From 0c06babb6081096bf2118bd53cfc43f2a276c5f3 Mon Sep 17 00:00:00 2001
From: j <okp57855@psoxs.com>
Date: Sun, 24 Dec 2017 12:32:45 +1300
Subject: [PATCH] Rollback and new fix.
---
src/events/intro/initNationalities.tw | 10 +
src/events/intro/introSummary.tw | 2 +-
src/init/storyInit.tw | 7 +-
.../SecForceEX/SpecialForceUpgradeDec.tw | 371 +++++++++---------
src/pregmod/widgets/pregmodWidgets.tw | 12 +-
src/uncategorized/BackwardsCompatibility.tw | 4 +-
src/uncategorized/corporationDevelopments.tw | 45 +--
src/uncategorized/costs.tw | 16 +-
src/uncategorized/costsReport.tw | 15 +-
src/uncategorized/manageArcology.tw | 16 +-
src/uncategorized/nonRandomEvent.tw | 2 +-
src/uncategorized/options.tw | 6 -
12 files changed, 255 insertions(+), 251 deletions(-)
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index f4e09e17504..594304f73c7 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -52,6 +52,16 @@
<<set $rep += 4000>>
<</if>>
+<<if $PC.visualAge >= 50>>
+ <<set $rep += 2000>>
+<<elseif $PC.visualAge < 35>>
+ <<if $rep >= 2000>>
+ <<set $rep -= 2000>>
+ <<else>>
+ <<set $rep = 0>>
+ <</if>>
+<</if>>
+
/* SET HEROES */
<<set $heroSlaves = []>>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 2d7f063e271..161eca5b734 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -929,11 +929,11 @@ Image display
<<set $PC.engineering = -100>>
<<set $PC.medicine = 0>>
<</if>>
+ <</if>>
<<set $girls = 2>>
<<if $secExp == 1>>
<<set $wasToggledBefore = 1>>
<</if>>
- <</if>>
<<goto "init Nationalities">>
<</link>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 3eb0591b832..427902ccd84 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1203,11 +1203,11 @@ FertilityAge($fertilityAge)
<<set $securityForceMissionEfficiency = 1>> /* How efficient is the SF at completing its assigned task? (Upgrades*Drug Multiplier) */
/* FacilitySupport */
-<<set $Lieutenantcolonel = 1>> /* Has a slave been selected to be a Lieutenant colonel? */
+<<set $Lieutenantcolonel = 0>> /* Has a slave been selected to be a Lieutenant colonel? */
<<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? */
+<<set $FacilitySupportCapacity = 5>> /* How many slaves can the support facility house? */
/* Colonel */
<<set $securityForceSexedColonelToken = 0>> /* Has the player sexed The colonel this week? */
@@ -1259,9 +1259,6 @@ erectileImplant: 0
<<set $PastPrimeAge = 5000>>
<</if>>
-<<if ndef $FormattedWithCommas>>
- <<set $FormattedWithCommas = 0>>
-<</if>>
<<set $researchLab = {
built: "false",
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
index b1f39ef992b..4a38fe5025a 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
@@ -1,46 +1,46 @@
:: SpecialForceUpgradeDec [nobr]
''Barracks:''
-/* 13 upgrades */
-<<if $securityForceArcologyUpgrades == 0>>
+<<switch $securityForceArcologyUpgrades>>
+<<case 0>>
Is currently quite basic, consisting of little more than a dormitory, armoury, a processing facility for human spoils, and a common area, sectioned off by stacks of empty supply crates. The cavernous space, however, is ripe for expansion.
-<<elseif $securityForceArcologyUpgrades == 1>>
+<<case 1>>
Has become more permanent, expanding into free space, erecting permanent dividers, and sectioning off an area for use as a garage and vehicle maintenance bay.
-<<elseif $securityForceArcologyUpgrades == 2>>
+<<case 2>>
Has added a facility for the storage, maintenance, and deployment of armed combat drones, and added storage facilities for the soldiers to store their personal spoils in.
-<<elseif $securityForceArcologyUpgrades == 3>>
+<<case 3>>
Has added additional support personnel and equipment, allowing the potential procurement of heavier infantry armour, fighting vehicles, and combat drones.
-<<elseif $securityForceArcologyUpgrades == 4>>
+<<case 4>>
Has expanded tremendously, adding an aerial control facility and express elevator connecting to a ring of launch pads and hangars built around the arcology's upper levels. Additional facilities have been added for soldier recreation, and Spartan quarters for live-in slaves, both menial and service, have been installed.
-<<elseif $securityForceArcologyUpgrades == 5>>
+<<case 5>>
Has (mostly) taken on the appearance of a professional military installation, with clearly delineated soldier and logistical areas, dedicated support and recreation facilities, in addition to advanced command and control apparatus. As a final measure, heavy, long range, electromagnetic railgun artillery pieces have been installed in casemates along the aerial launch pads, giving $securityForceName an immense superiority in local firepower.
-<<elseif $securityForceArcologyUpgrades == 6>>
+<<case 6>>
Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As a final measure, quad heavy, long range, electromagnetic railgun artillery pieces have been installed in casemates along the aerial launch pads, giving $securityForceName an immense superiority in local firepower.
-<<elseif $securityForceArcologyUpgrades == 7>>
+<<case 7>>
Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As a final measure, quad heavy, long range, electromagnetic railgun artillery pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads, giving $securityForceName an immense superiority in local firepower.
-<<elseif $securityForceArcologyUpgrades == 8>>
+<<case 8>>
Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, electromagnetic railgun artillery pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
-<<elseif $securityForceArcologyUpgrades == 9>>
+<<case 9>>
Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, electromagnetic railgun artillery 356 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
-<<elseif $securityForceArcologyUpgrades == 10>>
+<<case 10>>
Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
-<<elseif $securityForceArcologyUpgrades == 11>>
+<<case 11>>
Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, dual barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
-<<elseif $securityForceArcologyUpgrades == 12>>
+<<case 12>>
Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
-<<elseif $securityForceArcologyUpgrades == 13>>
+<<case 13>>
Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
<br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network.
-<<elseif $securityForceArcologyUpgrades == 14>>
+<<case 14>>
Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
<br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network.<br>'Borowed' old world designs for a kill house.
-<<elseif $securityForceArcologyUpgrades == 15>>
+<<case 15>>
Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
<br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network.<br>Added electronics to the kill house.
-<<elseif $securityForceArcologyUpgrades == 16>>
+<<case 16>>
Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
<br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network.<br>Added VR support to the kill house.
-<</if>>
+<</switch>>
<br><br>
@@ -56,6 +56,7 @@
The barrack's large dormitories are near capacity, and the <<print commaNum($securityForcePersonnel)>> members of $securityForceName often barter their personal loot, whether it be monetary or human, for the choicest bunks.
<</if>>
+/*
<<if $FacilitySupport == 1>>
<br><br>
''$facilitysupportName:''
@@ -64,93 +65,101 @@
<<goto "FacilitySupport">>
<</link>>
<</if>>
+*/
<br><br>
''Armory:''
-/* 11 upgrades */
-<<if $securityForceInfantryPower == 0>>
+<<switch $securityForceInfantryPower>>
+<<case 0>>
Is well-stocked with high-quality personal weapons and light armour, but contains little in the way of exceptional armament.
-<<elseif $securityForceInfantryPower == 1>>
+<<case 1>>
Has large stocks of the absolute latest personal weapons and light armour, and Has added first-generation exo-suits to improve soldier lethality.
-<<elseif $securityForceInfantryPower == 2>>
+<<case 2>>
Acquired advanced tactical helmets and second-generation exo-suits to further improve soldier lethality.
-<<elseif $securityForceInfantryPower == 3>>
+<<case 3>>
Replaced deployed exo-suits with basic enclosed combat armour suits, and has further begun to deploy early electromagnetic (coilgun) weaponry.
-<<elseif $securityForceInfantryPower == 4>>
+<<case 4>>
Has begun to equip the soldiers with more advanced combat armour suits, and has expanded its inventory of electromagnetic weaponry.
-<<elseif $securityForceInfantryPower == 5>>
+<<case 5>>
Acquired heavy weapon attachments for its combat armour suits, and has further sourced small advanced electromagnetic weaponry (miniaturized railguns) for the soldiers, ensuring that the infantry of $securityForceName is perhaps the most well-equipped in the world.
-<<elseif $securityForceInfantryPower == 6>>
+<<case 6>>
Acquired heavy weapon attachments for its combat armour suits, and has further sourced both small and medium advanced electromagnetic weaponry (miniaturized railguns) for the soldiers, ensuring that the infantry of $securityForceName is perhaps the most well-equipped in the world.
-<<elseif $securityForceInfantryPower == 7>>
+<<case 7>>
Acquired heavy weapon attachments for its combat armour suits, and has further sourced small/medium and large advanced electromagnetic weaponry (miniaturized railguns) for the soldiers, ensuring that the infantry of $securityForceName is perhaps the most well-equipped in the world.
-<<elseif $securityForceInfantryPower == 8>>
+<<case 8>>
Acquired heavy weapon attachments for its combat armour suits with basic thrusters, and has further sourced both small/medium and large advanced electromagnetic weaponry (miniaturized railguns) for the soldiers, ensuring that the infantry of $securityForceName is perhaps the most well-equipped in the world.
-<<elseif $securityForceInfantryPower == 9>>
+<<case 9>>
Acquired heavy weapon attachments for its combat armour suits with advanced thrusters, and has further sourced both small/medium and large advanced electromagnetic weaponry (miniaturized railguns) for the soldiers, ensuring that the infantry of $securityForceName is perhaps the most well-equipped in the world.
-<<elseif $securityForceInfantryPower == 10>>
+<<case 10>>
Acquired heavy weapon attachments for its combat armour suits with advanced thrusters,basic optical illusion kits, and has further sourced small/medium and large advanced electromagnetic weaponry (miniaturized railguns) for the soldiers, ensuring that the infantry of $securityForceName is perhaps the most well-equipped in the world.
-<<elseif $securityForceInfantryPower == 11>>
+<<case 11>>
Acquired heavy weapon attachments for its combat armour suits with advanced thrusters,advanced optical illusion kits, and has further sourced small/medium and large advanced electromagnetic weaponry (miniaturized railguns) for the soldiers, ensuring that the infantry of $securityForceName is perhaps the most well-equipped in the world.
-<</if>>
+<<case 12>>
+ Acquired heavy weapon attachments for its combat armour suits with advanced thrusters,advanced optical illusion kits, and has further sourced small/medium and large advanced nanite rather than electromagnetic weaponry (miniaturized nanite rifes) for the soldiers, ensuring that the infantry of $securityForceName is perhaps the most well-equipped in the world.
+<</switch>>
<br><br>
''Stimulant Lab:''
-/* 7 upgrades */
-<<if $securityForceStimulantPower == 0>>
+<<switch $securityForceStimulantPower>>
+<<case 0>>
Is providing the soldiers with standard ephedrine-based stimulants.
-<<elseif $securityForceStimulantPower == 1>>
+<<case 1>>
Improved the formula of the ephedrine-based stimulants, concentrating them and increasing both their potency, and the effectiveness of the soldiers under their influence.
-<<elseif $securityForceStimulantPower == 2>>
+<<case 2>>
Replaced the soldiers' stimulants with methamphetamine-based variants, greatly increasing their alertness and aggressiveness when under their influence.
-<<elseif $securityForceStimulantPower == 3>>
+<<case 3>>
Improved and concentrated the methamphetamine-based stimulants, and has also begun providing soldiers with phenylcyclidine-based dissociatives, allowing the soldiers to excuse their actions in the field and reducing any reluctance to follow severe orders.
-<<elseif $securityForceStimulantPower == 4>>
+<<case 4>>
Has further refined the formulas of the methamphetamine-based stimulants and phenylcyclidine-based dissociatives, and has also begun providing tryptamine-based psychedelics to the soldiers, allowing them to avoid traumatic stress in the field.
-<<elseif $securityForceStimulantPower == 5>>
+<<case 5>>
Has maximally refined the formulas of the methamphetamine-based stimulants, phenylcyclidine-based dissociatives, and tryptamine-based psychedelics, increasing their effectiveness in all aspects and ensuring that the soldiers of $securityForceName go into combat wired, aggressive, and euphoric (if needed).
-<<elseif $securityForceStimulantPower == 6>>
+<<case 6>>
Has slightly refined the formulas of higher purity methamphetamine-based stimulants, phenylcyclidine-based dissociatives, and tryptamine-based psychedelics, increasing their effectiveness in all aspects and ensuring that the soldiers of $securityForceName go into combat wired, aggressive, and euphoric (if needed).
-<<elseif $securityForceStimulantPower == 7>>
+<<case 7>>
Has maximally refined the formulas of higher purity methamphetamine-based stimulants, phenylcyclidine-based dissociatives, and tryptamine-based psychedelics, increasing their effectiveness in all aspects and ensuring that the soldiers of $securityForceName go into combat wired, aggressive, and euphoric (if needed).
-<<elseif $securityForceStimulantPower == 8>>
+<<case 8>>
Has mixed the higher purity methamphetamine-based stimulants, phenylcyclidine-based dissociatives, and tryptamine-based psychedelics into a single dose further increasing their effectiveness in all aspects and ensuring that the soldiers of $securityForceName go into combat wired, aggressive, and euphoric (if needed). However side effects may include (no particular order): Dissociative Identity Disorder , severe clincal depresssion, unstopabble vomitting, extreme paranoia, PTSD, finally total organ failfure. Recommended by 9/10 doctors*. <br>* Only the doctors of $securityForceName were consulted to ensure a completely unbiased result.
-<<elseif $securityForceStimulantPower == 9>>
+<<case 9>>
Has mixed the higher purity methamphetamine-based stimulants, phenylcyclidine-based dissociatives, and tryptamine-based psychedelics into a single dose further increasing their effectiveness in all aspects and ensuring that the soldiers of $securityForceName go into combat wired, aggressive, and euphoric (if needed). Potentinal side effects have been reduced slightly to "only mildly" severe ones: Dissociative Identity Disorder , severe clincal depresssion, unstopabble vomitting, extreme paranoia and PTSD. Now recommended by 15/10 doctors*. <br>* Only the doctors of $securityForceName were consulted to ensure a completely unbiased result.
-<</if>>
+<<case 10>>
+ Has increased the single dose strength of the mixture of higher purity methamphetamine-based stimulants, phenylcyclidine-based dissociatives, and tryptamine-based psychedelics which further increases their effectiveness in all aspects and ensuring that the soldiers of $securityForceName go into combat wired, aggressive, and euphoric (if needed) at the cost of lengthing the effects.
+ <br>Potentinal side effects have been reduced slightly to "only mildly" severe ones: Dissociative Identity Disorder , severe clincal depresssion, unstopabble vomitting, extreme paranoia and PTSD. Now recommended by 15/10 doctors*. <br>* Only the doctors of $securityForceName were consulted to ensure a completely unbiased result.
+<</switch>>
<<if _Garage > 0 && $securityForceArcologyUpgrades >= 1>>
<br><br>
''Garage:''
-/* 7 upgrades */
-<<if $securityForceVehiclePower == 0>>
+<<switch $securityForceVehiclePower>>
+<<case 0>>
Contains basic, unarmoured vehicles for use by the soldiers, primarily high-end civilian vehicles with jury-rigged crew-served weapons.
-<<elseif $securityForceVehiclePower == 1>>
+<<case 1>>
Replaced its technical fleet with armed military utility vehicles. It has also sourced customized, high-volume slave transports for better securing human spoils.
-<<elseif $securityForceVehiclePower == 2>>
+<<case 2>>
Has added a number of light infantry fighting vehicles to its fleet, and acquired more slave transports to keep up with demand.
-<<elseif $securityForceVehiclePower == 3>>
+<<case 3>>
Acquired improved infantry fighting vehicles, and has also added some mobile artillery and other support vehicles.
-<<elseif $securityForceVehiclePower == 4>>
+<<case 4>>
Acquired some heavier armoured vehicles to augment the infantry fighting vehicles and expanded their inventory of artillery and support vehicles.
-<<elseif $securityForceVehiclePower == 5>>
+<<case 5>>
Replaced both its armoured and support vehicles with the most advanced variants possible, making the mobile unit of $securityForceName far superior to anything in the arcology's immediate area.
-<<elseif $securityForceVehiclePower == 6>>
+<<case 6>>
Replaced both its armoured and support vehicles with the most advanced light variants possible, making the mobile unit of $securityForceName far superior to anything in the arcology's immediate area.
-<<elseif $securityForceVehiclePower == 7>>
+<<case 7>>
Replaced both its armoured and support vehicles with the most advanced light and medium variants possible, making the mobile unit of $securityForceName far superior to anything in the arcology's immediate area.
-<</if>>
+<<case 8>>
+ Replaced both its armoured and support vehicles with the most advanced light, medium and heavy variants possible, making the mobile unit of $securityForceName far superior to anything in the arcology's immediate area.
+<</switch>>
-/* 3 upgrades */
<<if $securityForceHeavyBattleTank > 0>>
<br>''Heavy Battle Tank:''
-<<if $securityForceHeavyBattleTank == 1>>
+<<switch $securityForceHeavyBattleTank>>
+<<case 1>>
A basic heavy battle tank has been 'borrowed' from the old world.
-<<elseif $securityForceHeavyBattleTank == 2>>
+<<case 2>>
Modernised the armor.
-<<elseif $securityForceHeavyBattleTank == 3>>
+<<case 3>>
Modernised the armor and upgradeded the main gun to a 356 cm barrel.
-<</if>>
+<</switch>>
<</if>>
<</if>>
@@ -158,122 +167,124 @@
<br><br>
''Hangar:''
<br>
-/* 8 upgrades */
''Airforce:''
-<<if $securityForceAircraftPower == 0>>
+<<switch $securityForceAircraftPower>>
+<<case 0>>
Primarily consists of light transport VTOLs equipped with non-lethal weaponry.
-<<elseif $securityForceAircraftPower == 1>>
+<<case 1>>
Upgraded light transport VTOLs with additional fire-power and lethal weaponry.
-<<elseif $securityForceAircraftPower == 2>>
+<<case 2>>
The VTOLs have been upgraded to higher-capacity variants with heavier weaponry.
-<<elseif $securityForceAircraftPower == 3>>
+<<case 3>>
The medium transport VTOLs have been upgraded with enhanced armour and customized cargo compartments to better transport captured stock.
-<<elseif $securityForceAircraftPower == 4>>
+<<case 4>>
Acquired specialized attack VTOLs to complement and escort its advanced transport fleet, as well as to provide close air support.
-<<elseif $securityForceAircraftPower == 5>>
+<<case 5>>
Upgraded its attack VTOLs for enhanced lethality, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area.
-<<elseif $securityForceAircraftPower == 6>>
+<<case 6>>
Upgraded its attack VTOLs for enhanced lethality/speed, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area.
-<<elseif $securityForceAircraftPower == 7>>
+<<case 7>>
Upgraded its attack VTOLs for enhanced lethality/speed/armour, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area.
-<<elseif $securityForceAircraftPower == 8>>
+<<case 8>>
Upgraded its attack VTOLs for enhanced lethality/speed/armour, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area.<br>Also It now possesses a basic old world bomber.
-<<elseif $securityForceAircraftPower == 9>>
+<<case 9>>
Upgraded its attack VTOLs for enhanced lethality/speed/armour, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area.<br>Improved the bomber's engines.
-<<elseif $securityForceAircraftPower == 10>>
+<<case 10>>
Upgraded its attack VTOLs for enhanced lethality/speed/armour, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area.<br>Improved the bomber's engines and armour.
-<</if>>
+<</switch>>
<<if $securityForceSpacePlanePower > 0>>
<br>''Space Plane:''
- /* 11 upgrades */
- <<if $securityForceSpacePlanePower == 1>>
+<<switch $securityForceSpacePlanePower>>
+ <<case 1>>
A basic two engine SpacePlane has been 'borrowed' from the old world.
- <<elseif $securityForceSpacePlanePower == 2>>
+ <<case 2>>
Upgraded the shielding, reducing both potential heat damage and radar signature.
- <<elseif $securityForceSpacePlanePower == 3>>
+ <<case 3>>
Upgraded the shielding, reducing both potential heat damage and radar signature,also mounted another engine on top of the tail.
- <<elseif $securityForceSpacePlanePower == 4>>
+ <<case 4>>
Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail and modernized the electronics.
- <<elseif $securityForceSpacePlanePower == 5>>
+ <<case 5>>
Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail,modernized the electronics in addition to the fuel lines to increase efficiency.
- <<elseif $securityForceSpacePlanePower == 6>>
+ <<case 6>>
Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.
- <<elseif $securityForceSpacePlanePower == 7>>
+ <<case 7>>
Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.
- <<elseif $securityForceSpacePlanePower == 8>>
+ <<case 8>>
Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.
- <<elseif $securityForceSpacePlanePower == 9>>
+ <<case 9>>
Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making $securityForceName Space Plane untouchable.
- <<elseif $securityForceSpacePlanePower == 10>>
+ <<case 10>>
Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making $securityForceName Space Plane untouchable.Replaced the skin of $securityForceName Space Plane with a basic optical illusion kit.
- <<elseif $securityForceSpacePlanePower == 11>>
+ <<case 11>>
Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making $securityForceName Space Plane untouchable.Replaced the skin of $securityForceName Space Plane with an advanced optical illusion kit.
- <</if>>
+<</switch>>
<</if>>
<<if $securityForceFortressZeppelin > 0>>
<br>''Fortress Zeppelin:''
- /* 3 upgrades */
- <<if $securityForceFortressZeppelin == 1>>
+<<switch $securityForceFortressZeppelin>>
+ <<case 1>>
A basic fortress zeppelin has been 'borrowed' from the old world.
- <<elseif $securityForceFortressZeppelin == 2>>
+ <<case 2>>
Modernized the armor.
- <<elseif $securityForceFortressZeppelin == 3>>
+ <<case 3>>
Modernized the armor and weaponry.
- <</if>>
+ <<case 4>>
+ Modernized the armor and weaponry. Improved the speaker system.
+<</switch>>
<</if>>
<<if $securityForceAC130 > 0>>
<br>''AC130:''
- /* 5 upgrades */
- <<if $securityForceAC130 == 1>>
+<<switch $securityForceAC130>>
+ <<case 1>>
A basic AC-130 has been 'borrowed' from the old world.
- <<elseif $securityForceAC130 == 2>>
+ <<case 2>>
Modernized the armor.
- <<elseif $securityForceAC130 == 3>>
+ <<case 3>>
Modernized the armor and weaponry.
- <<elseif $securityForceAC130 == 4>>
+ <<case 4>>
Modernized the armor, weaponry and electronics.
- <<elseif $securityForceAC130 == 5>>
+ <<case 5>>
Modernized the armor, weaponry, electronics and crew seating.
- <</if>>
+<</switch>>
<</if>>
<<if $securityForceHeavyTransport > 0>>
<br>''Heavy Transport:''
- /* 3 upgrades */
- <<if $securityForceHeavyTransport == 1>>
+<<switch $securityForceHeavyTransport>>
+ <<case 1>>
A basic heavy transport has been 'borrowed' from the old world.
- <<elseif $securityForceHeavyTransport == 2>>
+ <<case 2>>
Modernized the armor.
- <<elseif $securityForceHeavyTransport == 3>>
+ <<case 3>>
Modernized the armor and engines.
- <<elseif $securityForceHeavyTransport == 4>>
+ <<case 4>>
Modernized the armor and engines. Replaced the ballistic gun mounts with electromagnetic ones.
- <</if>>
+<</switch>>
<</if>>
<</if>>
<<if $securityForceArcologyUpgrades >= 2>>
<br><br>
''Drone Bay:''
-/* 7 upgrades */
-<<if $securityForceDronePower == 0>>
+<<switch $securityForceDronePower>>
+<<case 0>>
Contains a small number of 're-purposed' non-military drones from the arcology's original contingent.
-<<elseif $securityForceDronePower == 1>>
+<<case 1>>
Replaced the security drones with basic, lightly-armoured military combat models possessing integrated small arms.
-<<elseif $securityForceDronePower == 2>>
+<<case 2>>
Replaced its basic military drones with more advanced models and added a number of support drones carrying heavy weaponry to its fleet.
-<<elseif $securityForceDronePower == 3>>
+<<case 3>>
Acquired even more advanced models of both the standard combat drones and the heavy support drones, and expanded its numbers of both.
-<<elseif $securityForceDronePower == 4>>
+<<case 4>>
Has acted to upgrade both the standard and support models of drones to carry basic electromagnetic weaponry, improving their overall combat effectiveness.
-<<elseif $securityForceDronePower == 5>>
+<<case 5>>
Improved the electromagnetic armament of it's drones by mounting both miniaturized and heavy railguns on them. In addition further sourcing numerous models of drones for roles as diverse as reconnaissance, independent slave capture and swarming tactics.
-<<elseif $securityForceDronePower == 6>>
+<<case 6>>
Acquired even lighter advanced armoured combat Drones with electromagnetic weaponry, advanced heavy Drones with electromagnetic support weaponry along with specialized Drones for reconnaissance, capture, and swarm tactics.
-<<elseif $securityForceDronePower == 7>>
+<<case 7>>
Acquired even lighter advanced thicker armoured combat Drones with electromagnetic weaponry, advanced heavy Drones with electromagnetic support weaponry along with specialized Drones for reconnaissance, capture, and swarm tactics.
-<<elseif $securityForceDronePower == 8>>
+<<case 8>>
Acquired even lighter advanced thicker armoured combat Drones with nanite rather than electromagnetic weaponry, advanced heavy Drones with electromagnetic support weaponry along with specialized Drones for reconnaissance, capture, and swarm tactics.
-<</if>>
+<</switch>>
<</if>>
<<if (_LaunchBayNO > 0 || _LaunchBayO > 0) && $securityForceArcologyUpgrades >= 4>>
@@ -281,86 +292,88 @@
''Launch Bay:''
<<if $securityForceSatellitePower > 0>>
<br>''Satellite:''
- /* 18 upgrades */
- <<if $securityForceSatellitePower == 1>>
+<<switch $securityForceSatellitePower>>
+ <<case 1>>
A basic Satellite has been 'borrowed' from the old world.
- <<elseif $securityForceSatellitePower == 2>>
+ <<case 2>>
Modernized the electronics.
- <<elseif $securityForceSatellitePower == 3>>
+ <<case 3>>
Modernized the electronics, wiring and circuitry.
- <<elseif $securityForceSatellitePower == 4>>
+ <<case 4>>
Modernized the electronics, wiring and circuitry.Installed a basic localized communications jammer to the Satellite (excludes your own frequencies with little to no leeway) that will "slightly" anger locals until it is deactivated.
- <<elseif $securityForceSatellitePower == 5>>
+ <<case 5>>
Modernized the electronics, wiring and circuitry.An advanced communications jammer is installed in the Satellite, increasing the AO localization, reducing the number of effected equipment.
- <<elseif $securityForceSatellitePower == 6>>
+ <<case 6>>
Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer power by 25% (now can damage effected equipment).
- <<elseif $securityForceSatellitePower == 7>>
+ <<case 7>>
Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment).
- <<elseif $securityForceSatellitePower == 8>>
+ <<case 8>>
Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment).The Satellite is now equipped with a basic EMP generator (advanced EMP hardening was applied before the insulation and activation) will "slightly" anger locals until it is deactivated.
- <<elseif $securityForceSatellitePower == 9>>
+ <<case 9>>
Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment).The Satellite is now equipped with an advanced EMP generator by, increasing the AO localization which reduces the quantity of effected equipment.
- <<elseif $securityForceSatellitePower == 10>>
+ <<case 10>>
Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 25% (now can damage effected equipment).
- <<elseif $securityForceSatellitePower == 11>>
+ <<case 11>>
Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).
- <<elseif $securityForceSatellitePower == 12>>
+ <<case 12>>
Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to be able to shoot a concentrated beam of pure energy that is able to level an entire city block. It required overhauling the battery system and shielding.
- <<elseif $securityForceSatellitePower == 13>>
+ <<case 13>>
Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to focus the bean enough to level a suburb.
- <<elseif $securityForceSatellitePower == 14>>
+ <<case 14>>
Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level a box of houses.
- <<elseif $securityForceSatellitePower == 15>>
+ <<case 15>>
Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level a single house.
- <<elseif $securityForceSatellitePower == 16>>
+ <<case 16>>
Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level 366 cm.
- <<elseif $securityForceSatellitePower == 17>>
+ <<case 17>>
Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level 30 cm.
- <<elseif $securityForceSatellitePower == 18>>
+ <<case 18>>
Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level 15 cm.
- <<elseif $securityForceSatellitePower == 19>>
+ <<case 19>>
Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to switch the 15 cm wide beam from lazer to nanites.
- <</if>>
+ <<case 20>>
+ Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to switch the 15 cm wide beam from lazer to nanites and allow the bleam to be split (if needed)
+<</switch>>
<</if>>
<<if $securityForceGiantRobot > 0>>
<br>''Giant Robot'':
- /* 11 upgrades */
- <<if $securityForceGiantRobot == 1>>
+<<switch $securityForceGiantRobot>>
+ <<case 1>>
An old world giant robot has been 'Borrowed'.
- <<elseif $securityForceGiantRobot == 2>>
+ <<case 2>>
Upgraded the wiring and circuitry.
- <<elseif $securityForceGiantRobot == 3>>
+ <<case 3>>
Upgraded the wiring, circuitry and power efficiency.
- <<elseif $securityForceGiantRobot == 4>>
+ <<case 4>>
Upgraded the wiring, circuitry and power efficiency.Reduced the weight.
- <<elseif $securityForceGiantRobot == 5>>
+ <<case 5>>
Upgraded the wiring, circuitry, power efficiency and battery capacity.Reduced the weight.
- <<elseif $securityForceGiantRobot == 6>>
+ <<case 6>>
Upgraded the wiring, circuitry, power efficiency,battery capacity and armour.Reduced the weight.
- <<elseif $securityForceGiantRobot == 7>>
+ <<case 7>>
Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons.
- <<elseif $securityForceGiantRobot == 8>>
+ <<case 8>>
Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons and the amount of pilots to two via a synced neural link.
- <<elseif $securityForceGiantRobot == 9>>
+ <<case 9>>
Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons and the amount of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.
- <<elseif $securityForceGiantRobot == 10>>
+ <<case 10>>
Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons and the amount of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with a basic optical illusion kit.
- <<elseif $securityForceGiantRobot == 11>>
+ <<case 11>>
Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons and the amount of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit.
- <<elseif $securityForceGiantRobot == 12>>
+ <<case 12>>
Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted nanite rather than electromagnetic cannons and the amount of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit.
- <</if>>
+<</switch>>
<</if>>
<<if $securityForceMissileSilo > 0>>
<br>''Missile Silo:''
- /* 3 upgrades */
- <<if $securityForceMissileSilo == 1>>
+<<switch $securityForceMissileSilo>>
+ <<case 1>>
A basic missile silo has been 'borrowed' from the old world.
- <<elseif $securityForceMissileSilo == 2>>
+ <<case 2>>
Modernized the launching electronics.
- <<elseif $securityForceMissileSilo == 3>>
+ <<case 3>>
Modernized the launching electronics, wiring and circuitry.
- <</if>>
+<</switch>>
<</if>>
<</if>>
@@ -369,51 +382,53 @@
''Naval Yard:''
<<if $securityForceAircraftCarrier > 0>>
<br>''Aircraft Carrier:''
- /* 4 upgrades */
- <<if $securityForceAircraftCarrier == 1>>
+<<switch $securityForceAircraftCarrier>>
+ <<case 1>>
A basic aircraft carrier has been 'borrowed' from the old world.
- <<elseif $securityForceAircraftCarrier == 2>>
+ <<case 2>>
Modernized the electronics.
- <<elseif $securityForceAircraftCarrier == 3>>
+ <<case 3>>
Modernized the electronics and weaponry.
- <<elseif $securityForceAircraftCarrier == 4>>
+ <<case4>>
Modernized the electronics, weaponry and armour.
- <<elseif $securityForceAircraftCarrier == 5>>
+ <<case 5>>
Modernized the electronics, weaponry and armour. Added an EMP generator.
- <</if>>
+ <<case 6>>
+ Modernized the electronics, weaponry and armour. Added an EMP generator and lazer designator.
+<</switch>>
<</if>>
<<if $securityForceSubmarine > 0>>
<br>''Submarine:''
- /* 6 upgrades */
- <<if $securityForceSubmarine == 1>>
+<<switch $securityForceSubmarine>>
+ <<case 1>>
A basic submarine has been 'borrowed' from the old world.
- <<elseif $securityForceSubmarine == 2>>
+ <<case 2>>
Modernized the engines for speed.
- <<elseif $securityForceSubmarine == 3>>
+ <<case 3>>
Modernized the engines for speed and silence.
- <<elseif $securityForceSubmarine == 4>>
+ <<case 4>>
Modernized the engines for speed and silence.Upgraded the hull for silence.
- <<elseif $securityForceSubmarine == 5>>
+ <<case 5>>
Modernized the engines for speed and silence.Upgraded the hull for silence and weaponry.
- <<elseif $securityForceSubmarine == 6>>
+ <<case 6>>
Modernized the engines for speed and silence.Upgraded the hull for silence, weaponry and air scrubbers, allowing it to stay submerged for longer.
- <</if>>
+<</switch>>
<</if>>
<<if $securityForceHeavyAmphibiousTransport > 0>>
<br>''Heavy Amphibious Transport:''
- /* 5 upgrades */
- <<if $securityForceHeavyAmphibiousTransport == 1>>
+<<switch $securityForceHeavyAmphibiousTransport>>
+ <<case 1>>
A basic heavy amphibious transport has been 'borrowed' from the old world.
- <<elseif $securityForceHeavyAmphibiousTransport == 2>>
+ <<case 2>>
Modernized the armor.
- <<elseif $securityForceHeavyAmphibiousTransport == 3>>
+ <<case 3>>
Modernized the armor and speed.
- <<elseif $securityForceHeavyAmphibiousTransport == 4>>
+ <<case 4>>
Modernized the armor and speed. Added miniaturized railguns in all four corners.
- <<elseif $securityForceHeavyAmphibiousTransport == 5>>
+ <<case 5>>
Modernized the armor and speed. Added miniaturized railguns in all four corners and a lazer designator in the midle.
- <<elseif $securityForceHeavyAmphibiousTransport == 6>>
+ <<case 6>>
Modernized the armor and speed. Replaced the corner miniaturized railguns with nanite ones while keeping the lazer designator in the midle.
- <</if>>
+<</switch>>
<</if>>
<</if>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index a225c70eef3..6f88a7d1d49 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1793,17 +1793,17 @@ Of her $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if>>; $sla
<<widget "AgePCEffects">>
<<switch $PC.actualAge>>
-/* <<case 3>> */
+<<case 3>>
<<set $AgeTrainingLowerBounds = 18, $AgeTrainingUpperBounds = 20, $AgePricing = .1, $AgeTrainingEffect = .1>>
-/* <<case 4>> */
+<<case 4>>
<<set $AgeTrainingLowerBounds = 17, $AgeTrainingUpperBounds = 19, $AgePricing = .15, $AgeTrainingEffect = .15>>
-/* <<case 5>> */
+<<case 5>>
<<set $AgeTrainingLowerBounds = 16, $AgeTrainingUpperBounds = 18, $AgePricing = .35, $AgeTrainingEffect = .35>>
-/* <<case 6>> */
+<<case 6>>
<<set $AgeTrainingLowerBounds = 15, $AgeTrainingUpperBounds = 17, $AgePricing = .55, $AgeTrainingEffect = .55>>
-/* <<case 7>> */
+<<case 7>>
<<set $AgeTrainingLowerBounds = 14, $AgeTrainingUpperBounds = 16, $AgePricing = .75, $AgeTrainingEffect = .75>>
-/* <<case 8>> */
+<<case 8>>
<<set $AgeTrainingLowerBounds = 13, $AgeTrainingUpperBounds = 15, $AgePricing = .85, $AgeTrainingEffect = .85>>
<<case 9>>
<<set $AgeTrainingLowerBounds = 12, $AgeTrainingUpperBounds = 14, $AgePricing = 1.00, $AgeTrainingEffect = 1.00>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 851e2f62b06..38916460236 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -713,7 +713,7 @@
<</if>>
<<if ndef $Lieutenantcolonel>>
- <<set $Lieutenantcolonel = 1>>
+ <<set $Lieutenantcolonel = 0>>
<</if>>
<<if ndef $FacilitySupportSlaves>>
<<set $FacilitySupportSlaves = 0>>
@@ -2877,8 +2877,6 @@ Setting missing slave variables:
<<set $MinEffectedAge = 3>>
<<set $PastPrimeAge = 5000>>
-<<set $FormattedWithCommas = 0>>
-
<<HeroSlavesCleanup>>
Done!
diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw
index 4edc1080351..887529306ca 100644
--- a/src/uncategorized/corporationDevelopments.tw
+++ b/src/uncategorized/corporationDevelopments.tw
@@ -132,19 +132,20 @@ 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><br>
<<if $cash > 1000*$sharePrice>>
<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>>
+ <<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>>
@@ -178,18 +179,18 @@ You are unable to purchase 1000 shares at the current share price.
<<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>>
<<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>>
+ <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>>
diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw
index 7665153f4ab..42bc5eb38eb 100644
--- a/src/uncategorized/costs.tw
+++ b/src/uncategorized/costs.tw
@@ -466,12 +466,16 @@
<<set $costs += 1000>>
<</if>>
-<<set _cost = 10000*$AgePricing>>
-
-<<if $PC.actualAge >= $MinEffectedAge && $PC.actualAge < $PastPrimeAge>>
-<<if ($personalAttention == "trading") || ($personalAttention == "warfare") || ($personalAttention == "slaving") || ($personalAttention == "engineering") || ($personalAttention == "medicine")>>
- <<set $costs += _cost>>
-<</if>>
+<<if ($personalAttention == "trading")>>
+ <<set $costs += 10000>>
+<<elseif ($personalAttention == "warfare")>>
+ <<set $costs += 10000>>
+<<elseif ($personalAttention == "slaving")>>
+ <<set $costs += 10000>>
+<<elseif ($personalAttention == "engineering")>>
+ <<set $costs += 10000>>
+<<elseif ($personalAttention == "medicine")>>
+ <<set $costs += 10000>>
<</if>>
<<if $cyberMod != 0 && $researchLab.built == "true">>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 66d0307b8d2..b66945e764f 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -117,7 +117,7 @@
<<if $soldierWages == 0>>
<<set _soldierMod = 1>>
- <<elseif $soldierWages == 0>>
+ <<elseif $soldierWages == 1>>
<<set _soldierMod = 1.5>>
<<else>>
<<set _soldierMod = 2>>
@@ -206,19 +206,16 @@
<br>Coursing Association membership: <<print cashFormat(1000)>>
<</if>>
-<<set _cost = 10000*$AgePricing>>
-<<if $PC.actualAge >= $MinEffectedAge && $PC.actualAge < $PastPrimeAge>>
-
<<if ($personalAttention == "trading")>>
- <br>Trading trainer fees: <<print cashFormat(_cost)>>
+ <br>Trading trainer fees: <<print cashFormat(10000)>>
<<elseif ($personalAttention == "warfare")>>
- <br>Warfare trainer fees: <<print cashFormat(_cost)>>
+ <br>Warfare trainer fees: <<print cashFormat(10000)>>
<<elseif ($personalAttention == "slaving")>>
- <br>Slaving trainer fees: <<print cashFormat(_cost)>>
+ <br>Slaving trainer fees: <<print cashFormat(10000)>>
<<elseif ($personalAttention == "engineering")>>
- <br>Engineering trainer fees: <<print cashFormat(_cost)>>
+ <br>Engineering trainer fees: <<print cashFormat(10000)>>
<<elseif ($personalAttention == "medicine")>>
- <br>Medicine trainer fees: <<print cashFormat(_cost)>>
+ <br>Medicine trainer fees: <<print cashFormat(10000)>>
<</if>>
<br>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index d104f8dddc6..678c6fc54be 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -88,14 +88,6 @@ __Construction__
You have installed the FCTV receiver and have access to the full range of FCTV's programs. Low viewership rates amongst your citizens limits the impact of FCTV on your societal goals.
<</if>>
-<br>
-
-<<set $GenericProsperityImporvementCost = Math.trunc($cash*.10)>>
-<<link "Increase the maxium prosperity of $arcologies[0].name">>
- <<set $AProsperityCap += 5>>
- <<set $cash -= $GenericProsperityImporvementCost>>
- <<goto "Manage Arcology">>
-<</link>> <br>// This will cost 10% of your current cash which is <<if $FormattedWithCommas == 0>> <<print $GenericProsperityImporvementCost>> <<else>> <<print cashFormat($GenericProsperityImporvementCost)>> <</if>>.
<<if $secExp == 1>>
<br>
<br>
@@ -182,18 +174,14 @@ She also has charge of all smart piercings in the arcology, and is using her ada
<br><br>
-
Your slaves have participated in approximately <<print commaNum($oralTotal+$vaginalTotal+$analTotal)>> sexual encounters: <<print commaNum($oralTotal)>> primarily oral, <<print commaNum($vaginalTotal)>> vanilla, <<print commaNum($mammaryTotal)>> mammary, <<print commaNum($analTotal)>> anal, and <<print commaNum($penetrativeTotal)>> with the slave penetrating another. They have produced about <<print commaNum($milkTotal)>> liters of marketable milk, <<if $seeDicks != 0>>about <<print commaNum($cumTotal)>> deciliters of marketable cum, <</if>>and have given birth <<print commaNum($birthsTotal)>> times.
-<<if $pitKillsTotal > 0>> <<print commaNum($pitKillsTotal)>> <</if>> slaves have died in your fighting pit.<</if>>
-<<if $fuckdollsSold > 0>> <<print commaNum($fuckdollsSold)>> <</if>> mindbroken arcade slaves have been converted into Fuckdolls and sold.<</if>>
+<<if $pitKillsTotal > 0>>$pitKillsTotal slaves have died in your fighting pit.<</if>>
+<<if $fuckdollsSold > 0>>$fuckdollsSold mindbroken arcade slaves have been converted into Fuckdolls and sold.<</if>>
<<if $secExp == 1 && $battlesEnabled == 1>>
<br><br>
<<if $securityForceCreate == 0>>
- Your army counts <<if $FormattedWithCommas == 0>> <<print $militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower>> <<else>> <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower)>> <</if>>total soldiers.
-<<else>>
- Your army counts <<if $FormattedWithCommas == 0>> <<print $militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $securityForcePersonnel>> <<else>> <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $securityForcePersonnel)>> <</if>> total soldiers of which <<if $FormattedWithCommas == 0>> $securityForcePersonnel <<else>> <<print commaNum($securityForcePersonnel)>> <</if>> fall under the security force command with the rest under your direct control.
Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower)>> total soldiers.
<<else>>
Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $securityForcePersonnel)>> total soldiers of which <<print commaNum($securityForcePersonnel)>> under the security force command and the rest under your direct control.
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index d254400975e..ce30e57fc28 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -158,7 +158,7 @@
<<goto "secExpSmilingMan">>
<<elseif $rivalOwner == 0 && $smilingManProgress == 3 && $secExp == 1>>
<<goto "secExpSmilingMan">>
-<<elseif (_effectiveWeek > 84) && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance == 0>>
+<<elseif (_effectiveWeek > 84) && $LieutenantColonel != 0 && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance == 0>>
<<goto "securityForceTradeShow">>
<<else>>
<<if random(1,100) > _effectiveWeek+25>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 1bc05bea221..e5a83b09e6b 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -100,12 +100,6 @@ New Model UI @@.cyan;ENABLED@@. [[Disable|Options][$newModelUI = 0]]
New Model UI @@.red;DISABLED@@. [[Enable|Options][$newModelUI = 1]]
<</if>>
-<br>
-<<if $FormattedWithCommas != 0>>
- Commas are @@.cyan;used@@ used to display values. [[Disable|Options][$FormattedWithCommas = 0]]
-<<else>>
- Commas @@.cyan;are not@@ used to display vaules. [[Enable|Options][$FormattedWithCommas = 1]]
-<</if>>
<br>
<<if $seeArcology == 1>>
--
GitLab