diff --git a/src/art/vector/Generate_Stylesheet.tw b/src/art/vector/Generate_Stylesheet.tw
index 1d3f7bb50f4159cacd4594a88b0e8b28c7a0b1c3..77c8b874c91f7a77d63e7099653008a3e3f73344 100644
--- a/src/art/vector/Generate_Stylesheet.tw
+++ b/src/art/vector/Generate_Stylesheet.tw
@@ -8,7 +8,7 @@
<</if>>
<<set _art_display_class = "ad"+_art_display_id >>
-<<print "<style>."+_art_display_class+" {
+<<print "<style>."+_art_display_class+" { /*>> for sanityCheck*/
position: absolute;
height: 100%;
margin-left: auto;
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index c3de2c1f883b6d97872aaa748f608220dd3dd739..505d0f7909137f77e1793148fb86797f67229e76 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -1241,7 +1241,7 @@
/*
Name pool selector based on nationality and race. Use as follows, given some slave _slave:
-<<set _namePool =
+<<set _namePool = /* >> this comment is just here for sanity check *//*
(setup.namePoolSelector[_slave.nationality + "." + _slave.race]
|| setup.namePoolSelector[_slave.nationality]
|| setup.whiteAmericanSlaveNames)>>
diff --git a/src/pregmod/pAssociatesPublicSlut.tw b/src/pregmod/pAssociatesPublicSlut.tw
index cdc9c7edb774f6f3880f4a8dddddcb72733fec1d..9d237f84b461c07bf7e60ebc4828a691e6c3edc5 100644
--- a/src/pregmod/pAssociatesPublicSlut.tw
+++ b/src/pregmod/pAssociatesPublicSlut.tw
@@ -2,11 +2,11 @@
<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", _num = random(1,99)>>
-The Promenade is especially vibrant today, humming with activity as the wealthier of '' $arcologies[0].name''s citizens go about their business and pleasure. You are a regular sight here, leisurely strolling amidst the bustle of the many shops, boutiques and eateries that line the wide thoroughfare. These regular strolls are, of course, timed in order to allow the citizenry, particularly high society, to feel your presence. Its not all about optics though, there are frequent opportunities for pleasure during these outings, be it shopping, dining or more unique kinds of distraction. One such opportunity presents itself today.
+The Promenade is especially vibrant today, humming with activity as the wealthier of ''$arcologies[0].name''s citizens go about their business and pleasure. You are a regular sight here, leisurely strolling amidst the bustle of the many shops, boutiques and eateries that line the wide thoroughfare. These regular strolls are, of course, timed in order to allow the citizenry, particularly high society, to feel your presence. Its not all about optics though, there are frequent opportunities for pleasure during these outings, be it shopping, dining or more unique kinds of distraction. One such opportunity presents itself today.
<br><br>
-You take a detour down one of the minor byways that feed into the Promenade proper. The centre of the street is divided by a row of public benches and carefully manicured trees, interspersed by simple metal railings that are set into the ground, coming up to about waist height. They look like bicycle stands, and are indeed occasionally used as such, but their primary function is for restraining slaves for public use, as punishment for some and reward for others. The scene playing out before you is most assuredly the former. A petite slave is being restrained.
+You take a detour down one of the minor byways that feed into the Promenade proper. The center of the street is divided by a row of public benches and carefully manicured trees, interspersed by simple metal railings that are set into the ground, coming up to about waist height. They look like bicycle stands, and are indeed occasionally used as such, but their primary function is for restraining slaves for public use, as punishment for some and reward for others. The scene playing out before you is most assuredly the former. A petite slave is being restrained.
<<if _num < $seeDicks>>
His pink minidress is scrunched up around his waist, having been peeled back from his flat chest and hiked up to reveal his rather small genitals and his butt. He is bent over the railing at the waist, his hands and legs both shackled at either end of the rail, and a ring gag keeps him relatively quiet, while simultaneously keeping his mouth available for use.
@@ -19,11 +19,11 @@ You take a detour down one of the minor byways that feed into the Promenade prop
<<if _num < $seeDicks>>
The one restraining him is a business associate of yours. She's a beautiful woman who cuts a gorgeous figure in her expensive, tasteful business attire. You have some rapport with one another and she greets you cheerily and you make small talk as she finishes up shackling her newly minted slave. He was, she explains, her boyfriend, who had accrued significant debt due to his severe lack of business sense and tact. She had bought out his debt in order to save him from enslavement, only to find out not long after that he had been cheating on her with another free woman. Since she owned his debt, it took only a few formalities to turn him into her property as revenge. "Since he likes sluts so much, I'm going to turn him into one!" She giggles, while stroking the struggling traps luxurious bleach blond hair. Her eyes light up as her gaze returns to you. You know whats coming, and are surprised it took this long for it to occur to her. She reaches around her slave and spreads his ass cheeks. "<<if $PC.title == 1>>Sir<<else>> Ma'am<</if>>, it would honor me if you fucked him!"
- You consider the slave's anus. Your associate has clearly spent all day customising her new toy, it looks freshly bleached and is smooth and inviting. It effectively has been transformed into a sex organ.
+ You consider the slave's anus. Your associate has clearly spent all day customizing her new toy, it looks freshly bleached and is smooth and inviting. It effectively has been transformed into a sex organ.
<<else>>
- The one restraining her is a business associate of yours. He's a well built man who cuts a handsome figure in his expensive, tasteful business attire. You have some rapport with one another and he greets you cheerily and you make small talk as he finishes up shackling his newly minted slave. She was, he explains, his girlfriend, who had accrued significant debt due to her severe lack of business sense and tact. He had bought out her debt in order to save her from enslavement, only to find out not long after that she had been cheating on him with another free woman. Since he owned her debt, it took only a few formalities to turn her into his property as revenge. "She was already a slut, Ive simply made her look the part, and play it more honestly!" he chuckles, while fondling the struggling bimbo's ample ass. He favors you with a rueful smile as his gaze returns to you. You know whats coming, and are surprised it took this long for it to occur to him. He reaches around his slave and spreads her ass cheeks. "<<if $PC.title == 1>>Sir<<else>> Ma'am<</if>>, it would honor me if you fucked her! Ive had her hymen restored just a few hours ago, first time is all yours if you want it."
+ The one restraining her is a business associate of yours. He's a well built man who cuts a handsome figure in his expensive, tasteful business attire. You have some rapport with one another and he greets you cheerily and you make small talk as he finishes up shackling his newly minted slave. She was, he explains, his girlfriend, who had accrued significant debt due to her severe lack of business sense and tact. He had bought out her debt in order to save her from enslavement, only to find out not long after that she had been cheating on him with another free woman. Since he owned her debt, it took only a few formalities to turn her into his property as revenge. "She was already a slut, I've simply made her look the part, and play it more honestly!" he chuckles, while fondling the struggling bimbo's ample ass. He favors you with a rueful smile as his gaze returns to you. You know whats coming, and are surprised it took this long for it to occur to him. He reaches around his slave and spreads her ass cheeks. "<<if $PC.title == 1>>Sir<<else>> Ma'am<</if>>, it would honor me if you fucked her! Ive had her hymen restored just a few hours ago, first time is all yours if you want it."
- You consider the slave's pussy. Your associate has clearly spent all day customising his new toy, it looks tight and inviting. Surprisingly, she's quite moist, indicating that in spite of her struggling, she's actually rather aroused, seems she has a bit of a fetish for humiliation. She'll assuredly make an excellent slave if thats the case.
+ You consider the slave's pussy. Your associate has clearly spent all day customizing his new toy, it looks tight and inviting. Surprisingly, she's quite moist, indicating that in spite of her struggling, she's actually rather aroused, seems she has a bit of a fetish for humiliation. She'll assuredly make an excellent slave if that's the case.
<</if>>
<br><br>
@@ -32,9 +32,9 @@ You take a detour down one of the minor byways that feed into the Promenade prop
<<link "Give <<if _num < $seeDicks>>him his<<else>>her the<</if>> first taste of slave life">>
<<replace "#result">>
<<if _num < $seeDicks>>
- Taking a slaves anal virginity is hardly novel for you, yet somehow it never stops being fun. You grab the bottle of lubricant your associate has left out for use and begin to generously lubricate his asshole <<if $PC.dick == 0>>. You also reach for one of the brand new strapons she has left out for ladies who wish to avail of her slut, tearing it eagerly from its box.<<else>>.<</if>> He begins to moan as you gently probe his anus with the tip of <<if $PC.dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to his petite, feminine waist as you work, occasionally using one hand to hold him roughly by the hair, neck or shoulder, or to smack his butt. Your business associate makes no attempt to hide her obvious arousal at the sight of <<if $PC.dick == 0>>the formidable dildo<<else>>your formidable cock<</if>> pounding some obedience into her slave, and flirts shamelessly with you as you work. <<if $PC.dick == 0>>The slave climaxes, and while you dont quite join him, watching him squirm helplessly underneath you as you used his ass has left you instensely aroused.<<else>>The slaves tight anal muscles massage your cock as he orgasms, bringing you to climax as well.<</if>> Your associate's faced is flushed after the spectacle, though considering the disappointing size of her new slaves penis its hardly surprising that she's so thirsty for male attention. She offers to "serve you some refreshments" back at her apartment, an offer you happily take her up on. As you depart with her, a mass of curious socialites converge on the helpless sissy, eager to try his asshole out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made him very fashionable.
+ Taking a slave's anal virginity is hardly novel for you, yet somehow it never stops being fun. You grab the bottle of lubricant your associate has left out for use and begin to generously lubricate his asshole <<if $PC.dick == 0>>. You also reach for one of the brand new strap-ons she has left out for ladies who wish to avail of her slut, tearing it eagerly from its box.<<else>>.<</if>> He begins to moan as you gently probe his anus with the tip of <<if $PC.dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to his petite, feminine waist as you work, occasionally using one hand to hold him roughly by the hair, neck or shoulder, or to smack his butt. Your business associate makes no attempt to hide her obvious arousal at the sight of <<if $PC.dick == 0>>the formidable dildo<<else>>your formidable cock<</if>> pounding some obedience into her slave, and flirts shamelessly with you as you work. <<if $PC.dick == 0>>The slave climaxes, and while you don't quite join him, watching him squirm helplessly underneath you as you used his ass has left you intensely aroused.<<else>>The slaves tight anal muscles massage your cock as he orgasms, bringing you to climax as well.<</if>> Your associate's face is flushed after the spectacle, though considering the disappointing size of her new slaves penis its hardly surprising that she's so thirsty for male attention. She offers to "serve you some refreshments" back at her apartment, an offer you happily take her up on. As you depart with her, a mass of curious socialites converge on the helpless sissy, eager to try his asshole out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made him very fashionable.
<<else>>
- Taking a slaves virginity is hardly novel for you, yet somehow it never stops being fun. You consider the bottle of lubricant your associate has left out for use and then decide it's unnecessary, since the slutty bitch is already quite wet.<<if $PC.dick == 0>>. You do however reach for one of the brand new strapons he has left out for ladies who wish to avail of his slut, tearing it eagerly from its box.<<else>>.<</if>> She begins to moan as you gently probe her pussy with the tip of <<if $PC.dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to her petite, feminine waist as you work, occasionally using one hand to hold her roughly by the hair, neck or shoulder, or to smack her butt. Your business associate can't keep the smug smile off his face as he watches you pound some obedience into his slave. You know nothing puts a bitch in her place harder than discovering the secret rapture of being fucked just the way she didn't even know she likes it, and focus on exploiting her apparent humiliation fetish.<<if $PC.dick == 0>> She climaxes indecently hard from your expert, hard, but just tender enough loving.<<else>> Her tight pussy brings you to climax after a hard fucking and the sensation of being filled with your semen is enough to bring about her orgasm as well.<</if>> Your associate is extremely impressed with your performance and eager to ask for some slave-breaking tips. You're more than happy to offer a little advice, considering hes new to the game, and the two of you walk off together to find somewhere where you can get refreshments as you discuss. As you depart, a mass of curious socialites converge on the helpless slut, eager to try her holes out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made her very fashionable.
+ Taking a slaves virginity is hardly novel for you, yet somehow it never stops being fun. You consider the bottle of lubricant your associate has left out for use and then decide it's unnecessary, since the slutty bitch is already quite wet. <<if $PC.dick == 0>>You do however reach for one of the brand new strap-ons he has left out for ladies who wish to avail of his slut, tearing it eagerly from its box.<</if>> She begins to moan as you gently probe her pussy with the tip of <<if $PC.dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to her petite, feminine waist as you work, occasionally using one hand to hold her roughly by the hair, neck or shoulder, or to smack her butt. Your business associate can't keep the smug smile off his face as he watches you pound some obedience into his slave. You know nothing puts a bitch in her place harder than discovering the secret rapture of being fucked just the way she didn't even know she likes it, and focus on exploiting her apparent humiliation fetish.<<if $PC.dick == 0>> She climaxes indecently hard from your expert, hard, but just tender enough loving.<<else>> Her tight pussy brings you to climax after a hard fucking and the sensation of being filled with your semen is enough to bring about her orgasm as well.<</if>> Your associate is extremely impressed with your performance and eager to ask for some slave-breaking tips. You're more than happy to offer a little advice, considering he's new to the game, and the two of you walk off together to find somewhere where you can get refreshments as you discuss. As you depart, a mass of curious socialites converge on the helpless slut, eager to try her holes out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made her very fashionable.
<</if>>
Your citizens @@.green;appreciated@@ the vigorous show you put on, and the fact that you are @@.green;not too snobby@@ to enjoy the simple pleasure of availing of a public whore once in a while.
<<set $rep += 100>>
diff --git a/src/pregmod/widgets/economyWidgets.tw b/src/pregmod/widgets/economyWidgets.tw
index f1268eb8be7fab9877e7b788601c81239f7f261d..47e66354009589df3f584ae1a94d65319e8f8281 100644
--- a/src/pregmod/widgets/economyWidgets.tw
+++ b/src/pregmod/widgets/economyWidgets.tw
@@ -7,7 +7,7 @@
<<else>>
<<set _details = $args[0]>>
<<set _b = $facility.brothel>>
- <<run
+ <<run /*>> for sanityCheck*/
_b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0;
_b.rep = (def _b.rep) ? _b.rep : 0;
_b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0;
@@ -113,7 +113,7 @@
<<else>>
<<set _details = $args[0]>>
<<set _b = $facility.club>>
- <<run
+ <<run /*>> for sanityCheck*/
_b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0;
_b.rep = (def _b.rep) ? _b.rep : 0;
_b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0;
@@ -219,7 +219,7 @@
<<else>>
<<set _details = $args[0]>>
<<set _b = $facility.dairy>>
- <<run
+ <<run /*>> for sanityCheck*/
_b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0;
_b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0;
_b.maintenance = (def _b.maintenance) ? _b.maintenance : 0;
@@ -304,7 +304,7 @@
<<else>>
<<set _details = $args[0]>>
<<set _b = $facility.arcade>>
- <<run
+ <<run /*>> for sanityCheck*/
_b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0;
_b.rep = (def _b.rep) ? _b.rep : 0;
_b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0;
diff --git a/src/pregmod/widgets/marketWidgets.tw b/src/pregmod/widgets/marketWidgets.tw
index 77d4bd31c7717f02772fc8c316a7d6285dea63c4..134ebb8ae5c9a4c1be9f68804668324624ba0a45 100644
--- a/src/pregmod/widgets/marketWidgets.tw
+++ b/src/pregmod/widgets/marketWidgets.tw
@@ -10,7 +10,7 @@
<<widget "AddMarketOrigins">>
<<if _.isString($args[0]) && _.isArray($args[1])>>
- <<set _widgets = _(Story.widgets)
+ <<set _widgets = _(Story.widgets) /*>> for sanityCheck*/
.filter(function(wp) { return wp.tags.includes('market:' + $args[0]); })
.flatMap(function(wp) {
var re = RegExp('<<widget\\s+"([^"]+Populate)"\\s*>>', 'g');
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index b0bfbacb98324b7032a6bc11fdac3d442d88cf99..6b6dc1fdd8ef9a2505f32a22f717ba4052e53f21 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1072,20 +1072,20 @@ extremely pale -5
<<widget "ParentNames">>
<<set _currentSlaveNames = $slaves.map(s => s.slaveName)>>
-<<set $args[1].slaveName =
+<<set $args[1].slaveName = /*>> for sanityCheck*/
generateName($args[0].nationality, $args[1].race, $args[1].genes === "XY", sn => !_currentSlaveNames.includes(sn))>>
<<if !$args[1].slaveName>>
/* we ran out of names ... How? */
<<set _maxTries = 10>>
<<for _maxTries > 0 && !$args[1].slaveName>>
<<set _continentNationality = hashChoice($nationalities)>>
- <<set $args[1].slaveName =
+ <<set $args[1].slaveName = /*>> for sanityCheck*/
generateName(_continentNationality, $args[1].race, $args[1].genes === "XY", sn => !_currentSlaveNames.includes(sn))>>
<</for>>
<</if>>
<<if !$args[1].slaveName>>
/* give up, duplicate name is fine I guess */
- <<set $args[1].slaveName =
+ <<set $args[1].slaveName = /*>> for sanityCheck*/
generateName($args[0].nationality, $args[1].race, $args[1].genes === "XY")>>
<</if>>
<<unset _currentSlaveNames, _maxTries, _continentNationality>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 86797428cbe05785d844569563835946611ecc62..0ea2696819a4873d9520e53e96159ea91065344b 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -987,101 +987,111 @@
<<if ndef $SF>>
<<if $securityForceEventSeen < 1>> <<set $securityForceActive = -1>> <<else>> <<set $securityForceActive = 2>> <</if>>
- <<set $SF = Object.assign({}, $SF, {Toggle:$SFMODToggle, Active:$securityForceActive})>>
+ <<set $SF = {Toggle:$SFMODToggle, Active:$securityForceActive}>>
<<unset $SFMODToggle, $securityForceActive, $securityForceCreate, $securityForceEventSeen>>
- <<if ndef $securityForceName>> <<set $securityForceName = "the special force">> <</if>>
- <<if $SF.Active >= 1>>
- <<run Object.assign($SF, {Depravity:$securityForceDepravity,
- Units:$SFAO, MWU:$securityForceUpgradeTokenReset, U:$securityForceUpgradeToken,
- WG:$securityForceGiftToken, SpecOps:0, SpecOpsLock:0, ROE:$securityForceRulesOfEngagement,
- Target:$securityForceFocus, Regs:$securityForceAccountability,
- Caps:"The Special Force", Lower:$securityForceName, Subsidy:$SubsidyActive})>>
- <<unset $securityForceActive, $securityForceRecruit, $securityForceTrade,
- $securityForceBooty, $securityForceIncome, $securityForceMissionEfficiency,
- $securityForceProfitable, $TierTwoUnlock, $securityForceDepravity, $SFAO,
- $securityForceUpgradeTokenReset, $securityForceUpgradeToken,
- $securityForceGiftToken, $securityForceRulesOfEngagement, $securityForceFocus,
- $securityForceAccountability, $securityForceName, $SubsidyActive>>
- <<if $SF.Lower != "the special force">>
- <<set $SF.Caps = $SF.Lower.replace("the ", "The ")>>
- <</if>>
-
- <<if ndef $ColonelCore>> <<set $ColonelCore = "">> <</if>>
- <<if ndef $ColonelDiscussion>> <<set $ColonelDiscussion = 0>> <</if>>
- <<if ndef $ColonelSexed>> <<set $ColonelSexed = 0>> <</if>>
- <<set $SFColonel = Object.assign({}, $SFColonel = {Core:$ColonelCore, Talk:$securityForceColonelToken,
- Fun:$securityForceColonelSexed, Status:$ColonelRelationship})>>
- <<unset $ColonelCore, $securityForceColonelToken, $securityForceColonelSexed,
- $ColonelRelationship>>
-
- <<if ndef $TradeShowIncome>> <<set $TradeShowIncome = 0>> <</if>>
- <<if ndef $TotalTradeShowIncome>> <<set $TotalTradeShowIncome = 0>> <</if>>
- <<if ndef $TradeShowHelots>> <<set $TradeShowHelots = 0>> <</if>>
- <<if ndef $TotalTradeShowHelots>> <<set $TotalTradeShowHelots = 0>> <</if>>
- <<set $SFTradeShow = Object.assign({}, $SFTradeShow, {History:$OverallTradeShowAttendance,
- CanAttend:$CurrentTradeShowAttendance, Income:$TradeShowIncome,
- Revenue:$TotalTradeShowIncome, Helots:$TradeShowHelots,
- TotalHelots:$TotalTradeShowHelots, Mercs:0, TotalMercs:0})>>
- <<unset $OverallTradeShowAttendance, $CurrentTradeShowAttendance,
- $TradeShowIncome, $TotalTradeShowIncome, $TradeShowHelots,
- $TotalTradeShowHelots>>
- <<if $SFTradeShow.History > 0>> <<set $SFTradeShow.View = 1>> <</if>>
-
- <<if ndef $securityForceHeavyBattleTank>>
- <<set $securityForceHeavyBattleTank = 0>> <</if>>
- <<if ndef $securityForceSpacePlanePower>>
- <<set $securityForceSpacePlanePower = 0>> <</if>>
- <<if ndef $securityForceAC130>> <<set $securityForceAC130 = 0>> <</if>>
- <<if ndef $securityForceSatellitePower>>
- <<set $securityForceSatellitePower = 0>> <</if>>
- <<if ndef $securityForceGiantRobot>>
- <<set $securityForceGiantRobot = 0>> <</if>>
- <<if ndef $securityForceMissileSilo>>
- <<set $securityForceMissileSilo = 0>> <</if>>
- <<if ndef $securityForceAircraftCarrier>>
- <<set $securityForceAircraftCarrier = 0>> <</if>>
- <<if ndef $securityForceSubmarine>>
- <<set $securityForceSubmarine = 0>> <</if>>
- <<if ndef $securityForceHeavyAmphibiousTransport>>
- <<set $securityForceHeavyAmphibiousTransport = 0>> <</if>>
- <<set $SFUnit = Object.assign({}, $SFUnit, {Troops:$securityForcePersonnel,
- Armoury:$securityForceInfantryPower, Firebase:$securityForceArcologyUpgrades,
- AV:$securityForceVehiclePower, TV:$securityForceVehiclePower,
- Drones:$securityForceDronePower, Drugs:$securityForceStimulantPower,
- PGT:$securityForceHeavyBattleTank,AA:$securityForceAircraftPower,
- TA:$securityForceAircraftPower, SpacePlane:$securityForceSpacePlanePower,
- GunS:$securityForceAC130, Satellite:$securityForceSatellitePower,
- GiantRobot:$securityForceGiantRobot, MissileSilo:$securityForceMissileSilo,
- AircraftCarrier:$securityForceAircraftCarrier, Sub:$securityForceSubmarine,
- HAT:$securityForceHeavyAmphibiousTransport})>> <<set $SatLaunched = 0>>
- <<unset $securityForcePersonnel, $securityForceInfantryPower,
- $securityForceArcologyUpgrades, $securityForceVehiclePower,
- $securityForceDronePower, $securityForceStimulantPower,
- $securityForceHeavyBattleTank, $securityForceAircraftPower,
- $securityForceSpacePlanePower,$securityForceAC130, $securityForceSatellitePower,
- $securityForceGiantRobot, $securityForceMissileSilo,
- $securityForceAircraftCarrier, $securityForceSubmarine, $securityForceHeavyAmphibiousTransport>>
- <<else>>
- <<run Object.assign($SF, {Depravity:0, Units:0, MWU:0, U:0, WG:0, SpecOps:0, SpecOpsLock:0, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1})>>
- <<set $SFUnit = Object.assign({}, $SFUnit, {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:0, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0})>>
- <<set $SatLaunched = 0>>
- <<set $arcologies[0].SFRaid = 1,$arcologies[0].SFRaidTarget = -1>> <<set $SFColonel = Object.assign({}, $SFColonel, {Core:"", Talk:0, Fun:0, Status:0})>>
- <<set $SFTradeShow = Object.assign({}, $SFTradeShow, {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0})>>
+ <<if ndef $securityForceName>><<set $securityForceName = "the special force">><</if>>
+ <<if $SF.Active >= 1>>
+ <<run Object.assign($SF, {
+ Depravity:$securityForceDepravity,
+ Units:$SFAO,
+ MWU:$securityForceUpgradeTokenReset,
+ U:$securityForceUpgradeToken,
+ WG:$securityForceGiftToken,
+ SpecOps:0,
+ SpecOpsLock:0,
+ ROE:$securityForceRulesOfEngagement,
+ Target:$securityForceFocus,
+ Regs:$securityForceAccountability,
+ Caps:"The Special Force",
+ Lower:$securityForceName,
+ Subsidy:$SubsidyActive})>>
+ <<unset $securityForceActive, $securityForceRecruit, $securityForceTrade, $securityForceBooty, $securityForceIncome, $securityForceMissionEfficiency, $securityForceProfitable, $TierTwoUnlock, $securityForceDepravity, $SFAO, $securityForceUpgradeTokenReset, $securityForceUpgradeToken, $securityForceGiftToken, $securityForceRulesOfEngagement, $securityForceFocus, $securityForceAccountability, $securityForceName, $SubsidyActive>>
+ <<if $SF.Lower != "the special force">><<set $SF.Caps = $SF.Lower.replace("the ", "The ")>><</if>>
+
+ <<if ndef $ColonelCore>><<set $ColonelCore = "">><</if>>
+ <<if ndef $ColonelDiscussion>><<set $ColonelDiscussion = 0>><</if>>
+ <<if ndef $ColonelSexed>><<set $ColonelSexed = 0>><</if>>
+ <<set $SFColonel = {
+ Core:$ColonelCore,
+ Talk:$securityForceColonelToken,
+ Fun:$securityForceColonelSexed,
+ Status:$ColonelRelationship}>>
+ <<unset $ColonelCore, $securityForceColonelToken, $securityForceColonelSexed, $ColonelRelationship>>
+
+ <<if ndef $TradeShowIncome>><<set $TradeShowIncome = 0>><</if>>
+ <<if ndef $TotalTradeShowIncome>><<set $TotalTradeShowIncome = 0>><</if>>
+ <<if ndef $TradeShowHelots>><<set $TradeShowHelots = 0>><</if>>
+ <<if ndef $TotalTradeShowHelots>><<set $TotalTradeShowHelots = 0>><</if>>
+ <<set $SFTradeShow = {
+ History:$OverallTradeShowAttendance,
+ CanAttend:$CurrentTradeShowAttendance,
+ Income:$TradeShowIncome,
+ Revenue:$TotalTradeShowIncome,
+ Helots:$TradeShowHelots,
+ TotalHelots:$TotalTradeShowHelots,
+ Mercs:0,
+ TotalMercs:0}>>
+ <<unset $OverallTradeShowAttendance, $CurrentTradeShowAttendance, $TradeShowIncome, $TotalTradeShowIncome, $TradeShowHelots, $TotalTradeShowHelots>>
+ <<if $SFTradeShow.History > 0>> <<set $SFTradeShow.View = 1>> <</if>>
+
+ <<if ndef $securityForceHeavyBattleTank>><<set $securityForceHeavyBattleTank = 0>><</if>>
+ <<if ndef $securityForceSpacePlanePower>><<set $securityForceSpacePlanePower = 0>><</if>>
+ <<if ndef $securityForceAC130>><<set $securityForceAC130 = 0>><</if>>
+ <<if ndef $securityForceSatellitePower>><<set $securityForceSatellitePower = 0>><</if>>
+ <<if ndef $securityForceGiantRobot>><<set $securityForceGiantRobot = 0>><</if>>
+ <<if ndef $securityForceMissileSilo>><<set $securityForceMissileSilo = 0>><</if>>
+ <<if ndef $securityForceAircraftCarrier>><<set $securityForceAircraftCarrier = 0>><</if>>
+ <<if ndef $securityForceSubmarine>><<set $securityForceSubmarine = 0>><</if>>
+ <<if ndef $securityForceHeavyAmphibiousTransport>><<set $securityForceHeavyAmphibiousTransport = 0>><</if>>
+ <<set $SFUnit = {
+ Troops:$securityForcePersonnel,
+ Armoury:$securityForceInfantryPower,
+ Firebase:$securityForceArcologyUpgrades,
+ AV:$securityForceVehiclePower,
+ TV:$securityForceVehiclePower,
+ Drones:$securityForceDronePower,
+ Drugs:$securityForceStimulantPower,
+ PGT:$securityForceHeavyBattleTank,
+ AA:$securityForceAircraftPower,
+ TA:$securityForceAircraftPower,
+ SpacePlane:$securityForceSpacePlanePower,
+ GunS:$securityForceAC130,
+ Satellite:$securityForceSatellitePower,
+ GiantRobot:$securityForceGiantRobot,
+ MissileSilo:$securityForceMissileSilo,
+ AircraftCarrier:$securityForceAircraftCarrier,
+ Sub:$securityForceSubmarine,
+ HAT:$securityForceHeavyAmphibiousTransport}>>
+ <<set $SatLaunched = 0>>
+ <<unset $securityForcePersonnel, $securityForceInfantryPower, $securityForceArcologyUpgrades, $securityForceVehiclePower, $securityForceDronePower, $securityForceStimulantPower, $securityForceHeavyBattleTank, $securityForceAircraftPower, $securityForceSpacePlanePower,$securityForceAC130, $securityForceSatellitePower, $securityForceGiantRobot, $securityForceMissileSilo, $securityForceAircraftCarrier, $securityForceSubmarine, $securityForceHeavyAmphibiousTransport>>
+ <<else>>
+ <<run Object.assign($SF, {Depravity:0, Units:0, MWU:0, U:0, WG:0, SpecOps:0, SpecOpsLock:0, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1})>>
+ <<set $SFUnit = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:0, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0}>>
+ <<set $SatLaunched = 0>>
+ <<set $arcologies[0].SFRaid = 1,$arcologies[0].SFRaidTarget = -1>>
+ <<set $SFColonel = {Core:"", Talk:0, Fun:0, Status:0}>>
+ <<set $SFTradeShow = {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0}>>
<</if>>
- <<set $SF.Facility = Object.assign({}, $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:[]})>>
+ <<set $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:[]}>>
<</if>>
<<if def $SF>>
<<if def $SpecOpsLock>>
<<set $SF.SpecOpsLock = $SpecOpsLock>>
<<unset $SpecOpsLock>>
<</if>>
- <<if $SF.Active >= 0 && passage() === "New Game Plus">> <<= SFInit()>> <<run Object.assign($SF, {Active:-1})>> <</if>>
+ <<if $SF.Active >= 0 && passage() === "New Game Plus">>
+ <<= SFInit()>>
+ <<run Object.assign($SF, {Active:-1})>>
+ <</if>>
<<if ndef $SF.Facility>>
- <<set $SF.Facility = Object.assign({}, $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:[]})>>
+ <<set $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:[]}>>
<</if>>
<<if ndef $SF.Bonus>>
<<set $SF.Bonus = 0>>
<</if>>
+ <<if $SF.Depravity < 0>>
+ <<set $SF.Depravity = 0>>
+ <</if>>
<</if>>
<<if def $SFUnit>>
<<if def $SFUnit.AT>>
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index eceeb378dcf2a895b8ce3f22e77f5e85b12f660e..ba2c67f5717cb903c270a03bf253d3012e6057e5 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -51,7 +51,7 @@
<<set _duplicateSlaves = _($slaves).countBy(s => s.ID).pickBy(v => v > 1).keys().map(v => Number(v)).value()>>
<<foreach _i of _duplicateSlaves>>
<br><br>@@.red;Duplicate slave ID _i at indices
- <<= _($slaves)
+ <<= _($slaves) /*>> for sanityCheck*/
.map((s, idx) => ({ID: s.ID, idx: idx, name: s.slaveName, assignment: s.assignment}))
.filter(s => s.ID === _i).map(s => s.idx + ' - ' + s.name + ' (' + s.assignment + ')').join(', ')>>@@
<</foreach>>
@@ -71,7 +71,7 @@
<<set $nextButton = "END WEEK", $nextLink = "End Week", $showEncyclopedia = 1, $encyclopedia = "How to Play">>
<<set $costs = getCost($slaves)>>
-<<set
+<<set /*>> for sanityCheck*/
$arcologies[0].name = $arcologies[0].name || "Arcology X-4",
$brothelName = $brothelName || "the Brothel",
$brothelNameCaps = $brothelNameCaps || "The Brothel",
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index dd9f4df4f1fed4b2d348fb70ef712dc74a8ef88d..f471df4e1e1138d3886d95705273df0e39ed42e0 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -113,7 +113,7 @@
<</if>>
<<if $slaves[$i].assignmentVisible == 1>> /* OPENS AUTOSURGERY, CLOTHES, AND ACCESSORIES */
- <<if hasSurgeryRule($slaves[$i], $defaultRules) &&
+ <<if hasSurgeryRule($slaves[$i], $defaultRules) && /*>> for sanityCheck*/
$slaves[$i].useRulesAssistant == 1 &&
$slaves[$i].indentureRestrictions < 2 &&
$cash > 0>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 7d06050c284d0a3a2fee33fb42f83bcb2bce8fd1..3273c8faff9d9d8d38aacae9ed4e7e27b682435a 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -192,12 +192,6 @@
<<if (_Slave.assignment != "work a glory hole")>><<continue>><</if>>
<<elseif $slaveAssignmentTab == "be a subordinate slave">>
<<if (_Slave.assignment != "be a subordinate slave")>><<continue>><</if>>
- <<elseif $slaveAssignmentTab == "all">>
- <<if $useSlaveSummaryOverviewTab == 1>>
- <<if (_Slave.assignment == "be your Head Girl")
- || (_Slave.assignment == "recruit girls")
- || (_Slave.assignment == "guard you")>><<continue>><</if>>
- <</if>>
<</if>>
<</if>>