From e35d462c7b76f2d2134ee7ecaa8937fbdd997080 Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Mon, 10 Jun 2024 22:50:12 +1200 Subject: [PATCH] Move Bricks Later in Tech Tree #991 --- angelsbioprocessing/changelog.txt | 4 ++ angelsbioprocessing/info.json | 6 +-- .../bio-processing-override-arboretum.lua | 1 + .../bio-processing-override-bobgreenhouse.lua | 1 + .../recipes/bio-processing-entity-angels.lua | 24 ++++++------ .../technology/bio-processing-wood-paper.lua | 5 ++- .../prototypes/technology/bio-refugium.lua | 5 ++- .../prototypes/technology/crop-farming.lua | 8 +++- angelsindustries/info.json | 6 +-- .../components-base-recipe-update.lua | 3 -- .../overrides/components-block-update.lua | 6 +-- .../overrides/global-tech-base-packs.lua | 6 +++ .../overrides/global-tech-bobs-packs.lua | 1 + .../components-mechanical-technology.lua | 20 +++++----- angelspetrochem/info.json | 2 +- .../technology/water-treatment-technology.lua | 12 ------ angelssmelting/changelog.txt | 1 + angelssmelting/info.json | 4 +- .../override/smelting-override-cobalt.lua | 4 +- .../prototypes/technology/smelting-cobalt.lua | 2 +- .../prototypes/technology/smelting-iron.lua | 2 +- .../prototypes/technology/smelting-lead.lua | 2 +- .../prototypes/technology/smelting-stone.lua | 38 ++++++++++++++----- 23 files changed, 93 insertions(+), 70 deletions(-) diff --git a/angelsbioprocessing/changelog.txt b/angelsbioprocessing/changelog.txt index 349c3ba80..e3f403fe8 100644 --- a/angelsbioprocessing/changelog.txt +++ b/angelsbioprocessing/changelog.txt @@ -3,6 +3,10 @@ Version: 0.7.28 Date: ??? Changes: - Limited animation speed of fish, puffer, and biter refugiums (987) + - Tech tree changes: (991) + - Moved Garden Processing and Farming 1 techs from Red Science to Green Science + - Reduced the tier of Algae farm 2's ingredients + - Made Biters require Purple Science --------------------------------------------------------------------------------------------------- Version: 0.7.27 Date: 21.02.2024 diff --git a/angelsbioprocessing/info.json b/angelsbioprocessing/info.json index 34b4266d1..5a5ec813a 100644 --- a/angelsbioprocessing/info.json +++ b/angelsbioprocessing/info.json @@ -8,8 +8,8 @@ "homepage": "https://forums.factorio.com/viewforum.php?f=185", "description": "Adds ways to recycle and process waste products through biological means and make use of biological processes and farming.", "dependencies": [ - "angelsrefining >= 0.12.1", - "angelspetrochem >= 0.9.25", - "angelssmelting >= 0.6.17" + "angelsrefining >= 0.12.8", + "angelspetrochem >= 0.9.27", + "angelssmelting >= 0.6.24" ] } diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-arboretum.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-arboretum.lua index ce34fdc2e..379d873ea 100644 --- a/angelsbioprocessing/prototypes/overrides/bio-processing-override-arboretum.lua +++ b/angelsbioprocessing/prototypes/overrides/bio-processing-override-arboretum.lua @@ -50,6 +50,7 @@ else "bio-arboretum-temperate-3", }) OV.remove_prereq("bio-wood-processing-2", "bio-farm-1") + OV.remove_unlock("bio-wood-processing-2", "bio-processor") end if angelsmods.trigger.bio_plastic then diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-bobgreenhouse.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-bobgreenhouse.lua index 8cc0b2421..091b3a97a 100644 --- a/angelsbioprocessing/prototypes/overrides/bio-processing-override-bobgreenhouse.lua +++ b/angelsbioprocessing/prototypes/overrides/bio-processing-override-bobgreenhouse.lua @@ -214,6 +214,7 @@ if mods["bobgreenhouse"] then }) -- update tech + OV.set_science_pack("bob-greenhouse", "logistic-science-pack", 1) OV.add_prereq("bob-greenhouse", "gardens") OV.add_unlock("bob-greenhouse", "wood-sawing-manual") OV.add_prereq("bob-greenhouse", "bio-arboretum-1") diff --git a/angelsbioprocessing/prototypes/recipes/bio-processing-entity-angels.lua b/angelsbioprocessing/prototypes/recipes/bio-processing-entity-angels.lua index d03cebe44..217c0a62b 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-processing-entity-angels.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-processing-entity-angels.lua @@ -85,10 +85,10 @@ angelsmods.functions.RB.build({ enabled = false, ingredients = { { type = "item", name = "algaefarm-1", amount = 1 }, - { type = "item", name = "t0-plate", amount = 11 }, - { type = "item", name = "t0-circuit", amount = 4 }, - { type = "item", name = "t0-brick", amount = 11 }, - { type = "item", name = "t0-pipe", amount = 18 }, + { type = "item", name = "t0-plate", amount = 6 }, + { type = "item", name = "t0-circuit", amount = 2 }, + { type = "item", name = "t0-brick", amount = 6 }, + { type = "item", name = "t0-pipe", amount = 9 }, }, result = "algae-farm", }, @@ -97,10 +97,10 @@ angelsmods.functions.RB.build({ enabled = false, ingredients = { { type = "item", name = "algaefarm-1", amount = 1 }, - { type = "item", name = "t0-plate", amount = 11 * buildingmulti }, - { type = "item", name = "t0-circuit", amount = 4 * buildingmulti }, - { type = "item", name = "t0-brick", amount = 11 * buildingmulti }, - { type = "item", name = "t0-pipe", amount = 18 * buildingmulti }, + { type = "item", name = "t0-plate", amount = 6 * buildingmulti }, + { type = "item", name = "t0-circuit", amount = 2 * buildingmulti }, + { type = "item", name = "t0-brick", amount = 6 * buildingmulti }, + { type = "item", name = "t0-pipe", amount = 9 * buildingmulti }, }, result = "algae-farm", }, @@ -113,10 +113,10 @@ angelsmods.functions.RB.build({ enabled = false, ingredients = { { type = "item", name = "algaefarm-2", amount = 1 }, - { type = "item", name = "t1-plate", amount = 11 }, - { type = "item", name = "t1-circuit", amount = 4 }, - { type = "item", name = "t1-brick", amount = 11 }, - { type = "item", name = "t1-pipe", amount = 18 }, + { type = "item", name = "t0-plate", amount = 11 }, + { type = "item", name = "t0-circuit", amount = 4 }, + { type = "item", name = "t0-brick", amount = 11 }, + { type = "item", name = "t0-pipe", amount = 18 }, }, result = "algae-farm-2", }, diff --git a/angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua b/angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua index 8d1674a9e..cb87cd538 100644 --- a/angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua +++ b/angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua @@ -29,10 +29,13 @@ data:extend({ icon_size = 128, order = "c-a", prerequisites = { - "bio-farm-1", "bio-wood-processing", }, effects = { + { + type = "unlock-recipe", + recipe = "bio-processor", + }, { type = "unlock-recipe", recipe = "wood-charcoal", diff --git a/angelsbioprocessing/prototypes/technology/bio-refugium.lua b/angelsbioprocessing/prototypes/technology/bio-refugium.lua index ab2db73a3..9c61e5b22 100644 --- a/angelsbioprocessing/prototypes/technology/bio-refugium.lua +++ b/angelsbioprocessing/prototypes/technology/bio-refugium.lua @@ -280,7 +280,6 @@ data:extend({ order = "c-a", prerequisites = { "bio-refugium-puffer-3", - "production-science-pack", }, effects = { { @@ -310,7 +309,6 @@ data:extend({ { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, { type = "item", name = "chemical-science-pack", amount = 1 }, - { type = "item", name = "production-science-pack", amount = 1 }, { type = "item", name = "token-bio", amount = 1 }, }, time = 30, @@ -328,6 +326,7 @@ data:extend({ "bio-refugium-butchery-2", "bio-refugium-puffer-2", "bio-processing-crystal-splinter-2", + "production-science-pack", "stone-wall", }, effects = { @@ -370,6 +369,7 @@ data:extend({ { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, { type = "item", name = "chemical-science-pack", amount = 1 }, + { type = "item", name = "production-science-pack", amount = 1 }, { type = "item", name = "token-bio", amount = 1 }, }, time = 30, @@ -417,6 +417,7 @@ data:extend({ { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, { type = "item", name = "chemical-science-pack", amount = 1 }, + { type = "item", name = "production-science-pack", amount = 1 }, { type = "item", name = "token-bio", amount = 1 }, }, time = 30, diff --git a/angelsbioprocessing/prototypes/technology/crop-farming.lua b/angelsbioprocessing/prototypes/technology/crop-farming.lua index 46353f3c2..170183efc 100644 --- a/angelsbioprocessing/prototypes/technology/crop-farming.lua +++ b/angelsbioprocessing/prototypes/technology/crop-farming.lua @@ -18,6 +18,10 @@ data:extend({ type = "unlock-recipe", recipe = "solid-soil", }, + { + type = "unlock-recipe", + recipe = "solid-sand", + }, { type = "unlock-recipe", recipe = "solid-soil-alternative", @@ -39,7 +43,7 @@ data:extend({ icon_size = 128, order = "c-a", prerequisites = { - "steel-processing", + "logistic-science-pack" }, effects = { { @@ -63,6 +67,7 @@ data:extend({ count = 50, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, + { type = "item", name = "logistic-science-pack", amount = 1 }, }, time = 30, }, @@ -157,6 +162,7 @@ data:extend({ count = 50, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, + { type = "item", name = "logistic-science-pack", amount = 1 }, }, time = 30, }, diff --git a/angelsindustries/info.json b/angelsindustries/info.json index b59f00257..a71e06943 100644 --- a/angelsindustries/info.json +++ b/angelsindustries/info.json @@ -9,9 +9,9 @@ "description": "Adds industrial equipment as well as the tools you need to expand and grow your base. Adds extra components [BETA] and a tech [ALPHA] overhaul.", "dependencies": [ "angelsrefining >= 0.12.8", - "angelspetrochem >= 0.9.25", - "angelssmelting >= 0.6.17", - "angelsbioprocessing >= 0.7.21", + "angelspetrochem >= 0.9.27", + "angelssmelting >= 0.6.24", + "angelsbioprocessing >= 0.7.28", "(?) aai-industry >= 0.4.12" ] } diff --git a/angelsindustries/prototypes/overrides/components-base-recipe-update.lua b/angelsindustries/prototypes/overrides/components-base-recipe-update.lua index 2ac732fa6..894c4afc8 100644 --- a/angelsindustries/prototypes/overrides/components-base-recipe-update.lua +++ b/angelsindustries/prototypes/overrides/components-base-recipe-update.lua @@ -49,9 +49,6 @@ if angelsmods.industries.components then AI.replace_recipe_ing("battery-mk2-equipment", "battery-equipment", "battery-4") OV.add_prereq("battery-mk2-equipment", "angels-components-batteries-4") - OV.add_prereq("angels-cobalt-smelting-1", "water-washing-1") - OV.remove_prereq("angels-cobalt-smelting-2", "water-washing-1") - -- roboports AI.replace_recipe_ing("personal-roboport-equipment", "battery-1", "battery-4") AI.replace_recipe_ing("personal-roboport-mk2-equipment", "battery-1", "battery-5") diff --git a/angelsindustries/prototypes/overrides/components-block-update.lua b/angelsindustries/prototypes/overrides/components-block-update.lua index 30ce406a8..a1fc5e520 100644 --- a/angelsindustries/prototypes/overrides/components-block-update.lua +++ b/angelsindustries/prototypes/overrides/components-block-update.lua @@ -3,11 +3,7 @@ if angelsmods.industries.components then ----------------------------------------------------------------------------- -- PREREQUISITES FOR COMPONENTS TO WORK CORRECTLY --------------------------- ----------------------------------------------------------------------------- - -- move molds from stone 2 to stone 1 to be at red science - OV.remove_unlock("angels-stone-smelting-2", "angels-casing-resin-mold") - OV.add_unlock("angels-stone-smelting-1", "angels-casing-resin-mold") - OV.remove_unlock("angels-stone-smelting-2", "mold-expendable") - OV.add_unlock("angels-stone-smelting-1", "mold-expendable") + -- move molds from stone 2 to stone 1 to be at green science OV.remove_prereq("angels-stone-smelting-2", "bio-arboretum-1") OV.add_prereq("angels-stone-smelting-1", "bio-wood-processing-2") OV.add_prereq("angels-stone-smelting-1", "angels-components-mechanical-1") diff --git a/angelsindustries/prototypes/overrides/global-tech-base-packs.lua b/angelsindustries/prototypes/overrides/global-tech-base-packs.lua index a1861ed42..e397288c1 100644 --- a/angelsindustries/prototypes/overrides/global-tech-base-packs.lua +++ b/angelsindustries/prototypes/overrides/global-tech-base-packs.lua @@ -47,7 +47,9 @@ if angelsmods.industries.tech then OV.remove_prereq("automation-2", "tech-green-packs") -- SMELTING OV.add_prereq("angels-metallurgy-1", "tech-specialised-labs-basic-processing-1") + AI.pack_replace("angels-stone-smelting-1", "green", "red") -- BIO PROCESSING + AI.pack_replace("bio-farm-1", "green", "red") AI.pack_count_update("bio-temperate-farming", "angels-science-pack-red", 4) AI.pack_replace("bio-fermentation", "green", "red") OV.remove_prereq("bio-fermentation", "tech-green-packs") @@ -59,6 +61,7 @@ if angelsmods.industries.tech then AI.pack_replace("bio-desert-farming-1", "green", "red") AI.pack_replace("bio-swamp-farming-1", "green", "red") AI.pack_replace("bio-temperate-farming-1", "green", "red") + AI.pack_replace("gardens", "green", "red") -- INDUSTRIES AI.pack_replace("tech-green-circuit", "green", "red") OV.remove_prereq("tech-green-circuit", "resins") @@ -76,6 +79,8 @@ if angelsmods.industries.tech then AI.pack_replace("lubricant", "blue", "green") -- PETROCHEM AI.pack_replace("sodium-processing-1", "blue", "green") + -- SMELTING + AI.pack_replace("angels-stone-smelting-2", "blue", "green") -- BIO PROCESSING OV.add_prereq("bio-refugium-fish-1", "water-treatment-2") AI.pack_replace("bio-paper-2", "blue", "green") @@ -158,6 +163,7 @@ if angelsmods.industries.tech then AI.pack_replace("angels-silicon-smelting-2", "blue", "orange") AI.pack_replace("angels-silicon-casting-2", "blue", "orange") AI.pack_replace("angels-stone-smelting-3", "blue", "orange") + OV.remove_prereq("angels-stone-smelting-3", "production-science-pack") AI.pack_replace("angels-tin-smelting-3", "blue", "orange") AI.pack_replace("angels-tin-casting-3", "blue", "orange") AI.pack_replace("angels-iron-smelting-3", "blue", "orange") diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua index 7885125a3..c121cedad 100644 --- a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua +++ b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua @@ -86,6 +86,7 @@ if angelsmods.industries.tech then ------------------------------------------------------------------------------- if mods["bobgreenhouse"] then --adds bob greenhouse stuffs + AI.pack_replace("bob-greenhouse", "green", "red") end ------------------------------------------------------------------------------- diff --git a/angelsindustries/prototypes/technology/components-mechanical-technology.lua b/angelsindustries/prototypes/technology/components-mechanical-technology.lua index 0bff66e0e..a3f2bbf13 100644 --- a/angelsindustries/prototypes/technology/components-mechanical-technology.lua +++ b/angelsindustries/prototypes/technology/components-mechanical-technology.lua @@ -47,10 +47,10 @@ if angelsmods.industries.components then OV.add_unlock("angels-iron-smelting-2", "angels-casing-iron-1") OV.add_prereq("angels-iron-smelting-2", "angels-components-mechanical-1") - OV.add_prereq("angels-iron-smelting-2", "angels-stone-smelting-2") + OV.add_prereq("angels-iron-smelting-2", "angels-stone-smelting-1") OV.add_unlock("angels-iron-smelting-3", "angels-casing-iron-2") - OV.add_prereq("angels-iron-smelting-3", "angels-stone-smelting-3") + OV.add_prereq("angels-iron-smelting-3", "angels-stone-smelting-2") ------------------------------------------------------------------------------- -- MECHANICAL PARTS 2 --------------------------------------------------------- @@ -64,7 +64,7 @@ if angelsmods.industries.components then icon_mipmaps = 4, prerequisites = { "angels-components-mechanical-1", - "angels-stone-smelting-2", + "angels-stone-smelting-1", "logistic-science-pack", "steel-processing", "angels-iron-smelting-1", @@ -105,7 +105,7 @@ if angelsmods.industries.components then OV.add_unlock("angels-steel-smelting-3", "angels-casing-steel-2") OV.add_prereq("angels-steel-smelting-3", "angels-components-mechanical-2") - OV.add_prereq("angels-steel-smelting-3", "angels-stone-smelting-3") + OV.add_prereq("angels-steel-smelting-3", "angels-stone-smelting-2") ------------------------------------------------------------------------------- -- MECHANICAL PARTS 3 --------------------------------------------------------- @@ -119,7 +119,7 @@ if angelsmods.industries.components then icon_mipmaps = 4, prerequisites = { "angels-components-mechanical-2", - --"angels-stone-smelting-2", + --"angels-stone-smelting-1", "angels-aluminium-smelting-1", }, effects = { @@ -158,7 +158,7 @@ if angelsmods.industries.components then OV.add_unlock("angels-aluminium-smelting-2", "angels-casing-aluminium-2") OV.add_prereq("angels-aluminium-smelting-2", "angels-components-mechanical-3") - OV.add_prereq("angels-aluminium-smelting-2", "angels-stone-smelting-3") + OV.add_prereq("angels-aluminium-smelting-2", "angels-stone-smelting-2") ------------------------------------------------------------------------------- -- MECHANICAL PARTS 4 --------------------------------------------------------- @@ -172,7 +172,7 @@ if angelsmods.industries.components then icon_mipmaps = 4, prerequisites = { "angels-components-mechanical-3", - --"angels-stone-smelting-2", + --"angels-stone-smelting-1", "angels-titanium-smelting-1", "lubricant", }, @@ -213,7 +213,7 @@ if angelsmods.industries.components then OV.add_unlock("angels-titanium-smelting-2", "angels-casing-titanium-2") OV.add_prereq("angels-titanium-smelting-2", "angels-components-mechanical-4") - OV.add_prereq("angels-titanium-smelting-2", "angels-stone-smelting-3") + OV.add_prereq("angels-titanium-smelting-2", "angels-stone-smelting-2") ------------------------------------------------------------------------------- -- MECHANICAL PARTS 5 --------------------------------------------------------- @@ -227,7 +227,7 @@ if angelsmods.industries.components then icon_mipmaps = 4, prerequisites = { "angels-components-mechanical-4", - --"angels-stone-smelting-2", + --"angels-stone-smelting-1", "angels-tungsten-smelting-1", }, effects = { @@ -269,5 +269,5 @@ if angelsmods.industries.components then OV.add_unlock("angels-tungsten-smelting-2", "angels-casing-tungsten-green") OV.add_unlock("angels-tungsten-smelting-2", "angels-casing-tungsten-2") OV.add_prereq("angels-tungsten-smelting-2", "angels-components-mechanical-5") - OV.add_prereq("angels-tungsten-smelting-2", "angels-stone-smelting-3") + OV.add_prereq("angels-tungsten-smelting-2", "angels-stone-smelting-2") end diff --git a/angelspetrochem/info.json b/angelspetrochem/info.json index f59faa818..7a9102ec7 100644 --- a/angelspetrochem/info.json +++ b/angelspetrochem/info.json @@ -8,6 +8,6 @@ "homepage": "https://forums.factorio.com/viewforum.php?f=185", "description": "Angel's Petrochemical processing changes Oil processing and adds Gas processing, as well as a more complex web of chemical production. Includes overrides and tie-ins to Bob's technologies and recipes. Dependencies: Angel's Refining", "dependencies": [ - "angelsrefining >= 0.12.3" + "angelsrefining >= 0.12.8" ] } diff --git a/angelsrefining/prototypes/technology/water-treatment-technology.lua b/angelsrefining/prototypes/technology/water-treatment-technology.lua index a2a811893..dc155b47d 100644 --- a/angelsrefining/prototypes/technology/water-treatment-technology.lua +++ b/angelsrefining/prototypes/technology/water-treatment-technology.lua @@ -234,18 +234,6 @@ data:extend({ type = "unlock-recipe", recipe = "washing-5", }, - { - type = "unlock-recipe", - recipe = "solid-clay", - }, - { - type = "unlock-recipe", - recipe = "solid-limestone", - }, - { - type = "unlock-recipe", - recipe = "solid-sand", - }, }, unit = { count = 10, diff --git a/angelssmelting/changelog.txt b/angelssmelting/changelog.txt index 70de13f74..0b6307709 100644 --- a/angelssmelting/changelog.txt +++ b/angelssmelting/changelog.txt @@ -4,6 +4,7 @@ Date: ??? Changes: - Rebalance Tungsten Smelting Recipes (980) - Adjusted the recipes for Bob's Assembling Machines (985) + - Moved Cement Processing techs up a science pack tier so Clay Bricks are not available so early in the game (991) --------------------------------------------------------------------------------------------------- Version: 0.6.23 Date: 21.02.2024 diff --git a/angelssmelting/info.json b/angelssmelting/info.json index 7f2fac65d..6b64a3f5b 100644 --- a/angelssmelting/info.json +++ b/angelssmelting/info.json @@ -8,7 +8,7 @@ "homepage": "https://forums.factorio.com/viewforum.php?f=185", "description": "Angel's Smelting provides alternative ways to produce plate and increase ore yield at the expense of space and energy.", "dependencies": [ - "angelsrefining >= 0.12.1", - "angelspetrochem >= 0.9.25" + "angelsrefining >= 0.12.8", + "angelspetrochem >= 0.9.27" ] } diff --git a/angelssmelting/prototypes/override/smelting-override-cobalt.lua b/angelssmelting/prototypes/override/smelting-override-cobalt.lua index 20a22be53..e0987a876 100644 --- a/angelssmelting/prototypes/override/smelting-override-cobalt.lua +++ b/angelssmelting/prototypes/override/smelting-override-cobalt.lua @@ -66,8 +66,8 @@ if angelsmods.trigger.smelting_products["cobalt"].ingot then ), }, }) - OV.remove_prereq("angels-cobalt-smelting-1", "water-washing-1") - OV.add_prereq("angels-cobalt-smelting-2", "water-washing-1") + OV.remove_prereq("angels-cobalt-smelting-1", "angels-stone-smelting-1") + OV.add_prereq("angels-cobalt-smelting-2", "angels-stone-smelting-1") OV.remove_prereq("angels-cobalt-smelting-1", "ore-processing-2") OV.add_prereq("angels-cobalt-smelting-1", "angels-metallurgy-3") end diff --git a/angelssmelting/prototypes/technology/smelting-cobalt.lua b/angelssmelting/prototypes/technology/smelting-cobalt.lua index 4629b74bd..e4626b865 100644 --- a/angelssmelting/prototypes/technology/smelting-cobalt.lua +++ b/angelssmelting/prototypes/technology/smelting-cobalt.lua @@ -12,7 +12,7 @@ data:extend({ --"angels-metallurgy-3", "ore-processing-2", "angels-coal-processing", - "water-washing-1", + "angels-stone-smelting-1", }, effects = { { diff --git a/angelssmelting/prototypes/technology/smelting-iron.lua b/angelssmelting/prototypes/technology/smelting-iron.lua index 520d33ef4..87fab2cfd 100644 --- a/angelssmelting/prototypes/technology/smelting-iron.lua +++ b/angelssmelting/prototypes/technology/smelting-iron.lua @@ -124,7 +124,7 @@ data:extend({ --"angels-metallurgy-3", "ore-processing-2", "angels-iron-smelting-2", - "water-washing-1", + "angels-stone-smelting-1", }, effects = { { diff --git a/angelssmelting/prototypes/technology/smelting-lead.lua b/angelssmelting/prototypes/technology/smelting-lead.lua index ce2d4e7a2..148faba77 100644 --- a/angelssmelting/prototypes/technology/smelting-lead.lua +++ b/angelssmelting/prototypes/technology/smelting-lead.lua @@ -116,7 +116,7 @@ data:extend({ "ore-processing-2", "angels-lead-smelting-2", "angels-sulfur-processing-2", - "water-washing-1", + "angels-stone-smelting-1", }, effects = { { diff --git a/angelssmelting/prototypes/technology/smelting-stone.lua b/angelssmelting/prototypes/technology/smelting-stone.lua index 315e04adc..98fef17f2 100644 --- a/angelssmelting/prototypes/technology/smelting-stone.lua +++ b/angelssmelting/prototypes/technology/smelting-stone.lua @@ -6,10 +6,23 @@ data:extend({ icon_size = 128, prerequisites = { --"angels-metallurgy-1", + "logistic-science-pack", "powder-metallurgy-1", "water-washing-1", }, effects = { + { + type = "unlock-recipe", + recipe = "solid-clay", + }, + { + type = "unlock-recipe", + recipe = "solid-limestone", + }, + { + type = "unlock-recipe", + recipe = "solid-sand", + }, { type = "unlock-recipe", recipe = "solid-lime", @@ -22,11 +35,20 @@ data:extend({ type = "unlock-recipe", recipe = "angels-clay-brick", }, + { + type = "unlock-recipe", + recipe = "angels-casing-resin-mold", + }, + { + type = "unlock-recipe", + recipe = "mold-expendable", + }, }, unit = { count = 50, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, + { type = "item", name = "logistic-science-pack", amount = 1 }, }, time = 30, }, @@ -39,6 +61,7 @@ data:extend({ icon_size = 128, prerequisites = { --"angels-metallurgy-2", + "chemical-science-pack", "powder-metallurgy-2", "angels-stone-smelting-1", "concrete", @@ -63,11 +86,11 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "angels-casing-resin-mold", + recipe = "mold-non-expendable", }, { type = "unlock-recipe", - recipe = "mold-expendable", + recipe = "mold-non-expendable-wash", }, }, unit = { @@ -75,6 +98,7 @@ data:extend({ 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 }, }, time = 30, }, @@ -91,6 +115,7 @@ data:extend({ "angels-stone-smelting-2", "angels-aluminium-smelting-1", "angels-steel-smelting-1", + "production-science-pack", }, effects = { { @@ -105,14 +130,6 @@ data:extend({ type = "unlock-recipe", recipe = "angels-reinforced-concrete-brick", }, - { - type = "unlock-recipe", - recipe = "mold-non-expendable", - }, - { - type = "unlock-recipe", - recipe = "mold-non-expendable-wash", - }, }, unit = { count = 50, @@ -120,6 +137,7 @@ data:extend({ { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, { type = "item", name = "chemical-science-pack", amount = 1 }, + { type = "item", name = "production-science-pack", amount = 1 }, }, time = 30, },