k2 updates and spaced out

This commit is contained in:
Brevven 2025-05-04 03:29:43 -07:00
parent f8a6ecf923
commit 03451f3d45
10 changed files with 71 additions and 53 deletions

View file

@ -78,6 +78,10 @@ function util.se6()
return mods["space-exploration"] and mods["space-exploration"] >= "0.6"
end
function util.k2()
return mods.Krastorio2 or mods["Krastorio2-spaced-out"]
end
util.cablesg = util.se6() and "electronic" or "cable"
function get_setting(name)
@ -115,12 +119,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 util.k2() and kr_adjust_stack_sizes then
return tonumber(200)
end
return default
end
@ -515,7 +516,12 @@ end
-- k2 matter
-- params: {k2matter}, k2baseicon , {icon}
function util.k2matter(params)
local matter = require("__Krastorio2__/prototypes/libraries/matter")
local matter
if mods.Krastorio2 then
matter = require("__Krastorio2__/prototypes/libraries/matter")
else
matter = require("__Krastorio2-spaced-out__/prototypes/libraries/matter")
end
if mods["space-exploration"] then
params.k2matter.needs_stabilizer = true
end
@ -570,7 +576,7 @@ function util.k2matter(params)
},
})
end
if params.k2matter.only_deconversion and params.k2matter.only_deconversion == true then
if params.k2matter.only_deconversion then
matter.make_deconversion_recipe(params.k2matter)
else
matter.make_recipes(params.k2matter)
@ -585,8 +591,8 @@ function util.se_matter(params)
if not params.quant_in then params.quant_in = params.quant_out end
if not params.icon_size then params.icon_size = 64 end
local fname = "matter-fusion-"..params.ore
local sedata = mods.Krastorio2 and "se-kr-matter-synthesis-data" or "se-fusion-test-data"
local sejunk = mods.Krastorio2 and "se-broken-data" or "se-junk-data"
local sedata = util.k2() and "se-kr-matter-synthesis-data" or "se-fusion-test-data"
local sejunk = util.k2() and "se-broken-data" or "se-junk-data"
data:extend({
{
type = "recipe",
@ -623,7 +629,7 @@ function util.se_matter(params)
})
util.add_unlock("se-space-matter-fusion", fname)
if mods.Krastorio2 then
if util.k2() then
local lname = params.ore.."-to-particle-stream"
data:extend({
enabled = false,