diff --git a/src/init/dummy.tw b/src/init/dummy.tw
index 8cdf21a7c5803705e44b645e9fbac1d00e1fe64b..90d4d94bbc5e81790dd26d14c33c23261fe2b162 100644
--- a/src/init/dummy.tw
+++ b/src/init/dummy.tw
@@ -21,7 +21,6 @@ $belarusianSlaveNames, $dominicanSlaveNames, $scottishSlaveNames
$ArcologyNamesEugenics, $ArcologyNamesRepopulationist, $ArcologyNamesHedonisticDecadence
$hare1, $hare2, $hare3, $hareSpeed, $hareSpeed1, $hareSpeed2, $hareSpeed3, $origin1, $origin2, $origin3, $LurcherSpeed
$$i
-$SSSlavesIDs, $SSLevel, $SSLBSCA, $SSLBCA, $SSLBHC, $SSLBC, $SSLASAST, $SSLASM, $SSLAM, $SSLSLPH, $SSLSLSC, $SSLSLAC, $SSLC, $SSLAAST, $SSLevelGarage, $SSLevelHangar, $SSLevelDroneBay, $SSLevelLaunchBay
$activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVector, $activeSlave.shoeColor, $activeSlave.newGamePlus, $activeSlave.HasBeenAssignedToFacilitySupport
$drugs
$PC.origRace, $PC.origSkin
diff --git a/src/pregmod/SecForceEX/SFMBarracksSlaveSupport.tw b/src/pregmod/SecForceEX/SFMBarracksSlaveSupport.tw
deleted file mode 100644
index 14381e83a2f7d8fcc1db51ff3bbb81c6cbb3d499..0000000000000000000000000000000000000000
--- a/src/pregmod/SecForceEX/SFMBarracksSlaveSupport.tw
+++ /dev/null
@@ -1,64 +0,0 @@
-:: SS [nobr]
-
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Barracks", $SS = $SSSlavesIDs.length, $Flag = 0>>
-
-<<if SSSlaves > 5>>
- $securityForceName's Slave Support area is bustling with activity. There is little to no trash on the ground.
- <<set $SSLevel = 1>>
-<</if>>
-
-<<set $SSSlaves.combatSkill + 1>>
-<<set $SSsSlaves.devotion +10>>
-<<set $SSSlaves.trust +10>>
-
-<<set _Tmult0 = Math.trunc($SS*1000*$upgradeMultiplierArcology)>>
-<br>It can support $SS support workers.
-[[Expand the SS|SS][$cash -= _Tmult0, $SS += 5]] //Costs ¤_Tmult0 and will increase upkeep costs//
-
-<br>
-<<if $SSUpgradeMonitoring == 1>>
- The area has been upgraded with enhanced monitoring systems to make the support workers work harder, improving their obedience,efficiency and trust.
-<<else>>
- <<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology)>>
- The area is standard. [[Upgrade the monitoring systems to force harder work|$SS][$cash -= _Tmult1,set $SSsSlaves.devotion +5, set $SSSlaves.trust +5, $SSUpgradeMonitoring = 1]] //Costs ¤_Tmult1 and will increase upkeep costs//
-<</if>>
-
-<!-- Statistics output -->
-<<SSStatistics 1>>
-
-<br><br>
-<<if ($SS <= $SSSlaves)>>
- ''$SSNameCaps is full and cannot hold any more slaves''
-<<elseif ($slaves.length > $SSSlaves)>>
- <<link "''Send a slave to $SSName''">>
- <<replace #ComingGoing>>
- <<resetAssignmentFilter>>
- <<set $Flag to 0>>
- <<include "Slave Summary">>
- <</replace>>
- <</link>>
-<</if>>
-
-<<if $SSSlaves > 0>>
- | <<link "''Bring a slave out of $SSName''">>
- <<replace #ComingGoing>>
- <<SSAssignmentFilter>>
- <<set $Flag = 1>>
- <<include "Slave Summary">>
- <<resetAssignmentFilter>>
- <</replace>>
- <</link>>
-<<else>>
- <br><br>//$SSNameCaps is empty for the moment.<br>//
-<</if>>
-
-<br><br>
-<<assignmentFilter >>
-<span id="ComingGoing">
- <<SSAssignmentFilter>>
- <<set $Flag = 1>>
- <<include "Slave Summary">>
- <<resetAssignmentFilter>>
-</span>
-
-<br><br>Rename $SSName: <<textbox "$SSName" $SSName "SS">> //Use a noun or similar short phrase//
diff --git a/src/pregmod/SecForceEX/SlaveSupport.tw b/src/pregmod/SecForceEX/SlaveSupport.tw
deleted file mode 100644
index d9f92e6e174925a7f7f379ccc166b17faeb395bf..0000000000000000000000000000000000000000
--- a/src/pregmod/SecForceEX/SlaveSupport.tw
+++ /dev/null
@@ -1,159 +0,0 @@
-:: SlaveSupport [nobr]
-
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "SlaveSupport", $showEncyclopedia = 1, $encyclopedia = "SlaveSupport", $SlaveSupportSlaves = $SSiIDs.length>>
-
-<<if $SlaveSupportName != "the SlaveSupport">>
- <<set $SlaveSupportNameCaps = $SlaveSupportName.replace("the ", "The ")>>
-<</if>>
-$SlaveSupportNameCaps
-
-/* Facilities */
-
-Where should the slave be assigned?
-
-<span id="result0">
- <<link "Barracks">>
- <<replace "#result0">>
- <<set $SSLevelBarracks += 1, $slaves[$i].XP + 1>>
- <</replace>>
- <</link>><<link ",armoury">>
- <<replace "#result0">>
- <<set $SSLevelArmoury += 1, $slaves[$i].XP + 1>>
- <</replace>>
- <</link>><<link ",stimulant Lab,,">>
- <<replace "#result0">>
- <<set $SSLevelStimulantLab += 1, $slaves[$i].XP + 1>>
- <</replace>>
- <</link>><<link "garage,">>
- <<replace "#result0">>
- <<set $SSLevelGarage += 1, $slaves[$i].XP + 1>>
- <</replace>>
- <</link>><<link "Hangar,">>
- <<replace "#result0">>
- <<set $SSLevelHangar += 1, $slaves[$i].XP + 1>>
- <</replace>>
- <</link>><<link "Drone Bay,">>
- <<replace "#result0">>
- <<set $SSLevelDroneBay += 1, $slaves[$i].XP + 1>>
- <</replace>>
- <</link>><<link "Launch Bay,">>
- <<replace "#result0">>
- <<set $SSLevelLaunchBay = 1, $slaves[$i].XP + 1>>
- <</replace>><</link>>
- <<if $terrain == "oceanic">>
- <<link "Naval Yard.">>
- <<replace "#result0">>
- <<set $SSLevelNavalYard = 1, $slaves[$i].XP + 1>>
- <</replace>><</link>>
- <</if>>
-<span>
-
-/* <<switch $SlaveSupportDecoration>>
-<<case "Roman Revivalist">>
- is designed to resemble the holding pens beneath the old Coliseum. Whenever there's a fight in the arcology, screens in each cell helpfully keep inmates informed of what awaits (otherwise) useless slaves.
-<<case "Aztec Revivalist">>
- is designed to frighten the prisoners to submission. All the cells look to the center of the facility, where a sacrificial altar stands, adorned with ceremonial <<if $arcologies[0].FSPaternalist != "unset">>ropes and penetrators<<else>>knives, ropes and blunt instruments<</if>>.
-<<case "Egyptian Revivalist">>
- uses the climate of Egypt as an additional source of discomfort. The air here is hot and dry, and inmates can easily imagine themselves confined in mud brick cells in a baking desert.
-<<case "Edo Revivalist">>
- is furnished in a severely medieval Japanese style. There is one refinement, but it's of exquisite cruelty. At the end of the hall, there's a fountain with a traditional bamboo boar scarer. As it fills with water, it tips against a stone with a thunk... thunk... thunk... thunk...
-<<case "Arabian Revivalist">>
- is furnished as imagined Arabian slave pens, all set around a central pillar. This pillar is capped by shackles, so that slaves can be bound by their hands and whipped on the backs, buttocks, and thighs in clear view of all their fellow chattel.
-<<case "Chinese Revivalist">>
- is furnished in a severely medieval Chinese style. There is one refinement, but it's of exquisite cruelty. Somewhere out of sight, water is dripping into an urn, drop by drop... drop... drop... drop...
-<<case "Chattel Religionist">>
- is built of cold stone. Most of the cells are unfurnished little cubes inside which the only bed is the bare floor. A few are smaller still, so that the inmates can neither stand nor lie flat.
-<<case "Degradationist">>
- is a nightmare. Everything is made of metal, and almost everything menaces with spikes of steel. Inmates must carefully avoid the walls of their own cells if they wish to avoid being stabbed.
-<<case "Asset Expansionist">>
- is a straightforward prison, with one exception. Each cell features a screen displaying plans for its inmate's expansion. Day and night, inmates are confronted with the sight of themselves transformed.
-<<case "Transformation Fetishist">>
- is a straightforward prison, with one exception. Each cell features a screen displaying plans for its inmate's expansion. Day and night, inmates are confronted with the sight of themselves transformed.
-<<case "Gender Radicalist">>
- is a straightforward prison, with one exception. Each cell features a screen displaying plans for its inmate's bimbofication. Day and night, inmates are confronted with the sight of themselves dyed, pierced, tattooed, gaped, filled with implants, or all of these.
-<<case "Gender Fundamentalist">>
- is a block of barred cells whose sides, offering a clear view of the whole prison, provide much menace. Anyone who abuses an inmate does so in full view of every other slave here, keeping the jailbirds in a state of constant fear that they're next.
-<<case "Physical Idealist">>
- is a block of barred cells whose sides, offering a clear view of the whole prison, provide much menace. Anyone who assrapes an inmate does so in full view of every other slave here, keeping the bitches in a state of constant fear that their asses are next.
-<<case "Supremacist">>
- is a straightforward prison whose menace is provided by context that, although subtle, adds up to a nightmare. Everyone outside the cells is $arcologies[0].FSSupremacistRace, and everyone inside them is not. The darkness of history is palpable here.
-<<case "Subjugationist">>
- is a straightforward prison whose menace is provided by context that, although subtle, adds up to a nightmare. The inmates inside the cells are $arcologies[0].FSSubjugationistRace, and everyone outside them is not. The darkness of history is palpable here.
-<<case "Repopulation Focus">>
- is a straightforward prison, with two exceptions. One cell style features a screen displaying plans for its inmate's impregnation, the other is covered with mirrors for its inmate to watch her pregnancy grow. Day and night, inmates are confronted with the sight of themselves transformed.
-<<case "Eugenics">>
- is designed to make very clear to its inmates that they are subhuman. Many screens showcasing their inadequacy intermingled with propaganda play on nonstop loops.
-<<case "Paternalist">>
- is a prison, but a modern and scientific one. The cells, the common areas, and even the color of the walls are all carefully designed to communicate the feeling that inmates can better themselves.
-<<case "Pastoralist">>
- requires its inmates to drink as much breast milk as they can hold. This sounds like a small thing, but for an unbroken slave, conquering the revulsion of drinking another girl's milk is an important step.
-<<case "Maturity Preferentialist">>
- is subtly designed to make very clear to its inmates that they are sex objects. Many screens showing pornography make it clear to the maturest girl here that she's still an object of lust, and will be used to slake others' pleasure.
-<<case "Youth Preferentialist">>
- is subtly designed to make the breadth of sex acts performed in the arcology clear to its inmates. A cacophony of pornography makes clear to the most innocent inmate that her pussy is a fuck hole, her mouth is a fuck hole, her anus is a fuck hole, and, in fact, all three can be fuck holes at once.
-<<case "Body Purist">>
- requires its inmates to drink as much filtered water as they can, all the time. This sounds like a petty thing, but most inmates are very aware that they're being flushed out. Cleaned. It is an oddly menacing thought.
-<<case "Slimness Enthusiast">>
- is torture for chubby slaves. Fat bitches that pass through here soon learn that they're going to be slim and pretty one day, but that it isn't going to be much fun getting there.
-<<case "Hedonistic">>
- is torture for thin slaves. The first thing they notice is the heavily reinforced cot they will reside upon. The second is the feeding tube that will be anchored in their stomach for the duration of their stay. Slaves imprisoned here will have their body stuffed to capacity with concentrated slave food, unsuring a plump, docile slave by the end of their sentence.
-<<default>>
- could be mistaken for a modern generic office. Upon close inspection, however, reveals restraints in each cell that will hold inmates in sexually compromising positions, and compliance systems to force them to place their wrists and ankles in them.
-<</switch>> */
-
-<<if $SlaveSupportSlaves > 2>>
- $SlaveSupportNameCaps is full of slaves, though it's difficult to tell at first.
-<<elseif $SlaveSupportSlaves > 0>>
- $SlaveSupportNameCaps holds a few slaves, though it's difficult to tell at first.
-
-<<else>>
- None of your slaves are assigned in SlaveSupport. [[Decommission SlaveSupport|Main][$SlaveSupport = 0, $SlaveSupportDecoration = "standard", $SlaveSupportUpgrade = 0]]
-<</if>>
-
-<<set _Tmult0 = Math.trunc($SlaveSupport*1000*$upgradeMultiplierArcology)>>
-<br>$SlaveSupportNameCaps has room for $SlaveSupport slaves to assigned.
-[[Expand the SlaveSupport|SlaveSupport][$cash -= _Tmult0, $SlaveSupport += 5]] //Costs ¤_Tmult0//
-
-/* <br>
-<<if $SlaveSupportUpgrade == 1>>
- Its compliance systems have been upgraded to allow slaves no mental respite, painstakingly correcting the tiniest misbehaviors to soften flaws into quirks at the cost of considerable anguish to inmates denied any rest from correction.
-<<else>>
- <<set _Tmult1 = Math.trunc(20000*$upgradeMultiplierArcology)>>
- Its compliance systems are standard. [[Upgrade them to soften slave flaws|SlaveSupport][$cash -= _Tmult1, $SlaveSupportUpgrade = 1]] //Costs ¤_Tmult1//
-<</if>> */
-
-<br><br>
-<<if ($SlaveSupport <= $SlaveSupportSlaves)>>
- ''$SlaveSupportNameCaps is full and cannot hold any more slaves''
-<<elseif ($slaves.length > $SlaveSupportSlaves)>>
- <<link "''Send a slave to be assigned in the SlaveSupport''">>
- <<replace #ComingGoing>>
- <<resetAssignmentFilter>>
- <<set $Flag to 0>>
- <<include "Slave Summary">>
- <</replace>>
- <</link>>
-<</if>>
-
-<<if $SlaveSupportSlaves > 0>>
- | <<link "''Let a slave out of SlaveSupport''">>
- <<replace #ComingGoing>>
- <<SlaveSupportAssignmentFilter>>
- <<set $Flag = 1>>
- <<include "Slave Summary">>
- <<resetAssignmentFilter>>
- <</replace>>
- <</link>>
-<<else>>
- <br><br>//SlaveSupport is empty for the moment.<br>//
-<</if>>
-<br><br>
-<<assignmentFilter>>
-<span id="ComingGoing">
- <<SlaveSupportAssignmentFilter>>
- <<set $Flag = 1>>
- <<include "Slave Summary">>
- <<resetAssignmentFilter>>
-</span>
-
-<br><br>Rename $SlaveSupportName: <<textbox "$SlaveSupportName" $SlaveSupportName "SlaveSupport">> //Use a noun or similar short phrase//
diff --git a/src/pregmod/SecForceEX/SlaveSupportReport.tw b/src/pregmod/SecForceEX/SlaveSupportReport.tw
deleted file mode 100644
index aef98ad5064829d0e1bddd0adbdfb82229b13527..0000000000000000000000000000000000000000
--- a/src/pregmod/SecForceEX/SlaveSupportReport.tw
+++ /dev/null
@@ -1,48 +0,0 @@
-:: SlaveSupport Report [nobr]
-
-<<SlaveSort $SSiIDs>>
-<<set _DL = $SSiIDs.length, $SlaveSupportSlaves = _DL, _SL = $slaves.length, _brokenSlaves = 0, _idleBonus = 0, _softenedQuirks = 0, _trustMalus = 0, _FLsFetish = 0>>
-
-<<if $SlaveSupportDecoration != "standard">>
- <<set _devBonus = 1>>
-<<else>>
- <<set _devBonus = 0>>
-<</if>>
-
-/* Progression at facilities */
-
- <<set _FLs = $slaves.findIndex(function(s))>>
-
-<<if $SSLevelBarracks && $slaves[$i].XP >= 15>>
- <<set $SSLBSCA += 1, $slaves[_FLs].devotion += 5, $slaves[_FLs].trust += 5,$slaves[_FLs].intelligence = 3,$slaves[_FLs].intelligenceImplant = 1, $slaves[_FLs].combatSkill = 1>>
-<<elseif $SSLevelBarracks && $slaves[$i].XP >= 10>>
- <<set $SSLBCA += 1, $slaves[_FLs].devotion += 4, $slaves[_FLs].trust += 4,$slaves[_FLs].intelligence = 2,$slaves[_FLs].intelligenceImplant = 1, $slaves[_FLs].combatSkill = 1>>
-<<elseif $SSLevelBarracks && $slaves[$i].XP >= 5>>
- <<set $SSLBHC += 1, $slaves[_FLs].devotion += 3, $slaves[_FLs].trust += 3,$slaves[_FLs].intelligence = 1,$slaves[_FLs].intelligenceImplant = 0, $slaves[_FLs].combatSkill = 0>>
-<<elseif $SSLevelBarracks && $slaves[$i].XP >= 1>>
- <<set $SSLBC += 1, $slaves[_FLs].devotion += 2, $slaves[_FLs].trust += 2,$slaves[_FLs].intelligence = 0,$slaves[_FLs].intelligenceImplant = 0, $slaves[_FLs].combatSkill = 0>>
-<</if>>
-
-<<if $SSLevelArmoury && $slaves[$i].XP >= 15>>
- <<set $SSLASAST += 1, $slaves[_FLs].devotion += 5, $slaves[_FLs].trust += 5,$slaves[_FLs].intelligence = 3,$slaves[_FLs].intelligenceImplant = 1, $slaves[_FLs].combatSkill = 1>>
-<<elseif $SSLevelArmoury && $slaves[$i].XP >= 10>>
- <<set $SSLAAST += 1, $slaves[_FLs].devotion += 4, $slaves[_FLs].trust += 4,$slaves[_FLs].intelligence = 2,$slaves[_FLs].intelligenceImplant = 1, $slaves[_FLs].combatSkill = 1>>
-<<elseif $SSLevelArmoury && $slaves[$i].XP >= 5>>
- <<set $SSLASM += 1, $slaves[_FLs].devotion += 3, $slaves[_FLs].trust += 3,$slaves[_FLs].intelligence = 1,$slaves[_FLs].intelligenceImplant = 0, $slaves[_FLs].combatSkill = 0>>
-<<elseif $SSLevelArmoury && $slaves[$i].XP >= 1>>
- <<set $SSLAM += 1, $slaves[_FLs].devotion += 2, $slaves[_FLs].trust += 2,$slaves[_FLs].intelligence = 0,$slaves[_FLs].intelligenceImplant = 0, $slaves[_FLs].combatSkill = 0>>
-<</if>>
-
-<<if $SSLevelStimulantLab && $slaves[$i].XP >= 15>>
- <<set $SSLSLPH += 1, $slaves[_FLs].devotion += 5, $slaves[_FLs].trust += 5,$slaves[_FLs].intelligence = 3,$slaves[_FLs].intelligenceImplant = 1, $slaves[_FLs].combatSkill = 1>>
-<<elseif $SSLevelStimulantLab && $slaves[$i].XP >= 10>>
- <<set $SSLSLSC += 1, $slaves[_FLs].devotion += 4, $slaves[_FLs].trust += 4,$slaves[_FLs].intelligence = 2,$slaves[_FLs].intelligenceImplant = 1, $slaves[_FLs].combatSkill = 1>>
-<<elseif $SSLevelStimulantLab && $slaves[$i].XP >= 5>>
- <<set $SSLSLAC += 1, $slaves[_FLs].devotion += 3, $slaves[_FLs].trust += 3,$slaves[_FLs].intelligence = 1,$slaves[_FLs].intelligenceImplant = 0, $slaves[_FLs].combatSkill = 0>>
-<<elseif $SSLevelStimulantLab && $slaves[$i].XP >= 1>>
- <<set $SSLC += 1, $slaves[_FLs].devotion += 2, $slaves[_FLs].trust += 2,$slaves[_FLs].intelligence = 0,$slaves[_FLs].intelligenceImplant = 0, $slaves[_FLs].combatSkill = 0>>
-<</if>>
-
-<<if (_DL > 0)>>
- <<if (_DL == 1)>>''One slave has been assigned to $SlaveSupportName.''<<else>>''_DL slaves have been assigned to $SlaveSupportName.''<</if>>
-<</if>>
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
index 2ee6ffe7a8cb2b30ca16d48f0a59a458e8d7e7d0..9d2a0abea3bf356c75a955cde4de43cb41a19ba2 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
@@ -44,7 +44,6 @@
<</if>>
<br><br>
-
<div style="margin-left:1em">
<<if $securityForcePersonnel < 100>>
The barracks' large dormitories are sparsely occupied, the few members of $securityForceName residing within them concentrating together in a corner. The hundreds of empty beds and lockers visible herald the future.
@@ -67,10 +66,10 @@
<br><<link "Enter the building then send a slave to serve in the HQ and facilities of $securityForceName">>
<<goto "FacilitySupport">>
<</link>>
+<br><br>
<</if>>
-<br>
-
+<br><br>
''Armory:''
<br>
/* 11 upgrades */
@@ -101,7 +100,6 @@
<</if>>
<br><br>
-
''Stimulant Lab:''
<br>
/* 7 upgrades */
@@ -151,6 +149,7 @@
<</if>>
/* 3 upgrades */
+<br>
<<if $securityForceHeavyBattleTank == 1>>
A basic heavy battle tank has been 'borrowed' from the old world.
<<elseif $securityForceHeavyBattleTank == 2>>
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
index f3b7e8ce228695ddfe54630573881039d64469f1..5f0699c942afa4c3cbe031587a1230cc53b80729 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
@@ -1,11 +1,10 @@
-:: SpecialForceUpgradeOptions [nobr]
+:: SpecialForceUpgradeOptions
-<<if ($SFAO < _max) && $securityForceUpgradeToken == 0>>
+<<nobr>>
+<<if ( $SFAO < _max) && $securityForceUpgradeToken == 0>>
<span id="resultX">
-<<switch $UpgradeOptions>>
<br><br>Which facility or equipment do you wish _Name to upgrade this week?
- <<case "Barracks">>
<<if $securityForceUpgradeToken == 0 && _Barracks < 5>>
<br><<link "Barracks">>
<<replace "#resultX">><br><br>
@@ -62,7 +61,6 @@
<br>//$securityForceName has fully upgraded the barracks to support it's activities//
<</if>>
- <<case "Facility Support">>
<<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && $FacilitySupport == 0>>
<br><<link "Facility Support">>
<<replace "#resultX">><br><br>
@@ -72,7 +70,6 @@
<</link>> // Costs ¤<<print Math.trunc(150000000*(Math.max(0.99,$SFAO)/10)*$Env)>> //
<</if>>
- <<case "Armoury">>
<<if $securityForceUpgradeToken == 0 && _Armoury < 5>>
<br><<link "Armoury">>
<<replace "#resultX">><br><br>
@@ -92,8 +89,7 @@
<br>//$securityForceName has fully upgraded the armoury to support it's activities.//
<</if>>
- <<case "Stimulant Lab">>
- <<if $securityForceUpgradeToken == 0 && _StimulantLab < 5>>
+ <<if $securityForceUpgradeToken == 0 && _StimulantLab < 5>>
<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."
@@ -126,18 +122,15 @@
<br>//$securityForceName has fully upgraded the stimulant lab to support it's activities.//
<</if>>
- <<case "Garage">>
- <<switch $GarageUpgrades>>
- <<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && _Garage < _GarageMax>>
- <br><<link "Garage">>
- <<replace "#resultX">>
- <span id="resultB">
+ <<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && _Garage < _GarageMax>>
+ <br><<link "Garage">>
+ <<replace "#resultX">>
+ <span id="resultB">
<br><br>"Which unit do you wish to upgrade or 'borrow'?"
<<link "Go back">>
<<goto "SFM Barracks">>
<</link>>
- <<case "Light and medium vehicles">>
<<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower < 5>>
<br><<link "Light and medium vehicles">>
<<replace "#resultB">><br><br>
@@ -164,7 +157,6 @@
<br>//More barracks infrastructure upgrades are needed before the vehicle fleet can be expanded.//
<</if>>
- <<case "heavy battle tank">>
<<if $securityForceUpgradeToken == 0 && $securityForceHeavyBattleTank < 1 && $securityForceVehiclePower >= 7>>
<br><<link "A heavy battle tank">>
<<replace "#resultB">><br><br>
@@ -189,15 +181,12 @@
<br>//$securityForceName has fully upgraded the heavy battle tank to support it's activities.//
<</if>>
- </span>
- <</replace>>
- <</link>>
- <</if>>
- <</switch>>
+ </span>
+ <</replace>>
+ <</link>>
+ <</if>>
<<if _Garage >= _GarageMax>>//<br>$securityForceName has fully upgraded the garage to support it's activities.//<</if>>
- <<case "Hangar">>
- <<switch $LaunchBayUpgrades>>
<<if $securityForceUpgradeToken == 0 && _Barracks >= 4 && _Hangar < _HangarMax>>
<br><<link "Hangar">>
<<replace "#resultX">>
@@ -207,7 +196,6 @@
<<goto "SFM Barracks">>
<</link>>
- <<case "Light and medium aircraft">>
<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower < 5>>
<br><<link "Light and medium aircraft">>
<<replace "#resultY">><br><br>
@@ -240,7 +228,6 @@
<br>//More barracks infrastructure upgrades are needed before the air fleet can be expanded.//
<</if>>
- <<case "space plane">>
<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceSpacePlanePower < 1>>
<br><<link "A space plane">>
<<replace "#resultY">><br><br>
@@ -277,7 +264,6 @@
<br>//$securityForceName has fully upgraded the space plane to support it's activities.//
<</if>>
- <<case "fortress zeppelin">>
<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceFortressZeppelin < 1>>
<br><<link "A fortress zeppelin">>
<<replace "#resultY">><br><br>
@@ -296,7 +282,6 @@
<br>//$securityForceName has fully upgraded the fortress zeppelin to support it's activities.//
<</if>>
- <<case "AC130">>
<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceAC130 < 1>>
<br><<link "An AC-130">>
<<replace "#resultY">><br><br>
@@ -316,7 +301,6 @@
<br>//$securityForceName has fully upgraded the AC-130 to support it's activities.//
<</if>>
- <<case "heavy transport">>
<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceHeavyTransport < 1>>
<br><<link "A heavy transport">>
<<replace "#resultY">><br><br>
@@ -339,10 +323,8 @@
<</replace>>
<</link>>
<</if>>
- <</switch>>
<<if _Hangar >= _HangarMax>>//<br>$securityForceName has fully upgraded the hangar to support it's activities.//<</if>>
- <<case "Drone bay">>
<<if $securityForceUpgradeToken == 0 && _DroneBay < 5 && _Barracks >= 2>>
<br><<link "Drone bay">>
<<replace "#resultX">>
@@ -364,8 +346,6 @@
<br>//More barracks infrastructure upgrades are needed before the drone bay can be expanded.//
<</if>>
- <<case "Launch Bay">>
- <<switch $LaunchBayUpgrades>>
<<if _Barracks >= 4>>
<<if $securityForceUpgradeToken == 0 && _LaunchBayNO < _LaunchBayNOMax || _LaunchBayO < _LaunchBayNOMax>>
<br><<link "Launch Bay">>
@@ -376,7 +356,6 @@
<<goto "SFM Barracks">>
<</link>>
- <<case "Satellite">>
<<if $securityForceUpgradeToken == 0 && _Barracks >= 4 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceSatellitePower < 1>>
<br><<link "A Satellite">>
<<replace "#resultZ">><br><br>
@@ -415,48 +394,46 @@
<br>//$securityForceName has fully upgraded the Satellite to support it's activities.//
<</if>>
- <<case "giant robot">>
- <<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceGiantRobot < 1 && ($terrain != "oceanic" && $terrain != "marine")>>
- <br><<link "A giant robot">>
- <<replace "#resultZ">><br><br>
- "Sure, boss." she says, nodding. "A giant robot would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= 50000000*$Env>>
- <</replace>>
- <</link>> // Costs ¤<<print 50000000*$Env>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot >= 1 && $securityForceGiantRobot < _GiantRobotMax>>
- <<if $securityForceGiantRobot < 3>>
- <<set _robCost = 25000000>>
- <<elseif $securityForceGiantRobot == 3>>
- <<set _robCost = 45000000>>
- <<elseif $securityForceGiantRobot == 4>>
- <<set _robCost = 45000000>>
- <<elseif $securityForceGiantRobot == 5>>
- <<set _robCost = 65000000>>
- <<elseif $securityForceGiantRobot == 6>>
- <<set _robCost = 85000000>>
- <<elseif $securityForceGiantRobot == 7>>
- <<set _robCost = 95000000>>
- <<elseif $securityForceGiantRobot == 8>>
- <<set _robCost = 105000000>>
- <<elseif $securityForceGiantRobot == 9 && $securityForceInfantryPower >= 10>>
- <<set _robCost = 2750000000>>
- <<elseif $securityForceGiantRobot == 10>>
- <<set _robCost = 3150000000>>
- <<elseif $securityForceGiantRobot == 11>>
- <<set _robCost = 3200000000>>
- <</if>>
- <br><<link "Giant robot">>
- <<replace "#resultZ">><br><br>
- "Sure, boss." she says, nodding. "Upgrading the giant robot, 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."
- <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= _robCost*$Env>>
- <</replace>>
- <</link>> // Costs ¤<<print _robCost*$Env>> //
- <</if>>
- <<if $securityForceGiantRobot == 9 || $securityForceGiantRobot == _GiantRobotMax && ($terrain != "oceanic" && $terrain != "marine")>>
- <br>//$securityForceName has fully upgraded the giant robot to support it's activities.//
+ <<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceGiantRobot < 1 && ($terrain != "oceanic" && $terrain != "marine")>>
+ <br><<link "A giant robot">>
+ <<replace "#resultZ">><br><br>
+ "Sure, boss." she says, nodding. "A giant robot would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
+ <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= 50000000*$Env>>
+ <</replace>>
+ <</link>> // Costs ¤<<print 50000000*$Env>> //
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot >= 1 && $securityForceGiantRobot < _GiantRobotMax>>
+ <<if $securityForceGiantRobot < 3>>
+ <<set _robCost = 25000000>>
+ <<elseif $securityForceGiantRobot == 3>>
+ <<set _robCost = 45000000>>
+ <<elseif $securityForceGiantRobot == 4>>
+ <<set _robCost = 45000000>>
+ <<elseif $securityForceGiantRobot == 5>>
+ <<set _robCost = 65000000>>
+ <<elseif $securityForceGiantRobot == 6>>
+ <<set _robCost = 85000000>>
+ <<elseif $securityForceGiantRobot == 7>>
+ <<set _robCost = 95000000>>
+ <<elseif $securityForceGiantRobot == 8>>
+ <<set _robCost = 105000000>>
+ <<elseif $securityForceGiantRobot == 9 && $securityForceInfantryPower >= 10>>
+ <<set _robCost = 2750000000>>
+ <<elseif $securityForceGiantRobot == 10>>
+ <<set _robCost = 3150000000>>
+ <<elseif $securityForceGiantRobot == 11>>
+ <<set _robCost = 3200000000>>
<</if>>
-
- <<case "missile silo">>
+ <br><<link "Giant robot">>
+ <<replace "#resultZ">><br><br>
+ "Sure, boss." she says, nodding. "Upgrading the giant robot, 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."
+ <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= _robCost*$Env>>
+ <</replace>>
+ <</link>> // Costs ¤<<print _robCost*$Env>> //
+ <</if>>
+ <<if $securityForceGiantRobot == 9 || $securityForceGiantRobot == _GiantRobotMax && ($terrain != "oceanic" && $terrain != "marine")>>
+ <br>//$securityForceName has fully upgraded the giant robot to support it's activities.//
+ <</if>>
+
<<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceMissileSilo < 1 && ($terrain != "oceanic" && $terrain != "marine")>>
<br><<link "A missile silo">>
<<replace "#resultZ">><br><br>
@@ -484,13 +461,9 @@
<</link>>
<</if>>
<</if>>
- <</switch>>
<<if _LaunchBayNO >= _LaunchBayNOMax || _LaunchBayO >= _LaunchBayNOMax>>//<br>$securityForceName has fully upgraded the launch bay to support it's activities.//<</if>>
- <<if ($terrain == "oceanic" || $terrain == "marine")>>
- <<case "Naval Yard">>
- <<switch $NavalYardUpgrades>>
- <<if $securityForceUpgradeToken == 0 && (_NavalYard < _NavalYardMax)>>
+ <<if $securityForceUpgradeToken == 0 && ($terrain == "oceanic" || $terrain == "marine") && (_NavalYard < _NavalYardMax)>>
<br><<link "Naval Yard">>
<<replace "#resultX">>
<span id="resultA">
@@ -498,8 +471,7 @@
<<link "Go back">>
<<goto "SFM Barracks">>
<</link>>
-
- <<case "aircraft carrier">>
+
<<if $securityForceUpgradeToken == 0 && $securityForceAircraftCarrier < 1>>
<br><<link "An aircraft carrier">>
<<replace "#resultA">><br><br>
@@ -519,7 +491,6 @@
<br>//$securityForceName has fully upgraded the aircraft carrier to support it's activities.//
<</if>>
- <<case "submarine">>
<<if $securityForceUpgradeToken == 0 && $securityForceSubmarine < 1>>
<br><<link "A submarine">>
<<replace "#resultA">><br><br>
@@ -542,7 +513,6 @@
<</if>>
<<if $securityForceSubmarine == _SubmarineMax && ($terrain == "oceanic" || $terrain == "marine")>><br>//$securityForceName has fully upgraded the submarine to support it's activities.//<</if>>
- <<case "heavy amphibious transport">>
<<if $securityForceUpgradeToken == 0 && $securityForceHeavyAmphibiousTransport < 1>>
<br><<link "A heavy amphibious transport">>
<<replace "#resultA">><br><br>
@@ -575,10 +545,8 @@
<</replace>>
<</link>>
<</if>>
- <</switch>>
- <<if (_NavalYard >= _NavalYardMax)>><br>$securityForceName has fully upgraded the naval yard to support it's activities.//<</if>>
- <</if>>
+ <<if ($terrain == "oceanic" || $terrain == "marine") && (_NavalYard >= _NavalYardMax)>><br>$securityForceName has fully upgraded the naval yard to support it's activities.//<</if>>
-<</switch>>
</span>
<</if>>
+<</nobr>>
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw
index 1b922ee931764e56a2ea868e5fe1adfab4dacfee..d7bbfda61684608c670042c6b79ae5eb5411bee5 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw
@@ -14,13 +14,11 @@
<<set _StimulantLabMax = 9>>
<<set _Garage = $securityForceVehiclePower+$securityForceHeavyBattleTank>>
-<<set $GarageUpgrades = $securityForceVehiclePower+$securityForceHeavyBattleTank>>
<<set _GarageMax = 10>>
<<set _LightAndMediumVehiclesMax = 7>>
<<set _HeavyBattleTankMax = 3>>
<<set _Hangar = $securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceAC130+$securityForceHeavyTransport>>
-<<set $LaunchBayUpgrades = $securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceAC130+$securityForceHeavyTransport>>
<<set _HangarMax = 33>>
<<set _AircraftMax = 10>>
<<set _SpacePlaneMax = 11>>
@@ -32,7 +30,6 @@
<<set _DroneBayMax = 8>>
<<set _LaunchBayNO = $securityForceSatellitePower+$securityForceGiantRobot+$securityForceMissileSilo>>
-<<set $LaunchBayUpgrades = $securityForceSatellitePower+$securityForceGiantRobot+$securityForceMissileSilo>>
<<set _LaunchBayNOMax = 34>>
<<set _SatelliteMax = 19>>
<<set _GiantRobotMax = 12>>
@@ -52,14 +49,12 @@
<<if $terrain != "oceanic" && $terrain != "marine">>
<<set $SFNO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayNO+_FacilitySupport>>
- <<set $UpgradeOptions = _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 $NavalYardUpgrades = $securityForceAircraftCarrier+$securityForceSubmarine+$securityForceHeavyAmphibiousTransport>>
<<set $SFO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayO+_NavalYard+_FacilitySupport>>
<<set $UpgradeOptions = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayO+_NavalYard+_FacilitySupport>>
<<set _max = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayOMax+_FacilitySupportMax>>