From d61c5e95e39aa4067fc77b00df5578d2d7e56595 Mon Sep 17 00:00:00 2001 From: Brevven Date: Sat, 3 May 2025 15:44:33 -0700 Subject: [PATCH] k2 spaced out --- changelog.txt | 5 +++++ data-util.lua | 19 ++++++++++++++----- info.json | 3 ++- magazine.lua | 2 +- zircon-matter.lua | 6 +++--- zirconium-enriched.lua | 2 +- zirconium-recipe-final-stacking.lua | 8 ++++---- zirconium-recipe-se.lua | 6 +++--- zirconium-recipe-updates-lds.lua | 2 +- zirconium-recipe-updates.lua | 6 +++--- zirconium-recipe.lua | 10 +++++----- 11 files changed, 42 insertions(+), 27 deletions(-) diff --git a/changelog.txt b/changelog.txt index 5192628..37d7e65 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 2.1.12 +Date: 2025-05-04 + Changes: + - Support for Krastorio2 spaced out +--------------------------------------------------------------------------------------------------- Version: 2.1.11 Date: 2025-05-04 Fixes: diff --git a/data-util.lua b/data-util.lua index 29ebf26..c4144a0 100644 --- a/data-util.lua +++ b/data-util.lua @@ -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, diff --git a/info.json b/info.json index e88b112..3fb6b2a 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzzirconium", - "version": "2.1.11", + "version": "2.1.12", "factorio_version": "2.0", "title": "Zirconium", "author": "Brevven", @@ -12,6 +12,7 @@ "? space-exploration", "? aai-industry", "? Krastorio2", + "? Krastorio2-spaced-out", "? deadlock-beltboxes-loaders", "? DeadlockCrating", "? omnimatter", diff --git a/magazine.lua b/magazine.lua index 020eb14..555ccce 100644 --- a/magazine.lua +++ b/magazine.lua @@ -16,7 +16,7 @@ if util.me.ammo() then end 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)) data:extend({ diff --git a/zircon-matter.lua b/zircon-matter.lua index b8b6b5a..81946ac 100644 --- a/zircon-matter.lua +++ b/zircon-matter.lua @@ -1,6 +1,6 @@ -- 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({ k2matter = { @@ -15,7 +15,7 @@ if mods["Krastorio2"] then unlocked_by = "zirconium-matter-processing", }, 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) util.k2matter({ diff --git a/zirconium-enriched.lua b/zirconium-enriched.lua index e8b9074..e6c75f1 100644 --- a/zirconium-enriched.lua +++ b/zirconium-enriched.lua @@ -1,7 +1,7 @@ -- Enriched Titanium for Krastorio2 local util = require("__bzzirconium__.data-util"); -if mods["Krastorio2"] then +if util.k2() then data:extend({ { type = "item", diff --git a/zirconium-recipe-final-stacking.lua b/zirconium-recipe-final-stacking.lua index 7f6a745..5e0f1e8 100644 --- a/zirconium-recipe-final-stacking.lua +++ b/zirconium-recipe-final-stacking.lua @@ -9,10 +9,10 @@ if deadlock and deadlock["add_stack"] then if util.me.use_cermet() then deadlock.add_stack("cermet", "__bzzirconium__/graphics/icons/stacked/cermet-stacked.png", "deadlock-stacking-2", 128) 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) 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) end if mods["space-exploration"] then @@ -28,10 +28,10 @@ if deadlock_crating then if util.me.use_cermet() then deadlock_crating.add_crate("cermet", "deadlock-crating-2") end - if mods["Krastorio2"] then + if util.k2() then deadlock_crating.add_crate("enriched-zircon", "deadlock-crating-2") 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") end if mods["space-exploration"] then diff --git a/zirconium-recipe-se.lua b/zirconium-recipe-se.lua index 5dc1983..539943d 100644 --- a/zirconium-recipe-se.lua +++ b/zirconium-recipe-se.lua @@ -51,7 +51,7 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then main_product = "molten-zirconium", subgroup = "zirconium", 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, 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= "zirconium-ingot"}) 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") se_delivery_cannon_recipes["enriched-zirconium"] = {name= "enriched-zirconium"} end @@ -117,7 +117,7 @@ else data.raw.item["zirconium-plate"].subgroup = "plates" data.raw.recipe["zirconium-plate"].subgroup = "plates" - if mods["Krastorio2"] then + if util.k2() then data:extend({ { type = "recipe", diff --git a/zirconium-recipe-updates-lds.lua b/zirconium-recipe-updates-lds.lua index 64441bb..b98019f 100644 --- a/zirconium-recipe-updates-lds.lua +++ b/zirconium-recipe-updates-lds.lua @@ -1,6 +1,6 @@ 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) else util.replace_some_ingredient("low-density-structure", "copper-plate", 10, "zirconia", 10) diff --git a/zirconium-recipe-updates.lua b/zirconium-recipe-updates.lua index a2bbb77..cb839f6 100644 --- a/zirconium-recipe-updates.lua +++ b/zirconium-recipe-updates.lua @@ -32,7 +32,7 @@ util.set_category("cermet", "kiln-smelting") if util.me.early() then util.replace_some_ingredient("stone-furnace", "stone", 1, "zircon", 1) end -if not mods["Krastorio2"] then +if not util.k2() then util.replace_some_ingredient("steel-furnace", "stone-brick", 4, "zirconia", 6) if mods.bzsilicon then -- this uses enough stone, we can just replace 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) -local ufc_amt = mods["Krastorio2"] and 1 or 5 +local ufc_amt = util.k2() and 1 or 5 if not mods.Atomic_Overhaul then util.replace_some_ingredient("uranium-fuel-cell", nuclear_plate, 5, nuclear_z, ufc_amt) end @@ -103,7 +103,7 @@ if util.fe_plus("Machines") then end -- Krastorio2 -if mods["Krastorio2"] then +if util.k2() then util.replace_some_ingredient("matter-stabilizer", "imersium-plate", 1, "zirconium-plate", 5) util.add_ingredient("kr-advanced-furnace", "zirconia", 60) diff --git a/zirconium-recipe.lua b/zirconium-recipe.lua index 5476453..7defd77 100644 --- a/zirconium-recipe.lua +++ b/zirconium-recipe.lua @@ -24,7 +24,7 @@ data:extend({ category = "smelting", allow_productivity = true, order = "z[zirconia]", - icons = (mods["Krastorio2"] and + icons = (util.k2() and { { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128 }, { 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, }, } ), - -- (mods["Krastorio2"] and + -- (util.k2() and -- { -- main_product = "zirconia", -- enabled = false, @@ -115,7 +115,7 @@ data:extend({ subgroup = "raw-material", auto_recycle = false, 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/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, }, } ), - -- (mods["Krastorio2"] and + -- (util.k2() and -- { -- enabled = false, -- energy_required = 8, @@ -413,7 +413,7 @@ util.add_unlock("foundry", "zirconium-gettering") end -- 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({ { type = "item",