diff --git a/changelog.txt b/changelog.txt index b7603ee..013ba54 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 2.0.14 +Date: 2025-05-03 + Fixes: + - Fix possible load issues with Bob's +--------------------------------------------------------------------------------------------------- Version: 2.0.13 Date: 2025-04-08 Changes: diff --git a/data-util.lua b/data-util.lua index f121833..0e48dbf 100644 --- a/data-util.lua +++ b/data-util.lua @@ -1330,7 +1330,7 @@ end -- Replace one product with another in a recipe function util.replace_product(recipe_name, old, new, options) if not should_force(options) and bypass(recipe_name) then return end - if data.raw.recipe[recipe_name] then + if data.raw.recipe[recipe_name] and (data.raw.item[new] or data.raw.fluid[new]) then replace_product(data.raw.recipe[recipe_name], old, new, options) end end diff --git a/info.json b/info.json index c81ceb3..664cb50 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzsilicon", - "version": "2.0.13", + "version": "2.0.14", "factorio_version": "2.0", "title": "Silica & Silicon", "author": "Brevven", @@ -13,6 +13,7 @@ "? 248k", "? aai-industry", "? modmashsplinterelectronics", + "? bztitanium", "(?) IndustrialRevolution", "base" ], diff --git a/prototypes/gyro.lua b/prototypes/gyro.lua index 548d21d..ea1f150 100644 --- a/prototypes/gyro.lua +++ b/prototypes/gyro.lua @@ -15,7 +15,7 @@ end if mods.bztungsten and not mods["space-age"] then table.insert(gyro_ingredients, util.item("tungsten-plate", 1)) table.insert(gyro_prereqs, "tungsten-processing") -elseif mods.bztitanium then +elseif mods.bztitanium and data.raw.item["titanium-plate"] then table.insert(gyro_ingredients, util.item("titanium-plate", 1)) table.insert(gyro_prereqs, "titanium-processing") elseif mods.Krastorio2 then diff --git a/prototypes/silicon-recipe.lua b/prototypes/silicon-recipe.lua index b0c1a7d..4c32b12 100644 --- a/prototypes/silicon-recipe.lua +++ b/prototypes/silicon-recipe.lua @@ -176,14 +176,10 @@ data:extend({ enabled = false, energy_required = 2, allow_productivity = true, - ingredients = (mods["bzlead"] and not mods["angelssmelting"] and { + ingredients = { {type= "item", name="silicon-wafer", amount=1}, {type= "item", name="electronic-circuit", amount=1}, - {type= "item", name="lead-plate", amount=1}, - } or { - {type= "item", name="silicon-wafer", amount=1}, - {type= "item", name="electronic-circuit", amount=1}, - }), + }, results = {util.item("solar-cell", 2)} }, }) diff --git a/recipe-updates.lua b/recipe-updates.lua index f90b8ad..d55a015 100644 --- a/recipe-updates.lua +++ b/recipe-updates.lua @@ -68,6 +68,7 @@ if data.raw.item["silicone"] then end end +util.add_ingredient("solar-cell", "lead-plate", 1) if not mods["Krastorio2"] then util.remove_ingredient("concrete", "stone-brick");