diff --git a/bzaluminum2/aluminum-burner-phase.lua b/bzaluminum2/aluminum-burner-phase.lua index 4984502..28fb76d 100644 --- a/bzaluminum2/aluminum-burner-phase.lua +++ b/bzaluminum2/aluminum-burner-phase.lua @@ -14,15 +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.add_prerequisite("automation-science-pack", "copper-processing") - 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") @@ -44,15 +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.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}}) @@ -73,9 +73,6 @@ 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 @@ -134,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-matter.lua b/bzaluminum2/aluminum-matter.lua index bacd77f..92caa5c 100644 --- a/bzaluminum2/aluminum-matter.lua +++ b/bzaluminum2/aluminum-matter.lua @@ -1,62 +1,68 @@ -- Matter recipes for Krastorio2 if mods["Krastorio2"] then - local util = require("data-util") - local matter = require("__Krastorio2__/prototypes/libraries/matter") +local util = require("data-util"); +local matter = require("__Krastorio2__/prototypes/libraries/matter") - data:extend({ +data:extend( +{ + { + type = "technology", + name = "aluminum-matter-processing", + icons = { - type = "technology", - name = "aluminum-matter-processing", - icons = { - { - icon = util.k2assets() .. "/technologies/backgrounds/matter.png", - icon_size = 256, - }, - { - icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png", - icon_size = 64, - scale = 1, - }, - }, - effects = {}, - prerequisites = { "kr-matter-processing" }, - unit = { - count = 350, - ingredients = { - { "production-science-pack", 1 }, - { "utility-science-pack", 1 }, - { "kr-matter-tech-card", 1 }, - }, - time = 45, + { + icon = util.k2assets().."/technologies/matter-coal.png", + icon_size = 256, }, + { + icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png", + icon_size = 64, + scale = 1.4, + } }, - }) + prerequisites = {"kr-matter-processing"}, + unit = + { + count = 350, + ingredients = + { + {"production-science-pack", 1}, + {"utility-science-pack", 1}, + {"kr-matter-tech-card", 1} + }, + time = 45 + } + }, +}) - local aluminum_ore_matter = { - material = { type = "item", name = "aluminum-ore", amount = 10 }, +local aluminum_ore_matter = + { + material = { type = "item", name = "aluminum-ore", amount = 10 }, matter_count = 5, energy_required = 1, - needs_stabilizer = false, - unlocked_by = "aluminum-matter-processing", - } - matter.make_recipes(aluminum_ore_matter) + need_stabilizer = false, + unlocked_by_technology = "aluminum-matter-processing" + } +matter.make_recipes(aluminum_ore_matter) - local alumina_matter = { - material = { type = "item", name = "alumina", amount = 10 }, +local alumina_matter = + { + material = { type = "item", name = "alumina", amount = 10 }, matter_count = 7.5, energy_required = 2, - -- only_deconversion = true, - needs_stabilizer = true, - unlocked_by = "aluminum-matter-processing", - } - matter.make_deconversion_recipe(alumina_matter) - local aluminum_plate_matter = { - material = { type = "item", name = "aluminum-plate", amount = 10 }, + only_deconversion = true, + need_stabilizer = true, + unlocked_by_technology = "aluminum-matter-processing" + } +matter.make_recipes(alumina_matter) +local aluminum_plate_matter = + { + material = { type = "item", name = "aluminum-plate", amount = 10 }, matter_count = 10, energy_required = 3, - -- only_deconversion = true, - needs_stabilizer = true, - unlocked_by = "aluminum-matter-processing", - } - matter.make_deconversion_recipe(aluminum_plate_matter) + only_deconversion = true, + need_stabilizer = true, + unlocked_by_technology = "aluminum-matter-processing" + } +matter.make_recipes(aluminum_plate_matter) end 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 285b245..f243d81 100644 --- a/bzaluminum2/changelog.txt +++ b/bzaluminum2/changelog.txt @@ -1,14 +1,4 @@ --------------------------------------------------------------------------------------------------- -Version: 2.0.4 -Date: 05.11.2025 - Bug Fixes: - - Fix early game progression ---------------------------------------------------------------------------------------------------- -Version: 2.0.3 -Date: 01.11.2025 - Bug Fixes: - - Fix K2 matter integration (thanks pla) ---------------------------------------------------------------------------------------------------- Version: 2.0.2 Date: 22.10.2025 Bug Fixes: diff --git a/bzaluminum2/data-util.lua b/bzaluminum2/data-util.lua index fe2226b..e69f0d5 100644 --- a/bzaluminum2/data-util.lua +++ b/bzaluminum2/data-util.lua @@ -115,12 +115,12 @@ end function util.k2matter(params) local matter = require("__Krastorio2__/prototypes/libraries/matter") if mods["space-exploration"] then - params.k2matter.needs_stabilizer = true + params.k2matter.need_stabilizer = true end if not params.k2matter.minimum_conversion_quantity then params.k2matter.minimum_conversion_quantity = 10 end - if not data.raw.technology[params.k2matter.unlocked_by] then + if not data.raw.technology[params.k2matter.unlocked_by_technology] then local icon = "" if params.k2baseicon then icon = util.k2assets().."/technologies/matter-"..params.k2baseicon..".png" @@ -132,7 +132,7 @@ function util.k2matter(params) { { type = "technology", - name = params.k2matter.unlocked_by, + name = params.k2matter.unlocked_by_technology, icons = { { @@ -163,16 +163,11 @@ function util.k2matter(params) }, time = 45, }, - effects = {}, localised_name = {"technology-name.k2-conversion", {"item-name."..params.k2matter.item_name}}, }, }) end - if params.k2matter.only_deconversion then - matter.make_deconversion_recipe(params.k2matter) - else - matter.make_recipes(params.k2matter) - end + matter.make_recipes(params.k2matter) end diff --git a/bzaluminum2/info.json b/bzaluminum2/info.json index b5a5435..79b1b04 100644 --- a/bzaluminum2/info.json +++ b/bzaluminum2/info.json @@ -1,6 +1,6 @@ { "name": "bzaluminum2", - "version": "2.0.4", + "version": "2.0.2", "factorio_version": "2.0", "title": "Aluminum", "description": "Adds aluminum, alumina, cables, alloys and more to the game.",