Remove FoodContainer, add whitelists, replace with SpawnItemsOnUse (#4358)

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml

@@ -1,8 +1,5 @@
 # Base
 
-- type: Tag
-  id: Donut
-
 - type: entity
   parent: BaseItem
   id: FoodDonutBase

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml

@@ -21,6 +21,9 @@
     count: 8
   - type: Item
     size: 8
+  - type: Tag
+    tags:
+    - Pizza
 
 - type: entity
   parent: FoodPizzaBase
@@ -37,6 +40,9 @@
         Quantity: 5
   - type: Item
     size: 1
+  - type: Tag
+    tags:
+    - Pizza
 
 # Pizza
 

Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml

@@ -8,7 +8,7 @@
 - type: entity
   parent: BaseItem
   id: FoodBoxDonut
-  name: donutbox
+  name: donut box
   description: Mmm, Donuts.
   components:
   - type: Sprite
@@ -17,6 +17,9 @@
     state: box
   - type: Storage
     capacity: 6
+    whitelist:
+      tags:
+      - Donut
   - type: Item
     sprite: Objects/Consumable/Food/Baked/donut.rsi
     size: 6
@@ -48,7 +51,7 @@
 - type: entity
   parent: BaseItem
   id: FoodContainerEgg
-  name: eggbox
+  name: egg carton
   description: Don't drop 'em!
   components:
   - type: Sprite
@@ -57,6 +60,9 @@
     state: box-closed
   - type: Storage
     capacity: 12
+    whitelist:
+      tags:
+      - Egg
   - type: Item
     sprite: Objects/Consumable/Food/egg.rsi
     size: 12
@@ -114,6 +120,7 @@
 - type: entity
   parent: FoodContainerEgg
   id: EggBoxBroken
+  suffix: Broken
   components:
   - type: StorageFill
     contents:
@@ -261,6 +268,9 @@
     sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
     state: box
   - type: Storage
+    whitelist:
+      tags:
+      - DonkPocket
     capacity: 6
   - type: Item
     sprite: Objects/Consumable/Food/Baked/donkpocket.rsi

Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml

@@ -1,8 +1,5 @@
 # Base
 
-- type: Tag
-  id: Egg
-
 - type: entity
   parent: BaseItem
   id: FoodEggBase
@@ -66,7 +63,7 @@
   - type: Puddle
     variants: 4
     state: egg
-    
+
 - type: entity
   name: eggshells
   parent: BaseItem
@@ -86,6 +83,9 @@
       reagents:
       - ReagentId: Egg
         Quantity: 1
+  - type: Tag
+    tags:
+    - Egg
 
 # Egg
 

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml

@@ -4,10 +4,15 @@
   id: PackPaperRolling
   description: "A pack of thin pieces of paper used to make fine smokeables."
   components:
-    # I know but it just works.
-  - type: FoodContainer
-    prototypes:
-      PaperRolling: 100
+  - type: Storage
+    whitelist:
+      tags:
+      - RollingPaper
+    capacity: 16
+  - type: StorageFill
+    contents:
+      - id: PaperRolling
+        amount: 8
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
     state: cigpapers
@@ -29,6 +34,10 @@
       state: cigpaper
     - type: Item
       sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
+      size: 2
+    - type: Tag
+      tags:
+      - RollingPaper
 
 - type: entity
   id: CigaretteFilter

Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml

@@ -4,9 +4,15 @@
   id: MonkeyCubeBox
   description: Drymate brand monkey cubes. Just add water!
   components:
-  - type: FoodContainer
-    prototypes:
-      MonkeyCubeWrapper: 100
+  - type: Storage
+    whitelist:
+      tags:
+      - MonkeyCube
+    capacity: 30
+  - type: StorageFill
+    contents:
+      - id: MonkeyCubeWrapped
+        amount: 6
   - type: Sprite
     sprite: Objects/Misc/monkeycube.rsi
     state: box
@@ -14,13 +20,18 @@
 - type: entity
   parent: BaseItem
   name: monkey cube
-  id: MonkeyCubeWrapper
+  suffix: Wrapped
+  id: MonkeyCubeWrapped
   description: Unwrap this to get a monkey cube.
   components:
-  - type: FoodContainer
-    capacity: 1
-    prototypes:
-      MonkeyCube: 100
+  - type: SpawnItemsOnUse
+    items:
+      - id: MonkeyCube
+    sound:
+      path: /Audio/Effects/unwrap.ogg
   - type: Sprite
     sprite: Objects/Misc/monkeycube.rsi
     state: wrapper
+  - type: Tag
+    tags:
+    - MonkeyCube

Resources/Prototypes/tags.yml

@@ -58,6 +58,12 @@
 - type: Tag
   id: DoorElectronics
 
+- type: Tag
+  id: Donut
+
+- type: Tag
+  id: Egg
+
 - type: Tag
   id: ExplosivePassable
 
@@ -84,13 +90,19 @@
 
 - type: Tag
   id: JawsOfLife
-  
+
+- type: Tag
+  id: MonkeyCube
+
 - type: Tag
   id: NoSpinOnThrow
 
 - type: Tag
   id: Ore
 
+- type: Tag
+  id: Pizza
+
 - type: Tag
   id: PlantAnalyzer
 
@@ -103,6 +115,9 @@
 - type: Tag
   id: Powerdrill
 
+- type: Tag
+  id: RollingPaper
+
 - type: Tag
   id: Screwdriver