From 131c6d1b10841d9d182485680d7926bcd8008245 Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Wed, 22 Nov 2023 23:38:10 +1300 Subject: [PATCH 1/7] Prerequisites and unlocks shuffle - Move Glycerol and Toluene recipe unlocks to Explosives. These fluids aren't used for anything else. - Move Ammonium Chloride later in the tech tree. It's only used for Platinum 3. - Move Molten Salt Electrolysis to Chlorine Processing 3. It doesn't really make sense until after Water Treatment 3. - Move Chloromethane to Chlorine Processing 2. It's only used for Paste and Toluene so doesn't need to be available early in Green Science. --- .../technology/bio-processing-alien.lua | 3 +- .../overrides/global-tech-bobs-packs.lua | 1 - .../prototypes/global-override/bobwarfare.lua | 7 +--- .../prototypes/override/angelspetrochem.lua | 3 +- .../prototypes/override/angelssmelting.lua | 4 +++ .../technology/petrochem-basic-chemistry.lua | 32 ++++++++----------- .../technology/petrochem-petro-chemistry.lua | 8 ----- .../technology/petrochem-weaponary.lua | 12 +++++++ .../technology/smelting-platinum.lua | 2 +- 9 files changed, 34 insertions(+), 38 deletions(-) diff --git a/angelsbioprocessing/prototypes/technology/bio-processing-alien.lua b/angelsbioprocessing/prototypes/technology/bio-processing-alien.lua index 6e4c2dc3e..fd60d3b28 100644 --- 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/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua index 87761570f..9f6878042 100644 --- 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/angelspetrochem/prototypes/global-override/bobwarfare.lua b/angelspetrochem/prototypes/global-override/bobwarfare.lua index fa80e3df6..92fde55df 100644 --- 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 index eeb3bd13e..9eb8429b3 100644 --- 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-3", "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 index cd85b864f..4def633d0 100644 --- 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/technology/petrochem-basic-chemistry.lua b/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua index ce4cb927d..d9c8f9cfd 100644 --- 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", }, @@ -566,6 +563,10 @@ data:extend({ type = "unlock-recipe", recipe = "gas-melamine", }, + { + type = "unlock-recipe", + recipe = "gas-ammonium-chloride", + }, { type = "unlock-recipe", recipe = "solid-sodium-hypochlorite", @@ -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", @@ -689,15 +680,15 @@ data:extend({ 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", diff --git a/angelspetrochem/prototypes/technology/petrochem-petro-chemistry.lua b/angelspetrochem/prototypes/technology/petrochem-petro-chemistry.lua index a3970dc06..749d4d67c 100644 --- a/angelspetrochem/prototypes/technology/petrochem-petro-chemistry.lua +++ b/angelspetrochem/prototypes/technology/petrochem-petro-chemistry.lua @@ -344,14 +344,6 @@ data:extend({ type = "unlock-recipe", recipe = "catalyst-metal-blue", }, - { - type = "unlock-recipe", - recipe = "liquid-toluene-from-benzene", - }, - { - type = "unlock-recipe", - recipe = "liquid-toluene-from-naphtha", - }, }, unit = { count = 50, diff --git a/angelspetrochem/prototypes/technology/petrochem-weaponary.lua b/angelspetrochem/prototypes/technology/petrochem-weaponary.lua index c7c58b7b9..f7677c0cc 100644 --- a/angelspetrochem/prototypes/technology/petrochem-weaponary.lua +++ b/angelspetrochem/prototypes/technology/petrochem-weaponary.lua @@ -70,6 +70,10 @@ data:extend({ "military-science-pack", }, effects = { + { + type = "unlock-recipe", + recipe = "liquid-glycerol", + }, { type = "unlock-recipe", recipe = "solid-nitroglycerin", @@ -96,6 +100,14 @@ data:extend({ "angels-advanced-chemistry-3", }, effects = { + { + type = "unlock-recipe", + recipe = "liquid-toluene-from-benzene", + }, + { + type = "unlock-recipe", + recipe = "liquid-toluene-from-naphtha", + }, { type = "unlock-recipe", recipe = "solid-trinitrotoluene", diff --git a/angelssmelting/prototypes/technology/smelting-platinum.lua b/angelssmelting/prototypes/technology/smelting-platinum.lua index 06758782b..615d87f57 100644 --- a/angelssmelting/prototypes/technology/smelting-platinum.lua +++ b/angelssmelting/prototypes/technology/smelting-platinum.lua @@ -134,7 +134,7 @@ data:extend({ "ore-processing-5", "angels-platinum-smelting-2", "chlorine-processing-1", -- it seems rediculous adding this prerequisite to yellow... - "angels-nitrogen-processing-2", -- it seems rediculous adding this prerequisite to yellow... + "angels-nitrogen-processing-3", -- it seems rediculous adding this prerequisite to yellow... }, effects = { { From 85ae4b89b74e2271ec118bf9dfea90e143c6e441 Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Wed, 22 Nov 2023 23:50:47 +1300 Subject: [PATCH 2/7] Combine steam cracking techs There wasn't enough difference between gas steam cracking and oil steam cracking --- .../components-batteries-technology.lua | 2 +- angelspetrochem/locale/en/petrochem.cfg | 6 +- .../prototypes/override/base-game.lua | 3 +- .../prototypes/override/bobplates.lua | 2 +- .../technology/petrochem-basic-chemistry.lua | 2 +- .../technology/petrochem-petro-chemistry.lua | 98 +++++-------------- .../technology/petrochem-solids.lua | 5 +- 7 files changed, 30 insertions(+), 88 deletions(-) diff --git a/angelsindustries/prototypes/technology/components-batteries-technology.lua b/angelsindustries/prototypes/technology/components-batteries-technology.lua index c67d1b4f7..c92309a6f 100644 --- 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/locale/en/petrochem.cfg b/angelspetrochem/locale/en/petrochem.cfg index 45703ebac..86922f018 100644 --- 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/override/base-game.lua b/angelspetrochem/prototypes/override/base-game.lua index 1fed45938..fd7b99b0d 100644 --- 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 index 7ee1d28d2..5785aa90b 100644 --- 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 index d9c8f9cfd..1c249962b 100644 --- a/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua +++ b/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua @@ -675,7 +675,7 @@ data:extend({ icons = angelsmods.functions.create_gas_tech_icon("ClClCl"), prerequisites = { "chlorine-processing-1", - "gas-steam-cracking-1", + "steam-cracking-1", }, effects = { { diff --git a/angelspetrochem/prototypes/technology/petrochem-petro-chemistry.lua b/angelspetrochem/prototypes/technology/petrochem-petro-chemistry.lua index 749d4d67c..2ac2dd73c 100644 --- a/angelspetrochem/prototypes/technology/petrochem-petro-chemistry.lua +++ b/angelspetrochem/prototypes/technology/petrochem-petro-chemistry.lua @@ -149,7 +149,7 @@ data:extend({ icon_size = 256, icon_mipmaps = 2, prerequisites = { - "gas-steam-cracking-2", + "steam-cracking-2", }, effects = { { @@ -261,8 +261,7 @@ data:extend({ prerequisites = { "angels-advanced-chemistry-1", "advanced-electronics", - "gas-steam-cracking-1", - "oil-steam-cracking-1", + "steam-cracking-1", "chemical-science-pack", "angels-sulfur-processing-2", }, @@ -324,7 +323,7 @@ data:extend({ "angels-advanced-chemistry-2", "angels-advanced-gas-processing", "chlorine-processing-1", - "oil-steam-cracking-2", + "steam-cracking-2", "thermal-water-extraction", }, effects = { @@ -523,11 +522,13 @@ data:extend({ }, { type = "technology", - name = "gas-steam-cracking-1", + name = "steam-cracking-1", icon = "__angelspetrochem__/graphics/technology/steam-cracker-tech.png", icon_size = 128, prerequisites = { + "angels-advanced-chemistry-1", "gas-processing", + "oil-processing", }, effects = { { @@ -536,91 +537,35 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "steam-cracking-methane", - }, - { - type = "unlock-recipe", - recipe = "steam-cracking-ethane", - }, - { - type = "unlock-recipe", - recipe = "steam-cracking-butane", - }, - { - type = "unlock-recipe", - recipe = "gas-propene-synthesis", + recipe = "catalyst-steam-cracking-butane", }, { type = "unlock-recipe", - recipe = "gas-ethylene-oxide", + recipe = "catalyst-steam-cracking-naphtha", }, { type = "unlock-recipe", - recipe = "liquid-ethylene-carbonate", - }, - }, - unit = { - count = 50, - ingredients = { - { type = "item", name = "automation-science-pack", amount = 1 }, - { type = "item", name = "logistic-science-pack", amount = 1 }, + recipe = "steam-cracking-methane", }, - time = 15, - }, - order = "c-a", - }, - { - type = "technology", - name = "gas-steam-cracking-2", - icon = "__angelspetrochem__/graphics/technology/steam-cracker-tech.png", - icon_size = 128, - prerequisites = { - "gas-steam-cracking-1", - "angels-advanced-chemistry-2", - "chemical-science-pack", - }, - effects = { { type = "unlock-recipe", - recipe = "steam-cracker-2", + recipe = "steam-cracking-ethane", }, { type = "unlock-recipe", - recipe = "steam-cracking-gas-residual", - }, - }, - unit = { - count = 50, - ingredients = { - { type = "item", name = "automation-science-pack", amount = 1 }, - { type = "item", name = "logistic-science-pack", amount = 1 }, - { type = "item", name = "chemical-science-pack", amount = 1 }, + recipe = "steam-cracking-butane", }, - time = 15, - }, - order = "c-a", - }, - { - type = "technology", - name = "oil-steam-cracking-1", - icon = "__angelspetrochem__/graphics/technology/steam-cracker-tech.png", - icon_size = 128, - prerequisites = { - "oil-processing", - "angels-advanced-chemistry-1", - }, - effects = { { type = "unlock-recipe", - recipe = "steam-cracker", + recipe = "gas-propene-synthesis", }, { type = "unlock-recipe", - recipe = "catalyst-steam-cracking-butane", + recipe = "gas-ethylene-oxide", }, { type = "unlock-recipe", - recipe = "catalyst-steam-cracking-naphtha", + recipe = "liquid-ethylene-carbonate", }, }, unit = { @@ -635,13 +580,12 @@ data:extend({ }, { type = "technology", - name = "oil-steam-cracking-2", + name = "steam-cracking-2", icon = "__angelspetrochem__/graphics/technology/steam-cracker-tech.png", icon_size = 128, prerequisites = { - "oil-steam-cracking-1", "angels-advanced-chemistry-2", - "chemical-science-pack", + "steam-cracking-1", }, effects = { { @@ -664,6 +608,10 @@ data:extend({ type = "unlock-recipe", recipe = "steam-cracking-oil-residual", }, + { + type = "unlock-recipe", + recipe = "steam-cracking-gas-residual", + }, }, unit = { count = 50, @@ -682,8 +630,7 @@ data:extend({ icon = "__angelspetrochem__/graphics/technology/electric-boiler-tech.png", icon_size = 128, prerequisites = { - "oil-steam-cracking-1", - "gas-steam-cracking-1", + "steam-cracking-1", }, effects = { { @@ -712,8 +659,7 @@ data:extend({ icon_size = 128, prerequisites = { "angels-electric-boiler", - "oil-steam-cracking-2", - "gas-steam-cracking-2", + "steam-cracking-2", }, effects = { { diff --git a/angelspetrochem/prototypes/technology/petrochem-solids.lua b/angelspetrochem/prototypes/technology/petrochem-solids.lua index 35b009836..bc4f11299 100644 --- a/angelspetrochem/prototypes/technology/petrochem-solids.lua +++ b/angelspetrochem/prototypes/technology/petrochem-solids.lua @@ -6,8 +6,7 @@ data:extend({ icon = "__angelspetrochem__/graphics/technology/plastic-1-tech.png", icon_size = 128, prerequisites = { - "gas-steam-cracking-1", - "oil-steam-cracking-1", + "steam-cracking-1", }, effects = { { @@ -214,7 +213,7 @@ data:extend({ icon = "__angelspetrochem__/graphics/technology/separator-tech.png", icon_size = 128, prerequisites = { - --"oil-steam-cracking-1", + --"steam-cracking-1", "angels-advanced-chemistry-2", }, effects = { From 315ec81f454d125b9e37906a9a19c08741d9bb30 Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Tue, 28 Nov 2023 21:42:04 +1300 Subject: [PATCH 3/7] More tech cleanup --- angelsbioprocessing/prototypes/technology/crop-farming.lua | 1 + angelspetrochem/prototypes/global-override/bobplates.lua | 1 + 2 files changed, 2 insertions(+) diff --git a/angelsbioprocessing/prototypes/technology/crop-farming.lua b/angelsbioprocessing/prototypes/technology/crop-farming.lua index cbe327f1b..9a780bd4e 100644 --- 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/angelspetrochem/prototypes/global-override/bobplates.lua b/angelspetrochem/prototypes/global-override/bobplates.lua index 2507c76b9..a68ae8594 100644 --- 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") From 4ab7c246888d0e525e3e49f2d85c61a2d97c3707 Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Sun, 3 Dec 2023 20:49:36 +1300 Subject: [PATCH 4/7] Fix paper 2 prerequisites Make sure supporting recipes for Paper 2 are available at the same time. While still avoiding unnecessary prerequisites --- .../overrides/bio-processing-override-arboretum.lua | 5 +++++ .../prototypes/technology/bio-processing-wood-paper.lua | 7 +------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-arboretum.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-arboretum.lua index c9aaff38a..e1e0f2063 100644 --- 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-wood-paper.lua b/angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua index e40dddebe..f29a01307 100644 --- 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, From c87f212be6301c628f9bd5acaeb3ff76400a06dc Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Mon, 11 Dec 2023 19:04:12 +1300 Subject: [PATCH 5/7] Updating changelog --- angelspetrochem/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/angelspetrochem/changelog.txt b/angelspetrochem/changelog.txt index cfb971317..017b6d070 100644 --- 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) From 8064223717c56a21d584215772fd416cc2d1569f Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Tue, 12 Dec 2023 16:54:01 +1300 Subject: [PATCH 6/7] Prerequisite tweaks --- angelspetrochem/prototypes/override/angelspetrochem.lua | 2 +- .../prototypes/technology/petrochem-basic-chemistry.lua | 6 +++++- angelssmelting/prototypes/technology/smelting-platinum.lua | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/angelspetrochem/prototypes/override/angelspetrochem.lua b/angelspetrochem/prototypes/override/angelspetrochem.lua index 9eb8429b3..d05892f4f 100644 --- a/angelspetrochem/prototypes/override/angelspetrochem.lua +++ b/angelspetrochem/prototypes/override/angelspetrochem.lua @@ -290,7 +290,7 @@ else OV.disable_recipe({ "gas-ammonium-chloride", }) - OV.remove_unlock("angels-nitrogen-processing-3", "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/technology/petrochem-basic-chemistry.lua b/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua index 1c249962b..bc572caf3 100644 --- a/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua +++ b/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua @@ -604,6 +604,10 @@ data:extend({ "angels-advanced-chemistry-5", }, effects = { + { + type = "unlock-recipe", + recipe = "gas-refinery-4", + }, { type = "unlock-recipe", recipe = "gas-dinitrogen-tetroxide", @@ -622,7 +626,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "gas-refinery-4", + recipe = "gas-ammonium-chloride", }, }, unit = { diff --git a/angelssmelting/prototypes/technology/smelting-platinum.lua b/angelssmelting/prototypes/technology/smelting-platinum.lua index 615d87f57..75d0c185b 100644 --- a/angelssmelting/prototypes/technology/smelting-platinum.lua +++ b/angelssmelting/prototypes/technology/smelting-platinum.lua @@ -133,8 +133,7 @@ data:extend({ --"angels-metallurgy-5", "ore-processing-5", "angels-platinum-smelting-2", - "chlorine-processing-1", -- it seems rediculous adding this prerequisite to yellow... - "angels-nitrogen-processing-3", -- it seems rediculous adding this prerequisite to yellow... + "angels-nitrogen-processing-4", }, effects = { { From 1579227626d7438c9adc3f4a6fdf7521e7acf81d Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Tue, 12 Dec 2023 17:00:11 +1300 Subject: [PATCH 7/7] Removing duplicate recipe unlock --- .../prototypes/technology/petrochem-basic-chemistry.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua b/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua index bc572caf3..1cf346f00 100644 --- a/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua +++ b/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua @@ -563,10 +563,6 @@ data:extend({ type = "unlock-recipe", recipe = "gas-melamine", }, - { - type = "unlock-recipe", - recipe = "gas-ammonium-chloride", - }, { type = "unlock-recipe", recipe = "solid-sodium-hypochlorite",