Skip to content

Compatibility fixes #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SimonBrodtmann wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Compatibility fixes #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ac9956a
gitignore
SimonBrodtmann Oct 6, 2025
19568fb
Fix SE landfill generation
SimonBrodtmann Oct 6, 2025
e7bbcad
SE compatibility fixes
SimonBrodtmann Oct 6, 2025
6a8821e
Mod compatibility fixes
SimonBrodtmann Oct 11, 2025
3b73c24
Add missing ingredient types
SimonBrodtmann Oct 13, 2025
d2c1425
Fix pictures sizes
SimonBrodtmann Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.bak
*.blend*
.idea
26 changes: 12 additions & 14 deletions data-util.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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},
}
}
Expand Down Expand Up @@ -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},
}
}
Expand Down Expand Up @@ -684,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},
}

Expand All @@ -695,7 +694,6 @@ function util.se_matter(params)
end
util.add_unlock("bz-advanced-stream-production", lname)
end
end
end

-- deprecated
Expand Down
8 changes: 4 additions & 4 deletions zirconium-enriched.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]",
Expand Down
97 changes: 4 additions & 93 deletions zirconium-recipe-se.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
{
Expand Down Expand Up @@ -55,7 +54,7 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then
},
energy_required = 60,
ingredients = {
{name = "zirconia", amount = 24},
{ type = "item", name = "zirconia", amount = 24},
{type = "fluid", name = "se-pyroflux", amount = 10},
},
enabled = false,
Expand All @@ -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},
Expand All @@ -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,
Expand All @@ -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
18 changes: 10 additions & 8 deletions zirconium-recipe.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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)}
-- }
},
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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({
{
Expand Down