diff --git a/src/SecExp/attackGenerator.tw b/src/SecExp/attackGenerator.tw
index 434a42194970cadbf0c1833cceb8fcbd8985db39..d2113e2d7d190e3ceeaf5b745406bec527ab32a7 100644
--- a/src/SecExp/attackGenerator.tw
+++ b/src/SecExp/attackGenerator.tw
@@ -234,7 +234,7 @@
<<if ($week >= 120 && $attackType != "none") || ($forceMajorBattle == 1 && $foughtThisWeek == 0)>>
<<if random(1,100) >= 50 || $forceMajorBattle == 1>>
<<set $majorBattle = 1>>
- <<if $SF.Active && $SF.Toggle>>
+ <<if $securityForceCreate == 1>>
<<set $attackTroops = Math.trunc($attackTroops * random(4,6) * $majorBattleMult)>>
<<set $attackEquip = either(3,4)>>
<<else>>
@@ -253,4 +253,4 @@
<</if>>
<</if>>
<</if>>
-<</if>>
+<</if>>
\ No newline at end of file
diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw
index 106f4b6b0907f2068f518e3c5f17ae8a089f79f7..4fae71757dba80f2da4e2069f62fd8e14d8db943 100644
--- a/src/SecExp/attackHandler.tw
+++ b/src/SecExp/attackHandler.tw
@@ -97,22 +97,22 @@
<<set _enemyMod = 1.5>>
<<set _SFMod = 1.5>>
<<set _turns = $maxTurns * 2>>
- <<if $SF.Active && $SF.Toggle>>
- <<if $SFUnit.Firebase >= 7>>
- <<set _atkMod += ($SFUnit.Firebase - 6) * 0.05>>
+ <<if $securityForceCreate == 1>>
+ <<if $securityForceArcologyUpgrades >= 7>>
+ <<set _atkMod += ($securityForceArcologyUpgrades - 6) * 0.05>>
<</if>>
- <<if $SFUnit.GunS >= 1>>
- <<set _defMod += $SFUnit.GunS * 0.05>>
+ <<if $securityForceFortressZeppelin >= 1>>
+ <<set _defMod += $securityForceFortressZeppelin * 0.05>>
<</if>>
- <<if $SFUnit.Satellite >= 5>>
- <<set _atkMod += ($SFUnit.Satellite - 5) * 0.05>>
+ <<if $securityForceSatellitePower >= 11>>
+ <<set _atkMod += ($securityForceSatellitePower - 10) * 0.05>>
<</if>>
- <<if $SFUnit.GiantRobot >= 6>>
- <<set _defMod += ($SFUnit.GiantRobot - 5) * 0.05>>
+ <<if $securityForceGiantRobot >= 6>>
+ <<set _defMod += ($securityForceGiantRobot - 5) * 0.05>>
<</if>>
- <<if $SFUnit.MissileSilo >= 1>>
- <<set _atkMod += $SFUnit.MissileSilo * 0.05>>
- <<set _defMod += $SFUnit.MissileSilo * 0.05>>
+ <<if $securityForceMissileSilo >= 1>>
+ <<set _atkMod += $securityForceMissileSilo * 0.05>>
+ <<set _defMod += $securityForceMissileSilo * 0.05>>
<</if>>
<</if>>
<</if>>
@@ -1241,4 +1241,4 @@ __Enemy__:
<<goto "attackReport">>
<</if>>
-<</if>> /* closes check for bribery */
+<</if>> /* closes check for bribery */
\ No newline at end of file
diff --git a/src/SecExp/attackOptions.tw b/src/SecExp/attackOptions.tw
index b5c625e620897faa38329709b2f5949a51f13789..c517473f02e1b8eaab0458701c956a8c50e582fb 100644
--- a/src/SecExp/attackOptions.tw
+++ b/src/SecExp/attackOptions.tw
@@ -198,7 +198,7 @@ __Battle Plan__:
<<case "mercenary">>
<<set _leader = "The mercenary commander">>
<<case "colonel">>
- <<set _leader = $SF.Lower +"'s Colonel">>
+ <<set _leader = $securityForceName +"'s Colonel">>
<</switch>>
/* leader assignment */
@@ -247,11 +247,11 @@ __Battle Plan__:
<<replace "#leader">><strong><<print _leader>></strong><</replace>>
<</link>>
<</if>>
- <<if $SF.Active && $SF.Toggle && $SFTradeShow.CanAttend === -1>>
+ <<if $securityForceCreate == 1>>
|
<<link "Let The Colonel lead the troops">>
<<set $leadingTroops = "colonel">>
- <<set _leader = $SF.Lower +"'s Colonel">>
+ <<set _leader = $securityForceName +"'s Colonel">>
<<replace "#leader">><strong><<print _leader>></strong><</replace>>
<</link>>
<</if>>
@@ -391,7 +391,7 @@ Units about to be deployed:
<</for>>
<</if>>
-<<if $majorBattle == 1 && $SF.Active>>
+<<if $majorBattle == 1 && $securityForceCreate == 1>>
<br>
<br>
The size of the incoming attack warrants the intervention of the security force in its full force. They will <span id="SFI">not intervene</span>.
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index 50ff06dbdc1e82592e7619181174944529ef4ccb..83696e8eb68695f6d26a749dcf1b2c097e6b1842 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -789,15 +789,15 @@
<</if>>
<<if $SFIntervention == 1>>
<<if $PC.career == "mercenary" || $PC.career == "slaver" || $PC.career == "capitalist" || $PC.career == "gang" || $PC.warfare > 75>>
- The soldiers of the $SF.Lower are ready and willing to follow you into battle, confident in your past experience.
+ The soldiers of the $securityForceName are ready and willing to follow you into battle, confident in your past experience.
<<elseif $PC.career == "wealth" || $PC.career == "medicine" || $PC.career == "engineer">>
- The soldiers of the $SF.Lower, as loyal as they are, are not enthusiastic to follow the orders of someone who has no experience leading men.
+ The soldiers of the $securityForceName, as loyal as they are, are not enthusiastic to follow the orders of someone who has no experience leading men.
<<elseif $PC.career == "servant">>
- The soldiers of the $SF.Lower, as loyal as they are, are not enthusiastic to follow the orders of an ex-servant.
+ The soldiers of the $securityForceName, as loyal as they are, are not enthusiastic to follow the orders of an ex-servant.
<<elseif $PC.career == "escort">>
- The soldiers of the $SF.Lower, as loyal as they are, are not enthusiastic to follow the orders of an ex-escort.
+ The soldiers of the $securityForceName, as loyal as they are, are not enthusiastic to follow the orders of an ex-escort.
<<elseif $PC.career == "BlackHat">>
- The soldiers of the $SF.Lower, as loyal as they are, are not enthusiastic to follow the orders of a dubious incursion specialist.
+ The soldiers of the $securityForceName, as loyal as they are, are not enthusiastic to follow the orders of a dubious incursion specialist.
<</if>>
<</if>>
<<if $PC.warfare <= 25 && $PC.warfare > 10>>
@@ -1167,7 +1167,7 @@
Your mercenaries approve of such decisions, as they feel more confident by having a good, experienced commander.
<</if>>
<<if $SFIntervention == 1>>
- The soldiers of $SF.Lower obviously approved of your decision.
+ The soldiers of $securityForceName obviously approved of your decision.
<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset" && $deployingMilitia == 1>>
Since you decided to revive old Rome, your volunteers are more willing to trust one of your soldiers as their leader.
@@ -1421,23 +1421,23 @@
<br>
<<include "unitsBattleReport">>
- <<if $SF.Toggle && ($SFUnit.Firebase >= 7 || $SFUnit.GunS >= 1 || $SFUnit.Satellite >= 5 || $SFUnit.GiantRobot >= 6 || $SFUnit.MissileSilo >= 1)>>
+ <<if $securityForceArcologyUpgrades >= 7 || $securityForceFortressZeppelin >= 1 || $securityForceSatellitePower >= 11 || $securityForceGiantRobot >= 6 || $securityForceMissileSilo >= 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.
+ <<if $securityForceArcologyUpgrades >= 7>>
+ The artillery pieces installed around the $securityForceName barracks provided vital fire support to the troops in the field.
<</if>>
- <<if $SFUnit.GunS >= 1>>
- The gunship gave our troops an undeniable advantage in recon capabilities, air superiority and fire support.
+ <<if $securityForceFortressZeppelin >= 1>>
+ The fortress zeppelin gave our troops an undeniable advantage in recon capabilities, air superiority and fire support.
<</if>>
- <<if $SFUnit.Satellite >= 5>>
- The $SF.Lower SF.Satellite devastating power was employed with great efficiency against the enemy.
+ <<if $securityForceSatellitePower >= 11>>
+ The $securityForceName Satellite devastating power was employed with great efficiency against the enemy.
<</if>>
- <<if $SFUnit.GiantRobot >= 6>>
- The giant robot of the $SF.Lower proved to be a great boon to our troops, shielding many from the worst the enemy had to offer.
+ <<if $securityForceGiantRobot >= 6>>
+ The giant robot of the $securityForceName proved to be a great boon to our troops, shielding many from the worst the enemy had to offer.
<</if>>
- <<if $SFUnit.MissileSilo >= 1>>
+ <<if $securityForceMissileSilo >= 1>>
The missile silo exterminated many enemy soldiers even before the battle would begin.
<</if>>
<</if>>
diff --git a/src/SecExp/authorityReport.tw b/src/SecExp/authorityReport.tw
index b9e1f8113d38448020bc1357f10d3db97a61bcca..11370b0273149328b0d63ea4948b0f80374e402f 100644
--- a/src/SecExp/authorityReport.tw
+++ b/src/SecExp/authorityReport.tw
@@ -106,11 +106,6 @@ Your authority is
<<set _authGrowth += 12 * $activeUnits>>
<</if>>
-<<if $SF.Toggle && $SF.Active && $SF.Units > 10>>
- Having a powerful special force, increases your authority.
- <<set _authGrowth += $SF.Units/10>>
-<</if>>
-
<<if $arcologies[0].FSChattelReligionist >= 90>>
Religious organizations have a tight grip on the minds of your residents and their dogma greatly helps your authority grow.
<<set _authGrowth += $arcologies[0].FSChattelReligionist>>
diff --git a/src/SecExp/edicts.tw b/src/SecExp/edicts.tw
index 2501501d50a255fd8de51c170037dba37763b07a..3ed4ab94dfbe3b63ad9a2937c9de7073e61a835b 100644
--- a/src/SecExp/edicts.tw
+++ b/src/SecExp/edicts.tw
@@ -44,22 +44,22 @@
[[Repeal|edicts][$subsidyChurch = 0, $edictsUpkeep -= 1000]]
<</if>>
-<<if $SFSupportLevel > 0 && $SF.Toggle>>
+<<if $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.
+ <<if $SFSupportLevel == 1>>
+ <br>''Equipment provision:'' $securityForceName is providing the security HQ with advanced equipment, boosting its efficiency.
[[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 1000, $reqHelots += 5]]
- <<elseif $SFSupportLevel === 2>>
- <br>''Personnel training:'' $SF.Caps is currently providing advanced equipment and training to security HQ personnel.
+ <<elseif $SFSupportLevel == 2>>
+ <br>''Personnel training:'' $securityForceName is currently providing advanced equipment and training to security HQ personnel.
[[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 2000, $reqHelots += 5]]
- <<elseif $SFSupportLevel === 3>>
- <br>''Troops detachment:'' $SF.Caps has currently transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
+ <<elseif $SFSupportLevel == 3>>
+ <br>''Troops detachment:'' $securityForceName has currently transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
[[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 3000, $reqHelots += 5]]
- <<elseif $SFSupportLevel === 4>>
- <br>''Full support:''$SF.Caps is currently providing its full support to the security department, while transferring troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
+ <<elseif $SFSupportLevel == 4>>
+ <br>''Full support:''$securityForceName is currently providing its full support to the security department, while transferring troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
[[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 3000, $reqHelots += 5]]
- <<elseif $SFSupportLevel === 5>>
- <br>''Network assistance:''$SF.Caps is currently assisting with a local install of its custom network full support and has transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
+ <<elseif $SFSupportLevel == 5>>
+ <br>''Network assistance:''$securityForceName is currently assisting with a local install of its custom network full support and has transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
[[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 4000, $secHQUpkeep -= 1000, $reqHelots += 5]]
<</if>>
<</if>>
@@ -307,42 +307,42 @@
<</if>>
<</if>>
-<<if $SF.Active && $SFSupportLevel < 5 && $SF.Toggle>>
+<<if $securityForceCreate == 1 && $SFSupportLevel < 5>>
<br><br>__Special Force:__
<<if $SFSupportLevel == 0 && $reqHelots > 5>>
- <br>''Equipment provision:'' $SF.Caps will provide the security HQ with advanced equipment.
+ <br>''Equipment provision:'' $securityForceName will provide the security HQ with advanced equipment.
<<if $authority >= 1000>>
[[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 1000, $reqHelots -= 5]]
<<else>>
<br>//Not enough Authority.//
<</if>>
<br> //Will lower the amount of personnel necessary to man the security HQ by 5, but will incur upkeep costs.//
- <<elseif $SFSupportLevel === 1 && $SFUnit.Firebase >= 4 && $reqHelots > 5>>
- <br>''Personnel training:'' $SF.Caps will provide the security HQ personnel with advanced training.
+ <<elseif $SFSupportLevel == 1 && $securityForceArcologyUpgrades != 4 && $reqHelots > 5>>
+ <br>''Personnel training:'' $securityForceName will provide the security HQ personnel with advanced training.
<<if $authority >= 1000>>
[[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 2000, $reqHelots -= 5]]
<<else>>
<br>//Not enough Authority.//
<</if>>
<br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.//
- <<elseif $SFSupportLevel === 2 && $SFUnit.Firebase >= 6 && $reqHelots > 5>>
- <br>''Troops detachment:'' $SF.Caps will provide troops to the security department.
+ <<elseif $SFSupportLevel == 2 && $securityForceArcologyUpgrades != 6 && $reqHelots > 5>>
+ <br>''Troops detachment:'' $securityForceName will provide troops to the security department.
<<if $authority >= 1000>>
[[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 3000, $reqHelots -= 5]]
<<else>>
<br>//Not enough Authority.//
<</if>>
<br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.//
- <<elseif $SFSupportLevel === 3 && $SFUnit.Firebase >= 6 && $reqHelots > 5>>
- <br>''Full Support:'' $SF.Caps will give the security department its full support.
+ <<elseif $SFSupportLevel == 3 && $securityForceArcologyUpgrades != 6 && $reqHelots > 5>>
+ <br>''Full Support:'' $securityForceName will give the security department its full support.
<<if $authority >= 1000>>
[[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 3000, $reqHelots -= 5]]
<<else>>
<br>//Not enough Authority.//
<</if>>
<br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.//
- <<elseif $SFSupportLevel === 4 && $SFUnit.Firebase === 10 && $reqHelots > 5>>
- <br>''Network assistance:'' $SF.Caps will assist the security department with installing a local version of their custom network.
+ <<elseif $SFSupportLevel == 4 && $securityForceArcologyUpgrades == 13 && $reqHelots > 5>>
+ <br>''Network assistance:'' $securityForceName will assist the security department with installing a local version of their custom network.
<<if $authority >= 1000>>
[[Implement|edicts][$SFSupportLevel++, $cash -=50000, $authority -= 1000, $SFSupportUpkeep += 4000, $secHQUpkeep += 1000, $reqHelots -= 5]]
<<else>>
diff --git a/src/SecExp/rebellionHandler.tw b/src/SecExp/rebellionHandler.tw
index 67a56b0ec31402fe66a01af591f82cde127418bb..624c40e9543d9b441708b921ab2b149fbb74f487 100644
--- a/src/SecExp/rebellionHandler.tw
+++ b/src/SecExp/rebellionHandler.tw
@@ -136,7 +136,7 @@
<</if>>
<</for>>
-<<if $SF.Active && $SF.Toggle>>
+<<if $securityForceCreate == 1>>
<<set $SFatk = 0>>
<<set $SFdef = 0>>
<<set $SFhp = 0>>
@@ -177,10 +177,10 @@
<<set _moraleTroopMod = Math.clamp($troopCount / 100,1,10)>>
/* morale and baseHp calculation */
-<<set _morale = ($secBotsMorale * $secBots.active + $militiaBaseMorale * $deployingMilitia + $slaveBaseMorale * $deployingSlaves + $mercBaseMorale * $deployingMercs + $SFBaseMorale * $SF.Active) / ($secBots.active + $deployingMilitia +$deployingSlaves + $deployingMercs + $SF.Active)>>
+<<set _morale = ($secBotsMorale * $secBots.active + $militiaBaseMorale * $deployingMilitia + $slaveBaseMorale * $deployingSlaves + $mercBaseMorale * $deployingMercs + $SFBaseMorale * $securityForceCreate) / ($secBots.active + $deployingMilitia +$deployingSlaves + $deployingMercs + $securityForceCreate)>>
<<set _morale = _morale + _morale * $secBarracksUpgrades.luxury * 0.05>> /* barracks bonus */
<<set _morale *= _moraleTroopMod>>
-<<set _baseHp = ($secBotsBaseHp * $secBots.active + $militiaBaseHp * $deployingMilitia + $slaveBaseHp * $deployingSlaves + $mercBaseHp * $deployingMercs + $SFBaseHp * $SF.Active) / ($secBots.active + $deployingMilitia +$deployingSlaves + $deployingMercs + $SF.Active)>>
+<<set _baseHp = ($secBotsBaseHp * $secBots.active + $militiaBaseHp * $deployingMilitia + $slaveBaseHp * $deployingSlaves + $mercBaseHp * $deployingMercs + $SFBaseHp * $securityForceCreate) / ($secBots.active + $deployingMilitia +$deployingSlaves + $deployingMercs + $securityForceCreate)>>
/* calculates rebelling army stats */
<<if $week <= 30>>
diff --git a/src/SecExp/rebellionOptions.tw b/src/SecExp/rebellionOptions.tw
index 5baf167f37b26be9ac87e27fe1aac7396172ee36..cb0035eface5921beb55d2d20c33c3173b09369f 100644
--- a/src/SecExp/rebellionOptions.tw
+++ b/src/SecExp/rebellionOptions.tw
@@ -97,10 +97,10 @@
<</if>>
<</if>>
<</for>>
- <<if $SF.Active && $SF.Toggle>>and $SF.Lower, <<print commaNum($SFUnit.Troops)>> strong<</if>>
+ <<if $securityForceActive == 1>>and $securityForceName, <<print commaNum($securityForcePersonnel)>> strong<</if>>
are called to defend the arcology from this menace.
<<else>>
- <<if $arcologyUpgrade.drones == 1>>Your security drones<<if $SF.Active && $SF.Toggle>>and $SF.Lower, <<print commaNum($SFUnit.Troops)>> strong<</if>><</if>>
+ <<if $arcologyUpgrade.drones == 1>>Your security drones<<if $securityForceActive == 1>>and <<print commaNum($securityForceName, $securityForcePersonnel)>> strong<</if>><</if>>
are called to defend the arcology from this menace.
<</if>>
<hr>
@@ -192,10 +192,10 @@
<</if>>
<</if>>
<</for>>
- <<if $SF.Active && $SF.Toggle>>and $SF.Lower, <<print commaNum($SFUnit.Troops)>> strong<</if>>
+ <<if $securityForceActive == 1>>and $securityForceName, <<print commaNum($securityForcePersonnel)>> strong<</if>>
are called to defend the arcology from this menace.
<<else>>
- <<if $arcologyUpgrade.drones == 1>>Your security drones<<if $SF.Active && $SF.Toggle>>and $SF.Lower, <<print commaNum($SFUnit.Troops)>> strong<</if>><</if>>
+ <<if $arcologyUpgrade.drones == 1>>Your security drones<<if $securityForceActive == 1>>and $securityForceName, <<print commaNum($securityForcePersonnel)>> strong<</if>><</if>>
are called to defend the arcology from this menace.
<</if>>
<hr>
diff --git a/src/SecExp/secBarracks.tw b/src/SecExp/secBarracks.tw
index 799500dc3fc5387ac2a25a2c122ede81401cf233..c621fb3f53857f4b231f3651d05dfae0c45330c6 100644
--- a/src/SecExp/secBarracks.tw
+++ b/src/SecExp/secBarracks.tw
@@ -139,7 +139,7 @@ While this a sore sight for many citizens of $arcologies[0].name, the barracks s
<hr>
__Units__
<br>
-Your current maximum number of units is <<print $maxUnits>> (<<print commaNum($secBots.maxTroops+(50*$maxUnits))>> troops), <<print $activeUnits>> (<<print commaNum($secBots.maxTroops+($slavesEmployedManpower)+($militiaEmployedManpower)+($mercEmployedManpower))>> troops) are active and <<print (2 * $readiness)>> units can be deployed. <<if $secBarracksUpgrades.luxury > 0>>The barracks provides <<print $secBarracksUpgrades.luxury * 5>>% bonus morale when battle occurs.<</if>><<if $secBarracksUpgrades.training > 0>> The training facility will increase the effectiveness of your units with time.<</if>>
+Your maximum number of units is <<print $maxUnits>>, currently you have <<print $activeUnits>>. <<if $secBarracksUpgrades.luxury > 0>>The barracks provides <<print $secBarracksUpgrades.luxury * 5>>% bonus morale when battle occurs.<</if>><<if $secBarracksUpgrades.training > 0>> The training facility will increase the effectiveness of your units with time.<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset" || $arcologies[0].FSChineseRevivalist != "unset" || $arcologies[0].FSArabianRevivalist != "unset" || $arcologies[0].FSEdoRevivalist != "unset" || $arcologies[0].FSEgyptianRevivalist != "unset" || $arcologies[0].FSAztecRevivalist != "unset">>
<</if>>
<br>
diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw
index 56eabf9114a86e9130570bef825fc677dd80c8bb..56eb883bc4e6bf774492d6ea8c6d288a2ff6a2e8 100644
--- a/src/SecExp/securityReport.tw
+++ b/src/SecExp/securityReport.tw
@@ -126,13 +126,13 @@
<</if>>
<<if $SFSupportLevel >= 3>>
- The two squads of $SF.Lower assigned to the Security HQ provide an essential help to the security department.
+ The two squads of $securityForceName assigned to the Security HQ provide an essential help to the security department.
<</if>>
<<if $SFSupportLevel >= 2>>
- The training officers of $SF.Lower assigned to the Security HQ improve its effectiveness.
+ The training officers of $securityForceName assigned to the Security HQ improve its effectiveness.
<</if>>
<<if $SFSupportLevel >= 1>>
- Providing your Security Department with equipment from $SF.Lower slightly boosts the security of your arcology.
+ Providing your Security Department with equipment from $securityForceName slightly boosts the security of your arcology.
<</if>>
/* resting point */
@@ -252,10 +252,6 @@
<<if $militiaFounded == 1 || $activeUnits >= 1>>
<br>
<strong> Military</strong>: /* militia */
- <<if $SF.Toggle && $SF.Active && $SF.Units > 10>>
- Having a powerful special force attracts a lot of citizens, hopeful that they may be able to fight along side it.
- <<set _recruits += random(0,(Math.round($SF.Units/10)))>>
- <</if>>
<<if $propCampaign >= 1 && $propFocus == "recruitment">>
<<if $RecuriterOffice == 0 || $Recruiter == 0>>
<<if $propCampaignBoost == 1>>
@@ -404,10 +400,6 @@
<<if $crime > 60>>
The powerful crime organizations that nested themselves in the arcology have an unending need for cheap guns for hire, many mercenaries flock to your free city in search of employment.<<set _newMercs += random(1,2)>>
<</if>>
- <<if $SF.Toggle && $SF.Active && $SF.Units > 10>>
- Having a powerful special force attracts a lot of mercenaries, hopeful that they may be able to fight along side it.
- <<set _newMercs += random(0,Math.round($SF.Units/10))>>
- <</if>>
<<set _newMercs = Math.trunc(_newMercs / 2)>>
<<if _newMercs > 0>>
<<set $mercTotalManpower += _newMercs>>
diff --git a/src/SecExp/seeUnit.tw b/src/SecExp/seeUnit.tw
index f878bb952036879888b0c381697b5e644074d800..2ad539ccd55eb46712e8154f5c871fe961d21f8f 100644
--- a/src/SecExp/seeUnit.tw
+++ b/src/SecExp/seeUnit.tw
@@ -26,17 +26,17 @@
<</link>>
Invest in the development of more refined controls for your drones to increase the maximum number of drones in the unit.
<br>//Costs <<print cashFormat(5000)>> per upgrade and each will increase the max by 10//
- <<elseif $secBots.maxTroops < 100 && $SFSupportLevel >= 1 && $SF.Active>>>
+ <<elseif $secBots.maxTroops < 100 && $SFSupportLevel >= 1>>
<br>
- <<link "Refine the drone network with $SF.Lower assistance">>
+ <<link "Refine the drone network with $securityForceName assistance">>
<<set $secBots.maxTroops += 10>>
<<set $cash -= 5000 + 10 * $secBotsUpgradeCost * $secBots.equip>>
<<goto "seeUnit">>
<</link>>
- Utilize the technological developments made by $SF.Lower to further improve the control matrix of the security drones.
+ Utilize the technological developments made by $securityForceName to further improve the control matrix of the security drones.
<br>//Costs <<print cashFormat(5000 + 10 * $secBotsUpgradeCost * $secBots.equip)>> and will increase the max by 10//
- <<elseif $SFSupportLevel < 1 && $SF.Active>>
- There's little left to improve in the matrix. However support from $SF.Lower might give some more room from improvement.
+ <<elseif $SFSupportLevel < 1 && $securityForceCreate == 1>>
+ There's little left to improve in the matrix. However support from $securityForceName might give some more room from improvement.
<<else>>
There's little left to improve in the matrix. Your control systems are at top capacity and won't be able to handle a bigger drone unit.
<</if>>
@@ -160,7 +160,7 @@
<<else>>
<br>The unit has a medic detachment following it into battle, decreasing the number of casualties the unit suffers.
<</if>>
- <<if $SF.Active && $SF.Toggle>>
+ <<if $securityForceActive == 1>>
<<if $militiaUnits[$targetIndex].SF == 0>>
<br>
<<link "Attach Special Force advisors">>
@@ -168,10 +168,10 @@
<<set $cash -= ($equipUpgradeCost * $militiaUnits[$targetIndex].maxTroops) + 5000>>
<<goto "seeUnit">>
<</link>>
- Attach $SF.Lower advisors to the unit.
+ Attach $securityForceName advisors to the unit.
<br>//Costs <<print cashFormat(($equipUpgradeCost * $militiaUnits[$targetIndex].maxTroops) + 5000)>> and will slightly increase the base stats of the unit.//
<<else>>
- <br>The unit has attached advisors from $SF.Lower that will help the squad remain tactically aware and active.
+ <br>The unit has attached advisors from $securityForceName that will help the squad remain tactically aware and active.
<</if>>
<</if>>
@@ -318,7 +318,7 @@
<<else>>
<br>The unit has a medic detachment following it into battle, decreasing the number of casualties the unit suffers.
<</if>>
- <<if $SF.Active && $SF.Toggle>>
+ <<if $securityForceActive == 1>>
<<if $slaveUnits[$targetIndex].SF == 0>>
<br>
<<link "Attach Special Force advisors">>
@@ -326,10 +326,10 @@
<<set $cash -= ($equipUpgradeCost * $slaveUnits[$targetIndex].maxTroops) + 5000>>
<<goto "seeUnit">>
<</link>>
- Attach $SF.Lower advisors to the unit.
+ Attach $securityForceName advisors to the unit.
<br>//Costs <<print cashFormat(($equipUpgradeCost * $slaveUnits[$targetIndex].maxTroops) + 5000)>> and will slightly increase the base stats of the unit.//
<<else>>
- <br>The unit has attached advisors from $SF.Lower that will help the squad remain tactically aware and active.
+ <br>The unit has attached advisors from $securityForceName that will help the squad remain tactically aware and active.
<</if>>
<</if>>
<<if $showBattleStatistics == 1>>
@@ -474,7 +474,7 @@
<<else>>
<br>The unit has a medic detachment following it into battle, decreasing the number of casualties the unit suffers.
<</if>>
- <<if $SF.Active && $SF.Toggle>>
+ <<if $securityForceActive == 1>>
<<if $mercUnits[$targetIndex].SF == 0>>
<br>
<<link "Attach Special Force advisors">>
@@ -482,10 +482,10 @@
<<set $cash -= ($equipUpgradeCost * $mercUnits[$targetIndex].maxTroops) + 5000>>
<<goto "seeUnit">>
<</link>>
- Attach $SF.Lower advisors to the unit.
+ Attach $securityForceName advisors to the unit.
<br>//Costs <<print cashFormat(($equipUpgradeCost * $mercUnits[$targetIndex].maxTroops) + 5000)>> and will slightly increase the base stats of the unit.//
<<else>>
- <br>The unit has attached advisors from $SF.Lower that will help the squad remain tactically aware and active.
+ <br>The unit has attached advisors from $securityForceName that will help the squad remain tactically aware and active.
<</if>>
<</if>>
<<if $showBattleStatistics == 1>>
diff --git a/src/SecExp/unitsBattleReport.tw b/src/SecExp/unitsBattleReport.tw
index d2ce2a7ebcdd1544cc53cf14e59847be2ae27414..b702f98375e4eda6d3a5c8a81a4d61d71ea12f56 100644
--- a/src/SecExp/unitsBattleReport.tw
+++ b/src/SecExp/unitsBattleReport.tw
@@ -5,9 +5,9 @@
<br>
Security Drones: no casualties.
<</if>>
- <<if $SFIntervention === 1 && $SF.Toggle>>
+ <<if $SFIntervention == 1>>
<br>
- <<print commaNum($SFUnit.Troops)>> soldiers from $SF.Lower joined the battle: no casualties suffered.
+ <<print $securityForcePersonnel>> soldiers from $securityForceName joined the battle: no casualties suffered.
<</if>>
<<if $deployingMilitia == 1>>
<<for _j = 0; _j < $militiaUnits.length; _j++>>
@@ -56,7 +56,7 @@
/* if the losses are more than zero */
/* generates a list of randomized losses, from which each unit picks one at random */
<<set _losses = $losses>>
- <<if $SFIntervention === 1 && $SF.Toggle>>
+ <<if $SFIntervention == 1>>
<<set $deployedUnits++>>
<</if>>
<<set _averageLosses = Math.trunc(_losses / $deployedUnits)>>
@@ -122,11 +122,11 @@
<</if>>
<br>
<</if>>
- <<if $SFIntervention === 1 && $SF.Toggle>>
+ <<if $SFIntervention == 1>>
<br>
<<set _loss = _lossesList.pluck()>>
- <<set _loss = Math.clamp(_loss,0,$SFUnit.Troops)>>
- <<print commaNum($SFUnit.Troops)>> soldiers from $SF.Lower joined the battle:
+ <<set _loss = Math.clamp(_loss,0,$securityForcePersonnel)>>
+ <<print $securityForcePersonnel>> soldiers from the $securityForceName joined the battle:
<<if _loss <= 0>>
no casualties
<<elseif _loss <= 10>>
@@ -139,7 +139,7 @@
catastrophic casualties
<</if>>
suffered.
- <<set $SFUnit.Troops -= _loss>>
+ <<set $securityForcePersonnel -= _loss>>
<br>
<</if>>
<<if $deployingMilitia == 1>>
@@ -273,4 +273,4 @@
<</if>>
<<else>>
<br>@@.red;Error: losses are a negative number or NaN@@
-<</if>> /* closes check for more than zero casualties */
+<</if>> /* closes check for more than zero casualties */
\ No newline at end of file
diff --git a/src/SecExp/unitsRebellionReport.tw b/src/SecExp/unitsRebellionReport.tw
index c847a46a8f2a3561ab339f21b52a5075621c64de..b07d60ec4d8bce574ef184674790e2a999ac205c 100644
--- a/src/SecExp/unitsRebellionReport.tw
+++ b/src/SecExp/unitsRebellionReport.tw
@@ -8,9 +8,9 @@
<br>
Security drones: no casualties suffered.
<</if>>
- <<if $SF.Active && $SF.Toggle>>
+ <<if $securityForceCreate == 1>>
<br>
- $SF.Lower, <<print commaNum($SFUnit.Troops)>> strong, was called to join the battle: no casualties suffered.
+ $securityForceName, <<print commaNum($securityForcePersonnel)>> strong, was called to join the battle: no casualties suffered.
<</if>>
<<set _count = 0>>
<<if $loyalID.length > 0>>
@@ -256,7 +256,7 @@
<<elseif $losses > 0>>
/* if the losses are more than zero */
/* generates a list of randomized losses, from which each unit picks one at random */
- <<if $SF.Active && $SF.Toggle>>
+ <<if $securityForceCreate == 1>>
<<set $deployedUnits++>>
<</if>>
<<if $irregulars > 0>>
@@ -346,13 +346,13 @@
The unit has very few operatives left, it risks complete annihilation if deployed again.
<</if>>
<</if>>
- <<if $SF.Active && $SF.Toggle>>
+ <<if $securityForceCreate == 1>>
<br>
<br>
<<set _loss = _lossesList.pluck()>>
- <<set _loss = Math.clamp(_loss,0,$SFUnit.Troops)>>
- $SF.Lower, $SFUnit.Troops strong, is called to join the battle:
- <<set $SFUnit.Troops -= _loss>>
+ <<set _loss = Math.clamp(_loss,0,$securityForcePersonnel)>>
+ $securityForceName, $securityForcePersonnel strong, is called to join the battle:
+ <<set $securityForcePersonnel -= _loss>>
<<if _loss <= 0>>
no casualties
<<elseif _loss <= 10>>
diff --git a/src/SecExp/weaponsManufacturing.tw b/src/SecExp/weaponsManufacturing.tw
index 4f38d49702ac7e73e78f8c1dc9903dc0222b150c..339b434aa738fab80187fa0a79fb8eeab57fc03d 100644
--- a/src/SecExp/weaponsManufacturing.tw
+++ b/src/SecExp/weaponsManufacturing.tw
@@ -322,10 +322,10 @@ __Upgrades__:
<br>//Will take _time weeks, cost <<print cashFormat(120000*$HackingSkillMultiplier)>> and will increase the base hp and morale values of human troops.//
<</if>>
<br>
- <<if $SFUnit.Active && $SFUnit.Toggle>>
- <<if !$completedUpgrades.includes(6) && $weapLab >= 2 && $SFSupportLevel >= 2 && $SFUnit.Firebase >= 7>>
+ <<if $securityForceCreate == 1>>
+ <<if !$completedUpgrades.includes(6) && $weapLab >= 2 && $SFSupportLevel >= 2 && $securityForceArcologyUpgrades >= 7>>
<br>
- <<link "Develop combined training regimens with $SF.Lower">>
+ <<link "Develop combined training regimens with $securityForceName">>
<<set $currentUpgrade = {
ID: 6,
name: "combined training regimens with the special force",
@@ -336,9 +336,9 @@ __Upgrades__:
<</link>>
<br>//Will take _time weeks, and will increase the base attack and defense values of human troops.//
<</if>>
- <<if !$completedUpgrades.includes(7) && $weapLab >= 2 && $SFSupportLevel >= 4 && $SFUnit.Drugs >= 8>>
+ <<if !$completedUpgrades.includes(7) && $weapLab >= 2 && $SFSupportLevel >= 4 && $securityForceStimulantPower >= 8>>
<br>
- <<link "Develop a variant of the stimulant cocktail that $SF.Lower created">>
+ <<link "Develop a variant of the stimulant cocktail that $securityForceName created">>
<<set $currentUpgrade = {
ID: 7,
name: "a variant of the stimulant cocktail that the special force created",
@@ -352,7 +352,7 @@ __Upgrades__:
<</if>>
<<if !$completedUpgrades.includes(8) && $weapLab >= 3 && $SFSupportLevel >= 5>>
<br>
- <<link "Create a mesh network based off the custom network of $SF.Lower">>
+ <<link "Create a mesh network based off the custom network of $securityForceName">>
<<set $currentUpgrade = {
ID: 8,
name: "a mesh network based off the custom network of the special force",
@@ -365,12 +365,12 @@ __Upgrades__:
<br>//Will take _time weeks, cost <<print cashFormat(1000000*$HackingSkillMultiplier)>> and will increase all base stats of human troops.//
<</if>>
<</if>>
- <<if ($humanUpgrade.attack >= 4 || $humanUpgrade.hp >= 4 || $humanUpgrade.morale >= 40 || $humanUpgrade.defense >= 4)>>
+ <<if $securityForceCreate == 1 && ($humanUpgrade.attack >= 4 || $humanUpgrade.hp >= 4 || $humanUpgrade.morale >= 40 || $humanUpgrade.defense >= 4)>>
You fully upgraded your human troops.
<<elseif $humanUpgrade.attack >= 2 || $humanUpgrade.hp >= 2 || $humanUpgrade.morale >= 20 || $humanUpgrade.defense >= 2>>
You fully upgraded your human troops.
- <<if ($humanUpgrade.attack < 4 || $humanUpgrade.hp < 4 || $humanUpgrade.morale < 40 || $humanUpgrade.defense < 4) && (($SFSupportLevel >= 2 && $SFUnit.Firebase >= 7) || ($SFSupportLevel >= 4 && $SFUnit.Drugs >= 8) || ($SFSupportLevel >= 5))>>
- With support from $SF.Lower, however, we may be able to further upgrade our troops.
+ <<if $securityForceCreate == 1 && ($humanUpgrade.attack < 4 || $humanUpgrade.hp < 4 || $humanUpgrade.morale < 40 || $humanUpgrade.defense < 4) && (($SFSupportLevel >= 2 && $securityForceArcologyUpgrades >= 7) || ($SFSupportLevel >= 4 && $securityForceStimulantPower >= 8) || ($SFSupportLevel >= 5))>>
+ With support from $securityForceName, however, we may be able to further upgrade our troops.
<</if>>
<<elseif $weapLab < 3>>
Upgrade the research facility further to unlock more upgrades for human troops.
diff --git a/src/SecExp/widgets/battleWidgets.tw b/src/SecExp/widgets/battleWidgets.tw
index 2bc955cd613b7af998e59b73b61d0e75ad65f904..26edaff84521764dddd5cfd17038e8fdbf96ab8e 100644
--- a/src/SecExp/widgets/battleWidgets.tw
+++ b/src/SecExp/widgets/battleWidgets.tw
@@ -3,33 +3,33 @@
<<widget "calcSFStatistics">>
<<if $slaveRebellion != 1 || $citizenRebellion != 1>>
/* atk, def */
- <<set _upgradesSum = $SFUnit.Armoury + $SFUnit.Drugs + $SFUnit.AirForce + $SFUnit.Vehicles>>
+ <<set _upgradesSum = $securityForceInfantryPower + $securityForceStimulantPower + $securityForceAircraftPower + $securityForceAircraftPower>>
<<if !isInt(_upgradesSum)>>
<<set _upgradesSum = random(10,15)>>
<</if>>
<<set $SFatk = Math.trunc(0.65 * _upgradesSum)>>
<<set $SFdef = Math.trunc(0.40 * _upgradesSum)>>
/* hp */
- <<set $carriableSoldiers = 125 * ($SFUnit.GunS + $SFUnit.Vehicles + $SFUnit.AirForce)>>
+ <<set $carriableSoldiers = 125 * ($securityForceAC130 + $securityForceVehiclePower)>>
<<if !isInt($carriableSoldiers)>>
- <<set $carriableSoldiers = $SFUnit.Troops / 10>>
+ <<set $carriableSoldiers = $securityForcePersonnel / 10>>
<</if>>
- <<if $SFUnit.Troops > $carriableSoldiers>>
+ <<if $securityForcePersonnel > $carriableSoldiers>>
<<set $SFhp = $carriableSoldiers * $SFBaseHp>>
<<else>>
- <<set $carriableSoldiers = $SFUnit.Troops>>
+ <<set $carriableSoldiers = $securityForcePersonnel>>
<<set $SFhp = $carriableSoldiers * $SFBaseHp>>
<</if>>
<<else>>
/* atk, def */
- <<set _upgradesSum = $SFUnit.Armoury + $SFUnit.Drugs + $SFUnit.AirForce + $SFUnit.Vehicles>>
+ <<set _upgradesSum = $securityForceInfantryPower + $securityForceStimulantPower + $securityForceAircraftPower + $securityForceAircraftPower>>
<<if !isInt(_upgradesSum)>>
<<set _upgradesSum = random(10,15)>>
<</if>>
<<set $SFatk = Math.trunc(0.75 * _upgradesSum)>>
<<set $SFdef = Math.trunc(0.50 * _upgradesSum)>>
/* hp */
- <<set $SFhp = $SFUnit.Troops * $SFBaseHp>>
+ <<set $SFhp = $securityForcePersonnel * $SFBaseHp>>
<</if>>
<</widget>>
@@ -111,7 +111,7 @@
<<set _troops += $mercUnits[_i].troops>>
<</if>>
<</for>>
- <<if $SF.Active && $SF.Toggle>>
+ <<if $securityForceCreate == 1>>
<<set _troops += $carriableSoldiers>>
<</if>>
<<set $troopCount = _troops>>
@@ -137,4 +137,4 @@
<<set $bribeCost *= 3>>
<</if>>
<<set $bribeCost = Math.trunc(Math.clamp($bribeCost,0,1000000))>>
-<</widget>>
+<</widget>>
\ No newline at end of file
diff --git a/src/SecExp/widgets/unitsWidgets.tw b/src/SecExp/widgets/unitsWidgets.tw
index 042aa75970ba19470eccb57f6d785fb6ea06288a..1760c71c98d228b9917db7a3d258f14c54341d58 100644
--- a/src/SecExp/widgets/unitsWidgets.tw
+++ b/src/SecExp/widgets/unitsWidgets.tw
@@ -39,7 +39,7 @@
The unit has a dedicated squad of medics that will follow them in battle.
<</if>>
<<if $args[0].SF == 1>>
- The unit has attached advisors from $SF.Lower that will help the squad remain tactically aware and active.
+ The unit has attached advisors from $securityForceName that will help the squad remain tactically aware and active.
<</if>>
<<else>>
$args[0].platoonName lost too many operatives in the $args[0].battlesFought it fought and can no longer be considered a unit at all.
@@ -85,7 +85,7 @@
The unit has a dedicated squad of medics that will follow them in battle.
<</if>>
<<if $args[0].SF == 1>>
- The unit has attached advisors from $SF.Lower that will help the squad remain tactically aware and active.
+ The unit has attached advisors from $securityForceName that will help the squad remain tactically aware and active.
<</if>>
<<else>>
$args[0].platoonName lost too many operatives in the $args[0].battlesFought it fought and can no longer be considered a unit at all.
@@ -131,7 +131,7 @@
The unit has a dedicated squad of medics that will follow them in battle.
<</if>>
<<if $args[0].SF == 1>>
- The unit has attached advisors from $SF.Lower that will help the squad remain tactically aware and active.
+ The unit has attached advisors from $securityForceName that will help the squad remain tactically aware and active.
<</if>>
<<else>>
$args[0].platoonName lost too many operatives in the $args[0].battlesFought it fought and can no longer be considered a unit at all.