diff --git a/changelog.txt b/changelog.txt index 6324346..281e4cf 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,6 +3,7 @@ Version: 2.1.10 Date: 2025-05-03 Changes: - Fix load issue with bob's + - K2 updated compatibility, thanks to autechr3 and pla --------------------------------------------------------------------------------------------------- Version: 2.1.9 Date: 2025-04-20 diff --git a/data-util.lua b/data-util.lua index d57f071..29ebf26 100644 --- a/data-util.lua +++ b/data-util.lua @@ -115,12 +115,9 @@ function util.fe_plus(sub) end end -function util.get_stack_size(default) - if mods.Krastorio2 then - local size = get_setting("kr-stack-size") - if size and tonumber(size) then - return tonumber(size) - end +function util.get_stack_size(default) + if mods.Krastorio2 and kr_adjust_stack_sizes then + return tonumber(200) end return default end @@ -514,14 +511,11 @@ end -- k2 matter -- params: {k2matter}, k2baseicon , {icon} -function util.k2matter(params, only_deconversion) +function util.k2matter(params) local matter = require("__Krastorio2__/prototypes/libraries/matter") if mods["space-exploration"] then params.k2matter.needs_stabilizer = true end - if not params.k2matter.material.amount then - params.k2matter.material.amount = 10 - end if not data.raw.technology[params.k2matter.unlocked_by] then local icon = "" if params.k2baseicon then @@ -543,7 +537,6 @@ function util.k2matter(params, only_deconversion) }, params.icon, }, - effects = {}, prerequisites = {"kr-matter-processing"}, unit = { @@ -566,11 +559,12 @@ function util.k2matter(params, only_deconversion) }, time = 45, }, + effects = {} -- (ignore for now) localised_name = {"technology-name.k2-conversion", {"item-name."..params.k2matter.item_name}}, }, }) end - if only_deconversion then + if params.k2matter.only_deconversion then matter.make_deconversion_recipe(params.k2matter) else matter.make_recipes(params.k2matter) @@ -681,7 +675,7 @@ function util.se_matter(params) {"se-astronomic-science-pack-4", 1}, {"se-energy-science-pack-4", 1}, {"se-material-science-pack-4", 1}, - {"kr-matter-tech-card", 1}, + {"matter-tech-card", 1}, {"se-deep-space-science-pack-1", 1}, } diff --git a/zircon-matter.lua b/zircon-matter.lua index c09f108..b8b6b5a 100644 --- a/zircon-matter.lua +++ b/zircon-matter.lua @@ -6,7 +6,8 @@ if mods["Krastorio2"] then k2matter = { material = { name = "zircon", - type = "item" + type = "item", + amount = 10, }, matter_count = 6, energy_required = 1, @@ -27,6 +28,7 @@ if mods["Krastorio2"] then matter_count = 10, energy_required = 2, needs_stabilizer = true, + only_deconversion = true, unlocked_by = "zirconium-matter-processing", }, }, true) @@ -36,12 +38,14 @@ if mods["Krastorio2"] then material = { name = "zirconium-plate", type = "item", + amount = 10, }, matter_count = 17, energy_required = 2, needs_stabilizer = true, + only_deconversion = true, unlocked_by = "zirconium-matter-processing", }, - }, true) + }) end