From 63324114b2706edfc540055c7e6affd2074cceec Mon Sep 17 00:00:00 2001 From: Brevven Date: Sun, 4 May 2025 03:36:20 -0700 Subject: [PATCH] k2 spaced out, etc --- changelog.txt | 1 + info.json | 1 + settings.lua | 2 +- titanium-data-settings.lua | 2 +- titanium-enriched.lua | 2 +- titanium-matter.lua | 2 +- titanium-recipe-final-k2.lua | 18 +++++++++--------- titanium-recipe-final-stacking.lua | 4 ++-- titanium-recipe-se.lua | 4 ++-- titanium-recipe-updates.lua | 3 ++- titanium-recipe.lua | 2 +- 11 files changed, 22 insertions(+), 19 deletions(-) diff --git a/changelog.txt b/changelog.txt index 7207e55..c1979a7 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,6 +3,7 @@ Version: 2.0.25 Date: 2025-05-04 Changes: - Support for Krastorio2 spaced out + - Further tweaks to K2 2 integration --------------------------------------------------------------------------------------------------- Version: 2.0.24 Date: 2025-05-03 diff --git a/info.json b/info.json index 990c8c2..4711006 100644 --- a/info.json +++ b/info.json @@ -11,6 +11,7 @@ "? aai-industry", "? space-exploration", "? Krastorio2", + "? Krastorio2-spaced-out", "? Rich-Rocks-Requiem", "? FactorioExtended-Plus-Core", "? Pre0-17-60Oil", diff --git a/settings.lua b/settings.lua index baa69d0..5ffeef3 100644 --- a/settings.lua +++ b/settings.lua @@ -11,7 +11,7 @@ data:extend({ name = "bztitanium-mining-fluid", setting_type = "startup", default_value = "lubricant", - allowed_values = (mods["Krastorio2"] and {"lubricant", "sulfuric-acid", "chlorine"} or {"lubricant", "sulfuric-acid"}), + allowed_values = ((mods.Krastorio or mods["Krastorio-spaced-out"]) and {"lubricant", "sulfuric-acid", "kr-chlorine"} or {"lubricant", "sulfuric-acid"}), }, { type = "int-setting", diff --git a/titanium-data-settings.lua b/titanium-data-settings.lua index e6d999f..a0a8714 100644 --- a/titanium-data-settings.lua +++ b/titanium-data-settings.lua @@ -8,7 +8,7 @@ if settings.startup["bztitanium-mining-fluid"] then mining_fluid = settings.startup["bztitanium-mining-fluid"].value end -if mining_fluid == "chlorine" and data.raw.fluid["chlorine"] and mods["Krastorio2"] then +if mining_fluid == "chlorine" and data.raw.fluid["chlorine"] and util.k2() then data.raw.technology[util.me.titanium_processing].prerequisites = {"kr-fluids-chemistry"} data.raw.technology[util.me.titanium_processing].unit.ingredients = util.ALC else diff --git a/titanium-enriched.lua b/titanium-enriched.lua index 2047038..12d985d 100644 --- a/titanium-enriched.lua +++ b/titanium-enriched.lua @@ -1,7 +1,7 @@ -- Enriched Titanium for Krastorio2 local util = require("__bztitanium__.data-util"); -if mods["Krastorio2"] then +if util.k2() then data:extend( { { diff --git a/titanium-matter.lua b/titanium-matter.lua index e09d0e4..9ffe34b 100644 --- a/titanium-matter.lua +++ b/titanium-matter.lua @@ -1,6 +1,6 @@ -- Matter recipes for Krastorio2 -if mods["Krastorio2"] then local util = require("__bztitanium__.data-util"); +if util.k2() then data:extend( { diff --git a/titanium-recipe-final-k2.lua b/titanium-recipe-final-k2.lua index e8a4161..5bc4c37 100644 --- a/titanium-recipe-final-k2.lua +++ b/titanium-recipe-final-k2.lua @@ -2,24 +2,24 @@ -- There are other K2 changes throughout local util = require("__bztitanium__.data-util"); -if mods["Krastorio2"] then +if util.k2() then -- Titanium modifies flying robot frames, so use them in a reasonable tech card in Krastorio 2 - util.replace_ingredient("advanced-tech-card", "electric-engine-unit", "flying-robot-frame") + util.multiply_recipe("kr-advanced-tech-card", 2) + util.replace_ingredient("kr-advanced-tech-card", "electric-engine-unit", "flying-robot-frame", 5) -- Flavor changes - util.replace_ingredient("kr-electric-mining-drill-mk2", "rare-metals", util.me.titanium_plate) - util.replace_ingredient("kr-advanced-transport-belt", "rare-metals", util.me.titanium_plate) - util.replace_ingredient("kr-advanced-loader", "rare-metals", util.me.titanium_plate) + util.replace_ingredient("kr-electric-mining-drill-mk2", "kr-rare-metals", util.me.titanium_plate) + util.replace_ingredient("kr-advanced-transport-belt", "kr-rare-metals", util.me.titanium_plate) + util.replace_ingredient("kr-advanced-loader", "kr-rare-metals", util.me.titanium_plate) if mods["deadlock-beltboxes-loaders"] then - util.replace_ingredient("kr-advanced-transport-belt-beltbox", "rare-metals", util.me.titanium_plate) - util.replace_ingredient("kr-advanced-transport-belt-loader", "rare-metals", util.me.titanium_plate) + util.replace_ingredient("kr-advanced-transport-belt-beltbox", "kr-rare-metals", util.me.titanium_plate) + util.replace_ingredient("kr-advanced-transport-belt-loader", "kr-rare-metals", util.me.titanium_plate) end util.replace_ingredient("kr-quarry-drill", "steel-plate", util.me.titanium_plate) util.replace_ingredient("kr-singularity-lab", "steel-plate", util.me.titanium_plate) - util.replace_ingredient("stack-inserter", "steel-plate", util.me.titanium_plate) - util.replace_ingredient("stack-filter-inserter", "steel-plate", util.me.titanium_plate) + util.replace_ingredient("bulk-inserter", "steel-plate", util.me.titanium_plate) util.add_ingredient("kr-advanced-steam-turbine", util.me.titanium_plate, 40) diff --git a/titanium-recipe-final-stacking.lua b/titanium-recipe-final-stacking.lua index 5b733f2..e36b3f8 100644 --- a/titanium-recipe-final-stacking.lua +++ b/titanium-recipe-final-stacking.lua @@ -5,7 +5,7 @@ local util = require("__bztitanium__.data-util"); if deadlock and deadlock["add_stack"] then deadlock.add_stack("titanium-ore", "__bztitanium__/graphics/icons/stacked/titanium-ore-stacked.png", "deadlock-stacking-2", 64) deadlock.add_stack(util.me.titanium_plate, "__bztitanium__/graphics/icons/stacked/titanium-plate-stacked.png" , "deadlock-stacking-2", 64) - if mods["Krastorio2"] then + if util.k2() then deadlock.add_stack("enriched-titanium", "__bztitanium__/graphics/icons/stacked/enriched-titanium-stacked.png" , "deadlock-stacking-2", 64) end if data.raw.item["titanium-ingot"] then @@ -17,7 +17,7 @@ end if deadlock_crating then deadlock_crating.add_crate("titanium-ore", "deadlock-crating-2") deadlock_crating.add_crate(util.me.titanium_plate, "deadlock-crating-2") - if mods["Krastorio2"] then + if util.k2() then deadlock_crating.add_crate("enriched-titanium", "deadlock-crating-2") end if data.raw.item["titanium-ingot"] then diff --git a/titanium-recipe-se.lua b/titanium-recipe-se.lua index b3b9772..bd6020d 100644 --- a/titanium-recipe-se.lua +++ b/titanium-recipe-se.lua @@ -100,7 +100,7 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "titanium-ingot"}) util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "titanium-ingot-to-plate"}) util.add_prerequisite(data.raw.technology["se-processing-vulcanite"], util.me.titanium_processing) - if mods["Krastorio2"] then + if util.k2() then util.set_item_subgroup("enriched-titanium", "titanium") data.raw.recipe["enriched-titanium-plate"].order= "d[titanium-plate]" se_delivery_cannon_recipes["enriched-titanium"] = {name= "enriched-titanium"} @@ -108,7 +108,7 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then se_delivery_cannon_recipes["titanium-ingot"] = {name= "titanium-ingot"} else data.raw.item[util.me.titanium_plate].subgroup = "plates" - if mods["Krastorio2"] then + if util.k2() then data:extend({ { diff --git a/titanium-recipe-updates.lua b/titanium-recipe-updates.lua index 95b791f..c6a3df6 100644 --- a/titanium-recipe-updates.lua +++ b/titanium-recipe-updates.lua @@ -109,7 +109,7 @@ if not mods["pyrawores"] then end -- Krastorio 2 changes -if mods["Krastorio2"] then +if util.k2() then util.add_prerequisite("kr-electric-mining-drill-mk2", util.me.titanium_processing) util.add_prerequisite("kr-quarry-minerals-extraction", util.me.titanium_processing) end @@ -208,3 +208,4 @@ util.replace_ingredient("turbo-inserter", "steel-plate", util.me.titanium_plate) util.replace_ingredient("express-filter-inserter", "steel-plate", util.me.titanium_plate) util.replace_ingredient("express-stack-inserter", "steel-plate", util.me.titanium_plate) util.replace_ingredient("express-stack-filter-inserter", "steel-plate", util.me.titanium_plate) + diff --git a/titanium-recipe.lua b/titanium-recipe.lua index 92f3e12..ed04988 100644 --- a/titanium-recipe.lua +++ b/titanium-recipe.lua @@ -27,7 +27,7 @@ data:extend({ main_product = util.me.titanium_plate, category = "smelting", order = "d[titanium-plate]", - icons = (mods["Krastorio2"] and + icons = (util.k2() and { { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3,}, { icon = "__bztitanium__/graphics/icons/titanium-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}},