From db1b0a91442baefba89fa8aee02f59acadf0a3f8 Mon Sep 17 00:00:00 2001 From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Date: Sat, 1 Feb 2025 16:20:01 +0100 Subject: [PATCH] Separates frost oil into coldsauce and frost oil (#34458) --- Resources/Locale/en-US/reagents/frostoil.ftl | 3 ++ .../meta/consumable/food/condiments.ftl | 4 +-- .../meta/consumable/food/ingredients.ftl | 3 ++ .../Inventories/condiments.yml | 4 +-- .../Consumable/Food/Containers/condiments.yml | 6 ++-- .../Objects/Consumable/Food/produce.yml | 2 +- Resources/Prototypes/Hydroponics/seeds.yml | 2 +- .../Reagents/Consumable/Food/condiments.yml | 18 +++++------ .../Reagents/Consumable/Food/ingredients.yml | 30 +++++++++++++++++++ .../Prototypes/Recipes/Reactions/drinks.yml | 2 +- .../Prototypes/Recipes/Reactions/food.yml | 12 ++++++++ Resources/migration.yml | 3 ++ 12 files changed, 70 insertions(+), 19 deletions(-) create mode 100644 Resources/Locale/en-US/reagents/frostoil.ftl diff --git a/Resources/Locale/en-US/reagents/frostoil.ftl b/Resources/Locale/en-US/reagents/frostoil.ftl new file mode 100644 index 0000000000..f2181e7e4a --- /dev/null +++ b/Resources/Locale/en-US/reagents/frostoil.ftl @@ -0,0 +1,3 @@ +### Messages that pop up when metabolizing Frost Oil. + +frost-oil-effect-light-cold = You feel a slight cold tingle in your throat... \ No newline at end of file diff --git a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl index 809fbafffd..0fe7be6b37 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl @@ -7,8 +7,8 @@ reagent-desc-bbq-sauce = Hand wipes not included. reagent-name-cornoil = corn oil reagent-desc-cornoil = Corn oil, A delicious oil used in cooking. Made from corn. -reagent-name-frostoil = frostoil -reagent-desc-frostoil = Leaves the tongue numb in its passage. +reagent-name-coldsauce = coldsauce +reagent-desc-coldsauce = Leaves the tongue numb in its passage. reagent-name-horseradish-sauce = horseradish sauce reagent-desc-horseradish-sauce = Smelly horseradish sauce. diff --git a/Resources/Locale/en-US/reagents/meta/consumable/food/ingredients.ftl b/Resources/Locale/en-US/reagents/meta/consumable/food/ingredients.ftl index 4f5c5ae782..98dc73ecbc 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/food/ingredients.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/food/ingredients.ftl @@ -36,3 +36,6 @@ reagent-desc-oil = Used by chefs to cook. reagent-name-capsaicin-oil = Capsaicin Oil reagent-desc-capsaicin-oil = Capsaicin Oil is the ingredient found in different types of hot peppers. + +reagent-name-frost-oil = Frost Oil +reagent-desc-frost-oil = Frost Oil is the ingredient found in chilly peppers, a rare pepper mutation. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml index 70924a1e6e..d0304bd4ad 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml @@ -3,7 +3,7 @@ startingInventory: FoodCondimentPacketAstrotame: 5 FoodCondimentPacketBbq: 5 - FoodCondimentPacketFrostoil: 5 + FoodCondimentPacketColdsauce: 5 FoodCondimentPacketHorseradish: 5 FoodCondimentPacketHotsauce: 5 FoodCondimentPacketKetchup: 5 @@ -17,4 +17,4 @@ SpoonPlastic: 10 KnifePlastic: 10 FoodPlatePlastic: 10 - FoodPlateSmallPlastic: 10 \ No newline at end of file + FoodPlateSmallPlastic: 10 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml index bbe5cf244b..c7de98b4a4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -140,7 +140,7 @@ - type: entity parent: BaseFoodCondimentPacket - id: FoodCondimentPacketFrostoil + id: FoodCondimentPacketColdsauce name: coldsauce description: Coldsauce. Leaves the tongue numb in its passage. components: @@ -149,7 +149,7 @@ food: maxVol: 10 reagents: - - ReagentId: Frostoil + - ReagentId: Coldsauce Quantity: 10 - type: Icon state: packet-frostoil @@ -375,7 +375,7 @@ solutions: food: reagents: - - ReagentId: Frostoil + - ReagentId: Coldsauce Quantity: 30 - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 877f3d86f1..ce5aa2eef5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1386,7 +1386,7 @@ reagents: - ReagentId: Nutriment Quantity: 4 - - ReagentId: Frostoil + - ReagentId: FrostOil Quantity: 10 - ReagentId: Vitamin Quantity: 4 diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 7349f3c3d7..de7be63d2b 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1136,7 +1136,7 @@ idealLight: 9 idealHeat: 298 chemicals: - Frostoil: + FrostOil: Min: 1 Max: 10 PotencyDivisor: 10 diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml index 4cc2810792..f419605307 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml @@ -18,6 +18,15 @@ color: darkred recognizable: true +- type: reagent + id: Coldsauce + name: reagent-name-coldsauce + group: Foods + desc: reagent-desc-coldsauce + physicalDesc: reagent-physical-desc-cold + flavor: cold + color: skyblue + - type: reagent id: Cornoil name: reagent-name-cornoil @@ -28,15 +37,6 @@ color: yellow recognizable: true -- type: reagent - id: Frostoil - name: reagent-name-frostoil - group: Foods - desc: reagent-desc-frostoil - physicalDesc: reagent-physical-desc-cold - flavor: cold - color: skyblue - - type: reagent id: HorseradishSauce name: reagent-name-horseradish-sauce diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml index d6f6305539..d2cf44e6d6 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml @@ -274,3 +274,33 @@ - !type:AdjustReagent reagent: Nutriment amount: 0.1 + +- type: reagent + id: FrostOil + name: reagent-name-frost-oil + group: Foods + desc: reagent-desc-frost-oil + physicalDesc: reagent-physical-desc-oily + flavor: cold + color: skyblue + metabolisms: + Food: + effects: + - !type:AdjustReagent + reagent: Nutriment #Oils enhance nutrition + amount: 0.75 + Poison: + effects: + - !type:AdjustTemperature + amount: -250 # thermal energy, not temp + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 5 + damage: + types: + Cold: 1 + - !type:PopupMessage + type: Local + messages: [ "frost-oil-effect-light-cold" ] + probability: 0.2 diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index 790a236d5c..84d79466b9 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -519,7 +519,7 @@ reactants: Beer: amount: 10 - Frostoil: + FrostOil: amount: 1 products: IcedBeer: 10 diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 7d524a9c7a..6d32948f89 100644 --- a/Resources/Prototypes/Recipes/Reactions/food.yml +++ b/Resources/Prototypes/Recipes/Reactions/food.yml @@ -284,6 +284,18 @@ products: Hotsauce: 3 +- type: reaction + id: CookingColdsauce + reactants: + JuiceTomato: + amount: 1 + TableSalt: + amount: 1 + FrostOil: + amount: 1 + products: + Coldsauce: 3 + - type: reaction id: CookingVinegar reactants: diff --git a/Resources/migration.yml b/Resources/migration.yml index a6aa44b326..b5e6294774 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -544,3 +544,6 @@ DrinkIrishCarBomb: DrinkIrishSlammer #2025-01-06 ClothingMaskSexyClown: ClothingMaskBlushingClown ClothingMaskSexyMime: ClothingMaskBlushingMime + +# 2025-01-27 +FoodCondimentPacketFrostoil: FoodCondimentPacketColdsauce