From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sat, 30 Sep 2023 19:52:24 +0000 (+0100) Subject: bowl is open (#20453) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=54851faefaa52a97104ca4359229cb75ef1439d5;p=space-station-14.git bowl is open (#20453) Co-authored-by: deltanedas <@deltanedas:kde.org> --- diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml index 4384542bb0..eb05133a38 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml @@ -21,18 +21,12 @@ damage: types: Blunt: 5 - - type: Drink - solution: food - - type: DrawableSolution - solution: food - - type: Damageable - damageContainer: Inorganic - type: SolutionTransfer canChangeTransferAmount: true - type: UserInterface interfaces: - - key: enum.TransferAmountUiKey.Key - type: TransferAmountBoundUserInterface + - key: enum.TransferAmountUiKey.Key + type: TransferAmountBoundUserInterface - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml index 05cae79b16..e2ce3dfaa8 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml @@ -1,7 +1,7 @@ # Base - type: entity - parent: FoodInjectableBase + parent: [FoodInjectableBase, ItemHeftyBase] id: FoodEggBase description: An egg! abstract: true @@ -28,15 +28,7 @@ ignoreEmpty: true popup: spike-solution-egg - type: DeleteOnTrigger - - type: DamageOnLand - damage: - types: - Blunt: 1 - - type: DamageOtherOnHit - damage: - types: - Blunt: 1 - #Dignity: 25 + # egg fragile - type: DamageOnHighSpeedImpact minimumSpeed: 0.1 damage: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 9c9890084c..c3b3bba35b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -5,9 +5,9 @@ # Reagent Containers - type: entity + abstract: true parent: BaseItem id: ReagentContainerBase - abstract: true components: - type: Sprite sprite: Objects/Consumable/Food/ingredients.rsi @@ -18,6 +18,8 @@ - type: SolutionTransfer # This is potentially badly-handled due to 'drink opening', # but it lets the flour be tampered with, refilled, etc. + - type: DrawableSolution + solution: food - type: RefillableSolution solution: food - type: DrainableSolution @@ -26,22 +28,58 @@ solution: food useSound: path: /Audio/Items/eating_1.ogg + - type: Damageable + damageContainer: Inorganic + - type: Spillable + solution: food + - type: TrashOnEmpty + solution: food + +- type: entity + abstract: true + parent: ReagentContainerBase + id: ReagentPacketBase + components: - type: Openable sound: collection: packetOpenSounds - - type: Spillable - solution: food + # packet can be broken open + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 2 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: desecration + - !type:SpillBehavior + solution: food + - !type:DoActsBehavior + acts: [ "Destruction" ] + # packet contents can be splashed when open - type: MeleeWeapon soundNoDamage: path: "/Audio/Effects/Fluids/splat.ogg" damage: types: Blunt: 0 - - type: TrashOnEmpty - solution: food - type: entity - parent: ReagentContainerBase + abstract: true + id: ItemHeftyBase + components: + - type: DamageOnLand + damage: + types: + Blunt: 1 + - type: DamageOtherOnHit + damage: + types: + Blunt: 1 + +- type: entity + parent: [ReagentPacketBase, ItemHeftyBase] id: ReagentContainerFlour name: flour bag description: A big bag of flour. Good for baking! @@ -55,34 +93,9 @@ reagents: - ReagentId: Flour Quantity: 50 - - type: DamageOnLand - damage: - types: - Blunt: 1 - - type: DamageOtherOnHit - damage: - types: - Blunt: 1 - - type: Damageable - damageContainer: Inorganic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 2 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: desecration - - !type:SpillBehavior - solution: food - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: TrashOnEmpty - solution: food - type: entity - parent: ReagentContainerBase + parent: [ReagentPacketBase, ItemHeftyBase] id: ReagentContainerFlourSmall name: flour pack description: A pack of flour. Good for baking! @@ -96,32 +109,9 @@ reagents: - ReagentId: Flour Quantity: 20 - - type: DamageOnLand - damage: - types: - Blunt: 1 - - type: DamageOtherOnHit - damage: - types: - Blunt: 1 - - type: Damageable - damageContainer: Inorganic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 2 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: desecration - - !type:SpillBehavior - solution: food - - !type:DoActsBehavior - acts: [ "Destruction" ] - type: entity - parent: ReagentContainerBase + parent: ReagentPacketBase id: ReagentContainerCornmeal name: cornmeal bag description: A big bag of cornmeal. Good for cooking! @@ -136,7 +126,7 @@ Quantity: 50 - type: entity - parent: ReagentContainerBase + parent: ReagentPacketBase id: ReagentContainerCornmealSmall name: cornmeal pack description: A pack of cornmeal. Good for cooking! @@ -152,7 +142,7 @@ Quantity: 20 - type: entity - parent: ReagentContainerBase + parent: ReagentPacketBase id: ReagentContainerRice name: rice bag description: A big bag of rice. Good for cooking! @@ -167,7 +157,7 @@ Quantity: 50 - type: entity - parent: ReagentContainerBase + parent: ReagentPacketBase id: ReagentContainerRiceSmall name: rice pack description: A pack of rice. Good for cooking! @@ -183,7 +173,7 @@ Quantity: 20 - type: entity - parent: ReagentContainerBase + parent: ReagentPacketBase id: ReagentContainerSugar name: sugar bag description: A big bag of tasty spacey sugar. @@ -198,7 +188,7 @@ Quantity: 50 - type: entity - parent: ReagentContainerBase + parent: ReagentPacketBase id: ReagentContainerSugarSmall name: sugar pack description: A pack of tasty spacey sugar. @@ -216,7 +206,7 @@ # Milk - type: entity - parent: ReagentContainerBase + parent: ReagentPacketBase id: ReagentContainerMilk name: milk description: It's milk. White and nutritious goodness! @@ -232,7 +222,7 @@ Quantity: 50 - type: entity - parent: ReagentContainerBase + parent: ReagentPacketBase id: ReagentContainerMilkSoy name: soy milk description: It's soy milk. White and nutritious goodness! @@ -248,7 +238,7 @@ Quantity: 50 - type: entity - parent: ReagentContainerBase + parent: ReagentPacketBase id: ReagentContainerMilkOat name: oat milk description: It's oat milk. Tan and nutritious goodness! @@ -266,7 +256,7 @@ # Misc - type: entity - parent: ReagentContainerBase + parent: ReagentPacketBase id: ReagentContainerOliveoil name: olive oil description: Olive oil. From space olives presumably. @@ -282,7 +272,7 @@ Quantity: 20 - type: entity - parent: ReagentContainerBase + parent: ReagentPacketBase id: ReagentContainerMayo name: mayonnaise description: Bottle of mayonnaise. @@ -298,7 +288,7 @@ Quantity: 20 # - type: entity -# parent: ReagentContainerBase +# parent: ReagentPacketBase # id: ReagentContainerAllspice # name: all-spice # description: @@ -316,13 +306,12 @@ - type: entity abstract: true - parent: BaseItem + parent: FoodBase id: FoodBakingBase description: Used in various recipes. components: - type: Sprite sprite: Objects/Consumable/Food/ingredients.rsi - - type: Food - type: SolutionContainerManager solutions: food: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 4a5aa42130..1e3d42b26b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -548,7 +548,7 @@ - type: entity name: tomato - parent: FoodProduceBase + parent: [FoodProduceBase, ItemHeftyBase] id: FoodTomato description: I say to-mah-to, you say tom-mae-to. components: @@ -576,15 +576,6 @@ reagents: - ReagentId: JuiceTomato Quantity: 10 - - type: DamageOnLand - damage: - types: - Blunt: 1 - - type: DamageOtherOnHit - damage: - types: - Blunt: 1 - #Dignity: 25 - type: Damageable damageContainer: Biological - type: DamageOnHighSpeedImpact @@ -1329,7 +1320,7 @@ - type: entity name: watermelon - parent: FoodProduceBase + parent: [FoodProduceBase, ItemHeftyBase] id: FoodWatermelon description: Round green object that you can slice and eat. components: @@ -1358,14 +1349,6 @@ reagents: - ReagentId: JuiceWatermelon Quantity: 20 - - type: DamageOnLand - damage: - types: - Blunt: 1 - - type: DamageOtherOnHit - damage: - types: - Blunt: 1 - type: Damageable damageContainer: Biological - type: DamageOnHighSpeedImpact @@ -1531,4 +1514,4 @@ - type: Seed seedId: bungo - type: SpaceGarbage - - type: BadFood \ No newline at end of file + - type: BadFood