Move spawning collections of EntitySpawnEntry out of StorageSystem, make Butcherable use it (#7305)

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

Resources/Locale/en-US/kitchen/components/kitchen-spike-component.ftl

@@ -15,4 +15,4 @@ comp-kitchen-spike-knife-needed = You need a knife to do this.
 comp-kitchen-spike-remove-meat = You remove some meat from { THE($victim) }.
 comp-kitchen-spike-remove-meat-last = You remove the last piece of meat from { THE($victim) }!
 
-comp-kitchen-spike-meat-name = { $victim } meat
+comp-kitchen-spike-meat-name = { $name } ({ $victim })

Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml

@@ -12,5 +12,6 @@
     state: icon
   - type: Butcherable
     butcheringType: Knife
-    spawned: MaterialCloth1
-    pieces: 2
+    spawned:
+    - id: MaterialCloth1
+      amount: 2

Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml

@@ -10,5 +10,6 @@
     state: icon
   - type: Butcherable
     butcheringType: Knife
-    spawned: MaterialCloth1
-    pieces: 1
+    spawned:
+    - id: MaterialCloth1
+      amount: 1

Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml

@@ -22,8 +22,9 @@
       path: /Audio/Items/jumpsuit_equip.ogg
   - type: Butcherable
     butcheringType: Knife
-    spawned: MaterialCloth1
-    pieces: 3
+    spawned:
+    - id: MaterialCloth1
+      amount: 3
 
 - type: entity
   abstract: true
@@ -39,5 +40,6 @@
       path: /Audio/Items/jumpsuit_equip.ogg
   - type: Butcherable
     butcheringType: Knife
-    spawned: MaterialCloth1
-    pieces: 3
+    spawned:
+    - id: MaterialCloth1
+      amount: 3

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

@@ -36,8 +36,9 @@
       crit: dead
       dead: dead
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 1
+    spawned:
+    - id: FoodMeat
+      amount: 1
   - type: InteractionPopup
     successChance: 0.2
     interactSuccessString: petting-success-soft-floofy
@@ -139,8 +140,9 @@
       crit: dead-0
       dead: dead-0
   - type: Butcherable
-    spawned: FoodMeatChicken
-    pieces: 1
+    spawned:
+    - id: FoodMeatChicken
+      amount: 1
   - type: InteractionPopup
     successChance: 0.8
     interactSuccessString: petting-success-bird
@@ -169,8 +171,9 @@
       crit: dead-0
       dead: dead-0
   - type: Butcherable
-    spawned: FoodMeatDuck
-    pieces: 1
+    spawned:
+    - id: FoodMeatDuck
+      amount: 1
   - type: InteractionPopup
     successChance: 0.9
     interactSuccessString: petting-success-bird
@@ -199,8 +202,9 @@
       crit: dead-1
       dead: dead-1
   - type: Butcherable
-    spawned: FoodMeatDuck
-    pieces: 1
+    spawned:
+    - id: FoodMeatDuck
+      amount: 1
   - type: InteractionPopup
     successChance: 0.9
     interactSuccessString: petting-success-bird
@@ -229,8 +233,9 @@
       crit: dead-2
       dead: dead-2
   - type: Butcherable
-    spawned: FoodMeatDuck
-    pieces: 1
+    spawned:
+    - id: FoodMeatDuck
+      amount: 1
   - type: InteractionPopup
     successChance: 0.9
     interactSuccessString: petting-success-bird
@@ -336,8 +341,9 @@
     quantity: 25
     updateRate: 30
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 5
+    spawned:
+    - id: FoodMeat
+      amount: 5
   - type: Grammar
     attributes:
       gender: female # Here because of UdderComponent
@@ -380,8 +386,9 @@
       dead: dead
     - type: AsteroidRockVisualizer
   - type: Butcherable
-    spawned: FoodMeatCrab
-    pieces: 2
+    spawned:
+    - id: FoodMeatCrab
+      amount: 2
   - type: InteractionPopup
     successChance: 0.5
     interactSuccessString: petting-success-crab
@@ -420,8 +427,9 @@
     quantity: 25
     updateRate: 20
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 4
+    spawned:
+    - id: FoodMeat
+      amount: 4
   - type: Grammar
     attributes:
       gender: female # Here because of UdderComponent
@@ -450,8 +458,9 @@
       crit: dead
       dead: dead
   - type: Butcherable
-    spawned: FoodMeatChicken
-    pieces: 2
+    spawned:
+    - id: FoodMeatChicken
+      amount: 2
   - type: InteractionPopup # TODO: Make it so there's a separate chance to make certain animals outright hostile towards you.
     successChance: 0.1 # Yeah, good luck with that.
     interactSuccessString: petting-success-goose
@@ -491,8 +500,9 @@
       crit: dead
       dead: dead
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 4
+    spawned:
+    - id: FoodMeat
+      amount: 4
   - type: Bloodstream
     bloodMaxVolume: 300
 
@@ -602,8 +612,9 @@
       normalState: Monkey_burning
   - type: Butcherable
     butcheringType: Spike
-    spawned: FoodMeat
-    pieces: 3
+    spawned:
+    - id: FoodMeat
+      amount: 3
   - type: MonkeyAccent
 
 - type: entity
@@ -667,8 +678,9 @@
         - ReagentId: Blood
           Quantity: 50
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 1
+    spawned:
+    - id: FoodMeat
+      amount: 1
   - type: ReplacementAccent
     accent: mouse
   - type: Tag
@@ -770,8 +782,9 @@
       crit: dead
       dead: dead
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 1
+    spawned:
+    - id: FoodMeat
+      amount: 1
   - type: InteractionPopup
     successChance: 0.3
     interactSuccessString: petting-success-reptile
@@ -817,8 +830,9 @@
       crit: dead
       dead: dead
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 1
+    spawned:
+    - id: FoodMeat
+      amount: 1
   - type: InteractionPopup
     successChance: 0.6
     interactSuccessString: petting-success-frog
@@ -862,8 +876,9 @@
       crit: dead
       dead: dead
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 1
+    spawned:
+    - id: FoodMeat
+      amount: 1
   - type: InteractionPopup
     successChance: 0.6
     interactSuccessString: petting-success-bird
@@ -903,8 +918,9 @@
       crit: penguin_dead
       dead: penguin_dead
   - type: Butcherable
-    spawned: FoodMeatPenguin
-    pieces: 3
+    spawned:
+    - id: FoodMeatPenguin
+      amount: 3
   - type: InteractionPopup
     successChance: 0.5
     interactSuccessString: petting-success-bird
@@ -951,8 +967,9 @@
       crit: dead
       dead: dead
   - type: Butcherable
-    spawned: FoodMeatPenguin
-    pieces: 3
+    spawned:
+    - id: FoodMeatPenguin
+      amount: 3
   - type: UnarmedCombat
     range: 0.5
     arcwidth: 0
@@ -965,7 +982,7 @@
   - type: OnUseTimerTrigger
     delay: 10
     beepSound:
-      path: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg #funny sfx use 
+      path: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg #funny sfx use
     beepInterval: 1
   - type: Explosive
     devastationRange: 1
@@ -1009,8 +1026,9 @@
      # dead: dead
      # crit: dead
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 1
+    spawned:
+    - id: FoodMeat
+      amount: 1
   - type: InteractionPopup
     successChance: 0.6
     interactSuccessString: petting-success-reptile
@@ -1055,8 +1073,9 @@
       crit: tarantula_dead
       dead: tarantula_dead
   - type: Butcherable
-    spawned: FoodMeatSpider
-    pieces: 2
+    spawned:
+    - id: FoodMeatSpider
+      amount: 2
   - type: InteractionPopup
     successChance: 0.5
     interactSuccessString: petting-success-tarantula
@@ -1108,8 +1127,9 @@
       crit: possum_dead # TODO: Make it so possums can "play dead." Probably need AI changes
       dead: possum_dead
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 3
+    spawned:
+    - id: FoodMeat
+      amount: 3
   - type: InteractionPopup
     successChance: 0.2 # Low when undomesticated.
     interactSuccessString: petting-success-possum # Possums don't really make much noise when they're happy. They make clicking noises as a mating call, but that is NOT the same thing!
@@ -1166,8 +1186,9 @@
       crit: raccoon_dead
       dead: raccoon_dead
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 3
+    spawned:
+    - id: FoodMeat
+      amount: 3
   - type: InteractionPopup
     successChance: 0.2 # Low when undomesticated.
     interactSuccessString: petting-success-soft-floofy
@@ -1222,8 +1243,9 @@
       crit: fox_dead
       dead: fox_dead
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 3
+    spawned:
+    - id: FoodMeat
+      amount: 3
   - type: InteractionPopup
     successChance: 0.5
     interactSuccessString: petting-success-soft-floofy

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

@@ -43,8 +43,10 @@
       crit: crit
       dead: dead
   - type: Butcherable
-    spawned: FoodMeat # TODO: CrapMeat or FishMeat # - 2022-02-17 LMAO crap meat
-    pieces: 2
+    # TODO: CrapMeat or FishMeat # - 2022-02-17 LMAO crap meat
+    spawned:
+    - id: FoodMeat
+      amount: 2
   - type: UnarmedCombat
     range: 1.5
     arcwidth: 0

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

@@ -33,8 +33,9 @@
       crit: corgi_dead
       dead: corgi_dead
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 3
+    spawned:
+    - id: FoodMeat
+      amount: 3
   - type: ReplacementAccent
     accent: dog
   - type: InteractionPopup
@@ -211,8 +212,9 @@
       crit: cat_dead
       dead: cat_dead
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 2
+    spawned:
+    - id: FoodMeat
+      amount: 3
   - type: ReplacementAccent
     accent: cat
   - type: InteractionPopup
@@ -362,8 +364,9 @@
       crit: sloth_dead
       dead: sloth_dead
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 3
+    spawned:
+    - id: FoodMeat
+      amount: 3
   - type: InteractionPopup
     successChance: 0.9
     interactSuccessString: petting-success-sloth
@@ -405,8 +408,9 @@
       crit: ferret_dead
       dead: ferret_dead
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 3
+    spawned:
+    - id: FoodMeat
+      amount: 3
   - type: InteractionPopup
     successChance: 0.8
     interactDelay: 1.5 # Avoids overlapping SFX due to spam - these SFX are a little longer than the typical 1 second.
@@ -449,7 +453,7 @@
       mass: 10
       mask:
       - Impassable
-      - MobImpassable 
+      - MobImpassable
       - VaultImpassable
       - SmallImpassable
       layer:
@@ -461,10 +465,11 @@
       crit: bingus_dead
       dead: bingus_dead
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 2
+    spawned:
+    - id: FoodMeat
+      amount: 2
   - type: InteractionPopup
-    successChance: 0.9 
+    successChance: 0.9
     interactSuccessString: petting-success-cat
     interactFailureString: petting-failure-generic
     interactSuccessSound:
@@ -472,7 +477,7 @@
   - type: Grammar
     attributes:
       gender: epicene
-      
+
 - type: entity
   name: mcgriff
   parent: SimpleMobBase
@@ -494,7 +499,7 @@
       mass: 10
       mask:
       - Impassable
-      - MobImpassable 
+      - MobImpassable
       - SmallImpassable
       - VaultImpassable
       layer:
@@ -506,12 +511,13 @@
       crit: mcgriff_dead
       dead: mcgriff_dead
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 2
+    spawned:
+    - id: FoodMeat
+      amount: 2
   - type: ReplacementAccent
     accent: dog
   - type: InteractionPopup
-    successChance: 0.5 
+    successChance: 0.5
     interactSuccessString: petting-success-dog
     interactFailureString: petting-failure-generic
     interactSuccessSound:
@@ -540,8 +546,9 @@
       crit: paperwork_dead
       dead: paperwork_dead
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 3
+    spawned:
+    - id: FoodMeat
+      amount: 3
   - type: InteractionPopup
     successChance: 1
     interactSuccessString: petting-success-sloth
@@ -550,7 +557,7 @@
     attributes:
       proper: true
       gender: male
-      
+
 - type: entity
   name: walter
   parent: SimpleMobBase
@@ -572,7 +579,7 @@
       mass: 10
       mask:
       - Impassable
-      - MobImpassable 
+      - MobImpassable
       - SmallImpassable
       - VaultImpassable
       layer:
@@ -584,8 +591,9 @@
       crit: walter_dead
       dead: walter_dead
   - type: Butcherable
-    spawned: FoodMeat
-    pieces: 3
+    spawned:
+    - id: FoodMeat
+      amount: 3
   - type: ReplacementAccent
     accent: dog
   - type: InteractionPopup
@@ -597,4 +605,4 @@
   - type: Grammar
     attributes:
       proper: true
-      gender: male
+      gender: male

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

@@ -45,8 +45,9 @@
       normal: alive
       dead: dead
   - type: Butcherable
-    spawned: FoodMeatXeno
-    pieces: 1
+    spawned:
+    - id: FoodMeatXeno
+      amount: 1
   - type: Bloodstream
     bloodMaxVolume: 50
   - type: UnarmedCombat

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

@@ -69,9 +69,10 @@
       dead: dead
   - type: Puller
   - type: Butcherable
-    spawned: FoodMeatXeno
     butcheringType: Spike
-    pieces: 5
+    spawned:
+    - id: FoodMeatXeno
+      amount: 5
   - type: GhostTakeoverAvailable
     makeSentient: true
     name: xeno

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -284,7 +284,9 @@
   - type: Puller
   - type: Butcherable
     butcheringType: Spike # TODO human.
-    spawned: FoodMeat
+    spawned:
+    - id: FoodMeat
+      amount: 5
 #  - type: Recyclable Turns out turning off recycler safeties without considering the instagib is a bad idea
 #    safe: false
   - type: Speech

Resources/Prototypes/Entities/Mobs/Species/slime.yml

@@ -136,7 +136,9 @@
           probability: 0.25
     - type: Butcherable
       butcheringType: Spike
-      spawned: FoodMeatSlime
+      spawned:
+      - id: FoodMeatSlime
+        amount: 5
 
 - type: entity
   save: false

Resources/Prototypes/Entities/Mobs/Species/vox.yml

@@ -111,4 +111,6 @@
     speciesId: vox
   - type: Butcherable
     butcheringType: Spike
-    spawned: FoodMeatChicken
+    spawned:
+    - id: FoodMeatChicken
+      amount: 5