Updates mob spawners for Arena (#393)

* Updates mob spawners for Arena

* Remove test notes

* Adjusts sprite states to not be dead

---------

Co-authored-by: Jeff <>

Resources/Prototypes/Entities/Mobs/NPCs/space.yml

@@ -64,13 +64,13 @@
     radius: 1.2
     energy: 2
     color: "#4faffb"
-  - type: GhostTakeoverAvailable
+  #- type: GhostTakeoverAvailable # Delta V: Moves ghost takeover to child
   - type: Speech
     speechVerb: LargeMob
 
 - type: entity
   name: space bear
-  id: MobBearSpace
+  id: MobBearSpaceNPC # Delta V : remove ghosttakeover comps
   parent: MobSpaceBasic
   description: It looks friendly. Why don't you give it a hug?
   components:
@@ -110,10 +110,7 @@
     interactFailureString: petting-failure-bear
     interactSuccessSound:
       path: /Audio/Animals/sloth_squeak.ogg
-  - type: GhostRole
-    prob: 0.25
-    name: ghost-role-information-space-bear-name
-    description: ghost-role-information-space-bear-description
+  # Moved to Nyanotrasen\Entities\Mobs\NPCs\space.yml
 
 - type: entity
   id: MobBearSpaceSalvage
@@ -129,7 +126,7 @@
 
 - type: entity
   name: space kangaroo
-  id: MobKangarooSpace
+  id: MobKangarooSpaceNPC # Delta V : remove ghosttakeover comps
   parent: MobSpaceBasic
   description: It looks friendly. Why don't you give it a hug?
   components:
@@ -182,10 +179,7 @@
     interfaces:
     - key: enum.StrippingUiKey.Key
       type: StrippableBoundUserInterface
-  - type: GhostRole
-    prob: 0.25
-    name: ghost-role-information-space-kangaroo-name
-    description: ghost-role-information-space-kangaroo-description
+  # Moved to Nyanotrasen\Entities\Mobs\NPCs\space.yml
 
 - type: entity
   id: MobKangarooSpaceSalvage
@@ -201,7 +195,7 @@
 
 - type: entity
   name: space spider
-  id: MobSpiderSpace
+  id: MobSpiderSpaceNPC # Delta V : remove ghosttakeover comps
   parent: MobSpaceBasic
   description: It's so glowing, it looks dangerous.
   components:
@@ -278,10 +272,7 @@
     color: "#4faffb"
   - type: NoSlip
   - type: IgnoreSpiderWeb
-  - type: GhostRole
-    prob: 0.30
-    name: ghost-role-information-space-spider-name
-    description: ghost-role-information-space-spider-description
+  # Moved to Nyanotrasen\Entities\Mobs\NPCs\space.yml
   - type: Speech
     speechVerb: Arachnid
 

Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml

@@ -96,13 +96,13 @@
     spawned:
     - id: FoodMeatXeno
       amount: 5
-  - type: GhostRole
-    allowMovement: true
-    allowSpeech: true
-    makeSentient: true
-    name: ghost-role-information-xeno-name
-    description: ghost-role-information-xeno-description
-    rules: ghost-role-information-xeno-rules
+  #- type: GhostRole # Delta V - Moves ghost role from parent to child
+  #  allowMovement: true # Delta V - Moves ghost role from parent to child
+  #  allowSpeech: true # Delta V - Moves ghost role from parent to child
+  #  makeSentient: true # Delta V - Moves ghost role from parent to child
+  #  name: ghost-role-information-xeno-name # Delta V - Moves ghost role from parent to child
+  #  description: ghost-role-information-xeno-description # Delta V - Moves ghost role from parent to child
+  #  rules: ghost-role-information-xeno-rules # Delta V - Moves ghost role from parent to child
   # - type: GhostTakeoverAvailable # Delta V - Moves ghost role from parent to child
   - type: TypingIndicator
     proto: alien

Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/mobs.yml

@@ -14,7 +14,7 @@
         - MobCarp
         - MobCarpMagic
         - MobCarpHolo
-        - MobCarpMagic
+        - MobCarpRainbow
 
 - type: entity
   name: NPC Snake Spawner
@@ -88,12 +88,13 @@
   name: Xeno Spawner
   id: XenoAISpawner
   parent: MarkerBase
+  suffix: No Ghost Takeover
   components:
     - type: Sprite
       layers:
         - state: red
         - sprite: Mobs/Aliens/Xenos/burrower.rsi
-          state: crit
+          state: walking
         - state: ai
     - type: RandomSpawner
       prototypes:
@@ -107,3 +108,87 @@
       rarePrototypes:
         - MobXenoQueenNPC
       rareChance: 0.10
+
+- type: entity
+  name: Argocyte Spawner
+  id: ArgocyteAISpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Mobs/Aliens/Argocyte/argocyte_common.rsi
+          state: crawler
+        - state: ai
+    - type: RandomSpawner
+      prototypes:
+        - MobArgocyteSkitter
+        - MobArgocyteSwiper
+        - MobArgocyteMolder
+        - MobArgocytePouncer
+        - MobArgocyteGlider
+        - MobArgocyteHarvester
+        - MobArgocyteCrawler
+        - MobArgocyteFounder
+      rarePrototypes:
+        - MobArgocyteLeviathing
+      rareChance: 0.10
+
+- type: entity
+  name: Watcher Spawner
+  id: WatcherAISpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Mobs/Aliens/Lavaland/watcher.rsi
+          state: unshaded
+        - state: ai
+    - type: RandomSpawner
+      prototypes:
+        - MobWatcherLavaland
+        - MobWatcherIcewing
+        - MobWatcherMagmawing
+      rarePrototypes:
+        - MobWatcherPride
+      rareChance: 0.10
+
+- type: entity
+  name: Space Creature Spawner
+  id: SpaceCreatureAISpawner
+  parent: MarkerBase
+  suffix: No Ghost Takeover
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Mobs/Animals/spacespider.rsi
+          state: spacespider
+        - state: ai
+    - type: RandomSpawner
+      prototypes:
+        - MobBearSpaceNPC
+        - MobKangarooSpaceNPC
+        - MobSpiderSpaceNPC
+
+- type: entity
+  name: Arena Spawner
+  id: ArenaSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Mobs/Animals/kangaroo.rsi
+          state: kangaroo-space
+        - state: ai
+    - type: RandomSpawner
+      prototypes:
+        - SpaceCreatureAISpawner
+        - WatcherAISpawner
+        - ArgocyteAISpawner
+        - SpawnMobOreCrab
+      rarePrototypes:
+        - MobLaserRaptor
+      rareChance: 0.10

Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/space.yml

@@ -0,0 +1,33 @@
+# 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

Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/xeno.yml

@@ -35,6 +35,13 @@
   parent: MobXeno
   suffix: Player
   components:
+  - type: GhostRole
+    allowMovement: true
+    allowSpeech: true
+    makeSentient: true
+    name: ghost-role-information-xeno-name
+    description: ghost-role-information-xeno-description
+    rules: ghost-role-information-xeno-rules
   - type: GhostTakeoverAvailable
 
 - type: entity
@@ -43,6 +50,13 @@
   id: MobXenoPraetorian
   suffix: Player
   components:
+  - type: GhostRole
+    allowMovement: true
+    allowSpeech: true
+    makeSentient: true
+    name: ghost-role-information-xeno-name
+    description: ghost-role-information-xeno-description
+    rules: ghost-role-information-xeno-rules
   - type: GhostTakeoverAvailable
 
 - type: entity
@@ -51,6 +65,13 @@
   id: MobXenoDrone
   suffix: Player
   components:
+  - type: GhostRole
+    allowMovement: true
+    allowSpeech: true
+    makeSentient: true
+    name: ghost-role-information-xeno-name
+    description: ghost-role-information-xeno-description
+    rules: ghost-role-information-xeno-rules
   - type: GhostTakeoverAvailable
 
 - type: entity
@@ -59,6 +80,13 @@
   id: MobXenoQueen
   suffix: Player
   components:
+  - type: GhostRole
+    allowMovement: true
+    allowSpeech: true
+    makeSentient: true
+    name: ghost-role-information-xeno-name
+    description: ghost-role-information-xeno-description
+    rules: ghost-role-information-xeno-rules
   - type: GhostTakeoverAvailable
 
 - type: entity
@@ -67,6 +95,13 @@
   id: MobXenoRavager
   suffix: Player
   components:
+  - type: GhostRole
+    allowMovement: true
+    allowSpeech: true
+    makeSentient: true
+    name: ghost-role-information-xeno-name
+    description: ghost-role-information-xeno-description
+    rules: ghost-role-information-xeno-rules
   - type: GhostTakeoverAvailable
 
 - type: entity
@@ -75,22 +110,40 @@
   id: MobXenoRunner
   suffix: Player
   components:
+  - type: GhostRole
+    allowMovement: true
+    allowSpeech: true
+    makeSentient: true
+    name: ghost-role-information-xeno-name
+    description: ghost-role-information-xeno-description
+    rules: ghost-role-information-xeno-rules
   - type: GhostTakeoverAvailable
 
 - type: entity
   name: Rouny
-  parent: MobXenoRunner
+  parent: MobXenoRounyNPC
   id: MobXenoRouny
   components:
-  - type: Sprite
-    drawdepth: Mobs
-    sprite: Mobs/Aliens/Xenos/rouny.rsi
-    offset: 0,0.6
+  - type: GhostRole
+    allowMovement: true
+    allowSpeech: true
+    makeSentient: true
+    name: ghost-role-information-xeno-name
+    description: ghost-role-information-xeno-description
+    rules: ghost-role-information-xeno-rules
+  - type: GhostTakeoverAvailable
 
 - type: entity
   name: Spitter
   parent: MobXenoSpitterNPC
   id: MobXenoSpitter
   suffix: Player
   components:
+  - type: GhostRole
+    allowMovement: true
+    allowSpeech: true
+    makeSentient: true
+    name: ghost-role-information-xeno-name
+    description: ghost-role-information-xeno-description
+    rules: ghost-role-information-xeno-rules
   - type: GhostTakeoverAvailable