diff --git a/Tantalite2/info.json b/Tantalite2/info.json index 121b7d5..cef230f 100644 --- a/Tantalite2/info.json +++ b/Tantalite2/info.json @@ -14,14 +14,14 @@ "? bismuth", "? bobassembly", "? BrassTacks-Updated", - "? bzaluminum", - "? bzcarbon", - "? bzgold", - "? bzlead", - "? bztin", - "? bztitanium", - "? bztungsten", - "? bzzirconium", + "? bzaluminum2", + "? bzcarbon2", + "? bzgold2", + "? bzlead2", + "? bztin2", + "? bztitanium2", + "? bztungsten2", + "? bzzirconium2", "? EndgameCombat", "? FluidMustFlow", "? IfNickel-Updated", diff --git a/Tantalite2/prototypes/tantalum-recipe.lua b/Tantalite2/prototypes/tantalum-recipe.lua index c5af548..7b3d6eb 100644 --- a/Tantalite2/prototypes/tantalum-recipe.lua +++ b/Tantalite2/prototypes/tantalum-recipe.lua @@ -18,7 +18,7 @@ data:extend({ end if mods["248k-Redux"] then thoriated_filament_ingredients = {{type="item", name="thorium-ore", amount=1}} - if mods["bztungsten"] then + if mods["bztungsten2"] then table.insert(thoriated_filament_ingredients, {type="item", name="tungsten-plate", amount=1}) end data:extend({ @@ -104,13 +104,13 @@ data:extend({ table.insert(crt_ingredients, {type="item", name=glass_name, amount=3}) end local crt_subgroup = "intermediate-product" - if mods["bzcarbon"] then + if mods["bzcarbon2"] then crt_ingredients = {{type="item", name="electron-gun", amount=1}, {type="item", name="graphene", amount=1}, {type="item", name="advanced-circuit", amount=3}} if data.raw.item[glass_name] then table.insert(crt_ingredients, {type="item", name=glass_name, amount=3}) end end - if mods["bzcarbon"] and mods["bismuth"] and mods["bzaluminum"] then + if mods["bzcarbon2"] and mods["bismuth"] and mods["bzaluminum2"] then crt_ingredients = {{type="item", name="electron-gun", amount=1}, {type="item", name="graphene", amount=1}, {type="item", name="advanced-circuit", amount=3}, {type="item", name="pcb-solder", amount=3}, {type="item", name="aluminum-plate", amount=5}} if data.raw.item[glass_name] then table.insert(crt_ingredients, {type="item", name=glass_name, amount=3}) @@ -144,9 +144,9 @@ data:extend({ local tantalum_capacitor_ingredients = {{type="item", name="tantalum-plate", amount=1},{type="item", name="copper-cable", amount=1}} local tantalum_capacitor_subgroup = "intermediate-product" - if mods["bzlead"] or mods["manganese"] then + if mods["bzlead2"] or mods["manganese"] then tantalum_capacitor_ingredients = {{type="item", name="tantalum-plate", amount=1}} - if mods["bzlead"] then + if mods["bzlead2"] then table.insert(tantalum_capacitor_ingredients, {type="item", name="lead-plate", amount = 1}) end if mods["manganese"] then diff --git a/Tantalite2/prototypes/technology.lua b/Tantalite2/prototypes/technology.lua index 906c8c1..dd218c5 100644 --- a/Tantalite2/prototypes/technology.lua +++ b/Tantalite2/prototypes/technology.lua @@ -40,7 +40,7 @@ data:extend( util.add_prerequisite("laser-turret", "electron-emitter") local crt_prerequisites = {"electron-emitter"} -if mods["bzcarbon"] then +if mods["bzcarbon2"] then crt_prerequisites = {"graphene", "electron-emitter"} end data:extend( @@ -78,7 +78,7 @@ local advanced_tantalum_processing_pre = {"chemical-science-pack"} if mods["IfNickel-Updated"] and data.raw.item["advanced-flow-controller"] then advanced_multi_cylinder_engine_tech = {"advanced-flow-controller"} end -if mods["bztitanium"] then +if mods["bztitanium2"] then advanced_tantalum_processing_pre = {"titanium-processing"} end data:extend( diff --git a/Tantalite2/recipe-final-fix.lua b/Tantalite2/recipe-final-fix.lua index 7d2ae00..ab3c1ec 100644 --- a/Tantalite2/recipe-final-fix.lua +++ b/Tantalite2/recipe-final-fix.lua @@ -8,7 +8,7 @@ if mods["space-exploration"] then util.add_product("se-core-fragment-omni",{ type = "item", name = "tantalite-ore", amount = 1 }) end -if mods["bzaluminum"] then +if mods["bzaluminum2"] then --stop bz aluminum from replacing electronic circuit. Not sure why it does that util.replace_ingredient("electron-gun", "aluminum-cable", "electronic-circuit") util.remove_ingredient("rocket-control-unit", "aluminum-plate") diff --git a/Tantalite2/recipe-modify.lua b/Tantalite2/recipe-modify.lua index 9ba7638..152a249 100644 --- a/Tantalite2/recipe-modify.lua +++ b/Tantalite2/recipe-modify.lua @@ -20,7 +20,7 @@ if mods["bismuth"] then util.remove_ingredient("rocket-control-unit", "pcb-solder") end -if mods["bzcarbon"] then +if mods["bzcarbon2"] then util.remove_ingredient("rocket-control-unit", "graphene") end @@ -47,7 +47,7 @@ if mods["aai-industry"] then util.replace_ingredient("better-tank", "engine-unit", "advanced-multi-cylinder-engine", 12) end if mods["space-exploration"] then - if mods["bzaluminum"] then + if mods["bzaluminum2"] then util.remove_ingredient("se-fluid-burner-generator", "spark-plug") end util.replace_ingredient("se-fluid-burner-generator", "electric-motor", "advanced-multi-cylinder-engine", 5)