From 94455f55f272688f4a02e7c6a0c3156186c21c8f Mon Sep 17 00:00:00 2001 From: Kit Date: Fri, 4 Jul 2025 10:29:20 -0400 Subject: [PATCH] Saturating and moisture recipes (#1496) * Bestia Essence * Target Recipies * Essence bestia stuff * Magic type fix --- .../en-US/_CP14/magicEnergy/magic-types.ftl | 1 + .../reagents/meta/thaumaturgy/essence.ftl | 5 ++- .../ru-RU/_CP14/magicEnergy/magic-types.ftl | 1 + .../reagents/meta/thaumaturgy/essence.ftl | 3 ++ .../Objects/Specific/Thaumaturgy/essence.yml | 15 +++++++ .../Prototypes/_CP14/MagicTypes/magic.yml | 6 +++ .../_CP14/Reagents/magic_essence.yml | 14 ++++++- .../Thaumaturgy/essence_combining.yml | 13 +++++++ .../target_effect_creation_on_water.yml | 39 ++++++++++++++++++- .../AlchemistTabs/AlchemyTabs/Essence.xml | 1 + .../AlchemistTabs/AlchemyTabs/Essence.xml | 1 + 11 files changed, 95 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/_CP14/magicEnergy/magic-types.ftl b/Resources/Locale/en-US/_CP14/magicEnergy/magic-types.ftl index caa5e6cf69..6213f563df 100644 --- a/Resources/Locale/en-US/_CP14/magicEnergy/magic-types.ftl +++ b/Resources/Locale/en-US/_CP14/magicEnergy/magic-types.ftl @@ -19,6 +19,7 @@ cp14-essence-crystal = Vitreus # Complex tier 2 cp14-essence-magic = Praecantatio +cp14-essence-beast = Bestia cp14-magic-manacost = Manacost cp14-magic-essence = Magic type diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/essence.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/essence.ftl index e6d8f0c5dd..e6287dd967 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/essence.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/essence.ftl @@ -24,7 +24,7 @@ cp14-reagent-name-essence-frost = Gelum essence cp14-reagent-desc-essence-frost = The liquid embodiment of the elements of ice, frost and cold. cp14-reagent-name-essence-light = Lux essence -cp14-reagent-desc-essence-light = The liquid embodiment of the elements of light. +cp14-reagent-desc-essence-light = The liquid embodiment of the element of light. cp14-reagent-name-essence-motion = Motus essence cp14-reagent-desc-essence-motion = The liquid embodiment of the elements of movement and animation. @@ -51,3 +51,6 @@ cp14-reagent-desc-essence-crystal = The liquid embodiment of the elements of gla cp14-reagent-name-essence-magic = Praecantatio essence cp14-reagent-desc-essence-magic = The liquid embodiment of the elements of magic, enchantment and sorcery. + +cp14-reagent-name-essence-beast = Bestia essence +cp14-reagent-desc-essence-beast = The liquid embodiment of the element of animals. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/magicEnergy/magic-types.ftl b/Resources/Locale/ru-RU/_CP14/magicEnergy/magic-types.ftl index 1ea00c1627..6a044490f3 100644 --- a/Resources/Locale/ru-RU/_CP14/magicEnergy/magic-types.ftl +++ b/Resources/Locale/ru-RU/_CP14/magicEnergy/magic-types.ftl @@ -19,6 +19,7 @@ cp14-essence-crystal = Vitreus # Complex tier 2 cp14-essence-magic = Praecantatio +cp14-essence-beast = Bestia cp14-magic-manacost = Затраты маны cp14-magic-essence = Тип магии diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/essence.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/essence.ftl index 700fc97388..d4a50541ba 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/essence.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/essence.ftl @@ -51,3 +51,6 @@ cp14-reagent-desc-essence-crystal = Жидкое воплощение стихи cp14-reagent-name-essence-magic = Эссенция Praecantatio cp14-reagent-desc-essence-magic = Жидкое воплощение магии, чар и колдовства. + +cp14-reagent-name-essence-beast = Эссенция Bestia +cp14-reagent-desc-essence-beast = Жидкое воплощение животных. \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/essence.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/essence.yml index cb0bd37830..d350be732b 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/essence.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/essence.yml @@ -287,3 +287,18 @@ reagents: - ReagentId: CP14EssenceMagic Quantity: 1 + +- type: entity + parent: CP14BaseEssence + id: CP14EssenceBeast + name: bestia + components: + - type: Sprite + color: "#5c3c0f" + - type: SolutionContainerManager + solutions: + essence: + maxVol: 1 + reagents: + - ReagentId: CP14EssenceBeast + Quantity: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/MagicTypes/magic.yml b/Resources/Prototypes/_CP14/MagicTypes/magic.yml index 0b1dbaa1b9..aadc7e6393 100644 --- a/Resources/Prototypes/_CP14/MagicTypes/magic.yml +++ b/Resources/Prototypes/_CP14/MagicTypes/magic.yml @@ -99,3 +99,9 @@ name: cp14-essence-magic color: "#5497d6" essenceProto: CP14EssenceMagic + +- type: magicType + id: Beast + name: cp14-essence-beast + color: "#5c3c0f" + essenceProto: CP14EssenceBeast \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Reagents/magic_essence.yml b/Resources/Prototypes/_CP14/Reagents/magic_essence.yml index c4cd3539be..d8b067af45 100644 --- a/Resources/Prototypes/_CP14/Reagents/magic_essence.yml +++ b/Resources/Prototypes/_CP14/Reagents/magic_essence.yml @@ -216,4 +216,16 @@ pricePerUnit: 0.40 # From Blue Amanita (0.5) or craft (Void + Energia → 2) tileReactions: - !type:CreateEntityTileReaction - entity: CP14EssenceMagic \ No newline at end of file + entity: CP14EssenceMagic + +- type: reagent + parent: CP14EssenceBaseT2 + id: CP14EssenceBeast + name: cp14-reagent-name-essence-beast + desc: cp14-reagent-desc-essence-beast + group: CP14MagicEssenceT2 + color: "#5c3c0f" + pricePerUnit: 0.40 # craft (motion + life → 2) + tileReactions: + - !type:CreateEntityTileReaction + entity: CP14EssenceBeast diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/essence_combining.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/essence_combining.yml index 44ab9b5b81..0e92dba1af 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/essence_combining.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/essence_combining.yml @@ -142,3 +142,16 @@ - !type:CP14AffectSolutionTemperature addTemperature: -150 +- type: reaction + id: CP14EssenceBeast + minTemp: 600 + reactants: + CP14EssenceMotion: + amount: 1 + CP14EssenceLife: + amount: 1 + products: + CP14EssenceBeast: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_water.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_water.yml index 68d9cab69a..0e777b9597 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_water.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_water.yml @@ -250,8 +250,43 @@ - !type:CP14AffectSolutionTemperature addTemperature: -150 -# CP14BasicEffectSatiateHunger -# CP14BasicEffectSatiateThirst +- type: reaction + id: CP14WaterBrewingSatiateHunger + minTemp: 500 + priority: 2 + reactants: + CP14EssenceBeast: + amount: 2 + CP14EssenceLife: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectSatiateHunger: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingSatiateThirst + minTemp: 500 + priority: 1 + reactants: + CP14EssenceWater: + amount: 1 + CP14EssenceLife: + amount: 1 + Water: + amount: 2 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectRainbow: 1 + CP14BasicEffectSatiateThirst: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 - type: reaction id: CP14WaterBrewingHealMana diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/AlchemistTabs/AlchemyTabs/Essence.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/AlchemistTabs/AlchemyTabs/Essence.xml index cf00de72b8..b4c4b4f6c5 100644 --- a/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/AlchemistTabs/AlchemyTabs/Essence.xml +++ b/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/AlchemistTabs/AlchemyTabs/Essence.xml @@ -35,6 +35,7 @@ Minimal units of being. By obtaining them from splitting items and precursers, a ## Second Compound Essences: + diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/AlchemistTabs/AlchemyTabs/Essence.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/AlchemistTabs/AlchemyTabs/Essence.xml index 4b70c5f274..cc344bc145 100644 --- a/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/AlchemistTabs/AlchemyTabs/Essence.xml +++ b/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/AlchemistTabs/AlchemyTabs/Essence.xml @@ -34,6 +34,7 @@ ## Эссенции второго сложения: +