src/uncategorized/SFMBarracks.tw

bug fixes, re-work.

src/uncategorized/securityForceEOWReport.tw

@@ -147,7 +147,7 @@ securityForceX
 	<<if $securityForceArcologyUpgrades >= 4>>
 		<<if $securityForceSatellitePower > 0>>
 			<<set $securityForceRecruit += ($securityForceSatellitePower)>> <</if>>
-		<<if $securityForceGiantRobot > 0>>
+		<<if $securityForceGiantRobot > 0 && ($terrain != "oceanic" && $terrain != "marine")>>
 			<<set $securityForceRecruit += ($securityForceGiantRobot)>> <</if>>
 	<</if>>
 
@@ -216,9 +216,9 @@ securityForceX
 	<<if $securityForceArcologyUpgrades >= 4>>
 		<<if $securityForceSatellitePower > 0>>
 			<<set $securityForceTrade += (0.25*($securityForceSatellitePower))>> <</if>>
-		<<if $securityForceGiantRobot > 0 && $terrain != "oceanic" ||  $terrain != "marine">>
+		<<if $securityForceGiantRobot > 0 && $terrain != "oceanic" &&  $terrain != "marine">>
 			<<set $securityForceTrade += (0.25*($securityForceGiantRobot))>> <</if>>
-		<<if $securityForceMissileSilo > 0 && $terrain != "oceanic" ||  $terrain != "marine">>
+		<<if $securityForceMissileSilo > 0 && $terrain != "oceanic" &&  $terrain != "marine">>
 			<<set $securityForceTrade += (0.25*($securityForceMissileSilo))>> <</if>>
 	<</if>>
 
@@ -325,9 +325,9 @@ securityForceX
 	<<if $securityForceArcologyUpgrades >= 4>>
 		<<if $securityForceSatellitePower > 0>>
 			<<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceSatellitePower*_RaidingEfficienyPercentage)))>> <</if>>
-		<<if $securityForceGiantRobot > 0 && ($terrain != "oceanic" && $terrain != "marine")
+		<<if $securityForceGiantRobot > 0 && ($terrain != "oceanic" && $terrain != "marine")>>
 			<<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceGiantRobot*_RaidingEfficienyPercentage))>> <</if>>
-		<<if $securityForceMissileSilo > 0 && ($terrain != "oceanic" && $terrain != "marine")
+		<<if $securityForceMissileSilo > 0 && ($terrain != "oceanic" && $terrain != "marine")>>
 			<<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceMissileSilo*_RaidingEfficienyPercentage))>> <</if>>
 	<</if>>