From ac9956add752003cdb75a9a031ce98d0f2d68c6e Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 6 Oct 2025 13:13:54 +0200 Subject: [PATCH 1/6] gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 72c1b51..318cbef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.bak *.blend* +.idea \ No newline at end of file From 19568fbb2eee28c9c9e05f5bd891e168cf56c4e4 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 6 Oct 2025 13:14:50 +0200 Subject: [PATCH 2/6] Fix SE landfill generation --- data-util.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data-util.lua b/data-util.lua index c4144a0..c0de5b4 100644 --- a/data-util.lua +++ b/data-util.lua @@ -504,8 +504,8 @@ function util.se_landfill(params) category = "hard-recycling", order = "z-b-"..params.ore, subgroup = "terrain", - result = "landfill", - ingredients = {{params.ore, 50}}, + results = {{ type = "item", name = "landfill", amount = 1 }}, + ingredients = {{ type = "item", name = params.ore, amount = 50}}, } }) util.add_unlock("se-recycling-facility", lname) From e7bbcad3450210125c2031b8e66ba70853736c27 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 6 Oct 2025 13:19:36 +0200 Subject: [PATCH 3/6] SE compatibility fixes --- data-util.lua | 20 ++++----- zirconium-recipe-se.lua | 95 ++--------------------------------------- 2 files changed, 12 insertions(+), 103 deletions(-) diff --git a/data-util.lua b/data-util.lua index c0de5b4..f6ac2d4 100644 --- a/data-util.lua +++ b/data-util.lua @@ -584,7 +584,6 @@ end -- se matter -- params: ore, energy_required, quant_out, quant_in, icon_size, stream_out function util.se_matter(params) - if mods["space-exploration"] > "0.6" then 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 @@ -611,15 +610,15 @@ function util.se_matter(params) energy_required = params.energy_required, enabled = false, ingredients = { - {sedata, 1}, + {type="item", name=sedata, amount=1}, {type="fluid", name="se-particle-stream", amount=50}, {type="fluid", name="se-space-coolant-supercooled", amount=25}, }, results = { - {params.ore, params.quant_out}, - {"se-contaminated-scrap", 1}, - {type=item, name=sedata, amount=1, probability=.99}, - {type=item, name=sejunk, amount=1, probability=.01}, + {type="item", name=params.ore, amount=params.quant_out}, + {type="item", name="se-contaminated-scrap", amount=1}, + {type="item", name=sedata, amount=1, probability=.99}, + {type="item", name=sejunk, amount=1, probability=.01}, {type="fluid", name="se-space-coolant-hot", amount=25, ignored_by_stats=25, ignored_by_productivity=25}, } } @@ -650,13 +649,13 @@ function util.se_matter(params) energy_required = 30, enabled = false, ingredients = { - {"se-kr-matter-liberation-data", 1}, - {params.ore, params.quant_in}, + {type="item", name="se-kr-matter-liberation-data", amount=1}, + {type="item", name=params.ore, amount=params.quant_in}, {type="fluid", name="se-particle-stream", amount=50}, }, results = { - {type=item, name="se-kr-matter-liberation-data", amount=1, probability=.99}, - {type=item, name=sejunk, amount=1, probability=.01}, + {type="item", name="se-kr-matter-liberation-data", amount=1, probability=.99}, + {type="item", name=sejunk, amount=1, probability=.01}, {type="fluid", name="se-particle-stream", amount=params.stream_out, ignored_by_stats=50, ignored_by_productivity=50}, } } @@ -695,7 +694,6 @@ function util.se_matter(params) end util.add_unlock("bz-advanced-stream-production", lname) end - end end -- deprecated diff --git a/zirconium-recipe-se.lua b/zirconium-recipe-se.lua index 539943d..b59141d 100644 --- a/zirconium-recipe-se.lua +++ b/zirconium-recipe-se.lua @@ -8,7 +8,6 @@ if mods["space-exploration"] then se_delivery_cannon_recipes["zirconium-plate"] = {name= "zirconium-plate"} util.se_landfill({ore="zircon"}) -if string.sub(mods["space-exploration"], 1, 3) == "0.6" then util.se_matter({ore="zircon", energy_required=1.5, quant_out=10, stream_out=60}) data:extend({ { @@ -67,7 +66,7 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then type = "recipe", name = "zirconium-ingot", category = "casting", - results = {{"zirconium-ingot", 1}}, + results = {{type = "item", name = "zirconium-ingot", amount = 1}}, energy_required = 75, ingredients = { {type = "fluid", name = "molten-zirconium", amount = 750}, @@ -86,11 +85,11 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then {icon = "__bzzirconium__/graphics/icons/zirconium-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, }, results = { - {name = "zirconium-plate", amount = 10}, + {type = "item", name = "zirconium-plate", amount = 10}, }, energy_required = 5, ingredients = { - {name = "zirconium-ingot", amount = 1} + {type = "item", name = "zirconium-ingot", amount = 1} }, enabled = false, always_show_made_in = true, @@ -110,92 +109,4 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then end se_delivery_cannon_recipes["zirconium-ingot"] = {name= "zirconium-ingot"} -else - -- Organization - data.raw.item["zirconia"].subgroup = "plates" - data.raw.recipe["zirconia"].subgroup = "plates" - data.raw.item["zirconium-plate"].subgroup = "plates" - data.raw.recipe["zirconium-plate"].subgroup = "plates" - - if util.k2() then - data:extend({ - { - type = "recipe", - name = "enriched-zirconia-smelting-vulcanite", - category = "smelting", - order = "z[zirconium-plate]", - energy_required = 24, - enabled = false, - always_show_made_in = true, - allow_as_intermediate = false, - ingredients = { - {name = "enriched-zircon", amount = 8}, - {name = "se-vulcanite-block", amount = 1}, - }, - results = { - {name = "zirconia", amount = 24}, - }, - icons = - { - { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128}, - { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, scale=0.25, shift= {-10, -10}}, - }, - }, - }) - table.insert(data.raw.technology["se-processing-vulcanite"].effects, - {type = "unlock-recipe", recipe= "enriched-zirconia-smelting-vulcanite"}) - data.raw.recipe["enriched-zircon"].order= "d[zircon]" - se_delivery_cannon_recipes["enriched-zircon"] = {name= "enriched-zircon"} - else - data:extend({ - { - type = "recipe", - name = "zircon-smelting-vulcanite", - category = "smelting", - order = "z[zirconium-plate]", - energy_required = 16, - enabled = false, - always_show_made_in = true, - allow_as_intermediate = false, - ingredients = { - {name = "zircon", amount = 8}, - {name = "se-vulcanite-block", amount = 1}, - }, - results = { - {name = "zirconia", amount = 24}, - }, - icons = - { - { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128, icon_mipmaps = 3,}, - { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, scale=0.25, shift= {-10, -10}}, - }, - }}) - util.add_effect("se-processing-vulcanite", {type = "unlock-recipe", recipe= "zircon-smelting-vulcanite"}) - end - data:extend({ - { - type = "recipe", - name = "zirconia-smelting-vulcanite", - category = "smelting", - order = "z[zirconium-plate]", - energy_required = 16, - enabled = false, - always_show_made_in = true, - allow_as_intermediate = false, - ingredients = { - {name = "zirconia", amount = 24}, - {name = "se-vulcanite-block", amount = 1}, - }, - results = { - {name = "zirconium-plate", amount = 12}, - }, - icons = - { - { icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128, icon_mipmaps = 3,}, - { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, scale=0.25, shift= {-10, -10}}, - }, - }, - }) - util.add_effect("se-processing-vulcanite", {type = "unlock-recipe", recipe= "zirconia-smelting-vulcanite"}) -end end From 6a8821e1b8059dfb2edfc370d5227ed8cca896fc Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sat, 11 Oct 2025 18:25:38 +0200 Subject: [PATCH 4/6] Mod compatibility fixes --- data-util.lua | 2 +- zirconium-recipe.lua | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/data-util.lua b/data-util.lua index f6ac2d4..2fa3d78 100644 --- a/data-util.lua +++ b/data-util.lua @@ -683,7 +683,7 @@ function util.se_matter(params) {"se-astronomic-science-pack-4", 1}, {"se-energy-science-pack-4", 1}, {"se-material-science-pack-4", 1}, - {"matter-tech-card", 1}, + {"kr-matter-tech-card", 1}, {"se-deep-space-science-pack-1", 1}, } diff --git a/zirconium-recipe.lua b/zirconium-recipe.lua index 7defd77..b6b7d42 100644 --- a/zirconium-recipe.lua +++ b/zirconium-recipe.lua @@ -325,6 +325,8 @@ if mods.bzsilicon then synth_i = "silica" elseif data.raw.item["sand"] then synth_i = "sand" +elseif data.raw.item["kr-sand"] then + synth_i = "kr-sand" end data:extend({ { From 3b73c24c154b47ac0841e519cdc2d956f32c7bf3 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 13 Oct 2025 15:59:48 +0200 Subject: [PATCH 5/6] Add missing ingredient types --- zirconium-recipe-se.lua | 2 +- zirconium-recipe.lua | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zirconium-recipe-se.lua b/zirconium-recipe-se.lua index b59141d..d74fd88 100644 --- a/zirconium-recipe-se.lua +++ b/zirconium-recipe-se.lua @@ -54,7 +54,7 @@ if mods["space-exploration"] then }, energy_required = 60, ingredients = { - {name = "zirconia", amount = 24}, + { type = "item", name = "zirconia", amount = 24}, {type = "fluid", name = "se-pyroflux", amount = 10}, }, enabled = false, diff --git a/zirconium-recipe.lua b/zirconium-recipe.lua index b6b7d42..cecf52c 100644 --- a/zirconium-recipe.lua +++ b/zirconium-recipe.lua @@ -39,8 +39,8 @@ data:extend({ -- energy_required = 8, -- ingredients = {util.item("zircon", 5)}, -- results = mods.bztitanium and util.me.byproduct() and { - -- {name="zirconia", amount_min=4, amount_max=5}, - -- {name="titanium-ore", amount=1, probability=.5} + -- { type = "item", name = "zirconia", amount_min=4, amount_max=5}, + -- { type = "item", name = "titanium-ore", amount=1, probability=.5} -- } or {util.item("zirconia", 5)} -- } or main_product = "zirconia", @@ -58,7 +58,7 @@ data:extend({ -- energy_required = 3.2, -- ingredients = {util.item("zircon", 1)}, -- results = mods.bztitanium and util.me.byproduct() and { - -- util.item("zirconia", 1), {name="titanium-ore", amount=1, probability=.05} + -- util.item("zirconia", 1), { type = "item", name = "titanium-ore", amount=1, probability=.05} -- } or {util.item("zirconia", 2)} -- } }, From d2c1425fcb928518fcb67521522b7cb1352561b4 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Thu, 16 Oct 2025 00:29:52 +0200 Subject: [PATCH 6/6] Fix pictures sizes --- zirconium-enriched.lua | 8 ++++---- zirconium-recipe.lua | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/zirconium-enriched.lua b/zirconium-enriched.lua index e6c75f1..1af128f 100644 --- a/zirconium-enriched.lua +++ b/zirconium-enriched.lua @@ -9,10 +9,10 @@ data:extend({ icon_size = 128, icon = "__bzzirconium__/graphics/icons/enriched-zircon.png", pictures = { - {filename="__bzzirconium__/graphics/icons/enriched-zircon.png", size=128, scale=0.125}, - {filename="__bzzirconium__/graphics/icons/enriched-zircon-2.png", size=128, scale=0.125}, - {filename="__bzzirconium__/graphics/icons/enriched-zircon-3.png", size=128, scale=0.125}, - {filename="__bzzirconium__/graphics/icons/enriched-zircon-4.png", size=128, scale=0.125}, + {filename="__bzzirconium__/graphics/icons/enriched-zircon.png", size=128, scale=0.25}, + {filename="__bzzirconium__/graphics/icons/enriched-zircon-2.png", size=128, scale=0.25}, + {filename="__bzzirconium__/graphics/icons/enriched-zircon-3.png", size=128, scale=0.25}, + {filename="__bzzirconium__/graphics/icons/enriched-zircon-4.png", size=128, scale=0.25}, }, subgroup = "raw-material", order = "e05-a[enriched-ores]-a1[enriched-zircon]", diff --git a/zirconium-recipe.lua b/zirconium-recipe.lua index cecf52c..4669dbd 100644 --- a/zirconium-recipe.lua +++ b/zirconium-recipe.lua @@ -208,11 +208,11 @@ data:extend({ icon = "__bzzirconium__/graphics/icons/cermet.png", icon_size = 128, pictures = { - {filename = "__bzzirconium__/graphics/icons/cermet.png", size=128, scale=0.125}, - {filename = "__bzzirconium__/graphics/icons/cermet-1.png", size=128, scale=0.125}, - {filename = "__bzzirconium__/graphics/icons/cermet-2.png", size=128, scale=0.125}, - {filename = "__bzzirconium__/graphics/icons/cermet-3.png", size=128, scale=0.125}, - {filename = "__bzzirconium__/graphics/icons/cermet-4.png", size=128, scale=0.125}, + {filename = "__bzzirconium__/graphics/icons/cermet.png", size=128, scale=0.25}, + {filename = "__bzzirconium__/graphics/icons/cermet-1.png", size=128, scale=0.25}, + {filename = "__bzzirconium__/graphics/icons/cermet-2.png", size=128, scale=0.25}, + {filename = "__bzzirconium__/graphics/icons/cermet-3.png", size=128, scale=0.25}, + {filename = "__bzzirconium__/graphics/icons/cermet-4.png", size=128, scale=0.25}, }, inventory_move_sound = item_sounds.wire_inventory_move, pick_sound = item_sounds.wire_inventory_pickup,