Merge branch 'SF-ContentMain' into 'pregmod-master'

Sf content main

See merge request !1095

src/uncategorized/SFMBarracks.tw

@@ -675,7 +675,7 @@ securityForceX */
 	<</link>> <br>It will cost 0.05 of your currently displayed cash, which is ¤<<print Math.trunc(_securityForceUpgradeResetTokenCurrentCost)>>.
 <</if>>
 <<if $securityForceUpgradeTokenReset >= 1>>
-	<br><br>So far, you have currently discussed increasing the frequency of upgrading $securityForceName per week _Name <<if $securityForceUpgradeTokenReset == 1>>once<<else>>$securityForceUpgradeTokenReset times<</if>>.
+	<br><br>"In total, you have asked _Name about upgrading $secureityForceName $securityForceUpgradeTokenReset times."
 <</if>>
 
 <<if ( $SFAO < _max) && $securityForceUpgradeToken == 0>>

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>>