diff --git a/src/SpecialForce/Firebase.tw b/src/SpecialForce/Firebase.tw
index de2b09e8e0fc101ec0c81d810eea906aa6042e46..69753acb2ab78a7706c6bc4ca0271c52c840f9b7 100644
--- a/src/SpecialForce/Firebase.tw
+++ b/src/SpecialForce/Firebase.tw
@@ -29,7 +29,7 @@
<<print Interactions()>>
<<include "WC">>
- <<if ndef $SF.MercCon.View && ($SF.Colonel.Fun + $SF.Colonel.Talk < 1)>>
+ <<if ndef $SF.MercCon.View && ($SF.Colonel.Fun + $SF.Colonel.Talk < 1)>> <<= MercCon()>>
<br><br>Her expression changes as something jogs her memory. "Before we begin <<if $SF.Colonel.Core == "brazen">><<= properTitle()>><<else>>boss<</if>>, back when I was a merc me and a couple of my old friends would have a meetup every several months. Drinking, fucking, drugs... a little poker. It eventually grew into a whole thing, and now we bring our latest and greatest toys to show off, maybe make some money off selling the schematics. I'd like to continue going, for old times' sake."
<br>[[Grant leave|Firebase][$SF.MercCon.CanAttend = 1,$SF.MercCon.View = 1]]
<br>[[Request she remain on base|Firebase][$SF.MercCon.CanAttend = -2,$SF.MercCon.View = 0]]<br>
diff --git a/src/SpecialForce/NamingColonel.tw b/src/SpecialForce/NamingColonel.tw
index 33867ce92e938899535da96de4e182c284beef56..da38d5d19890e63fe3d4bfc958bb00daef8b508e 100644
--- a/src/SpecialForce/NamingColonel.tw
+++ b/src/SpecialForce/NamingColonel.tw
@@ -1,9 +1,9 @@
:: Security Force Naming-Colonel [nobr]
-<<set $nextButton = " ">> <<if ndef $Progresss>> <<set $Progress = -1>> <</if>>
-<<if $Progresss < 0>>
+<<set $nextButton = " ">>
+<<if $SF.IntroProgress < 0>>
You instruct $assistantName to announce to the arcology's citizenry that you will be making an important announcement in the near future regarding the security situation. Given the damage still present from the Daughters' attack, everyone will be tuning in. You also instruct your assistant to begin quietly investigating potential leadership figures for the force itself.
It's been a short while since you told your citizens that you were going to talk to them about their security, and by all accounts, they've turned out in force to watch your address over the arcology's internal communications system. You wake up early, relieve your frustrations on a few slaves woken out of deep sleep, and take position behind your desk. You also call over a slave and push her under your desk. The unspoken instruction is clear, and she begins enthusiastically
- <<if $PC.dick == 1>>
+ <<if $PC.dick > 0>>
sucking your cock, taking it as deep as she can without gagging.
<<else>>
eating you out, pressing her face into your pussy and forcing her tongue deep inside you.
@@ -14,23 +14,21 @@
<br><br>As you speak, you carefully monitor the citizens' opinions as indicated on their communication devices. It is uniformly positive — they know whom they have to thank for their continued survival and dominance. You also monitor your arousal given the ministrations of your slave. A few small movements on your part communicate to your citizens what is happening without being too obvious. Free Cities business etiquette respects business conducted while being subtly serviced (and your doing so during such a public and important broadcast signals how seriously you are taking it), but a climax would be seen as a serious lack of discipline.
<br><br>You finally wrap up your speech, declaring yourself Marshal of the newly-formed <<textbox "$SF.Lower" $SF.Lower "Security Force Naming-Colonel">>
<br><br>You close the link to the communication system and read a message from your assistant that appeared during the last moments of your address. In consultation with major figures in the mercenary community, a suitable candidate for day-to-day command of the new unit has been found. Your instructions were to keep you in the dark about them so as to avoid prejudgment. They are waiting outside your office.
- <br><br>[[Invite them inside|Security Force Naming-Colonel][$Progresss = 1]]
-<<elseif $Progresss < 2>> <<= SFNameCapsCheck()>>
+ <br><br>[[Invite them inside|Security Force Naming-Colonel][$SF.IntroProgress = 1]]
+<<elseif $SF.IntroProgress < 2>> <<= SFNameCapsCheck()>>
The figure that enters is not what you were expecting, given your previous experiences with the mercenary groups that work with the arcology owners of the Free Cities. Most mercenaries you've worked with have been grizzled stout men, veterans of the Old World militaries that finally had too much and went private. Instead, a woman walks in.
- <<if $SF.Colonel.Core == "">>
+ <<if $SF.Colonel.Core === "">>
She strikes you as someone who is likely to be:
<br><br>[[Kind|Security Force Naming-Colonel][$SF.Colonel.Core = "kind"]]
<br>[[Cruel and psychopathic|Security Force Naming-Colonel][$SF.Colonel.Core = "cruel"]]
<br>[[A brazen warmonger|Security Force Naming-Colonel][$SF.Colonel.Core = "brazen"]]
<br>[[Jaded|Security Force Naming-Colonel][$SF.Colonel.Core = "jaded"]]
<br>[[Shell-shocked|Security Force Naming-Colonel][$SF.Colonel.Core = "shell shocked"]]
- <</if>>
- <<if $SF.Colonel.Core !== "">>
+ <<else>>
She is likely to be ''$SF.Colonel.Core''.
<br><br>She strides in, stopping in front of your desk,
<<switch $SF.Colonel.Core>>
- <<case "kind">>
- pulling off a laid-back salute with an easy grin.
+ <<case "kind">> pulling off a laid-back salute with an easy grin.
<<case "cruel">>
her eyes flashing a hard glare in an instant before quickly softening into those of someone who wants something you have.
<<case "brazen">>
@@ -40,21 +38,13 @@
<</switch>>
She is very tall and wearing the pants, boots, gloves, and the tank top undershirt of a standard female combat uniform. Her bare arms and upper body are corded with muscle, and through the tank top's thin fabric you can see both the shape of her muscled abdomen and the curves of her small but perky breasts, complete with what your experience tells you are barbell nipple piercings. Her eyes are alive with intelligence, and you can see her scanning your office, clearly impressed by its opulence. Her hair is shaved close to the scalp, and her ears and nose are heavily pierced. You can make out three long, ugly scars running over top of the mottled tissue of a previous, severe burn along one side of her face, as well as numerous smaller scars and burns on her bare arms. She's been disarmed prior to meeting you; the pistol holster on her hip lies empty, as do at least three knife holsters about her person.
<br><br>Returning your gaze to her face, she crosses her arms underneath her chest, pressing her breasts up and forward. You have her measure. Given the generally patriarchal nature of both the mercenary community, and the same nature combined with the heavily sexualized lifestyle of the Free Cities, she's decided to embrace her position rather than fight it.
- <br><br>"So," she begins, "you're the boss." You invite her to sit down. "No thanks, boss. Besides,"
+ <br><br>"So," she begins, "you're the boss." You invite her to sit down. "No thanks, boss. Besides," She
<<switch $SF.Colonel.Core>>
- <<case "kind">>
- she playfully
- <<case "shell shocked">>
- she uncomfortably
- <<default>>
- she
+ <<case "kind">> playfully
+ <<case "shell shocked">> uncomfortably
<</switch>>
indicates the slave under your desk, "you look a little occupied." She nods at the camera across from you. "Saw the speech. Very nice. I'd heard you crazy bastards do business while getting
- <<if $PC.dick == 1>>
- sucked off,
- <<else>>
- eaten out,
- <</if>>
+ <<if $PC.dick > 0>> sucked off, <<else>> eaten out, <</if>>
but I've never seen anyone actually do it. Hell, most of you people don't want to have to have too much to do with a merc like me. I usually get my instructions remotely."
<<switch $SF.Colonel.Core>>
<<case "jaded" "brazen">>
@@ -75,12 +65,12 @@
<</switch>>
"Joined with another big outfit, became the number two, then shit went bad and I had to run. Been a solo fighter and slaver ever since. I know my work, and I know I can make this work."
- <br><br>You feel your climax approaching and hold up a finger. The merc pauses while you
- <<if $PC.dick == 1>>
- grab the slave's head, forcing your cock roughly down her throat while you cum. She swallows as much as she can before pulling away, coughing.
+ <br><br>You feel your climax approaching and hold up a finger. The merc pauses while you grab the slave's head
+ <<if $PC.dick > 0>>
+ then force your cock roughly down her throat while you cum. She swallows as much as she can before pulling
<<else>>
- grip the slave's head tightly with your thighs, pressing her face tightly against your pussy as you cum. When you release her, she pulls away, coughing.
- <</if>>
+ tightly with your thighs, pressing her face tightly against your pussy as you cum. When you release her, she pulls
+ <</if>> away, coughing.
<br><br>
<<if $SF.Colonel.Core === "shell shocked">>
@@ -116,9 +106,9 @@
A glint runs through her eyes. "Sounds like a good fucking time."
<br><br>You quickly decide she'll do. You tap a few commands on your desk's console, assigning her personal quarters on the arcology's higher levels and transferring her first stipend to her new account. You also ask her what title she wants.
<br><br>"Title?" Another short laugh. "I guess I do need one, given that I'm all official and shit now." She thinks for a moment. "I was a major before I went freelance, and I think I'd like a promotion. Colonel sounds good." You make a note of this in her file. "You people don't seal contracts with a fuck do you?" Reassuring her you don't, she laughs again. "Good. I make it a point never to fuck the boss. It's bad for business." She turns around. "Well, I guess I'd better get to it. Your helper-thing assigned me space on the lower levels for the firebase. I brought a few squads of guys I know from the old days to start, but we'll grow fast once I put the word out, I guarantee it."
- <br><br>[[Let her leave|Security Force Naming-Colonel][$Progresss = 2]]
+ <br><br>[[Let her leave|Security Force Naming-Colonel][$SF.IntroProgress = 2]]
<</if>>
-<<elseif $Progresss < 3>> <<set $nextLink = "RIE Eligibility Check",$nextButton = "Continue">> <<unset $Progresss>>
+<<elseif $SF.IntroProgress < 3>> <<set $nextLink = "RIE Eligibility Check",$nextButton = "Continue">>
She turns and leaves, and you chase the slave out after her. A few minutes later, a soft chime announces the arrival of a message. It's from the Colonel.
<br><br>//Hey boss, just wanted to mention something else. In your speech you said that you were going to be paying for $SF.Lower. In my mind that means it's yours, no matter what anyone else here might think. I do what you tell me to do. I make sure the troops behave as you want them to behave. I've worked for some 'nice guys' in the past, and I can do that job if you want. It's boring, but sustainable, and I'll have the $SF.Lower turning a profit and supporting the arcology in good order. But if you let me <<if $SF.Colonel.Core === "cruel">>off the leash<<else>>do what I do<</if>> and throw any Old World complaints in the trash where they belong, I promise you'll have money pouring into your coffers, even accounting for the good amounts me and my boys will pocket along the way. You'll have an empire in short order.
<<if $mercenaries > 1>>
diff --git a/src/SpecialForce/Proposal.tw b/src/SpecialForce/Proposal.tw
index 10a9998b37807d419372804b3cd6c3ee91863b7f..979ff678f950124a94f35f11d81fbc20f67a1e2d 100644
--- a/src/SpecialForce/Proposal.tw
+++ b/src/SpecialForce/Proposal.tw
@@ -9,6 +9,6 @@ The Free Cities were founded on the principles of unrestrained anarcho-capitalis
<<set _price = 20000>> <<if $PC.warfare >= 100>> <<set _price *= .5>>
<<elseif $PC.warfare >= 50||$PC.career === "arcology owner">> <<set _price *= .75>> <</if>>
<br><<link "Prepare for an announcement.""Security Force Naming-Colonel">> <<replace "#result">>
- <<= SFInit()>> <<set $SF.Active = 1>><<run cashX(forceNeg(_price), "specialForces")>>
+ <<= SFInit()>> <<set $SF.Active = 1,$SF.IntroProgress = -1>> <<run cashX(forceNeg(_price), "specialForces")>>
<</replace>> <</link>><br>//Initial costs are @@.yellowgreen;<<print cashFormat(_price)>>@@ and upon establishment the force will have significant support costs until it is self-sufficient.//
<br><<link "The current measures are enough.""RIE Eligibility Check">> <<replace "#result">> <<set $SF.Active = 0>> <</replace>> <</link>> </span>
\ No newline at end of file
diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index 21c8c2a6d9b30389dad887aeca7793a2f044ed42..3db4bbab231cfb0f93ab7c23c58ce37832eb09d5 100644
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
@@ -73,6 +73,7 @@ window.Count = function() {
else {T.Env=2;}
T.SFSubsidy=5000*(1+((V.SF.Squad.Troops/100)+(V.SF.Size/100)));
SFNameCapsCheck();
+ if (V.SF.IntroProgress > -1) delete V.SF.IntroProgress;
};
window.Firebase = function() {
@@ -443,11 +444,11 @@ window.MercCon = function() {
};
window.Facility = function() {
const V=State.variables;
- V.SF.Facility={Toggle:V.SF.Facility.Toggle, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
+ V.SF.Facility={Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
};
window.SFInit = function() {
- Main();Squad();Colonel();MercCon();Facility();
+ Main();Squad();Colonel();
};
window.SFBC = function() {
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index cd7abe21264bff968b8da619d4771e5d0403ca45..cb7025180ff9f7abc4b029695149a32f7702c366 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1495,11 +1495,7 @@ erectileImplant: 0
<<set $DefaultBirthDestination = "individually decided fates">>
<<set $abbreviateHormoneBalance = 2>>
-<<if def $SF.Toggle>>
- <<set $SF = {Toggle:$SF.Toggle, Facility:{Toggle:$SF.Facility.Toggle}}>>
-<<else>>
- <<set $SF = {Toggle:0, Facility:{Toggle:0}}>>
-<</if>>
-<<set $SF.Active = -1>>
+<<if def $SF.Toggle>> <<set $SF={Toggle:$SF.Toggle}>> <<else>> <<set $SF={Toggle:0}>> <</if>>
+<<set $SF.Active=-1>> <<= Facility()>>
<<goto "Alpha disclaimer">>