diff --git a/me.lua b/me.lua index 8b0af7f..94a2a59 100644 --- a/me.lua +++ b/me.lua @@ -16,10 +16,6 @@ else me.titanium_processing = "titanium-processing" end -function me.steel_to_titanium(name) - replace_ingredient(name, "steel-plate", me.titanium_plate) -end - function me.add_titanium_ingredient(amount, name) add_ingredient(name, me.titanium_plate, amount) end diff --git a/titanium-recipe-final-5d.lua b/titanium-recipe-final-5d.lua index 6e7260a..49260e7 100644 --- a/titanium-recipe-final-5d.lua +++ b/titanium-recipe-final-5d.lua @@ -92,7 +92,7 @@ if mods["5dim_core"] then if mods["5dim_automation"] then for i, name in ipairs( {"5d-assembling-machine-07","5d-assembling-machine-08","5d-lab-06","5d-lab-07"}) do - util.me.steel_to_titanium(name) + util.replace_ingredient(name, "steel-plate", "titanium-plate") end end @@ -115,7 +115,7 @@ if mods["5dim_core"] then end if mods["5dim_battlefield"] then - util.me.steel_to_titanium(name) + util.replace_ingredient(name, "steel-plate", "titanium-plate") end end diff --git a/titanium-recipe-final-k2.lua b/titanium-recipe-final-k2.lua index 5d3867a..a6a1fa1 100644 --- a/titanium-recipe-final-k2.lua +++ b/titanium-recipe-final-k2.lua @@ -15,11 +15,11 @@ if mods["Krastorio2"] then util.me.rare_to_titanium("kr-advanced-transport-belt-loader") end - util.me.steel_to_titanium("kr-quarry-drill") - util.me.steel_to_titanium("kr-singularity-lab") + util.replace_ingredient("kr-quarry-drill", "steel-plate", "titanium-plate") + util.replace_ingredient("kr-singularity-lab", "steel-plate", "titanium-plate") - util.me.steel_to_titanium("stack-inserter") - util.me.steel_to_titanium("stack-filter-inserter") + util.replace_ingredient("stack-inserter", "steel-plate", "titanium-plate") + util.replace_ingredient("stack-filter-inserter", "steel-plate", "titanium-plate") util.me.add_titanium_ingredient(40, "kr-advanced-steam-turbine") end diff --git a/titanium-recipe-final-modmash.lua b/titanium-recipe-final-modmash.lua index aa1e666..d8fb3b5 100644 --- a/titanium-recipe-final-modmash.lua +++ b/titanium-recipe-final-modmash.lua @@ -42,10 +42,10 @@ if mods["modmashsplinter"] then end if mods["modmashsplinterlogistics"] then - util.me.steel_to_titanium("regenerative-transport-belt") - util.me.steel_to_titanium("regenerative-splitter") - util.me.steel_to_titanium("regenerative-underground-belt-structure") - util.me.steel_to_titanium("regenerative-mini-loader") + util.replace_ingredient("regenerative-transport-belt", "steel-plate", "titanium-plate") + util.replace_ingredient("regenerative-splitter", "steel-plate", "titanium-plate") + util.replace_ingredient("regenerative-underground-belt-structure", "steel-plate", "titanium-plate") + util.replace_ingredient("regenerative-mini-loader", "steel-plate", "titanium-plate") end end diff --git a/titanium-recipe-final-se.lua b/titanium-recipe-final-se.lua index facd0ee..d3d082b 100644 --- a/titanium-recipe-final-se.lua +++ b/titanium-recipe-final-se.lua @@ -9,10 +9,10 @@ if data.raw.recipe["se-space-pipe"] then -- deadlock loaders for SE -- mods["deadlock-beltboxes-loaders"] if mods["Deadlock-SE-bridge"] then if data.raw.recipe["se-space-transport-belt-loader"] then - util.me.steel_to_titanium("se-space-transport-belt-loader") + util.replace_ingredient("se-space-transport-belt-loader", "steel-plate", "titanium-plate") end if data.raw.recipe["se-space-transport-belt-beltbox"] then - util.me.steel_to_titanium("se-space-transport-belt-beltbox") + util.replace_ingredient("se-space-transport-belt-beltbox", "steel-plate", "titanium-plate") end end end diff --git a/titanium-recipe-final-transport.lua b/titanium-recipe-final-transport.lua index ff5cc09..336a979 100644 --- a/titanium-recipe-final-transport.lua +++ b/titanium-recipe-final-transport.lua @@ -2,33 +2,33 @@ local util = require("__bztitanium__.data-util"); -- Various vehicle/transport mod changes if mods["Aircraft"] then - util.me.steel_to_titanium("gunship") - util.me.steel_to_titanium("cargo-plane") - util.me.steel_to_titanium("flying-fortress") + util.replace_ingredient("gunship", "steel-plate", "titanium-plate") + util.replace_ingredient("cargo-plane", "steel-plate", "titanium-plate") + util.replace_ingredient("flying-fortress", "steel-plate", "titanium-plate") util.me.add_titanium_ingredient(10, "aircraft-afterburner") -- jet doesn't use steel in base aircraft mod, but leave this here just in case that changes - util.me.steel_to_titanium("jet") + util.replace_ingredient("jet", "steel-plate", "titanium-plate") end if mods["betterCargoPlanes"] then - util.me.steel_to_titanium("better-cargo-plane") + util.replace_ingredient("better-cargo-plane", "steel-plate", "titanium-plate") end if mods["HelicopterRevival"] or mods["Helicopters"] then - util.me.steel_to_titanium("heli-recipe") + util.replace_ingredient("heli-recipe", "steel-plate", "titanium-plate") end if mods["adamo-chopper"] then - util.me.steel_to_titanium("chopper-recipe") + util.replace_ingredient("chopper-recipe", "steel-plate", "titanium-plate") end if mods["jetpack"] then - util.me.steel_to_titanium("jetpack-1") + util.replace_ingredient("jetpack-1", "steel-plate", "titanium-plate") end if mods["Hovercrafts"] or mods["Hovercrafts_Realism"] then - util.me.steel_to_titanium("hcraft-recipe") + util.replace_ingredient("hcraft-recipe", "steel-plate", "titanium-plate") util.me.add_titanium_prerequisite("hcraft-tech") end @@ -37,8 +37,8 @@ if mods["Raven"] then end if mods["Hover-Car"] then - util.me.steel_to_titanium("hover-car-recipe") - util.me.steel_to_titanium("hover-car-mk2-recipe") + util.replace_ingredient("hover-car-recipe", "steel-plate", "titanium-plate") + util.replace_ingredient("hover-car-mk2-recipe", "steel-plate", "titanium-plate") end if mods["fast_trans"] then @@ -48,7 +48,7 @@ if mods["fast_trans"] then "fast-one-mk2 txt", "fast-one-mk3 txt", }) do - util.me.steel_to_titanium(item) + util.replace_ingredient(item, "steel-plate", "titanium-plate") end util.me.add_titanium_prerequisite("fast-one-tech-mk2") end diff --git a/titanium-recipe-updates.lua b/titanium-recipe-updates.lua index 59f9efc..3a1756a 100644 --- a/titanium-recipe-updates.lua +++ b/titanium-recipe-updates.lua @@ -3,7 +3,7 @@ local util = require("__bztitanium__.data-util"); if (not mods["bobplates"]) then - util.me.steel_to_titanium("power-armor") + util.replace_ingredient("power-armor", "steel-plate", "titanium-plate") util.add_prerequisite("power-armor", util.me.titanium_processing) -- Generally, steel-based equipment techs require solar panel tech, so only require @@ -14,14 +14,14 @@ if (not mods["bobplates"]) then -- All equipment that uses steel now uses titanium. Who wants to carry around steel! for name, recipe in pairs(data.raw.recipe) do if recipe.result ~= nil and recipe.result:find("equipment") then - util.me.steel_to_titanium(recipe.name) + util.replace_ingredient(recipe.name, "steel-plate", "titanium-plate") end end end -util.me.steel_to_titanium("low-density-structure") +util.replace_ingredient("low-density-structure", "steel-plate", "titanium-plate") if mods["modmashsplintergold"] then - util.me.steel_to_titanium("low-density-structure-with-gold") + util.replace_ingredient("low-density-structure-with-gold", "steel-plate", "titanium-plate") end if not mods["bobrevamp"] then @@ -30,14 +30,14 @@ end if (not mods["bobplates"]) then - util.me.steel_to_titanium("flying-robot-frame") + util.replace_ingredient("flying-robot-frame", "steel-plate", "titanium-plate") util.me.add_titanium_prerequisite("robotics") end if (mods["bobrevamp"] and not mods["bobplates"] and not mods["angelssmelting"]) then - util.me.steel_to_titanium("flying-robot-frame-2") - util.me.steel_to_titanium("flying-robot-frame-3") - util.me.steel_to_titanium("flying-robot-frame-4") + util.replace_ingredient("flying-robot-frame-2", "steel-plate", "titanium-plate") + util.replace_ingredient("flying-robot-frame-3", "steel-plate", "titanium-plate") + util.replace_ingredient("flying-robot-frame-4", "steel-plate", "titanium-plate") end @@ -45,15 +45,15 @@ end if data.raw.recipe["se-space-pipe"] then -- Space Exploration space stuff - util.me.steel_to_titanium("se-space-pipe") - util.me.steel_to_titanium("se-space-transport-belt") - util.me.steel_to_titanium("se-space-underground-belt") - util.me.steel_to_titanium("se-space-splitter") - util.me.steel_to_titanium("se-space-rail") + util.replace_ingredient("se-space-pipe", "steel-plate", "titanium-plate") + util.replace_ingredient("se-space-transport-belt", "steel-plate", "titanium-plate") + util.replace_ingredient("se-space-underground-belt", "steel-plate", "titanium-plate") + util.replace_ingredient("se-space-splitter", "steel-plate", "titanium-plate") + util.replace_ingredient("se-space-rail", "steel-plate", "titanium-plate") util.me.add_titanium_ingredient(1, "se-space-platform-scaffold") -- Space Exploration alternative LDS - util.me.steel_to_titanium("se-low-density-structure-beryllium") + util.replace_ingredient("se-low-density-structure-beryllium", "steel-plate", "titanium-plate") -- Space Exploration buildings util.me.add_titanium_ingredient(20, "se-condenser-turbine") @@ -88,7 +88,7 @@ if mods["Aircraft"] then end if mods["eve-weaponry"] then - util.me.steel_to_titanium("small-titanium-sabot") + util.replace_ingredient("small-titanium-sabot", "steel-plate", "titanium-plate") end if mods["FastFurnaces"] then @@ -105,7 +105,7 @@ util.replace_ingredient("artificial-organ", "iron-plate", "titanium-plate") -- Memory storage changes if data.raw.item["memory-unit"] then - util.me.steel_to_titanium("memory-unit") + util.replace_ingredient("memory-unit", "steel-plate", "titanium-plate") end -- Underwater pipes changes @@ -123,6 +123,6 @@ if data.raw.item["underwater-pipe"] then end util.me.add_titanium_prerequisite("underwater-pipes") - util.me.steel_to_titanium("underwater-pipe") + util.replace_ingredient("underwater-pipe", "steel-plate", "titanium-plate") end