diff --git a/bzaluminum2/aluminum-enriched.lua b/bzaluminum2/aluminum-enriched.lua index c8ebd51..160f945 100644 --- a/bzaluminum2/aluminum-enriched.lua +++ b/bzaluminum2/aluminum-enriched.lua @@ -100,7 +100,7 @@ data:extend( results = { {type = "fluid", name = "water", amount = 90, catalyst_amount = 90}, - mods.bzsilicon and util.me.byproduct() and {type = "item", name = "silica", amount = 1} or + mods["bzsilicon2"] and util.me.byproduct() and {type = "item", name = "silica", amount = 1} or {type = "item", name = "stone", probability = 0.40, amount = 1}, {type = "item", name = "aluminum-ore", probability = 0.10, amount = 1}, }, diff --git a/bzaluminum2/aluminum-ore.lua b/bzaluminum2/aluminum-ore.lua index 304bccb..a425bbb 100644 --- a/bzaluminum2/aluminum-ore.lua +++ b/bzaluminum2/aluminum-ore.lua @@ -26,7 +26,7 @@ data:extend({ minable = { hardness = 1, - mining_particle = mods.bztitanium and "titanium-ore-particle" or "iron-ore-particle", + mining_particle = mods["bztitanium2"] and "titanium-ore-particle" or "iron-ore-particle", mining_time = 1, result = "aluminum-ore" }, diff --git a/bzaluminum2/aluminum-recipe-final-stacking.lua b/bzaluminum2/aluminum-recipe-final-stacking.lua index c21240e..3ff95eb 100644 --- a/bzaluminum2/aluminum-recipe-final-stacking.lua +++ b/bzaluminum2/aluminum-recipe-final-stacking.lua @@ -11,7 +11,7 @@ if deadlock then deadlock.add_stack("spark-plug", "__bzaluminum2__/graphics/icons/stacked/spark-plug-stacked.png" , "deadlock-stacking-2", 128) deadlock.add_stack("aluminum-6061", "__bzaluminum2__/graphics/icons/stacked/aluminum-6061-stacked.png" , "deadlock-stacking-2", 128) deadlock.add_stack("aluminum-2219", "__bzaluminum2__/graphics/icons/stacked/aluminum-2219-stacked.png" , "deadlock-stacking-3", 128) - if mods.bztitanium then + if mods["bztitanium2"] then deadlock.add_stack("ti-sapphire", "__bzaluminum2__/graphics/icons/stacked/ti-sapphire-stacked.png" , "deadlock-stacking-3", 128) end @@ -45,7 +45,7 @@ if deadlock_crating then deadlock_crating.add_crate("spark-plug", "deadlock-crating-2") deadlock_crating.add_crate("aluminum-6061", "deadlock-crating-2") deadlock_crating.add_crate("aluminum-2219", "deadlock-crating-3") - if mods.bztitanium then + if mods["bztitanium2"] then deadlock_crating.add_crate("ti-sapphire", "deadlock-crating-3") end if mods.Krastorio2 then diff --git a/bzaluminum2/aluminum-recipe-updates.lua b/bzaluminum2/aluminum-recipe-updates.lua index 946484f..921c967 100644 --- a/bzaluminum2/aluminum-recipe-updates.lua +++ b/bzaluminum2/aluminum-recipe-updates.lua @@ -28,7 +28,7 @@ util.add_ingredient("tank", "spark-plug", 1) util.replace_some_ingredient("artillery-shell", "explosives", 4, "aluminum-2219", 4) -if mods.bztitanium then +if mods["bztitanium2"] then util.remove_ingredient("laser-turret", "diamond") util.add_ingredient("laser-turret", "ti-sapphire", 1) util.add_ingredient("obelisk-of-light", "ti-sapphire", 1) diff --git a/bzaluminum2/aluminum-recipe.lua b/bzaluminum2/aluminum-recipe.lua index 5e1d7eb..7d01274 100644 --- a/bzaluminum2/aluminum-recipe.lua +++ b/bzaluminum2/aluminum-recipe.lua @@ -5,12 +5,12 @@ local futil = require("util"); local alumina_results = {} -if mods.bzsilicon and util.me.byproduct() and not mods.Krastorio2 then +if mods["bzsilicon2"] and util.me.byproduct() and not mods.Krastorio2 then alumina_results ={ {type="item", name = "alumina", amount=1, probability=0.95}, {type="item", name = "silica", amount=1, probability=0.05}, } -elseif mods.bzsilicon and util.me.byproduct() and mods.Krastorio2 then +elseif mods["bzsilicon2"] and util.me.byproduct() and mods.Krastorio2 then alumina_results ={ {type="item", name = "alumina", amount=5, probability=0.95}, {type="item", name = "silica", amount=1, probability=0.25}, @@ -94,7 +94,7 @@ data:extend({ }, }) -if mods.bzsilicon then +if mods["bzsilicon2"] then landfill = futil.table.deepcopy(data.raw.recipe["landfill"]) landfill.name = "landfill-silica" data:extend({landfill}) @@ -282,7 +282,7 @@ local aluminum_6061 = {} aluminum_6061["aluminum-plate"] = 18 aluminum_6061["copper-plate"] = 1 aluminum_6061["iron-plate"] = 1 -if mods.bzsilicon or mods.Krastorio2 then +if mods["bzsilicon2"] or mods.Krastorio2 then aluminum_6061[mods.Krastorio2 and "kr-silicon" or "silicon"] = 1 aluminum_6061["aluminum-plate"] = aluminum_6061["aluminum-plate"] - 1 end @@ -336,7 +336,7 @@ util.add_prerequisite("basic-alloys", "kr-silicon-processing") local aluminum_2219 = {} aluminum_2219["aluminum-plate"] = 16 aluminum_2219["copper-plate"] = 4 -if mods.bztitanium then +if mods["bztitanium2"] then aluminum_2219["titanium-plate"] = 2 aluminum_2219["aluminum-plate"] = aluminum_2219["aluminum-plate"] - 1 aluminum_2219["copper-plate"] = aluminum_2219["copper-plate"] - 1 @@ -392,7 +392,7 @@ end util.add_prerequisite("aerospace-alloys", "titanium-processing") util.add_prerequisite("aerospace-alloys", "zirconia-processing") -if mods.bztitanium then +if mods["bztitanium2"] then data:extend({ { type = "item", diff --git a/bzaluminum2/data-final-fixes.lua b/bzaluminum2/data-final-fixes.lua index 9b205c1..f29e22b 100644 --- a/bzaluminum2/data-final-fixes.lua +++ b/bzaluminum2/data-final-fixes.lua @@ -24,7 +24,7 @@ util.add_to_product("vtk-deepcore-mining-ore-chunk-refining", "vtk-deepcore-mini util.add_to_product("vtk-deepcore-mining-ore-chunk-refining-no-uranium", "vtk-deepcore-mining-aluminum-ore-chunk", 10) util.set_vtk_dcm_ingredients() -if mods.bzsilicon then +if mods["bzsilicon2"] then for i, entity in pairs(data.raw.furnace) do if entity.result_inventory_size ~= nil and entity.result_inventory_size < 2 and util.contains(entity.crafting_categories, "smelting") then entity.result_inventory_size = 2 @@ -32,7 +32,7 @@ for i, entity in pairs(data.raw.furnace) do end end -if mods.bztitanium then +if mods["bztitanium2"] then util.add_ingredient("w93-modular-gun-plaser", "ti-sapphire", 1) util.add_ingredient("w93-modular-gun-tlaser", "ti-sapphire", 1) util.add_ingredient("w93-modular-gun-beam", "ti-sapphire", 1) diff --git a/bzaluminum2/info.json b/bzaluminum2/info.json index c264e2f..6da22c9 100644 --- a/bzaluminum2/info.json +++ b/bzaluminum2/info.json @@ -10,7 +10,7 @@ "base >= 2.0.0", "bzfoundry2 >= 2.0.0", "~ bz-dsr-bridge", - "? bztitanium >= 2.0.26", + "? bztitanium2 >= 2.0.27", "? bzlead2 >= 2.0.29", "? bzzirconium >= 2.1.13", "? bztungsten2 >= 2.0.0",