From 5523e016f4af4f4574c3e26757e7dbbb09de457f Mon Sep 17 00:00:00 2001 From: Alzore <140123969+Blackern5000@users.noreply.github.com> Date: Fri, 5 Apr 2024 16:06:12 -0500 Subject: [PATCH] Dionae now bleed sap, and this can be used to make syrup. (#25748) * SapAndSyrup * centrifug * morewatervapor * whyisitnotpushing * nymphs * lessrealmorefun --- .../Locale/en-US/reagents/meta/biological.ftl | 3 +++ .../meta/consumable/food/condiments.ftl | 3 +++ .../Prototypes/Entities/Mobs/NPCs/animals.yml | 2 +- .../Entities/Mobs/Species/diona.yml | 4 +-- .../Reagents/Consumable/Food/condiments.yml | 24 +++++++++++++++++ Resources/Prototypes/Reagents/biological.yml | 26 +++++++++++++++++++ .../Recipes/Reactions/biological.yml | 13 ++++++++++ .../Recipes/Reactions/single_reagent.yml | 13 ++++++++++ 8 files changed, 85 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/reagents/meta/biological.ftl b/Resources/Locale/en-US/reagents/meta/biological.ftl index a320bbdcb3..d8f0f6c413 100644 --- a/Resources/Locale/en-US/reagents/meta/biological.ftl +++ b/Resources/Locale/en-US/reagents/meta/biological.ftl @@ -7,6 +7,9 @@ reagent-desc-insect-blood = Okay, this is really gross. It almost looks.. alive? reagent-name-slime = slime reagent-desc-slime = You thought this was gradient blood at first, but you were mistaken. +reagent-name-sap = sap +reagent-desc-sap = Sticky, sweet tree blood. + reagent-name-hemocyanin-blood = blue blood reagent-desc-hemocyanin-blood = Contains copper as opposed to iron which gives it a distinct blue color. 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 38cd16b01c..809fbafffd 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl @@ -39,3 +39,6 @@ reagent-desc-soysauce = A salty soy-based flavoring. reagent-name-table-salt = table salt reagent-desc-table-salt = Commonly known as salt, Sodium Chloride is often used to season food or kill borers instantly. + +reagent-name-syrup = syrup +reagent-desc-syrup = Delicious syrup made from tree sap, somehow stickier than glue. diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 3a56c4df3a..dc469ddea4 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -3166,7 +3166,7 @@ - type: InventorySlots - type: Strippable - type: Bloodstream - bloodReagent: Water + bloodReagent: Sap bloodMaxVolume: 60 - type: UserInterface interfaces: diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml index 7f726e2f2c..dbdaa9c7e3 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml @@ -24,14 +24,14 @@ damageOverlayGroups: Brute: sprite: Mobs/Effects/brute_damage.rsi - color: "#75b1f0" + color: "#cd7314" - type: Butcherable butcheringType: Spike spawned: - id: FoodMeatPlant amount: 5 - type: Bloodstream - bloodReagent: Water + bloodReagent: Sap - type: Reactive groups: Flammable: [ Touch ] diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml index 8fbfd3cd64..4cc2810792 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml @@ -164,3 +164,27 @@ # eating salt on its own kinda sucks, kids - !type:SatiateThirst factor: -0.5 + +- type: reagent + id: Syrup + name: reagent-name-syrup + group: Foods + desc: reagent-desc-syrup + flavor: sweet + color: "#fb7125" + recognizable: true + physicalDesc: reagent-physical-desc-sticky + slippery: false + viscosity: 0.55 #Start using syrup to attach your remote recievers to your microwaves! + tileReactions: + - !type:SpillTileReaction + metabolisms: + Food: + # 12 diona blood for 1 unit of syrup, this stuff better be worthwhile. + effects: + - !type:SatiateHunger + factor: 6.0 #Stronger than cookedramen + footstepSound: + collection: FootstepBlood + params: + volume: 6 diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml index c24c073f03..0c53ae10fd 100644 --- a/Resources/Prototypes/Reagents/biological.yml +++ b/Resources/Prototypes/Reagents/biological.yml @@ -82,6 +82,32 @@ params: volume: 6 +- type: reagent + id: Sap + name: reagent-name-sap + group: Biological + desc: reagent-desc-sap + flavor: sweet + color: "#cd7314" + recognizable: true + physicalDesc: reagent-physical-desc-sticky + slippery: false + viscosity: 0.10 + tileReactions: + - !type:SpillTileReaction + metabolisms: + Food: + # Sweet! + effects: + - !type:SatiateHunger + factor: 1 + - !type:SatiateThirst + factor: 1 + footstepSound: + collection: FootstepBlood + params: + volume: 6 + - type: reagent parent: Blood id: CopperBlood diff --git a/Resources/Prototypes/Recipes/Reactions/biological.yml b/Resources/Prototypes/Recipes/Reactions/biological.yml index 4e94b8d85b..604211466f 100644 --- a/Resources/Prototypes/Recipes/Reactions/biological.yml +++ b/Resources/Prototypes/Recipes/Reactions/biological.yml @@ -25,6 +25,19 @@ Water: 4 Nitrogen: 1 + +- type: reaction + id: SapBloodBreakdown + source: true + requiredMixerCategories: + - Centrifuge + reactants: + Sap: + amount: 10 + products: + Water: 9 + Sugar: 1 + - type: reaction id: CopperBloodBreakdown source: true diff --git a/Resources/Prototypes/Recipes/Reactions/single_reagent.yml b/Resources/Prototypes/Recipes/Reactions/single_reagent.yml index 160353219b..46fe35415f 100644 --- a/Resources/Prototypes/Recipes/Reactions/single_reagent.yml +++ b/Resources/Prototypes/Recipes/Reactions/single_reagent.yml @@ -20,6 +20,19 @@ products: EggCooked: 0.5 +- type: reaction + id: SapBoiling + impact: Low + minTemp: 377 + reactants: + Sap: + amount: 1.2 + effects: + - !type:CreateGas + gas: WaterVapor + products: + Syrup: 0.1 #12:1 sap to syruop + # Holy - TODO: make it so only the chaplain can use the bible to start these reactions, not anyone with a bible - type: reaction -- 2.52.0