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

Add missing ingredient types + compatibility fixes

Browse source
This commit is contained in:
Simon Brodtmann 2025-10-13 16:00:31 +02:00
parent e4e82c98e8
commit a52835dd77
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ChemistryForYou2/prototypes/recipes.lua
View file

@ -68,7 +68,7 @@ if mods["bzaluminum"] then
end end
local sodaLimeGlassCategory = "crafting" local sodaLimeGlassCategory = "crafting"
if not data.raw.item["glass"] then if not data.raw.item["glass"] and not data.raw.item["kr-glass"] then
data:extend({ data:extend({
{ {
type = "item", type = "item",
@ -521,11 +521,11 @@ data:extend({
} or { } or {
{ icon = "__ChemistryForYou2__/graphics/icons/glass.png", icon_size = 64}, { icon = "__ChemistryForYou2__/graphics/icons/glass.png", icon_size = 64},
}), }),
main_product = "glass", main_product = mods["Krastorio2"] and "kr-glass" or "glass",
enabled = false, enabled = false,
energy_required = 16, energy_required = 16,
ingredients = {{type="item", name="sodium-carbonate", amount=10}, (data.raw.item["quicklime"] and {type = "item", name = "quicklime", amount=10}) or {type = "item", name = "stone", amount=5}, (data.raw.item["alumina"] and {type = "item", name = "alumina", amount=1}) or {type = "item", name = "iron-plate", amount=1}}, ingredients = {{type="item", name="sodium-carbonate", amount=10}, (data.raw.item["quicklime"] and {type = "item", name = "quicklime", amount=10}) or {type = "item", name = "stone", amount=5}, (data.raw.item["alumina"] and {type = "item", name = "alumina", amount=1}) or {type = "item", name = "iron-plate", amount=1}},
results = {{type="item", name = "glass", amount=10}} results = {{type="item", name = mods["Krastorio2"] and "kr-glass" or "glass", amount=10}}
} }
}) })
@ -536,16 +536,16 @@ local science_pack = "__ChemistryForYou2__/graphics/icons/productivity-science-p
if mods["248k-Redux"] then if mods["248k-Redux"] then
local rich_water_filtration_results = {data.raw.item["lithium"] and {type = "item", name="lithium", amount=5} or {type = "item", name="el_lithium_item", amount=5}, {type="fluid", name="water", amount=100}} local rich_water_filtration_results = {data.raw.item["lithium"] and {type = "item", name="lithium", amount=5} or {type = "item", name="el_lithium_item", amount=5}, {type="fluid", name="water", amount=100}}
if data.raw.item["cobaltite-ore"] then if data.raw.item["cobaltite-ore"] then
table.insert(rich_water_filtration_results, {name="cobaltite-ore", amount=1, probability=0.2}) table.insert(rich_water_filtration_results, { type = "item", name = "cobaltite-ore", amount=1, probability=0.2})
end end
if data.raw.item["gold-ore"] then if data.raw.item["gold-ore"] then
table.insert(rich_water_filtration_results, {name="gold-ore", amount=1, probability=0.1}) table.insert(rich_water_filtration_results, { type = "item", name = "gold-ore", amount=1, probability=0.1})
end end
if data.raw.item["platinum-powder"] then if data.raw.item["platinum-powder"] then
table.insert(rich_water_filtration_results, {name="platinum-powder", amount=1, probability=0.1}) table.insert(rich_water_filtration_results, { type = "item", name = "platinum-powder", amount=1, probability=0.1})
end end
if data.raw.item["palladium-powder"] then if data.raw.item["palladium-powder"] then
table.insert(rich_water_filtration_results, {name="palladium-powder", amount=1, probability=0.1}) table.insert(rich_water_filtration_results, { type = "item", name = "palladium-powder", amount=1, probability=0.1})
end end
data:extend({ data:extend({
{ {
@ -1149,7 +1149,7 @@ if mods["space-exploration"] then
util.add_productivity("deep-space-ore-enrichment") util.add_productivity("deep-space-ore-enrichment")
end end
if mods["bztungsten"] then if mods["bztungsten"] then
local smart_glass_ingredients = {{type="item", name="tungsten-trioxide", amount=10}, {type="item", name="glass", amount=10}} local smart_glass_ingredients = {{type="item", name="tungsten-trioxide", amount=10}, {type="item", name=mods["Krastorio2"] and "kr-glass" or "glass", amount=10}}
if data.raw.item["graphene"] then if data.raw.item["graphene"] then
table.insert(smart_glass_ingredients, {type="item", name="graphene", amount=4}) table.insert(smart_glass_ingredients, {type="item", name="graphene", amount=4})
end end

11
ChemistryForYou2/recipe-modify.lua
View file

@ -2,6 +2,7 @@ local util = require("data-util")
-- Main vanilla changes -- Main vanilla changes
local glass_name = mods["Krastorio2"] and "kr-glass" or "glass"
-- Mod changes -- Mod changes
if mods["248k-Redux"] then if mods["248k-Redux"] then
@ -91,7 +92,7 @@ if mods["ShockTurret"] then
end end
if mods["bzgold"] and mods["ThemTharHills-Updated"] then if mods["bzgold"] and mods["ThemTharHills-Updated"] then
util.add_product("trace-gold-from-copper", {name="platinum-powder", amount=1, probability=0.1}) util.add_product("trace-gold-from-copper", { type = "item", name = "platinum-powder", amount=1, probability=0.1})
util.add_unlock("gold-processing", "platinum-ingot") util.add_unlock("gold-processing", "platinum-ingot")
end end
@ -132,16 +133,16 @@ if mods["space-exploration"] then
if mods["bztungsten"] then if mods["bztungsten"] then
util.remove_ingredient("se-space-biochemical-laboratory", "graphene") util.remove_ingredient("se-space-biochemical-laboratory", "graphene")
util.replace_ingredient("se-space-biochemical-laboratory", "glass", "smart-glass", 80) util.replace_ingredient("se-space-biochemical-laboratory", glass_name, "smart-glass", 80)
util.remove_ingredient("se-space-growth-facility", "graphene") util.remove_ingredient("se-space-growth-facility", "graphene")
util.replace_ingredient("se-space-growth-facility", "glass", "smart-glass", 300) util.replace_ingredient("se-space-growth-facility", glass_name, "smart-glass", 300)
util.remove_ingredient("se-space-mirror", "silver-plate") util.remove_ingredient("se-space-mirror", "silver-plate")
util.replace_ingredient("se-space-mirror", "glass", "smart-glass", 8) util.replace_ingredient("se-space-mirror", glass_name, "smart-glass", 8)
util.remove_ingredient("se-space-mirror-alternate", "silver-plate") util.remove_ingredient("se-space-mirror-alternate", "silver-plate")
util.replace_ingredient("se-space-mirror-alternate", "glass", "smart-glass", 2) util.replace_ingredient("se-space-mirror-alternate", glass_name, "smart-glass", 2)
util.add_prerequisite("se-space-biochemical-laboratory","tungsten-chemistry") util.add_prerequisite("se-space-biochemical-laboratory","tungsten-chemistry")
end end