From ae297c4e8b4ee2980ba46f120f4ba06f0f17e007 Mon Sep 17 00:00:00 2001
From: PreLeyZero <Paul.Zschoppe@gmx.de>
Date: Thu, 5 May 2022 22:04:03 +0200
Subject: [PATCH] fixed conditional require

---
 data-final-fixes.lua                   | 7 ++-----
 scripts/krastorio2/overhaul.lua        | 9 ++++-----
 scripts/overhaul.lua                   | 2 +-
 scripts/realisticreactors/overhaul.lua | 4 ++++
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/data-final-fixes.lua b/data-final-fixes.lua
index 9378630..1928d5a 100644
--- a/data-final-fixes.lua
+++ b/data-final-fixes.lua
@@ -7,6 +7,7 @@ end
 --krastorio2
 if mods["Krastorio2"] then
     require('scripts/krastorio2/data-final-fixes')
+    require('scripts/krastorio2/overhaul')
 end
 --ind2
 if mods["IndustrialRevolution"] then
@@ -16,17 +17,13 @@ end
 if mods["space-exploration"] then
     require('scripts/SE/data-final-fixes')
 end
---overhaul K2
-if (settings.startup['overhaul_mode'].value == true and mods["Krastorio2"]) then
-    require('scripts/krastorio2/overhaul')
-end
 --overhaul with realistic reactors
 if mods["RealisticReactors"] then
     for i,v in ipairs(data.raw.technology["nuclear-power"].prerequisites) do
         if v == "effectivity-module-2" then data.raw.technology["nuclear-power"].prerequisites[i] = nil end
     end
 
-    if (settings.startup['overhaul_mode'].value == true and settings.startup['overhaul_realistic_reactors'].value == true) then
+    if settings.startup['overhaul_realistic_reactors'].value then
         require('scripts/realisticreactors/overhaul')
     end
 end
\ No newline at end of file
diff --git a/scripts/krastorio2/overhaul.lua b/scripts/krastorio2/overhaul.lua
index bceedf9..eada56a 100644
--- a/scripts/krastorio2/overhaul.lua
+++ b/scripts/krastorio2/overhaul.lua
@@ -1,3 +1,6 @@
+if settings.startup['overhaul_mode'].value then
+-- indent ignored
+
 local function add_to_recipe(recipe, item, item_amount)
     if not data.raw.recipe[recipe] then
         return
@@ -514,11 +517,7 @@ add_cards_to_tree(del_doubles(walk_techs("gr_charger_tech", break_con)), "singul
 add_cards_to_tree(del_doubles(walk_techs("gr_compact_fusion_tech", break_con)), "singularity-tech-card")
 add_cards_to_tree(del_doubles(walk_techs("kr-singularity-tech-card", break_con)), "fu_space_probe_science_item")
 
-
---TODO
---rare metals with fi_materials
---compact fusion tech and singularity tech
---singularity tech stuff integate
+end --indent ignored
 
 --===================================================================================================================
 --                              math and meta 
diff --git a/scripts/overhaul.lua b/scripts/overhaul.lua
index b8dea7c..a06bf3e 100644
--- a/scripts/overhaul.lua
+++ b/scripts/overhaul.lua
@@ -1,4 +1,4 @@
-if settings.startup['overhaul_mode'].value == true then
+if settings.startup['overhaul_mode'].value then
 -- indent ignored
 
 local function add_to_recipe(recipe, item, item_amount)
diff --git a/scripts/realisticreactors/overhaul.lua b/scripts/realisticreactors/overhaul.lua
index 2a46a11..d359781 100644
--- a/scripts/realisticreactors/overhaul.lua
+++ b/scripts/realisticreactors/overhaul.lua
@@ -1,3 +1,6 @@
+if settings.startup['overhaul_mode'].value then
+-- indent ignored
+
 local function add_to_recipe(recipe, item, item_amount)
     if not data.raw.recipe[recipe] then
         return
@@ -415,3 +418,4 @@ add_tech_cards(change_table_index(add_card_table, tech_structure))
 remove_pre_techs(change_table_index(pre_tech_table, tech_structure))
 remove_tech_cards(change_table_index(remove_card_table, card_structure))
 
+end --indent ignored