diff --git a/data-final-fixes.lua b/data-final-fixes.lua index 95982af..dd53bb6 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -1,34 +1,60 @@ -require("titanium-recipe-final") - --- Space Exploration compatibility and flavor tweaks -require("titanium-recipe-final-se") - --- Krastorio 2 final fixes -require("titanium-recipe-final-k2") - --- Rich Rocks Requiem for Krastorio 2 final fixes -require("titanium-recipe-final-rrr") - --- Module fixes, including for Krastorio 2 -require("titanium-recipe-modules") - - --- Deadlock's stacking and crating -require("titanium-recipe-final-stacking") - --- 5Dim's final fixes -require("titanium-recipe-final-5d") - --- Modmash final fixes -require("titanium-recipe-final-modmash") - -require("compatibility/248k-final") - - -require("titanium-data-final-settings") - - --- Second part of hack for endgame combat -require("compatibility/titanium-endgame-combat-final") --- Hack for AutoTrainDepot -require("compatibility/titanium-auto-train-depot-final") +require("titanium-recipe-final") + + + +-- Space Exploration compatibility and flavor tweaks + +require("titanium-recipe-final-se") + + + +-- Krastorio 2 final fixes + +require("titanium-recipe-final-k2") + + + +-- Rich Rocks Requiem for Krastorio 2 final fixes + +require("titanium-recipe-final-rrr") + + + +-- Module fixes, including for Krastorio 2 + +require("titanium-recipe-modules") + + + + + +-- Deadlock's stacking and crating + +require("titanium-recipe-final-stacking") + + + +-- 5Dim's final fixes + +require("titanium-recipe-final-5d") + + + +-- Modmash final fixes + +require("titanium-recipe-final-modmash") + + + +require("compatibility/248k-final") + + + +-- Second part of hack for endgame combat + +require("compatibility/titanium-endgame-combat-final") + +-- Hack for AutoTrainDepot + +require("compatibility/titanium-auto-train-depot-final") + diff --git a/data.lua b/data.lua index 6df808c..da417db 100644 --- a/data.lua +++ b/data.lua @@ -4,6 +4,7 @@ require("titanium-recipe") require("titanium-enriched") -- Enriched Ti for Krastorio 2 require("titanium-recipe-se") -- Space Exploration special recipes (depends on K2 if present) require("titanium-compressed") +require("titanium-data-settings") -- First part of hack for endgame combat require("compatibility/titanium-endgame-combat-data") diff --git a/titanium-data-final-settings.lua b/titanium-data-settings.lua similarity index 80% rename from titanium-data-final-settings.lua rename to titanium-data-settings.lua index 221091a..76b409d 100644 --- a/titanium-data-final-settings.lua +++ b/titanium-data-settings.lua @@ -13,13 +13,8 @@ if mining_fluid == "chlorine" and data.raw.fluid["chlorine"] and mods["Krastorio data.raw.technology[util.me.titanium_processing].unit.ingredients = { {"basic-tech-card", 1}, {"automation-science-pack", 1}, {"logistic-science-pack", 1}} elseif mining_fluid == "sulfuric-acid" then - data.raw.technology[util.me.titanium_processing].prerequisites = {"sulfur-processing"} - data.raw.technology[util.me.titanium_processing].unit.ingredients = { - {"automation-science-pack", 1}, {"logistic-science-pack", 1}} + data.raw.technology[util.me.titanium_processing].prerequisites = {"uranium-mining"} else - if data.raw.technology["titanium-processing"] then - data.raw.technology["titanium-processing"].prerequisites = {"lubricant"} - end if not mods["Pre0-17-60Oil"] then util.set_tech_recipe("solar-panel-equipment", { {"automation-science-pack", 1}, {"logistic-science-pack", 1}, {"chemical-science-pack", 1}})