From f208c4c3ac5828b347d87404f26b3bc74dae1040 Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Thu, 7 Dec 2017 05:35:11 +1300 Subject: [PATCH] src/uncategorized/SFMBarracks.tw bug fixes, re-work. --- src/uncategorized/securityForceEOWReport.tw | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw index 69871f9881f..bf401878f41 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>> -- GitLab