diff --git a/bzaluminum2/aluminum-burner-phase.lua b/bzaluminum2/aluminum-burner-phase.lua index 793679e..28fb76d 100644 --- a/bzaluminum2/aluminum-burner-phase.lua +++ b/bzaluminum2/aluminum-burner-phase.lua @@ -14,14 +14,17 @@ if not mods.Krastorio2 and not mods["aai-industry"] then util.add_ingredient("repair-pack", "aluminum-cable", 3) util.set_ingredient("repair-pack", "iron-gear-wheel", 3) - util.remove_recipe_effect("electronics", "copper-cable") + util.add_effect("electronics", { type = "unlock-recipe", recipe = "electronic-circuit" }) + util.add_effect("electronics", { type = "unlock-recipe", recipe = "inserter" }) util.add_effect("electronics", { type = "unlock-recipe", recipe = "long-handed-inserter" }) util.remove_recipe_effect("electronics", "lab") util.remove_recipe_effect("automation", "long-handed-inserter") util.set_enabled("electronic-circuit", false) util.set_enabled("inserter", false) - util.remove_prerequisite("automation-science-pack", "electronics") util.add_prerequisite("logistic-science-pack", "electronics") + util.remove_prerequisite("automation-science-pack", "electronics") + util.add_prerequisite("copper-processing", "automation-science-pack") + util.remove_prerequisite("automation-science-pack", "electronics") util.add_effect("steam-power", { type = "unlock-recipe", recipe = "lab" }) util.remove_prerequisite("fast-inserter", "automation-science-pack") util.add_prerequisite("fast-inserter", "electronics") @@ -43,17 +46,13 @@ if mods.Krastorio2 then util.remove_ingredient("kr-basic-tech-card", "copper-cable") util.add_ingredient("kr-basic-tech-card", "aluminum-cable", 1) + util.add_prerequisite("automation-science-pack", "copper-processing") if mods.bobassembly then util.set_prerequisite("basic-automation", {"kr-automation-core"}) util.set_tech_recipe("basic-automation", {{"kr-basic-tech-card", 1}}) end util.remove_prerequisite("automation", "smelting") -- Bitumen mod - util.add_prerequisite("automation-science-pack", "copper-processing") - - util.remove_prerequisite("logistic-science-pack", "automation-science-pack") - util.add_prerequisite("logistic-science-pack", "electronics") - -- For warptorio2 expansion with K2 util.remove_prerequisite("laboratory", "automation-science-pack") util.set_tech_recipe("laboratory", {{"kr-basic-tech-card", 1}}) @@ -74,14 +73,9 @@ if mods["aai-industry"] then util.replace_ingredient("motor", "iron-plate", "aluminum-plate") util.replace_ingredient("repair-pack", "copper-plate", "aluminum-plate") util.replace_ingredient("burner-lab", "copper-plate", "aluminum-plate") - util.add_prerequisite("copper-processing", "automation-science-pack") - util.remove_recipe_effect("electricity", "copper-cable") - util.add_effect("copper-processing", { type = "unlock-recipe", recipe = "copper-cable" }) end if mods["aai-industry"] and mods.Krastorio2 then - table.insert(data.raw.technology["copper-processing"].unit.ingredients, { "automation-science-pack", 1 }) - util.remove_prerequisite("automation-science-pack", "copper-processing") util.remove_prerequisite("copper-processing", "automation") util.add_prerequisite("copper-processing", "electricity") @@ -137,9 +131,13 @@ require("compatibility/textplates") -- All customizations or custom unlocks prior to this block util.add_unlock_force("electronics", "electronic-circuit") -util.replace_ingredients_prior_to("electronics", "electronic-circuit", "aluminum-cable") -util.replace_ingredients_prior_to("copper-processing", "copper-cable", "aluminum-cable") -util.replace_ingredients_prior_to("copper-processing", "copper-plate", "aluminum-plate") +-- Disabled for now because replace_ingredients_prior_to has an infinite recursion +--util.replace_ingredients_prior_to("electronics", "electronic-circuit", "aluminum-cable") +--util.replace_ingredients_prior_to("copper-processing", "copper-cable", "aluminum-cable") +--util.replace_ingredients_prior_to("copper-processing", "copper-plate", "aluminum-plate") -- Any post-fixes (eg aluminum back to copper) after this block +util.remove_prerequisite("copper-processing", "automation") + + -- End of file diff --git a/bzaluminum2/aluminum-recipe.lua b/bzaluminum2/aluminum-recipe.lua index 301da7e..0bb653d 100644 --- a/bzaluminum2/aluminum-recipe.lua +++ b/bzaluminum2/aluminum-recipe.lua @@ -137,7 +137,9 @@ data:extend({ order = "b-b", }, }) -if not mods["aai-industry"] then +if mods["aai-industry"] then + util.add_prerequisite("copper-processing", "electricity") +else util.add_prerequisite("copper-processing", "automation") end diff --git a/bzaluminum2/changelog.txt b/bzaluminum2/changelog.txt index c22d00e..36af3b0 100644 --- a/bzaluminum2/changelog.txt +++ b/bzaluminum2/changelog.txt @@ -1,14 +1,4 @@ --------------------------------------------------------------------------------------------------- -Version: 2.0.5 -Date: 05.11.2025 - Bug Fixes: - - Fix early game progression (once more) ---------------------------------------------------------------------------------------------------- -Version: 2.0.4 -Date: 05.11.2025 - Bug Fixes: - - Fix early game progression ---------------------------------------------------------------------------------------------------- Version: 2.0.3 Date: 01.11.2025 Bug Fixes: diff --git a/bzaluminum2/info.json b/bzaluminum2/info.json index ef58de2..8df25de 100644 --- a/bzaluminum2/info.json +++ b/bzaluminum2/info.json @@ -1,6 +1,6 @@ { "name": "bzaluminum2", - "version": "2.0.5", + "version": "2.0.3", "factorio_version": "2.0", "title": "Aluminum", "description": "Adds aluminum, alumina, cables, alloys and more to the game.",