diff --git a/compatibility/248k-final.lua b/compatibility/248k-final.lua index 59e39a9..a4ecfda 100644 --- a/compatibility/248k-final.lua +++ b/compatibility/248k-final.lua @@ -1,6 +1,6 @@ local util = require("data-util"); -if mods["248k"] then +if mods["248k-Redux"] then local ti2 = "fi_materials_titan" -- Swap out all 248k titanium for BZ titanium_plate diff --git a/info.json b/info.json index ee33f81..017e81a 100644 --- a/info.json +++ b/info.json @@ -21,7 +21,7 @@ "? modmashsplinterresources", "? EndgameCombat", "(?) Power Armor MK3", - "? 248k", + "? 248k-Redux", "? tenebris", "? Cerys-Moon-of-Fulgora", "(?) atan-nuclear-science", diff --git a/titanium-data-settings.lua b/titanium-data-settings.lua index a0a8714..ef6e721 100644 --- a/titanium-data-settings.lua +++ b/titanium-data-settings.lua @@ -8,7 +8,7 @@ if settings.startup["bztitanium-mining-fluid"] then mining_fluid = settings.startup["bztitanium-mining-fluid"].value end -if mining_fluid == "chlorine" and data.raw.fluid["chlorine"] and util.k2() then +if mining_fluid == "kr-chlorine" and data.raw.fluid["kr-chlorine"] and util.k2() then data.raw.technology[util.me.titanium_processing].prerequisites = {"kr-fluids-chemistry"} data.raw.technology[util.me.titanium_processing].unit.ingredients = util.ALC else diff --git a/titanium-enriched.lua b/titanium-enriched.lua index 12d985d..e98688d 100644 --- a/titanium-enriched.lua +++ b/titanium-enriched.lua @@ -10,10 +10,10 @@ data:extend( icon_size = 64, icon_mipmaps = 3, icon = "__bztitanium__/graphics/icons/enriched-titanium.png", pictures = { - {filename="__bztitanium__/graphics/icons/enriched-titanium.png", size=64, scale=0.25}, - {filename="__bztitanium__/graphics/icons/enriched-titanium-2.png", size=64, scale=0.25}, - {filename="__bztitanium__/graphics/icons/enriched-titanium-3.png", size=64, scale=0.25}, - {filename="__bztitanium__/graphics/icons/enriched-titanium-4.png", size=64, scale=0.25}, + {filename="__bztitanium__/graphics/icons/enriched-titanium.png", size=64, scale=0.5}, + {filename="__bztitanium__/graphics/icons/enriched-titanium-2.png", size=64, scale=0.5}, + {filename="__bztitanium__/graphics/icons/enriched-titanium-3.png", size=64, scale=0.5}, + {filename="__bztitanium__/graphics/icons/enriched-titanium-4.png", size=64, scale=0.5}, }, subgroup = "raw-material", order = "e05-a[enriched-ores]-a1[enriched-titanium]", diff --git a/titanium-recipe-se.lua b/titanium-recipe-se.lua index 81a61fa..93d4dc3 100644 --- a/titanium-recipe-se.lua +++ b/titanium-recipe-se.lua @@ -121,8 +121,8 @@ else always_show_made_in = true, allow_as_intermediate = false, ingredients = { - {name = "enriched-titanium", amount = 8}, - {name = "se-vulcanite-block", amount = 1}, + { type = "item", name = "enriched-titanium", amount = 8}, + { type = "item", name = "se-vulcanite-block", amount = 1}, }, results = { {name = util.me.titanium_plate, amount = 6}, @@ -151,8 +151,8 @@ else always_show_made_in = true, allow_as_intermediate = false, ingredients = { - {name = "titanium-ore", amount = 20}, - {name = "se-vulcanite-block", amount = 1}, + { type = "item", name = "titanium-ore", amount = 20}, + { type = "item", name = "se-vulcanite-block", amount = 1}, }, results = { {name = util.me.titanium_plate, amount = 6}, diff --git a/titanium-recipe-updates-transport.lua b/titanium-recipe-updates-transport.lua index 2c56a2a..40e27f3 100644 --- a/titanium-recipe-updates-transport.lua +++ b/titanium-recipe-updates-transport.lua @@ -55,7 +55,7 @@ end -- Just a general compatiblity improvement with py alien life enabled alongside jetpack or other equipment mods if mods["pyalienlife"] then - util.remove_prerequisite("modular-armor", "advanced-electronics") + util.remove_prerequisite("modular-armor", "advanced-circuit") end if not mods.bzaluminum then diff --git a/titanium-recipe-updates.lua b/titanium-recipe-updates.lua index c6a3df6..14495e7 100644 --- a/titanium-recipe-updates.lua +++ b/titanium-recipe-updates.lua @@ -201,11 +201,7 @@ util.replace_ingredient("ultimate-underground-belt", "steel-plate", util.me.tita util.replace_ingredient("turbo-splitter", "steel-plate", util.me.titanium_plate) util.replace_ingredient("ultimate-splitter", "steel-plate", util.me.titanium_plate) util.replace_ingredient("turbo-inserter", "steel-plate", util.me.titanium_plate) -util.replace_ingredient("turbo-filter-inserter", "steel-plate", util.me.titanium_plate) util.replace_ingredient("turbo-stack-inserter", "steel-plate", util.me.titanium_plate) -util.replace_ingredient("turbo-stack-filter-inserter", "steel-plate", util.me.titanium_plate) util.replace_ingredient("turbo-inserter", "steel-plate", util.me.titanium_plate) -util.replace_ingredient("express-filter-inserter", "steel-plate", util.me.titanium_plate) util.replace_ingredient("express-stack-inserter", "steel-plate", util.me.titanium_plate) -util.replace_ingredient("express-stack-filter-inserter", "steel-plate", util.me.titanium_plate)