diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index acfbcefe4657f30756398d250aa8eabb8348e7da..de1dcbf655555d43fa389192965cf090aaa10979 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -3,6 +3,9 @@
0.10.7.0/1
12/20/17
+
+ 218
+ -SFanon's tweaks
217
-fixed sex count NaN in saRules-schoolroom
diff --git a/src/SecExp/weaponsManufacturing.tw b/src/SecExp/weaponsManufacturing.tw
index 96d78768ea88bb678d80a62a4a3b269702a29186..fa5cad1f3d63539d7b9fe0b5f9b50c1eea08a92e 100644
--- a/src/SecExp/weaponsManufacturing.tw
+++ b/src/SecExp/weaponsManufacturing.tw
@@ -183,7 +183,7 @@ __Markets__:
<br>
<<set _time = $baseUpgradeTime / $weapProductivity>>
__Upgrades__:
-<br>With our current industrial and research capabilities upgrades will be finished in <<print _time>> weeks.
+<br>With our current industrial and research capabilities upgrades will be finished in <<print Math.ceil(_time)>> weeks.
<br>
<<if $currentUpgrade.time <= 0>>
<br>Security Drones:
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 8d64057ec26fb66fb4f41f82cfe21a6c5f00297b..82ef1854a466cf0c8ab2b6513203a6a4a719b24c 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2548,7 +2548,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
<br>''PregModder'' has modded extensively, including descriptive embellishments for pregnant slaves, various asset descriptions, Master Suite reporting, the Wardrobe, a pack of facility leader interactions, options for Personal Assistant appearances, birthing scenes, fake pregnancy accessories, many other preg mechanics, blind content, expanded chubby belly descriptions, several new surgeries, neon and metallic makeup, better descriptive support for different refreshments, work on choosesOwnJob, many bugfixes, an expansion to the hostage corruption event chain, slave specific player titles, gagging and several basic gags, extended family mode, oversized sex toys, buttplug attachment system, and other, likely forgotten, things.
<br>''Lolimodder'' your loli expertise will be missed.
<br>''pregmodfan'' for tremendous amounts of work with compilers, decompilers, etc. Single-handedly kicked this mod into its new git home. Contributed lots of bugfixes as well as fixed the RA considerably. Also for ppmod, ramod, implmod, cfpmod and psmod (preg speed).
-<br>''FCGudder'' for advanced economy reports, image improvements, cleaning and fixing extended-extended family mode, extending building widgets, anaphrodisiacs, name cleaning, height overhauling, proper slave summary caching, new shelter slaves, some crazy ass shit with vector art, fixing seDeath and likely one to two of these other anon credits.
+<br>''FCGudder'' for advanced economy reports, image improvements, cleaning and fixing extended-extended family mode, extending building widgets, anaphrodisiacs, name cleaning, height overhauling, proper slave summary caching, new shelter slaves, some crazy ass shit with vector art, fixing seDeath, coding jquery in ui support and likely one to two of these other anon credits.
<br>''family mod anon'' for extending extended family mode.
<br>''anon'' for lolimod content, new slave careers, new pubestyles, and general improvements.
<br>''anon'' for considerable bugfixing, most notably that infernal reputation bug.
@@ -2587,6 +2587,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
<br>''anonNeo'' for spellchecking.
<br>''Utopia'' for dirty dealings gang leader focus and updates to it.
<br>''hexall90'' for height growth drugs, incubator organ farm support and detailing, the dispensary cleanup, the joint Eugenics bad end rework, the Hippolyta Academy, and the Security Expansion Mod.
+<br>''sensei'' for coding in support for commas.
<br>''laziestman'' for sexy spats.
<br>''SFanon (blank)'' for SF related work, passive player skill gain and the joint Eugenics bad end rework.
<br>''anon'' for extending FCGudder's economy reports to the other facilities.
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index df379230151ae797b026669dc8340fbcd0d6b76a..ea45ee81736d7071df18666a0ffc726226004e43 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -229,7 +229,7 @@ You should have received a copy of the GNU General Public License along with thi
<</if>>
<<set $organs = []>>
-<<set $ArcadeiIDs = [], $BrothiIDs = [], $CellBiIDs = [], $CliniciIDs = [], $ClubiIDs = [], $DairyiIDs = [], $HGSuiteiIDs = [], $MastSiIDs = [], $SchlRiIDs = [], $ServQiIDs = [], $SpaiIDs = []>>
+<<set $ArcadeiIDs = [], $BrothiIDs = [], $CellBiIDs = [], $CliniciIDs = [], $ClubiIDs = [], $DairyiIDs = [], $HGSuiteiIDs = [], $MastSiIDs = [], $SchlRiIDs = [], $ServQiIDs = [], $SpaiIDs = [], $FacSupIDs = []>>
<<if ndef $saveImported>>
<<set $saveImported = 0>>
@@ -1207,6 +1207,7 @@ FertilityAge($fertilityAge)
<<set $FacilitySupportSlaves = 0>> /* How many slaves are assiting in the facility support? */
<<set $FacilitySupportfficiency = 0>> /* How efficent is the support facility? */
<<set $FacilitySupportUpgrade = 0>> /* How many support facility upgrades has the play brought? */
+<<set $FacilitySupportCapaity = 5>> /* How many slaves can the support facility house? */
/* Colonel */
<<set $securityForceSexedColonelToken = 0>> /* Has the player sexed The colonel this week? */
@@ -1238,6 +1239,27 @@ cyberneticPLimb: 0,
ocularImplant: 0,
erectileImplant: 0
} >>
+
+<<if ndef $AgePricing>>
+ <<set $AgePricing = 1>>
+<</if>>
+<<if ndef $AgeTrainingEffect>>
+ <<set $AgeTrainingEffect = 1>>
+<</if>>
+<<if ndef $AgeTrainingUpperBounds>>
+ <<set $AgeTrainingUpperBounds = 14>>
+<</if>>
+<<if ndef $AgeTrainingLowerBounds>>
+ <<set $AgeTrainingLowerBounds = 12>>
+<</if>>
+<<if ndef $MinEffectedAge>>
+ <<set $MinEffectedAge = 3>>
+<</if>>
+<<if ndef $PastPrimeAge>>
+ <<set $PastPrimeAge = 5000>>
+<</if>>
+
+
<<set $researchLab = {
built: "false",
aiModule: 1,
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
index 9d2a0abea3bf356c75a955cde4de43cb41a19ba2..b1f39ef992bdf0b18c4f0d2862a27712b8d7221b 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
@@ -1,161 +1,156 @@
:: SpecialForceUpgradeDec [nobr]
''Barracks:''
-<br>
/* 13 upgrades */
<<if $securityForceArcologyUpgrades == 0>>
- The barracks 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.
+ 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>>
- The barracks 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.
+ 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>>
- The barracks 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.
+ 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>>
- The barracks has added additional support personnel and equipment, allowing the potential procurement of heavier infantry armour, fighting vehicles, and combat drones.
+ Has added additional support personnel and equipment, allowing the potential procurement of heavier infantry armour, fighting vehicles, and combat drones.
<<elseif $securityForceArcologyUpgrades == 4>>
- The barracks 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.
+ 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>>
- The barracks 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.
+ 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>>
- The barracks 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.
+ 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>>
- The barracks 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.
+ 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>>
- The barracks 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.
+ 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>>
- The barracks 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.
+ 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>>
- The barracks 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.
+ 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>>
- The barracks 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.
+ 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>>
- The barracks 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.
+ 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>>
- The barracks 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.
+ 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>>
- The barracks 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.
+ 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>>
- The barracks 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.
+ 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>>
- The barracks 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.
+ 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>>
<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.
+ The barrack's 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.
<<elseif $securityForcePersonnel < 300>>
- The barracks' large dormitories are lightly occupied, with the $securityForcePersonnel members of $securityForceName starting to spread out across them.
+ The barrack's large dormitories are lightly occupied, with the <<print commaNum($securityForcePersonnel)>> members of $securityForceName starting to spread out across them.
<<elseif $securityForcePersonnel < 500>>
- The barracks' large dormitories are moderately occupied, though the $securityForcePersonnel members of $securityForceName residing within have a considerable amount of extra room.
+ The barrack's large dormitories are moderately occupied, though the <<print commaNum($securityForcePersonnel)>> members of $securityForceName residing within have a considerable amount of extra room.
<<elseif $securityForcePersonnel < 700>>
- The barracks' large dormitories are well-occupied, and the $securityForcePersonnel members of $securityForceName within have started to form small cliques based on section and row.
+ The barrack's large dormitories are well-occupied, and the <<print commaNum($securityForcePersonnel)>> members of $securityForceName within have started to form small cliques based on section and row.
<<elseif $securityForcePersonnel < 1500>>
- The barracks' large dormitories are near capacity, and the $securityForcePersonnel members of $securityForceName often barter their personal loot, whether it be monetary or human, for the choicest bunks.
+ 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>>
-</div>
<<if $FacilitySupport == 1>>
<br><br>
''$facilitysupportName:''
-<br>
-<<if $LieutenantColonel != 0>><<SlaveFullName $LieutenantColonel>> is the Lieutenant Colonel of $securityForceName, primarily in charge of $FacilitySupportName.<</if>> <<if $FacilitySupportSlaves > 0>>There are $FacilitySupportSlaves slaves serving in $FacilitySupportName.<</if>> The <<if $FacilitySupportUpgrade == 3>>quantum teleportation system greatly improves efficiency<<elseif $FacilitySupportUpgrade == 2>>rapid tube system somewhat improves efficiency<<elseif $FacilitySupportUpgrade == 1>>specialized pathways slightly improves efficiency<<else>>general pathways does nothing to improve efficiency<</if>>.
+<<if $LieutenantColonel == 2>><<SlaveFullName $LieutenantColonel>> is the Lieutenant Colonel of $securityForceName, primarily in charge of $FacilitySupportName.<</if>> <<if $FacilitySupportSlaves > 0>>There are $FacilitySupportSlaves slaves serving in $FacilitySupportName.<</if>> The <<if $FacilitySupportUpgrade == 3>>quantum teleportation system greatly improves efficiency<<elseif $FacilitySupportUpgrade == 2>>rapid tube system somewhat improves efficiency<<elseif $FacilitySupportUpgrade == 1>>specialized pathways slightly improves efficiency<<else>>general pathways does nothing to improve efficiency<</if>>.
<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>
''Armory:''
-<br>
/* 11 upgrades */
<<if $securityForceInfantryPower == 0>>
- The armory is well-stocked with high-quality personal weapons and light armour, but contains little in the way of exceptional armament.
+ Is well-stocked with high-quality personal weapons and light armour, but contains little in the way of exceptional armament.
<<elseif $securityForceInfantryPower == 1>>
- The armory has large stocks of the absolute latest personal weapons and light armour, and has added first-generation exo-suits to improve soldier lethality.
+ 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>>
- The armory has acquired advanced tactical helmets and second-generation exo-suits to further improve soldier lethality.
+ Acquired advanced tactical helmets and second-generation exo-suits to further improve soldier lethality.
<<elseif $securityForceInfantryPower == 3>>
- The armory has replaced deployed exo-suits with basic enclosed combat armour suits, and has further begun to deploy early electromagnetic (coilgun) weaponry.
+ Replaced deployed exo-suits with basic enclosed combat armour suits, and has further begun to deploy early electromagnetic (coilgun) weaponry.
<<elseif $securityForceInfantryPower == 4>>
- The armory has begun to equip the soldiers with more advanced combat armour suits, and has expanded its inventory of electromagnetic weaponry.
+ Has begun to equip the soldiers with more advanced combat armour suits, and has expanded its inventory of electromagnetic weaponry.
<<elseif $securityForceInfantryPower == 5>>
- The armory has 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.
+ 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>>
- The armory has 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.
+ 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>>
- The armory has 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.
+ 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>>
- The armory has 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.
+ 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>>
- The armory has 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.
+ 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>>
- The armory has 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.
+ 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>>
- The armory has 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.
+ 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>>
<br><br>
''Stimulant Lab:''
-<br>
/* 7 upgrades */
<<if $securityForceStimulantPower == 0>>
- The stimulant lab is providing the soldiers with standard ephedrine-based stimulants.
+ Is providing the soldiers with standard ephedrine-based stimulants.
<<elseif $securityForceStimulantPower == 1>>
- The stimulant lab has improved the formula of the ephedrine-based stimulants, concentrating them and increasing both their potency, and the effectiveness of the soldiers under their influence.
+ 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>>
- The stimulant lab has replaced the soldiers' stimulants with methamphetamine-based variants, greatly increasing their alertness and aggressiveness when under their influence.
+ Replaced the soldiers' stimulants with methamphetamine-based variants, greatly increasing their alertness and aggressiveness when under their influence.
<<elseif $securityForceStimulantPower == 3>>
- The stimulant lab has 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.
+ 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>>
- The stimulant lab 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.
+ 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>>
- The stimulant lab 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).
+ 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>>
- The stimulant lab 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).
+ 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>>
- The stimulant lab 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).
+ 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>>
- The stimulant lab 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*. * only doctors of $securityForceName for a completely unbiased result.
+ 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>>
- The stimulant lab 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*. * only doctors of $securityForceName for a completely unbiased result.
+ 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>>
<<if _Garage > 0 && $securityForceArcologyUpgrades >= 1>>
<br><br>
''Garage:''
-<br>
/* 7 upgrades */
<<if $securityForceVehiclePower == 0>>
- The garage contains basic, unarmoured vehicles for use by the soldiers, primarily high-end civilian vehicles with jury-rigged crew-served weapons.
+ Contains basic, unarmoured vehicles for use by the soldiers, primarily high-end civilian vehicles with jury-rigged crew-served weapons.
<<elseif $securityForceVehiclePower == 1>>
- The garage has replaced its technical fleet with armed military utility vehicles. It has also sourced customized, high-volume slave transports for better securing human spoils.
+ 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>>
- The garage has added a number of light infantry fighting vehicles to its fleet, and acquired more slave transports to keep up with demand.
+ 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>>
- The garage has acquired improved infantry fighting vehicles, and has also added some mobile artillery and other support vehicles.
+ Acquired improved infantry fighting vehicles, and has also added some mobile artillery and other support vehicles.
<<elseif $securityForceVehiclePower == 4>>
- The garage has acquired some heavier armoured vehicles to augment the infantry fighting vehicles and expanded their inventory of artillery and support vehicles.
+ Acquired some heavier armoured vehicles to augment the infantry fighting vehicles and expanded their inventory of artillery and support vehicles.
<<elseif $securityForceVehiclePower == 5>>
- The garage has 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.
+ 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>>
- The garage has 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.
+ 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>>
- The garage has 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.
+ 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>>
/* 3 upgrades */
-<br>
+<<if $securityForceHeavyBattleTank > 0>>
+<br>''Heavy Battle Tank:''
<<if $securityForceHeavyBattleTank == 1>>
A basic heavy battle tank has been 'borrowed' from the old world.
<<elseif $securityForceHeavyBattleTank == 2>>
- Modernised the heavy battle tank's armor.
+ Modernised the armor.
<<elseif $securityForceHeavyBattleTank == 3>>
- Modernised the heavy battle tank's armor and upgradeded the main gun to a 356 cm barrel.
+ Modernised the armor and upgradeded the main gun to a 356 cm barrel.
+<</if>>
<</if>>
<</if>>
@@ -164,93 +159,94 @@
''Hangar:''
<br>
/* 8 upgrades */
+''Airforce:''
<<if $securityForceAircraftPower == 0>>
- The aerial fleet primarily consists of light transport VTOLs equipped with non-lethal weaponry.
+ Primarily consists of light transport VTOLs equipped with non-lethal weaponry.
<<elseif $securityForceAircraftPower == 1>>
- The aerial fleet's light transport VTOLs have been upgraded with additional fire-power and lethal weaponry.
+ Upgraded light transport VTOLs with additional fire-power and lethal weaponry.
<<elseif $securityForceAircraftPower == 2>>
- The aerial fleet's VTOLs have been upgraded to higher-capacity variants with heavier weaponry.
+ The VTOLs have been upgraded to higher-capacity variants with heavier weaponry.
<<elseif $securityForceAircraftPower == 3>>
- The aerial fleet's medium transport VTOLs have been upgraded with enhanced armour and customized cargo compartments to better transport captured stock.
+ The medium transport VTOLs have been upgraded with enhanced armour and customized cargo compartments to better transport captured stock.
<<elseif $securityForceAircraftPower == 4>>
- The aerial fleet has acquired specialized attack VTOLs to complement and escort its advanced transport fleet, as well as to provide close air support.
+ Acquired specialized attack VTOLs to complement and escort its advanced transport fleet, as well as to provide close air support.
<<elseif $securityForceAircraftPower == 5>>
- The aerial fleet has 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.
+ 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>>
- The aerial fleet has 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.
+ 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>>
- The aerial fleet has 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.
+ 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>>
- The aerial fleet has 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.
+ 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>>
- The aerial fleet has 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.
+ 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>>
- The aerial fleet has 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.
+ 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>>
<<if $securityForceSpacePlanePower > 0>>
- <br>
+<br>''Space Plane:''
/* 11 upgrades */
<<if $securityForceSpacePlanePower == 1>>
A basic two engine SpacePlane has been 'borrowed' from the old world.
<<elseif $securityForceSpacePlanePower == 2>>
- Upgraded the space plane's shielding, reducing both potential heat damage and radar signature.
+ Upgraded the shielding, reducing both potential heat damage and radar signature.
<<elseif $securityForceSpacePlanePower == 3>>
- Upgraded the space plane's shielding, reducing both potential heat damage and radar signature,also mounted another engine on top of the space plane's tail.
+ Upgraded the shielding, reducing both potential heat damage and radar signature,also mounted another engine on top of the tail.
<<elseif $securityForceSpacePlanePower == 4>>
- Upgraded the space plane's shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the space plane's tail and modernized the electronics.
+ 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>>
- Upgraded the space plane's shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the space plane's tail,modernized the electronics in addition to the fuel lines to increase efficiency.
+ 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>>
- Upgraded the space plane's shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the space plane's tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the space plane's engines to allow for more efficient fuel.
+ 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>>
- Upgraded the space plane's shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the space plane's tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the space plane's engines to allow for more efficient fuel.Reduced the space plane's weight and reworked the body to reduce drag.
+ 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>>
- Upgraded the space plane's shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the space plane's tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the space plane's engines to allow for more efficient fuel.Reduced the space plane's weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.
+ 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>>
- Upgraded the space plane's shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the space plane's tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the space plane's engines to allow for more efficient fuel.Reduced the space plane's 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.
+ 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>>
- Upgraded the space plane's shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the space plane's tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the space plane's engines to allow for more efficient fuel.Reduced the space plane's 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.
+ 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>>
- Upgraded the space plane's shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the space plane's tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the space plane's engines to allow for more efficient fuel.Reduced the space plane's 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.
+ 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>>
<</if>>
<<if $securityForceFortressZeppelin > 0>>
- <br>
+<br>''Fortress Zeppelin:''
/* 3 upgrades */
<<if $securityForceFortressZeppelin == 1>>
A basic fortress zeppelin has been 'borrowed' from the old world.
<<elseif $securityForceFortressZeppelin == 2>>
- Modernized the fortress zeppelin's armor.
+ Modernized the armor.
<<elseif $securityForceFortressZeppelin == 3>>
- Modernized the fortress zeppelin's armor and weaponry.
+ Modernized the armor and weaponry.
<</if>>
<</if>>
<<if $securityForceAC130 > 0>>
- <br>
+<br>''AC130:''
/* 5 upgrades */
<<if $securityForceAC130 == 1>>
A basic AC-130 has been 'borrowed' from the old world.
<<elseif $securityForceAC130 == 2>>
- Modernized the AC-130's armor.
+ Modernized the armor.
<<elseif $securityForceAC130 == 3>>
- Modernized the AC-130's armor and weaponry.
+ Modernized the armor and weaponry.
<<elseif $securityForceAC130 == 4>>
- Modernized the AC-130's armor, weaponry and electronics.
+ Modernized the armor, weaponry and electronics.
<<elseif $securityForceAC130 == 5>>
- Modernized the AC-130's armor, weaponry, electronics and crew seating.
+ Modernized the armor, weaponry, electronics and crew seating.
<</if>>
<</if>>
<<if $securityForceHeavyTransport > 0>>
- <br>
+<br>''Heavy Transport:''
/* 3 upgrades */
<<if $securityForceHeavyTransport == 1>>
A basic heavy transport has been 'borrowed' from the old world.
<<elseif $securityForceHeavyTransport == 2>>
- Modernized the heavy transport's armor.
+ Modernized the armor.
<<elseif $securityForceHeavyTransport == 3>>
- Modernized the armor and engines of the heavy transport.
+ Modernized the armor and engines.
<<elseif $securityForceHeavyTransport == 4>>
- Modernized the armor and engines of the heavy transport. Replaced the ballistic gun mounts with electromagnetic ones.
+ Modernized the armor and engines. Replaced the ballistic gun mounts with electromagnetic ones.
<</if>>
<</if>>
<</if>>
@@ -258,26 +254,25 @@
<<if $securityForceArcologyUpgrades >= 2>>
<br><br>
''Drone Bay:''
-<br>
/* 7 upgrades */
<<if $securityForceDronePower == 0>>
- The drone bay contains a small number of 're-purposed' non-military drones from the arcology's original contingent.
+ Contains a small number of 're-purposed' non-military drones from the arcology's original contingent.
<<elseif $securityForceDronePower == 1>>
- The drone bay has replaced the security drones with basic, lightly-armoured military combat models possessing integrated small arms.
+ Replaced the security drones with basic, lightly-armoured military combat models possessing integrated small arms.
<<elseif $securityForceDronePower == 2>>
- The drone bay has replaced its basic military drones with more advanced models and added a number of support drones carrying heavy weaponry to its fleet.
+ 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>>
- The drone bay has acquired even more advanced models of both the standard combat drones and the heavy support drones, and expanded its numbers of both.
+ 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>>
- The drone bay has acted to upgrade both the standard and support models of drones to carry basic electromagnetic weaponry, improving their overall combat effectiveness.
+ 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>>
- The drone bay has 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.
+ 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>>
- The drone bay has 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.
+ 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>>
- The drone bay has 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.
+ 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>>
- The drone bay has 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.
+ 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>>
<</if>>
@@ -285,86 +280,86 @@
<br><br>
''Launch Bay:''
<<if $securityForceSatellitePower > 0>>
- <br>
+<br>''Satellite:''
/* 18 upgrades */
<<if $securityForceSatellitePower == 1>>
- A basic Satellite 'borrowed' from the old world.
+ A basic Satellite has been 'borrowed' from the old world.
<<elseif $securityForceSatellitePower == 2>>
- Modernized the Satellite's electronics.
+ Modernized the electronics.
<<elseif $securityForceSatellitePower == 3>>
- Modernized the Satellite's electronics, wiring and circuitry.
+ Modernized the electronics, wiring and circuitry.
<<elseif $securityForceSatellitePower == 4>>
- Modernized the Satellite's 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.
+ 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>>
- Modernized the Satellite's electronics, wiring and circuitry.An advanced communications jammer is installed in the Satellite, increasing the AO localization, reducing the number of effected equipment.
+ 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>>
- Modernized the Satellite's electronics, wiring and circuitry.Boosted the Satellite's advanced comms jammer power by 25% (now can damage effected equipment).
+ Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer power by 25% (now can damage effected equipment).
<<elseif $securityForceSatellitePower == 7>>
- Modernized the Satellite's electronics, wiring and circuitry.Boosted the Satellite's advanced comms jammer's power by 50% (now can destroy effected equipment).
+ Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment).
<<elseif $securityForceSatellitePower == 8>>
- Modernized the Satellite's electronics, wiring and circuitry.Boosted the Satellite's 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.
+ 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>>
- Modernized the Satellite's electronics, wiring and circuitry.Boosted the Satellite's advanced comms jammer's power by 50% (now can destroy effected equipment).The Satellite is now equipped with an advanced EMP generator, increasing the AO localization which reduces the quantity of effected equipment.
+ 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>>
- Modernized the Satellite's electronics, wiring and circuitry.Boosted the Satellite's advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the Satellite's advanced EMP generator by 25% (now can damage effected equipment).
+ 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>>
- Modernized the Satellite's electronics, wiring and circuitry.Boosted the Satellite's advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the Satellite's advanced EMP generator 50% (now can destroy effected equipment).
+ 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>>
- Modernized the Satellite's electronics, wiring and circuitry.Boosted the Satellite's advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the Satellite's advanced EMP generator 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 Satellite's battery system and shielding.
+ 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>>
- Modernized the Satellite's electronics, wiring and circuitry.Boosted the Satellite's advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the Satellite's advanced EMP generator 50% (now can destroy effected equipment).Provided R&D funds to focus the bean enough to level a suburb.
+ 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>>
- Modernized the Satellite's electronics, wiring and circuitry.Boosted the Satellite's advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the Satellite's advanced EMP generator 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level a box of houses.
+ 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>>
- Modernized the Satellite's electronics, wiring and circuitry.Boosted the Satellite's advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the Satellite's advanced EMP generator 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level a single house.
+ 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>>
- Modernized the Satellite's electronics, wiring and circuitry.Boosted the Satellite's advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the Satellite's advanced EMP generator 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level 366 cm.
+ 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>>
- Modernized the Satellite's electronics, wiring and circuitry.Boosted the Satellite's advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the Satellite's advanced EMP generator 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level 30 cm.
+ 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>>
- Modernized the Satellite's electronics, wiring and circuitry.Boosted the Satellite's advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the Satellite's advanced EMP generator 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level 15 cm.
+ 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>>
- Modernized the Satellite's electronics, wiring and circuitry.Boosted the Satellite's advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the Satellite's advanced EMP generator 50% (now can destroy effected equipment).Provided R&D funds to switch the 15 cm wide beam from lazer to nanites.
+ 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>>
<</if>>
<<if $securityForceGiantRobot > 0>>
- <br>
+<br>''Giant Robot'':
/* 11 upgrades */
<<if $securityForceGiantRobot == 1>>
An old world giant robot has been 'Borrowed'.
<<elseif $securityForceGiantRobot == 2>>
- Upgraded the giant robot's wiring and circuitry.
+ Upgraded the wiring and circuitry.
<<elseif $securityForceGiantRobot == 3>>
- Upgraded the giant robot's wiring, circuitry and power efficiency.
+ Upgraded the wiring, circuitry and power efficiency.
<<elseif $securityForceGiantRobot == 4>>
- Upgraded the giant robot's wiring, circuitry and power efficiency.Reduced the giant robot's weight.
+ Upgraded the wiring, circuitry and power efficiency.Reduced the weight.
<<elseif $securityForceGiantRobot == 5>>
- Upgraded the giant robot's wiring, circuitry, power efficiency and battery capacity.Reduced the giant robot's weight.
+ Upgraded the wiring, circuitry, power efficiency and battery capacity.Reduced the weight.
<<elseif $securityForceGiantRobot == 6>>
- Upgraded the giant robot's wiring, circuitry, power efficiency,battery capacity and armour.Reduced the giant robot's weight.
+ Upgraded the wiring, circuitry, power efficiency,battery capacity and armour.Reduced the weight.
<<elseif $securityForceGiantRobot == 7>>
- Upgraded the giant robot's 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.
+ 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>>
- Upgraded the giant robot's 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.
+ 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>>
- Upgraded the giant robot's 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.
+ 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>>
- Upgraded the giant robot's 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.
+ 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>>
- Upgraded the giant robot's 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.
+ 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>>
- Upgraded the giant robot's 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.
+ 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>>
<</if>>
<<if $securityForceMissileSilo > 0>>
- <br>
+<br>''Missile Silo:''
/* 3 upgrades */
<<if $securityForceMissileSilo == 1>>
A basic missile silo has been 'borrowed' from the old world.
<<elseif $securityForceMissileSilo == 2>>
- Modernized the missile silo's launching electronics.
+ Modernized the launching electronics.
<<elseif $securityForceMissileSilo == 3>>
- Modernized the missile silo's launching electronics, wiring and circuitry.
+ Modernized the launching electronics, wiring and circuitry.
<</if>>
<</if>>
<</if>>
@@ -373,52 +368,52 @@
<br><br>
''Naval Yard:''
<<if $securityForceAircraftCarrier > 0>>
- <br>
+<br>''Aircraft Carrier:''
/* 4 upgrades */
<<if $securityForceAircraftCarrier == 1>>
A basic aircraft carrier has been 'borrowed' from the old world.
<<elseif $securityForceAircraftCarrier == 2>>
- Modernized the aircraft carrier's electronics.
+ Modernized the electronics.
<<elseif $securityForceAircraftCarrier == 3>>
- Modernized the aircraft carrier's electronics and weaponry.
+ Modernized the electronics and weaponry.
<<elseif $securityForceAircraftCarrier == 4>>
- Modernized the aircraft carrier's electronics, weaponry and armour.
+ Modernized the electronics, weaponry and armour.
<<elseif $securityForceAircraftCarrier == 5>>
- Modernized the aircraft carrier's electronics, weaponry and armour. Added an EMP generator.
+ Modernized the electronics, weaponry and armour. Added an EMP generator.
<</if>>
<</if>>
<<if $securityForceSubmarine > 0>>
- <br>
+<br>''Submarine:''
/* 6 upgrades */
<<if $securityForceSubmarine == 1>>
A basic submarine has been 'borrowed' from the old world.
<<elseif $securityForceSubmarine == 2>>
- Modernized the submarine's engines for speed.
+ Modernized the engines for speed.
<<elseif $securityForceSubmarine == 3>>
- Modernized the submarine's engines for speed and silence.
+ Modernized the engines for speed and silence.
<<elseif $securityForceSubmarine == 4>>
- Modernized the submarine's engines for speed and silence.Upgraded the submarine's hull for silence.
+ Modernized the engines for speed and silence.Upgraded the hull for silence.
<<elseif $securityForceSubmarine == 5>>
- Modernized the submarine's engines for speed and silence.Upgraded the submarine's hull for silence and weaponry.
+ Modernized the engines for speed and silence.Upgraded the hull for silence and weaponry.
<<elseif $securityForceSubmarine == 6>>
- Modernized the submarine's engines for speed and silence.Upgraded the submarine's hull for silence, weaponry and air scrubbers, allowing the sub to stay submerged for longer.
+ Modernized the engines for speed and silence.Upgraded the hull for silence, weaponry and air scrubbers, allowing it to stay submerged for longer.
<</if>>
<</if>>
<<if $securityForceHeavyAmphibiousTransport > 0>>
- <br>
+<br>''Heavy Amphibious Transport:''
/* 5 upgrades */
<<if $securityForceHeavyAmphibiousTransport == 1>>
A basic heavy amphibious transport has been 'borrowed' from the old world.
<<elseif $securityForceHeavyAmphibiousTransport == 2>>
- Modernized the heavy amphibious transport's armor.
+ Modernized the armor.
<<elseif $securityForceHeavyAmphibiousTransport == 3>>
- Modernized the heavy amphibious transport's armor and speed.
+ Modernized the armor and speed.
<<elseif $securityForceHeavyAmphibiousTransport == 4>>
- Modernized the heavy amphibious transport's armor and speed. Added miniaturized railguns in all four corners.
+ Modernized the armor and speed. Added miniaturized railguns in all four corners.
<<elseif $securityForceHeavyAmphibiousTransport == 5>>
- Modernized the heavy amphibious transport's armor and speed. Added miniaturized railguns in all four corners and a lazer designator in the midle.
+ Modernized the armor and speed. Added miniaturized railguns in all four corners and a lazer designator in the midle.
<<elseif $securityForceHeavyAmphibiousTransport == 6>>
- Modernized the heavy amphibious transport's armor and speed. Replaced the corner miniaturized railguns with nanite ones while keeping the lazer designator in the midle.
+ Modernized the armor and speed. Replaced the corner miniaturized railguns with nanite ones while keeping the lazer designator in the midle.
<</if>>
<</if>>
<</if>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index ca99e56b504fca6e2f5577f39d1ce45599e270bb..6f88a7d1d496eda98102db49c2fe139e10f3dfc8 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1791,6 +1791,51 @@ Of her $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if>>; $sla
<</widget>>
+<<widget "AgePCEffects">>
+<<switch $PC.actualAge>>
+<<case 3>>
+ <<set $AgeTrainingLowerBounds = 18, $AgeTrainingUpperBounds = 20, $AgePricing = .1, $AgeTrainingEffect = .1>>
+<<case 4>>
+ <<set $AgeTrainingLowerBounds = 17, $AgeTrainingUpperBounds = 19, $AgePricing = .15, $AgeTrainingEffect = .15>>
+<<case 5>>
+ <<set $AgeTrainingLowerBounds = 16, $AgeTrainingUpperBounds = 18, $AgePricing = .35, $AgeTrainingEffect = .35>>
+<<case 6>>
+ <<set $AgeTrainingLowerBounds = 15, $AgeTrainingUpperBounds = 17, $AgePricing = .55, $AgeTrainingEffect = .55>>
+<<case 7>>
+ <<set $AgeTrainingLowerBounds = 14, $AgeTrainingUpperBounds = 16, $AgePricing = .75, $AgeTrainingEffect = .75>>
+<<case 8>>
+ <<set $AgeTrainingLowerBounds = 13, $AgeTrainingUpperBounds = 15, $AgePricing = .85, $AgeTrainingEffect = .85>>
+<<case 9>>
+ <<set $AgeTrainingLowerBounds = 12, $AgeTrainingUpperBounds = 14, $AgePricing = 1.00, $AgeTrainingEffect = 1.00>>
+<<case 10>>
+ <<set $AgeTrainingLowerBounds = 11, $AgeTrainingUpperBounds = 13, $AgePricing = 1.0005, $AgeTrainingEffect = 1.0005>>
+<<case 11>>
+ <<set $AgeTrainingLowerBounds = 10, $AgeTrainingUpperBounds = 12, $AgePricing = 1.01, $AgeTrainingEffect = 1.01>>
+<<case 12>>
+ <<set $AgeTrainingLowerBounds = 9, $AgeTrainingUpperBounds = 11, $AgePricing = 1.02, $AgeTrainingEffect = 1.02>>
+<<case 13>>
+ <<set $AgeTrainingLowerBounds = 8, $AgeTrainingUpperBounds = 10, $AgePricing = 1.03, $AgeTrainingEffect = 1.03>>
+<<case 14>>
+ <<set $AgeTrainingLowerBounds = 7, $AgeTrainingUpperBounds = 9, $AgePricing = 1.04, $AgeTrainingEffect = 1.04>>
+<<case 15>>
+ <<set $AgeTrainingLowerBounds = 6, $AgeTrainingUpperBounds = 8, $AgePricing = 1.05, $AgeTrainingEffect = 1.05>>
+<<case 16>>
+ <<set $AgeTrainingLowerBounds = 5, $AgeTrainingUpperBounds = 7, $AgePricing = 1.06, $AgeTrainingEffect = 1.06>>
+<<case 17>>
+ <<set $AgeTrainingLowerBounds = 4, $AgeTrainingUpperBounds = 6, $AgePricing = 1.07, $AgeTrainingEffect = 1.07>>
+<<case 18>>
+ <<set $AgeTrainingLowerBounds = 3, $AgeTrainingUpperBounds = 5, $AgePricing = 1.08, $AgeTrainingEffect = 1.08>>
+
+/* <<case 19>> */
+/* <<set $AgeTrainingLowerBounds = 2, $AgeTrainingUpperBounds = 4, $AgePricing = 1.09, $AgeTrainingEffect = 1.09>> */
+/* <<case 20>> */
+/* <<set $AgeTrainingLowerBounds = 1, $AgeTrainingUpperBounds = 3, $AgePricing = 1.10, $AgeTrainingEffect = 1.10 >> */
+/* <<default>> */
+/* <<set $AgeTrainingLowerBounds = 0, $AgeTrainingUpperBounds = 0, $AgePricing = 0, $AgeTrainingEffect = .95>> */
+
+<</switch>>
+<</widget>>
+
<<widget "HeroSlavesCleanup">>
<<run $heroSlaves.forEach(function(s) {
const validRaces = [
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 69d9f14402f8dbbe648f963031f451b4388f0120..3891646023631fe30b5d1ae0cdea14baedbd7002 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2870,6 +2870,13 @@ Setting missing slave variables:
<<if ndef _Slave.origSkin>><<set _Slave.origSkin = _Slave.skin>><</if>>
<</for>>
+<<set $AgePricing = 1>>
+<<set $AgeTrainingEffect = 1>>
+<<set $AgeTrainingUpperBounds = 14>>
+<<set $AgeTrainingLowerBounds = 12>>
+<<set $MinEffectedAge = 3>>
+<<set $PastPrimeAge = 5000>>
+
<<HeroSlavesCleanup>>
Done!
diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw
index cc830b7e288bc98aea6d3b31d055cea8801feb01..887529306ca2c8ace6a1bbe1df7759171de7e739 100644
--- a/src/uncategorized/corporationDevelopments.tw
+++ b/src/uncategorized/corporationDevelopments.tw
@@ -132,17 +132,23 @@ Shares in your corporation are trading at <<print cashFormat($sharePrice)>>:
You hold <<print commaNum($personalShares)>> shares personally while <<print commaNum($publicShares)>> are publicly held.
<span id="CorpAction">
-<br>Purchase shares from corporation:
+
+<br><br>
<<if $cash > 1000*$sharePrice>>
-<<link "1000">><<set $personalShares += 1000>><<set $cash -= 1000*$sharePrice>><<set $corpCash += 1000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 1000 shares from the corporation, driving the share price up slightly.">><</replace>><</link>><</if>>
-<<if $cash > 5000*$sharePrice>>
-<<link "5000">><<set $personalShares += 5000>><<set $cash -= 5000*$sharePrice>><<set $corpCash += 5000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 5000 shares from the corporation, driving the share price up slightly.">><</replace>><</link>><</if>>
-<<if $cash > 10000*$sharePrice>>
-<<link "10000">><<set $personalShares += 10000>><<set $cash -= 10000*$sharePrice>><<set $corpCash += 10000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 10000 shares from the corporation, driving the share price up slightly.">><</replace>><</link>><</if>>
-<<if $cash > 15000*$sharePrice>>
-<<link "15000">><<set $personalShares += 15000>><<set $cash -= 15000*$sharePrice>><<set $corpCash += 15000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 15000 shares from the corporation, driving the share price up slightly.">><</replace>><</link>><</if>>
-<<if $cash > 20000*$sharePrice>>
-<<link "20000">><<set $personalShares += 20000>><<set $cash -= 20000*$sharePrice>><<set $corpCash += 20000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 20000 shares from the corporation, driving the share price up massively.">><</replace>><</link>><</if>>
+<br>Purchase shares from corporation:
+ <<if $cash > 1000*$sharePrice>>
+ <<link "1000">><<set $personalShares += 1000>><<set $cash -= 1000*$sharePrice>><<set $corpCash += 1000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 1000 shares from the corporation, driving the share price up slightly.">><</replace>><</link>><</if>>
+ <<if $cash > 5000*$sharePrice>>
+ <<link "5000">><<set $personalShares += 5000>><<set $cash -= 5000*$sharePrice>><<set $corpCash += 5000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 5000 shares from the corporation, driving the share price up slightly.">><</replace>><</link>><</if>>
+ <<if $cash > 10000*$sharePrice>>
+ <<link "10000">><<set $personalShares += 10000>><<set $cash -= 10000*$sharePrice>><<set $corpCash += 10000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 10000 shares from the corporation, driving the share price up slightly.">><</replace>><</link>><</if>>
+ <<if $cash > 15000*$sharePrice>>
+ <<link "15000">><<set $personalShares += 15000>><<set $cash -= 15000*$sharePrice>><<set $corpCash += 15000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 15000 shares from the corporation, driving the share price up slightly.">><</replace>><</link>><</if>>
+ <<if $cash > 20000*$sharePrice>>
+ <<link "20000">><<set $personalShares += 20000>><<set $cash -= 20000*$sharePrice>><<set $corpCash += 20000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 20000 shares from the corporation, driving the share price up massively.">><</replace>><</link>><</if>>
+<<else>>
+You are unable to purchase 1000 shares at the current share price.
+<</if>>
<br>Issue new shares:
<<if $personalShares-1000 > $publicShares>>
@@ -172,19 +178,24 @@ You hold <<print commaNum($personalShares)>> shares personally while <<print com
<<if $personalShares-20000 > $publicShares>>
<<link "20000">><<set $personalShares -= 20000>><<set $publicShares += 20000>><<set $cash += 10000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "You sold 20000 shares, driving the share price down massively.">><</replace>><</link>><</if>>
-<br>Buy publicly held shares:
-<<if _PublicOwnershipPercentage <= 5>>//You cannot make the corporation privately held.//<</if>>
-<<if _PublicOwnershipPercentage < 49 && $publicShares > 1000 && $cash >= 1000*$sharePrice>>
- <<link "1000">><<set $personalShares += 1000>><<set $publicShares -= 1000>><<set $cash -= 1000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 1000 shares, driving the share price up slightly.">><</replace>><</link>><</if>>
-<<if $publicShares >= 5000 && $cash >= 5000*$sharePrice>>
- <<link "5000">><<set $personalShares += 5000>><<set $publicShares -= 5000>><<set $cash -= 5000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 5000 shares, driving the share price up slightly.">><</replace>><</link>><</if>>
-<<if $publicShares >= 10000 && $cash >= 10000*$sharePrice>>
- <<link "10000">><<set $personalShares += 10000>><<set $publicShares -= 10000>><<set $cash -= 10000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 10000 shares, driving the share price up slightly.">><</replace>><</link>><</if>>
-<<if $publicShares >= 15000 && $cash >= 15000*$sharePrice>>
- <<link "15000">><<set $personalShares += 15000>><<set $publicShares -= 15000>><<set $cash -= 15000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 15000 shares, driving the share price up slightly.">><</replace>><</link>><</if>>
-<<if $publicShares >= 20000 && $cash >= 20000*$sharePrice>>
- <<link "20000">><<set $personalShares += 20000>><<set $publicShares -= 20000>><<set $cash -= 20000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 20000 shares, driving the share price up massively.">><</replace>><</link>><</if>>
+<<if $cash > 1000*$sharePrice>>
+ <br>Buy publicly held shares:
+ <<if _PublicOwnershipPercentage <= 5>>//You cannot make the corporation privately held.//<</if>>
+ <<if _PublicOwnershipPercentage < 49 && $publicShares > 1000 && $cash >= 1000*$sharePrice>>
+ <<link "1000">><<set $personalShares += 1000>><<set $publicShares -= 1000>><<set $cash -= 1000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 1000 shares, driving the share price up slightly.">><</replace>><</link>><</if>>
+ <<if $publicShares >= 5000 && $cash >= 5000*$sharePrice>>
+ <<link "5000">><<set $personalShares += 5000>><<set $publicShares -= 5000>><<set $cash -= 5000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 5000 shares, driving the share price up slightly.">><</replace>><</link>><</if>>
+ <<if $publicShares >= 10000 && $cash >= 10000*$sharePrice>>
+ <<link "10000">><<set $personalShares += 10000>><<set $publicShares -= 10000>><<set $cash -= 10000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 10000 shares, driving the share price up slightly.">><</replace>><</link>><</if>>
+ <<if $publicShares >= 15000 && $cash >= 15000*$sharePrice>>
+ <<link "15000">><<set $personalShares += 15000>><<set $publicShares -= 15000>><<set $cash -= 15000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 15000 shares, driving the share price up slightly.">><</replace>><</link>><</if>>
+ <<if $publicShares >= 20000 && $cash >= 20000*$sharePrice>>
+ <<link "20000">><<set $personalShares += 20000>><<set $publicShares -= 20000>><<set $cash -= 20000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 20000 shares, driving the share price up massively.">><</replace>><</link>><</if>>
+<<else>>
+You are unable to purchase 1000 shares at the current share price.
+<</if>>
</span>
+<br><br>
<br>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 10123123580ad11d10522c11f34efafc9687750f..7255b017249d77a0a77cf4ba441469f27c8bc3e8 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -18,6 +18,7 @@
<<set $PC.birthWeek = 0>>
<<if $playerAging == 2>>
<<set $PC.physicalAge++, $PC.actualAge++, $PC.visualAge++, $PC.ovaryAge++>>
+ <<AgePCEffects>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw
index a85b5297dfb233097895ab6941e5e876232a68a6..e42f4a8027043f4a3a57a6b3586cb9d001580b76 100644
--- a/src/uncategorized/securityForceEOWReport.tw
+++ b/src/uncategorized/securityForceEOWReport.tw
@@ -288,7 +288,7 @@
<</if>>
LieutenantColonel and Facility Support
- <<if $LieutenantColonel == 1>>
+ <<if $LieutenantColonel == 2>>
<<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($LieutenantColonel*_RaidingEfficienyPercentage)))>>
<</if>>
<<if $FacilitySupportEfficiency > 1>>
@@ -397,8 +397,8 @@
<<if $OverallTradeShowAttendance == 1>>
<br>Thank you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>> for letting me to go back to it, hopefully Lieutenant Colonel <<SlaveFullName $LieutenantColonel>> has been doing her job. There was some interest in our developements, I could probably sell generic scematics next time I go if you want?
<<elseif $OverallTradeShowAttendance >= 2>>
- While at the recent TradeShow, $TradeShowIncome was made selling generic scematics and $TradeShowHelots menial slaves were sent as a bonus.
- Overal $TotalTradeShowIncome has been made and $TotalTradeShowHelots menial slaves have been acquired during the $OverallTradeShowAttendance TradeShow's I have attended.
+ While at the recent TradeShow, <<print cashFormat($TradeShowIncome)>> was made selling generic scematics and $TradeShowHelots menial slaves were sent as a bonus.
+ Overal <<print cashFormat($TotalTradeShowIncome)>> has been made and $TotalTradeShowHelots menial slaves have been acquired during the $OverallTradeShowAttendance TradeShow's I have attended.
<</if>>
//Current facilities status://
<<include "SpecialForceUpgradeDec">>