Fix showing reticule buttons when offworld.

It did not account for structures back on home base.
Warzone2100 · Dec 3, 2017 · 73036ec · 73036ec
1 parent b5f8a07
commit 73036ec
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/data/base/script/rules.js b/data/base/script/rules.js
@@ -8,17 +8,28 @@ var allowDesign = false;
 
 function setMainReticule()
 {
+	var offHQ = enumStructOffWorld(selectedPlayer, "A0CommandCentre");
+	var offRes = enumStructOffWorld(selectedPlayer, "A0ResearchFacility");
+	var fCount = 0;
+	var facs = ["A0LightFactory", "A0CyborgFactory", "A0VTolFactory1"];
+
+	for (var i = 0, l = facs.length; i < l; ++i)
+	{
+		var f = facs[i];
+		var offWorldCount = enumStructOffWorld(selectedPlayer, f);
+		fCount = fCount + countStruct(f) + (offWorldCount != null ? offWorldCount.length : 0);
+	}
+
 	setReticuleButton(0, _("Close"), "image_cancel_up.png", "image_cancel_down.png");
-	if (countStruct("A0LightFactory") + countStruct("A0CyborgFactory") + countStruct("A0VTolFactory1") > 0
-	    && levelType != LDS_EXPAND_LIMBO)
+	if (fCount > 0 && levelType != LDS_EXPAND_LIMBO)
 	{
 		setReticuleButton(1, _("Manufacture (F1)"), "image_manufacture_up.png", "image_manufacture_down.png");
 	}
 	else
 	{
 		setReticuleButton(1, _("Manufacture - build factory first"), "", "");
 	}
-	if (countStruct("A0ResearchFacility") > 0 && levelType != LDS_EXPAND_LIMBO)
+	if (countStruct("A0ResearchFacility") + (offRes != null ? offRes.length : 0) > 0 && levelType != LDS_EXPAND_LIMBO)
 	{
 		setReticuleButton(2, _("Research (F2)"), "image_research_up.png", "image_research_down.png");
 	}
@@ -34,7 +45,7 @@ function setMainReticule()
 	{
 		setReticuleButton(3, _("Build - manufacture constructor droids first"), "", "");
 	}
-	if (allowDesign == true)
+	if (allowDesign == true || (offHQ != null ? offHQ.length > 0 : false))
 	{
 		setReticuleButton(4, _("Design (F4)"), "image_design_up.png", "image_design_down.png");
 	}