diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index aafd0870a98afe680994bad7be7045bc89836ee8..63c6056c02915467cd48eb2cd4b183d1713a6e74 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4826,4 +4826,14 @@ Pregmod 0.10.3.0
187
-fixes
- -SFanon's fixes
\ No newline at end of file
+ -SFanon's fixes
+
+ 12/06/17
+
+ 188
+ -fixes
+ -SFanon's fixes
+ -secEx tweaks
+
+ 189
+ -fixes and tweaks
\ No newline at end of file
diff --git a/src/SecExp/SecExpBackwardCompatibility.tw b/src/SecExp/SecExpBackwardCompatibility.tw
index 0b69f5c5cb6180df0978eaa336aa0f30cc08b258..3ee639f803ff010ce945534765d2165f8925cbd5 100644
--- a/src/SecExp/SecExpBackwardCompatibility.tw
+++ b/src/SecExp/SecExpBackwardCompatibility.tw
@@ -103,6 +103,12 @@
<<if ndef $allowPrestigeFromBattles>>
<<set $allowPrestigeFromBattles = 1>>
<</if>>
+<<if ndef $battleFrequency>>
+<<set $battleFrequency = 1>>
+<</if>>
+<<if ndef $rebellionSpeed>>
+<<set $rebellionSpeed = 1>>
+<</if>>
/* edicts */
<<if ndef $edictsUpkeep>>
diff --git a/src/SecExp/attackGenerator.tw b/src/SecExp/attackGenerator.tw
index e1ff70090df0406f800fc7cce49e4fbd2bc058b2..f8269dbb4f4eeb2734a1b61ebc662dd2cc830035 100644
--- a/src/SecExp/attackGenerator.tw
+++ b/src/SecExp/attackGenerator.tw
@@ -16,13 +16,15 @@
<<else>>
<<set _attackChance =20>>
<</if>>
- <<if $lastAttackWeeks >= 15>>
- <<set _attackChance += 5>>
- <</if>>
<<if $hasFoughtOnce == 1>>
<<set _attackChance = 25>>
<</if>>
+ <<if $lastAttackWeeks >= 10>>
+ <<set _attackChance += 5>>
+ <</if>>
<</if>>
+/* battle frequency */
+<<set _attackChance *= $battleFrequency>>
<<if $forceBattle == 1 && $forceRebellion != 1 && $foughtThisWeek == 0>>
<<set _attackChance = 100>>
diff --git a/src/SecExp/attackOptions.tw b/src/SecExp/attackOptions.tw
index 8ee016fc43eb119051a4b0396b31adefb26b14f0..1d875c1b62672edb78f2b15d9ae268eba3a795f8 100644
--- a/src/SecExp/attackOptions.tw
+++ b/src/SecExp/attackOptions.tw
@@ -472,22 +472,9 @@ Offensive Tactics
<<goto "attackReport">>
<</link>>
<br>
-/* calculates bribe cost */
-<<if $week <= 30>>
- <<set $bribeCost = 5000 + $baseBribePerAttacker * $attackTroops>>
-<<elseif $week <= 30>>
- <<set $bribeCost = 10000 + $baseBribePerAttacker * $attackTroops>>
-<<elseif $week <= 30>>
- <<set $bribeCost = 15000 + $baseBribePerAttacker * $attackTroops>>
-<<elseif $week <= 30>>
- <<set $bribeCost = 20000 + $baseBribePerAttacker * $attackTroops>>
-<<elseif $week <= 30>>
- <<set $bribeCost = 25000 + $baseBribePerAttacker * $attackTroops>>
-<</if>>
-<<if $majorBattle == 1>>
- <<set $bribeCost *= 3>>
-<</if>>
+/* calculates bribe cost */
+<<calcBribe>>
<<link "Attempt to bribe">>
<<set $battleResult = 1>>
<<if $hasFoughtOnce == 0>>
diff --git a/src/SecExp/rebellionGenerator.tw b/src/SecExp/rebellionGenerator.tw
index 4905a6cd146db452e0cf126ad730022ddc6be03b..3134e57c7064ce5e2f2c0ba88d5965af1d3da39c 100644
--- a/src/SecExp/rebellionGenerator.tw
+++ b/src/SecExp/rebellionGenerator.tw
@@ -132,9 +132,9 @@
<</if>>
<<set _roll = random(1,_slave + _citizen)>>
<<if $brainImplant == 106>>
- <<set _slave = Math.trunc(_slave * 0.2), _citizen = Math.trunc(_citizen * 0.2)>>
+ <<set _slave = Math.trunc(_slave * 0.5 * $rebellionSpeed), _citizen = Math.trunc(_citizen * 0.5 * $rebellionSpeed)>>
<<else>>
- <<set _slave = Math.trunc(_slave * 0.75), _citizen = Math.trunc(_citizen * 0.75)>>
+ <<set _slave = Math.trunc(_slave * $rebellionSpeed), _citizen = Math.trunc(_citizen * $rebellionSpeed)>>
<</if>>
<<if _roll <= _slave>>
<<if random(1,100) < _slave>>
diff --git a/src/SecExp/secExpOptions.tw b/src/SecExp/secExpOptions.tw
index 46015b30d9a17a4c4fac2d33fd59d0484271991b..b0a5e5b885ae2347923cc117c2053487809fa8ff 100644
--- a/src/SecExp/secExpOptions.tw
+++ b/src/SecExp/secExpOptions.tw
@@ -185,7 +185,22 @@ __Rebellions__:
<</link>>
<</if>>
<br> //Enable/disable rebellions.//
+ <br>
<<if $rebellionsEnabled == 1>>
+ <<if $rebellionGameOver == 0>>
+ Rebellions can cause gameover is @@.red;FALSE@@.
+ <<link "Activate game loss in case of rebellions succeeding">>
+ <<set $rebellionGameOver = 1>>
+ <<goto "secExpOptions">>
+ <</link>>
+ <<elseif $rebellionGameOver == 1>>
+ Rebellions can cause gameover is @@.cyan;TRUE@@.
+ <<link "Deactivate game loss in case of rebellions succeeding">>
+ <<set $rebellionGameOver = 0>>
+ <<goto "secExpOptions">>
+ <</link>>
+ <</if>>
+ <br> //Determines wheter a total defeat in a rebellion will cause a gameover.//
<br>
<<if $forceRebellion == 0>>
Rebellions guaranteed this week is @@.red;FALSE@@.
@@ -201,21 +216,6 @@ __Rebellions__:
<</link>>
<</if>>
<br> //Will force rebellions to happen every week. Rebellions will take precedence over battles.//
- <br>
- <<if $rebellionGameOver == 0>>
- Rebellions can cause gameover is @@.red;FALSE@@.
- <<link "Activate game loss in case of rebellions succeeding">>
- <<set $rebellionGameOver = 1>>
- <<goto "secExpOptions">>
- <</link>>
- <<elseif $rebellionGameOver == 1>>
- Rebellions can cause gameover is @@.cyan;TRUE@@.
- <<link "Deactivate game loss in case of rebellions succeeding">>
- <<set $rebellionGameOver = 0>>
- <<goto "secExpOptions">>
- <</link>>
- <</if>>
- <br> //Determines wheter a total defeat in a rebellion will cause a gameover.//
<</if>>
<<if $showBattleStatistics == 0 &&($battlesEnabled == 1 || $rebellionsEnabled == 1)>>
@@ -304,6 +304,92 @@ __Battles/Rebellions Difficulty__:
@@.darkred;Very hard@@
<</replace>>
<</link>>
+<br>
+<br>
+__Battles frequency__:
+<br>Battle frequency is set to:<span id="battleFrequency">
+<<if $battleFrequency == 0.5>>
+ @@.green;Very infrequent@@
+<<elseif $battleFrequency == 0.75>>
+ @@.limegreen;Infrequent@@
+<<elseif $battleFrequency == 1>>
+ @@.yellow;Normal@@
+<<elseif $battleFrequency == 1.25>>
+ @@.red;Frequent@@
+<<else>>
+ @@.darkred;Very frequent@@
+<</if>>
+</span>
+<br>
+<<link "Very infrequent">>
+ <<set $battleFrequency = 0.5>>
+ <<replace "#battleFrequency">>
+ @@.green;Very infrequent@@
+ <</replace>>
+<</link>> | <<link "Infrequent">>
+ <<set $battleFrequency = 0.75>>
+ <<replace "#battleFrequency">>
+ @@.limegreen;Infrequent@@
+ <</replace>>
+<</link>> | <<link "Normal">>
+ <<set $battleFrequency = 1>>
+ <<replace "#battleFrequency">>
+ @@.yellow;Normal@@
+ <</replace>>
+<</link>> | <<link "Frequent">>
+ <<set $battleFrequency = 1.25>>
+ <<replace "#battleFrequency">>
+ @@.red;Frequent@@
+ <</replace>>
+<</link>> | <<link "Very frequent">>
+ <<set $battleFrequency = 1.5>>
+ <<replace "#battleFrequency">>
+ @@.darkred;Very frequent@@
+ <</replace>>
+<</link>>
+<br>
+<br>
+__Rebellions buildup speed__:
+<br>Rebellion speed is set to:<span id="rebellionSpeed">
+<<if $rebellionSpeed == 0.5>>
+ @@.green;Very slow@@
+<<elseif $rebellionSpeed == 0.75>>
+ @@.limegreen;Slow@@
+<<elseif $rebellionSpeed == 1>>
+ @@.yellow;Normal@@
+<<elseif $rebellionSpeed == 1.25>>
+ @@.red;Fast@@
+<<else>>
+ @@.darkred;Very fast@@
+<</if>>
+</span>
+<br>
+<<link "Very slow">>
+ <<set $rebellionSpeed = 0.5>>
+ <<replace "#rebellionSpeed">>
+ @@.green;Very slow@@
+ <</replace>>
+<</link>> | <<link "Slow">>
+ <<set $rebellionSpeed = 0.75>>
+ <<replace "#rebellionSpeed">>
+ @@.limegreen;Slow@@
+ <</replace>>
+<</link>> | <<link "Normal">>
+ <<set $rebellionSpeed = 1>>
+ <<replace "#rebellionSpeed">>
+ @@.yellow;Normal@@
+ <</replace>>
+<</link>> | <<link "Fast">>
+ <<set $rebellionSpeed = 1.25>>
+ <<replace "#rebellionSpeed">>
+ @@.red;Fast@@
+ <</replace>>
+<</link>> | <<link "Very fast">>
+ <<set $rebellionSpeed = 1.5>>
+ <<replace "#rebellionSpeed">>
+ @@.darkred;Very fast@@
+ <</replace>>
+<</link>>
<br>
diff --git a/src/SecExp/secInit.tw b/src/SecExp/secInit.tw
index 41db87c4a4208aa94bd0d6601bd768f2af781df1..489526b77d66d12ad6acc24d21e324f34acfb0b6 100644
--- a/src/SecExp/secInit.tw
+++ b/src/SecExp/secInit.tw
@@ -35,6 +35,8 @@
<<set $forceRebellion = 0>>
<<set $rebellionGameOver = 1>>
<<set $allowPrestigeFromBattles = 1>>
+<<set $battleFrequency = 1>>
+<<set $rebellionSpeed = 1>>
/* edicts */
<<set $edictsUpkeep = 0>>
diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw
index aad8825bfde6c675012cb7a798f40fe0d2e017d8..230be15cbd9c7b86607eb0f56f58a433f4f72102 100644
--- a/src/SecExp/securityReport.tw
+++ b/src/SecExp/securityReport.tw
@@ -100,7 +100,7 @@
<</if>>
<<if $transportHub == 1>>
- <<if $terrain != "oceanic" || $terrain != "marine">>
+ <<if $terrain != "oceanic" && $terrain != "marine">>
<<set _secGrowth += ($airport + $railway - $hubSecurity * 3) / 2>>
<<else>>
<<set _secGrowth += ($airport + $docks - $hubSecurity * 3) / 2>>
diff --git a/src/SecExp/tradeReport.tw b/src/SecExp/tradeReport.tw
index d08c807307a1297fc93fa12e4af8b9ce10a5d2d5..16c308cc8821b594638822f3e3cb04f52d9f01a4 100644
--- a/src/SecExp/tradeReport.tw
+++ b/src/SecExp/tradeReport.tw
@@ -76,7 +76,7 @@
The arcology's airport is an incredible boon to the commercial development of the arcology.<<set _tradeChange += 3>>
<</if>>
- <<if $terrain != "oceanic" || $terrain != "marine">>
+ <<if $terrain != "oceanic" && $terrain != "marine">>
<<if $railway == 1>>
The railway network's age and limited extension limit commercial activity.
<<elseif $railway == 2>>
diff --git a/src/SecExp/transportHub.tw b/src/SecExp/transportHub.tw
index f83f9aeb0427f147179c0416bfe72e175877b2c2..d813ed19796aa6b69c257826dd90343da6b003cf 100644
--- a/src/SecExp/transportHub.tw
+++ b/src/SecExp/transportHub.tw
@@ -4,7 +4,7 @@
<strong>The Transport Hub</strong>
<hr>
-You quickly reach the transport hub, where a constant stream of vehicles, people and goods greets you. Part of the structure is dedicated to air travel and the other is mainly occupied by <<if $terrain != "oceanic" || $terrain != "marine">>the rail station.<<else>> the docks.<</if>>
+You quickly reach the transport hub, where a constant stream of vehicles, people and goods greets you. Part of the structure is dedicated to air travel and the other is mainly occupied by <<if $terrain != "oceanic" && $terrain != "marine">>the rail station.<<else>> the docks.<</if>>
<<if $limitImmigration == 1 || $AntiImmigrationRep == 1>>
Due to your strict policies concerning immigration, very few new citizens arrive in the transport hub.
@@ -24,7 +24,7 @@ You quickly reach the transport hub, where a constant stream of vehicles, people
The arcology's airport is huge and very well equipped. It can handle an impressive amount of traffic.
<</if>>
-<<if $terrain != "oceanic" || $terrain != "marine">>
+<<if $terrain != "oceanic" && $terrain != "marine">>
<<if $railway == 1>>
The railway network is old and limited. It can handle some traffic, but not sustain commercial activity.
<<elseif $railway == 2>>
@@ -107,7 +107,7 @@ You quickly reach the transport hub, where a constant stream of vehicles, people
<</if>>
<br>
/* trainyard/dockyard */
-<<if $terrain != "oceanic" || $terrain != "marine">>
+<<if $terrain != "oceanic" && $terrain != "marine">>
<<if $railway == 1>>
<br>
<<link "Modernize the railway">>
diff --git a/src/SecExp/widgets/battleWidgets.tw b/src/SecExp/widgets/battleWidgets.tw
index 73cad8d8bc1caf27718aee83e82875b795e09edc..26edaff84521764dddd5cfd17038e8fdbf96ab8e 100644
--- a/src/SecExp/widgets/battleWidgets.tw
+++ b/src/SecExp/widgets/battleWidgets.tw
@@ -119,4 +119,22 @@
<<else>>
<br>@@.red;Error: widget called outside battle@@
<</if>>
+<</widget>>
+
+<<widget "calcBribe">>
+ <<if $week <= 30>>
+ <<set $bribeCost = 5000 + $baseBribePerAttacker * $attackTroops>>
+ <<elseif $week <= 30>>
+ <<set $bribeCost = 10000 + $baseBribePerAttacker * $attackTroops>>
+ <<elseif $week <= 30>>
+ <<set $bribeCost = 15000 + $baseBribePerAttacker * $attackTroops>>
+ <<elseif $week <= 30>>
+ <<set $bribeCost = 20000 + $baseBribePerAttacker * $attackTroops>>
+ <<elseif $week <= 30>>
+ <<set $bribeCost = 25000 + $baseBribePerAttacker * $attackTroops>>
+ <</if>>
+ <<if $majorBattle == 1>>
+ <<set $bribeCost *= 3>>
+ <</if>>
+ <<set $bribeCost = Math.trunc(Math.clamp($bribeCost,0,1000000))>>
<</widget>>
\ No newline at end of file
diff --git a/src/pregmod/securityForceTradeShow.tw b/src/pregmod/securityForceTradeShow.tw
index 8bd05db0f5d3ed1055545a7df803967a430c41b2..f2c1c5b8276c96a2785214ea1803f276ad666fca 100644
--- a/src/pregmod/securityForceTradeShow.tw
+++ b/src/pregmod/securityForceTradeShow.tw
@@ -24,7 +24,7 @@
<<set _LaunchBayO = $securityForceSatalitePower>>
<<set _FacilitySupport = $FacilitySupport>>
-<<if $terrain != "oceanic" || $terrain != "marine">>
+<<if $terrain != "oceanic" && $terrain != "marine">>
<<set $SFNO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayNO+_FacilitySupport>>
<</if>>
<<if $terrain == "oceanic" || $terrain == "marine">>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 9915643472ac942e40642c725a5f9050491b7aa7..007a817eab3b4f7f63b53d25a9881a399c024c0c 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2388,8 +2388,10 @@ Setting missing slave variables:
<<set _Slave.health = 205>>
<</if>>
- <<set _Slave.devotion = (_Slave.devotion*5)>>
- <<set _Slave.trust = (_Slave.trust*5)>>
+ <<set _Slave.devotion = (_Slave.devotion*5)>>
+ <<set _Slave.oldDevotion = (_Slave.oldDevotion*5)>>
+ <<set _Slave.trust = (_Slave.trust*5)>>
+ <<set _Slave.oldTrust = (_Slave.oldTrust*5)>>
<<if _Slave.fetishStrength == 0>>
<<set _Slave.fetishStrength = random(0, 60)>>
diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index fba389a12496f1e2f28dd32c5726f8e17ecfad94..71bc61b0a2189b8fff439ec7c168cfa6546ddc5c 100644
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -13,11 +13,11 @@
<<set _Name = "<<if $CurrentTradeShowAttendance == 1>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>><<else>>The Colonel<</if>>">>
<<if $economy == .5>>
- <<set $Env = _N1, $EnvCash1 = 15000, $EnvCash2 = 450, $EnvCash3 = 200, $EnvCash4 = 100, $EnvProsp = 3, _BaseDiscount = _BaseDiscount-.005>>
+ <<set $Env = _N1, $EnvCash2 = 450, $EnvCash3 = 200, $EnvCash4 = 100, $EnvProsp = 3, _BaseDiscount = _BaseDiscount-.005>>
<<elseif $economy == 1>>
- <<set $Env = _N2, $EnvCash1 = 25000, $EnvCash2 = 500, $EnvCash3 = 250, $EnvCash4 = 150, $EnvProsp = 5, _BaseDiscount = _BaseDiscount>>
+ <<set $Env = _N2, $EnvCash2 = 500, $EnvCash3 = 250, $EnvCash4 = 150, $EnvProsp = 5, _BaseDiscount = _BaseDiscount>>
<<elseif $economy == 1.5>>
- <<set $Env = _N3, $EnvCash1 = 35000, $EnvCash2 = 550, $EnvCash3 = 300, $EnvCash4 = 200, $EnvProsp = 7, _BaseDiscount = _BaseDiscount+.005>>
+ <<set $Env = _N3, $EnvCash2 = 550, $EnvCash3 = 300, $EnvCash4 = 200, $EnvProsp = 7, _BaseDiscount = _BaseDiscount+.005>>
<</if>>
/* The upgrades are currently ordered as:
@@ -32,32 +32,32 @@
securityForceVehiclePower(7)
securityForceHeavyBattleTank(3)
<</if>>
- <<if $securityForceArcologyUpgrades >= 4>>Hangar(30)
- securityForceAircraftPower(8)
+ <<if $securityForceArcologyUpgrades >= 4>>Hangar(32)
+ securityForceAircraftPower(10)
securityForceSpacePlanePower(11)
securityForceFortressZeppelin(3)
securityForceAC130(5)
securityForceHeavyTransport(3)
<</if>>
- <<if $securityForceArcologyUpgrades >= 2>>Drone Bay(6)
- securityForceDronePower(6)
+ <<if $securityForceArcologyUpgrades >= 2>>Drone Bay(7)
+ securityForceDronePower(7)
<</if>>
- <<if $securityForceArcologyUpgrades >= 4>>Launch Bay(29)
- securityForceSatellitePower(17)
- securityForceGiantRobot(9)
+ <<if $securityForceArcologyUpgrades >= 4>>Launch Bay(32)
+ securityForceSatellitePower(18)
+ securityForceGiantRobot(11)
securityForceMissileSilo(3)
<</if>>
securityForceX
<<if $terrain == "oceanic" || $terrain == "marine">>
- <<if $securityForceArcologyUpgrades >= 4>>Launch Bay(17)
- securityForceSatellitePower(17)
+ <<if $securityForceArcologyUpgrades >= 4>>Launch Bay(18)
+ securityForceSatellitePower(18)
<</if>>
<</if>>
- Naval Yard (12)
+ Naval Yard (15)
securityForceAircraftCarrier(4)
- securityForceSubmarine(5)
- securityForceHeavyAmphibiousTransport (3)
+ securityForceSubmarine(6)
+ securityForceHeavyAmphibiousTransport (5)
securityForceX */
<<set _Barracks = $securityForceArcologyUpgrades>>
@@ -73,18 +73,22 @@ securityForceX */
<<set _GarageMax = 10>>
<<set _Hangar = $securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceAC130+$securityForceHeavyTransport>>
-<<set _HangarMax = 30>>
+<<set _HangarMax = 32>>
<<set _DroneBay = $securityForceDronePower>>
-<<set _DroneBayMax = 6>>
+<<set _DroneBayMax = 7>>
<<set _LaunchBayNO = $securityForceSatellitePower+$securityForceGiantRobot+$securityForceMissileSilo>>
-<<set _LaunchBayNOMax = 29>>
+<<set _LaunchBayNOMax = 32>>
<<set _LaunchBayO = $securityForceSatellitePower>>
<<set _LaunchBayOMax = 17>>
<<set _FacilitySupport = $FacilitySupport>>
<<set _FacilitySupportMax = 1>>
+<<set _NavalYardMax = 15>>
+
+<<set _maxNO = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayNOMax+_FacilitySupportMax>>
+<<set _maxO = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayOMax+_NavalYardMax+_FacilitySupportMax>>
<<if $terrain != "oceanic" && $terrain != "marine">>
<<set $SFNO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayNO+_FacilitySupport>>
@@ -288,7 +292,11 @@ securityForceX */
<<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.
<<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.Also it now possesses a basic old world bomber.
+ 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.
+<<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.
+<<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.
<</if>>
<<if $securityForceSpacePlanePower > 0>>
<br>
@@ -360,7 +368,7 @@ securityForceX */
<br><br>
''Drone Bay:''
<br>
-/* 6 upgrades */
+/* 7 upgrades */
<<if $securityForceDronePower == 0>>
The drone bay contains a small number of 're-purposed' non-military drones from the arcology's original contingent.
<<elseif $securityForceDronePower == 1>>
@@ -374,7 +382,9 @@ securityForceX */
<<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.
<<elseif $securityForceDronePower == 6>>
- The drone bay has acquired even lighter advanced armoured combat Drones with electromagnetic weaponry, advanced heavy Drones with electromagnetic support weaponry, and specialized Drones for reconnaissance, capture, and swarm tactics.
+ 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.
+<<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.
<</if>>
<</if>>
@@ -383,7 +393,7 @@ securityForceX */
''Launch Bay:''
<<if $securityForceSatellitePower > 0>>
<br>
- /* 16 upgrades */
+ /* 18 upgrades */
<<if $securityForceSatellitePower == 1>>
A basic Satellite 'borrowed' from the old world.
<<elseif $securityForceSatellitePower == 2>>
@@ -415,14 +425,16 @@ securityForceX */
<<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.
<<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 twelve feet.
+ 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.
<<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 one foot.
+ 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.
+ <<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.
<</if>>
<</if>>
<<if $securityForceGiantRobot > 0>>
<br>
- /* 9 upgrades */
+ /* 11 upgrades */
<<if $securityForceGiantRobot == 1>>
An old world giant robot has been 'Borrowed'.
<<elseif $securityForceGiantRobot == 2>>
@@ -442,6 +454,8 @@ securityForceX */
<<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.
<<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.
+ <<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.
<</if>>
<</if>>
@@ -476,28 +490,34 @@ securityForceX */
<</if>>
<<if $securityForceSubmarine > 0>>
<br>
- /* 5 upgrades */
+ /* 6 upgrades */
<<if $securityForceSubmarine == 1>>
A basic submarine has been 'borrowed' from the old world.
<<elseif $securityForceSubmarine == 2>>
- Modernized the submarine's engines for silence.
+ Modernized the submarine's engines for speed.
<<elseif $securityForceSubmarine == 3>>
- Modernized the submarine's engines for silence.Upgraded the submarine's hull for silence.
+ Modernized the submarine's engines for speed and silence.
<<elseif $securityForceSubmarine == 4>>
- Modernized the submarine's engines for silence.Upgraded the submarine's hull for silence and weaponry.
+ Modernized the submarine's engines for speed and silence.Upgraded the submarine's hull for silence.
<<elseif $securityForceSubmarine == 5>>
- Modernized the submarine's engines for silence.Upgraded the submarine's hull for silence, weaponry and air scrubbers, allowing the sub to stay submerged for longer.
+ Modernized the submarine's engines for speed and silence.Upgraded the submarine's 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.
<</if>>
<</if>>
<<if $securityForceHeavyAmphibiousTransport > 0>>
<br>
- /* 3 upgrades */
+ /* 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.
<<elseif $securityForceHeavyAmphibiousTransport == 3>>
Modernized the heavy amphibious transport's armor and speed.
+ <<elseif $securityForceHeavyAmphibiousTransport == 4>>
+ Modernized the heavy amphibious transport's 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.
<</if>>
<</if>>
<</if>>
@@ -597,24 +617,24 @@ securityForceX */
<span id="result">
<<link "Ask _Name for some extra cash">><br>
<<replace "#result">>
- <<set _CashGift = $EnvCash1*Math.trunc($SFAO)*$Env>>
+ <<set $CashGift = Math.trunc(($cash*0.05)*($SFAO))*$Env>>
<<if random(1,100) > 50>>
<<if random(1,100) > 50>>
- _Name nods. "Sure boss," she says, "we had a bit of a haul this week. One of my sergeants convinced a woman to tell us where she had hidden her shit. Cut her up pretty bad, but she told us. Bunch of nice jewelry, I kept a nice piece for myself." She picks up a tablet on the table, tapping a few commands on it. "@@.green;There's your cut,@@ ¤<<print _CashGift>>."
+ _Name nods. "Sure boss," she says, "we had a bit of a haul this week. One of my sergeants convinced a woman to tell us where she had hidden her shit. Cut her up pretty bad, but she told us. Bunch of nice jewelry, I kept a nice piece for myself." She picks up a tablet on the table, tapping a few commands on it. "@@.green;There's your cut,@@ ¤<<print $CashGift>>."
<<else>>
- _Name smiles widely. "Sure boss," she says, "we pulled in some good shit this week. One of the boys found a real nice family hiding in a basement. 18-year old triplets. Brought in a good bit of cash." She picks up a tablet on the table, tapping a few commands on it. "@@.green;There's your cut,@@ ¤<<print _CashGift>>."
+ _Name smiles widely. "Sure boss," she says, "we pulled in some good shit this week. One of the boys found a real nice family hiding in a basement. 18-year old triplets. Brought in a good bit of cash." She picks up a tablet on the table, tapping a few commands on it. "@@.green;There's your cut,@@ ¤<<print $CashGift>>."
<</if>>
<<else>>
- _Name picks up a tablet. "Sure boss," she says, "we had a nice score this week. Looters fucked up and left a bunch of nice shit behind." She taps a few commands on the tablet. "@@.green;There's your cut,@@ ¤<<print _CashGift>>."
+ _Name picks up a tablet. "Sure boss," she says, "we had a nice score this week. Looters fucked up and left a bunch of nice shit behind." She taps a few commands on the tablet. "@@.green;There's your cut,@@ ¤<<print $CashGift>>."
<</if>>
<<set $securityForceGiftToken = 1>>
- <<set $cash += _CashGift>>
+ <<set $cash += $CashGift>>
<</replace>>
<</link>>
<<if $rep < 15000 && $CurrentTradeShowAttendance == 0>>
<<link "Ask The Colonel to put in a good word for you with her contacts">><br>
<<replace "#result">>
- <<set _GoodWords1 += 250+((Math.trunc($SFAO))*$Env)>>
+ <<set $GoodWords1 += 250+((Math.trunc($SFAO))*$Env)>>
<<if random(1,100) > 50>>
<<if random(1,100) > 50>>
The Colonel nods. "Sure boss," she says, "I still know a lot of people out there and they know my word means something. I'll tell them that yours does as well." She picks up a tablet on the table, tapping a few commands on it. "I just put the word out, boss. Your @@.green;reputation should be a bit better@@ now."
@@ -625,14 +645,14 @@ securityForceX */
The Colonel picks up a tablet. "Sure boss," she says, "I can talk you up a bit. This new gig has impressed a lot of people, they'll definitely listen when I speak." She taps a few commands on the tablet. "I just put the word out, boss. Your @@.green;reputation should be a bit better@@ now."
<</if>>
<<set $securityForceGiftToken = 1>>
- <<set $rep += _GoodWords1>>
+ <<set $rep += $GoodWords1>>
<</replace>>
<</link>>
<</if>>
<<if $arcologies[0].prosperity < 30 && $CurrentTradeShowAttendance == 0>>
<<link "Ask The Colonel to use her contacts to help the arcology's business community">><br>
<<replace "#result">>
- <<set _GoodWords2 = $EnvProsp+((Math.trunc($SFAO/100))*$Env)>>
+ <<set $GoodWords2 = $EnvProsp+((Math.trunc($SFAO/100))*$Env)>>
<<if random(1,100) > 50>>
<<if random(1,100) > 50>>
The Colonel nods. "Sure boss," she says, "I can convince some of my contacts to run their business through the markets here rather than another City." She picks up a tablet on the table, tapping a few commands on it. "@@.green;There should be a small increase in prosperity,@@ boss."
@@ -643,7 +663,7 @@ securityForceX */
The Colonel picks up a tablet. "Sure boss," she says, "I can ensure that the soldiers only use the escrow services here for their business." She taps a few commands on the tablet. "@@.green;There should be a small increase in prosperity,@@ boss."
<</if>>
<<set $securityForceGiftToken = 1>>
- <<set $arcologies[0].prosperity += _GoodWords2>>
+ <<set $arcologies[0].prosperity += $GoodWords2>>
<</replace>>
<</link>>
<</if>>
@@ -887,6 +907,10 @@ securityForceX */
<<set _airCost = 3250000>>
<<elseif $securityForceAircraftPower == 7>>
<<set _airCost = 5750000>>
+ <<elseif $securityForceAircraftPower == 8>>
+ <<set _airCost = 6750000>>
+ <<elseif $securityForceAircraftPower == 9>>
+ <<set _airCost = 7750000>>
<</if>>
<br><<link "Light and medium aircraft">>
<<replace "#resultY">><br><br>
@@ -895,7 +919,7 @@ securityForceX */
<</replace>>
<</link>> // Costs ¤<<print _airCost*$Env>> //
<</if>>
- <<if $securityForceAircraftPower == 5 || $securityForceAircraftPower == 8>>
+ <<if $securityForceAircraftPower == 5 || $securityForceAircraftPower == 10>>
<br>//$securityForceName has fully upgraded the air fleet to support it's activities.//
<<else>>
<br>//More barracks infrastructure upgrades are needed before the air fleet can be expanded.//
@@ -921,7 +945,7 @@ securityForceX */
<<set _spCost = 125000000>>
<<elseif $securityForceSpacePlanePower == 8>>
<<set _spCost = 175000000>>
- <<elseif $securityForceSpacePlanePower == 9>>
+ <<elseif $securityForceSpacePlanePower == 9 && $securityForceInfantryPower >= 10>>
<<set _spCost = 250000000>>
<<elseif $securityForceSpacePlanePower == 10>>
<<set _spCost = 350000000>>
@@ -1013,7 +1037,7 @@ securityForceX */
<</replace>>
<</link>> // Costs ¤<<print 2000000*$Env>> //
<</if>>
- <<if _DroneBay == 5 || _DroneBay == 6>>
+ <<if _DroneBay == 5 || _DroneBay == _DroneBayMax>>
<br>//$securityForceName has fully upgraded the drone bay to support it's activities.//
<<else>>
<br>//More barracks infrastructure upgrades are needed before the drone bay can be expanded.//
@@ -1085,8 +1109,10 @@ securityForceX */
<<set _robCost = 95000000>>
<<elseif $securityForceGiantRobot == 8>>
<<set _robCost = 105000000>>
- <<elseif $securityForceGiantRobot == 9>>
+ <<elseif $securityForceGiantRobot == 9 && $securityForceInfantryPower >= 10>>
<<set _robCost = 2750000000>>
+ <<elseif $securityForceGiantRobot == 10>>
+ <<set _robCost = 3150000000>>
<</if>>
<br><<link "Giant robot">>
<<replace "#resultZ">><br><br>
@@ -1095,7 +1121,7 @@ securityForceX */
<</replace>>
<</link>> // Costs ¤<<print _robCost*$Env>> //
<</if>>
- <<if $securityForceGiantRobot == 10 && ($terrain != "oceanic" && $terrain != "marine")>>
+ <<if $securityForceGiantRobot == 9 || $securityForceGiantRobot == 10 && ($terrain != "oceanic" && $terrain != "marine")>>
<br>//$securityForceName has fully upgraded the giant robot to support it's activities.//
<</if>>
@@ -1190,6 +1216,10 @@ securityForceX */
<<set _hatCost = 150000000>>
<<elseif $securityForceHeavyAmphibiousTransport == 2>>
<<set _hatCost = 250000000>>
+ <<elseif $securityForceHeavyAmphibiousTransport == 3>>
+ <<set _hatCost = 300000000>>
+ <<elseif $securityForceHeavyAmphibiousTransport == 4>>
+ <<set _hatCost = 300000000>>
<</if>>
<br><<link "Heavy amphibious transport">>
<<replace "#resultA">><br><br>
@@ -1198,7 +1228,7 @@ securityForceX */
<</replace>>
<</link>> // Costs ¤<<print _hatCost*$Env>> //
<</if>>
- <<if $securityForceHeavyAmphibiousTransport == 3 && ($terrain == "oceanic" || $terrain == "marine")>><br>//$securityForceName has fully upgraded the heavy amphibious transport to support it's activities.//<</if>>
+ <<if $securityForceHeavyAmphibiousTransport == 5 && ($terrain == "oceanic" || $terrain == "marine")>><br>//$securityForceName has fully upgraded the heavy amphibious transport to support it's activities.//<</if>>
</span>
<</replace>>
diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw
index bf401878f41479c7937f7b2a9c39544951291850..679c0f9d8dd50fc85bc0b61114ba1f6e9ea9a77c 100644
--- a/src/uncategorized/securityForceEOWReport.tw
+++ b/src/uncategorized/securityForceEOWReport.tw
@@ -1,6 +1,6 @@
:: Security Force EOW Report
-/*
+<<silently>>
The upgrades are currently ordered as:
Barracks(16)
securityForceArcologyUpgrades(16)
@@ -13,19 +13,19 @@ The upgrades are currently ordered as:
securityForceVehiclePower(7)
securityForceHeavyBattleTank(3)
<</if>>
- <<if $securityForceArcologyUpgrades >= 4>>Hangar(30)
- securityForceAircraftPower(8)
+ <<if $securityForceArcologyUpgrades >= 4>>Hangar(32)
+ securityForceAircraftPower(10)
securityForceSpacePlanePower(11)
securityForceFortressZeppelin(3)
securityForceAC130(5)
securityForceHeavyTransport(3)
<</if>>
- <<if $securityForceArcologyUpgrades >= 2>>Drone Bay(6)
- securityForceDronePower(6)
+ <<if $securityForceArcologyUpgrades >= 2>>Drone Bay(7)
+ securityForceDronePower(7)
<</if>>
- <<if $securityForceArcologyUpgrades >= 4>>Launch Bay(29)
- securityForceSatellitePower(17)
- securityForceGiantRobot(9)
+ <<if $securityForceArcologyUpgrades >= 4>>Launch Bay(32)
+ securityForceSatellitePower(18)
+ securityForceGiantRobot(11)
securityForceMissileSilo(3)
<</if>>
securityForceX
@@ -34,25 +34,35 @@ The upgrades are currently ordered as:
<<if $securityForceArcologyUpgrades >= 4>>Launch Bay(17)
securityForceSatellitePower(17)
<</if>>
- Naval Yard (12)
+ Naval Yard (15)
securityForceAircraftCarrier(4)
- securityForceSubmarine(5)
- securityForceHeavyAmphibiousTransport (3)
+ securityForceSubmarine(6)
+ securityForceHeavyAmphibiousTransport (4)
securityForceX
-*/
-<<set _Barracks = $securityForceArcologyUpgrades>>
-<<set _Armoury = $securityForceInfantryPower>>
-<<set _StimulantLab = $securityForceStimulantPower>>
-<<set _Garage = $securityForceVehiclePower+$securityForceHeavyBattleTank>>
-<<set _Hangar = $securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceAC130+$securityForceHeavyTransport>>
-<<set _DroneBay = $securityForceDronePower>>
-<<set _LaunchBayNO = $securityForceSatellitePower+$securityForceGiantRobot+$securityForceMissileSilo>>
-<<set _LaunchBayO = $securityForceSatellitePower>>
+
+<<set $SFNO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayNO+_FacilitySupport>>
+<<set $SFO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayO+_NavalYard+_FacilitySupport>>
+<<set _BarracksMax = 16>>
+<<set _ArmouryMax = 11>>
+<<set _StimulantLabMax = 9>>
+<<set _GarageMax = 10>>
+<<set _HangarMax = 32>>
+<<set _DroneBayMax = 7>>
+<<set _LaunchBayNOMax = 32>>
+<<set _LaunchBayOMax = 17>>
+<<set _FacilitySupportMax = 1>>
+<<set _NavalYardMax = 15>>
+
+<<set _maxNO = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayNOMax+_FacilitySupportMax>>
+<<set _maxO = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayOMax+_NavalYardMax+_FacilitySupportMax>>
+
+<<set _SFNOPercentage = _maxNO*_RaidingEfficienyPercentage>>
+<<set _SFOPercentage = _maxO*_RaidingEfficienyPercentage>>
+
<<if $terrain == "oceanic" || $terrain == "marine">>
<<set _NavalYard = $securityForceAircraftCarrier+$securityForceSubmarine+$securityForceHeavyAmphibiousTransport>>
<</if>>
-<<silently>>
/* Manpower Fluctuation Calculations - loss from attrition, random casualties, etc. Baseline is ~3%/week. Heavier for raiding/slaving, reduced for securing trade. Maxes out between 1000-1500, though never exactly that. If over 1500 for some reason, set to 1455-1495. If under 100, cannot fluctuate further negatively. */
/* Check for too many troopers, set to mid 1400s if so */
@@ -275,23 +285,6 @@ securityForceX
/* Facilities */
- <<set _BarracksMax = 16>>
- <<set _FacilitySupportMax = 1>>
- <<set _ArmouryMax = 11>>
- <<set _StimulantLabMax = 9>>
- <<set _GarageMax = 10>>
- <<set _HangarMax = 30>>
- <<set _DroneBayMax = 6>>
- <<set _LaunchBayNOMax = 29>>
- <<set _LaunchBayOMax = 17>>
- <<set _NavalYardMax = 12>>
-
- <<set _maxNO = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayNOMax+_FacilitySupportMax>>
- <<set _maxO = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayOMax+_NavalYardMax+_FacilitySupportMax>>
-
- <<set _SFNOPercentage = _maxNO*_RaidingEfficienyPercentage>>
- <<set _SFOPercentage = _maxO*_RaidingEfficienyPercentage>>
-
<<if $securityForceArcologyUpgrades > 0>>
<<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceArcologyUpgrades*_RaidingEfficienyPercentage)))>> <</if>>
<<if $securityForceInfantryPower > 0>>
@@ -464,8 +457,9 @@ securityForceX
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.
<</if>>
- <br> //Current Status://
-<<nobr>> ''Barracks:''
+ //Current facilities status://
+<<nobr>>
+<br> ''Barracks:''
<br>
/* 13 upgrades */
<<if $securityForceArcologyUpgrades == 0>>
@@ -610,7 +604,7 @@ securityForceX
<br><br>
''Hangar:''
<br>
-/* 8 upgrades */
+/* 10 upgrades */
<<if $securityForceAircraftPower == 0>>
The aerial fleet primarily consists of light transport VTOLs equipped with non-lethal weaponry.
<<elseif $securityForceAircraftPower == 1>>
@@ -629,6 +623,10 @@ securityForceX
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 the $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 the $securityForceName is amongst the most capable still in operation in the area.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.
+<<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.
<</if>>
<<if $securityForceSpacePlanePower > 0>>
<br>
@@ -684,6 +682,7 @@ securityForceX
<</if>>
<</if>>
<<if $securityForceHeavyTransport > 0>>
+<br>
/* 3 upgrades */
<<if $securityForceHeavyTransport == 1>>
A basic heavy transport has been 'borrowed' from the old world.
@@ -699,7 +698,7 @@ securityForceX
<br><br>
''Drone Bay:''
<br>
-/* 6 upgrades */
+/* 7 upgrades */
<<if $securityForceDronePower == 0>>
The drone bay contains a small number of 're-purposed' non-military drones from the arcology's original contingent.
<<elseif $securityForceDronePower == 1>>
@@ -713,7 +712,9 @@ securityForceX
<<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.
<<elseif $securityForceDronePower == 6>>
- The drone bay has acquired even lighter advanced armoured combat Drones with electromagnetic weaponry, advanced heavy Drones with electromagnetic support weaponry, and specialized Drones for reconnaissance, capture, and swarm tactics.
+ 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.
+<<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.
<</if>>
<</if>>
@@ -722,7 +723,7 @@ securityForceX
''Launch Bay:''
<<if $securityForceSatellitePower > 0>>
<br>
- /* 16 upgrades */
+ /* 18 upgrades */
<<if $securityForceSatellitePower == 1>>
A basic Satellite 'borrowed' from the old world.
<<elseif $securityForceSatellitePower == 2>>
@@ -754,14 +755,16 @@ securityForceX
<<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.
<<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 twelve feet.
+ 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.
<<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 one foot.
+ 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.
+ <<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.
<</if>>
<</if>>
<<if $securityForceGiantRobot > 0>>
<br>
- /* 9 upgrades */
+ /* 11 upgrades */
<<if $securityForceGiantRobot == 1>>
An old world giant robot has been 'Borrowed'.
<<elseif $securityForceGiantRobot == 2>>
@@ -781,6 +784,8 @@ securityForceX
<<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.
<<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.
+ <<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.
<</if>>
<</if>>
@@ -815,28 +820,34 @@ securityForceX
<</if>>
<<if $securityForceSubmarine > 0>>
<br>
- /* 5 upgrades */
+ /* 6 upgrades */
<<if $securityForceSubmarine == 1>>
A basic submarine has been 'borrowed' from the old world.
<<elseif $securityForceSubmarine == 2>>
- Modernized the submarine's engines for silence.
+ Modernized the submarine's engines for speed.
<<elseif $securityForceSubmarine == 3>>
- Modernized the submarine's engines for silence.Upgraded the submarine's hull for silence.
+ Modernized the submarine's engines for speed and silence.
<<elseif $securityForceSubmarine == 4>>
- Modernized the submarine's engines for silence.Upgraded the submarine's hull for silence and weaponry.
+ Modernized the submarine's engines for speed and silence.Upgraded the submarine's hull for silence.
<<elseif $securityForceSubmarine == 5>>
- Modernized the submarine's engines for silence.Upgraded the submarine's hull for silence, weaponry and air scrubbers which increases submerge time..
+ Modernized the submarine's engines for speed and silence.Upgraded the submarine's 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 which increases submerge time..
<</if>>
<</if>>
<<if $securityForceHeavyAmphibiousTransport > 0>>
<br>
- /* 3 upgrades */
+ /* 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.
<<elseif $securityForceHeavyAmphibiousTransport == 3>>
Modernized the heavy amphibious transport's armor and speed.
+ <<elseif $securityForceHeavyAmphibiousTransport == 4>>
+ Modernized the heavy amphibious transport's 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.
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 5965d4a3d8d1c760e655e2533efdea31b61c6361..93d686186a9275d4126df0d6bfb2a66e58a01d65 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -443,7 +443,7 @@
<<if $riotCenter == 1>>
<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
<</if>>
- <span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
+ <br><span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
<</if>>
<<if $cyberMod != 0 && $researchLab.built == "true">>
@@ -480,7 +480,7 @@
<<if $riotCenter == 1>>
<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
<</if>>
- <span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
+ <br><span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
<</if>>
<<if $cyberMod != 0 && $researchLab.built == "true">>
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index 5221186b90699a8b68b5b7adcee1f08ec81a325d..305b8d7da88f49065e242f314bf49cecbfd997e0 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -3598,7 +3598,7 @@ Your brand design is ''$brandDesign.''
<<if _combinedRule.growth.butt != "no default setting">>
<<if $args[0].butt < _combinedRule.growth.butt>>
<<set _priority = {drug: "butt injections", weight: (_combinedRule.growth.butt-$args[0].butt)/_combinedRule.growth.butt}, _priorities.push(_priority)>>
- <<elseif ($args[0].butt > _combinedRule.growth.butt) && $args[0].weight < 100 && ($arcologies[0].FSSlimnessEnthusiastResearch == 1)>>
+ <<elseif ($args[0].butt > _combinedRule.growth.butt+.5) && $args[0].weight < 100 && ($arcologies[0].FSSlimnessEnthusiastResearch == 1)>>
<<set _priority = {drug: "butt redistributors", weight: (1+(($args[0].butt-$args[0].buttImplant-_combinedRule.growth.butt)/_combinedRule.growth.butt))}, _priorities.push(_priority)>>
<</if>>
<</if>>