k2 spaced out

This commit is contained in:
Brevven 2025-05-03 15:44:33 -07:00
parent 3d1da79f4b
commit d61c5e95e3
11 changed files with 42 additions and 27 deletions

View file

@ -1,4 +1,9 @@
--------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------
Version: 2.1.12
Date: 2025-05-04
Changes:
- Support for Krastorio2 spaced out
---------------------------------------------------------------------------------------------------
Version: 2.1.11 Version: 2.1.11
Date: 2025-05-04 Date: 2025-05-04
Fixes: Fixes:

View file

@ -78,6 +78,10 @@ function util.se6()
return mods["space-exploration"] and mods["space-exploration"] >= "0.6" return mods["space-exploration"] and mods["space-exploration"] >= "0.6"
end end
function util.k2()
return mods.Krastorio2 or mods["Krastorio2-spaced-out"]
end
util.cablesg = util.se6() and "electronic" or "cable" util.cablesg = util.se6() and "electronic" or "cable"
function get_setting(name) function get_setting(name)
@ -116,7 +120,7 @@ function util.fe_plus(sub)
end end
function util.get_stack_size(default) 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) return tonumber(200)
end end
return default return default
@ -512,7 +516,12 @@ end
-- k2 matter -- k2 matter
-- params: {k2matter}, k2baseicon , {icon} -- params: {k2matter}, k2baseicon , {icon}
function util.k2matter(params) 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 if mods["space-exploration"] then
params.k2matter.needs_stabilizer = true params.k2matter.needs_stabilizer = true
end 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.quant_in then params.quant_in = params.quant_out end
if not params.icon_size then params.icon_size = 64 end if not params.icon_size then params.icon_size = 64 end
local fname = "matter-fusion-"..params.ore local fname = "matter-fusion-"..params.ore
local sedata = mods.Krastorio2 and "se-kr-matter-synthesis-data" or "se-fusion-test-data" local sedata = util.k2() and "se-kr-matter-synthesis-data" or "se-fusion-test-data"
local sejunk = mods.Krastorio2 and "se-broken-data" or "se-junk-data" local sejunk = util.k2() and "se-broken-data" or "se-junk-data"
data:extend({ data:extend({
{ {
type = "recipe", type = "recipe",
@ -617,7 +626,7 @@ function util.se_matter(params)
}) })
util.add_unlock("se-space-matter-fusion", fname) util.add_unlock("se-space-matter-fusion", fname)
if mods.Krastorio2 then if util.k2() then
local lname = params.ore.."-to-particle-stream" local lname = params.ore.."-to-particle-stream"
data:extend({ data:extend({
enabled = false, enabled = false,

View file

@ -1,6 +1,6 @@
{ {
"name": "bzzirconium", "name": "bzzirconium",
"version": "2.1.11", "version": "2.1.12",
"factorio_version": "2.0", "factorio_version": "2.0",
"title": "Zirconium", "title": "Zirconium",
"author": "Brevven", "author": "Brevven",
@ -12,6 +12,7 @@
"? space-exploration", "? space-exploration",
"? aai-industry", "? aai-industry",
"? Krastorio2", "? Krastorio2",
"? Krastorio2-spaced-out",
"? deadlock-beltboxes-loaders", "? deadlock-beltboxes-loaders",
"? DeadlockCrating", "? DeadlockCrating",
"? omnimatter", "? omnimatter",

View file

@ -16,7 +16,7 @@ if util.me.ammo() then
end end
table.insert(mag, {type="fluid", name="heavy-oil", amount=ct}) table.insert(mag, {type="fluid", name="heavy-oil", amount=ct})
if not mods.Krastorio2 or not util.get_setting("kr-more-realistic-weapon") then if not util.k2() or not util.get_setting("kr-more-realistic-weapon") then
table.insert(mag, util.item("piercing-rounds-magazine", ct)) table.insert(mag, util.item("piercing-rounds-magazine", ct))
data:extend({ data:extend({

View file

@ -1,6 +1,6 @@
-- Matter recipes for Krastorio2 -- Matter recipes for Krastorio2
if mods["Krastorio2"] then local util = require("__bzzirconium__.data-util");
local util = require("__bzzirconium__.data-util"); if util.k2() then
util.k2matter({ util.k2matter({
k2matter = { k2matter = {
@ -15,7 +15,7 @@ if mods["Krastorio2"] then
unlocked_by = "zirconium-matter-processing", unlocked_by = "zirconium-matter-processing",
}, },
k2baseicon = "stone", k2baseicon = "stone",
icon = { icon = "__bzzirconium__/graphics/icons/zircon.png", icon_size = 64, scale = 1.25} icon = { icon = "__bzzirconium__/graphics/icons/zircon.png", icon_size = 128, scale = 0.5}
}, false) }, false)
util.k2matter({ util.k2matter({

View file

@ -1,7 +1,7 @@
-- Enriched Titanium for Krastorio2 -- Enriched Titanium for Krastorio2
local util = require("__bzzirconium__.data-util"); local util = require("__bzzirconium__.data-util");
if mods["Krastorio2"] then if util.k2() then
data:extend({ data:extend({
{ {
type = "item", type = "item",

View file

@ -9,10 +9,10 @@ if deadlock and deadlock["add_stack"] then
if util.me.use_cermet() then if util.me.use_cermet() then
deadlock.add_stack("cermet", "__bzzirconium__/graphics/icons/stacked/cermet-stacked.png", "deadlock-stacking-2", 128) deadlock.add_stack("cermet", "__bzzirconium__/graphics/icons/stacked/cermet-stacked.png", "deadlock-stacking-2", 128)
end end
if mods["Krastorio2"] then if util.k2() then
deadlock.add_stack("enriched-zircon", "__bzzirconium__/graphics/icons/stacked/enriched-zircon-stacked.png" , "deadlock-stacking-2", 128) deadlock.add_stack("enriched-zircon", "__bzzirconium__/graphics/icons/stacked/enriched-zircon-stacked.png" , "deadlock-stacking-2", 128)
end end
if mods["Krastorio2"] or mods["space-exploration"] then if util.k2() or mods["space-exploration"] then
deadlock.add_stack("zirconium-tungstate", nil, "deadlock-stacking-2", 64) deadlock.add_stack("zirconium-tungstate", nil, "deadlock-stacking-2", 64)
end end
if mods["space-exploration"] then if mods["space-exploration"] then
@ -28,10 +28,10 @@ if deadlock_crating then
if util.me.use_cermet() then if util.me.use_cermet() then
deadlock_crating.add_crate("cermet", "deadlock-crating-2") deadlock_crating.add_crate("cermet", "deadlock-crating-2")
end end
if mods["Krastorio2"] then if util.k2() then
deadlock_crating.add_crate("enriched-zircon", "deadlock-crating-2") deadlock_crating.add_crate("enriched-zircon", "deadlock-crating-2")
end end
if mods["Krastorio2"] or mods["space-exploration"] then if util.k2() or mods["space-exploration"] then
deadlock_crating.add_crate("zirconium-tungstate", "deadlock-crating-2") deadlock_crating.add_crate("zirconium-tungstate", "deadlock-crating-2")
end end
if mods["space-exploration"] then if mods["space-exploration"] then

View file

@ -51,7 +51,7 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then
main_product = "molten-zirconium", main_product = "molten-zirconium",
subgroup = "zirconium", subgroup = "zirconium",
results = { results = {
{type = "fluid", name = "molten-zirconium", amount = mods.Krastorio2 and 750 or 900}, {type = "fluid", name = "molten-zirconium", amount = util.k2() and 750 or 900},
}, },
energy_required = 60, energy_required = 60,
ingredients = { ingredients = {
@ -104,7 +104,7 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then
util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "molten-zirconium"}) util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "molten-zirconium"})
util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "zirconium-ingot"}) util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "zirconium-ingot"})
util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "zirconium-ingot-to-plate"}) util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "zirconium-ingot-to-plate"})
if mods["Krastorio2"] then if util.k2() then
util.set_item_subgroup("enriched-zircon", "zirconium") util.set_item_subgroup("enriched-zircon", "zirconium")
se_delivery_cannon_recipes["enriched-zirconium"] = {name= "enriched-zirconium"} se_delivery_cannon_recipes["enriched-zirconium"] = {name= "enriched-zirconium"}
end end
@ -117,7 +117,7 @@ else
data.raw.item["zirconium-plate"].subgroup = "plates" data.raw.item["zirconium-plate"].subgroup = "plates"
data.raw.recipe["zirconium-plate"].subgroup = "plates" data.raw.recipe["zirconium-plate"].subgroup = "plates"
if mods["Krastorio2"] then if util.k2() then
data:extend({ data:extend({
{ {
type = "recipe", type = "recipe",

View file

@ -1,6 +1,6 @@
local util = require("data-util"); local util = require("data-util");
if mods.Krastorio2 then if util.k2() then
util.replace_some_ingredient("low-density-structure", "copper-plate", 5, "zirconia", 5) util.replace_some_ingredient("low-density-structure", "copper-plate", 5, "zirconia", 5)
else else
util.replace_some_ingredient("low-density-structure", "copper-plate", 10, "zirconia", 10) util.replace_some_ingredient("low-density-structure", "copper-plate", 10, "zirconia", 10)

View file

@ -32,7 +32,7 @@ util.set_category("cermet", "kiln-smelting")
if util.me.early() then if util.me.early() then
util.replace_some_ingredient("stone-furnace", "stone", 1, "zircon", 1) util.replace_some_ingredient("stone-furnace", "stone", 1, "zircon", 1)
end end
if not mods["Krastorio2"] then if not util.k2() then
util.replace_some_ingredient("steel-furnace", "stone-brick", 4, "zirconia", 6) util.replace_some_ingredient("steel-furnace", "stone-brick", 4, "zirconia", 6)
if mods.bzsilicon then -- this uses enough stone, we can just replace if mods.bzsilicon then -- this uses enough stone, we can just replace
util.replace_ingredient("electric-furnace", "stone-brick", "zirconia") util.replace_ingredient("electric-furnace", "stone-brick", "zirconia")
@ -58,7 +58,7 @@ util.set_product_amount("explosives", "explosives", 3)
util.add_ingredient("nuclear-reactor", nuclear_z, 100) util.add_ingredient("nuclear-reactor", nuclear_z, 100)
local ufc_amt = mods["Krastorio2"] and 1 or 5 local ufc_amt = util.k2() and 1 or 5
if not mods.Atomic_Overhaul then if not mods.Atomic_Overhaul then
util.replace_some_ingredient("uranium-fuel-cell", nuclear_plate, 5, nuclear_z, ufc_amt) util.replace_some_ingredient("uranium-fuel-cell", nuclear_plate, 5, nuclear_z, ufc_amt)
end end
@ -103,7 +103,7 @@ if util.fe_plus("Machines") then
end end
-- Krastorio2 -- Krastorio2
if mods["Krastorio2"] then if util.k2() then
util.replace_some_ingredient("matter-stabilizer", "imersium-plate", 1, "zirconium-plate", 5) util.replace_some_ingredient("matter-stabilizer", "imersium-plate", 1, "zirconium-plate", 5)
util.add_ingredient("kr-advanced-furnace", "zirconia", 60) util.add_ingredient("kr-advanced-furnace", "zirconia", 60)

View file

@ -24,7 +24,7 @@ data:extend({
category = "smelting", category = "smelting",
allow_productivity = true, allow_productivity = true,
order = "z[zirconia]", order = "z[zirconia]",
icons = (mods["Krastorio2"] and icons = (util.k2() and
{ {
{ icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128 }, { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128 },
{ icon = "__bzzirconium__/graphics/icons/zircon.png", icon_size = 128, scale=0.25, shift= {-8, -8}}, { icon = "__bzzirconium__/graphics/icons/zircon.png", icon_size = 128, scale=0.25, shift= {-8, -8}},
@ -32,7 +32,7 @@ data:extend({
{ icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128, }, { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128, },
} }
), ),
-- (mods["Krastorio2"] and -- (util.k2() and
-- { -- {
-- main_product = "zirconia", -- main_product = "zirconia",
-- enabled = false, -- enabled = false,
@ -115,7 +115,7 @@ data:extend({
subgroup = "raw-material", subgroup = "raw-material",
auto_recycle = false, auto_recycle = false,
order = "d[zirconium-plate]", order = "d[zirconium-plate]",
icons = (mods["Krastorio2"] and icons = (util.k2() and
{ {
{ icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128 }, { icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128 },
{ icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128, scale=0.125, shift= {-8, -8}},
@ -123,7 +123,7 @@ data:extend({
{ icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128, }, { icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128, },
} }
), ),
-- (mods["Krastorio2"] and -- (util.k2() and
-- { -- {
-- enabled = false, -- enabled = false,
-- energy_required = 8, -- energy_required = 8,
@ -413,7 +413,7 @@ util.add_unlock("foundry", "zirconium-gettering")
end end
-- Zirconium Tungstate, only if needed -- Zirconium Tungstate, only if needed
if mods["space-age"] or (mods.bztungsten and (mods["Krastorio2"] or mods["space-exploration"])) then if mods["space-age"] or (mods.bztungsten and (util.k2() or mods["space-exploration"])) then
data:extend({ data:extend({
{ {
type = "item", type = "item",