Fix for missing check in compatibility scripts (#1)

nicolas-lang · Jul 29, 2021 · fbe281d · fbe281d
1 parent 51a855e
commit fbe281d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 17 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.2.2
+  Bugfixes:
+    - Fix for missing check in compatibility scripts (https://github.com/nicolas-lang/Factorio.LongWarehouses/issues/1)
+---------------------------------------------------------------------------------------------------
 Version: 0.2.1
   Major Features:
     - Complete refactoring

diff --git a/data/compatibility/aai-containers.lua b/data/compatibility/aai-containers.lua
@@ -6,13 +6,17 @@ if mods["aai-containers"] then
 	whTech.unit.ingredients = data_util.getResearchUnitIngredients("aai-storehouse-base")
 	whTech.unit.count = data_util.getResearchUnitCount("aai-storehouse-base")*2
 	--
-	local whTechLogistic1 = data.raw["technology"]["nco-LongWarehousesLogistics1"]
-	table.insert(whTechLogistic1.prerequisites,"aai-storehouse-storage")
-	whTechLogistic1.unit.ingredients = data_util.getResearchUnitIngredients("aai-storehouse-storage")
-	whTechLogistic1.unit.count = data_util.getResearchUnitCount("aai-storehouse-storage")*2
+	if settings.startup["wh-enable-logistic"].value then
+		local whTechLogistic1 = data.raw["technology"]["nco-LongWarehousesLogistics1"]
+		table.insert(whTechLogistic1.prerequisites,"aai-storehouse-storage")
+		whTechLogistic1.unit.ingredients = data_util.getResearchUnitIngredients("aai-storehouse-storage")
+		whTechLogistic1.unit.count = data_util.getResearchUnitCount("aai-storehouse-storage")*2
+	end
 	--
-	local whTechLogistic2 = data.raw["technology"]["nco-LongWarehousesLogistics2"]
-	table.insert(whTechLogistic2.prerequisites,"aai-storehouse-logistic")
-	whTechLogistic2.unit.ingredients = data_util.getResearchUnitIngredients("aai-storehouse-logistic")
-	whTechLogistic2.unit.count = data_util.getResearchUnitCount("aai-storehouse-logistic")*2
+	if settings.startup["wh-enable-advanced-logistic"].value then
+		local whTechLogistic2 = data.raw["technology"]["nco-LongWarehousesLogistics2"]
+		table.insert(whTechLogistic2.prerequisites,"aai-storehouse-logistic")
+		whTechLogistic2.unit.ingredients = data_util.getResearchUnitIngredients("aai-storehouse-logistic")
+		whTechLogistic2.unit.count = data_util.getResearchUnitCount("aai-storehouse-logistic")*2
+	end
 end
diff --git a/data/compatibility/k2.lua b/data/compatibility/k2.lua
@@ -7,14 +7,18 @@ if mods["Krastorio2"] then
 		whTech.unit.ingredients = data_util.getResearchUnitIngredients("kr-containers")
 		whTech.unit.count = data_util.getResearchUnitCount("kr-containers")*2
 		--
-		local whTechLogistic1 = data.raw["technology"]["nco-LongWarehousesLogistics1"]
-		table.insert(whTechLogistic1.prerequisites,"kr-logistic-containers-1")
-		whTechLogistic1.unit.ingredients = data_util.getResearchUnitIngredients("kr-logistic-containers-1")
-		whTechLogistic1.unit.count = data_util.getResearchUnitCount("kr-logistic-containers-1")*2
+		if settings.startup["wh-enable-logistic"].value then
+			local whTechLogistic1 = data.raw["technology"]["nco-LongWarehousesLogistics1"]
+			table.insert(whTechLogistic1.prerequisites,"kr-logistic-containers-1")
+			whTechLogistic1.unit.ingredients = data_util.getResearchUnitIngredients("kr-logistic-containers-1")
+			whTechLogistic1.unit.count = data_util.getResearchUnitCount("kr-logistic-containers-1")*2
+		end
 		--
-		local whTechLogistic2 = data.raw["technology"]["nco-LongWarehousesLogistics2"]
-		table.insert(whTechLogistic2.prerequisites,"kr-logistic-containers-2")
-		whTechLogistic2.unit.ingredients = data_util.getResearchUnitIngredients("kr-logistic-containers-2")
-		whTechLogistic2.unit.count = data_util.getResearchUnitCount("kr-logistic-containers-2")*2
+		if settings.startup["wh-enable-advanced-logistic"].value then
+			local whTechLogistic2 = data.raw["technology"]["nco-LongWarehousesLogistics2"]
+			table.insert(whTechLogistic2.prerequisites,"kr-logistic-containers-2")
+			whTechLogistic2.unit.ingredients = data_util.getResearchUnitIngredients("kr-logistic-containers-2")
+			whTechLogistic2.unit.count = data_util.getResearchUnitCount("kr-logistic-containers-2")*2
+		end
 	end
 end
diff --git a/info.json b/info.json
@@ -1,6 +1,6 @@
 {
 	"name": "nco-LongWarehouses",
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"title": "Long Warehouses",
 	"author": "Karoschl",
 	"contact": "",