From e7bbcad3450210125c2031b8e66ba70853736c27 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 6 Oct 2025 13:19:36 +0200 Subject: [PATCH] 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