From 3967258eba49bb689b69f28f6cf360a020942c97 Mon Sep 17 00:00:00 2001 From: x <okp57855@psoxs.com> Date: Sun, 2 Sep 2018 16:30:12 +1200 Subject: [PATCH] Toggle changes --- src/SecExp/attackReport.tw | 6 +++--- src/SecExp/edicts.tw | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw index 2dd15748b01..fe87340867e 100644 --- a/src/SecExp/attackReport.tw +++ b/src/SecExp/attackReport.tw @@ -438,7 +438,7 @@ Damage to the infrastructure was @@.yellow;virtually non-existent@@, costing only pocket cash to bring the structure back to normal. The inhabitants as well reported little to no injuries, because of this the prosperity of the arcology did not suffer. <<set $cash -= 1000 * _majorBattleMod, $PC.engineering += .1>> <<if $PCvictoryStreak >= 3>> - It seems your victories over the constant threats directed your way is having @@.green;a positive effect on the prosperity of the arcology@@, due to the security your leadership affords. + It seems your victories over the constant threats directed your way is having @@.green;a positive effect on the prosperity of the arcology@@, due to the security your leadership affords. <<set $arcologies[0].prosperity += 5 * _majorBattleMod>> <</if>> <<elseif $battleResult == -3>> @@ -1153,7 +1153,7 @@ <<if $arcologies[0].FSRomanRevivalist != "unset" && $deployingMilitia == 1>> Since you decided to revive old Rome, your volunteers are more willing to trust one of your mercenaries as their leader. <<elseif $deployingMilitia == 1>> - Your volunteers are not enthusiastic at the prospect of being commanded around by a gun for hire. + Your volunteers are not enthusiastic at the prospect of being commanded around by a gun for hire. <</if>> <<if $arcologies[0].FSDegradationist != "unset" && $deployingSlaves == 1>> Because of your degradationist society, your slave soldiers are highly distrustful of the gun for hire you forced them to accept as leader. @@ -1421,7 +1421,7 @@ <br> <<include "unitsBattleReport">> - <<if $SF.Toggle && ($SFUnit.Firebase >= 7 || $SFUnit.GunS >= 1 || $SFUnit.Satellite >= 5 || $SFUnit.GiantRobot >= 6 || $SFUnit.MissileSilo >= 1)>> + <<if $SF.Toggle && $SF.Active >= 1 && ($SFUnit.Firebase >= 7 || $SFUnit.GunS >= 1 || $SFUnit.Satellite >= 5 || $SFUnit.GiantRobot >= 6 || $SFUnit.MissileSilo >= 1)>> /* SF upgrades effects */ <br><br> <<if $SFUnit.Firebase >= 7>> The artillery pieces installed around the $SF.Lower firebase provided vital fire support to the troops in the field. diff --git a/src/SecExp/edicts.tw b/src/SecExp/edicts.tw index a49d5a6993d..ad04f902add 100644 --- a/src/SecExp/edicts.tw +++ b/src/SecExp/edicts.tw @@ -44,7 +44,7 @@ [[Repeal|edicts][$subsidyChurch = 0, $edictsUpkeep -= 1000]] <</if>> -<<if $SF.Toggle && $SFSupportLevel > 0>> +<<if $SF.Toggle && $SF.Active >= 1 && $SFSupportLevel > 0>> <br><br>__Special Force:__ <<if $SFSupportLevel === 1>> <br>''Equipment provision:'' $SF.Caps is providing the security HQ with advanced equipment, boosting its efficiency. @@ -240,7 +240,7 @@ <br> //Will provide cash each week. The higher the flux of citizens to slaves the higher the income. Will cost a small amount of authority each week.// <</if>> -<<if $sellData == 0 && ($secUpgrades.nanoCams == 1 || $secUpgrades.cyberBots == 1 || $secUpgrades.eyeScan == 1 || $secUpgrades.cryptoAnalyzer == 1 || $crimeUpgrades.autoTrial == 1 || $crimeUpgrades.autoArchive == 1 || $crimeUpgrades.worldProfiler == 1 || $crimeUpgrades.advForensic == 1)>> +<<if $sellData == 0 && ($secUpgrades.nanoCams == 1 || $secUpgrades.cyberBots == 1 || $secUpgrades.eyeScan == 1 || $secUpgrades.cryptoAnalyzer == 1 || $crimeUpgrades.autoTrial == 1 || $crimeUpgrades.autoArchive == 1 || $crimeUpgrades.worldProfiler == 1 || $crimeUpgrades.advForensic == 1)>> <br>''Private Data marketization:'' allow the selling of private citizens' data. <<if $authority >= 1000>> [[Implement|edicts][$sellData = 1, $cash -=5000, $authority -= 1000, $edictsAuthUpkeep += 10]] @@ -433,7 +433,7 @@ <<else>> <br>//Not enough Authority.// <</if>> - <br> //Will raise all units upkeep and push loyalty to average levels.// + <br> //Will raise all units upkeep and push loyalty to average levels.// <<elseif $soldierWages == 1>> <br>''Low wages for soldiers:'' will set the wages paid to the soldiers of the arcology to a low amount. <<if $authority >= 1000>> -- GitLab