diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl index 06212b5e39..89e650df1f 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl @@ -4,6 +4,9 @@ cp14-reagent-desc-basic-impurity = The natural, undesirable by products of alche cp14-reagent-name-basic-empty = Empty solution cp14-reagent-desc-basic-empty = Natural solvent. Essentially a useless liquid that dilutes useful effects. Getting rid of it will give you much more concentrated solutions. +cp14-reagent-name-basic-simplebase = Simple solvent +cp14-reagent-desc-basic-simplebase = Simple solvent, often used in brewing basic potions in place of water or more specialized solvents. + cp14-reagent-name-basic-heal-brute = Healing solution cp14-reagent-desc-basic-heal-brute = Can heal all types of physical damage. diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl index 14e52e3bd6..75b6b2d72d 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl @@ -4,6 +4,9 @@ cp14-reagent-desc-basic-impurity = Естественные, нежелател cp14-reagent-name-basic-empty = Пустой раствор cp14-reagent-desc-basic-empty = Природный растворитель. По сути бесполезная жидкость, разбавляющая полезные эффекты. Избавившись от нее, вы получите куда более концентрированные растворы. +cp14-reagent-name-basic-simplebase = Простой растворитель +cp14-reagent-desc-basic-simplebase = Простой растворитель, часто используемый при приготовлении базовых зелий вместо воды или более специализированных растворителей. + cp14-reagent-name-basic-heal-brute = Лечебный раствор cp14-reagent-desc-basic-heal-brute = Способен залечивать все виды физических повреждений. diff --git a/Resources/Prototypes/_CP14/Reagents/basic-effects.yml b/Resources/Prototypes/_CP14/Reagents/basic-effects.yml index 52b867fc74..16ee97006e 100644 --- a/Resources/Prototypes/_CP14/Reagents/basic-effects.yml +++ b/Resources/Prototypes/_CP14/Reagents/basic-effects.yml @@ -30,6 +30,15 @@ color: "#858585" physicalDesc: cp14-reagent-physical-desc-colorless +- type: reagent + id: CP14BasicEffectSimplebase + name: cp14-reagent-name-basic-simplebase + desc: cp14-reagent-desc-basic-simplebase + group: CP14BasicEffect + flavor: CP14Salty + color: "#AFBFBF" + physicalDesc: cp14-reagent-physical-desc-powdery + # T1 / Simple or Basic solutions # Have simple effects, shouldn't be able to replace their occupational diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/agaric.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/agaric.yml index a22e6bfe6a..a24f249607 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/agaric.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/agaric.yml @@ -3,12 +3,12 @@ - type: reaction id: CP14AgaricShroomBrewing - minTemp: 500 + minTemp: 530 priority: 2 reactants: CP14AgaricMushroom: amount: 1 - CP14GroundQuartz: + CP14BasicEffectSimpleBase: amount: 1 products: CP14BasicEffectEmpty: 0.75 diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/air_lily.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/air_lily.yml index 176193ecd5..a00c41419e 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/air_lily.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/air_lily.yml @@ -2,12 +2,12 @@ - type: reaction id: CP14AirLilyBrewing - minTemp: 500 + minTemp: 530 priority: 2 reactants: CP14AirLily: amount: 1 - CP14GroundQuartz: + CP14BasicEffectSimpleBase: amount: 1 products: CP14BasicEffectEmpty: 1 diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/bloodflower.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/bloodflower.yml index 1e214e323a..398543977a 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/bloodflower.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/bloodflower.yml @@ -1,24 +1,6 @@ # Idea: # BloodFlower is a special reagent that can react with essence to create simple solutions -# Red color dye - -- type: reaction - id: CP14BloodFlowerBrewing - impact: Low - minTemp: 393 - priority: 1 - quantized: true - conserveEnergy: false - reactants: - CP14BloodFlowerSap: - amount: 10 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -50 - - !type:CreateEntityReactionEffect - entity: CP14DyeRed - # Splitting - type: reaction diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/blue_amanita.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/blue_amanita.yml index f4e8ffbcdb..f7f720d7e4 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/blue_amanita.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/blue_amanita.yml @@ -1,31 +1,13 @@ - -# Blue color dye - -- type: reaction - id: CP14BlueAmanitaColor - minTemp: 393 - priority: 1 - quantized: true - conserveEnergy: false - reactants: - CP14BlueAmanita: - amount: 10 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -50 - - !type:CreateEntityReactionEffect - entity: CP14DyeBlue - # Simple brewing - type: reaction id: CP14BlueAmanitaBrewing - minTemp: 500 + minTemp: 530 priority: 2 reactants: CP14BlueAmanita: amount: 1 - CP14GroundQuartz: + CP14BasicEffectSimpleBase: amount: 1 products: CP14BasicEffectEmpty: 1 diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_slime.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_slime.yml index f1ef6f76ef..e4a5bf1bb0 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_slime.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_slime.yml @@ -13,7 +13,7 @@ CP14ChromiumSlime: amount: 1 products: - CP14BasicEffectEmpty: 1 + CP14BasicEffectSimpleBase: 1 effects: - !type:CP14InverseEffect inversion: @@ -49,7 +49,7 @@ - type: reaction id: CP14ChromiumBrewing - minTemp: 500 + minTemp: 650 priority: 2 reactants: CP14ChromiumSlime: diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/dayflin.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/dayflin.yml index 35b8be857d..0dafa3f30d 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/dayflin.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/dayflin.yml @@ -1,33 +1,14 @@ - -# Yellow color dye - -- type: reaction - id: CP14DayflinDyeBrewing - impact: Low - minTemp: 500 - priority: 1 - quantized: true - conserveEnergy: false - reactants: - CP14YellowDayflinPulp: - amount: 10 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -250 - - !type:CreateEntityReactionEffect - entity: CP14DyeYellow - # Simple brewing - type: reaction id: CP14DayflinBrewing impact: Low - minTemp: 500 + minTemp: 530 priority: 2 reactants: CP14YellowDayflinPulp: amount: 1 - CP14GroundQuartz: + CP14BasicEffectSimpleBase: amount: 1 products: CP14BasicEffectEmpty: 0.75 diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/essense.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/essense.yml index e86549d258..282bfa6f2b 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/essense.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/essense.yml @@ -10,7 +10,7 @@ reactants: CP14Blood: amount: 0.75 - CP14GroundQuartz: + CP14AlchemistSalt: amount: 0.25 products: CP14AlchemizedBlood: 0.75 @@ -26,7 +26,7 @@ reactants: CP14BloodTiefling: amount: 0.75 - CP14GroundQuartz: + CP14AlchemistSalt: amount: 0.25 products: CP14AlchemizedBloodTiefling: 0.75 @@ -42,7 +42,7 @@ reactants: CP14BloodElf: amount: 0.75 - CP14GroundQuartz: + CP14AlchemistSalt: amount: 0.25 products: CP14AlchemizedBloodElf: 0.75 @@ -58,7 +58,7 @@ reactants: CP14BloodGoblin: amount: 0.75 - CP14GroundQuartz: + CP14AlchemistSalt: amount: 0.25 products: CP14AlchemizedBloodGoblin: 0.75 @@ -78,7 +78,7 @@ amount: 0.75 CP14BloodFlowerSap: amount: 0.25 - CP14GroundQuartz: + CP14AlchemistSalt: amount: 0.25 products: CP14Essense: 1 @@ -96,7 +96,7 @@ amount: 0.75 CP14BloodFlowerSap: amount: 0.25 - CP14GroundQuartz: + CP14AlchemistSalt: amount: 0.25 products: CP14EssenseTiefling: 1 @@ -114,7 +114,7 @@ amount: 0.75 CP14BloodFlowerSap: amount: 0.25 - CP14GroundQuartz: + CP14AlchemistSalt: amount: 0.25 products: CP14EssenseElf: 1 @@ -132,7 +132,7 @@ amount: 0.75 CP14BloodFlowerSap: amount: 0.25 - CP14GroundQuartz: + CP14AlchemistSalt: amount: 0.25 products: CP14EssenseGoblin: 1 diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/general.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/general.yml index 5baf51a58b..f9200f8a59 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/general.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/general.yml @@ -1,6 +1,6 @@ - type: reaction id: CP14OverbrewingFail - minTemp: 800 + minTemp: 780 reactants: CP14BasicEffectEmpty: amount: 1 @@ -33,7 +33,7 @@ CP14GroundQuartz: amount: 0.5 products: - CP14AlchemistSalt: 0.5 + CP14AlchemistSalt: 0.75 effects: - !type:CP14AffectSolutionTemperature addTemperature: -300 @@ -47,4 +47,15 @@ CP14AlchemistSalt: amount: 0.5 products: - CP14SaltedWater: 0.5 \ No newline at end of file + CP14SaltedWater: 0.5 + +- type: reaction + id: CP14SimpleSolvent + minTemp: 420 + reactants: + CP14SaltedWater: + ammount: 0.5 + CP14GroundQuartz: + amount: 0.5 + products: + CP14BasicEffectSimpleBase: 1 diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/lumishroom.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/lumishroom.yml index c9531bf944..a59aa95663 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/lumishroom.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/lumishroom.yml @@ -3,12 +3,12 @@ - type: reaction id: CP14LumiMushroomBrewing - minTemp: 500 + minTemp: 530 priority: 2 reactants: CP14LumiMushroom: amount: 1 - CP14GroundQuartz: + CP14BasicEffectSimpleBase: amount: 1 products: CP14BasicEffectEmpty: 0.75 diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/wild_sage.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/wild_sage.yml index 54a9a4c7d9..67b716e949 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/wild_sage.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/wild_sage.yml @@ -1,14 +1,13 @@ - # Simple brewing - type: reaction id: CP14WildSageSapBrewing - minTemp: 500 + minTemp: 530 priority: 2 reactants: CP14WildSageSap: amount: 1 - CP14GroundQuartz: + CP14BasicEffectSimpleBase: amount: 1 products: CP14BasicEffectEmpty: 0.75 diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/dye_brewing.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/dye_brewing.yml index efaca04057..5b8402d7c1 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/dye_brewing.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/dye_brewing.yml @@ -1,12 +1,52 @@ +# Red color dye + +- type: reaction + id: CP14BloodFlowerBrewing + impact: Low + minTemp: 393 + priority: 1 + quantized: true + conserveEnergy: false + reactants: + CP14BloodFlowerSap: + amount: 10 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -50 + - !type:CreateEntityReactionEffect + entity: CP14DyeRed + +# Yellow color dye + - type: reaction id: CP14YellowDayflinBrewing impact: Low quantized: true conserveEnergy: false - minTemp: 500 + minTemp: 393 reactants: CP14YellowDayflinPulp: amount: 10 effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -50 + effects: - !type:CreateEntityReactionEffect - entity: CP14DyeYellow \ No newline at end of file + entity: CP14DyeYellow + +# Blue color dye + +- type: reaction + id: CP14BlueAmanitaColor + minTemp: 393 + priority: 1 + quantized: true + conserveEnergy: false + reactants: + CP14BlueAmanita: + amount: 10 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -50 + - !type:CreateEntityReactionEffect + entity: CP14DyeBlue