more trash food

new-frontiers-14 · May 3, 2024 · a3cf959 · a3cf959
1 parent 2ff271a
commit a3cf959
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 22 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
@@ -251,7 +251,7 @@
 
 - type: entity
   name: paper cone
-  parent: BaseItem
+  parent: [ BaseItem, TrashSolutionInjector ] # Frontier
   id: FoodFrozenSnowconeTrash
   description: A crumpled paper cone used for an icy treat. Worthless.
   components:
@@ -264,7 +264,7 @@
 
 - type: entity
   name: popsicle stick
-  parent: BaseItem
+  parent: [ BaseItem, TrashSolutionInjector ] # Frontier
   id: FoodFrozenPopsicleTrash
   description: Once held a delicious treat. Now, 'tis barren.
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -301,7 +301,7 @@
 
 - type: entity
   name: banana peel
-  parent: BaseItem
+  parent: [ BaseItem, TrashSolutionInjector ] # Frontier
   id: TrashBananaPeel
   components:
   - type: Sprite
@@ -946,7 +946,7 @@
 
 - type: entity
   name: corn cob
-  parent: BaseItem
+  parent: [ BaseItem, TrashSolutionInjector ] # Frontier
   id: FoodCornTrash
   description: Not a dang kernel left.
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -460,7 +460,7 @@
 
 - type: entity
   noSpawn: true
-  parent: BaseItem
+  parent: [ BaseItem, TrashSolutionInjector ] # Frontier
   id: FoodPacketTrash
   description: This is rubbish.
   abstract: true
@@ -480,19 +480,6 @@
   - type: SpaceGarbage
   - type: StaticPrice
     price: 1
-  - type: FlavorProfile # Frontier, Goblins
-    flavors: # Frontier, Goblins
-      - funny # Frontier, Goblins
-  - type: Food # Frontier, Goblins
-    quality: Trash # Frontier, New Food Quality System
-#    requiresSpecialDigestion: true # Frontier, Goblins
-  - type: SolutionContainerManager # Frontier
-    solutions: # Frontier
-      food: # Frontier
-        maxVol: 1 # Frontier
-        reagents: # Frontier
-        - ReagentId: TrashJuice # Frontier
-          Quantity: 1 # Frontier
 
 - type: entity
   noSpawn: true

diff --git a/Resources/Prototypes/Entities/Objects/Misc/box.yml b/Resources/Prototypes/Entities/Objects/Misc/box.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: BoxBase
-  parent: BaseStorageItem
+  parent: [ BaseStorageItem, TrashSolutionInjector ] # Frontier
   abstract: true
   components:
   - type: Sprite

diff --git a/Resources/Prototypes/Entities/Objects/Misc/candles.yml b/Resources/Prototypes/Entities/Objects/Misc/candles.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: candle
-  parent: BaseItem
+  parent: [ BaseItem, TrashSolutionInjector ] # Frontier
   id: Candle
   description: A thin wick threaded through fat.
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml b/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
@@ -5,6 +5,8 @@
   suffix: Structure
   description: A cluster of wild mushrooms that likes to grow in dark, moist environments.
   components:
+    - type: Food # Frontier, New Food Quality System
+      quality: Toxin # Frontier, New Food Quality System
     - type: Sprite
       sprite: Objects/Misc/spaceshroom.rsi
       state: structure
@@ -45,6 +47,8 @@
   id: FoodSpaceshroom
   description: A wild mushroom. There's no telling what effect it could have...
   components:
+  - type: Food # Frontier, New Food Quality System
+    quality: Toxin # Frontier, New Food Quality System
   - type: Produce
   - type: Sprite
     sprite: Objects/Misc/spaceshroom.rsi
@@ -103,6 +107,8 @@
   id: FoodSpaceshroomCooked
   description: A wild mushroom that has been cooked through. It seems the heat has removed its chemical effects.
   components:
+  - type: Food # Frontier, New Food Quality System
+    quality: Toxin # Frontier, New Food Quality System
   - type: FlavorProfile
     flavors:
       - spaceshroomcooked

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/spoiled.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/spoiled.yml
@@ -6,6 +6,8 @@
   description: "It's probably still edible, just need to scrape this thing off. And this one too. And this one."
   noSpawn: true
   components:
+  - type: Food
+    quality: Toxin
   - type: Sprite
     layers:
     - sprite: Objects/Consumable/Food/meat.rsi
@@ -36,6 +38,8 @@
   description: "It's probably still edible, just need to scrape this thing off. And this one too. And this one."
   noSpawn: true
   components:
+  - type: Food
+    quality: Toxin
   - type: Sprite
     layers:
     - sprite: Objects/Consumable/Food/meat.rsi

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/trash.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/trash.yml
@@ -0,0 +1,18 @@
+- type: entity
+  noSpawn: true
+  id: TrashSolutionInjector
+  abstract: true
+  components:
+  - type: FlavorProfile
+    flavors:
+    - funny
+  - type: Food
+    quality: Trash
+#    requiresSpecialDigestion: true # Frontier, Goblins
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 1
+        reagents:
+        - ReagentId: TrashJuice
+          Quantity: 1
diff --git a/Resources/Prototypes/_NF/Objects/Consumable/Food/meat_goblin.yml b/Resources/Prototypes/_NF/Objects/Consumable/Food/meat_goblin.yml
@@ -7,5 +7,5 @@
   - type: Sprite
     state: rotten
     color: lime
-#  - type: Food # Frontier, New Food Quality System
-#    quality: Toxin # Frontier, New Food Quality System
+  - type: Food # Frontier, New Food Quality System
+    quality: Toxin # Frontier, New Food Quality System