From e1e7d678ae581286bfb0987ff284468db5e3c820 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 22 Dec 2017 19:45:02 -0500
Subject: [PATCH] SFanon's merge 1.

---
 src/cheats/mod_EditFSCheat.tw                 |  97 +++--
 .../SecForceEX/SpecialForceUpgradeDec.tw      | 371 +++++++++---------
 .../SecForceEX/SpecialForceUpgradeOptions.tw  |  89 +++--
 .../SecForceEX/SpecialForceUpgradeTree.tw     |  26 +-
 src/uncategorized/SFMBarracks.tw              |  22 +-
 src/uncategorized/securityForceEOWReport.tw   |   6 +-
 6 files changed, 317 insertions(+), 294 deletions(-)

diff --git a/src/cheats/mod_EditFSCheat.tw b/src/cheats/mod_EditFSCheat.tw
index 49918d3a407..035748cdcb7 100644
--- a/src/cheats/mod_EditFSCheat.tw
+++ b/src/cheats/mod_EditFSCheat.tw
@@ -1,8 +1,6 @@
-:: MOD_Edit FS Cheat
+:: MOD_Edit FS Cheat [nobr]
 
-<<nobr>>
-	<<set $nextButton = "Continue">>
-	<<set $nextLink = "MOD_Edit FS Cheat Datatype Cleanup">>
+<<set $nextButton = "Continue", $nextLink = "MOD_Edit FS Cheat Datatype Cleanup">>
 
 ''Cheating Edit Future Society''
 	<br>
