Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Allow injecting into foods again (#4845)

Browse Source
This commit is contained in:
20kdc
2021-10-12 16:01:06 +01:00
committed by GitHub
parent ac1b5fa66e
commit 88bee5b878
10 changed files with 68 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
View File

@@ -1,7 +1,7 @@
# Base # Base
- type: entity - type: entity
parent: BaseItem parent: FoodInjectableBase
id: FoodBurgerBase id: FoodBurgerBase
abstract: true abstract: true
components: components:
@@ -13,7 +13,7 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
maxVol: 15 maxVol: 20
reagents: reagents:
- ReagentId: Nutriment - ReagentId: Nutriment
Quantity: 15 Quantity: 15
@@ -157,7 +157,7 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
maxVol: 25 maxVol: 33
reagents: reagents:
- ReagentId: Nutriment - ReagentId: Nutriment
Quantity: 25 Quantity: 25
@@ -174,7 +174,7 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
maxVol: 40 maxVol: 53
reagents: reagents:
- ReagentId: Nutriment - ReagentId: Nutriment
Quantity: 40 Quantity: 40

6
Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
View File

@@ -1,7 +1,7 @@
# Base # Base
- type: entity - type: entity
parent: BaseItem parent: FoodInjectableBase
id: FoodEggBase id: FoodEggBase
description: An egg! description: An egg!
abstract: true abstract: true
@@ -20,7 +20,7 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
maxVol: 5 maxVol: 6
reagents: reagents:
- ReagentId: Egg - ReagentId: Egg
Quantity: 5 Quantity: 5
@@ -92,7 +92,7 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
maxVol: 1 maxVol: 2
reagents: reagents:
- ReagentId: Egg - ReagentId: Egg
Quantity: 1 Quantity: 1

2
Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
View File

@@ -1,7 +1,7 @@
# Base # Base
- type: entity - type: entity
parent: BaseItem parent: FoodInjectableBase
id: FoodFrozenBase id: FoodFrozenBase
abstract: true abstract: true
components: components:

7
Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
View File

@@ -30,7 +30,14 @@
food: food:
maxVol: 50 maxVol: 50
- type: SolutionTransfer - type: SolutionTransfer
# This is potentially badly-handled due to 'drink opening',
# but it lets the flour be tampered with, refilled, etc.
- type: RefillableSolution
solution: food
- type: DrainableSolution
solution: food
- type: Drink - type: Drink
solution: food
openSounds: openSounds:
collection: packetOpenSounds collection: packetOpenSounds
useSound: useSound:

13
Resources/Prototypes/Entities/Objects/Consumable/Food/injectable_base.yml Normal file
View File

@@ -0,0 +1,13 @@
# This base type is used to cover all of the "obvious" things that should be doable to open-package food.
# Practically this means injection.
# But it might in future also mean drawing with a syringe, so this is a base prototype just in case.
- type: entity
parent: BaseItem
id: FoodInjectableBase
abstract: true
components:
- type: Food
- type: InjectableSolution
solution: food

5
Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
View File

@@ -4,7 +4,7 @@
# Base # Base
- type: entity - type: entity
parent: BaseItem parent: FoodInjectableBase
id: FoodMealBase id: FoodMealBase
abstract: true abstract: true
description: A delicious meal, cooked with love. description: A delicious meal, cooked with love.
@@ -16,7 +16,7 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
maxVol: 20 maxVol: 26
reagents: reagents:
- ReagentId: Nutriment - ReagentId: Nutriment
Quantity: 20 Quantity: 20
@@ -104,6 +104,7 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
# Note that this acts as the limiter against injecting anything.
maxVol: 1 maxVol: 1
reagents: reagents:
- ReagentId: Nutriment - ReagentId: Nutriment

2
Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
View File

@@ -1,7 +1,7 @@
# Base # Base
- type: entity - type: entity
parent: BaseItem parent: FoodInjectableBase
id: FoodMeatBase id: FoodMeatBase
abstract: true abstract: true
components: components:

4
Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
View File

@@ -1,7 +1,7 @@
# Base # Base
- type: entity - type: entity
parent: BaseItem parent: FoodInjectableBase
id: FoodNoodlesBase id: FoodNoodlesBase
abstract: true abstract: true
description: Now that's a nice pasta! description: Now that's a nice pasta!
@@ -14,7 +14,7 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
maxVol: 20 maxVol: 25
reagents: reagents:
- ReagentId: Nutriment - ReagentId: Nutriment
Quantity: 20 Quantity: 20

56
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
View File

@@ -1,3 +1,5 @@
# For produce that can't be immediately eaten
- type: entity - type: entity
parent: BaseItem parent: BaseItem
id: ProduceBase id: ProduceBase
@@ -11,6 +13,23 @@
- type: Extractable - type: Extractable
extractableSolution: food extractableSolution: food
# For produce that can be immediately eaten
- type: entity
parent: FoodInjectableBase
id: FoodProduceBase
abstract: true
components:
- type: SolutionContainerManager
- type: Sprite
netsync: false
state: produce
- type: Produce
- type: Extractable
extractableSolution: food
# Subclasses
- type: entity - type: entity
name: wheat bushel name: wheat bushel
description: Sigh... wheat... a-grain? description: Sigh... wheat... a-grain?
@@ -86,7 +105,7 @@
- type: entity - type: entity
name: banana name: banana
parent: ProduceBase parent: FoodProduceBase
id: FoodBanana id: FoodBanana
description: Rich in potassium. description: Rich in potassium.
components: components:
@@ -142,14 +161,13 @@
- type: entity - type: entity
name: carrot name: carrot
parent: ProduceBase parent: FoodProduceBase
id: FoodCarrot id: FoodCarrot
description: It's good for the eyes! description: It's good for the eyes!
components: components:
- type: Tag - type: Tag
tags: tags:
- Carrot - Carrot
- type: Food
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
@@ -168,11 +186,10 @@
- type: entity - type: entity
name: lemon name: lemon
parent: ProduceBase parent: FoodProduceBase
id: FoodLemon id: FoodLemon
description: When life gives you lemons, be grateful they aren't limes. description: When life gives you lemons, be grateful they aren't limes.
components: components:
- type: Food
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
@@ -191,11 +208,10 @@
- type: entity - type: entity
name: pineapple name: pineapple
parent: ProduceBase parent: FoodProduceBase
id: FoodPineapple id: FoodPineapple
description: Mmm, tropical. description: Mmm, tropical.
components: components:
- type: Food
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
@@ -217,11 +233,10 @@
- type: entity - type: entity
name: potato name: potato
parent: ProduceBase parent: FoodProduceBase
id: FoodPotato id: FoodPotato
description: The space Irish starved to death after their potato crops died. Sadly they were unable to fish for space carp due to it being the queen's space. Bringing this up to any space IRA member will drive them insane with anger. description: The space Irish starved to death after their potato crops died. Sadly they were unable to fish for space carp due to it being the queen's space. Bringing this up to any space IRA member will drive them insane with anger.
components: components:
- type: Food
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
@@ -235,11 +250,10 @@
- type: entity - type: entity
name: tomato name: tomato
parent: ProduceBase parent: FoodProduceBase
id: FoodTomato id: FoodTomato
description: I say to-mah-to, you say tom-mae-to. description: I say to-mah-to, you say tom-mae-to.
components: components:
- type: Food
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
@@ -302,11 +316,10 @@
- type: entity - type: entity
name: eggplant name: eggplant
parent: ProduceBase parent: FoodProduceBase
id: FoodEggplant id: FoodEggplant
description: Maybe there's a chicken inside? description: Maybe there's a chicken inside?
components: components:
- type: Food
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
@@ -320,11 +333,10 @@
- type: entity - type: entity
name: apple name: apple
parent: ProduceBase parent: FoodProduceBase
id: FoodApple id: FoodApple
description: It's a little piece of Eden. description: It's a little piece of Eden.
components: components:
- type: Food
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
@@ -343,7 +355,7 @@
- type: entity - type: entity
name: ear of corn name: ear of corn
parent: ProduceBase parent: FoodProduceBase
id: FoodCorn id: FoodCorn
description: Needs some butter! And some cooking... description: Needs some butter! And some cooking...
components: components:
@@ -375,11 +387,10 @@
- type: entity - type: entity
name: onion name: onion
parent: ProduceBase parent: FoodProduceBase
id: FoodOnion id: FoodOnion
description: Nothing to cry over. description: Nothing to cry over.
components: components:
- type: Food
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
@@ -396,11 +407,10 @@
- type: entity - type: entity
name: red onion name: red onion
parent: ProduceBase parent: FoodProduceBase
id: FoodOnionRed id: FoodOnionRed
description: Purple despite the name. description: Purple despite the name.
components: components:
- type: Food
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
@@ -417,11 +427,10 @@
- type: entity - type: entity
name: chanterelle cluster name: chanterelle cluster
parent: ProduceBase parent: FoodProduceBase
id: FoodMushroom id: FoodMushroom
description: "Cantharellus Cibarius: These jolly yellow little shrooms sure look tasty!" description: "Cantharellus Cibarius: These jolly yellow little shrooms sure look tasty!"
components: components:
- type: Food
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
@@ -436,11 +445,10 @@
# Slices # Slices
- type: entity - type: entity
parent: BaseItem parent: FoodInjectableBase
id: ProduceSliceBase id: ProduceSliceBase
abstract: true abstract: true
components: components:
- type: Food
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:

4
Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
View File

@@ -1,7 +1,7 @@
# Base # Base
- type: entity - type: entity
parent: BaseItem parent: FoodInjectableBase
id: FoodSkewerBase id: FoodSkewerBase
abstract: true abstract: true
components: components:
@@ -13,7 +13,7 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
food: food:
maxVol: 20 maxVol: 26
reagents: reagents:
- ReagentId: Nutriment - ReagentId: Nutriment
Quantity: 20 Quantity: 20