From 9a1822780ba147e7698d12e03f5dfa362ae67749 Mon Sep 17 00:00:00 2001 From: pla Date: Tue, 22 Apr 2025 15:26:43 +0200 Subject: [PATCH 1/4] Added enriched tin plate to en --- locale/en/tin.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/locale/en/tin.cfg b/locale/en/tin.cfg index 6ad2865..5f13f14 100644 --- a/locale/en/tin.cfg +++ b/locale/en/tin.cfg @@ -54,6 +54,8 @@ jellyskin-processing=Jellyskin processing tin-from-organotins=Tin from organotins metallic-asteroid-crushing-tin=Metallic asteroid crushing for tin separation=__1__ separation +enriched-tin-plate=Tin plate from enriched tin + [recipe-description] tin-sulfides=Only possible on Vulcanus, extract tin from the released acidic gases. From 05f54ef8ff2378ac9a035387832566754d5475ff Mon Sep 17 00:00:00 2001 From: pla Date: Tue, 22 Apr 2025 15:27:48 +0200 Subject: [PATCH 2/4] K2 compatibility --- data-util.lua | 5 +- tin-enriched.lua | 18 +++---- tin-matter.lua | 104 ++++++++++++++++++++++++++++++++--------- tin-recipe-se.lua | 2 +- tin-recipe-updates.lua | 23 +++++---- 5 files changed, 105 insertions(+), 47 deletions(-) diff --git a/data-util.lua b/data-util.lua index 0e48dbf..9709d0e 100644 --- a/data-util.lua +++ b/data-util.lua @@ -117,10 +117,7 @@ end function util.get_stack_size(default) if mods.Krastorio2 then - local size = get_setting("kr-stack-size") - if size and tonumber(size) then - return tonumber(size) - end + return 200 end return default end diff --git a/tin-enriched.lua b/tin-enriched.lua index 80e1407..c169fa8 100644 --- a/tin-enriched.lua +++ b/tin-enriched.lua @@ -42,7 +42,7 @@ data:extend( results = { {type = "item", name = "enriched-tin", amount = 6}, - {type = "fluid", name = "dirty-water", amount = 25, catalyst_amount = 25} + {type = "fluid", name = "kr-dirty-water", amount = 25, catalyst_amount = 25} }, crafting_machine_tint = { @@ -67,28 +67,28 @@ data:extend( always_show_made_in = true, always_show_products = true, allow_productivity = true, - ingredients = { {"enriched-tin", 5} }, - results = { {"tin-plate", 5} }, + ingredients = { {type = "item", name = "enriched-tin", amount = 5} }, + results = { {type = "item", name = "tin-plate", amount = 5} }, order = "b[tin-plate]-b[enriched-tin-plate]", }, { type = "recipe", name = "dirty-water-filtration-tin", - category = "fluid-filtration", + category = "kr-fluid-filtration", icons = { { - icon = data.raw.fluid["dirty-water"].icon, - icon_size = data.raw.fluid["dirty-water"].icon_size + icon = data.raw.fluid["kr-dirty-water"].icon, + icon_size = data.raw.fluid["kr-dirty-water"].icon_size or 64 }, { icon = data.raw.item["tin-ore"].icon, icon_size = data.raw.item["tin-ore"].icon_size, - scale = 0.20 * (data.raw.fluid["dirty-water"].icon_size/data.raw.item["tin-ore"].icon_size), + scale = 0.20 * ((data.raw.fluid["kr-dirty-water"].icon_size or 64)/data.raw.item["tin-ore"].icon_size), shift = {0, 4} } }, - icon_size = data.raw.fluid["dirty-water"].icon_size, + icon_size = data.raw.fluid["kr-dirty-water"].icon_size, energy_required = 2, enabled = false, allow_as_intermediate = false, @@ -96,7 +96,7 @@ data:extend( always_show_products = true, ingredients = { - {type = "fluid", name = "dirty-water", amount = 100, catalyst_amount = 100}, + {type = "fluid", name = "kr-dirty-water", amount = 100, catalyst_amount = 100}, }, results = { diff --git a/tin-matter.lua b/tin-matter.lua index 00ea0ed..adc496e 100644 --- a/tin-matter.lua +++ b/tin-matter.lua @@ -1,27 +1,89 @@ -- Matter recipes for Krastorio2 +-- removed the use of the lib function, K2 function is not universal anymore +-- if mods["Krastorio2"] then +-- local util = require("data-util"); +-- util.k2matter({ +-- k2matter = { +-- item_name = "tin-ore", +-- matter_value = 5, +-- energy_required = 1, +-- need_stabilizer = false, +-- unlocked_by_technology = "tin-matter-processing", +-- }, +-- k2baseicon = "stone", +-- icon = { icon = "__bztin__/graphics/icons/tin-ore.png", icon_size = 64, scale = 1.4} +-- }) + +-- util.k2matter({ +-- k2matter = { +-- item_name = "tin-plate", +-- minimum_conversion_quantity = 10, +-- matter_value = 10, +-- energy_required = 3, +-- only_deconversion = true, +-- need_stabilizer = true, +-- unlocked_by_technology = "tin-matter-processing", +-- }, +-- }) +-- end + if mods["Krastorio2"] then - local util = require("data-util"); - util.k2matter({ - k2matter = { - item_name = "tin-ore", - matter_value = 5, - energy_required = 1, - need_stabilizer = false, - unlocked_by_technology = "tin-matter-processing", + local util = require("__bztin__.data-util"); + local matter = require("__Krastorio2__/prototypes/libraries/matter") + + data:extend( + { + { + type = "technology", + name = "tin-matter-processing", + icons = + { + { + icon = util.k2assets().."/technologies/backgrounds/matter.png", + icon_size = 256, + }, + { + icon = "__bztin__/graphics/icons/tin-ore.png", + icon_size = 64, + scale = 0.9, + } + }, + prerequisites = {"kr-matter-processing"}, + unit = + { + count = 350, + ingredients = + { + {"production-science-pack", 1}, + {"utility-science-pack", 1}, + {"kr-matter-tech-card", 1} + }, + time = 45 + }, + effects = {} }, - k2baseicon = "stone", - icon = { icon = "__bztin__/graphics/icons/tin-ore.png", icon_size = 64, scale = 1.4} }) - - util.k2matter({ - k2matter = { - item_name = "tin-plate", - minimum_conversion_quantity = 10, - matter_value = 10, + + local tin_ore_matter = + { + material = { type = "item", name = "tin-ore", amount = 10 }, + matter_count = 5, + energy_required = 1, + need_stabilizer = false, + unlocked_by = "tin-matter-processing" + } + matter.make_recipes(tin_ore_matter) + + + local tin_plate_matter = + { + material = { type = "item", name = "tin-plate", amount = 10 }, + matter_count = 10, energy_required = 3, - only_deconversion = true, + -- only_deconversion = true, need_stabilizer = true, - unlocked_by_technology = "tin-matter-processing", - }, - }) -end + unlocked_by = "tin-matter-processing" + } + matter.make_deconversion_recipe(tin_plate_matter) + + end diff --git a/tin-recipe-se.lua b/tin-recipe-se.lua index 4f7ce37..4650532 100644 --- a/tin-recipe-se.lua +++ b/tin-recipe-se.lua @@ -50,7 +50,7 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then }, energy_required = 45, ingredients = { - {name = mods.Krastorio2 and "enriched-tin" or "tin-ore", amount = 24}, + {type = "item", name = mods.Krastorio2 and "enriched-tin" or "tin-ore", amount = 24}, {type = "fluid", name = "se-pyroflux", amount = 10}, }, enabled = false, diff --git a/tin-recipe-updates.lua b/tin-recipe-updates.lua index d33aee2..1887eab 100644 --- a/tin-recipe-updates.lua +++ b/tin-recipe-updates.lua @@ -47,10 +47,10 @@ util.add_ingredient("rocket-silo", "solder", 100) util.add_ingredient("accumulator", "solder", 2) util.add_ingredient("se-space-accumulator", "solder", 2) util.add_ingredient("storage-tank", "solder", 4) -util.add_ingredient("kr-fluid-storage-1", "solder", 4) -util.add_ingredient("kr-fluid-storage-2", "solder", 12) +util.add_ingredient("kr-fluid-stokr-big-storage-tankrage-1", "solder", 4) +util.add_ingredient("kr-huge-storage-tank", "solder", 12) util.add_ingredient("substation", "solder", 2) -util.add_ingredient("kr-substation-mk2", "solder", 2) +util.add_ingredient("kr-superior-substation", "solder", 2) util.add_ingredient("se-pylon-substation", "solder", 2) util.add_ingredient("se-pylon", "solder", 2) util.add_ingredient("se-holmium-solenoid", "solder", 2) @@ -63,9 +63,9 @@ util.add_ingredient("se-holmium-solenoid", "solder", 2) -- glass if mods.Krastorio2 then - util.replace_some_ingredient("glass", "sand", 1, "tin-plate", 1) - util.add_product("glass", {type="item", name="tin-plate", amount=1, catalyst_amount=1, probability=0.8}) - util.set_main_product("glass", "glass") + util.replace_some_ingredient("kr-glass", "kr-sand", 1, "tin-plate", 1) + util.add_product("kr-glass", {type="item", name="tin-plate", amount=1, catalyst_amount=1, probability=0.8}) + util.set_main_product("kr-glass", "kr-glass") else if mods.bzfoundry then if not mods.bzaluminum then @@ -97,7 +97,7 @@ end util.add_ingredient("kr-fuel-refinery", "solder", 5) util.add_ingredient("kr-electrolysis-plant", "solder", 10) util.replace_some_ingredient("kr-steel-pipe-to-ground", "steel-plate", 3, "solder", 8) -util.replace_ingredient("kr-biomass-growing", "petroleum-gas", "organotins") +util.replace_ingredient("kr-biomass", "petroleum-gas", "organotins") util.add_product("se-scrap-recycling", {type="item", name="tin-ore", amount=1, probability=0.05}) @@ -114,11 +114,11 @@ util.add_ingredient("se-space-biochemical-laboratory", "solder", 8) util.add_ingredient("se-decontamination-facility", "solder", 10) util.add_ingredient("se-life-support-facility", "solder", 40) -util.multiply_recipe("lithium-sulfur-battery", 2) -util.replace_some_ingredient("lithium-sulfur-battery", "copper-plate", 1, "tin-plate", 1) +util.multiply_recipe("kr-lithium-sulfur-battery", 2) +util.replace_some_ingredient("kr-lithium-sulfur-battery", "copper-plate", 1, "tin-plate", 1) util.add_ingredient("roboport", "solder", 20) -util.add_ingredient("kr-large-roboport", "solder", 20) +util.add_ingredient("kr-big-roboport", "solder", 20) util.add_ingredient("kr-small-roboport", "solder", 10) util.add_ingredient("se-supercharger", "solder", 15) util.add_ingredient("kr-filtration-plant", "solder", 4) @@ -179,8 +179,7 @@ if util.me.use_bronze() then local fast_i = mods.bzaluminum and "aluminum-plate" or "iron-plate" util.replace_some_ingredient("fast-inserter", fast_i, 1, "bronze-plate", 1) if mods.Krastorio2 then - util.replace_some_ingredient("filter-inserter", fast_i, 1, "bronze-plate", 1) - util.replace_ingredient("kr-steel-pump", "steel-beam", "bronze-plate", 4) + util.replace_ingredient("kr-steel-pump", "kr-steel-beam", "bronze-plate", 4) end util.replace_ingredient("pump", "steel-plate", "bronze-plate", 2) From ff4684a3a6aa23e9f531273ccf2be10fd8bf34a7 Mon Sep 17 00:00:00 2001 From: pla Date: Tue, 22 Apr 2025 15:37:52 +0200 Subject: [PATCH 3/4] fixed type needs_stabilizer --- tin-matter.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tin-matter.lua b/tin-matter.lua index adc496e..bf6a31b 100644 --- a/tin-matter.lua +++ b/tin-matter.lua @@ -69,7 +69,7 @@ if mods["Krastorio2"] then material = { type = "item", name = "tin-ore", amount = 10 }, matter_count = 5, energy_required = 1, - need_stabilizer = false, + needs_stabilizer = false, unlocked_by = "tin-matter-processing" } matter.make_recipes(tin_ore_matter) @@ -81,7 +81,7 @@ if mods["Krastorio2"] then matter_count = 10, energy_required = 3, -- only_deconversion = true, - need_stabilizer = true, + needs_stabilizer = true, unlocked_by = "tin-matter-processing" } matter.make_deconversion_recipe(tin_plate_matter) From 77c27ce4cc984f7a4c9e46d9f70934a0dd6cd2e0 Mon Sep 17 00:00:00 2001 From: pla Date: Tue, 29 Apr 2025 11:24:29 +0200 Subject: [PATCH 4/4] Fixed K2 matter util path and stacksize function --- data-util.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data-util.lua b/data-util.lua index 9709d0e..580e35c 100644 --- a/data-util.lua +++ b/data-util.lua @@ -116,8 +116,8 @@ function util.fe_plus(sub) end function util.get_stack_size(default) - if mods.Krastorio2 then - return 200 + if mods.Krastorio2 and kr_adjust_stack_sizes then + return tonumber(200) end return default end @@ -512,7 +512,7 @@ end -- k2 matter -- params: {k2matter}, k2baseicon , {icon} function util.k2matter(params) - local matter = require("__Krastorio2__/lib/public/data-stages/matter-util") + local matter = require("__Krastorio2__/prototypes/libraries/matter") if mods["space-exploration"] then params.k2matter.need_stabilizer = true end