From 68abec78e0bc295f374bb7ac0de1e412fa329733 Mon Sep 17 00:00:00 2001
From: x <okp57855@psoxs.com>
Date: Sun, 12 Aug 2018 18:34:24 +1200
Subject: [PATCH] Additonal minor tweaking VI
---
src/SecExp/attackHandler.tw | 14 +++++------
src/SecExp/attackOptions.tw | 2 +-
src/SecExp/attackReport.tw | 4 +--
src/SecExp/authorityReport.tw | 5 ++++
src/SecExp/edicts.tw | 22 ++++++++--------
src/SecExp/rebellionHandler.tw | 2 +-
src/SecExp/seeUnit.tw | 4 +--
src/SecExp/unitsBattleReport.tw | 4 +--
src/SecExp/unitsRebellionReport.tw | 2 +-
src/SecExp/weaponsManufacturing.tw | 6 ++---
src/SecExp/widgets/battleWidgets.tw | 4 +--
src/gui/mainMenu/AlphaDisclaimer.tw | 2 +-
src/init/storyInit.tw | 2 +-
.../JobFulfillmentCenterOrder.tw | 4 +--
src/pregmod/eliteTakeOverFight.tw | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 2 +-
src/uncategorized/genericPlotEvents.tw | 25 +++++++++----------
src/uncategorized/manageArcology.tw | 2 +-
src/uncategorized/nextWeek.tw | 2 +-
src/uncategorized/nonRandomEvent.tw | 6 ++---
20 files changed, 59 insertions(+), 57 deletions(-)
diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw
index 535f45571e8..106f4b6b090 100644
--- a/src/SecExp/attackHandler.tw
+++ b/src/SecExp/attackHandler.tw
@@ -97,22 +97,22 @@
<<set _enemyMod = 1.5>>
<<set _SFMod = 1.5>>
<<set _turns = $maxTurns * 2>>
- <<if $SF.Active== 1 && $SF.Toggle == 1>>
+ <<if $SF.Active && $SF.Toggle>>
<<if $SFUnit.Firebase >= 7>>
- <<set _atkMod += ($Firebase - 6) * 0.05>>
+ <<set _atkMod += ($SFUnit.Firebase - 6) * 0.05>>
<</if>>
<<if $SFUnit.GunS >= 1>>
<<set _defMod += $SFUnit.GunS * 0.05>>
<</if>>
- <<if $SFUnit.Satellite >= 11>>
- <<set _atkMod += ($SF.Satellite - 10) * 0.05>>
+ <<if $SFUnit.Satellite >= 5>>
+ <<set _atkMod += ($SFUnit.Satellite - 5) * 0.05>>
<</if>>
<<if $SFUnit.GiantRobot >= 6>>
- <<set _defMod += (SF.GiantRobot - 5) * 0.05>>
+ <<set _defMod += ($SFUnit.GiantRobot - 5) * 0.05>>
<</if>>
<<if $SFUnit.MissileSilo >= 1>>
- <<set _atkMod += SF.MissileSilo * 0.05>>
- <<set _defMod += SF.MissileSilo * 0.05>>
+ <<set _atkMod += $SFUnit.MissileSilo * 0.05>>
+ <<set _defMod += $SFUnit.MissileSilo * 0.05>>
<</if>>
<</if>>
<</if>>
diff --git a/src/SecExp/attackOptions.tw b/src/SecExp/attackOptions.tw
index e2a820c019c..b5c625e6208 100644
--- a/src/SecExp/attackOptions.tw
+++ b/src/SecExp/attackOptions.tw
@@ -391,7 +391,7 @@ Units about to be deployed:
<</for>>
<</if>>
-<<if $majorBattle == 1 && $SF.Active== 1>>
+<<if $majorBattle == 1 && $SF.Active>>
<br>
<br>
The size of the incoming attack warrants the intervention of the security force in its full force. They will <span id="SFI">not intervene</span>.
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index 7669e03a3cd..50ff06dbdc1 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -1421,7 +1421,7 @@
<br>
<<include "unitsBattleReport">>
- <<if $SF.Toggle && ($Firebase >= 7 || $SFUnit.GunS >= 1 || $SFUnit.Satellite >= 11 || SF.GiantRobot >= 6 || SF.MissileSilo >= 1)>>
+ <<if $SF.Toggle && ($SFUnit.Firebase >= 7 || $SFUnit.GunS >= 1 || $SFUnit.Satellite >= 5 || $SFUnit.GiantRobot >= 6 || $SFUnit.MissileSilo >= 1)>>
/* SF upgrades effects */
<br>
<br>
@@ -1431,7 +1431,7 @@
<<if $SFUnit.GunS >= 1>>
The gunship gave our troops an undeniable advantage in recon capabilities, air superiority and fire support.
<</if>>
- <<if $SFUnit.Satellite >= 11>>
+ <<if $SFUnit.Satellite >= 5>>
The $SF.Lower SF.Satellite devastating power was employed with great efficiency against the enemy.
<</if>>
<<if $SFUnit.GiantRobot >= 6>>
diff --git a/src/SecExp/authorityReport.tw b/src/SecExp/authorityReport.tw
index 11370b02731..521c1af05e6 100644
--- a/src/SecExp/authorityReport.tw
+++ b/src/SecExp/authorityReport.tw
@@ -106,6 +106,11 @@ Your authority is
<<set _authGrowth += 12 * $activeUnits>>
<</if>>
+<<if $SF.Toggle && $SF.Active && $SF.Units > 10>>
+ Having a powerful special force, increases your authority.
+ <<set _authGrowth += ($SF.Units/10)))>>
+<</if>>
+
<<if $arcologies[0].FSChattelReligionist >= 90>>
Religious organizations have a tight grip on the minds of your residents and their dogma greatly helps your authority grow.
<<set _authGrowth += $arcologies[0].FSChattelReligionist>>
diff --git a/src/SecExp/edicts.tw b/src/SecExp/edicts.tw
index a0543b52d1e..2501501d50a 100644
--- a/src/SecExp/edicts.tw
+++ b/src/SecExp/edicts.tw
@@ -47,13 +47,13 @@
<<if $SFSupportLevel > 0 && $SF.Toggle>>
<br><br>__Special Force:__
<<if $SFSupportLevel === 1>>
- <br>''Equipment provision:'' $SF.Lower is providing the security HQ with advanced equipment, boosting its efficiency.
+ <br>''Equipment provision:'' $SF.Caps is providing the security HQ with advanced equipment, boosting its efficiency.
[[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 1000, $reqHelots += 5]]
<<elseif $SFSupportLevel === 2>>
<br>''Personnel training:'' $SF.Caps is currently providing advanced equipment and training to security HQ personnel.
[[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 2000, $reqHelots += 5]]
<<elseif $SFSupportLevel === 3>>
- <br>''Troops detachment:'' $SF.Lower has currently transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
+ <br>''Troops detachment:'' $SF.Caps has currently transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
[[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 3000, $reqHelots += 5]]
<<elseif $SFSupportLevel === 4>>
<br>''Full support:''$SF.Caps is currently providing its full support to the security department, while transferring troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
@@ -310,39 +310,39 @@
<<if $SF.Active && $SFSupportLevel < 5 && $SF.Toggle>>
<br><br>__Special Force:__
<<if $SFSupportLevel == 0 && $reqHelots > 5>>
- <br>''Equipment provision:'' $SF.Lower will provide the security HQ with advanced equipment.
+ <br>''Equipment provision:'' $SF.Caps will provide the security HQ with advanced equipment.
<<if $authority >= 1000>>
[[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 1000, $reqHelots -= 5]]
<<else>>
<br>//Not enough Authority.//
<</if>>
<br> //Will lower the amount of personnel necessary to man the security HQ by 5, but will incur upkeep costs.//
- <<elseif $SFSupportLevel === 1 && $Firebase >= 4 && $reqHelots > 5>>
- <br>''Personnel training:'' $SF.Lower will provide the security HQ personnel with advanced training.
+ <<elseif $SFSupportLevel === 1 && $SFUnit.Firebase >= 4 && $reqHelots > 5>>
+ <br>''Personnel training:'' $SF.Caps will provide the security HQ personnel with advanced training.
<<if $authority >= 1000>>
[[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 2000, $reqHelots -= 5]]
<<else>>
<br>//Not enough Authority.//
<</if>>
<br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.//
- <<elseif $SFSupportLevel === 2 && $Firebase >= 6 && $reqHelots > 5>>
- <br>''Troops detachment:'' $SF.Lower will provide troops to the security department.
+ <<elseif $SFSupportLevel === 2 && $SFUnit.Firebase >= 6 && $reqHelots > 5>>
+ <br>''Troops detachment:'' $SF.Caps will provide troops to the security department.
<<if $authority >= 1000>>
[[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 3000, $reqHelots -= 5]]
<<else>>
<br>//Not enough Authority.//
<</if>>
<br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.//
- <<elseif $SFSupportLevel === 3 && $Firebase >= 6 && $reqHelots > 5>>
- <br>''Full Support:'' $SF.Lower will give the security department its full support.
+ <<elseif $SFSupportLevel === 3 && $SFUnit.Firebase >= 6 && $reqHelots > 5>>
+ <br>''Full Support:'' $SF.Caps will give the security department its full support.
<<if $authority >= 1000>>
[[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 3000, $reqHelots -= 5]]
<<else>>
<br>//Not enough Authority.//
<</if>>
<br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.//
- <<elseif $SFSupportLevel === 4 && $Firebase >= 13 && $reqHelots > 5>>
- <br>''Network assistance:'' $SF.Lower will assist the security department with installing a local version of their custom network.
+ <<elseif $SFSupportLevel === 4 && $SFUnit.Firebase === 10 && $reqHelots > 5>>
+ <br>''Network assistance:'' $SF.Caps will assist the security department with installing a local version of their custom network.
<<if $authority >= 1000>>
[[Implement|edicts][$SFSupportLevel++, $cash -=50000, $authority -= 1000, $SFSupportUpkeep += 4000, $secHQUpkeep += 1000, $reqHelots -= 5]]
<<else>>
diff --git a/src/SecExp/rebellionHandler.tw b/src/SecExp/rebellionHandler.tw
index 0a5b11ad1c4..67a56b0ec31 100644
--- a/src/SecExp/rebellionHandler.tw
+++ b/src/SecExp/rebellionHandler.tw
@@ -136,7 +136,7 @@
<</if>>
<</for>>
-<<if $SF.Active == 1>>
+<<if $SF.Active && $SF.Toggle>>
<<set $SFatk = 0>>
<<set $SFdef = 0>>
<<set $SFhp = 0>>
diff --git a/src/SecExp/seeUnit.tw b/src/SecExp/seeUnit.tw
index 3b3064ae02a..f878bb95203 100644
--- a/src/SecExp/seeUnit.tw
+++ b/src/SecExp/seeUnit.tw
@@ -26,7 +26,7 @@
<</link>>
Invest in the development of more refined controls for your drones to increase the maximum number of drones in the unit.
<br>//Costs <<print cashFormat(5000)>> per upgrade and each will increase the max by 10//
- <<elseif $secBots.maxTroops < 100 && $SFSupportLevel >= 1>>
+ <<elseif $secBots.maxTroops < 100 && $SFSupportLevel >= 1 && $SF.Active>>>
<br>
<<link "Refine the drone network with $SF.Lower assistance">>
<<set $secBots.maxTroops += 10>>
@@ -35,7 +35,7 @@
<</link>>
Utilize the technological developments made by $SF.Lower to further improve the control matrix of the security drones.
<br>//Costs <<print cashFormat(5000 + 10 * $secBotsUpgradeCost * $secBots.equip)>> and will increase the max by 10//
- <<elseif $SFSupportLevel < 1 && $SF.Active== 1>>
+ <<elseif $SFSupportLevel < 1 && $SF.Active>>
There's little left to improve in the matrix. However support from $SF.Lower might give some more room from improvement.
<<else>>
There's little left to improve in the matrix. Your control systems are at top capacity and won't be able to handle a bigger drone unit.
diff --git a/src/SecExp/unitsBattleReport.tw b/src/SecExp/unitsBattleReport.tw
index 6156a88ef07..d2ce2a7ebcd 100644
--- a/src/SecExp/unitsBattleReport.tw
+++ b/src/SecExp/unitsBattleReport.tw
@@ -7,7 +7,7 @@
<</if>>
<<if $SFIntervention === 1 && $SF.Toggle>>
<br>
- <<print $SFUnit.Troops>> soldiers from $SF.Lower joined the battle: no casualties suffered.
+ <<print commaNum($SFUnit.Troops)>> soldiers from $SF.Lower joined the battle: no casualties suffered.
<</if>>
<<if $deployingMilitia == 1>>
<<for _j = 0; _j < $militiaUnits.length; _j++>>
@@ -126,7 +126,7 @@
<br>
<<set _loss = _lossesList.pluck()>>
<<set _loss = Math.clamp(_loss,0,$SFUnit.Troops)>>
- <<print commaNum($SFUnit.Troops)>> soldiers from the $SF.Lower joined the battle:
+ <<print commaNum($SFUnit.Troops)>> soldiers from $SF.Lower joined the battle:
<<if _loss <= 0>>
no casualties
<<elseif _loss <= 10>>
diff --git a/src/SecExp/unitsRebellionReport.tw b/src/SecExp/unitsRebellionReport.tw
index 00ca9c2fb46..c847a46a8f2 100644
--- a/src/SecExp/unitsRebellionReport.tw
+++ b/src/SecExp/unitsRebellionReport.tw
@@ -256,7 +256,7 @@
<<elseif $losses > 0>>
/* if the losses are more than zero */
/* generates a list of randomized losses, from which each unit picks one at random */
- <<if $SF.Active== 1>>
+ <<if $SF.Active && $SF.Toggle>>
<<set $deployedUnits++>>
<</if>>
<<if $irregulars > 0>>
diff --git a/src/SecExp/weaponsManufacturing.tw b/src/SecExp/weaponsManufacturing.tw
index 7b8b86c8e7d..4f38d49702a 100644
--- a/src/SecExp/weaponsManufacturing.tw
+++ b/src/SecExp/weaponsManufacturing.tw
@@ -322,8 +322,8 @@ __Upgrades__:
<br>//Will take _time weeks, cost <<print cashFormat(120000*$HackingSkillMultiplier)>> and will increase the base hp and morale values of human troops.//
<</if>>
<br>
- <<if $SFUnit.Active === 1 && $SFUnit.Toggle>>
- <<if !$completedUpgrades.includes(6) && $weapLab >= 2 && $SFSupportLevel >= 2 && $Firebase >= 7>>
+ <<if $SFUnit.Active && $SFUnit.Toggle>>
+ <<if !$completedUpgrades.includes(6) && $weapLab >= 2 && $SFSupportLevel >= 2 && $SFUnit.Firebase >= 7>>
<br>
<<link "Develop combined training regimens with $SF.Lower">>
<<set $currentUpgrade = {
@@ -369,7 +369,7 @@ __Upgrades__:
You fully upgraded your human troops.
<<elseif $humanUpgrade.attack >= 2 || $humanUpgrade.hp >= 2 || $humanUpgrade.morale >= 20 || $humanUpgrade.defense >= 2>>
You fully upgraded your human troops.
- <<if ($humanUpgrade.attack < 4 || $humanUpgrade.hp < 4 || $humanUpgrade.morale < 40 || $humanUpgrade.defense < 4) && (($SFSupportLevel >= 2 && $Firebase >= 7) || ($SFSupportLevel >= 4 && $SFUnit.Drugs >= 8) || ($SFSupportLevel >= 5))>>
+ <<if ($humanUpgrade.attack < 4 || $humanUpgrade.hp < 4 || $humanUpgrade.morale < 40 || $humanUpgrade.defense < 4) && (($SFSupportLevel >= 2 && $SFUnit.Firebase >= 7) || ($SFSupportLevel >= 4 && $SFUnit.Drugs >= 8) || ($SFSupportLevel >= 5))>>
With support from $SF.Lower, however, we may be able to further upgrade our troops.
<</if>>
<<elseif $weapLab < 3>>
diff --git a/src/SecExp/widgets/battleWidgets.tw b/src/SecExp/widgets/battleWidgets.tw
index 61acf42f645..2bc955cd613 100644
--- a/src/SecExp/widgets/battleWidgets.tw
+++ b/src/SecExp/widgets/battleWidgets.tw
@@ -10,7 +10,7 @@
<<set $SFatk = Math.trunc(0.65 * _upgradesSum)>>
<<set $SFdef = Math.trunc(0.40 * _upgradesSum)>>
/* hp */
- <<set $carriableSoldiers = 125 * ($SFUnit.GunS + $SFUnit.Vehicles)>>
+ <<set $carriableSoldiers = 125 * ($SFUnit.GunS + $SFUnit.Vehicles + $SFUnit.AirForce)>>
<<if !isInt($carriableSoldiers)>>
<<set $carriableSoldiers = $SFUnit.Troops / 10>>
<</if>>
@@ -111,7 +111,7 @@
<<set _troops += $mercUnits[_i].troops>>
<</if>>
<</for>>
- <<if $SF.Active== 1>>
+ <<if $SF.Active && $SF.Toggle>>
<<set _troops += $carriableSoldiers>>
<</if>>
<<set $troopCount = _troops>>
diff --git a/src/gui/mainMenu/AlphaDisclaimer.tw b/src/gui/mainMenu/AlphaDisclaimer.tw
index d8ff768cb4a..42df6073ea9 100644
--- a/src/gui/mainMenu/AlphaDisclaimer.tw
+++ b/src/gui/mainMenu/AlphaDisclaimer.tw
@@ -1,7 +1,7 @@
:: Alpha disclaimer
<<set $ui = "start">>\
-//version $ver build $releaseID commit 234b925a commit 234b925a commit 234b925a commit 234b925a commit 234b925a commit 234b925a commit 8cf48426 commit 8cf48426 commit 8cf48426//
+//version $ver build $releaseID//
@@.green;//Mod: expanded age ranges and other tweaks 2016-08-30//@@ @@.darkred;+SV@@
@@.green;//Mod: extra preg content and other crap//@@
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 76cf3f870b5..e671489c0ca 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1267,7 +1267,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
/* INCORPORATED MODS */
-/* SFVAR */ <<set $SF = Object.assign({}, $SF, {Toggle:0})>>
+/*SFVAR*/ <<set $SF = Object.assign({}, $SF, {Toggle:0, Active: -1})>>
/* Misc mod variables */
diff --git a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw
index 003d26c0da7..5153d19c200 100644
--- a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw
+++ b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw
@@ -11,9 +11,9 @@
<<link "Security">>
<<replace "#JobType">>
<br>
- <<if $SF.Toggle == 1>>
+ /*<<if $SF.Active && $SF.Toggle>>
<br>[[Lieutenant Colonel|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Lieutenant Colonel"]]
- <</if>>
+ <</if>>*/
<br>[[Bodyguard|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Bodyguard"]]
<br>[[Wardeness|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Wardeness"]]
<br>[[Return|JobFulfillmentCenterOrder]]
diff --git a/src/pregmod/eliteTakeOverFight.tw b/src/pregmod/eliteTakeOverFight.tw
index 020e6d24ed8..b2ce0b0eec2 100644
--- a/src/pregmod/eliteTakeOverFight.tw
+++ b/src/pregmod/eliteTakeOverFight.tw
@@ -242,7 +242,7 @@
<<set $eliteFate = 2>>
<<goto "eliteTakeOverResult">>
<</link>>
-<<elseif $SpecialForcesMessageSent == 1>>
+<<elseif $SpecialForcesMessageSent>>
It is now that a squad of $SF.Lower makes their entrance, pointing their guns at the <<if $eliteLeft < $eliteTotal>>remaining<</if>> elite.
The officer asks "your orders <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>?"
<br>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index f2ff32712de..2035df9a4fb 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -771,7 +771,7 @@
<<set $prisonCircuitIndex = random(0,$prisonCircuit.length-1)>>
<</if>>
-/* SFVAR */ <<if !$securityForceEventSeen>> <<set $SFMODToggle = -1>> <</if>>
+/*SFVAR*/ <<if !$securityForceEventSeen>> <<set $SFMODToggle = -1>> <</if>>
<<set $SF = Object.assign({}, $SF, {Toggle:$SFMODToggle, Active:$securityForceActive})>>
<<unset $SFMODToggle, $securityForceActive, $securityForceCreate, $securityForceEventSeen>>
<<if $SF.Toggle && $SF.Active>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 41346b7d528..8d55e8b8900 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -1002,11 +1002,11 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<case "aid invitation">>
-<<set $PAid = 0>>
-<<if ($SF.Active > 1) && ($securityForceVehiclePower >= 0)>>
- <<set _price = 5000>>
-<<else>>
- <<set _price = 10000>>
+<<set $PAid = 0>> <<set _price = 10000>>
+<<if $PC.career === "engineer"||$PC.career ==="mercenary"||$PC.engineering >= 100||$PC.warfare >= 100>>
+ <<set _price/2>>
+<<elseif $PC.engineering >= 50||$PC.warfare >= 50>>
+ <<set _price/.75>>
<</if>>
<<link "Agree">>
<<replace "#result">>
@@ -1023,14 +1023,13 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<</link>>
<br><<link "Airlift them into slavery">>
<<replace "#result">>
- <<if $SF.Active == 0>>
- You send your personal VTOL bird to the shop for some immediate and very expensive modifications to its cargo and passenger area. Since this will take several days, you stall the supplicants. Their situation isn't truly dire yet, and they can wait. They are extremely grateful, though they would be less hopeful if they knew the true nature of the aircraft coming to retrieve them.
- <<set $PAid = 1>>
- <<set $cash -= _price>>
- <<elseif ($SF.Active > 1) && ($securityForceVehiclePower >= 0)>>
- You ask The Colonel to get the garage to modify your personal VTOL's cargo and passenger area, saving on labor costs however it will still take them several days to make the necessary modifications. So your only choice is to stall the supplicants. Their situation isn't truly dire yet, and they can wait. They are extremely grateful, though they would be less hopeful if they knew the true nature of the aircraft coming to retrieve them.
- <<set $PAid = 1>>
- <<set $cash -= _price>>
+ <<if ($PC.career === "engineer"||$PC.career ==="mercenary"||$PC.engineering >= 50||$PC.warfare >= 50)>>
+ You decide to do the work yourself, saving on labor costs however it will still take several days to make the necessary modifications. So your only choice is to
+ <<else>>
+ You send your personal VTOL bird to the shop for some immediate and very expensive modifications to its cargo and passenger area. Since this will take still several days, you
+ <</if>>
+ stall the supplicants. Their situation isn't truly dire yet, and they can wait. They are extremely grateful, though they would be less hopeful if they knew the true nature of the aircraft coming to retrieve them.
+ <<set $PAid = 1,$cash -= _price>>
<</if>>
<</replace>>
<</link>> //This will cost <<print cashFormat(_price)>>//
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 74cb5047b5c..ebad6b7e64d 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -278,7 +278,7 @@ Your slaves have participated in approximately <<print commaNum($oralTotal+$vagi
<<if $secExp == 1 && $battlesEnabled == 1>>
<br><br>
-<<if $SF.Active== 0>>
+<<if !$SF.Active && $SF.Toggle>>
Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower)>> total soldiers.
<<elseif $SF.Active && $SF.Toggle>>
Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $SFUnit.Troops)>> total soldiers of which <<print commaNum($SFUnit.Troops)>> under the security force command and the rest under your direct control.
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index ef8bca47ec4..c81efc14861 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -300,7 +300,7 @@
/% These are variables that either should be made into _temp vars or should be Zeroed out once done with them instead of here. This can also interfere with debugging or hide NaN's as zeroing things out would clear a NaN. Also could stop from NaN's getting worse? %/
/% Integer and float variables. No real need to zero them out but doesn't hurt to have them in a known state, though this might mask variables NaN'ing out. Takes up the least amount of Memory besides a "" string. %/
-<<set $averageProsperity = 0, $beauty = 0, $beautyMultiplier = 0, $boobsID = -1, $boobsInterestTargetID = -1, $brideSlave = -1, $buttslutID = -1, $buttslutInterestTargetID = -1, $cumslutID = -1, $FResult = 0, $groomSlave = -1, $humiliationID = -1, $humiliationInterestTargetID = -1, $i = 0, $individualCosts = 0, $influenceBonus = 0, $j = 0, $masochistID = -1, $masochistInterestTargetID = -1, $opinion = 0, $r = 0, $subID = -1, $submissiveInterestTargetID = -1, $weddingSlaveID = -1, $NamingColonel = 0, $mother = -1, $daughter = -1, $devMother = -1, $devDaughter = -1, $alphaTwin = -1, $betaTwin = -1, $youngerSister = -1, $olderSister = -1, $recruiterSlave = -1>>
+<<set $averageProsperity = 0, $beauty = 0, $beautyMultiplier = 0, $boobsID = -1, $boobsInterestTargetID = -1, $brideSlave = -1, $buttslutID = -1, $buttslutInterestTargetID = -1, $cumslutID = -1, $FResult = 0, $groomSlave = -1, $humiliationID = -1, $humiliationInterestTargetID = -1, $i = 0, $individualCosts = 0, $influenceBonus = 0, $j = 0, $masochistID = -1, $masochistInterestTargetID = -1, $opinion = 0, $r = 0, $subID = -1, $submissiveInterestTargetID = -1, $weddingSlaveID = -1, $x = 0, $mother = -1, $daughter = -1, $devMother = -1, $devDaughter = -1, $alphaTwin = -1, $betaTwin = -1, $youngerSister = -1, $olderSister = -1, $recruiterSlave = -1>>
/% Other arrays %/
<<set $events = [], $RESSevent = [], $RESSTRevent = [], $RETSevent = [], $RECIevent = [], $RecETSevent = [], $REFIevent = [], $REFSevent = [], $PESSevent = [], $PETSevent = [], $FSAcquisitionEvents = [], $FSNonconformistEvents = [], $qualifiedNicknames = [], $REAnalCowgirlSubIDs = [], $REButtholeCheckinIDs = [], $recruit = [], $RETasteTestSubIDs = [], $devotedSlaves = [], $rebelSlaves = [], $REBoobCollisionSubIDs = [], $REIfYouEnjoyItSubIDs = [], $RESadisticDescriptionSubIDs = [], $REShowerForceSubIDs = [], $RESimpleAssaultIDs = [], $RECockmilkInterceptionIDs = [], $REInterslaveBeggingIDs = [], $bedSlaves = [], $qualifiedFS = [], $eligibleSlaves = [], $slavesInLine = []>>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index cc2bcf51da1..71986cc5264 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -2,8 +2,6 @@
<<set $showEncyclopedia = 0, $activeSlave = 0, $eventSlave = 0>>
-<<if $SF.Toggle && $SF.Active!== 0 && $SF.Active!== 1>>
- <<set $SF.Active = -1>> <</if>>
<<if $plot>>
<<set _effectiveWeek = $week-$nationHate>>
@@ -128,9 +126,9 @@
<<goto "P peacekeepers independence">>
<<elseif def $peacekeepers && $peacekeepers.strength >= 50 && $peacekeepers.influenceAnnounced == 0>>
<<goto "P peacekeepers influence">>
-<<elseif $SF.Toggle && _effectiveWeek >= 80 && $SF.Active=== -1>>
+<<elseif $SF.Toggle && _effectiveWeek >= 80 && $SF.Active === -1>>
<<goto "Security Force Proposal">>
-<<elseif $SF.Toggle && $SF.Active === -1>>
+<<elseif $SF.Toggle && $SF.Active>>
<<goto "Security Force Naming-Colonel">>
<<elseif ($cash > 30000) && ($rep > 4000) && ($corpAnnounced == 0)>>
<<goto "P Corp Announcement">>
--
GitLab