Simple solvent & Dye temperature / orgnization

2025-02-07 03:04:33 +13:00
parent d70c6eddaa
commit 0da463d2f2
14 changed files with 93 additions and 83 deletions
--- 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.

--- 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 = Способен залечивать все виды физических повреждений.

--- 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 

--- 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
--- 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
--- 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
--- 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
--- 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:
--- 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
--- 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
--- 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
+    CP14SaltedWater: 0.5
+
+- type: reaction
+  id: CP14SimpleSolvent
+  minTemp: 420 
+  reactants:
+    CP14SaltedWater:
+      ammount: 0.5
+    CP14GroundQuartz:
+      amount: 0.5
+  products:
+    CP14BasicEffectSimpleBase: 1
--- 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
--- 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
--- 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
+      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