diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw index c85d2dfc0e334a6a03bffbc71b216a78301a06fc..d3e20dad3a887fcb49faa3da9d84a5008a163f7f 100644 --- a/src/uncategorized/SFMBarracks.tw +++ b/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>> diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw index 69871f9881fbbce912f88e3592b25d8c89bb34d0..bf401878f41479c7937f7b2a9c39544951291850 100644 --- a/src/uncategorized/securityForceEOWReport.tw +++ b/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>>