From a7ac4a83c438ff0904ad0adc784d693f47afa213 Mon Sep 17 00:00:00 2001 From: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com> Date: Mon, 11 Sep 2023 11:16:26 +0300 Subject: [PATCH] Changed produce spills into dynamic from hardcoded. (#19980) --- .../Entities/Objects/Consumable/Food/egg.yml | 5 ++--- .../Objects/Consumable/Food/ingredients.yml | 14 ++++---------- .../Objects/Consumable/Food/produce.yml | 18 +++++++----------- Resources/Prototypes/Hydroponics/seeds.yml | 8 ++++++-- 4 files changed, 19 insertions(+), 26 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml index 6a7af9d132..05cae79b16 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml @@ -53,14 +53,13 @@ - !type:PlaySoundBehavior sound: collection: desecration + - !type:SpillBehavior + solution: food - !type:SpawnEntitiesBehavior spawn: Eggshells: min: 1 max: 1 - PuddleEgg: - min: 1 - max: 2 # Wow double-yolk you're so lucky! - !type:DoActsBehavior acts: [ "Destruction" ] diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 4d636e146f..22d5fbf14d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -73,11 +73,8 @@ - !type:PlaySoundBehavior sound: collection: desecration - - !type:SpawnEntitiesBehavior - spawn: - PuddleFlour: - min: 1 - max: 1 + - !type:SpillBehavior + solution: food - !type:DoActsBehavior acts: [ "Destruction" ] - type: TrashOnEmpty @@ -117,11 +114,8 @@ - !type:PlaySoundBehavior sound: collection: desecration - - !type:SpawnEntitiesBehavior - spawn: - PuddleFlour: - min: 1 - max: 1 + - !type:SpillBehavior + solution: food - !type:DoActsBehavior acts: [ "Destruction" ] diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 3dbff39133..bc0965008d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -460,8 +460,10 @@ maxVol: 14 reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 7 - ReagentId: Vitamin + Quantity: 3 + - ReagentId: Water Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/tomato.rsi @@ -498,11 +500,8 @@ - !type:PlaySoundBehavior sound: collection: desecration - - !type:SpawnEntitiesBehavior - spawn: - PuddleTomato: - min: 1 - max: 1 + - !type:SpillBehavior + solution: food - !type:DoActsBehavior acts: [ "Destruction" ] @@ -1114,11 +1113,8 @@ - !type:PlaySoundBehavior sound: collection: desecration - - !type:SpawnEntitiesBehavior - spawn: - PuddleWatermelon: - min: 1 - max: 1 + - !type:SpillBehavior + solution: food - !type:DoActsBehavior acts: [ "Destruction" ] - type: SliceableFood diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 8c8abe478d..aa18088766 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -306,9 +306,13 @@ chemicals: Nutriment: Min: 1 - Max: 10 - PotencyDivisor: 10 + Max: 7 + PotencyDivisor: 14 Vitamin: + Min: 1 + Max: 3 + PotencyDivisor: 33 + Water: Min: 1 Max: 4 PotencyDivisor: 25 -- 2.51.2