From 7c6f809f2a4fa16a1a1a284c961aa19c49aaa8ff Mon Sep 17 00:00:00 2001 From: Debug <49997488+DebugOk@users.noreply.github.com> Date: Mon, 26 Feb 2024 19:34:03 +0000 Subject: [PATCH 1/2] Finally fix salvage mobs ghost roles --- .../Prototypes/Entities/Mobs/NPCs/space.yml | 35 +++------------ .../Nyanotrasen/Entities/Mobs/NPCs/space.yml | 43 ------------------- 2 files changed, 6 insertions(+), 72 deletions(-) delete mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/space.yml diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml index 0dd89e11661..39460be3f3c 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml @@ -64,13 +64,13 @@ radius: 1.2 energy: 2 color: "#4faffb" - #- type: GhostTakeoverAvailable # Delta V: Moves ghost takeover to child + - type: GhostTakeoverAvailable - type: Speech speechVerb: LargeMob - type: entity name: space bear - id: MobBearSpaceNPC # Delta V : remove ghosttakeover comps + id: MobBearSpace parent: MobSpaceBasic description: It looks friendly. Why don't you give it a hug? components: @@ -110,23 +110,17 @@ interactFailureString: petting-failure-bear interactSuccessSound: path: /Audio/Animals/sloth_squeak.ogg - # Moved to Nyanotrasen\Entities\Mobs\NPCs\space.yml - type: entity id: MobBearSpaceSalvage parent: MobBearSpace suffix: "Salvage Ruleset" components: - - type: GhostRole - prob: 0.25 - name: ghost-role-information-salvage-bear-name - description: ghost-role-information-salvage-bear-description - rules: deltav-ghost-role-information-salvageantag-rules #DeltaV - type: SalvageMobRestrictions - type: entity name: space kangaroo - id: MobKangarooSpaceNPC # Delta V : remove ghosttakeover comps + id: MobKangarooSpace parent: MobSpaceBasic description: It looks friendly. Why don't you give it a hug? components: @@ -179,23 +173,17 @@ interfaces: - key: enum.StrippingUiKey.Key type: StrippableBoundUserInterface - # Moved to Nyanotrasen\Entities\Mobs\NPCs\space.yml - type: entity id: MobKangarooSpaceSalvage parent: MobKangarooSpace suffix: "Salvage Ruleset" components: - - type: GhostRole - prob: 0.25 - name: ghost-role-information-salvage-kangaroo-name - description: ghost-role-information-salvage-kangaroo-description - rules: deltav-ghost-role-information-salvageantag-rules #DeltaV - type: SalvageMobRestrictions - type: entity name: space spider - id: MobSpiderSpaceNPC # Delta V : remove ghosttakeover comps + id: MobSpiderSpace parent: MobSpaceBasic description: It's so glowing, it looks dangerous. components: @@ -272,7 +260,6 @@ color: "#4faffb" - type: NoSlip - type: IgnoreSpiderWeb - # Moved to Nyanotrasen\Entities\Mobs\NPCs\space.yml - type: Speech speechVerb: Arachnid speechSounds: Arachnid @@ -289,16 +276,11 @@ parent: MobSpiderSpace suffix: "Salvage Ruleset" components: - - type: GhostRole - prob: 0.30 - name: ghost-role-information-salvage-spider-name - description: ghost-role-information-salvage-spider-description - rules: deltav-ghost-role-information-salvageantag-rules #DeltaV - type: SalvageMobRestrictions - type: entity name: space cobra - id: MobCobraSpaceNPC # Delta V : remove ghosttakeover comps + id: MobCobraSpace parent: MobSpaceBasic description: Long fangs and a glowing hood, and the alluring look begs to come closer. components: @@ -379,7 +361,6 @@ radius: 1.1 energy: 1.5 color: "#4faffb" - # Moved to Nyanotrasen\Entities\Mobs\NPCs\space.yml - type: Stealth enabledOnDeath: false maxVisibility: 1.2 @@ -392,8 +373,4 @@ parent: MobCobraSpace suffix: "Salvage Ruleset" components: - - type: GhostRole - prob: 0.25 - name: ghost-role-information-salvage-cobra-name - description: ghost-role-information-salvage-cobra-description - - type: SalvageMobRestrictions + - type: SalvageMobRestrictions \ No newline at end of file diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/space.yml deleted file mode 100644 index 8180326332f..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/space.yml +++ /dev/null @@ -1,43 +0,0 @@ -# GhostTakeover - -- type: entity - name: space bear - id: MobBearSpace - parent: MobBearSpaceNPC - components: - - type: GhostTakeoverAvailable # Delta V: Moves here - - type: GhostRole - prob: 0.25 - name: ghost-role-information-space-bear-name - description: ghost-role-information-space-bear-description - -- type: entity - name: space kangaroo - id: MobKangarooSpace - parent: MobKangarooSpaceNPC - components: - - type: GhostTakeoverAvailable # Delta V: Moves here - - type: GhostRole - prob: 0.25 - name: ghost-role-information-space-kangaroo-name - description: ghost-role-information-space-kangaroo-description - -- type: entity - name: space spider - id: MobSpiderSpace - parent: MobSpiderSpaceNPC - components: - - type: GhostRole - prob: 0.30 - name: ghost-role-information-space-spider-name - description: ghost-role-information-space-spider-description - -- type: entity - name: space cobra - id: MobCobraSpace - parent: MobCobraSpaceNPC - components: - - type: GhostRole - prob: 0.25 - name: ghost-role-information-space-cobra-name - description: ghost-role-information-space-cobra-description From 449c49ba525e1bdbb069eb84901f126278646502 Mon Sep 17 00:00:00 2001 From: Debug <49997488+DebugOk@users.noreply.github.com> Date: Mon, 26 Feb 2024 19:45:09 +0000 Subject: [PATCH 2/2] Remove some stuff I missed --- Resources/Migrations/deltaMigrations.yml | 5 +++- .../Entities/Markers/Spawners/Random/mobs.yml | 24 ++++--------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/Resources/Migrations/deltaMigrations.yml b/Resources/Migrations/deltaMigrations.yml index 1bda4c6ae58..cffa7562339 100644 --- a/Resources/Migrations/deltaMigrations.yml +++ b/Resources/Migrations/deltaMigrations.yml @@ -90,5 +90,8 @@ ExteriorLightTube: BlueLightTube # 2024-01-26 SalvagePartsSpawnerSubSpace: SalvagePartsSpawnerMid -# 2024-08-02 +# 2024-02-08 SpawnVehicleAntagVehicle: null + +# 2024-02-26 +SpaceTickSpawnerNPC: SpaceTickSpawner \ No newline at end of file diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/mobs.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/mobs.yml index d8886ee2f73..4f22019c200 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/mobs.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/mobs.yml @@ -23,7 +23,6 @@ name: NPC Snake Spawner id: SnakeSpawnerMundane parent: MarkerBase - suffix: No Ghost Takeover components: - type: Sprite layers: @@ -33,7 +32,7 @@ - type: RandomSpawner prototypes: - MobPurpleSnake - - MobCobraSpaceNPC + - MobCobraSpace rarePrototypes: - MobSmallPurpleSnake rareChance: 0.2 @@ -78,20 +77,6 @@ - MobSmallPurpleSnakeGhost rareChance: 0.20 -- type: entity - name: Space Tick Spawner - id: SpaceTickSpawnerNPC - parent: MarkerBase - components: - - type: Sprite - layers: - - state: red - - sprite: Mobs/Aliens/Xenos/spacetick.rsi - state: icon - - type: ConditionalSpawner - prototypes: - - MobTick - - type: entity name: Xeno Spawner id: XenoAISpawner @@ -166,7 +151,6 @@ name: Space Creature Spawner id: SpaceCreatureAISpawner parent: MarkerBase - suffix: No Ghost Takeover components: - type: Sprite layers: @@ -176,9 +160,9 @@ - state: ai - type: RandomSpawner prototypes: - - MobBearSpaceNPC - - MobKangarooSpaceNPC - - MobSpiderSpaceNPC + - MobBearSpace + - MobKangarooSpace + - MobSpiderSpace - type: entity name: Arena Spawner