@@ -38,9 +36,9 @@
 	<<radiobutton "$arcologies[0].FSSupremacistRace" mixed race>> Mixed Race
 
 	<br>[[Apply and reset Racial Subjugationism|MOD_Edit FS Cheat][$arcologies[0].FSSubjugationist = "unset", $arcologies[0].FSSubjugationistRace = 0, $arcologies[0].FSSubjugationistDecoration = 20, $arcologies[0].FSSubjugationistLawME = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSSubjugationist != "unset" && $arcologies[0].FSSubjugationistRace != 0>>
 		<br>''You are pursuing'' $arcologies[0].FSSubjugationistRace Inferiority.
 	<<else>>
@@ -74,9 +72,9 @@
 	<<radiobutton "$arcologies[0].FSSubjugationistRace" mixed race>> Mixed Race
 
 	<br>[[Apply and reset Racial Supremacy|MOD_Edit FS Cheat][$arcologies[0].FSSupremacist = "unset",$arcologies[0].FSSupremacistRace = 0, $arcologies[0].FSSupremacistDecoration = 20, $arcologies[0].FSSupremacistLawME = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSGenderRadicalist != "unset">>
 		<br>You are ''pursuing'' Gender Radicalism.
 	<<else>>
@@ -104,9 +102,9 @@
 	| <<radiobutton "$arcologies[0].FSGenderRadicalistLawFuta" 4>> 4 (Trap pref.)
 
 	<br>[[Apply and reset Gender Traditionalism|MOD_Edit FS Cheat][$arcologies[0].FSGenderFundamentalist = "unset",$arcologies[0].FSGenderFundamentalistDecoration = 20,$arcologies[0].FSGenderFundamentalistLaw = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSGenderFundamentalist != "unset">>
 		<br>You are ''pursuing'' Gender Traditionalism.
 	<<else>>
@@ -127,9 +125,9 @@
 	| <<radiobutton "$arcologies[0].FSGenderFundamentalistSMR" 1>> 1 (Passed.)
 
 	<br>[[Apply and reset Gender Radicalism|MOD_Edit FS Cheat][$arcologies[0].FSGenderRadicalist = "unset",$arcologies[0].FSGenderRadicalistDecoration = 20,$arcologies[0].FSGenderRadicalistLawBeauty = 0, $arcologies[0].FSGenderRadicalistLawFuta = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSRepopulationFocus != "unset">>
 		<br>You are ''pursuing'' Repopulation Efforts.
 	<<else>>
@@ -154,9 +152,9 @@
 	| <<radiobutton "$arcologies[0].FSRepopulationFocusLaw" 1>> 1 (Passed.)
 
 	<br>[[Apply and reset Eugenics|MOD_Edit FS Cheat][$arcologies[0].FSRestart = "unset",$arcologies[0].FSRestartDecoration = 20,$arcologies[0].FSRestartLaw = 0, $arcologies[0].FSRestartSMR = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSRestart != "unset">>
 		<br>You are ''pursuing'' Eugenics.
 	<<else>>
@@ -177,9 +175,9 @@
 	| <<radiobutton "$arcologies[0].FSRestartSMR" 1>> 1 (Passed.)
 
 	<br>[[Apply and reset Repopulation Efforts|MOD_Edit FS Cheat][$arcologies[0].FSRepopulationFocus = "unset",$arcologies[0].FSRepopulationFocusDecoration = 20,$arcologies[0].FSRepopulationFocusLaw = 0, $arcologies[0].FSRepopulationFocusSMR = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSPaternalist != "unset">>
 		<br>You are ''pursuing'' Paternalism.
 	<<else>>
@@ -200,9 +198,9 @@
 	| <<radiobutton "$arcologies[0].FSPaternalistLaw" 1>> 1 (Passed.)
 
 	<br>[[Apply and reset Degradationism|MOD_Edit FS Cheat][$arcologies[0].FSDegradationist = "unset",$arcologies[0].FSDegradationistDecoration = 20,$arcologies[0].FSDegradationistLaw = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSDegradationist != "unset">>
 		<br>You are ''pursuing'' Degradationism.
 	<<else>>
@@ -223,9 +221,9 @@
 	| <<radiobutton "$arcologies[0].FSDegradationistLaw" 1>> 1 (Passed.)
 
 	<br>[[Apply and reset Paternalism|MOD_Edit FS Cheat][$arcologies[0].FSPaternalist = "unset",$arcologies[0].FSPaternalistDecoration = 20,$arcologies[0].FSPaternalistLaw = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSBodyPurist != "unset">>
 		<br>You are ''pursuing'' Body Purism.
 	<<else>>
@@ -246,9 +244,9 @@
 	| <<radiobutton "$arcologies[0].FSBodyPuristLaw" 1>> 1 (Passed.)
 
 	<br>[[Apply and reset Body Transformationism|MOD_Edit FS Cheat][$arcologies[0].FSTransformationFetishist = "unset",$arcologies[0].FSTransformationFetishistDecoration = 20,$arcologies[0].FSTransformationFetishistLaw = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSTransformationFetishist != "unset">>
 		<br>You are ''pursuing'' Body Transformationism.
 	<<else>>
@@ -269,9 +267,9 @@
 	| <<radiobutton "$arcologies[0].FSTransformationFetishistLaw" 1>> 1 (Passed.)
 
 	<br>[[Apply and reset Body Purism|MOD_Edit FS Cheat][$arcologies[0].FSBodyPurist = "unset",$arcologies[0].FSBodyPuristDecoration = 20,$arcologies[0].FSBodyPuristLaw = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSYouthPreferentialist != "unset">>
 		<br>You are ''pursuing'' Youth Preferentialism.
 	<<else>>
@@ -293,9 +291,9 @@
 	| <<radiobutton "$arcologies[0].FSYouthPreferentialistLaw" 1>> 1 (Passed.)
 
 	<br>[[Apply and reset Maturity Preferentialism|MOD_Edit FS Cheat][$arcologies[0].FSMaturityPreferentialist = "unset",$arcologies[0].FSMaturityPreferentialistDecoration = 20,$arcologies[0].FSMaturityPreferentialistLaw = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSMaturityPreferentialist != "unset">>
 		<br>You are ''pursuing'' Maturity Preferentialism.
 	<<else>>
@@ -317,9 +315,9 @@
 	| <<radiobutton "$arcologies[0].FSMaturityPreferentialistLaw" 1>> 1 (Passed.)
 
 	<br>[[Apply and reset Youth Preferentialism|MOD_Edit FS Cheat][$arcologies[0].FSYouthPreferentialist = "unset",$arcologies[0].FSYouthPreferentialistDecoration = 20,$arcologies[0].FSYouthPreferentialistLaw = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
 		<br>You are ''supporting'' Slimness Enthusiasm.
 	<<else>>
@@ -340,9 +338,9 @@
 	| <<radiobutton "$arcologies[0].FSSlimnessEnthusiastSMR" 1>> 1 (Passed.)
 
 	<br>[[Apply and reset Asset Expansionism|MOD_Edit FS Cheat][$arcologies[0].FSAssetExpansionist = "unset",$arcologies[0].FSAssetExpansionistDecoration = 20,$arcologies[0].FSAssetExpansionistLaw = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSAssetExpansionist != "unset">>
 		<br>You are ''pursuing'' Asset Expansionism.
 	<<else>>
@@ -364,9 +362,9 @@
 	| <<radiobutton "$arcologies[0].FSAssetExpansionistSMR" 1>> 1 (Passed.)
 
 	<br>[[Apply and reset Slimness Enthusiasm|MOD_Edit FS Cheat][$arcologies[0].FSSlimnessEnthusiast = "unset",$arcologies[0].FSSlimnessEnthusiastDecoration = 20,$arcologies[0].FSSlimnessEnthusiastLaw = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSPastoralist != "unset">>
 		<br>You are ''pursuing'' Pastoralism.
 	<<else>>
@@ -387,9 +385,9 @@
 	| <<radiobutton "$arcologies[0].FSPastoralistLaw" 1>> 1 (Passed.)
 
 	<br>[[Apply|MOD_Edit FS Cheat]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSPhysicalIdealist != "unset">>
 		<br>You are ''pursuing'' Physical Idealism.
 	<<else>>
@@ -410,9 +408,9 @@
 	| <<radiobutton "$arcologies[0].FSPhysicalIdealistSMR" 1>> 1 (Passed.)
 
 	<br>[[Apply and reset Hedonistic Decadence|MOD_Edit FS Cheat][$arcologies[0].FSHedonisticDecadence = "unset",$arcologies[0].FSHedonisticDecadenceDecoration = 20,$arcologies[0].FSHedonisticDecadenceLaw = 0,$arcologies[0].FSHedonisticDecadenceLaw2 = 0, $arcologies[0].FSHedonisticDecadenceSMR = 0, $arcologies[0].FSPhysicalIdealistStrongFat = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSHedonisticDecadence != "unset">>
 		<br>You are ''pursuing'' Hedonistic Decadence.
 	<<else>>
@@ -441,9 +439,8 @@
 	| <<radiobutton "$arcologies[0].FSHedonisticDecadenceLaw2" 1>> 1 (Passed.)
 
 	<br>[[Apply and reset Physical Idealist|MOD_Edit FS Cheat][$arcologies[0].FSPhysicalIdealist = "unset",$arcologies[0].FSPhysicalIdealistDecoration = 20,$arcologies[0].FSPhysicalIdealistLaw = 0, $arcologies[0].FSPhysicalIdealistSMR = 0, $arcologies[0].FSHedonisticDecadenceStrongFat = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
 
 	<<if $arcologies[0].FSChattelReligionist != "unset">>
 		<br>You are ''pursuing'' Chattel Religionism.
@@ -465,9 +462,8 @@
 	| <<radiobutton "$arcologies[0].FSChattelReligionistLaw" 1>> 1 (Passed.)
 
 	<br>[[Apply|MOD_Edit FS Cheat]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
 
 	<<if $arcologies[0].FSRomanRevivalist != "unset">>
 		<br>You are ''pursuing'' Roman Revivalism.
@@ -489,9 +485,8 @@
 	| <<radiobutton "$arcologies[0].FSRomanRevivalistLaw" 1>> 1 (Passed.)
 
 	<br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSAztecRevivalist = "unset",$arcologies[0].FSAztecRevivalistDecoration = 20,$arcologies[0].FSAztecRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalist = "unset",$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
-	<</nobr>>
 
-	<<nobr>>
+<br><br>
 
 		<<if $arcologies[0].FSAztecRevivalist != "unset">>
 			<br>You are ''pursuing'' Aztec Revivalism.
@@ -513,9 +508,9 @@
 		| <<radiobutton "$arcologies[0].FSAztecRevivalistLaw" 1>> 1 (Passed.)
 
 		<br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalist = "unset",$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSEgyptianRevivalist != "unset">>
 		<br>You are ''pursuing'' Egyptian Revivalism.
 	<<else>>
@@ -536,9 +531,9 @@
 	| <<radiobutton "$arcologies[0].FSEgyptianRevivalistLaw" 1>> 1 (Passed.)
 
 	<br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSAztecRevivalist = "unset",$arcologies[0].FSAztecRevivalistDecoration = 20,$arcologies[0].FSAztecRevivalistLaw = 0,$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSEdoRevivalist != "unset">>
 		<br>You are ''pursuing'' Edo Revivalism.
 	<<else>>
@@ -559,9 +554,9 @@
 	| <<radiobutton "$arcologies[0].FSEdoRevivalistLaw" 1>> 1 (Passed.)
 
 	<br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSAztecRevivalist = "unset",$arcologies[0].FSAztecRevivalistDecoration = 20,$arcologies[0].FSAztecRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSArabianRevivalist != "unset">>
 		<br>You are ''pursuing'' Arabian Revivalism.
 	<<else>>
@@ -582,9 +577,9 @@
 	| <<radiobutton "$arcologies[0].FSArabianRevivalistLaw" 1>> 1 (Passed.)
 
 	<br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSAztecRevivalist = "unset",$arcologies[0].FSAztecRevivalistDecoration = 20,$arcologies[0].FSAztecRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSEdoRevivalist = "unset",$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
-<</nobr>>
 
-<<nobr>>
+<br><br>
+
 	<<if $arcologies[0].FSChineseRevivalist != "unset">>
 		<br>You are ''pursuing'' Chinese Revivalism.
 	<<else>>
@@ -605,4 +600,4 @@
 	| <<radiobutton "$arcologies[0].FSChineseRevivalistLaw" 1>> 1 (Passed.)
 
 	<br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSAztecRevivalist = "unset",$arcologies[0].FSAztecRevivalistDecoration = 20,$arcologies[0].FSAztecRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSEdoRevivalist = "unset",$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0]]
-<</nobr>>\
+
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
index b1f39ef992b..4a38fe5025a 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
@@ -1,46 +1,46 @@
 :: SpecialForceUpgradeDec [nobr]
 
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ''Barracks:''
-/* 13 upgrades */
-<<if $securityForceArcologyUpgrades == 0>>
+<<switch $securityForceArcologyUpgrades>>
+<<case 0>>
 	 Is currently quite basic, consisting of little more than a dormitory, armoury, a processing facility for human spoils, and a common area, sectioned off by stacks of empty supply crates. The cavernous space, however, is ripe for expansion.
-<<elseif $securityForceArcologyUpgrades == 1>>
+<<case 1>>
 	 Has become more permanent, expanding into free space, erecting permanent dividers, and sectioning off an area for use as a garage and vehicle maintenance bay.
-<<elseif $securityForceArcologyUpgrades == 2>>
+<<case 2>>
 	 Has added a facility for the storage, maintenance, and deployment of armed combat drones, and added storage facilities for the soldiers to store their personal spoils in.
-<<elseif $securityForceArcologyUpgrades == 3>>
+<<case 3>>
 	 Has added additional support personnel and equipment, allowing the potential procurement of heavier infantry armour, fighting vehicles, and combat drones.
-<<elseif $securityForceArcologyUpgrades == 4>>
+<<case 4>>
 	 Has expanded tremendously, adding an aerial control facility and express elevator connecting to a ring of launch pads and hangars built around the arcology's upper levels. Additional facilities have been added for soldier recreation, and Spartan quarters for live-in slaves, both menial and service, have been installed.
-<<elseif $securityForceArcologyUpgrades == 5>>
+<<case 5>>
 	 Has (mostly) taken on the appearance of a professional military installation, with clearly delineated soldier and logistical areas, dedicated support and recreation facilities, in addition to advanced command and control apparatus. As a final measure, heavy, long range, electromagnetic railgun artillery pieces have been installed in casemates along the aerial launch pads, giving $securityForceName an immense superiority in local firepower.
-<<elseif $securityForceArcologyUpgrades == 6>>
+<<case 6>>
 	 Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As a final measure, quad heavy, long range, electromagnetic railgun artillery pieces have been installed in casemates along the aerial launch pads, giving $securityForceName an immense superiority in local firepower.
-<<elseif $securityForceArcologyUpgrades == 7>>
+<<case 7>>
 	 Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As a final measure, quad heavy, long range, electromagnetic railgun artillery pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads, giving $securityForceName an immense superiority in local firepower.
-<<elseif $securityForceArcologyUpgrades == 8>>
+<<case 8>>
 	 Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, electromagnetic railgun artillery pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
-<<elseif $securityForceArcologyUpgrades == 9>>
+<<case 9>>
 	 Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, electromagnetic railgun artillery 356 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
-<<elseif $securityForceArcologyUpgrades == 10>>
+<<case 10>>
 	 Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
-<<elseif $securityForceArcologyUpgrades == 11>>
+<<case 11>>
 	 Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, dual barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
-<<elseif $securityForceArcologyUpgrades == 12>>
+<<case 12>>
 	 Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
-<<elseif $securityForceArcologyUpgrades == 13>>
+<<case 13>>
 	 Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
 	<br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network.
-<<elseif $securityForceArcologyUpgrades == 14>>
+<<case 14>>
 	 Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
 	<br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network.<br>'Borowed' old world designs for a kill house.
-<<elseif $securityForceArcologyUpgrades == 15>>
+<<case 15>>
 	 Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
 	<br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network.<br>Added electronics to the kill house.
-<<elseif $securityForceArcologyUpgrades == 16>>
+<<case 16>>
 	 Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
 	<br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network.<br>Added VR support to the kill house.
-<</if>>
+<</switch>>
 
 <br><br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -56,6 +56,7 @@
 	The barrack's large dormitories are near capacity, and the <<print commaNum($securityForcePersonnel)>> members of $securityForceName often barter their personal loot, whether it be monetary or human, for the choicest bunks.
 <</if>>
 
+/*
 <<if $FacilitySupport == 1>>
 <br><br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ''$facilitysupportName:''
@@ -64,93 +65,101 @@
 	<<goto "FacilitySupport">>
 <</link>>
 <</if>>
+*/
 
 <br><br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ''Armory:''
-/* 11 upgrades */
-<<if $securityForceInfantryPower == 0>>
+<<switch $securityForceInfantryPower>>
+<<case 0>>
 	 Is well-stocked with high-quality personal weapons and light armour, but contains little in the way of exceptional armament.
-<<elseif $securityForceInfantryPower == 1>>
+<<case 1>>
 	 Has large stocks of the absolute latest personal weapons and light armour, and Has added first-generation exo-suits to improve soldier lethality.
-<<elseif $securityForceInfantryPower == 2>>
+<<case 2>>
 	 Acquired advanced tactical helmets and second-generation exo-suits to further improve soldier lethality.
-<<elseif $securityForceInfantryPower == 3>>
+<<case 3>>
 	 Replaced deployed exo-suits with basic enclosed combat armour suits, and has further begun to deploy early electromagnetic (coilgun) weaponry.
-<<elseif $securityForceInfantryPower == 4>>
+<<case 4>>
 	 Has begun to equip the soldiers with more advanced combat armour suits, and has expanded its inventory of electromagnetic weaponry.
-<<elseif $securityForceInfantryPower == 5>>
+<<case 5>>
 	 Acquired heavy weapon attachments for its combat armour suits, and has further sourced small advanced electromagnetic weaponry (miniaturized railguns) for the soldiers, ensuring that the infantry of $securityForceName is perhaps the most well-equipped in the world.
-<<elseif $securityForceInfantryPower == 6>>
+<<case 6>>
 	 Acquired heavy weapon attachments for its combat armour suits, and has further sourced both small and medium advanced electromagnetic weaponry (miniaturized railguns) for the soldiers, ensuring that the infantry of $securityForceName is perhaps the most well-equipped in the world.
-<<elseif $securityForceInfantryPower == 7>>
+<<case 7>>
 	 Acquired heavy weapon attachments for its combat armour suits, and has further sourced small/medium and large advanced electromagnetic weaponry (miniaturized railguns) for the soldiers, ensuring that the infantry of $securityForceName is perhaps the most well-equipped in the world.
-<<elseif $securityForceInfantryPower == 8>>
+<<case 8>>
 	 Acquired heavy weapon attachments for its combat armour suits with basic thrusters, and has further sourced both small/medium and large advanced electromagnetic weaponry (miniaturized railguns) for the soldiers, ensuring that the infantry of $securityForceName is perhaps the most well-equipped in the world.
-<<elseif $securityForceInfantryPower == 9>>
+<<case 9>>
 	 Acquired heavy weapon attachments for its combat armour suits with advanced thrusters, and has further sourced both small/medium and large advanced electromagnetic weaponry (miniaturized railguns) for the soldiers, ensuring that the infantry of $securityForceName is perhaps the most well-equipped in the world.
-<<elseif $securityForceInfantryPower == 10>>
+<<case 10>>
 	 Acquired heavy weapon attachments for its combat armour suits with advanced thrusters,basic optical illusion kits, and has further sourced small/medium and large advanced electromagnetic weaponry (miniaturized railguns) for the soldiers, ensuring that the infantry of $securityForceName is perhaps the most well-equipped in the world.
-<<elseif $securityForceInfantryPower == 11>>
+<<case 11>>
 	 Acquired heavy weapon attachments for its combat armour suits with advanced thrusters,advanced optical illusion kits, and has further sourced small/medium and large advanced electromagnetic weaponry (miniaturized railguns) for the soldiers, ensuring that the infantry of $securityForceName is perhaps the most well-equipped in the world.
-<</if>>
+<<case 12>>
+	 Acquired heavy weapon attachments for its combat armour suits with advanced thrusters,advanced optical illusion kits, and has further sourced small/medium and large advanced nanite rather than electromagnetic weaponry (miniaturized nanite rifes) for the soldiers, ensuring that the infantry of $securityForceName is perhaps the most well-equipped in the world.
+<</switch>>
 
 <br><br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ''Stimulant Lab:''
-/* 7 upgrades */
-<<if $securityForceStimulantPower == 0>>
+<<switch $securityForceStimulantPower>>
+<<case 0>>
 	 Is providing the soldiers with standard ephedrine-based stimulants.
-<<elseif $securityForceStimulantPower == 1>>
+<<case 1>>
 	 Improved the formula of the ephedrine-based stimulants, concentrating them and increasing both their potency, and the effectiveness of the soldiers under their influence.
-<<elseif $securityForceStimulantPower == 2>>
+<<case 2>>
 	 Replaced the soldiers' stimulants with methamphetamine-based variants, greatly increasing their alertness and aggressiveness when under their influence.
-<<elseif $securityForceStimulantPower == 3>>
+<<case 3>>
 	 Improved and concentrated the methamphetamine-based stimulants, and has also begun providing soldiers with phenylcyclidine-based dissociatives, allowing the soldiers to excuse their actions in the field and reducing any reluctance to follow severe orders.
-<<elseif $securityForceStimulantPower == 4>>
+<<case 4>>
 	 Has further refined the formulas of the methamphetamine-based stimulants and phenylcyclidine-based dissociatives, and has also begun providing tryptamine-based psychedelics to the soldiers, allowing them to avoid traumatic stress in the field.
-<<elseif $securityForceStimulantPower == 5>>
+<<case 5>>
 	 Has maximally refined the formulas of the methamphetamine-based stimulants, phenylcyclidine-based dissociatives, and tryptamine-based psychedelics, increasing their effectiveness in all aspects and ensuring that the soldiers of $securityForceName go into combat wired, aggressive, and euphoric (if needed).
-<<elseif $securityForceStimulantPower == 6>>
+<<case 6>>
 	 Has slightly refined the formulas of higher purity methamphetamine-based stimulants, phenylcyclidine-based dissociatives, and tryptamine-based psychedelics, increasing their effectiveness in all aspects and ensuring that the soldiers of $securityForceName go into combat wired, aggressive, and euphoric (if needed).
-<<elseif $securityForceStimulantPower == 7>>
+<<case 7>>
 	 Has maximally refined the formulas of higher purity methamphetamine-based stimulants, phenylcyclidine-based dissociatives, and tryptamine-based psychedelics, increasing their effectiveness in all aspects and ensuring that the soldiers of $securityForceName go into combat wired, aggressive, and euphoric (if needed).
-<<elseif $securityForceStimulantPower == 8>>
+<<case 8>>
 	 Has mixed the higher purity methamphetamine-based stimulants, phenylcyclidine-based dissociatives, and tryptamine-based psychedelics into a single dose further increasing their effectiveness in all aspects and ensuring that the soldiers of $securityForceName go into combat wired, aggressive, and euphoric (if needed). However side effects may include (no particular order): Dissociative Identity Disorder , severe clincal depresssion, unstopabble vomitting, extreme paranoia, PTSD, finally total organ failfure. Recommended by 9/10 doctors*. <br>* Only the doctors of $securityForceName were consulted to ensure a completely unbiased result.
-<<elseif $securityForceStimulantPower == 9>>
+<<case 9>>
 	 Has mixed the higher purity methamphetamine-based stimulants, phenylcyclidine-based dissociatives, and tryptamine-based psychedelics into a single dose further increasing their effectiveness in all aspects and ensuring that the soldiers of $securityForceName go into combat wired, aggressive, and euphoric (if needed). Potentinal side effects have been reduced slightly to "only mildly" severe ones: Dissociative Identity Disorder , severe clincal depresssion, unstopabble vomitting, extreme paranoia and PTSD. Now recommended by 15/10 doctors*. <br>* Only the doctors of $securityForceName were consulted to ensure a completely unbiased result.
-<</if>>
+<<case 10>>
+	 Has increased the single dose strength of the mixture of higher purity methamphetamine-based stimulants, phenylcyclidine-based dissociatives, and tryptamine-based psychedelics which further increases their effectiveness in all aspects and ensuring that the soldiers of $securityForceName go into combat wired, aggressive, and euphoric (if needed) at the cost of lengthing the effects.
+	 <br>Potentinal side effects have been reduced slightly to "only mildly" severe ones: Dissociative Identity Disorder , severe clincal depresssion, unstopabble vomitting, extreme paranoia and PTSD. Now recommended by 15/10 doctors*. <br>* Only the doctors of $securityForceName were consulted to ensure a completely unbiased result.
+<</switch>>
 
 <<if _Garage > 0 && $securityForceArcologyUpgrades >= 1>>
 <br><br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ''Garage:''
-/* 7 upgrades */
-<<if $securityForceVehiclePower == 0>>
+<<switch $securityForceVehiclePower>>
+<<case 0>>
 	 Contains basic, unarmoured vehicles for use by the soldiers, primarily high-end civilian vehicles with jury-rigged crew-served weapons.
-<<elseif $securityForceVehiclePower == 1>>
+<<case 1>>
 	 Replaced its technical fleet with armed military utility vehicles. It has also sourced customized, high-volume slave transports for better securing human spoils.
-<<elseif $securityForceVehiclePower == 2>>
+<<case 2>>
 	 Has added a number of light infantry fighting vehicles to its fleet, and acquired more slave transports to keep up with demand.
-<<elseif $securityForceVehiclePower == 3>>
+<<case 3>>
 	 Acquired improved infantry fighting vehicles, and has also added some mobile artillery and other support vehicles.
-<<elseif $securityForceVehiclePower == 4>>
+<<case 4>>
 	 Acquired some heavier armoured vehicles to augment the infantry fighting vehicles and expanded their inventory of artillery and support vehicles.
-<<elseif $securityForceVehiclePower == 5>>
+<<case 5>>
 	 Replaced both its armoured and support vehicles with the most advanced variants possible, making the mobile unit of $securityForceName far superior to anything in the arcology's immediate area.
-<<elseif $securityForceVehiclePower == 6>>
+<<case 6>>
 	 Replaced both its armoured and support vehicles with the most advanced light variants possible, making the mobile unit of $securityForceName far superior to anything in the arcology's immediate area.
-<<elseif $securityForceVehiclePower == 7>>
+<<case 7>>
 	 Replaced both its armoured and support vehicles with the most advanced light and medium variants possible, making the mobile unit of $securityForceName far superior to anything in the arcology's immediate area.
-<</if>>
+<<case 8>>
+	 Replaced both its armoured and support vehicles with the most advanced light, medium and heavy variants possible, making the mobile unit of $securityForceName far superior to anything in the arcology's immediate area.
+<</switch>>
 
-/* 3 upgrades */
 <<if $securityForceHeavyBattleTank > 0>>
 <br>''Heavy Battle Tank:''
-<<if $securityForceHeavyBattleTank == 1>>
+<<switch $securityForceHeavyBattleTank>>
+<<case 1>>
 	A basic heavy battle tank has been 'borrowed' from the old world.
-<<elseif $securityForceHeavyBattleTank == 2>>
+<<case 2>>
 	Modernised the armor.
-<<elseif $securityForceHeavyBattleTank == 3>>
+<<case 3>>
 	Modernised the armor and upgradeded the main gun to a 356 cm barrel.
-<</if>>
+<</switch>>
 <</if>>
 <</if>>
 
@@ -158,122 +167,124 @@
 <br><br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ''Hangar:''
 <br>
-/* 8 upgrades */
 ''Airforce:''
-<<if $securityForceAircraftPower == 0>>
+<<switch $securityForceAircraftPower>>
+<<case 0>>
 	Primarily consists of light transport VTOLs equipped with non-lethal weaponry.
-<<elseif $securityForceAircraftPower == 1>>
+<<case 1>>
 	Upgraded light transport VTOLs  with additional fire-power and lethal weaponry.
-<<elseif $securityForceAircraftPower == 2>>
+<<case 2>>
 	The VTOLs have been upgraded to higher-capacity variants with heavier weaponry.
-<<elseif $securityForceAircraftPower == 3>>
+<<case 3>>
 	The medium transport VTOLs have been upgraded with enhanced armour and customized cargo compartments to better transport captured stock.
-<<elseif $securityForceAircraftPower == 4>>
+<<case 4>>
 	Acquired specialized attack VTOLs to complement and escort its advanced transport fleet, as well as to provide close air support.
-<<elseif $securityForceAircraftPower == 5>>
+<<case 5>>
 	Upgraded its attack VTOLs for enhanced lethality, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area.
-<<elseif $securityForceAircraftPower == 6>>
+<<case 6>>
 	Upgraded its attack VTOLs for enhanced lethality/speed, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area.
-<<elseif $securityForceAircraftPower == 7>>
+<<case 7>>
 	Upgraded its attack VTOLs for enhanced lethality/speed/armour, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area.
-<<elseif $securityForceAircraftPower == 8>>
+<<case 8>>
 	Upgraded its attack VTOLs for enhanced lethality/speed/armour, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area.<br>Also It now possesses a basic old world bomber.
-<<elseif $securityForceAircraftPower == 9>>
+<<case 9>>
 	Upgraded its attack VTOLs for enhanced lethality/speed/armour, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area.<br>Improved the bomber's engines.
-<<elseif $securityForceAircraftPower == 10>>
+<<case 10>>
 	Upgraded its attack VTOLs for enhanced lethality/speed/armour, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area.<br>Improved the bomber's engines and armour.
-<</if>>
+<</switch>>
 <<if $securityForceSpacePlanePower > 0>>
 <br>''Space Plane:''
-	/* 11 upgrades */
-	<<if $securityForceSpacePlanePower == 1>>
+<<switch $securityForceSpacePlanePower>>
+	<<case 1>>
 		A basic two engine SpacePlane has been 'borrowed' from the old world.
-	<<elseif $securityForceSpacePlanePower == 2>>
+	<<case 2>>
 		Upgraded the shielding, reducing both potential heat damage and radar signature.
-	<<elseif $securityForceSpacePlanePower == 3>>
+	<<case 3>>
 		Upgraded the shielding, reducing both potential heat damage and radar signature,also mounted another engine on top of the tail.
-	<<elseif $securityForceSpacePlanePower == 4>>
+	<<case 4>>
 		Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail and modernized the electronics.
-	<<elseif $securityForceSpacePlanePower == 5>>
+	<<case 5>>
 		Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail,modernized the electronics in addition to the fuel lines to increase efficiency.
-		<<elseif $securityForceSpacePlanePower == 6>>
+		<<case 6>>
 		Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.
-	<<elseif $securityForceSpacePlanePower == 7>>
+	<<case 7>>
 		Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the  weight and reworked the body to reduce drag.
-	<<elseif $securityForceSpacePlanePower == 8>>
+	<<case 8>>
 		Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the  weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.
-	<<elseif $securityForceSpacePlanePower == 9>>
+	<<case 9>>
 		Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the  weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making $securityForceName Space Plane untouchable.
-	<<elseif $securityForceSpacePlanePower == 10>>
+	<<case 10>>
 		Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the  weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making $securityForceName Space Plane untouchable.Replaced the skin of $securityForceName Space Plane with a basic optical illusion kit.
-	<<elseif $securityForceSpacePlanePower == 11>>
+	<<case 11>>
 		Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the  weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making $securityForceName Space Plane untouchable.Replaced the skin of $securityForceName Space Plane with an advanced optical illusion kit.
-	<</if>>
+<</switch>>
 <</if>>
 <<if $securityForceFortressZeppelin > 0>>
 <br>''Fortress Zeppelin:''
-	/* 3 upgrades */
-	<<if $securityForceFortressZeppelin == 1>>
+<<switch $securityForceFortressZeppelin>>
+	<<case 1>>
 		A basic fortress zeppelin has been 'borrowed' from the old world.
-	<<elseif $securityForceFortressZeppelin == 2>>
+	<<case 2>>
 		Modernized the armor.
-	<<elseif $securityForceFortressZeppelin == 3>>
+	<<case 3>>
 		Modernized the armor and weaponry.
-	<</if>>
+	<<case 4>>
+		Modernized the armor and weaponry. Improved the speaker system.
+<</switch>>
 <</if>>
 <<if $securityForceAC130 > 0>>
 <br>''AC130:''
-	/* 5 upgrades */
-	<<if $securityForceAC130 == 1>>
+<<switch $securityForceAC130>>
+	<<case 1>>
 		A basic AC-130 has been 'borrowed' from the old world.
-	<<elseif $securityForceAC130 == 2>>
+	<<case 2>>
 		Modernized the armor.
-	<<elseif $securityForceAC130 == 3>>
+	<<case 3>>
 		Modernized the armor and weaponry.
-	<<elseif $securityForceAC130 == 4>>
+	<<case 4>>
 		Modernized the armor, weaponry and electronics.
-	<<elseif $securityForceAC130 == 5>>
+	<<case 5>>
 		Modernized the armor, weaponry, electronics and crew seating.
-	<</if>>
+<</switch>>
 <</if>>
 <<if $securityForceHeavyTransport > 0>>
 <br>''Heavy Transport:''
-	/* 3 upgrades */
-	<<if $securityForceHeavyTransport == 1>>
+<<switch $securityForceHeavyTransport>>
+	<<case 1>>
 		A basic heavy transport has been 'borrowed' from the old world.
-	<<elseif $securityForceHeavyTransport == 2>>
+	<<case 2>>
 		Modernized the armor.
-	<<elseif $securityForceHeavyTransport == 3>>
+	<<case 3>>
 		Modernized the armor and engines.
-	<<elseif $securityForceHeavyTransport == 4>>
+	<<case 4>>
 		Modernized the armor and engines. Replaced the ballistic gun mounts with electromagnetic ones.
-	<</if>>
+<</switch>>
 <</if>>
 <</if>>
 
 <<if $securityForceArcologyUpgrades >= 2>>
 <br><br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ''Drone Bay:''
-/* 7 upgrades */
-<<if $securityForceDronePower == 0>>
+<<switch  $securityForceDronePower>>
+<<case 0>>
 	 Contains a small number of 're-purposed' non-military drones from the arcology's original contingent.
-<<elseif $securityForceDronePower == 1>>
+<<case 1>>
 	 Replaced the security drones with basic, lightly-armoured military combat models possessing integrated small arms.
-<<elseif $securityForceDronePower == 2>>
+<<case 2>>
 	 Replaced its basic military drones with more advanced models and added a number of support drones carrying heavy weaponry to its fleet.
-<<elseif $securityForceDronePower == 3>>
+<<case 3>>
 	 Acquired even more advanced models of both the standard combat drones and the heavy support drones, and expanded its numbers of both.
-<<elseif $securityForceDronePower == 4>>
+<<case 4>>
 	 Has acted to upgrade both the standard and support models of drones to carry basic electromagnetic weaponry, improving their overall combat effectiveness.
-<<elseif $securityForceDronePower == 5>>
+<<case 5>>
 	 Improved the electromagnetic armament of it's drones by mounting both miniaturized and heavy railguns on them. In addition further sourcing numerous models of drones for roles as diverse as reconnaissance, independent slave capture and swarming tactics.
-<<elseif $securityForceDronePower == 6>>
+<<case 6>>
 	 Acquired even lighter advanced armoured combat Drones with electromagnetic weaponry, advanced heavy Drones with electromagnetic support weaponry along with specialized Drones for reconnaissance, capture, and swarm tactics.
-<<elseif $securityForceDronePower == 7>>
+<<case 7>>
 	 Acquired even lighter advanced thicker armoured combat Drones with electromagnetic weaponry, advanced heavy Drones with electromagnetic support weaponry along with specialized Drones for reconnaissance, capture, and swarm tactics.
-<<elseif $securityForceDronePower == 8>>
+<<case 8>>
 	 Acquired even lighter advanced thicker armoured combat Drones with nanite rather than electromagnetic weaponry, advanced heavy Drones with electromagnetic support weaponry along with specialized Drones for reconnaissance, capture, and swarm tactics.
-<</if>>
+<</switch>>
 <</if>>
 
 <<if (_LaunchBayNO > 0 || _LaunchBayO > 0) && $securityForceArcologyUpgrades >= 4>>
@@ -281,86 +292,88 @@
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ''Launch Bay:''
 <<if $securityForceSatellitePower > 0>>
 <br>''Satellite:''
-	/* 18 upgrades */
-	<<if $securityForceSatellitePower == 1>>
+<<switch $securityForceSatellitePower>>
+	<<case 1>>
 		A basic Satellite has been 'borrowed' from the old world.
-	<<elseif $securityForceSatellitePower == 2>>
+	<<case 2>>
 		Modernized the electronics.
-	<<elseif $securityForceSatellitePower == 3>>
+	<<case 3>>
 		Modernized the electronics, wiring and circuitry.
-	<<elseif $securityForceSatellitePower == 4>>
+	<<case 4>>
 		Modernized the electronics, wiring and circuitry.Installed a basic localized communications jammer to the Satellite (excludes your own frequencies with little to no leeway) that will "slightly" anger locals until it is deactivated.
-	<<elseif $securityForceSatellitePower == 5>>
+	<<case 5>>
 		Modernized the electronics, wiring and circuitry.An advanced communications jammer is installed in the Satellite, increasing the AO localization, reducing the number of effected equipment.
-	<<elseif $securityForceSatellitePower == 6>>
+	<<case 6>>
 		Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer power by 25% (now can damage effected equipment).
-	<<elseif $securityForceSatellitePower == 7>>
+	<<case 7>>
 		Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment).
-	<<elseif $securityForceSatellitePower == 8>>
+	<<case 8>>
 		Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment).The Satellite is now equipped with a basic EMP generator (advanced EMP hardening was applied before the insulation and activation) will "slightly" anger locals until it is deactivated.
-	<<elseif $securityForceSatellitePower == 9>>
+	<<case 9>>
 		Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment).The Satellite is now equipped with an advanced EMP generator by, increasing the AO localization which reduces the quantity of effected equipment.
-	<<elseif $securityForceSatellitePower == 10>>
+	<<case 10>>
 		Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 25% (now can damage effected equipment).
-	<<elseif $securityForceSatellitePower == 11>>
+	<<case 11>>
 		Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).
-	<<elseif $securityForceSatellitePower == 12>>
+	<<case 12>>
 		Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to be able to shoot a concentrated beam of pure energy that is able to level an entire city block. It required overhauling the battery system and shielding.
-	<<elseif $securityForceSatellitePower == 13>>
+	<<case 13>>
 		Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to focus the bean enough to level a suburb.
-	<<elseif $securityForceSatellitePower == 14>>
+	<<case 14>>
 		Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level a box of houses.
-	<<elseif $securityForceSatellitePower == 15>>
+	<<case 15>>
 		Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level a single house.
-	<<elseif $securityForceSatellitePower == 16>>
+	<<case 16>>
 		Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level 366 cm.
-	<<elseif $securityForceSatellitePower == 17>>
+	<<case 17>>
 		Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level 30 cm.
-	<<elseif $securityForceSatellitePower == 18>>
+	<<case 18>>
 		Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level 15 cm.
-	<<elseif $securityForceSatellitePower == 19>>
+	<<case 19>>
 		Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to switch the 15 cm wide beam from lazer to nanites.
-	<</if>>
+	<<case 20>>
+		Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to switch the 15 cm wide beam from lazer to nanites and allow the bleam to be split (if needed)
+<</switch>>
 <</if>>
 <<if $securityForceGiantRobot > 0>>
 <br>''Giant Robot'':
-	/* 11 upgrades */
-	<<if $securityForceGiantRobot == 1>>
+<<switch $securityForceGiantRobot>>
+	<<case 1>>
 		An old world giant robot has been 'Borrowed'.
-	<<elseif $securityForceGiantRobot == 2>>
+	<<case 2>>
 		Upgraded the wiring and circuitry.
-	<<elseif $securityForceGiantRobot == 3>>
+	<<case 3>>
 		Upgraded the wiring, circuitry and power efficiency.
-	<<elseif $securityForceGiantRobot == 4>>
+	<<case 4>>
 		Upgraded the wiring, circuitry and power efficiency.Reduced the weight.
-	<<elseif $securityForceGiantRobot == 5>>
+	<<case 5>>
 		Upgraded the wiring, circuitry, power efficiency and battery capacity.Reduced the weight.
-	<<elseif $securityForceGiantRobot == 6>>
+	<<case 6>>
 		Upgraded the wiring, circuitry, power efficiency,battery capacity and armour.Reduced the weight.
-	<<elseif $securityForceGiantRobot == 7>>
+	<<case 7>>
 		Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons.
-	<<elseif $securityForceGiantRobot == 8>>
+	<<case 8>>
 		Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons and the amount of pilots to two via a synced neural link.
-	<<elseif $securityForceGiantRobot == 9>>
+	<<case 9>>
 		Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons and the amount of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.
-	<<elseif $securityForceGiantRobot == 10>>
+	<<case 10>>
 		Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons and the amount of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with a basic optical illusion kit.
-	<<elseif $securityForceGiantRobot == 11>>
+	<<case 11>>
 		Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons and the amount of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit.
-	<<elseif $securityForceGiantRobot == 12>>
+	<<case 12>>
 		Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted nanite rather than electromagnetic cannons and the amount of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit.
-	<</if>>
+<</switch>>
 <</if>>
 <<if $securityForceMissileSilo > 0>>
 <br>''Missile Silo:''
-	/* 3 upgrades */
-	<<if $securityForceMissileSilo == 1>>
+<<switch $securityForceMissileSilo>>
+	<<case 1>>
 		A basic missile silo has been 'borrowed' from the old world.
-	<<elseif $securityForceMissileSilo == 2>>
+	<<case 2>>
 		Modernized the launching electronics.
-	<<elseif $securityForceMissileSilo == 3>>
+	<<case 3>>
 		Modernized the launching electronics, wiring and circuitry.
-	<</if>>
+<</switch>>
 <</if>>
 <</if>>
 
@@ -369,51 +382,53 @@
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ''Naval Yard:''
 <<if $securityForceAircraftCarrier > 0>>
 <br>''Aircraft Carrier:''
-	/* 4 upgrades */
-	<<if $securityForceAircraftCarrier == 1>>
+<<switch $securityForceAircraftCarrier>>
+	<<case 1>>
 		A basic aircraft carrier has been 'borrowed' from the old world.
-	<<elseif $securityForceAircraftCarrier == 2>>
+	<<case 2>>
 		Modernized the electronics.
-	<<elseif $securityForceAircraftCarrier == 3>>
+	<<case 3>>
 		Modernized the electronics and weaponry.
-	<<elseif $securityForceAircraftCarrier == 4>>
+	<<case4>>
 		Modernized the electronics, weaponry and armour.
-	<<elseif $securityForceAircraftCarrier == 5>>
+	<<case 5>>
 		Modernized the electronics, weaponry and armour. Added an EMP generator.
-	<</if>>
+	<<case 6>>
+		Modernized the electronics, weaponry and armour. Added an EMP generator and lazer designator.
+<</switch>>
 <</if>>
 <<if $securityForceSubmarine > 0>>
 <br>''Submarine:''
-	/* 6 upgrades */
-	<<if $securityForceSubmarine == 1>>
+<<switch $securityForceSubmarine>>
+	<<case 1>>
 	A basic submarine has been 'borrowed' from the old world.
-	<<elseif $securityForceSubmarine == 2>>
+	<<case 2>>
 	Modernized the engines for speed.
-	<<elseif $securityForceSubmarine == 3>>
+	<<case 3>>
 	Modernized the engines for speed and silence.
-	<<elseif $securityForceSubmarine == 4>>
+	<<case 4>>
 	Modernized the engines for speed and silence.Upgraded the hull for silence.
-	<<elseif $securityForceSubmarine == 5>>
+	<<case 5>>
 	Modernized the engines for speed and silence.Upgraded the hull for silence and weaponry.
-	<<elseif $securityForceSubmarine == 6>>
+	<<case 6>>
 	Modernized the engines for speed and silence.Upgraded the hull for silence, weaponry and air scrubbers, allowing it to stay submerged for longer.
-	<</if>>
+<</switch>>
 <</if>>
 <<if $securityForceHeavyAmphibiousTransport > 0>>
 <br>''Heavy Amphibious Transport:''
-	/* 5 upgrades */
-	<<if $securityForceHeavyAmphibiousTransport == 1>>
+<<switch $securityForceHeavyAmphibiousTransport>>
+	<<case 1>>
 		A basic heavy amphibious transport has been 'borrowed' from the old world.
-	<<elseif $securityForceHeavyAmphibiousTransport == 2>>
+	<<case 2>>
 		Modernized the armor.
-	<<elseif $securityForceHeavyAmphibiousTransport == 3>>
+	<<case 3>>
 		Modernized the armor and speed.
-	<<elseif $securityForceHeavyAmphibiousTransport == 4>>
+	<<case 4>>
 		Modernized the armor and speed. Added miniaturized railguns in all four corners.
-	<<elseif $securityForceHeavyAmphibiousTransport == 5>>
+	<<case 5>>
 		Modernized the armor and speed. Added miniaturized railguns in all four corners and a lazer designator in the midle.
-	<<elseif $securityForceHeavyAmphibiousTransport == 6>>
+	<<case 6>>
 		Modernized the armor and speed. Replaced the corner miniaturized railguns with nanite ones while keeping the lazer designator in the midle.
-	<</if>>
+<</switch>>
 <</if>>
 <</if>>
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
index d2f4f96b3b6..f93707e5ba3 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
@@ -13,29 +13,30 @@
 			<</replace>>
 			<</link>> // Costs <<print cashFormat(100000*$Env)>> //
 		<<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades < _BarracksMax && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5>>
-			<<if $securityForceArcologyUpgrades == 5>>
+			<<switch _Barracks>>
+			<<case 5>>
 				<<set _arcCost = 15000000>>
-			<<elseif $securityForceArcologyUpgrades == 6>>
+			<<case 6>>
 				<<set _arcCost = 20000000>>
-			<<elseif $securityForceArcologyUpgrades == 7>>
+			<<case 7>>
 				<<set _arcCost = 35000000>>
-			<<elseif $securityForceArcologyUpgrades == 8>>
+			<<case 8>>
 				<<set _arcCost = 55000000>>
-			<<elseif $securityForceArcologyUpgrades == 9>>
+			<<case 9>>
 				<<set _arcCost = 125000000>>
-			<<elseif $securityForceArcologyUpgrades == 10>>
+			<<case 10>>
 				<<set _arcCost = 350000000>>
-			<<elseif $securityForceArcologyUpgrades == 11>>
+			<<case 11>>
 				<<set _arcCost = 600000000>>
-			<<elseif $securityForceArcologyUpgrades == 12>>
+			<<case 12>>
 				<<set _arcCost = 2500000000>>
-			<<elseif $securityForceArcologyUpgrades == 13>>
+			<<case 13>>
 				<<set _arcCost = 5000000000>>
-			<<elseif $securityForceArcologyUpgrades == 14>>
+			<<case 14>>
 				<<set _arcCost = 6000000000>>
-			<<elseif $securityForceArcologyUpgrades == 15>>
+			<<case 15>>
 				<<set _arcCost = 16000000000>>
-			<</if>>
+			<</switch>>
 			<br><<link "Barracks">>
 			<<replace "#resultX">><br><br>
 				"Sure, boss." she says, nodding. "Expanding the facilities here should help us support more cool shit." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
@@ -61,6 +62,7 @@
 			<br>//$securityForceName has fully upgraded the barracks to support it's activities//
 		<</if>>
 
+		/* 
 		<<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && $FacilitySupport == 0>>
 			<br><<link "Facility Support">>
 				<<replace "#resultX">><br><br>
@@ -69,6 +71,7 @@
 				<</replace>>
 			<</link>> // Costs <<print cashFormat(Math.trunc(150000000*(Math.max(0.99,$SFAO)/10)*$Env))>> //
 		<</if>>
+		*/
 
 		<<if $securityForceUpgradeToken == 0 && _Armoury < 5>>
 			<br><<link "Armoury">>
@@ -97,13 +100,14 @@
 				<</replace>>
 			<</link>> // Costs <<print cashFormat(40000*$Env)>> //
 		<<elseif $securityForceUpgradeToken == 0 && _StimulantLab > 5 && _StimulantLab < _StimulantLabMax && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5>>
-			<<if _StimulantLab == 6>>
+			<<switch _StimulantLab>>
+			<<case 6>>
 				<<set _drugCost = 2265000>>
-			<<elseif _StimulantLab == 7>>
+			<<case 7>>
 				<<set _drugCost = 200000000000>>
-			<<elseif _StimulantLab == 8>>
+			<<case 8>>
 				<<set _drugCost = 250000000000>>
-			<</if>>
+			<</switch>>
 			<br><<link "Stimulant Lab">>
 				<<replace "#resultX">><br><br>
 				"Sure, boss." she says, nodding. "The boys are going to like hearing that they'll be getting new stims. Some of them can't get enough." She laughs, sweeping her arm at a corner of the throne, where dozens of empty stimulant injectors are piled. "I might be one of them. Either way, the fucks out there aren't going to like us once we're on the new juice." She picks up a tablet and taps a few commands on it. "I'll get right on it."
@@ -143,6 +147,8 @@
 					<<set _vehCost = 2500000>>
 				<<elseif $securityForceVehiclePower == 6>>
 					<<set _vehCost = 3000000>>
+				<<elseif $securityForceVehiclePower == 7>>
+					<<set _vehCost = 4900000>>
 				<</if>>
 				<br><<link "Light and medium vehicles">>
 					<<replace "#resultB">><br><br>
@@ -204,17 +210,18 @@
 					<</replace>>
 				<</link>> // Costs <<print cashFormat(70000*$Env)>> //
 			<<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftPower < _AircraftMax && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5>>
-				<<if $securityForceAircraftPower == 5>>
+				<<switch $securityForceAircraftPower>>
+				<<case 5>>
 					<<set _airCost = 2750000>>
-				<<elseif $securityForceAircraftPower == 6>>
+				<<case 6>>
 					<<set _airCost = 3250000>>
-				<<elseif $securityForceAircraftPower == 7>>
+				<<case 7>>
 					<<set _airCost = 5750000>>
-				<<elseif $securityForceAircraftPower == 8>>
+				<<case 8>>
 					<<set _airCost = 6750000>>
-				<<elseif $securityForceAircraftPower == 9>>
+				<<case 9>>
 					<<set _airCost = 7750000>>
-				<</if>>
+				<</switch>>
 				<br><<link "Light and medium aircraft">>
 					<<replace "#resultY">><br><br>
 					"Sure, boss." she says, nodding. "Some new VTOLs would be great." She laughs. "They're the real multiplier over the scum out there. Not much a looter gang can do against air support." She picks up a tablet and taps a few commands on it. "I'll get right on it."
@@ -364,25 +371,28 @@
 						<</replace>>
 					<</link>> // Costs <<print cashFormat(3750000*$Env)>> //
 				<<elseif $securityForceUpgradeToken == 0 && $securityForceSatellitePower >= 1 && $securityForceSatellitePower < _SatelliteMax>>
-					<<if $securityForceSatellitePower < 11>>
-						<<set _satCost = 2350000>>
-					<<elseif $securityForceSatellitePower == 11>>
+					<<switch $securityForceSatellitePower>>
+					<<case 11>>
 						<<set _satCost = 150000000>>
-					<<elseif $securityForceSatellitePower == 12>>
+					<<case 12>>
 						<<set _satCost = 160000000>>
-					<<elseif $securityForceSatellitePower == 13>>
+					<<case 13>>
 						<<set _satCost = 170000000>>
-					<<elseif $securityForceSatellitePower == 14>>
+					<<case 14>>
 						<<set _satCost = 180000000>>
-					<<elseif $securityForceSatellitePower == 15>>
+					<<case 15>>
 						<<set _satCost = 190000000>>
-					<<elseif $securityForceSatellitePower == 16>>
+					<<case 16>>
 						<<set _satCost = 250000000000>>
-					<<elseif $securityForceSatellitePower == 17>>
+					<<case 17>>
 						<<set _satCost = 250000000000>>
-					<<elseif $securityForceSatellitePower == 18>>
+					<<case 18>>
 						<<set _satCost = 300000000000>>
-					<</if>>
+					<<case 19>>
+						<<set _satCost = 450000000000>>
+					<<default>>
+						<<set _satCost = 2350000>>
+					<</switch>>
 					<br><<link "Satellite">>
 						<<replace "#resultZ">><br><br>
 						"Sure, boss." she says, nodding. "Upgrading the Satellite should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
@@ -521,17 +531,18 @@
 						<</replace>>
 					<</link>> // Costs <<print cashFormat(1500000*$Env)>> //
 				<<elseif $securityForceUpgradeToken == 0&& $securityForceHeavyAmphibiousTransport >= 1 && $securityForceHeavyAmphibiousTransport < _HeavyAmphibiousTransportMax>>
-					<<if $securityForceHeavyAmphibiousTransport == 1>>
+					<<switch $securityForceHeavyAmphibiousTransport>>
+					<<case 1>>
 						<<set _hatCost = 150000000>>
-					<<elseif $securityForceHeavyAmphibiousTransport == 2>>
+					<<case 2>>
 						<<set _hatCost = 250000000>>
-					<<elseif $securityForceHeavyAmphibiousTransport == 3>>
+					<<case 3>>
 						<<set _hatCost = 300000000>>
-					<<elseif $securityForceHeavyAmphibiousTransport == 4>>
+					<<case 4>>
 						<<set _hatCost = 350000000>>
-					<<elseif $securityForceHeavyAmphibiousTransport == 5>>
+					<<case 5>>
 						<<set _hatCost = 400000000>>
-					<</if>>
+					<</switch>>
 					<br><<link "Heavy amphibious transport">>
 						<<replace "#resultA">><br><br>
 						"Sure, boss." she says, nodding. "Upgrading the heavy amphibious transport, should help us gain a massive 	advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw
index a0265b29fe1..924bf21bde6 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw
@@ -8,21 +8,21 @@
 	<<set _FacilitySupportMax = 1>>
 
 <<set _Armoury = $securityForceInfantryPower>>
-	<<set _ArmouryMax = 11>>
+	<<set _ArmouryMax = 12>>
 
 <<set _StimulantLab = $securityForceStimulantPower>>
-	<<set _StimulantLabMax = 9>>
+	<<set _StimulantLabMax = 10>>
 
 <<set _Garage = $securityForceVehiclePower+$securityForceHeavyBattleTank>>
-<<set _GarageMax = 10>>
-	<<set _LightAndMediumVehiclesMax = 7>>
+<<set _GarageMax = 11>>
+	<<set _LightAndMediumVehiclesMax = 8>>
 	<<set _HeavyBattleTankMax = 3>>
 
 <<set _Hangar = $securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceAC130+$securityForceHeavyTransport>>
-<<set _HangarMax = 33>>
+<<set _HangarMax = 34>>
 	<<set _AircraftMax = 10>>
 	<<set _SpacePlaneMax = 11>>
-	<<set _ForceFortressZeppelinMax = 3>>
+	<<set _ForceFortressZeppelinMax = 4>>
 	<<set _AC10Max = 5>>
 	<<set _heavyTransportMax = 4>>
 
@@ -30,17 +30,17 @@
 	<<set _DroneBayMax = 8>>
 
 <<set _LaunchBayNO = $securityForceSatellitePower+$securityForceGiantRobot+$securityForceMissileSilo>>
-<<set _LaunchBayNOMax = 34>>
-	<<set _SatelliteMax = 19>>
+<<set _LaunchBayNOMax = 35>>
+	<<set _SatelliteMax = 20>>
 	<<set _GiantRobotMax = 12>>
 	<<set _MissileSiloMax = 3>>
 
 <<set _LaunchBayO = $securityForceSatellitePower>>
-	<<set _LaunchBayOMax = 19>>
-	<<set _SatelliteMax = 19>>
+	<<set _LaunchBayOMax = 20>>
+	<<set _SatelliteMax = 20>>
 
-<<set _NavalYardMax = 17>>
-	<<set _AircraftCarrierMax = 5>>
+<<set _NavalYardMax = 18>>
+	<<set _AircraftCarrierMax = 6>>
 	<<set _SubmarineMax = 6>>
 	<<set _HeavyAmphibiousTransportMax = 6>>
 
@@ -51,8 +51,6 @@
 	<<set $SFNO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayNO+_FacilitySupport>>
 	<<set _max = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayNOMax+_FacilitySupportMax>>
 	<<set $SFO = 0>>
-	<<set _NavalYard = 0>>
-	<<set _NavalYardMax = 0>>
 <<elseif $terrain == "oceanic" || $terrain == "marine">>
 	<<set _NavalYard = $securityForceAircraftCarrier+$securityForceSubmarine+$securityForceHeavyAmphibiousTransport>>
 	<<set $SFO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayO+_NavalYard+_FacilitySupport>>
diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index ef6f50363a3..c2215c2c266 100644
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -41,13 +41,12 @@
 
 <<include "SpecialForceBarracksFlavourText">>
 
-<br>
 <<if $securityForceGiftToken == 0>>
 <br>
 	<span id="result">
-		<<link "Ask _Name for some extra cash">><br>
+		<<link "Ask _Name for some extra cash">>
 		<<replace "#result">>
-		<<set $CashGift = (Math.ceil((Math.abs($cash)*0.05)*(Math.max(0.99,$SFAO))))*$Env>>
+		<<set $CashGift = ((Math.ceil((Math.abs($cash)*0.05)*(Math.max(0.99,$SFAO))))*($arcologies[0].prosperity/100))*$Env>>
 			<<if random(1,100) > 50>>
 				<<if random(1,100) > 50>>
 					_Name nods. "Sure boss," she says, "we had a bit of a haul this week. One of my sergeants convinced a woman to tell us where she had hidden her shit. Cut her up pretty bad, but she told us. Bunch of nice jewelry, I kept a nice piece for myself." She picks up a tablet on the table, tapping a few commands on it. "@@.green;There's your cut,@@ <<print cashFormat($CashGift)>>."
@@ -59,10 +58,11 @@
 			<</if>>
 			<<set $securityForceGiftToken = 1>>
 			<<set $cash += $CashGift>>
+			<br>
 		<</replace>>
 		<</link>>
-		<<if $rep < 15000 && $CurrentTradeShowAttendance == 0>>
-			<br><<link "Ask The Colonel to put in a good word for you with her contacts">><br>
+		<<if $rep < 20000 && $CurrentTradeShowAttendance == 0>>
+			<br><<link "Ask The Colonel to put in a good word for you with her contacts">>
 			<<replace "#result">>
 			<<set $GoodWords1 += 250+(Math.ceil(Math.max(0.99,$SFAO))*$Env)>>
 				<<if random(1,100) > 50>>
@@ -76,11 +76,12 @@
 				<</if>>
 				<<set $securityForceGiftToken = 1>>
 				<<set $rep += $GoodWords1>>
+				<br>
 			<</replace>>
 			<</link>>
 		<</if>>
-		<<if $arcologies[0].prosperity < 30 && $CurrentTradeShowAttendance == 0>>
-			<br><<link "Ask The Colonel to use her contacts to help the arcology's business community">><br>
+		<<if $arcologies[0].prosperity < $AProsperityCap && $CurrentTradeShowAttendance == 0>>
+			<br><<link "Ask The Colonel to use her contacts to help the arcology's business community">>
 			<<replace "#result">>
 			<<set $GoodWords2 = $EnvProsp+(Math.max(0.99,$SFAO)/100)*$Env>>
 				<<if random(1,100) > 50>>
@@ -94,6 +95,7 @@
 				<</if>>
 				<<set $securityForceGiftToken = 1>>
 				<<set $arcologies[0].prosperity += $GoodWords2>>
+				<br>
 			<</replace>>
 			<</link>>
 		<</if>>
@@ -101,9 +103,9 @@
 <</if>>
 
 <<if $securityForceUpgradeToken == 1 && ( $SFAO < _max)>>
-//_Name is working to improve $securityForceName this week.//
+<br>//_Name is working to improve $securityForceName this week.//
 <<elseif $SFAO >= _max>>
-//$securityForceName is fully equipped and upgraded - nothing else can be done.//
+<br>//$securityForceName is fully equipped and upgraded - nothing else can be done.//
 <</if>>
 
 <<if $securityForceGiftToken == 1>>
@@ -125,7 +127,7 @@
 	<</link>> <br>It will cost 5% of your currently displayed cash, which is <<print cashFormat(Math.trunc(_securityForceUpgradeResetTokenCurrentCost))>>.
 <</if>>
 <<if $securityForceUpgradeTokenReset >= 1>>
-	<br><br>"In total, you have asked _Name about upgrading $securityForceName $securityForceUpgradeTokenReset times."
+	<br>Total multi week $securityForceName upgrades: $securityForceUpgradeTokenReset
 <</if>>
 
 <<include "SpecialForceUpgradeOptions">>
diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw
index e42f4a80270..184287a5c33 100644
--- a/src/uncategorized/securityForceEOWReport.tw
+++ b/src/uncategorized/securityForceEOWReport.tw
@@ -380,14 +380,16 @@
 
 <<if $securityForceStimulantPower == 8 && random(0,100) >_OverdoseSurvivalChance>>
 	<<set _OverdoseDeaths = "$securityForcePersonnel -= random(0,10)">>
+<<elseif $securityForceStimulantPower == 10 && random(0,100) >_OverdoseSurvivalChance>>
+	<<set _OverdoseDeaths = "$securityForcePersonnel -= random(0,20)">>
 <</if>>
 
 /* Take all the above and display the EOW text and control panel. */
 <</silently>>
 <<nobr>>
 	__Status and Activities of the $securityForceName __:
-	<br>This week, $securityForceName, $securityForcePersonnel strong, focused on <<if $securityForceFocus == "recruit">>recruiting and training more personnel. Smaller parties ventured out to protect the arcology's trade routes and strike targets of opportunity.<<elseif $securityForceFocus == "secure">>securing the trade routes between the arcology and the surrounding area. Smaller parties ventured out to strike targets of opportunity and process new recruits.
-	<<elseif $securityForceFocus == "raiding">>locating and striking targets of opportunity, capturing both material loot and new slaves. Smaller parties secured the most important of the arcology's trade routes and processed new recruits.<</if>> <<if $securityForceStimulantPower == 8>> _OverdoseDeaths soldiers fatly overdosed. The Colonel's much heavier than average drug use saves her from this side effect.<</if>> These activities have, overall, @@.green;improved@@ your arcology's prosperity. <<if $securityForceProfitable == 1>>The goods procured by the $securityForceName this week, after accounting for the spoils retained by individual soldiers, were @@.green;more than sufficient@@ to cover expenses. Excess material and human assets totalling @@.yellowgreen;<<print cashFormat($securityForceIncome)>>@@ (after liquidation) were transferred to your accounts. <<elseif $securityForceProfitable == 0>>The goods procured by the special force were, after accounting for the spoils retained by individual soldiers, @@.red;barely enough@@ to cover expenses. More growth will be needed to ensure profitability.<</if>> $securityForceName managed to recruit $securityForceRecruit new soldiers this week, and your reputation has @@.green;improved@@ through the improvement of trade security.
+	<br>This week, $securityForceName, <<print commaNum($securityForcePersonnel)>> strong, focused on <<if $securityForceFocus == "recruit">>recruiting and training more personnel. Smaller parties ventured out to protect the arcology's trade routes and strike targets of opportunity.<<elseif $securityForceFocus == "secure">>securing the trade routes between the arcology and the surrounding area. Smaller parties ventured out to strike targets of opportunity and process new recruits.
+	<<elseif $securityForceFocus == "raiding">>locating and striking targets of opportunity, capturing both material loot and new slaves. Smaller parties secured the most important of the arcology's trade routes and processed new recruits.<</if>> <<if $securityForceStimulantPower == 8 || $securityForceStimulantPower == 10>> _OverdoseDeaths soldiers fatally overdosed. The Colonel's much heavier than average drug use saves her from this side effect.<</if>> These activities have, overall, @@.green;improved@@ your arcology's prosperity. <<if $securityForceProfitable == 1>>The goods procured by the $securityForceName this week, after accounting for the spoils retained by individual soldiers, were @@.green;more than sufficient@@ to cover expenses. Excess material and human assets totalling @@.yellowgreen;<<print cashFormat($securityForceIncome)>>@@ (after liquidation) were transferred to your accounts. <<elseif $securityForceProfitable == 0>>The goods procured by the special force were, after accounting for the spoils retained by individual soldiers, @@.red;barely enough@@ to cover expenses. More growth will be needed to ensure profitability.<</if>> $securityForceName managed to recruit $securityForceRecruit new soldiers this week, and your reputation has @@.green;improved@@ through the improvement of trade security.
 
 <</nobr>>
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Your instructions to <<if $CurrentTradeShowAttendance == 1>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>><<else>>The Colonel<</if>>://
-- 
GitLab