Merge pull request #951 from KiwiHawk/tech-shuffle

Tech shuffle
Arch666Angel · Dec 14, 2023 · 1c8a8f9 · 1c8a8f9
2 parents 12b1b94 + 0573e6e
commit 1c8a8f9
Show file tree

Hide file tree

Showing 19 changed files with 74 additions and 134 deletions.
diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-arboretum.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-arboretum.lua
@@ -77,6 +77,11 @@ else
 end
 
 if angelsmods.triggers.paper then
+  OV.add_unlock("sodium-processing-1", "solid-sodium-hypochlorite-decomposition")
+  OV.remove_unlock("chlorine-processing-3", "solid-salt-separation")
+  OV.add_unlock("sodium-processing-1", "solid-salt-separation")
+  OV.add_prereq("sodium-processing-1", "angels-metallurgy-2")
+  OV.add_prereq("sodium-processing-1", "bio-paper-2")
 else
   OV.hide_recipe({
     "solid-wood-pulp",

diff --git a/angelsbioprocessing/prototypes/technology/bio-processing-alien.lua b/angelsbioprocessing/prototypes/technology/bio-processing-alien.lua
@@ -8,8 +8,7 @@ data:extend({
     order = "c-a",
     prerequisites = {
       "bio-processing-brown",
-      "bio-nutrient-paste",
-      "chlorine-processing-1",
+      "chlorine-processing-2",
     },
     effects = {
       {

diff --git a/angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua b/angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua
@@ -611,10 +611,9 @@ data:extend({
     icon_size = 128,
     order = "c-a",
     prerequisites = {
-      "angels-metallurgy-2",
       "angels-nitrogen-processing-2",
       "bio-paper-1",
-      "sodium-processing-1",
+      "chlorine-processing-1",
     },
     effects = {
       {
@@ -633,10 +632,6 @@ data:extend({
         type = "unlock-recipe",
         recipe = "liquid-pulping-liquor",
       },
-      {
-        type = "unlock-recipe",
-        recipe = "solid-sodium-hypochlorite-decomposition",
-      },
     },
     unit = {
       count = 50,

diff --git a/angelsbioprocessing/prototypes/technology/crop-farming.lua b/angelsbioprocessing/prototypes/technology/crop-farming.lua
@@ -167,6 +167,7 @@ data:extend({
     icon_size = 128,
     order = "c-a",
     prerequisites = {
+      "automation-2",
       "bio-farm-1",
       "angels-nitrogen-processing-2",
     },

diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua
@@ -316,7 +316,6 @@ if angelsmods.industries.tech then
     --small fixes
     AI.pack_replace("follower-robot-count-1", "green", "orange")
     AI.pack_replace("follower-robot-count-2", "green", "orange")
-    OV.remove_prereq("nitroglycerin-processing", "chlorine-processing-2") -- no clue why it works nowhere else...
     OV.remove_prereq("walking-vehicle", "production-science-pack")
   end
 

diff --git a/angelsindustries/prototypes/technology/components-batteries-technology.lua b/angelsindustries/prototypes/technology/components-batteries-technology.lua
@@ -113,7 +113,7 @@ if angelsmods.industries.components then
         "thermal-water-extraction",
         "bio-processing-green",
         "angels-components-batteries-2",
-        "gas-steam-cracking-1",
+        "steam-cracking-1",
       },
       effects = {
         {

diff --git a/angelspetrochem/changelog.txt b/angelspetrochem/changelog.txt
@@ -4,6 +4,7 @@ Date: ??.??.????
   Changes:
     - Compatibility with Bob's changes (911)
     - Split tech Sodium processing into Sodium processing 1 and Sodium processing 2 (922)
+    - Combined techs Oil Steam cracking and Gas Steam Cracking (951)
   Bugfixes:
     - Fixed recipe order of carbon products to correctly display in helmod
     - Fixed fertiliser not being craftable in mod configurations (924)

diff --git a/angelspetrochem/locale/en/petrochem.cfg b/angelspetrochem/locale/en/petrochem.cfg
@@ -455,8 +455,7 @@ angels-advanced-chemistry=Advanced chemistry
 angels-coal-processing=Coal processing
 angels-coal-cracking=Coal cracking
 gas-synthesis=Synthesis gas processing
-gas-steam-cracking=Gas steam cracking
-oil-steam-cracking=Oil steam cracking
+steam-cracking=Steam cracking
 plastic=Plastic
 resins=Resins
 resin=Resin
@@ -485,8 +484,7 @@ angels-advanced-chemistry=Selective chemical conversions using catalysts.
 angels-coal-processing=Purification and use of coke as well as carbon.
 angels-coal-cracking=Liquefaction and gasification of coal.
 gas-synthesis=De novo synthesis of hydrocarbons from base chemicals.
-gas-steam-cracking=Re-combination of short-chained hydrocarbons.
-oil-steam-cracking=Cracking down of long-chained hydrocarbons.
+steam-cracking=Steam cracking of hydrocarbons.
 plastic=Various sources for plastic.
 resins=Synthetic polymeric materials that can be molded into protective composition.
 resin=Various sources for resins.

diff --git a/angelspetrochem/prototypes/global-override/bobplates.lua b/angelspetrochem/prototypes/global-override/bobplates.lua
@@ -83,6 +83,7 @@ if mods["bobplates"] then
   OV.remove_prereq("cobalt-processing", "electrolysis-1")
 
   OV.remove_prereq("chemical-processing-2", "electrolysis-2")
+  OV.remove_prereq("plastics", "chemical-plant")
   OV.remove_prereq("plastics", "electrolysis-2")
   OV.remove_prereq("aluminium-processing", "electrolysis-2")
   OV.add_prereq("aluminium-processing", "chlorine-processing-1")

diff --git a/angelspetrochem/prototypes/global-override/bobwarfare.lua b/angelspetrochem/prototypes/global-override/bobwarfare.lua
@@ -28,11 +28,6 @@ if mods["bobwarfare"] then
       angelsmods.functions.add_flag("sulfuric-nitric-acid", "hidden")
       OV.disable_recipe({ "sulfuric-nitric-acid" })
     end
-
-    OV.add_prereq("nitroglycerin-processing", "angels-sulfur-processing-2")
-    OV.add_prereq("nitroglycerin-processing", "angels-nitrogen-processing-2")
-  else
-    OV.add_prereq("cordite-processing", "angels-nitrogen-processing-2")
   end
 
   -----------------------------------------------------------------------------
@@ -63,7 +58,7 @@ if mods["bobwarfare"] then
   data.raw["recipe"]["nitroglycerin"].always_show_products = true
 
   OV.remove_unlock("nitroglycerin-processing", "glycerol")
-  OV.add_prereq("nitroglycerin-processing", "chlorine-processing-2")
+  OV.add_prereq("nitroglycerin-processing", "angels-explosives-1")
 
   -----------------------------------------------------------------------------
   -- GLYCEROL -----------------------------------------------------------------

diff --git a/angelspetrochem/prototypes/override/angelspetrochem.lua b/angelspetrochem/prototypes/override/angelspetrochem.lua
@@ -290,8 +290,9 @@ else
   OV.disable_recipe({
     "gas-ammonium-chloride",
   })
-  OV.remove_unlock("angels-nitrogen-processing-2", "gas-ammonium-chloride")
+  OV.remove_unlock("angels-nitrogen-processing-4", "gas-ammonium-chloride")
   angelsmods.functions.add_flag("gas-ammonium-chloride", "hidden")
+  OV.remove_prereq("angels-nitrogen-processing-3", "chlorine-processing-2")
 end
 
 -----------------------------------------------------------------------------

diff --git a/angelspetrochem/prototypes/override/angelssmelting.lua b/angelspetrochem/prototypes/override/angelssmelting.lua
@@ -34,6 +34,10 @@ else
     "solid-sodium-hydroxide-solid-sodium-sulfate",
   })
   angelsmods.functions.add_flag("solid-sodium-cyanide", "hidden")
+  OV.remove_unlock("sodium-processing-1", "solid-sodium-hydroxide")
   OV.remove_unlock("sodium-processing-1", "solid-sodium-sulfate-separation")
+  OV.add_unlock("sodium-processing-2", "solid-sodium-hydroxide")
   OV.add_unlock("sodium-processing-2", "solid-sodium-sulfate-separation")
+  OV.remove_prereq("sodium-processing-2", "sodium-processing-1")
+  OV.disable_technology({"sodium-processing-1"})
 end
diff --git a/angelspetrochem/prototypes/override/base-game.lua b/angelspetrochem/prototypes/override/base-game.lua
@@ -45,8 +45,7 @@ angelsmods.functions.add_flag("heavy-oil", "hidden")
 move_item("lubricant", "petrochem-carbon-fluids", "dcd", "fluid")
 OV.remove_prereq("lubricant", "oil-processing")
 OV.remove_prereq("lubricant", "chemical-plant")
-OV.add_prereq("lubricant", "angels-oil-processing")
-OV.add_prereq("lubricant", "gas-steam-cracking-1")
+OV.add_prereq("lubricant", "steam-cracking-1")
 
 -------------------------------------------------------------------------------
 -- PLASTICS -------------------------------------------------------------------

diff --git a/angelspetrochem/prototypes/override/bobplates.lua b/angelspetrochem/prototypes/override/bobplates.lua
@@ -170,7 +170,7 @@ if mods["bobplates"] then
   OV.add_unlock("flammables", "liquid-fuel")
   OV.add_unlock("flammables", "enriched-fuel-from-liquid-fuel")
   OV.remove_prereq("flammables", "gas-processing")
-  OV.add_prereq("flammables", "gas-steam-cracking-1")
+  OV.add_prereq("flammables", "steam-cracking-1")
 end
 
 -------------------------------------------------------------------------------

diff --git a/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua b/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua
@@ -520,10 +520,6 @@ data:extend({
         type = "unlock-recipe",
         recipe = "gas-nitrogen-dioxide",
       },
-      {
-        type = "unlock-recipe",
-        recipe = "gas-ammonium-chloride",
-      },
       {
         type = "unlock-recipe",
         recipe = "gas-urea",
@@ -554,6 +550,7 @@ data:extend({
     prerequisites = {
       "angels-nitrogen-processing-2",
       "angels-advanced-chemistry-3",
+      "chlorine-processing-2",
       "sodium-processing-2",
       "flammables",
     },
@@ -603,6 +600,10 @@ data:extend({
       "angels-advanced-chemistry-5",
     },
     effects = {
+      {
+        type = "unlock-recipe",
+        recipe = "gas-refinery-4",
+      },
       {
         type = "unlock-recipe",
         recipe = "gas-dinitrogen-tetroxide",
@@ -621,7 +622,7 @@ data:extend({
       },
       {
         type = "unlock-recipe",
-        recipe = "gas-refinery-4",
+        recipe = "gas-ammonium-chloride",
       },
     },
     unit = {
@@ -642,23 +643,13 @@ data:extend({
     name = "chlorine-processing-1",
     icons = angelsmods.functions.create_gas_tech_icon("ClClCl"),
     prerequisites = {
-      "gas-processing",
-      "ore-crushing",
-      "water-treatment-2",
+      "basic-chemistry-3",
     },
     effects = {
       {
         type = "unlock-recipe",
         recipe = "water-saline-separation",
       },
-      {
-        type = "unlock-recipe",
-        recipe = "solid-salt-separation",
-      },
-      {
-        type = "unlock-recipe",
-        recipe = "gas-chlor-methane",
-      },
       {
         type = "unlock-recipe",
         recipe = "gas-hydrogen-chloride",
@@ -684,20 +675,20 @@ data:extend({
     icons = angelsmods.functions.create_gas_tech_icon("ClClCl"),
     prerequisites = {
       "chlorine-processing-1",
-      "gas-steam-cracking-1",
+      "steam-cracking-1",
     },
     effects = {
       {
         type = "unlock-recipe",
-        recipe = "gas-allylchlorid",
+        recipe = "gas-chlor-methane",
       },
       {
         type = "unlock-recipe",
-        recipe = "gas-epichlorhydrin",
+        recipe = "gas-allylchlorid",
       },
       {
         type = "unlock-recipe",
-        recipe = "liquid-glycerol",
+        recipe = "gas-epichlorhydrin",
       },
       {
         type = "unlock-recipe",
@@ -722,9 +713,12 @@ data:extend({
     prerequisites = {
       "chlorine-processing-2",
       "water-treatment-3",
-      "chemical-science-pack",
     },
     effects = {
+      {
+        type = "unlock-recipe",
+        recipe = "solid-salt-separation",
+      },
       {
         type = "unlock-recipe",
         recipe = "gas-hydrogen-chloride-separation",