k2 spaced out

This commit is contained in:
Brevven 2025-05-03 15:16:40 -07:00
parent 41e353a9c0
commit 64e991bbe0
6 changed files with 27 additions and 13 deletions

View file

@ -1,4 +1,9 @@
---------------------------------------------------------------------------------------------------
Version: 2.0.25
Date: 2025-05-04
Changes:
- Support for Krastorio2 spaced out
---------------------------------------------------------------------------------------------------
Version: 2.0.24
Date: 2025-05-03
Changes:

View file

@ -37,12 +37,12 @@ if not mods.bztungsten then
util.remove_ingredient("lightning-turret", "tungsten")
util.remove_prerequisite("lightning-turrets", "tungsten-processing")
if mods.Krastorio2 then
if util.k2() then
util.remove_raw("recipe", "kr-vc-tungsten")
end
end
if mods.Krastorio2 then
if util.k2() then
-- remove K2 recipes that are created when our dummy items are detected
util.remove_raw("recipe", "kr-vc-cobalt-steel")
util.remove_raw("recipe", "kr-vc-nickel")

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)
@ -116,7 +120,7 @@ function util.fe_plus(sub)
end
function util.get_stack_size(default)
if mods.Krastorio2 and kr_adjust_stack_sizes then
if util.k2() and kr_adjust_stack_sizes then
return tonumber(200)
end
return default
@ -512,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
@ -579,8 +588,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",
@ -617,7 +626,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,

View file

@ -1,6 +1,6 @@
{
"name": "bztitanium",
"version": "2.0.24",
"version": "2.0.25",
"factorio_version": "2.0",
"title": "Titanium",
"author": "Brevven",

View file

@ -46,11 +46,11 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then
name = "molten-titanium",
subgroup = "titanium",
results = {
{type = "fluid", name = "molten-titanium", amount = mods.Krastorio2 and 750 or 900},
{type = "fluid", name = "molten-titanium", amount = util.k2() and 750 or 900},
},
energy_required = 60,
ingredients = {
{name = mods.Krastorio2 and "enriched-titanium" or "titanium-ore", amount = 24},
{name = util.k2() and "enriched-titanium" or "titanium-ore", amount = 24},
{type = "fluid", name = "se-pyroflux", amount = 10},
},
enabled = false,

View file

@ -34,9 +34,9 @@ data:extend({
} or nil),
enabled = false,
allow_productivity = true,
energy_required = mods.Krastorio2 and 16 or 8,
ingredients = {util.item("titanium-ore", mods.Krastorio2 and 10 or (mods["space-age"] and 10 or 5))},
results = {mods.Krastorio2 and {type="item", name= util.me.titanium_plate, amount_min=2, amount_max=3} or util.item(util.me.titanium_plate)},
energy_required = util.k2() and 16 or 8,
ingredients = {util.item("titanium-ore", util.k2() and 10 or (mods["space-age"] and 10 or 5))},
results = {util.k2() and {type="item", name= util.me.titanium_plate, amount_min=2, amount_max=3} or util.item(util.me.titanium_plate)},
-- expensive =
-- {
-- energy_required = 16,