diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index d0c43b9ad53cc9d6e8152e555f9e67e9591d15db..4914efdb435afb7676b25abe4907a356cd09b094 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -982,13 +982,13 @@ Currently
<br><br>
__''Mods''__
-<br>
-<<if $SFMODToggle == 1>>
- The Special Force Mod is ''enabled.''
-[[Disable|Intro Summary][$SFMODToggle = 0]]
+<br>The Special Force Mod is
+<<if $SF.Toggle>>
+ ''enabled.''
+[[Disable|Intro Summary][$SF.Toggle = 0]]
<<else>>
- The Special Force Mod is ''disabled.''
-[[Enable|Intro Summary][$SFMODToggle = 1]]
+ ''disabled.''
+[[Enable|Intro Summary][$SF.Toggle = 1]]
<</if>>
<br>
// This mod initially from anon1888 but expanded by SFanon offers a lategame special (initially, security but changed to Special in order to try and reduce confusion with crimeanon's separate Security Expansion mod) force, triggered around week 80. It is non-canon where it conflicts with canonical updates to the base game.//
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 766e0f06a22d0643ab10f44dc9de48f3e41283c2..2da92c1ee7dea52f82d9636985fb37b89c9dfa3d 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -3244,7 +3244,7 @@ Error: bad title.
| [[Battles in Security Expansion|Encyclopedia][$encyclopedia = "Battles"]]
<</if>>
-<<if $securityForceActive>>
+<<if $SF.Active>>
<<if $encyclopedia != "Special Force">>
<br>[[Special Force Mod|Encyclopedia][$encyclopedia = "Special Force"]]
<</if>>
diff --git a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw
index 072a815c75f482062a0b1ff00de50000342c79b4..5153d19c20045dd8682fe9e3fc5775d660f8ca1a 100644
--- a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw
+++ b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw
@@ -11,9 +11,9 @@
<<link "Security">>
<<replace "#JobType">>
<br>
- <<if $SFMODToggle == 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/SecForceEX/TrickShotNight.tw b/src/pregmod/SecForceEX/TrickShotNight.tw
new file mode 100644
index 0000000000000000000000000000000000000000..206a35ed7214682e4d2a6f5beb7cf00b20f155a4
--- /dev/null
+++ b/src/pregmod/SecForceEX/TrickShotNight.tw
@@ -0,0 +1,105 @@
+:: Trick Shot Night [nobr]
+
+<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check">>
+
+Despite your direct elevator, interaction with the majority of your security force is relatively scarce. Aside from mutually exchanged nods in the firebase and the occasional briefing, your $SF.Lower enjoy a degree of autonomy.
+
+<br><br>On a particularly lackadaisical evening, you find yourself alerted to a message alert by $assistantName.
+<<if $assistant > 0>>
+ "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, a message from $SF.Lower." She pauses before continuing. "It seems they're asking if you'd like to join their trick shot night."
+<<else>>
+ It informs you that $SF.Lower have sent a message asking you to join them at their trick shot night.
+<</if>>
+
+<br><br> <span id="result"> <<link "Politely decline">>
+ <<replace "#result">>
+ You inform $SF.Lower that you aren't planning to attend. A short while later, you receive a message from them stating that their invitation is an open one and that you're welcome to join in another night.
+ <</replace>>
+<</link>>
+
+<<if $cash < 500000>>
+ <br>//You lack the necessary funds to attend.//
+<<else>> /* cash >= 500000 */
+
+<br><<link "Attend the trick shot night">>
+ <<replace "#result">> <<set $PC.warfare += 1>>
+ You instruct to $assistantName to inform $SF.Lower that you will be attending their trick shot night, and after settling your affairs in the penthouse you head down to the firebase. The atmosphere in the firebase is casual, especially in comparison to the usual situations you meet them, though your security force still maintain some measure of decorum towards you as their employer. Eventually, you settle in at the table with a handful of $SF.Lower officers and cash in your @@.yellowgreen;<<print cashFormat(500000)>>@@ into bullets. All that remains is to decide your strategy for the night.
+ <br><br> <span id="bountyresult">
+
+ <<link "Play it safe">>
+ <<replace "#bountyresult">>
+ <<if random(1,100) > 50>>
+ Despite your attempts to mitigate risk and play the safest shots possible, it seems lady luck has conspired against you this evening. However, even when your last bullet is shot, your security force pitch you a few bullets to keep you in the game for the rest of the night. You may have lost most of your ¤, but it seems you've @@.green;made some friends.@@
+ <<set $rep += 1000, $cash -= 250000>>
+ <<else>>
+ While a careful eye for accuracy has buoyed you through the evening, ultimately lady luck is the decider in handing you the win in a number of close shots. Unfortunately your meticulous play limited your chance at a larger payout, and you only come away from the evening with @@.yellowgreen;<<print cashFormat(100000)>>@@ more than you arrived with and @@.green;the respect of your security force.@@
+ <<set $rep += 1000, $cash += 100000>>
+ <</if>>
+ <</replace>>
+ <</link>>
+
+ <br> <<link "Up the ante">>
+ <<replace "#bountyresult">>
+ Some aggressive play and an eye for riling up your fellow players has resulted in an immense payout, and all but one of your adversaries have folded as the situation has escalated. The only player still in contention is a wily old mercenary, the veteran of her fair share of battles on the battlefield and at the firing range. She's short on bullets, however, and she'll have to buy in with something else as collateral.
+ <br><br> <span id="aliveresult">
+
+ <<link "A year of servitude">>
+ <<replace "#aliveresult">>
+ <<if random(1,100) > 50>>
+ For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up her spoils, the other security force clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
+ <<set $rep += 1000, $cash -= 500000>>
+ <<else>>
+ For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck has rendered you the victor. A silence falls over the room as the result is declared, but after some time your opponent breaks the hush by joking that life as your slave is probably easier than fighting for $arcologies[0].name. After some awkward laughter the night continues, and at the end your former mercenary joins you on your trip back to the penthouse to submit to processing and to begin her new life as your sexual servant. She's not young, but she's tough and not distrusting of you due to her service in $SF.Lower.
+ <br>
+ <<set $activeSlaveOneTimeMinAge = 25>>
+ <<set $activeSlaveOneTimeMaxAge = 35>>
+ <<set $one_time_age_overrides_pedo_mode = 1>>
+ <<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
+ <<include "Generate XX Slave">>
+ <<set $activeSlave.origin = "$He put herself up as collateral at a trick shot game, and lost.">>
+ <<set $activeSlave.career = "a soldier">>
+ <<set $activeSlave.indentureRestrictions = 2>>
+ <<set $activeSlave.indenture = 52>>
+ <<if $activeSlave.eyes == -2>>
+ <<set $activeSlave.eyes = -1>>
+ <</if>>
+ <<set $activeSlave.devotion = random(45,60)>>
+ <<set $activeSlave.trust = random(55,65)>>
+ <<set $activeSlave.health = random(60,80)>>
+ <<set $activeSlave.muscles = 60>>
+ <<if $activeSlave.weight > 130>>
+ <<set $activeSlave.weight -= 100>>
+ <<set $activeSlave.waist = random(-10,50)>>
+ <</if>>
+ <<set $activeSlave.anus = 0>>
+ <<set $activeSlave.analSkill = 0>>
+ <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.behavioralFlaw = "arrogant">>
+ <<set $activeSlave.hStyle = "buzzcut">>
+ <<include "New Slave Intro">>
+ <</if>>
+ <</replace>>
+ <</link>>
+
+ <br> <<link "Dock her wages">>
+ <<replace "#aliveresult">>
+ <<if random(1,100) > 50>>
+ For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up her spoils, the other security force members clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
+ <<set $rep += 1000, $cash -= 500000>>
+ <<else>>
+ For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck has rendered you the victor. Your opponent accepts her defeat with grace and jokes to her comrades that she'll be fighting in her underwear for the next few months, and their uproar of laughter fills the room. Though you take the lion's share of the ¤, your security force also @@.green;had a good time fraternizing with you.@@
+ <<set $rep += 2000, $cash += 500000>>
+ <</if>>
+ <</replace>>
+ <</link>>
+
+ </span>
+ <</replace>>
+ <</link>>
+
+ </span>
+ <</replace>>
+<</link>> // It will cost @@.yellowgreen;<<print cashFormat(500000)>>@@ to participate in the trick shot night.//
+<</if>>
+</span>
\ No newline at end of file
diff --git a/src/pregmod/eliteTakeOver.tw b/src/pregmod/eliteTakeOver.tw
index 32ab19a419a8b8b60a9045f5e9e2b13820fefbb8..c8b6cfbe9f71d89cb435eec3c7e5a22677483288 100644
--- a/src/pregmod/eliteTakeOver.tw
+++ b/src/pregmod/eliteTakeOver.tw
@@ -74,12 +74,12 @@ You look up from your desk as the locked door to your office unseals, and a doze
<</replace>>
<</link>>
<</if>>
- <<if $securityForceActive == 1>>
- <br>
- <<link "Send a message to The Colonel">>
- <<set $finalChoice = "colonel">>
+ <<if $SF.Active && $SF.Toggle>>
+ <br> <<set _N = SFC()>>
+ <<link "Send a message to _N">>
+ <<set $finalChoice = "SF">>
<<replace "#fate">>
- send a message to The Colonel.
+ send a message to <<print SFC()>>.
<</replace>>
<</link>>
<</if>>
@@ -111,4 +111,4 @@ You look up from your desk as the locked door to your office unseals, and a doze
<<link "Confirm">>
<<goto "eliteTakeOverFight">>
<</link>>
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/pregmod/eliteTakeOverFight.tw b/src/pregmod/eliteTakeOverFight.tw
index 11d33b570ad18502ebe6566a99ef44abee19dcc8..b2ce0b0eec2e30f62248e54cdaa05899787e6a9f 100644
--- a/src/pregmod/eliteTakeOverFight.tw
+++ b/src/pregmod/eliteTakeOverFight.tw
@@ -30,8 +30,8 @@
<<case "mercenaries">>
<br>You send a quick message to the leader of your $mercenariesTitle, about your situation, then you pick up the revolver and quickly take aim.
<<set $MercenariesMessageSent = 1>>
-<<case "colonel">>
- <br>You send a quick message to The Colonel about your situation, then you pick up the revolver and quickly take aim.
+<<case "SF">>
+ <br>You send a quick message to <<print SFC()>> about your situation, then you pick up the revolver and quickly take aim.
<<set $SpecialForcesMessageSent = 1>>
<<case "enrage">>
<<if $PC.career != "wealth" && $PC.career != "engineer" && $PC.career != "medicine">>
@@ -242,8 +242,8 @@
<<set $eliteFate = 2>>
<<goto "eliteTakeOverResult">>
<</link>>
-<<elseif $SpecialForcesMessageSent == 1>>
- It is now that a squad of $securityForceName makes their entrance, pointing their guns at the <<if $eliteLeft < $eliteTotal>>remaining<</if>> elite.
+<<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>
<<link "Open fire">>
@@ -299,4 +299,4 @@
<<set $ui = "start">>
<br><br>
''GAME OVER''
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw
index ffe9bbc2c4a0b76ec176583a800c4032283a4977..bf7d60c6b087672e43ea9dcd7e1dfed14f12896a 100644
--- a/src/pregmod/eliteTakeOverResult.tw
+++ b/src/pregmod/eliteTakeOverResult.tw
@@ -63,9 +63,9 @@
</span>
<<elseif $SpecialForcesMessageSent == 1>>
<br>The <<if $eliteLeft < $eliteTotal>>remaining<</if>> elite are quickly captured, abused and enslaved.
- <<if $securityForceDepravity <= 0.3>>
+ <<if $SF.Depravity <= 0.3>>
Two soldiers decide to double team an elite; one gropes her ass while the other gropes her tits.
- <<elseif $securityForceDepravity <= 1.2>>
+ <<elseif $SF.Depravity <= 1.2>>
Two soldiers decide to double team an elite; one ass fucks while the other facefucks.
<<else>>
Two soldiers decide to double team an elite; one breaks out their knife and begins to make little breaks in the elite's skin while the other soldier facefucks them.
@@ -85,14 +85,16 @@
For a second your acceptance shocks them. Once they recover they are very grateful. "Thank you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>, I'll make sure to look after her. Soon the story spreads of the kind arcology owner, enhancing your reputation.
<</replace>>
<</link>>
- </span>
- <<switch $ColonelCore>>
+ </span>
+ <<if $SFTradeShow.CanAttend === -1>>
+ <<switch $SFColonel.Core>>
<<case "kind">>
The Colonel is shocked that you would allow her troops to do this but understands that it comes with the territory. <<if _SFHappyEverAfter == 1>>Thanks for being kind to one of my soldiers.<</if>>
<<case "warmonger" "cruel" "sociopathic" "jaded" "brazen" "psychopathic" "mischievous">>
The Colonel is grateful that you let her troops let off some steam. <<if _SFHappyEverAfter == 1>>Thanks for being kind to one of my soldiers.<</if>>
<</switch>>
- <<set $securityForceDepravity += 0.05>>
+ <</if>>
+ <<set $SF.Depravity += 0.05>>
<<elseif $eliteLeft <= 9 && $rep >= 10000>>
<<if $arcologies[0].FSDegradationist != "unset">>
An evil smile appears on the faces of your loyal citizens, while the surviving elite freeze in terror. The impromptu festivity will go on for hours, getting more and more depraved.
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 894234d263a7364e5f54317894d745be67177bfb..a56be1787c23cb3c795e96a999fea2a96f5eac47 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -158,7 +158,7 @@ Though the King himself is dead, murdered in his bed by bloodthirsty revolutiona
<br><br>
-Time is short, but you are well placed to acquire some choice slaves. With an adequate donation<<if $securityForceActive == 1>>, or the use of $securityForceName<</if>>, of course.
+Time is short, but you are well placed to acquire some choice slaves. With an adequate donation<<if $SF.Active && $SF.Toggle>>, or the use of $SF.Lower<</if>>, of course.
<br><br>
@@ -187,16 +187,16 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
//You lack the necessary funds and reputation to enslave a princess.//
<</if>>
-<<if $securityForceActive == 1>>
-<br><<link "Dispatch a $securityForceName on a night time raid to acquire a pretty princess.">>
+<<if $SF.Active && $SF.Toggle>>
+<br><<link "Dispatch a $SF.Lower on a night time raid to acquire a pretty princess.">>
<<replace "#result">>
- Seizing a tablet, you quickly send a message to The Colonel. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the princess aboard clad in chains and make a direct course towards your waiting penthouse.
+ Seizing a tablet, you quickly send a message to <<print SFC()>>. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the princess aboard clad in chains and make a direct course towards your waiting penthouse.
<br><br>
Eventually she arrives in your penthouse, the perfect image of a demure yet composed princess. Her clearly practiced facade of poise and grace fades under scrutiny, however. The slightest trembling of her balled up fists, the minute tremors that mar her immaculate posture, her inability to meet your eyes with her own - all signs that she is still a scared girl despite all her royal trappings. Nonetheless, though the princess's court training is unlikely to be very beneficial to her in her new life in the penthouse, it does stand in stark contrast to her more common slave peers.
<br><br>
<<set $arcologies[0].prosperity -= 15>>
<<set $rep -= 18000>>
- <<set _princess.origin = "She was a princess of a royal kingdom, till her family was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _princess.origin = "She was a princess of a royal kingdom, till her family was overthrown and she was acquired by "+$SF.Lower+".">>
<<set $activeSlave = _princess>>
<<include "New Slave Intro">>
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
@@ -221,16 +221,16 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<br>//You lack the necessary funds to enslave a crown prince.//
<</if>>
-<<if $securityForceActive == 1>>
-<br><<link "Dispatch $securityForceName on a night time raid to acquire the crown prince.">>
+<<if $SF.Active && $SF.Toggle>>
+<br><<link "Dispatch $SF.Lower on a night time raid to acquire the crown prince.">>
<<replace "#result">>
- Seizing a tablet, you quickly send a message to The Colonel. After dark, a flight of VTOLs land in the new arcology laden with troops. They take off again with the crown prince aboard and in chains, where he rails against the uncaring metal walls of the VTOL for the breadth of his journey to your penthouse.
+ Seizing a tablet, you quickly send a message to <<print SFC()>>. After dark, a flight of VTOLs land in the new arcology laden with troops. They take off again with the crown prince aboard and in chains, where he rails against the uncaring metal walls of the VTOL for the breadth of his journey to your penthouse.
<br><br>
When he arrives in your penthouse, the former prince is beside himself with rage. When he is brought to be modified in the remote surgery, he breaks free and attempts to fight his way out of your penthouse. His attempt at freedom is futile, however, and he is soon overwhelmed by your guards and dragged back to the remote surgery. It doesn't take long for the valiant prince to become a new dickgirl, though his submission to life as a slave is another question entirely.
<br><br>
<<set $arcologies[0].prosperity -= 15>>
<<set $rep -= 18000>>
- <<set _prince.origin = "She was the crown prince of a royal kingdom, till her family was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _prince.origin = "She was the crown prince of a royal kingdom, till her family was overthrown and she was acquired by "+$SF.Lower+".">>
<<set $activeSlave = _prince>>
<<include "New Slave Intro">>
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
@@ -276,17 +276,17 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<br>//You lack the necessary funds and reputation to enslave both the crown prince and princess.//
<</if>>
-<<if $securityForceActive == 1>>
-<br><<link "Dispatch $securityForceName on a night time raid to acquire both the prince and princess.">>
+<<if $SF.Active && $SF.Toggle>>
+<br><<link "Dispatch $SF.Lower on a night time raid to acquire both the prince and princess.">>
<<replace "#result">>
- Seizing a tablet, you quickly send a message to The Colonel. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the prince and princess aboard, clad in chains and bound face to face in a forced embrace, and make a direct course towards your waiting penthouse.
+ Seizing a tablet, you quickly send a message to <<print SFC()>>. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the prince and princess aboard, clad in chains and bound face to face in a forced embrace, and make a direct course towards your waiting penthouse.
<br><br>
Eventually they arrive in your penthouse, faces flushed with embarrassment of their compromising position. The former prince is beside himself with rage, but seems to be holding himself back for his little sister's sake, while she struggles to maintain a facade of poise and grace. The slightest trembling of her balled up fists, the minute tremors that mar her immaculate posture, her inability to meet your eyes with her own - all signs that she is still a scared girl despite all her royal trappings. Nonetheless, though the princess's court training is unlikely to be very beneficial to her in her new life in the penthouse, it does stand in stark contrast to her more common slave peers. However, the prince's submission to life as a slave is another question entirely.
<br><br>
<<set $arcologies[0].prosperity -= 15>>
<<set $rep -= 18000>>
/* princess */
- <<set _princess.origin = "She was a princess of a royal kingdom, till her family was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _princess.origin = "She was a princess of a royal kingdom, till her family was overthrown and she was acquired by "+$SF.Lower+".">>
<<set _princess.recruiter = 0>>
<<if $familyTesting == 1>>
<<set _princess.mother = $missingParentID>>
@@ -299,7 +299,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<</if>>
<<AddSlave _princess>> /* skip New Slave Intro */
/* prince */
- <<set _prince.origin = "She was the crown prince of a royal kingdom, till her family was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _prince.origin = "She was the crown prince of a royal kingdom, till her family was overthrown and she was acquired by "+$SF.Lower+".">>
<<set _prince.recruiter = 0>>
<<if $familyTesting == 1>>
<<set _prince.mother = _princess.mother>>
@@ -361,10 +361,10 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<br>//You lack the necessary funds to enslave a handful of court ladies.//
<</if>>
-<<if $securityForceActive == 1>>
-<br><<link "Dispatch $securityForceName on a night time raid to acquire a handful of court ladies.">>
+<<if $SF.Active && $SF.Toggle>>
+<br><<link "Dispatch $SF.Lower on a night time raid to acquire a handful of court ladies.">>
<<replace "#result">>
- You take a tablet and peruse the various court ladies on offer by the fledgling arcology. You single out a few interesting individuals for acquisition that might suit your tastes, but the slapdash descriptions provided for each by $securityForceName Intelligence make it likely that any similarities to your aesthetic leanings will be coincidental. Once you are satisfied with your selection, you electronically transfer the order to The Colonel and soon receive a mission success notice along with an estimated delivery schedule.
+ You take a tablet and peruse the various court ladies on offer by the fledgling arcology. You single out a few interesting individuals for acquisition that might suit your tastes, but the slapdash descriptions provided for each by $SF.Lower Intelligence make it likely that any similarities to your aesthetic leanings will be coincidental. Once you are satisfied with your selection, you electronically transfer the order to <<print SFC()>> and soon receive a mission success notice along with an estimated delivery schedule.
<br><br>
When the ladies arrive at your penthouse, they seem almost relieved at the opulence of their new surroundings. Though they still retain much of their aristocratic arrogance, they each submit to biometric scanning with relative obedience. It seems likely that their obedience is borne out of a delusional rationalization that enslavement by one wealthy master is better than enslavement by the unwashed masses they once lorded over.
<br><br>
@@ -374,7 +374,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<include "Generate XX Slave">>
- <<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$SF.Lower+".">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
<<set $activeSlave.prestige = 1>>
@@ -438,10 +438,10 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<br>//You lack the necessary funds to enslave a Queen.//
<</if>>
-<<if $securityForceActive == 1>>
-<br><<link "Dispatch $securityForceName on a night time raid to acquire the Queen herself.">>
+<<if $SF.Active && $SF.Toggle>>
+<br><<link "Dispatch $SF.Lower on a night time raid to acquire the Queen herself.">>
<<replace "#result">>
- Seizing a tablet, you quickly send a message to The Colonel. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the Queen aboard and make a direct course towards your waiting penthouse.
+ Seizing a tablet, you quickly send a message to <<print SFC()>>. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the Queen aboard and make a direct course towards your waiting penthouse.
<br><br>
When the Queen arrives at your penthouse, she seems almost relieved and almost basks in the opulence of her new surroundings. Yet, it seems likely that her relief has more to do with saving her from a lifetime of gang rape at the mercy of her former subjects, than it does the familiar luxury. She submits to biometric scanning obediently and without fuss<<if $seePreg != 0>>, during which you discover to her surprise that she is pregnant. Since she hasn't begun to show yet, it's unclear whether the child is the former King's or the new arcology owner's. You don't have the means to discern the father of the child, but you notice she cradles her ever so slightly rounded stomach protectively nonetheless<</if>>.
<br><br>
@@ -457,7 +457,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set _queen.visualAge = _queen.actualAge>>
<<set _queen.physicalAge = _queen.actualAge>>
<<set _queen.ovaryAge = _queen.actualAge>>
- <<set _queen.origin = "She was the Queen of a royal kingdom, till her husband was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _queen.origin = "She was the Queen of a royal kingdom, till her husband was overthrown and she was acquired by "+$SF.Lower+".">>
<<set $activeSlave = _queen>>
<<include "New Slave Intro">>
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
@@ -500,10 +500,10 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<br>//You lack the necessary funds and reputation to enslave both the Queen and princess.//
<</if>>
-<<if $securityForceActive == 1>>
-<br><<link "Dispatch $securityForceName on a night time raid to acquire both the Princess and Queen.">>
+<<if $SF.Active && $SF.Toggle>>
+<br><<link "Dispatch $SF.Lower on a night time raid to acquire both the Princess and Queen.">>
<<replace "#result">>
- Seizing a tablet, you quickly send a message to The Colonel. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the princess and Queen aboard, making a direct course towards your waiting penthouse.
+ Seizing a tablet, you quickly send a message to <<print SFC()>>. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the princess and Queen aboard, making a direct course towards your waiting penthouse.
<br><br>
Eventually they both arrive in your penthouse. The princess is flushed with embarrassment in her compromising position, struggling to maintain a facade of poise and grace. The slightest trembling of her balled up fists, the minute tremors that mar her immaculate posture, her inability to meet your eyes with her own - all signs that she is still a scared girl despite all her royal trappings. Nonetheless, though the princess's court training is unlikely to be very beneficial to her in her new life in the penthouse, it does stand in stark contrast to her more common slave peers. The Queen, on the other hand, seems almost relieved and basks in the opulence of her new surroundings. Yet, it seems likely that her relief has more to do with saving her from a lifetime of gang rape at the mercy of her former subjects, than it does the familiar luxury. She submits to biometric scanning obediently and without fuss<<if $seePreg != 0>>, during which you discover to her surprise that she is pregnant. Since she hasn't begun to show yet, it's unclear whether the child is the former King's or the new arcology owner's. You don't have the means to discern the father of the child, but you notice she cradles her ever so slightly rounded stomach protectively nonetheless<</if>>.
<<set $arcologies[0].prosperity -= 13>>
@@ -587,10 +587,10 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<AddSlave _queen>> /* skip New Slave Intro */
<</replace>>
<</link>> // It will cost about <<print cashFormat(500000)>> to enslave the Queen and her court ladies.//
-<<if $securityForceActive == 1>>
-<br><<link "Dispatch $securityForceName on a night time raid to acquire the Queen and her court ladies.">>
+<<if $SF.Active && $SF.Toggle>>
+<br><<link "Dispatch $SF.Lower on a night time raid to acquire the Queen and her court ladies.">>
<<replace "#result">>
- Seizing a tablet, you quickly send a message to The Colonel. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the Queen, who is resigned to her fate, and a gaggle of terrified court ladies chained together.
+ Seizing a tablet, you quickly send a message to <<print SFC()>>. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the Queen, who is resigned to her fate, and a gaggle of terrified court ladies chained together.
<br><br>
Eventually they all arrive in your penthouse. The Queen seems almost relieved and basks in the opulence of her new surroundings. Yet, it seems likely that her relief has more to do with saving her from a lifetime of gang rape at the mercy of her former subjects, than it does the familiar luxury. She submits to biometric scanning obediently and without fuss<<if $seePreg != 0>>, during which you discover to her surprise that she is pregnant. Since she hasn't begun to show yet, it's unclear whether the child is the former King's or the new arcology owner's. You don't have the means to discern the father of the child, but you notice she cradles her ever so slightly rounded stomach protectively nonetheless<</if>>. Meanwhile, the ladies seem comforted by the opulence of their new surroundings. Though they still retain much of their aristocratic arrogance, they each submit to biometric scanning with relative obedience. It seems likely that their obedience is borne out of a delusional rationalization that enslavement by one wealthy master is better than enslavement by the unwashed masses they once lorded over.
<<set $arcologies[0].prosperity -= 13>>
@@ -600,7 +600,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<include "Generate XX Slave">>
- <<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$SF.Lower+".">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
<<set $activeSlave.prestige = 1>>
@@ -632,7 +632,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
/*Queen*/
- <<set _queen.origin = "She was the Queen of a royal kingdom, till her husband was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _queen.origin = "She was the Queen of a royal kingdom, till her husband was overthrown and she was acquired by "+$SF.Lower+".">>
<<set _queen.recruiter = 0>>
<<set _queen.mother = $missingParentID>>
<<set $missingParentID-->>
@@ -713,11 +713,11 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<br>//You lack the necessary funds to enslave the entire court.//
<</if>>
-<<if $securityForceActive == 1 && $familyTesting == 1>>
-<br><<link "Dispatch $securityForceName on a night time raid to take everything of value.">>
+<<if $SF.Active && $SF.Toggle && $familyTesting>>
+<br><<link "Dispatch $SF.Lower on a night time raid to take everything of value.">>
<<replace "#result">>
<<set _loot = random(10,300)*100>>
- Seizing a tablet, you quickly send a message to The Colonel. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the prince and princess, clad in chains and bound face to face in a forced embrace, the Queen, who is resigned to her fate, a gaggle of terrified court ladies and as much loot as they could carry.
+ Seizing a tablet, you quickly send a message to <<print SFC()>>. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the prince and princess, clad in chains and bound face to face in a forced embrace, the Queen, who is resigned to her fate, a gaggle of terrified court ladies and as much loot as they could carry.
<br><br>
Eventually they all arrive in your penthouse. The prince and princess are flushed with embarrassment in their compromising position. The former prince is beside himself with rage, but seems to be holding himself back for his little sister's sake, while she struggles to maintain a facade of poise and grace. The slightest trembling of her balled up fists, the minute tremors that mar her immaculate posture, her inability to meet your eyes with her own - all signs that she is still a scared girl despite all her royal trappings. Nonetheless, though the princess's court training is unlikely to be very beneficial to her in her new life in the penthouse, it does stand in stark contrast to her more common slave peers. However, the prince's submission to life as a slave is another question entirely. The Queen, on the other hand, seems almost relieved and basks in the opulence of her new surroundings. Yet, it seems likely that her relief has more to do with saving her from a lifetime of gang rape at the mercy of her former subjects, than it does the familiar luxury. She submits to biometric scanning obediently and without fuss<<if $seePreg != 0>>, during which you discover to her surprise that she is pregnant. Since she hasn't begun to show yet, it's unclear whether the child is the former King's or the new arcology owner's. You don't have the means to discern the father of the child, but you notice she cradles her ever so slightly rounded stomach protectively nonetheless<</if>>. Lastly, the ladies seem comforted by the opulence of their new surroundings. Though they still retain much of their aristocratic arrogance, they each submit to biometric scanning with relative obedience. It seems likely that their obedience is borne out of a delusional rationalization that enslavement by one wealthy master is better than enslavement by the unwashed masses they once lorded over. You also scored @@.yellowgreen;<<print cashFormat(_loot)>>@@ in valuables from the raid.
<<set $arcologies[0].prosperity = 2>>
@@ -727,7 +727,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<include "Generate XX Slave">>
- <<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$SF.Lower+".">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
<<set $activeSlave.prestige = 1>>
@@ -759,20 +759,20 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
/* princess */
- <<set _princess.origin = "She was a princess of a royal kingdom, till her family was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _princess.origin = "She was a princess of a royal kingdom, till her family was overthrown and she was acquired by "+$SF.Lower+".">>
<<set _princess.recruiter = 0>>
<<set _princess.mother = _queen.ID>>
<<set _princess.father = $missingParentID>>
<<set $missingParentID-->>
<<AddSlave _princess>> /* skip New Slave Intro */
/* prince */
- <<set _prince.origin = "She was the crown prince of a royal kingdom, till her family was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _prince.origin = "She was the crown prince of a royal kingdom, till her family was overthrown and she was acquired by "+$SF.Lower+".">>
<<set _prince.recruiter = 0>>
<<set _prince.mother = _princess.mother>>
<<set _prince.father = _princess.father>>
<<AddSlave _prince>> /* skip New Slave Intro */
/*Queen*/
- <<set _queen.origin = "She was the Queen of a royal kingdom, till her husband was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _queen.origin = "She was the Queen of a royal kingdom, till her husband was overthrown and she was acquired by "+$SF.Lower+".">>
<<set _queen.recruiter = 0>>
<<set _queen.mother = $missingParentID>>
<<set $missingParentID-->>
@@ -782,4 +782,4 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<</replace>>
<</link>> //You will be loathed for this action and trade will be crippled.//
<</if>>
-</span>
\ No newline at end of file
+</span>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index af5496b00bae169cc00d61570e63dafb42bf8fd4..923bf1e4da65d0eda2f9accdfa5b6027cd680983 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -278,10 +278,10 @@ Your slaves have participated in approximately <<print commaNum($oralTotal+$vagi
<<if $secExp == 1 && $battlesEnabled == 1>>
<br><br>
-<<if $securityForceCreate == 0>>
+<<if !$SF.Active||!$SF.Toggle>>
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.
+<<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.
<</if>>
<<if $hasFoughtOnce == 1>>
Your troops were involved in <<print commaNum($battlesCount)>> battles of which <<print commaNum($majorBattlesCount)>> were major engagements. You won
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index db9ea93914e2dd7a095321d1dd879dda3447a769..c81efc14861f58a72b9c482846572d03bfd51479 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -325,5 +325,10 @@
<<if $autosave != 0>>
<<script>>Save.autosave.save("Week Start Autosave")<</script>>
<</if>>
-
+<<if $SFTradeShow.CanAttend !== -1 && $SFTradeShow.CanAttend !== -2>>
+ <<set $SFTradeShow.CanAttend = -1,$TradeShowChoice = 0>>
+<</if>>
+<<if $NamingColonel > 0>>
+ <<unset $NamingColonel>>
+<</if>>
<<goto "Main">>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index f30564ceca0c86013b13b187403702302b91717d..71986cc5264b0c69c8e62a0e32a68dc6d26afc4e 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -126,9 +126,9 @@
<<goto "P peacekeepers independence">>
<<elseif def $peacekeepers && $peacekeepers.strength >= 50 && $peacekeepers.influenceAnnounced == 0>>
<<goto "P peacekeepers influence">>
-<<elseif (_effectiveWeek > 80) && (random(1,100) > 66) && ($securityForceCreate != 1) && ($securityForceEventSeen != 1) && ($SFMODToggle == 1)>>
+<<elseif $SF.Toggle && _effectiveWeek >= 80 && $SF.Active === -1>>
<<goto "Security Force Proposal">>
-<<elseif ($securityForceCreate == 1) && ($securityForceActive == 0)>>
+<<elseif $SF.Toggle && $SF.Active>>
<<goto "Security Force Naming-Colonel">>
<<elseif ($cash > 30000) && ($rep > 4000) && ($corpAnnounced == 0)>>
<<goto "P Corp Announcement">>
@@ -166,8 +166,6 @@
<<goto "secExpSmilingMan">>
<<elseif $rivalOwner == 0 && $smilingManProgress == 3 && $secExp == 1>>
<<goto "secExpSmilingMan">>
-<<elseif $TierTwoUnlock == 1 && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance == 0>>
- <<goto "securityForceTradeShow">>
<<else>>
<<if random(1,100) > _effectiveWeek+25>>
<<goto "RIE Eligibility Check">>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 27ef410d36ef9e015e0a72c768f1e1e74f897033..5ca18cb8d9263e9a39690c21e94ffb4068e3776f 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -915,6 +915,6 @@ Routine upkeep of your demesne costs @@.yellow;<<print cashFormat($costs)>>.@@
<<set $menialDemandFactor += random(-250, 250)>>
<</if>>
-<<if $securityForceActive == 1>>
+<<if $SF.Active && $SF.Toggle>>
<<include "Security Force EOW Report">>
<</if>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index cf600114b6260c04458fb442ab2eb910c2e6a1f7..68dc1fb0344ef717a0ae23b39381c534f1c43f0e 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -1280,6 +1280,9 @@
<<set $milfSlaveID = $milfSlaveID.ID>>
<</if>>
<</if>>
+<<if $SF.Active && $SF.Toggle>>
+ <<set $events.push("Trick Shot Night")>>
+<</if>>
<<if $RegularParties == 1>>
<<if ($PC.vagina == 1 && $PC.title == 0) && (random(0,99) < $seeDicks)>>
diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw
index a568f0e82fd152cd8c62d779775cbe88da45a25b..1afdc2e2288012a1a392fb23b191e667f910e82b 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -42,10 +42,10 @@ Your window of opportunity to act is closing. If you have plans for punishing th
<br>
-<<if $securityForceActive == 1>>
- <<link "Let your $securityForceName handle her">>
+<<if $SF.Active && $SF.Toggle>>
+ <<link "Let your $SF.Lower handle her">>
<<replace "#result">>
- You take a tablet and send The Colonel a notice about the mutinous mercenary. When you have the majority of the pertinent details committed to text, all that remains is to decide the fate of your quarry.
+ You take a tablet and send <<print SFC()>> a notice about the mutinous mercenary. When you have the majority of the pertinent details committed to text, all that remains is to decide the fate of your quarry.
<br><br>
<span id="SFresult">
@@ -63,7 +63,7 @@ Your window of opportunity to act is closing. If you have plans for punishing th
<<link "You want her alive">>
<<replace "#SFresult">>
- It doesn't take long for a squad of $securityForceName, to track her down. Soon you have the troublesome turncoat before you in chains.
+ It doesn't take long for a squad of $SF.Lower, to track her down. Soon you have the troublesome turncoat before you in chains.
<br><br>
<span id="aliveresult">
diff --git a/src/uncategorized/seIndependenceDay.tw b/src/uncategorized/seIndependenceDay.tw
index 1825758a4366b106f6ca350fe51d1f6796d33357..6be39b6bf5f3cac56aa75f69f1575c14f12a84ed 100644
--- a/src/uncategorized/seIndependenceDay.tw
+++ b/src/uncategorized/seIndependenceDay.tw
@@ -375,88 +375,83 @@ In the Free Cities, Independence Day falls on the day when the Free City achieve
<span id="result2">
<br><<link "Pay for a lavish fireworks display">>
<<replace "#result2">>
- Once darkness falls outside the arcology, a traditional fireworks display erupts from mortars mounted on your penthouse balconies. The noise and light @@.green;delights@@ your citizens, terrifies the arcology's stupider slaves, and serves a useful ancillary purpose in defense preparedness. The arcology's radar and laser sensors track the display, using it as an opportunity to calibrate the point defense systems on real targets. There is general agreement that this sort of thing should be a yearly tradition here, just like it was in some parts of the old world: old ideas aren't all bad.
+ <br><br>Once darkness falls outside the arcology, a traditional fireworks display erupts from mortars mounted on your penthouse balconies. The noise and light @@.green;delights@@ your citizens, terrifies the arcology's stupider slaves, and serves a useful ancillary purpose in defense preparedness. The arcology's radar and laser sensors track the display, using it as an opportunity to calibrate the point defense systems on real targets. There is general agreement that this sort of thing should be a yearly tradition here, just like it was in some parts of the old world: old ideas aren't all bad.
<<set $rep += 1000, $cash -= 10000>>
<</replace>>
-<</link>> //Costs <<print cashFormat(10000)>>//
+<</link>> //Costs @@.yellowgreen;<<print cashFormat(10000)>>@@// </span>
-<<if $securityForceActive == 1>>
+<<if $SF.Active && $SF.Toggle>> <span id="result3">
<br><<link "Host a parade">>
- <<replace "#result2">>
- <<if $securityForcePersonnel < 100>>
- The tiny size of $securityForceName does not inspire confidence in your citizens.
+ <<replace "#result3">><br><br>
+ <<if $SFUnit.Troops < 100>>
+ The tiny size of $SF.Lower does not inspire confidence in your citizens.
<<set $rep -= 200>>
- <<elseif $securityForcePersonnel < 1500>>
- The almost full size of $securityForceName inspires confidence in your citizens.
- <<set $rep += 100>>
+ <<elseif $SFUnit.Troops < 2000>>
+ The almost full size of $SF.Lower inspires confidence in your citizens.
+ <<set $rep += 250>>
<</if>>
- <<if $securityForceInfantryPower == 0>>
- Seeing the soldiers of $securityForceName with high-quality personal weapons and light armor, but little in the way of exceptional armament, provides little confidence in $securityForceName.
+ <<if $SFUnit.Armoury === 0>>
+ Seeing the soldiers of $SF.Lower with high-quality personal weapons and light armor, but little in the way of exceptional armament, provides little confidence in $SF.Lower.
<<set $rep -= 200>>
- <<elseif $securityForceInfantryPower == 11>>
- The citizens of $arcologies[0].name are relieved to see that $securityForceName's troops are out fitted the absolutely latest in gear.
- <<set $rep += 100>>
+ <<else>>
+ The citizens of $arcologies[0].name are relieved to see that $SF.Lower's troops are out fitted the absolutely latest in gear.
+ <<set $rep += 250>>
<</if>>
- <<if $securityForceStimulantPower == 0>>
- Seeing $securityForceName being relaxed inspires confidence that they are unlikely to get a face full of lead.
- <<set $rep += 100>>
- <<elseif $securityForceStimulantPower == 7>>
- The slight twitchiness and high-end alertness of $securityForceName's troops makes your citizens afraid that they may get a face full of lead.
+ <<if $SFUnit.Drugs === 0>>
+ Seeing $SF.Lower being relaxed inspires confidence that they are unlikely to
+ <<set $rep += 250>>
+ <<else>>
+ The slight twitchiness and high-end alertness of $SF.Lower's troops makes your citizens afraid that they may
<<set $rep -= 200>>
- <</if>>
- <<if $securityForceVehiclePower == 0>>
- The use of basic, unarmored mainly high-end civilian vehicles with jury-rigged crew-served weapons by $securityForceName does not inspire confidence in your citizens.
+ <</if>> get a face full of lead.
+ <<if $SFUnit.Vehicles === 0>>
+ The use of basic, unarmored mainly high-end civilian vehicles with jury-rigged crew-served weapons by $SF.Lower does not
<<set $rep -= 200>>
- <<elseif $securityForceVehiclePower == 7>>
- $securityForceName's use of the most advanced heavy armored and support vehicles possible inspires confidence in your citizens.
- <<set $rep += 100>>
- <</if>>
- <<if $securityForceAircraftPower == 0>>
- Seeing $securityForceName's air force primarily consist of light transport VTOLs equipped with non-lethal weaponry, does not assure your citizens.
+ <<else>>
+ $SF.Lower's use of the most advanced heavy armored and support vehicles possible
+ <<set $rep += 250>>
+ <</if>> inspires confidence in your citizens.
+ <<if $SFUnit.AirForce === 1>>
+ Seeing $SF.Lower's air force only number enough to be a squadron and armed with just a Gatling cannon does not assure your citizens.
<<set $rep -= 200>>
- <<elseif $securityForceAircraftPower == 7>>
- Seeing $securityForceName's air force using latest equipment assures your citizens that they are safe from the air.
- <<set $rep += 100>>
+ <<else>>
+ Seeing $SF.Lower's air force using more advanced equipment assures your citizens that they are safe from the air.
+ <<set $rep += 250>>
<</if>>
- <<if $securityForceDronePower == 0>>
+ <<if $SFUnit.Drones === 0>>
Seeing "re-purposed" non-military drones from the arcology's original contingent flying around, does not inspire confidence in your citizens.
<<set $rep -= 200>>
- <<elseif $securityForceDronePower == 5>>
+ <<else>>
Seeing the latest and greatest drones buzzing over head assures your citizens that they are unmatched.
- <<set $rep += 100>>
+ <<set $rep += 250>>
<</if>>
- <<if $securityForceGiantRobot == 1>>
+ <<if $SFUnit.GiantRobot === 1>>
Seeing a basic old world rusted looking Giant Robot, doesn't provide your citizens with much assurance that they are protected.
<<set $rep -= 200>>
- <<elseif $securityForceGiantRobot == 7>>
+ <<else>>
Seeing that the Giant Robot has been fully upgraded provides your citizens with a feeling of safety.
- <<set $rep += 100>>
+ <<set $rep += 250>>
<</if>>
- <<if ($securityForceRulesOfEngagement == "hold") && ($securityForceDepravity >= 1.5)>>
- The sight of $securityForceName's forcing their captured slaves to suck them off while swinging their swords and other none lethal tools around trigger fingers twitch inspires terror in your citizens.
+ <<if ($SF.ROE === "hold") && ($SF.Depravity >= 1.5)>>
+ The sight of $SF.Lower's forcing their captured slaves to suck them off while swinging their swords and other none lethal tools around trigger fingers twitch inspires terror in your citizens.
<<set $rep -= 200>>
- <<elseif ($securityForceRulesOfEngagement == "limited") && ($securityForceDepravity >= 1.5)>>
- The sight of $securityForceName's forcing their captured slaves to suck them off with itchy trigger fingers inspires terror in your citizens.
+ <<elseif ($SF.ROE === "limited") && ($SF.Depravity >= 1.5)>>
+ The sight of $SF.Lower's forcing their captured slaves to suck them off with itchy trigger fingers inspires terror in your citizens.
<<set $rep -= 200>>
- <<elseif ($securityForceRulesOfEngagement == "free") && ($securityForceDepravity >= 1.5)>>
- The sight of $securityForceName's forcing their captured slaves to suck them off while frequently firing without any care into the air, inspiring terror in your citizens.
+ <<elseif ($SF.ROE === "free") && ($SF.Depravity >= 1.5)>>
+ The sight of $SF.Lower's forcing their captured slaves to suck them off while frequently firing without any care into the air, inspiring terror in your citizens.
<<set $rep -= 200>>
<</if>>
- <<if ($securityForceRulesOfEngagement == "hold") && ($securityForceDepravity <= 0.3)>>
- The sight of $securityForceName's professionally holstering their weapons provides your citizens with a sense of safety.
- <<set $rep += 100>>
- <<elseif ($securityForceRulesOfEngagement == "limited") && ($securityForceDepravity <= 0.3)>>
- The sight of $securityForceName's professionally keeping their finger on the trigger provides your citizens with a sense of safety.
- <<set $rep += 100>>
- <<elseif ($securityForceRulesOfEngagement == "free") && ($securityForceDepravity <= 0.3)>>
- The sight of $securityForceName's professionally being alert and to ready to act at a moment's notice provides your citizens with a sense of safety.
- <<set $rep += 100>>
+ <<if ($SF.ROE === "hold") && ($SF.Depravity <= 0.3)>>
+ The sight of $SF.Lower's professionally holstering their weapons provides your citizens with a sense of safety.
+ <<set $rep += 250>>
+ <<elseif ($SF.ROE === "limited") && ($SF.Depravity <= 0.3)>>
+ The sight of $SF.Lower's professionally keeping their finger on the trigger provides your citizens with a sense of safety.
+ <<set $rep += 250>>
+ <<elseif ($SF.ROE === "free") && ($SF.Depravity <= 0.3)>>
+ The sight of $SF.Lower's professionally being alert and to ready to act at a moment's notice provides your citizens with a sense of safety.
+ <<set $rep += 250>>
<</if>>
-
/*Maybe a random chance attack by the Daughter's of Liberty if they haven't been already defeated or if they have by a cell that managed to survive. The size of the attack could depend the time since their last encounter. The amount of damage inflicted would depend primarily on if the hacker's support was acquired, $bodyguard's combat skill, the player's combat skill, SF upgrades and finally some RNG. If a low amount of damage is inflicted then there will be a low hit to rep and some criminals can be acquired or dealt with in the usual manner. Higher amounts of damage leads to higher hits to rep and a chance that fewer attackers will survive. Without a bodyguard there is a chance that PC may die or be held hostage with a chance of being killed if the rescue attempt is botched. */
-
- /* I was thinking providing a option (potentially #result3) of giving a speech with it being a duplicate of the above speech just for completeness sake however it would be redundant except for a line or two about the outcome of attack if it fired (i.e listing the number of dead/captured attackers (potentially #result4) and dead soldiers with a couple of potential options (potentially #result5) ;to erect a statute or such acknowledge them and if one is already present to add them on to it, to provide support for their families. Also the amount of monetary damage, did $bodyguard die or just get wounded and if so how severely. Finally a closing message with how the PC wishes to react to it (potentially #result6); e.g. be vigilant, it's a one off, act of war, we will not give into terrorist attacks, etc. */
- <</replace>>
-<</link>>
-<</if>>
-</span>
\ No newline at end of file
+ /* I was thinking providing a option (potentially #result3) of giving a speech with it being a duplicate of the above speech just for completeness sake however it would be redundant except for a line or two about the outcome of attack if it fired (i.e listing the number of dead/captured attackers (potentially #result4) and dead soldiers with a couple of potential options (potentially #result5) ;to erect a statute or such acknowledge them and if one is already present to add them on to it, to provide support for their families. Also the amount of monetary damage, did $bodyguard die or just get wounded and if so how severely. Finally a closing message with how the PC wishes to react to it (potentially #result6); e.g. be vigilant, it's a one off, act of war, we will not give into terrorist attacks, etc. */
+ <</replace>> <</link>> </span> <</if>>
diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw
index e4976f0459e7f12fb729499510c32cbbf2d3417a..00bb76857fbd65e7ddb6d9330a0fafe93ee91a2f 100644
--- a/src/uncategorized/seRaiding.tw
+++ b/src/uncategorized/seRaiding.tw
@@ -3,8 +3,8 @@
<<set $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $nextButton = "Continue", $raided = $week>>
The leader of your $mercenariesTitle has contacted you from the world outside your arcology. It seems that your $mercenariesTitle have enjoyed a profitable series of raids in their time outside the arcology and have decided to push their luck by plundering one last location on their way back to the arcology. As their nominal leader, they ask your opinion of a small number of potential targets. Given the distance from the arcology and the time sensitivity of conducting such a mission, you have little to base your decision on besides a brief description.
-<<if $securityForceSatellitePower >= 1>>
- By having access to the use of $securityForceName's Satellite it is less likely that the target will escape.
+<<if $SFUnit.Satellite >= 1 && $SF.Toggle>>
+ By having access to the use of $SF.Lower's satellite it is less likely that the target will escape.
<</if>>
<br><br>
diff --git a/src/uncategorized/seRaidingAssault.tw b/src/uncategorized/seRaidingAssault.tw
index 508d522b404adfb6fcc5e9a28a24de1c416c3cfc..2351483c96e1c6bd8bf94445774cf0e313bae922 100644
--- a/src/uncategorized/seRaidingAssault.tw
+++ b/src/uncategorized/seRaidingAssault.tw
@@ -2,7 +2,7 @@
You make your selection and direct your $mercenariesTitle to attack the target.
-<<if $securityForceSatellitePower >= 1>>
+<<if $SFUnit.Satellite >= 1 && $SF.Toggle>>
<<set _MercCapture = random(-3,5)>>
<<set _raidescape = random(1,2)>>
<<else>>
@@ -205,4 +205,4 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<if ($targetEscape >= _MercCapture) || (_raidescape == 1)>>
Your $mercenariesTitle return without their final prize, but remain in high spirits given their other successes out in the field.
<</if>>
-<<unset $targetEscape, $origin>>
\ No newline at end of file
+<<unset $targetEscape, $origin>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index bd8e53d38bf4c517f220938e993547973a80dbf1..b5434103e06abfd5f13676c2feae54ac90f1344a 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -499,8 +499,8 @@
<</if>>
<</if>>
<br>
- <<if ($securityForceActive)>>
- <br><span id="SFMButton"> <<link "$securityForceName's Barracks""SFM Barracks">><</link>> </span> @@.cyan;[Z]@@
+ <<if $SF.Active && $SF.Toggle>>
+ <br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
<</if>>
<br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@
<<else>>
@@ -524,8 +524,8 @@
<<if $cyberMod != 0 && $researchLab.built == "true">>
<br>[[Manage Research Lab|Research Lab][$temp = 0]]
<</if>>
- <<if ($securityForceActive)>>
- <br><span id="SFMButton"> <<link "$securityForceName's Barracks""SFM Barracks">><</link>> </span> @@.cyan;[Z]@@
+ <<if $SF.Active && $SF.Toggle>>
+ <br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
<</if>>
<br>
@@ -565,8 +565,8 @@
<<if $cyberMod != 0 && $researchLab.built == "true">>
<br>[[Manage Research Lab|Research Lab][$temp = 0]]
<</if>>
- <<if ($securityForceActive)>>
- <br><span id="SFMButton"> <<link "$securityForceName's Barracks""SFM Barracks">><</link>> </span> @@.cyan;[Z]@@
+ <<if $SF.Active && $SF.Toggle>>
+ <br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
<</if>>
<br>