diff --git a/data-final-fixes.lua b/data-final-fixes.lua index d2064d8..540e41e 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -8,7 +8,7 @@ if mods["space-exploration"] then util.add_to_product("se-core-fragment-omni", "zircon", -3) end -if mods.bztitanium then +if mods["bztitanium2"] then if util.me.byproduct() then -- If furnaces are treated as furnaces, we need 2 outputs util.set_minimum_furnace_outputs("smelting", 2) diff --git a/data-util.lua b/data-util.lua index 2fa3d78..bc3e734 100644 --- a/data-util.lua +++ b/data-util.lua @@ -99,7 +99,7 @@ if get_setting("bz-recipe-bypass") then end function util.is_foundry() - return mods.bzfoundry and not me.get_setting("bzfoundry-minimal") + return mods.bzfoundry2 and not me.get_setting("bzfoundry-minimal") end function should_force(options) diff --git a/info.json b/info.json index 3fb6b2a..68f4c40 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzzirconium", - "version": "2.1.12", + "version": "2.1.13", "factorio_version": "2.0", "title": "Zirconium", "author": "Brevven", @@ -16,10 +16,10 @@ "? deadlock-beltboxes-loaders", "? DeadlockCrating", "? omnimatter", - "? bzsilicon", - "? bzlead", - "? bztitanium >= 0.12.4", - "? bztungsten >= 0.5.0" + "? bzsilicon2", + "? bzlead2", + "? bztitanium2 >= 2.0.27", + "? bztungsten2 >= 2.0.0" ], "description": "Adds zircon, zirconia, zirconium, and more to the base game.\n\nCompatible with Space Age and many other mods. A standalone piece of BZ Mods." } diff --git a/magazine.lua b/magazine.lua index 555ccce..977ddb9 100644 --- a/magazine.lua +++ b/magazine.lua @@ -6,12 +6,12 @@ if util.me.ammo() then util.item("zirconium-plate", 1), } local ct = 1 - if mods.bztungsten then + if mods.bztungsten2 then table.insert(mag, util.item("tungsten-carbide", 1)) ct = ct + 1 end -- add any other count-incrementing ingredients before silica, oil, and magazine - if mods.bzsilicon then + if mods["bzsilicon2"] then table.insert(mag, util.item("silica", ct)) end table.insert(mag, {type="fluid", name="heavy-oil", amount=ct}) diff --git a/zircon-compressed.lua b/zircon-compressed.lua index 498e84c..2f85c13 100644 --- a/zircon-compressed.lua +++ b/zircon-compressed.lua @@ -24,7 +24,7 @@ if simpleCompress then tungstenRecipe.results = { {type="item", name = "tungsten-plate", amount=simpleCompress.CompressedSmeltAmount}, } - tungstenRecipe.icons = {{ icon = "__bztungsten__/graphics/icons/tungsten-plate.png", icon_size = 128 }} + tungstenRecipe.icons = {{ icon = "__bztungsten2__/graphics/icons/tungsten-plate.png", icon_size = 128 }} tungstenRecipe.subgroup = "raw-material" tungstenRecipe.order = "d[tungsten-plate]" end diff --git a/zirconium-enriched.lua b/zirconium-enriched.lua index 1af128f..21800a3 100644 --- a/zirconium-enriched.lua +++ b/zirconium-enriched.lua @@ -41,7 +41,7 @@ data:extend({ { {type = "item", name = "enriched-zircon", amount = 6}, {type = "fluid", name = "kr-dirty-water", amount = 25, ignored_by_stats=25, ignored_by_productivity=25}, - (mods.bztitanium and util.me.byproduct()) and {type = "item", name = "titanium-ore", amount = 1} or nil, + (mods["bztitanium2"] and util.me.byproduct()) and {type = "item", name = "titanium-ore", amount = 1} or nil, }, crafting_machine_tint = { @@ -105,7 +105,7 @@ data:extend({ {type = "fluid", name = "water", amount = 90, ignored_by_stats=90, ignored_by_productivity=90}, {type = "item", name = "stone", probability = 0.20, amount = 1}, {type = "item", name = "zircon", probability = 0.20, amount = 1}, - (mods.bztitanium and util.me.byproduct()) and + (mods["bztitanium2"] and util.me.byproduct()) and {type = "item", name = "titanium-ore", probability = 0.20, amount = 1} or nil, }, crafting_machine_tint = diff --git a/zirconium-recipe-updates.lua b/zirconium-recipe-updates.lua index cb839f6..314873a 100644 --- a/zirconium-recipe-updates.lua +++ b/zirconium-recipe-updates.lua @@ -1,9 +1,9 @@ local util = require("data-util"); -local nuclear_plate = mods.bzlead and "lead-plate" or "iron-plate" +local nuclear_plate = mods["bzlead2"] and "lead-plate" or "iron-plate" local nuclear_z = data.raw.item["zircaloy-4"] and "zircaloy-4" or "zirconium-plate" -if mods.bzfoundry and data.raw.item["foundry"] then +if mods.bzfoundry2 and data.raw.item["foundry"] then util.set_to_founding("zircaloy-4") end @@ -15,7 +15,7 @@ end util.replace_ingredient("metallurgic-science-pack", "tungsten-plate", "zirconium-tungstate") util.add_ingredient("cryogenic-plant", "zirconium-tungstate", 20) -if mods["space-age"] and mods.bztin and util.me.basic_foundry() then +if mods["space-age"] and mods["bztin2"] and util.me.basic_foundry() then util.copy_recipe("bronze-plate", "bronze-plate-basic") util.set_category("bronze-plate-basic", "basic-metallurgy") util.set_localised_name("bronze-plate-basic", {"item-name.bronze-plate"}) @@ -34,7 +34,7 @@ if util.me.early() then end if not util.k2() then util.replace_some_ingredient("steel-furnace", "stone-brick", 4, "zirconia", 6) - if mods.bzsilicon then -- this uses enough stone, we can just replace + if mods["bzsilicon2"] then -- this uses enough stone, we can just replace util.replace_ingredient("electric-furnace", "stone-brick", "zirconia") else util.replace_some_ingredient("electric-furnace", "stone-brick", 5, "zirconia", 5) @@ -63,7 +63,7 @@ if not mods.Atomic_Overhaul then util.replace_some_ingredient("uranium-fuel-cell", nuclear_plate, 5, nuclear_z, ufc_amt) end -if not mods.bztungsten then +if not mods.bztungsten2 then util.add_ingredient("nuclear-fuel", nuclear_z, 1) end @@ -121,7 +121,7 @@ if util.k2() then util.replace_some_ingredient("se-stone-brick-vulcanite", "stone", 2, "zircon", 2) end - if not mods.bztungsten then + if not mods.bztungsten2 then util.add_ingredient("matter-research-data", "zirconia", 5) end end @@ -136,7 +136,7 @@ if mods["space-exploration"] then util.add_ingredient("se-quantum-processor", "cermet", 1) util.add_ingredient("se-space-mechanical-laboratory", "cermet", 40) end - if not mods.bztungsten then + if not mods.bztungsten2 then util.add_ingredient("se-hot-thermodynamics-data", "zirconium-plate", 1) util.add_product("se-hot-thermodynamics-data", {type="item", name="zirconium-plate", amount=1, probability=0.50}) end diff --git a/zirconium-recipe.lua b/zirconium-recipe.lua index 4669dbd..852bcfc 100644 --- a/zirconium-recipe.lua +++ b/zirconium-recipe.lua @@ -38,7 +38,7 @@ data:extend({ -- enabled = false, -- energy_required = 8, -- ingredients = {util.item("zircon", 5)}, - -- results = mods.bztitanium and util.me.byproduct() and { + -- results = mods["bztitanium"] and util.me.byproduct() and { -- { type = "item", name = "zirconia", amount_min=4, amount_max=5}, -- { type = "item", name = "titanium-ore", amount=1, probability=.5} -- } or {util.item("zirconia", 5)} @@ -47,7 +47,7 @@ data:extend({ enabled = false, energy_required = 6.4, ingredients = {util.item("zircon", 1)}, - results = mods.bztitanium and util.me.byproduct() and { + results = mods["bztitanium2"] and util.me.byproduct() and { {type="item", name="zirconia", amount=2, probability=.95}, {type="item", name="titanium-ore", amount=1, probability=.1} } or {util.item("zirconia", 2)} @@ -57,7 +57,7 @@ data:extend({ -- enabled = false, -- energy_required = 3.2, -- ingredients = {util.item("zircon", 1)}, - -- results = mods.bztitanium and util.me.byproduct() and { + -- results = mods["bztitanium"] and util.me.byproduct() and { -- util.item("zirconia", 1), { type = "item", name = "titanium-ore", amount=1, probability=.05} -- } or {util.item("zirconia", 2)} -- } @@ -191,14 +191,14 @@ data:extend({ -- cermet only if setting enabled if util.me.use_cermet() then local cermet_i = {util.item("zirconia", 2), util.item("copper-plate", 1)} -if mods.bztitanium and data.raw.item["titanium-plate"] then - local tme = require("__bztitanium__.me"); +if mods["bztitanium2"] and data.raw.item["titanium-plate"] then + local tme = require("__bztitanium2__.me"); table.insert(cermet_i, util.item(tme.titanium_plate, 1)) end -if mods.bzsilicon then +if mods["bzsilicon2"] then table.insert(cermet_i, util.item("silica", 1)) end -if mods.bzaluminum then +if mods.bzaluminum2 then table.insert(cermet_i, util.item("alumina", 1)) end data:extend({ @@ -263,7 +263,7 @@ data:extend({ order = "c" }, }) -if mods.bztitanium then +if mods["bztitanium2"] then util.add_prerequisite("cermet", util.titanium_processing) end end @@ -321,7 +321,7 @@ end if mods["space-age"] then -- Gleba local synth_i = "stone" -if mods.bzsilicon then +if mods["bzsilicon2"] then synth_i = "silica" elseif data.raw.item["sand"] then synth_i = "sand" @@ -415,7 +415,7 @@ util.add_unlock("foundry", "zirconium-gettering") end -- Zirconium Tungstate, only if needed -if mods["space-age"] or (mods.bztungsten and (util.k2() or mods["space-exploration"])) then +if mods["space-age"] or (mods.bztungsten2 and (util.k2() or mods["space-exploration"])) then data:extend({ { type = "item", @@ -451,7 +451,7 @@ end end -- Zircaloy-4 only if needed -if mods.bztin and not mods.bobplates then +if mods["bztin2"] and not mods.bobplates then require("basic-foundry") local zircaloyi = { util.item("zirconium-sponge", 17),