Compare commits

..

No commits in common. "3d759145b000b780c95755dba3b22f008a8da55a" and "90290e98cd64ff77775cfe8f798da7856c715a79" have entirely different histories.

6 changed files with 74 additions and 80 deletions

View file

@ -14,15 +14,17 @@ if not mods.Krastorio2 and not mods["aai-industry"] then
util.add_ingredient("repair-pack", "aluminum-cable", 3) util.add_ingredient("repair-pack", "aluminum-cable", 3)
util.set_ingredient("repair-pack", "iron-gear-wheel", 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.add_effect("electronics", { type = "unlock-recipe", recipe = "long-handed-inserter" })
util.remove_recipe_effect("electronics", "lab") util.remove_recipe_effect("electronics", "lab")
util.remove_recipe_effect("automation", "long-handed-inserter") util.remove_recipe_effect("automation", "long-handed-inserter")
util.set_enabled("electronic-circuit", false) util.set_enabled("electronic-circuit", false)
util.set_enabled("inserter", 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.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.add_effect("steam-power", { type = "unlock-recipe", recipe = "lab" })
util.remove_prerequisite("fast-inserter", "automation-science-pack") util.remove_prerequisite("fast-inserter", "automation-science-pack")
util.add_prerequisite("fast-inserter", "electronics") util.add_prerequisite("fast-inserter", "electronics")
@ -44,15 +46,13 @@ if mods.Krastorio2 then
util.remove_ingredient("kr-basic-tech-card", "copper-cable") util.remove_ingredient("kr-basic-tech-card", "copper-cable")
util.add_ingredient("kr-basic-tech-card", "aluminum-cable", 1) util.add_ingredient("kr-basic-tech-card", "aluminum-cable", 1)
util.add_prerequisite("automation-science-pack", "copper-processing")
if mods.bobassembly then if mods.bobassembly then
util.set_prerequisite("basic-automation", {"kr-automation-core"}) util.set_prerequisite("basic-automation", {"kr-automation-core"})
util.set_tech_recipe("basic-automation", {{"kr-basic-tech-card", 1}}) util.set_tech_recipe("basic-automation", {{"kr-basic-tech-card", 1}})
end end
util.remove_prerequisite("automation", "smelting") -- Bitumen mod 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 -- For warptorio2 expansion with K2
util.remove_prerequisite("laboratory", "automation-science-pack") util.remove_prerequisite("laboratory", "automation-science-pack")
util.set_tech_recipe("laboratory", {{"kr-basic-tech-card", 1}}) 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("motor", "iron-plate", "aluminum-plate")
util.replace_ingredient("repair-pack", "copper-plate", "aluminum-plate") util.replace_ingredient("repair-pack", "copper-plate", "aluminum-plate")
util.replace_ingredient("burner-lab", "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 end
if mods["aai-industry"] and mods.Krastorio2 then if mods["aai-industry"] and mods.Krastorio2 then
@ -134,9 +131,13 @@ require("compatibility/textplates")
-- All customizations or custom unlocks prior to this block -- All customizations or custom unlocks prior to this block
util.add_unlock_force("electronics", "electronic-circuit") util.add_unlock_force("electronics", "electronic-circuit")
util.replace_ingredients_prior_to("electronics", "electronic-circuit", "aluminum-cable") -- Disabled for now because replace_ingredients_prior_to has an infinite recursion
util.replace_ingredients_prior_to("copper-processing", "copper-cable", "aluminum-cable") --util.replace_ingredients_prior_to("electronics", "electronic-circuit", "aluminum-cable")
util.replace_ingredients_prior_to("copper-processing", "copper-plate", "aluminum-plate") --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 -- Any post-fixes (eg aluminum back to copper) after this block
util.remove_prerequisite("copper-processing", "automation")
-- End of file -- End of file

View file

@ -1,62 +1,68 @@
-- Matter recipes for Krastorio2 -- Matter recipes for Krastorio2
if mods["Krastorio2"] then if mods["Krastorio2"] then
local util = require("data-util") local util = require("data-util");
local matter = require("__Krastorio2__/prototypes/libraries/matter") local matter = require("__Krastorio2__/prototypes/libraries/matter")
data:extend({ data:extend(
{
{
type = "technology",
name = "aluminum-matter-processing",
icons =
{ {
type = "technology", {
name = "aluminum-matter-processing", icon = util.k2assets().."/technologies/matter-coal.png",
icons = { icon_size = 256,
{
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 = "__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 = { local aluminum_ore_matter =
material = { type = "item", name = "aluminum-ore", amount = 10 }, {
material = { type = "item", name = "aluminum-ore", amount = 10 },
matter_count = 5, matter_count = 5,
energy_required = 1, energy_required = 1,
needs_stabilizer = false, need_stabilizer = false,
unlocked_by = "aluminum-matter-processing", unlocked_by_technology = "aluminum-matter-processing"
} }
matter.make_recipes(aluminum_ore_matter) matter.make_recipes(aluminum_ore_matter)
local alumina_matter = { local alumina_matter =
material = { type = "item", name = "alumina", amount = 10 }, {
material = { type = "item", name = "alumina", amount = 10 },
matter_count = 7.5, matter_count = 7.5,
energy_required = 2, energy_required = 2,
-- only_deconversion = true, only_deconversion = true,
needs_stabilizer = true, need_stabilizer = true,
unlocked_by = "aluminum-matter-processing", unlocked_by_technology = "aluminum-matter-processing"
} }
matter.make_deconversion_recipe(alumina_matter) matter.make_recipes(alumina_matter)
local aluminum_plate_matter = { local aluminum_plate_matter =
material = { type = "item", name = "aluminum-plate", amount = 10 }, {
material = { type = "item", name = "aluminum-plate", amount = 10 },
matter_count = 10, matter_count = 10,
energy_required = 3, energy_required = 3,
-- only_deconversion = true, only_deconversion = true,
needs_stabilizer = true, need_stabilizer = true,
unlocked_by = "aluminum-matter-processing", unlocked_by_technology = "aluminum-matter-processing"
} }
matter.make_deconversion_recipe(aluminum_plate_matter) matter.make_recipes(aluminum_plate_matter)
end end

View file

@ -137,7 +137,9 @@ data:extend({
order = "b-b", 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") util.add_prerequisite("copper-processing", "automation")
end end

View file

@ -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 Version: 2.0.2
Date: 22.10.2025 Date: 22.10.2025
Bug Fixes: Bug Fixes:

View file

@ -115,12 +115,12 @@ end
function util.k2matter(params) function util.k2matter(params)
local matter = require("__Krastorio2__/prototypes/libraries/matter") local matter = require("__Krastorio2__/prototypes/libraries/matter")
if mods["space-exploration"] then if mods["space-exploration"] then
params.k2matter.needs_stabilizer = true params.k2matter.need_stabilizer = true
end end
if not params.k2matter.minimum_conversion_quantity then if not params.k2matter.minimum_conversion_quantity then
params.k2matter.minimum_conversion_quantity = 10 params.k2matter.minimum_conversion_quantity = 10
end end
if not data.raw.technology[params.k2matter.unlocked_by] then if not data.raw.technology[params.k2matter.unlocked_by_technology] then
local icon = "" local icon = ""
if params.k2baseicon then if params.k2baseicon then
icon = util.k2assets().."/technologies/matter-"..params.k2baseicon..".png" icon = util.k2assets().."/technologies/matter-"..params.k2baseicon..".png"
@ -132,7 +132,7 @@ function util.k2matter(params)
{ {
{ {
type = "technology", type = "technology",
name = params.k2matter.unlocked_by, name = params.k2matter.unlocked_by_technology,
icons = icons =
{ {
{ {
@ -163,16 +163,11 @@ function util.k2matter(params)
}, },
time = 45, time = 45,
}, },
effects = {},
localised_name = {"technology-name.k2-conversion", {"item-name."..params.k2matter.item_name}}, localised_name = {"technology-name.k2-conversion", {"item-name."..params.k2matter.item_name}},
}, },
}) })
end end
if params.k2matter.only_deconversion then matter.make_recipes(params.k2matter)
matter.make_deconversion_recipe(params.k2matter)
else
matter.make_recipes(params.k2matter)
end
end end

View file

@ -1,6 +1,6 @@
{ {
"name": "bzaluminum2", "name": "bzaluminum2",
"version": "2.0.4", "version": "2.0.2",
"factorio_version": "2.0", "factorio_version": "2.0",
"title": "Aluminum", "title": "Aluminum",
"description": "Adds aluminum, alumina, cables, alloys and more to the game.", "description": "Adds aluminum, alumina, cables, alloys and more to the game.",