From 64e991bbe09f6b682a1eaf467a0a8682f6590964 Mon Sep 17 00:00:00 2001 From: Brevven Date: Sat, 3 May 2025 15:16:40 -0700 Subject: [PATCH] k2 spaced out --- changelog.txt | 5 +++++ .../titanium-endgame-combat-final.lua | 4 ++-- data-util.lua | 19 ++++++++++++++----- info.json | 2 +- titanium-recipe-se.lua | 4 ++-- titanium-recipe.lua | 6 +++--- 6 files changed, 27 insertions(+), 13 deletions(-) diff --git a/changelog.txt b/changelog.txt index 9b98065..7207e55 100644 --- a/changelog.txt +++ b/changelog.txt @@ -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: diff --git a/compatibility/titanium-endgame-combat-final.lua b/compatibility/titanium-endgame-combat-final.lua index 1070f42..d1de5ae 100644 --- a/compatibility/titanium-endgame-combat-final.lua +++ b/compatibility/titanium-endgame-combat-final.lua @@ -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") 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 f25d545..990c8c2 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bztitanium", - "version": "2.0.24", + "version": "2.0.25", "factorio_version": "2.0", "title": "Titanium", "author": "Brevven", diff --git a/titanium-recipe-se.lua b/titanium-recipe-se.lua index 105610a..b3b9772 100644 --- a/titanium-recipe-se.lua +++ b/titanium-recipe-se.lua @@ -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, diff --git a/titanium-recipe.lua b/titanium-recipe.lua index 18fdd11..92f3e12 100644 --- a/titanium-recipe.lua +++ b/titanium-recipe.lua @@ -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,