cacklingfiend/ChemistryForYou2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mod compatibility fixes

Browse source
This commit is contained in:
Simon Brodtmann 2025-10-11 17:41:22 +02:00
parent 4ee2a3e57c
commit ef72fe66ce
3 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChemistryForYou2/data-util.lua
View file

@ -129,7 +129,7 @@ function util.se_matter(params)
{"se-astronomic-science-pack-4", 1}, {"se-astronomic-science-pack-4", 1},
{"se-energy-science-pack-4", 1}, {"se-energy-science-pack-4", 1},
{"se-material-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}, {"se-deep-space-science-pack-1", 1},
} }
}, },

58
ChemistryForYou2/prototypes/recipes.lua
View file

@ -245,7 +245,7 @@ data:extend({
enabled = false, enabled = false,
energy_required = 10, energy_required = 10,
ingredients = {(data.raw.item["aluminum-plate"] and {type="item", name="aluminum-plate", amount=2}) or {type="item", name="iron-plate", amount=2}, {type="item", name="sodium-hydroxide", amount=2}, {type="fluid", name="water", amount=20}}, ingredients = {(data.raw.item["aluminum-plate"] and {type="item", name="aluminum-plate", amount=2}) or {type="item", name="iron-plate", amount=2}, {type="item", name="sodium-hydroxide", amount=2}, {type="fluid", name="water", amount=20}},
results = {{type="item", name="aluminium-hydroxide", amount=2}, (data.raw.fluid["hydrogen"] and {type="fluid", name="hydrogen", amount=30}) or {type="fluid", name="water", amount=10}}, results = {{type="item", name="aluminium-hydroxide", amount=2}, (data.raw.fluid["kr-hydrogen"] and {type="fluid", name="kr-hydrogen", amount=30}) or {type="fluid", name="water", amount=10}},
}, },
{ {
type = "recipe", type = "recipe",
@ -261,8 +261,8 @@ data:extend({
}) })
local sodium_diuranate_ingredients = {{type="item", name="sodium-hydroxide", amount = 10}, { type = "fluid", name = "water", amount = 100 }} local sodium_diuranate_ingredients = {{type="item", name="sodium-hydroxide", amount = 10}, { type = "fluid", name = "water", amount = 100 }}
if data.raw.item["sand"] then if data.raw.item[mods["Krastorio2"] and "kr-sand" or "sand"] then
table.insert(sodium_diuranate_ingredients, {type="item", name="sand", amount=1}) table.insert(sodium_diuranate_ingredients, {type="item", name=mods["Krastorio2"] and "kr-sand" or "sand", amount=1})
end end
data:extend({ data:extend({
{ {
@ -390,9 +390,9 @@ data:extend({
} }
}) })
local hydrogen_peroxide_ingredients = {(data.raw.fluid["hydrogen"] and { type = "fluid", name = "hydrogen", amount = 50 }) or { type = "fluid", name = "water", amount = 100 }} local hydrogen_peroxide_ingredients = {(data.raw.fluid["kr-hydrogen"] and { type = "fluid", name = "kr-hydrogen", amount = 50 }) or { type = "fluid", name = "water", amount = 100 }}
if data.raw.fluid["oxygen"] then if data.raw.fluid["kr-oxygen"] then
table.insert(hydrogen_peroxide_ingredients, { type = "fluid", name = "oxygen", amount = 50 }) table.insert(hydrogen_peroxide_ingredients, { type = "fluid", name = "kr-oxygen", amount = 50 })
end end
if data.raw.item["palladium-ingot"] then if data.raw.item["palladium-ingot"] then
table.insert(hydrogen_peroxide_ingredients, {type="item", name="palladium-ingot", amount=1}) table.insert(hydrogen_peroxide_ingredients, {type="item", name="palladium-ingot", amount=1})
@ -418,8 +418,8 @@ local hydrogen_peroxide_disproportionation_results = {{ type = "fluid", name = "
if data.raw.item["platinum-ingot"] then if data.raw.item["platinum-ingot"] then
table.insert(hydrogen_peroxide_disproportionation_ingredients, {type="item", name="platinum-ingot", amount=1}) table.insert(hydrogen_peroxide_disproportionation_ingredients, {type="item", name="platinum-ingot", amount=1})
end end
if data.raw.fluid["oxygen"] then if data.raw.fluid["kr-oxygen"] then
table.insert(hydrogen_peroxide_disproportionation_results, { type = "fluid", name = "oxygen", amount = 25 }) table.insert(hydrogen_peroxide_disproportionation_results, { type = "fluid", name = "kr-oxygen", amount = 25 })
end end
data:extend({ data:extend({
@ -552,7 +552,7 @@ local science_pack = "__ChemistryForYou2__/graphics/icons/productivity-science-p
type = "recipe", type = "recipe",
name = "rich-water-filtration", name = "rich-water-filtration",
category = fluidFiltrationCraft, category = fluidFiltrationCraft,
icon = "__248k-Redux__/ressources/fluids/fi_dirty_water.png", icon = "__248k-Redux-graphics__/ressources/fluids/fi_dirty_water.png",
icon_size = 64, icon_size = 64,
group = "fi_item_group", group = "fi_item_group",
subgroup = "fi_item_subgroup_f", subgroup = "fi_item_subgroup_f",
@ -567,8 +567,8 @@ local science_pack = "__ChemistryForYou2__/graphics/icons/productivity-science-p
name = "nuclear-waste-extraction", name = "nuclear-waste-extraction",
category = "chemistry", category = "chemistry",
icons = { icons = {
{ icon = "__248k-Redux__/ressources/fission/fi_fuel/fi_fuel_plutonium239_item.png", icon_size = 64}, { icon = "__248k-Redux-graphics__/ressources/fission/fi_fuel/fi_fuel_plutonium239_item.png", icon_size = 64},
{ icon = "__248k-Redux__/ressources/fission/fi_materials/fi_materials_waste.png", icon_size = 64, scale=0.25, shift= {-8, -8}}, { icon = "__248k-Redux-graphics__/ressources/fission/fi_materials/fi_materials_waste.png", icon_size = 64, scale=0.25, shift= {-8, -8}},
}, },
group = "fi_item_group", group = "fi_item_group",
subgroup = "fi_item_subgroup_f", subgroup = "fi_item_subgroup_f",
@ -588,13 +588,13 @@ if mods["Krastorio2"] then
if data.raw.item["nylon"] then if data.raw.item["nylon"] then
table.insert(ammonium_nitrate_explosive_ingredients, {type="item", name="nylon", amount = 8 }) table.insert(ammonium_nitrate_explosive_ingredients, {type="item", name="nylon", amount = 8 })
end end
local sulfur_trioxide_ingredients = {{ type = "fluid", name = "sulfur-dioxide", amount = 100 }, { type = "fluid", name = "oxygen", amount = 50 }} local sulfur_trioxide_ingredients = {{ type = "fluid", name = "sulfur-dioxide", amount = 100 }, { type = "fluid", name = "kr-oxygen", amount = 50 }}
if data.raw.item["platinum-ingot"] then if data.raw.item["platinum-ingot"] then
table.insert(sulfur_trioxide_ingredients, {type="item", name="platinum-ingot", amount=1}) table.insert(sulfur_trioxide_ingredients, {type="item", name="platinum-ingot", amount=1})
end end
local sulfur_trioxide_results = {{ type = "fluid", name = "sulfur-trioxide", amount = 100 }} local sulfur_trioxide_results = {{ type = "fluid", name = "sulfur-trioxide", amount = 100 }}
if data.raw.item["platinum-ingot"] then if data.raw.item["platinum-ingot"] then
table.insert(sulfur_trioxide_results, {name="platinum-ingot", amount=1, probability=0.6}) table.insert(sulfur_trioxide_results, {type="item", name="platinum-ingot", amount=1, probability=0.6})
end end
data:extend({ data:extend({
{ {
@ -643,7 +643,7 @@ data:extend({
order = "a", order = "a",
enabled = false, enabled = false,
energy_required = 8, energy_required = 8,
ingredients = {{ type = "fluid", name = "nitrate", amount = 100 }, { type = "fluid", name = "ammonia", amount = 100 }}, ingredients = {{ type = "fluid", name = "nitrate", amount = 100 }, { type = "fluid", name = "kr-ammonia", amount = 100 }},
results = {{type="item", name="ammonium-nitrate",amount = 10 }}, results = {{type="item", name="ammonium-nitrate",amount = 10 }},
}, },
{ {
@ -665,13 +665,13 @@ data:extend({
order = "n", order = "n",
enabled = false, enabled = false,
energy_required = 10, energy_required = 10,
ingredients = {{ type = "fluid", name = "nitrogen", amount = 50 }, { type = "fluid", name = "oxygen", amount = 150 }},--should be made from Nitric acid but this works for now ingredients = {{ type = "fluid", name = "nitrogen", amount = 50 }, { type = "fluid", name = "kr-oxygen", amount = 150 }},--should be made from Nitric acid but this works for now
results = {{ type = "fluid", name = "nitrate", amount = 100 }}, results = {{ type = "fluid", name = "nitrate", amount = 100 }},
}, },
{ {
type = "recipe", type = "recipe",
name = "carbon-dioxide-condensation", name = "carbon-dioxide-condensation",
category = "atmosphere-condensation", category = "kr-atmosphere-condensation",
subgroup = "raw-material", subgroup = "raw-material",
order = "c", order = "c",
enabled = false, enabled = false,
@ -720,13 +720,13 @@ data:extend({
order = "a[fluid]-i[sulfur]", order = "a[fluid]-i[sulfur]",
enabled = false, enabled = false,
energy_required = 10, energy_required = 10,
ingredients = {{type = "item", name = "sulfur",amount = 10 }, { type = "fluid", name = "oxygen", amount = 150 }}, ingredients = {{type = "item", name = "sulfur",amount = 10 }, { type = "fluid", name = "kr-oxygen", amount = 150 }},
results = {{ type = "fluid", name = "sulfur-trioxide", amount = 100 }}, results = {{ type = "fluid", name = "sulfur-trioxide", amount = 100 }},
}, },
{ {
type = "recipe", type = "recipe",
name = "grow-wood-with-carbon-dioxide", name = "grow-wood-with-carbon-dioxide",
category = "bioprocessing", category = "kr-bioprocessing",
subgroup = "chemical", subgroup = "chemical",
main_porduct = "wood", main_porduct = "wood",
order = "a-b", order = "a-b",
@ -743,7 +743,7 @@ data:extend({
order = "w", order = "w",
enabled = false, enabled = false,
energy_required = 3, energy_required = 3,
ingredients = {{type = "item", name = "sodium-carbonate", amount = 10 }, { type = "fluid", name = "mineral-water", amount = 100 }}, ingredients = {{type = "item", name = "sodium-carbonate", amount = 10 }, { type = "fluid", name = "kr-mineral-water", amount = 100 }},
results = {{ type = "fluid", name = "water", amount = 100 }}, results = {{ type = "fluid", name = "water", amount = 100 }},
} }
}) })
@ -853,17 +853,17 @@ if mods["bzsilicon"] then
order = "s", order = "s",
icons = (mods["Krastorio2"] and icons = (mods["Krastorio2"] and
{ {
{ icon = "__Krastorio2Assets__/icons/items-with-variations/silicon/silicon.png", icon_size = 64}, { icon = "__Krastorio2Assets__/icons/items/silicon.png", icon_size = 64},
{ icon = "__ChemistryForYou2__/graphics/icons/sodium-aluminate.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, { icon = "__ChemistryForYou2__/graphics/icons/sodium-aluminate.png", icon_size = 128, scale=0.125, shift= {-8, -8}},
} or { } or {
{ icon = "__Krastorio2Assets__/icons/items-with-variations/silicon/silicon.png", icon_size = 64}, { icon = "__Krastorio2Assets__/icons/items/silicon.png", icon_size = 64},
}), }),
main_product = "silica", main_product = "silica",
subgroup = "chemical", subgroup = "chemical",
enabled = false, enabled = false,
energy_required = 10, energy_required = 10,
ingredients = {{type="item", name="sodium-aluminate", amount=10}, { type = "fluid", name = "water", amount = 100 }}, ingredients = {{type="item", name="sodium-aluminate", amount=10}, { type = "fluid", name = "water", amount = 100 }},
results = {{type="item", name="silica", 10}, {"sodium-aluminate", amount=9}, { type = "fluid", name = "water", amount = 90 }} results = {{type="item", name="silica", amount=10}, {type="item", name="sodium-aluminate", amount=9}, { type = "fluid", name = "water", amount = 90 }}
}, },
{ {
type = "recipe", type = "recipe",
@ -877,12 +877,12 @@ if mods["bzsilicon"] then
} or { } or {
{ icon = "__bzsilicon__/graphics/icons/silicon.png", icon_size = 64}, { icon = "__bzsilicon__/graphics/icons/silicon.png", icon_size = 64},
}), }),
main_product = "silicon", main_product = mods["Krastorio2"] and "kr-silicon" or "silicon",
subgroup = "intermediate-product", subgroup = "intermediate-product",
enabled = false, enabled = false,
energy_required = 10, energy_required = 10,
ingredients = {{type="item", name="silica", 9}, {type = "item", name = "aluminum-plate", amount=12}}, ingredients = {{type="item", name="silica", amount=9}, {type = "item", name = "aluminum-plate", amount=12}},
results = {{type="item", name="silicon", 9}, {type = "item", name = "alumina", amount=6}} results = {{type="item", name=mods["Krastorio2"] and "kr-silicon" or "silicon", amount=9}, {type = "item", name = "alumina", amount=6}}
}, },
}) })
if mods["bzgas"] then if mods["bzgas"] then
@ -917,11 +917,11 @@ if mods["bzsilicon"] then
order = "c", order = "c",
icons = { icons = {
{ icon = "__Nylon2__/graphics/icons/coal-tar.png", icon_size = 64}, { icon = "__Nylon2__/graphics/icons/coal-tar.png", icon_size = 64},
{ icon = "__Krastorio2Assets__/icons/items-with-variations/biomass/biomass.png", icon_size = 64, scale=0.2, shift= {-8, -8}},}, { icon = "__Krastorio2Assets__/icons/items/biomass.png", icon_size = 64, scale=0.2, shift= {-8, -8}},},
subgroup = "chemical", subgroup = "chemical",
enabled = false, enabled = false,
energy_required = 4, energy_required = 4,
ingredients = {{type="item", name="biomass", amount=10}, {type = "item", name = "sodium-hydroxide", amount=10}}, ingredients = {{type="item", name="kr-biomass", amount=10}, {type = "item", name = "sodium-hydroxide", amount=10}},
results = {{ type = "fluid", name = "coal-tar", amount = 10 }} results = {{ type = "fluid", name = "coal-tar", amount = 10 }}
}, },
}) })
@ -1131,7 +1131,7 @@ if mods["space-exploration"] then
order = "a-b", order = "a-b",
enabled = false, enabled = false,
energy_required = 20, energy_required = 20,
ingredients = {{type="item", name="se-vulcanite-block", amount=1}, {"fi_thorium232_item", amount=10}}, ingredients = {{type="item", name="se-vulcanite-block", amount=1}, {type="item", name="fi_thorium232_item", amount=10}},
results = {{type="item", name="se-vulcanite-enriched", amount=5}}, results = {{type="item", name="se-vulcanite-enriched", amount=5}},
}, },
{ {
@ -1202,7 +1202,7 @@ if mods["space-exploration"] then
order = "t", order = "t",
enabled = false, enabled = false,
energy_required = 30, energy_required = 30,
ingredients = {{type="item", name="tungsten-trioxide", amount=10}, { type = "fluid", name = "hydrogen", amount = 300 }}, ingredients = {{type="item", name="tungsten-trioxide", amount=10}, { type = "fluid", name = "kr-hydrogen", amount = 300 }},
results = {{type="item", name="tungsten-plate", amount=10}, { type = "fluid", name = "water", amount = 300 }}, results = {{type="item", name="tungsten-plate", amount=10}, { type = "fluid", name = "water", amount = 300 }},
}, },
{ {

12
ChemistryForYou2/prototypes/technology.lua
View file

@ -493,7 +493,7 @@ if mods["Krastorio2"] then
{ {
type = "technology", type = "technology",
name = "advanced-silicon-processing", name = "advanced-silicon-processing",
icon = "__Krastorio2Assets__/icons/items-with-variations/silicon/silicon.png", icon = "__Krastorio2Assets__/icons/items/silicon.png",
icon_size = 64, icon_size = 64,
prerequisites = {"productivity-science-pack"}, prerequisites = {"productivity-science-pack"},
effects = { effects = {
@ -560,7 +560,7 @@ if mods["248k-Redux"] then
{ {
type = "technology", type = "technology",
name = "rich-water-filtration", name = "rich-water-filtration",
icon = "__248k-Redux__/ressources/fluids/fi_dirty_water.png", icon = "__248k-Redux-graphics__/ressources/fluids/fi_dirty_water.png",
icon_size = 64, icon_size = 64,
prerequisites = rich_water_filtration_pre, prerequisites = rich_water_filtration_pre,
effects = { effects = {
@ -587,10 +587,10 @@ if mods["248k-Redux"] then
name = "nuclear-waste-extraction", name = "nuclear-waste-extraction",
icons = (mods["Krastorio2"] and icons = (mods["Krastorio2"] and
{ {
{ icon = "__248k-Redux__/ressources/fission/fi_fuel/fi_fuel_plutonium239_item.png", icon_size = 64}, { icon = "__248k-Redux-graphics__/ressources/fission/fi_fuel/fi_fuel_plutonium239_item.png", icon_size = 64},
{ icon = "__248k-Redux__/ressources/fission/fi_materials/fi_materials_waste.png", icon_size = 64, scale=0.5, shift= {-8, -8}}, { icon = "__248k-Redux-graphics__/ressources/fission/fi_materials/fi_materials_waste.png", icon_size = 64, scale=0.5, shift= {-8, -8}},
} or { } or {
{ icon = "__248k-Redux__/ressources/fission/fi_fuel/fi_fuel_plutonium239_item.png", icon_size = 64}, { icon = "__248k-Redux-graphics__/ressources/fission/fi_fuel/fi_fuel_plutonium239_item.png", icon_size = 64},
} }
), ),
prerequisites = {"rich-water-filtration", "nuclear-power"}, prerequisites = {"rich-water-filtration", "nuclear-power"},
@ -670,7 +670,7 @@ if mods["space-exploration"] then
{"production-science-pack", 1}, {"production-science-pack", 1},
{"se-material-science-pack-3", 1}, {"se-material-science-pack-3", 1},
{"se-energy-science-pack-3", 1}, {"se-energy-science-pack-3", 1},
{"matter-tech-card", 1} {"kr-matter-tech-card", 1}
} }
preMatterParticle = {"kr-matter-tech-card", "se-material-science-pack-3"} preMatterParticle = {"kr-matter-tech-card", "se-material-science-pack-3"}
end end