diff --git a/devTools/AutoGitVersionUploadBackground.sh b/devTools/AutoGitVersionUploadBackground.sh
index e0a78540509ff7e74570877c6250fef1bec9a9ec..597c5ba6a29af2269f1af07291127535bbc1abd2 100755
--- a/devTools/AutoGitVersionUploadBackground.sh
+++ b/devTools/AutoGitVersionUploadBackground.sh
@@ -1,8 +1,8 @@
#!/bin/sh Additional packages required: megatools, MEGAcmd, minify and git
U=anon@anon.anon P=13245 sdr=/tmp/FC-Dev/devTools rdr=FC/ ldr=FC/ gen='bin/*.*' rpo=https://gitgud.io/pregmodfan/fc-pregmod.git preVC=00; echo "Fresh git clone? 0:y 1:n 2:na" && read Opt && clear && mega-login $U $P > /dev/null
while true;do if [ `ls $ldr|echo $?` -eq 0 ]; then cd $ldr;fi ;clear
- if [[ $Opt == 0 ]]; then mkdir $ldr; git clone -q $rpo $ldr && cd $ldr && if [ `git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //'` != $preVC ]; then build=1 && sed -Ei "s/preVC=$preVC/preVC=$(git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //')/" $sdr/AutoGitVersionUploadBackground.sh;fi
- elif [[ $Opt > 0 || $build < 1 ]]; then git fetch -q origin && if [ `git rev-list HEAD...origin/pregmod-master --count` -gt 0 ]; then build=1 && git pull -q && sed -Ei "s/preVC=$preVC/preVC=$(git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //')/" $sdr/AutoGitVersionUploadBackground.sh;fi #A tweak of https://stackoverflow.com/a/17192101 and single line conversion.
- fi
- if [[ $Opt > 1 || $build > 0 ]]; then rm $gen; ./compile --insane && clear && minify -o $gen $gen && mv $gen bin/"FC-pregmod-$(git log -1 --format='%cd' --date='format:%d-%m-%Y-%H-%M')-$(git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //')".html && mega-put $gen $rdr && megals -u $U -p $P /Root/$rdr|sed -n '1!p'|tail -n +10|paste -sd " " -|xargs megarm -u $U -p $P;clear;fi
-if [[ $build > 0 ]];then build=0;fi ; if [[ $Opt != -1 ]];then Opt=-1;fi ;sleep 15m ;done
\ No newline at end of file
+ if [[ $Opt == 0 ]]; then mkdir $ldr; git clone -q $rpo $ldr && cd $ldr && if [ `git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //'|sed s'/.$//'` != $preVC ]; then build=1 && sed -Ei "s/preVC=$preVC/preVC=$(git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //'|sed s'/.$//')/" $sdr/AutoGitVersionUploadBackground.sh;fi
+ elif [[ $Opt > 0 || $build < 1 ]]; then git fetch -q origin && if [ `git rev-list HEAD...origin/pregmod-master --count` -gt 0 ]; then build=1 && git pull -q && sed -Ei "s/preVC=$preVC/preVC=$(git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //'|sed s'/.$//')/" $sdr/AutoGitVersionUploadBackground.sh;fi #A tweak of https://stackoverflow.com/a/17192101 and single line conversion.
+ fi #sed s'/.$//' - https://stackoverflow.com/a/3675181
+ if [[ $Opt > 1 || $build > 0 ]]; then rm $gen; ./compile --insane && clear && minify -o $gen $gen && mv $gen bin/"FC-pregmod-$(git log -1 --format='%cd' --date='format:%d-%m-%Y-%H-%M')-$(git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //'|sed s'/.$//')".html && mega-put $gen $rdr && megals -u $U -p $P /Root/$rdr|sed -n '1!p'|tail -n +10|paste -sd " " -|xargs megarm -u $U -p $P;clear;fi
+if [[ $build > 0 ]];then build=0;fi ; if [[ $Opt != -1 ]];then Opt=-1;fi ;sleep 30m ;done
diff --git a/src/SpecialForce/Report.tw b/src/SpecialForce/Report.tw
index e9c0547e74ea7b6c6f82575d7150ba64ccb32304..234126ee92bc7e904bad148fb3d132f5ed4063a4 100644
--- a/src/SpecialForce/Report.tw
+++ b/src/SpecialForce/Report.tw
@@ -173,7 +173,7 @@ $SF.Caps managed to recruit <<print Math.round(_FNGs/2)>> new soldiers this week
<<link "Hold Fire">> <<set $SF.ROE = "hold">> <<replace "#roe">> ''Hold Fire''
<</replace>> <</link>>
| <<link "Limited Fire">> <<set $SF.ROE = "limited">> <<replace "#roe">>
- 'Limited Fire'' <</replace>> <</link>>
+ ''Limited Fire'' <</replace>> <</link>>
| <<link "Free Fire">> <<set $SF.ROE = "free">> <<replace "#roe">> ''Free Fire''
<</replace>> <</link>>
<br> Accountability:
diff --git a/src/SpecialForce/WeeklyChoices.tw b/src/SpecialForce/WeeklyChoices.tw
index 064f833b990590a7f3e8dca42584c564d38e2cba..b9427691779feb4076c7524b902e6d12da253cad 100644
--- a/src/SpecialForce/WeeklyChoices.tw
+++ b/src/SpecialForce/WeeklyChoices.tw
@@ -12,13 +12,15 @@
<<set $GoodWords1 += 50*(Math.ceil($SF.Units*0.03*_Env))>>
<<set $GoodWords1 = (Number($GoodWords1) ? $GoodWords1 : 500),$SF.WG = 1>>
<<set $rep += $GoodWords1,$choice = 2>>
- <</link>><</if>>
+ <</link>>
+ <</if>>
<<if $arcologies[0].prosperity < $AProsperityCap>>
<br>Or we could hit some businesses that rival the ones in $arcologies[0].name with some sabotage. | <<link "Request sabotage""Firebase">>
<<set $GoodWords2 = _EnvProsp+(Math.ceil($SF.Units/100*_Env)),$SF.WG = 1,$choice = 3>>
<<if $arcologies[0].prosperity + $GoodWords2 > $AProsperityCap>>
<<set $arcologies[0].prosperity = $AProsperityCap>>
- <<else>><<set $arcologies[0].prosperity += $GoodWords2>><</if>> <</link>> <</if>>
+ <<else>> <<set $arcologies[0].prosperity += $GoodWords2>> <</if>> <</link>>
+ <</if>>
<<elseif $SF.WG == 0 && ($SFTradeShow.CanAttend > -1 || ($SFColonel.Talk + $SFColonel.Fun > 0))>>
<br>He looks down a list on his tablet. "<<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>, how can $SF.Lower help you this week?
<br>$SF.Caps can spare some profits from our recent operations. | <<link "Request cash""Firebase">>
@@ -30,168 +32,171 @@
<<set $GoodWords1 += 50*(Math.ceil($SF.Units*0.03*_Env))>>
<<set $GoodWords1 = (Number($GoodWords1) ? $GoodWords1 : 500),$SF.WG = 1>>
<<set $rep += Math.ceil($GoodWords1*0.8),$choice = 2>>
- <</link>> <</if>>
+ <</link>>
+ <</if>>
<<if $arcologies[0].prosperity < $AProsperityCap>>
<br>Or we can target rival businesses for sabotage. | <<link "Request sabotage""Firebase">>
<<set $GoodWords2 = _EnvProsp+(Math.ceil($SF.Units/100*_Env)),$SF.WG = 1,$choice = 3>>
<<if $arcologies[0].prosperity + $GoodWords2 * 0.8 > $AProsperityCap>>
<<set $arcologies[0].prosperity = $AProsperityCap>>
- <<else>><<set $arcologies[0].prosperity += Math.ceil($GoodWords2*0.8)>><</if>> <</link>> <</if>>
+ <<else>> <<set $arcologies[0].prosperity += Math.ceil($GoodWords2*0.8)>> <</if>> <</link>>
+ <</if>>
<</if>>
<<if $SFColonel.Talk === 0 && $SFColonel.Fun === 0 && $SFTradeShow.CanAttend === -1>> <span id="result0">
<br><br>If you need me for anything else, let me know."<br>
-<<if $SFColonel.Status >= 25>>
- <<link "Walk with the Colonel on the surface.">> <<replace "#result0">>
- <<set $SFColonel.Talk = 1>>
- <br><br>You ask the Colonel if she would like to stretch her legs up on the surface. It doesn't take much effort for her to agree.
- <<if $PC.warfare >= 100 && $PC.career == "mercenary">>
- Your mastery of wet work and prior experience in a PMC satisfies the Colonel that between you<<if $Bodyguard != 0>> , $Bodyguard.slaveName,<</if>> and her, there should be little threat to walking around the arcology. Being able to see and interact with the arcology owner directly maintains the false idea that you're just like one of them while also giving them an increased opportunity to try gaining your favor.
- <<set $rep += 10, $cash += _EnvCash2>>
- <<elseif $PC.warfare >= 100>>
- Your mastery of wet work satisfies the Colonel that you only need two soldiers <<if $Bodyguard != 0>> plus $Bodyguard.slaveName<</if>> to walk safely around the arcology. Being able to see and interact with the arcology owner directly maintains the false idea that you're just like one of them while also giving them an increased opportunity to try gaining your favor.
- <<set $rep += 5, $cash += _EnvCash3>>
- <<elseif $PC.warfare >= 60>>
- With some expertise in warfare, the Colonel believes <<if $Bodyguard != 0>>with $Bodyguard.slaveName <</if>>you only need a squad of armed soldiers for a walk through the arcology.
- <<elseif $PC.warfare >= 30>>
- As you have some skill in warfare, the Colonel believes<<if $Bodyguard != 0>> with $Bodyguard.slaveName<</if>> you only need two full squads of armed soldiers for a walk around the arcology.
- <<elseif $PC.warfare >= 10>>
- Your minor skill in warfare convinces the Colonel that <<if $Bodyguard != 0>>in addition to $Bodyguard.slaveName, <</if>>you need two full squads of armed soldiers and an armored car escort for a simple walk around the arcology.
- <<else>>
- Your complete lack of combat skill convinces the Colonel that <<if $Bodyguard != 0>>in addition to $Bodyguard.slaveName, <</if>>you need two full squads of armed soldiers, an armored car escort, and a sniper overwatch for a simple walk around the arcology.
- <</if>><br>As you make your way through the arcology you stop at a
- <<if $arcologies[0].FSPaternalist != "unset">>
- paternalist shop, <<if $SFColonel.Core == "cruel">>earning a sneer from the Colonel.<<else>>helping the Colonel select some luxurious and relaxing slave treatments.<</if>>
- <<elseif $arcologies[0].FSPastoralist != "unset">>
- pastoralist shop, helping the Colonel select a more comfortable breast pump.
- <<else>>shop that catches the Colonel's eye. <</if>>
- <<if $PC.slaving >= 100 && $PC.career == "slaver">>
- Your mastery and extensive history of slaving allows you assist the Colonel greatly. The shop owner is so impressed by your understanding of slavery that she asks you for some advice. Before you leave, you manage to pass on a few tips, helping the business with future customers.
- <<if $arcologies[0].prosperity < $AProsperityCap>>
- <<set $arcologies[0].prosperity++>> <</if>>
- <<elseif $PC.slaving >= 100>>
- Your mastery and extensive history of slaving allows you assist the Colonel greatly. The shop owner is so impressed by your understanding of slavery that she asks you for some advice. Before you leave, you manage to pass on a few tips, helping the business with future customers.
- <<if $arcologies[0].prosperity < $AProsperityCap>>
- <<set $arcologies[0].prosperity++>> <</if>>
- <<elseif $PC.slaving >= 60>>
- Your expertise in slavery allows you to help the Colonel decide what to buy for her main slave.
- <<elseif $PC.slaving >= 30>>
- Your moderate skill in slavery makes you somewhat helpful to the Colonel in deciding what to buy for her main slave.
- <<elseif $PC.slaving >= 10>>
- Your basic skill level of slavery doesn't allow you to help the Colonel at all.
- <<elseif $PC.slaving < 10>>
- Your total lack of slavery skill (which is very unusual and very concerning for an arcology owner) means that you are of little to no help or even a hindrance. The shopkeeper notices your complete ineptitude, and as soon as you've left the rumor mill begins.
- <<set $rep -= 20>><</if>>
- <br>Soon the entourage heads back to the HQ of $SF.Lower.
- <<if random(1,100) > 50>>Along the route you see a homeless citizen with a serious injury begging for help.
- <<if $PC.medicine >= 100 && $PC.career == "medicine">>
- Your expertise in surgery ensures that the citizen receives the best care they'll ever experience in their life. They are so grateful that they are more than happy to try and compensate your time. Word quickly spreads of the kindly medically trained arcology owner who took the time to heal a citizen, providing confidence to the rest of the citizens.
- <<set $rep += 10, $cash += _EnvCash4>>
- <<elseif $PC.medicine >= 100>>
- Your expertise in surgery ensures that the citizen receives the best care they'll ever experience in their life. Word quickly spreads of the kindly arcology owner who took the time to heal a citizen.
- <<set $rep += 5>>
- <<elseif $PC.medicine >= 60>>
- Your proficiency in surgery allows you to properly close their wound with minimal trauma to the patient.
- <<elseif $PC.medicine >= 30>>
- Your moderate surgical skill ensures that you can close the citizen's wound, though not without likely scarring.
- <<elseif $PC.medicine >= 10>>
- Your basic surgical skill in medicine is sufficient only to stabilize the citizen's wounds before medical assistnance arrives.
+ <<if $SFColonel.Status >= 25>>
+ <<link "Walk with the Colonel on the surface.">> <<replace "#result0">>
+ <<set $SFColonel.Talk = 1>>
+ <br><br>You ask the Colonel if she would like to stretch her legs up on the surface. It doesn't take much effort for her to agree.
+ <<if $PC.warfare >= 100 && $PC.career == "mercenary">>
+ Your mastery of wet work and prior experience in a PMC satisfies the Colonel that between you<<if $Bodyguard != 0>> , $Bodyguard.slaveName,<</if>> and her, there should be little threat to walking around the arcology. Being able to see and interact with the arcology owner directly maintains the false idea that you're just like one of them while also giving them an increased opportunity to try gaining your favor.
+ <<set $rep += 10, $cash += _EnvCash2>>
+ <<elseif $PC.warfare >= 100>>
+ Your mastery of wet work satisfies the Colonel that you only need two soldiers <<if $Bodyguard != 0>> plus $Bodyguard.slaveName<</if>> to walk safely around the arcology. Being able to see and interact with the arcology owner directly maintains the false idea that you're just like one of them while also giving them an increased opportunity to try gaining your favor.
+ <<set $rep += 5, $cash += _EnvCash3>>
+ <<elseif $PC.warfare >= 60>>
+ With some expertise in warfare, the Colonel believes <<if $Bodyguard != 0>>with $Bodyguard.slaveName <</if>>you only need a squad of armed soldiers for a walk through the arcology.
+ <<elseif $PC.warfare >= 30>>
+ As you have some skill in warfare, the Colonel believes<<if $Bodyguard != 0>> with $Bodyguard.slaveName<</if>> you only need two full squads of armed soldiers for a walk around the arcology.
+ <<elseif $PC.warfare >= 10>>
+ Your minor skill in warfare convinces the Colonel that <<if $Bodyguard != 0>>in addition to $Bodyguard.slaveName, <</if>>you need two full squads of armed soldiers and an armored car escort for a simple walk around the arcology.
<<else>>
- Your total lack of surgical skill causes the death of the citizen through repeated medical blunders.
- <<set $arcologies[0].prosperity -= .25>><</if>><</if>>
- <<set $SFColonel.Status += 2>><</replace>> <</link>><</if>>
+ Your complete lack of combat skill convinces the Colonel that <<if $Bodyguard != 0>>in addition to $Bodyguard.slaveName, <</if>>you need two full squads of armed soldiers, an armored car escort, and a sniper overwatch for a simple walk around the arcology.
+ <</if>> <br>As you make your way through the arcology you stop at a
+ <<if $arcologies[0].FSPaternalist != "unset">>
+ paternalist shop, <<if $SFColonel.Core == "cruel">>earning a sneer from the Colonel.<<else>>helping the Colonel select some luxurious and relaxing slave treatments.<</if>>
+ <<elseif $arcologies[0].FSPastoralist != "unset">>
+ pastoralist shop, helping the Colonel select a more comfortable breast pump.
+ <<else>>shop that catches the Colonel's eye. <</if>>
+ <<if $PC.slaving >= 100 && $PC.career == "slaver">>
+ Your mastery and extensive history of slaving allows you assist the Colonel greatly. The shop owner is so impressed by your understanding of slavery that she asks you for some advice. Before you leave, you manage to pass on a few tips, helping the business with future customers.
+ <<if $arcologies[0].prosperity < $AProsperityCap>>
+ <<set $arcologies[0].prosperity++>> <</if>>
+ <<elseif $PC.slaving >= 100>>
+ Your mastery and extensive history of slaving allows you assist the Colonel greatly. The shop owner is so impressed by your understanding of slavery that she asks you for some advice. Before you leave, you manage to pass on a few tips, helping the business with future customers.
+ <<if $arcologies[0].prosperity < $AProsperityCap>>
+ <<set $arcologies[0].prosperity++>> <</if>>
+ <<elseif $PC.slaving >= 60>>
+ Your expertise in slavery allows you to help the Colonel decide what to buy for her main slave.
+ <<elseif $PC.slaving >= 30>>
+ Your moderate skill in slavery makes you somewhat helpful to the Colonel in deciding what to buy for her main slave.
+ <<elseif $PC.slaving >= 10>>
+ Your basic skill level of slavery doesn't allow you to help the Colonel at all.
+ <<elseif $PC.slaving < 10>>
+ Your total lack of slavery skill (which is very unusual and very concerning for an arcology owner) means that you are of little to no help or even a hindrance. The shopkeeper notices your complete ineptitude, and as soon as you've left the rumor mill begins.
+ <<set $rep -= 20>><</if>>
+ <br>Soon the entourage heads back to the HQ of $SF.Lower.
+ <<if random(1,100) > 50>>Along the route you see a homeless citizen with a serious injury begging for help.
+ <<if $PC.medicine >= 100 && $PC.career == "medicine">>
+ Your expertise in surgery ensures that the citizen receives the best care they'll ever experience in their life. They are so grateful that they are more than happy to try and compensate your time. Word quickly spreads of the kindly medically trained arcology owner who took the time to heal a citizen, providing confidence to the rest of the citizens.
+ <<set $rep += 10, $cash += _EnvCash4>>
+ <<elseif $PC.medicine >= 100>>
+ Your expertise in surgery ensures that the citizen receives the best care they'll ever experience in their life. Word quickly spreads of the kindly arcology owner who took the time to heal a citizen.
+ <<set $rep += 5>>
+ <<elseif $PC.medicine >= 60>>
+ Your proficiency in surgery allows you to properly close their wound with minimal trauma to the patient.
+ <<elseif $PC.medicine >= 30>>
+ Your moderate surgical skill ensures that you can close the citizen's wound, though not without likely scarring.
+ <<elseif $PC.medicine >= 10>>
+ Your basic surgical skill in medicine is sufficient only to stabilize the citizen's wounds before medical assistnance arrives.
+ <<else>>
+ Your total lack of surgical skill causes the death of the citizen through repeated medical blunders.
+ <<set $arcologies[0].prosperity -= .25>><</if>>
+ <</if>>
+ <<set $SFColonel.Status += 2>> <</replace>> <</link>>
+ <</if>>
-<br><<link "Talk in $SF.Lower's HQ.">> <<replace "#result0">> <span id="result1">
-<br><br>What do you want to do with the Colonel in the HQ?
-<br><<link "Talk">><<replace "#result1">>
-<br><br>You and the Colonel talk over some $PC.refreshment, where she ends up talking about her past. You learn a little more about her.
-<<set $SFColonel.Status +=3>>
-<<switch random(1,6)>>
-<<case 1>>
- <<set $PC.medicine += 1>><<set $PC.trading += 1>><<set $PC.slaving += 1>>
-<<case 2>>
- <<set $PC.trading += 1>><<set $PC.slaving += 1>><<set $PC.engineering += 1>>
-<<case 3>>
- <<set $PC.slaving += 1>><<set $PC.engineering += 1>><<set $PC.hacking += 1>>
-<<case 4>>
- <<set $PC.engineering += 1>><<set $PC.hacking += 1>><<set $PC.warfare += 1>>
-<<case 5>>
- <<set $PC.hacking += 1>><<set $PC.warfare += 1>><<set $PC.medicine += 1>>
-<<case 6>>
- <<set $PC.warfare += 1>><<set $PC.medicine += 1>><<set $PC.trading += 1>>
-<</switch>>
-<</replace>><</link>>
+ <br> <<link "Talk in $SF.Lower's HQ.">> <<replace "#result0">> <span id="result1">
+ <br><br>What do you want to do with the Colonel in the HQ?
+ <br> <<link "Talk">><<replace "#result1">>
+ <br><br>You and the Colonel talk over some $PC.refreshment, where she ends up talking about her past. You learn a little more about her.
+ <<set $SFColonel.Status +=3>>
+ <<switch random(1,6)>>
+ <<case 1>>
+ <<set $PC.medicine += 1>><<set $PC.trading += 1>><<set $PC.slaving += 1>>
+ <<case 2>>
+ <<set $PC.trading += 1>><<set $PC.slaving += 1>><<set $PC.engineering += 1>>
+ <<case 3>>
+ <<set $PC.slaving += 1>><<set $PC.engineering += 1>><<set $PC.hacking += 1>>
+ <<case 4>>
+ <<set $PC.engineering += 1>><<set $PC.hacking += 1>><<set $PC.warfare += 1>>
+ <<case 5>>
+ <<set $PC.hacking += 1>><<set $PC.warfare += 1>><<set $PC.medicine += 1>>
+ <<case 6>>
+ <<set $PC.warfare += 1>><<set $PC.medicine += 1>><<set $PC.trading += 1>>
+ <</switch>>
+ <</replace>><</link>>
-<br><<link "Learn">> <<replace "#result1">>
-<<set $SFColonel.Talk = 1,$SFColonel.Status += 1>>
-<br><br>"Sure boss, I can use a break from all of this," she laughs. The Colonel tells a story about one time when she
-<<switch random(1,6)>>
-<<case 1>>
- used field medicine to save another merc's life, teaching you some medical procedures in the process.
- <<set $PC.medicine += 5>>
-<<case 2>>
- haggled for necessary gear with a stingy quartermaster, teaching you how to get what you want from traders.
- <<set $PC.trading += 5>>
-<<case 3>>
- found a load of human chattel in a raid and had to manage them before they could later be unloaded, teaching you how to better care for your slaves.
- <<set $PC.slaving += 5>>
-<<case 4>>
- was responsible for rebuilding a fort she had seized, teaching you how to better manage construction in your arcology.
- <<set $PC.engineering += 5>>
-<<case 5>>
- was forced to hack her way out of a trap, teaching you how to better penetrate digital security.
- <<set $PC.hacking += 5>>
-<<case 6>>
- fought off an entire battalion with only a small squad, teaching you how to think tactically in battle.
- <<set $PC.warfare += 5>>
-<</switch>>
-<</replace>> <</link>>
+ <br> <<link "Learn">> <<replace "#result1">>
+ <<set $SFColonel.Talk = 1,$SFColonel.Status += 1>>
+ <br><br>"Sure boss, I can use a break from all of this," she laughs. The Colonel tells a story about one time when she
+ <<switch random(1,6)>>
+ <<case 1>>
+ used field medicine to save another merc's life, teaching you some medical procedures in the process.
+ <<set $PC.medicine += 5>>
+ <<case 2>>
+ haggled for necessary gear with a stingy quartermaster, teaching you how to get what you want from traders.
+ <<set $PC.trading += 5>>
+ <<case 3>>
+ found a load of human chattel in a raid and had to manage them before they could later be unloaded, teaching you how to better care for your slaves.
+ <<set $PC.slaving += 5>>
+ <<case 4>>
+ was responsible for rebuilding a fort she had seized, teaching you how to better manage construction in your arcology.
+ <<set $PC.engineering += 5>>
+ <<case 5>>
+ was forced to hack her way out of a trap, teaching you how to better penetrate digital security.
+ <<set $PC.hacking += 5>>
+ <<case 6>>
+ fought off an entire battalion with only a small squad, teaching you how to think tactically in battle.
+ <<set $PC.warfare += 5>>
+ <</switch>>
+ <</replace>> <</link>>
-<<if $SFColonel.Status >= 45>>
-<br><<link "Have some fun.">> <<replace "#result1">>
- @@.orange;<<link "Go back""Firebase">>
- <<set $SFColonel.Fun = 0, $SFColonel.Talk = 0,$SFColonel.Status -= 3>>
- <</link>>@@
- <<set $SFColonel.Fun = 1,$SFColonel.Talk = 1,$SFColonel.Status += 3>>
- Where should this fun take place?
- <br>@@.orange;<<link "In private">> <span id="result6">
- Which orifice do you wish to target?
- @@.orange;<<link "Go back""Firebase">> <</link>>@@
- <br>@@.orange;<<link "Pussy">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 1>> <</link>>@@
- <br>@@.orange;<<link "Ass">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 1>> <</link>>@@
- <br>@@.orange;<<link "Both pussy and ass">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 2>> <</link>>@@
- <br>@@.orange;<<link "Mouth">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 1>> <</link>>@@
- <br>@@.orange;<<link "All three holes">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 3>> <</link>>@@
- </span> <</link>>@@
+ <<if $SFColonel.Status >= 45>> <br> <<link "Have some fun.">> <<replace "#result1">> <span id="result4">
+ <<set $SFColonel.Fun = 1,$SFColonel.Talk = 1,$SFColonel.Status += 3>>
+ <br>Where should this fun take place? <<link "Go back""Firebase">>
+ <<set $SFColonel.Fun = 0, $SFColonel.Talk = 0,$SFColonel.Status -= 3>>
+ <</link>>
+ <br> <<link "In private">> <<replace "#result4">> <span id="result6">
+ <br>Which orifice do you wish to target?
+ <<link "Go back""Firebase">> <</link>>
+ <br> <<link "Pussy">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 1>> <</link>>
+ <br> <<link "Ass">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 1>> <</link>>
+ <br> <<link "Both pussy and ass">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 2>> <</link>>
+ <br> <<link "Mouth">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 1>> <</link>>
+ <br> <<link "All three holes">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 3>> <</link>>
+ </span> <</replace>> <</link>>
- <br>@@.orange;<<link "On The Colonel's throne.">> <span id="result6">
- Which orifice do you wish to target?
- @@.orange;<<link "Go back""Firebase">> <</link>>@@
- <br>@@.orange;<<link "Pussy">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 1>> <</link>>@@
- <br>@@.orange;<<link "Ass">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 1>> <</link>>@@
- <br>@@.orange;<<link "Both pussy and ass">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 2>> <</link>>@@
- <br>@@.orange;<<link "Mouth">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 1>> <</link>>@@
- <br>@@.orange;<<link "All three holes">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 3>> <</link>>@@
- </span> <</link>>@@
-<</replace>><</link>><</if>><br>[[Go back|Firebase]]/*Closes fun*/
-</span> <</replace>> <</link>>@@ <</if>> /*Closes spend time with The Colonel*/
\ No newline at end of file
+ <br> <<link "On The Colonel's throne.">> <<replace "#result4">> <span id="result6">
+ <br>Which orifice do you wish to target?
+ <<link "Go back""Firebase">> <</link>>
+ <br> <<link "Pussy">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 1>> <</link>>
+ <br> <<link "Ass">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 1>> <</link>>
+ <br> <<link "Both pussy and ass">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 2>> <</link>>
+ <br> <<link "Mouth">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 1>> <</link>>
+ <br> <<link "All three holes">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 3>> <</link>>
+ </span> <</replace>> </span> <</link>>
+ </span> <</replace>> <</link>> <</if>> /*Closes fun*/
+ </span> <</replace>> <</link>> /*Closes talk*/
+</span> <</if>> /*Closes spend time with The Colonel*/
\ No newline at end of file
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 a5a894765fbabc4efba7e8ca517ec9530b9f1460..05942b660af0857a1a67bc109c43ddc7975fa93c 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -1271,7 +1271,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/init/storyInit.tw b/src/init/storyInit.tw
index 6aeb2ca5706bb66f6a32e6a9f741f58a641d2bac..d436f66a5000f07e2738de19e242421bd60d1b9f 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1381,4 +1381,6 @@ erectileImplant: 0
<<include "secInit">>
+<<set $postSexCleanUp = 1>>
+
<<goto "Alpha disclaimer">>
diff --git a/src/npc/descriptions/fAnus.tw b/src/npc/descriptions/fAnus.tw
index 78dcd2ea0993f2e20f74f9d77207069c9de2aec5..d9322b14a6d7022ace80c20a3f98e22add941a27 100644
--- a/src/npc/descriptions/fAnus.tw
+++ b/src/npc/descriptions/fAnus.tw
@@ -179,40 +179,42 @@ $His anus is invitingly bleached,
<<else>>
<<set _Anus = "anal gape">>
<</if>>
- <<switch $activeSlave.assignment>>
- <<case "work in the brothel">>
- $He goes to wash $his _Anus so $his next customer can have the illusion that he's the first to use it today.
- <<case "serve in the club">>
- $He goes to wash and delicately perfume $his _Anus so it can gratify the finest citizen.
- <<case "work in the dairy">>
- $He goes off to carefully wash $his _Anus to avoid besmirching the nice clean dairy.
- <<case "work as a servant">>
- $He rushes to wash $his _Anus, impatient to get back to $his many chores.
- <<case "work as a nanny">>
- $He goes off to wash $his _Anus, before hurrying to continue taking care of the children in $nurseryName.
- <<case "whore">>
- $He uses an enema to clean $his _Anus before returning to offering it for sale.
- <<case "serve the public">>
- $He uses an enema to clean $his _Anus before returning to offering it for free.
- <<case "be a servant">>
- $He uses an enema to clean $his _Anus, since $his chores didn't perform themselves while you used $his backdoor.
- <<case "rest">>
- $He uses an enema to clean $his _Anus before crawling back into bed, face down.
- <<case "get milked">>
- $He uses an enema to clean $his _Anus <<if $activeSlave.lactation > 0>>before going to get $his uncomfortably milk-filled tits drained<<else>>and then rests until $his balls are ready to be drained again<</if>>.
- <<case "please you">>
- $He uses an enema to clean $his _Anus before returning to await your next use of $his backdoor, as though nothing had happened.
- <<case "be a subordinate slave">>
- $He uses an enema to clean $his _Anus, though it's only a matter of time before another slave decides to play with $his backdoor.
- <<case "be your Head Girl">>
- $He uses an enema to clean $his _Anus, worried that $his charges got up to trouble while $he enjoyed the buttsex.
- <<case "guard you">>
- $He hurries off to wash $his _Anus so you'll be unguarded for as little time as possible.
- <<case "train slaves">>
- $He uses an enema to clean $his _Anus before $he returns to teaching $his classes, a little bow-legged.
- <<default>>
- $He hurries off to wash $his _Anus before going back to $activeSlave.assignment.
- <</switch>>
+ <<if $postSexCleanUp > 0>>
+ <<switch $activeSlave.assignment>>
+ <<case "work in the brothel">>
+ $He goes to wash $his _Anus so $his next customer can have the illusion that he's the first to use it today.
+ <<case "serve in the club">>
+ $He goes to wash and delicately perfume $his _Anus so it can gratify the finest citizen.
+ <<case "work in the dairy">>
+ $He goes off to carefully wash $his _Anus to avoid besmirching the nice clean dairy.
+ <<case "work as a servant">>
+ $He rushes to wash $his _Anus, impatient to get back to $his many chores.
+ <<case "work as a nanny">>
+ $He goes off to wash $his _Anus, before hurrying to continue taking care of the children in $nurseryName.
+ <<case "whore">>
+ $He uses an enema to clean $his _Anus before returning to offering it for sale.
+ <<case "serve the public">>
+ $He uses an enema to clean $his _Anus before returning to offering it for free.
+ <<case "be a servant">>
+ $He uses an enema to clean $his _Anus, since $his chores didn't perform themselves while you used $his backdoor.
+ <<case "rest">>
+ $He uses an enema to clean $his _Anus before crawling back into bed, face down.
+ <<case "get milked">>
+ $He uses an enema to clean $his _Anus <<if $activeSlave.lactation > 0>>before going to get $his uncomfortably milk-filled tits drained<<else>>and then rests until $his balls are ready to be drained again<</if>>.
+ <<case "please you">>
+ $He uses an enema to clean $his _Anus before returning to await your next use of $his backdoor, as though nothing had happened.
+ <<case "be a subordinate slave">>
+ $He uses an enema to clean $his _Anus, though it's only a matter of time before another slave decides to play with $his backdoor.
+ <<case "be your Head Girl">>
+ $He uses an enema to clean $his _Anus, worried that $his charges got up to trouble while $he enjoyed the buttsex.
+ <<case "guard you">>
+ $He hurries off to wash $his _Anus so you'll be unguarded for as little time as possible.
+ <<case "train slaves">>
+ $He uses an enema to clean $his _Anus before $he returns to teaching $his classes, a little bow-legged.
+ <<default>>
+ $He hurries off to wash $his _Anus before going back to $activeSlave.assignment.
+ <</switch>>
+ <</if>>
<</if>>
<</if>>
diff --git a/src/npc/descriptions/fButt.tw b/src/npc/descriptions/fButt.tw
index 5eaaae8fe3fc703db4f83b2c0530e7e22df9c3d4..d24572c47074eb5b1e5d550051a2b08ab6d2261f 100644
--- a/src/npc/descriptions/fButt.tw
+++ b/src/npc/descriptions/fButt.tw
@@ -200,7 +200,7 @@ $His anus is invitingly bleached,
$His still-tight ass keeps your load inside $him.
<</if>>
-<<if canWalk($activeSlave)>>
+<<if canWalk($activeSlave) && $postSexCleanUp > 0>>
<<switch $activeSlave.assignment>>
<<case "whore">>
$He heads to the bathroom to clean $his <<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>holes before returning to selling them publicly.<<elseif canDoVaginal($activeSlave) || canDoAnal($activeSlave)>>fuckhole before returning to selling it publicly.<<else>>face before returning to selling $his mouth publicly.<</if>>
diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw
index e26707c0a8261cf963ec7e1fe8b01abe8d595f09..d65aec14ac9e9ccb47d119112e10dd158a64ef8f 100644
--- a/src/npc/descriptions/fVagina.tw
+++ b/src/npc/descriptions/fVagina.tw
@@ -514,7 +514,7 @@ You call $him over so you can
Your cum slides right out of $his gaping hole.
<</if>>
-<<if canWalk($activeSlave)>>
+<<if canWalk($activeSlave) && $postSexCleanUp > 0>>
$He uses <<if $activeSlave.vagina > 0>>a quick douche to clean $his <<if $activeSlave.vagina < 2>>tight<<elseif $activeSlave.vagina > 3>>loose<</if>> pussy<<else>>an enema to clean $his <<if $activeSlave.anus < 2>>tight<<elseif $activeSlave.anus < 3>>used<<else>>gaping<</if>> butthole<</if>>,
<<switch $activeSlave.assignment>>
<<case "work in the brothel">>
diff --git a/src/pregmod/beastFuck.tw b/src/pregmod/beastFuck.tw
index a3268693334e71e4e1e287aa11b1ceda2a8f8190..4625cc26ff68e67136917e39422a22aa1e1369f1 100644
--- a/src/pregmod/beastFuck.tw
+++ b/src/pregmod/beastFuck.tw
@@ -332,40 +332,42 @@ before calling in the _animal.species. The _animal.species slowly saunters up to
Your cum slides right out of $his gaping hole.
<</if>>
- $He uses <<if $activeSlave.vagina > 0>>a quick douche to clean $his <<if $activeSlave.vagina < 2>>tight<<elseif $activeSlave.vagina > 3>>loose<</if>> pussy<<else>>an enema to clean $his <<if $activeSlave.anus < 2>>tight<<elseif $activeSlave.anus < 3>>used<<else>>gaping<</if>> butthole<</if>>,
-
- <<switch $activeSlave.assignment>>
- <<case "work in the brothel">>
- just like $he does between each customer.
- <<case "serve in the club">>
- just like $he does in the club.
- <<case "work in the dairy">>
- to avoid besmirching the nice clean dairy.
- <<case "work as a servant">>
- mostly to keep everything $he has to clean from getting any dirtier.
- <<case "whore">>
- before returning to offering it for sale.
- <<case "serve the public">>
- before returning to offering it for free.
- <<case "rest">>
- before crawling back into bed.
- <<case "get milked">>
- <<if $activeSlave.lactation > 0>>before going to get $his uncomfortably milk-filled tits drained<<else>>and then rests until $his balls are ready to be drained again<</if>>.
- <<case "be a servant">>
- since $his chores didn't perform themselves while you used $his fuckhole.
- <<case "please you">>
- before returning to await your next use of $his fuckhole, as though nothing had happened.
- <<case "be a subordinate slave">>
- though it's only a matter of time before another slave decides to play with $his fuckhole.
- <<case "be your Head Girl">>
- worried that $his charges got up to trouble while $he enjoyed $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s use.
- <<case "guard you">>
- so $he can be fresh and ready for more sexual use even as $he guards your person.
- <<case "be the Schoolteacher">>
- before $he returns to teaching $his classes.
- <<default>>
- before $he returns to $activeSlave.assignment.
- <</switch>>
+ <<if $postSexCleanUp > 0>>
+ $He uses <<if $activeSlave.vagina > 0>>a quick douche to clean $his <<if $activeSlave.vagina < 2>>tight<<elseif $activeSlave.vagina > 3>>loose<</if>> pussy<<else>>an enema to clean $his <<if $activeSlave.anus < 2>>tight<<elseif $activeSlave.anus < 3>>used<<else>>gaping<</if>> butthole<</if>>,
+
+ <<switch $activeSlave.assignment>>
+ <<case "work in the brothel">>
+ just like $he does between each customer.
+ <<case "serve in the club">>
+ just like $he does in the club.
+ <<case "work in the dairy">>
+ to avoid besmirching the nice clean dairy.
+ <<case "work as a servant">>
+ mostly to keep everything $he has to clean from getting any dirtier.
+ <<case "whore">>
+ before returning to offering it for sale.
+ <<case "serve the public">>
+ before returning to offering it for free.
+ <<case "rest">>
+ before crawling back into bed.
+ <<case "get milked">>
+ <<if $activeSlave.lactation > 0>>before going to get $his uncomfortably milk-filled tits drained<<else>>and then rests until $his balls are ready to be drained again<</if>>.
+ <<case "be a servant">>
+ since $his chores didn't perform themselves while you used $his fuckhole.
+ <<case "please you">>
+ before returning to await your next use of $his fuckhole, as though nothing had happened.
+ <<case "be a subordinate slave">>
+ though it's only a matter of time before another slave decides to play with $his fuckhole.
+ <<case "be your Head Girl">>
+ worried that $his charges got up to trouble while $he enjoyed $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s use.
+ <<case "guard you">>
+ so $he can be fresh and ready for more sexual use even as $he guards your person.
+ <<case "be the Schoolteacher">>
+ before $he returns to teaching $his classes.
+ <<default>>
+ before $he returns to $activeSlave.assignment.
+ <</switch>>
+ <</if>>
<</if>>
<<set $species = 0>>
diff --git a/src/pregmod/beastFucked.tw b/src/pregmod/beastFucked.tw
index 5b661e5c02c271fff626cdffbf5b284c08f40f31..8f119b3dba8e364d4833d1840be90064f9d6c005 100644
--- a/src/pregmod/beastFucked.tw
+++ b/src/pregmod/beastFucked.tw
@@ -435,40 +435,42 @@ before calling in the _animal.species. The _animal.species slowly saunters up to
<<= capFirstChar(_animal.species)>> cum slides right out of $his gaping hole.
<</if>>
- $He uses <<if $activeSlave.vagina > 0>>a quick douche to clean $his <<if $activeSlave.vagina < 2>>tight<<elseif $activeSlave.vagina > 3>>loose<</if>> pussy<<else>>an enema to clean $his <<if $activeSlave.anus < 2>>tight<<elseif $activeSlave.anus < 3>>used<<else>>gaping<</if>> butthole<</if>>,
-
- <<switch $activeSlave.assignment>>
- <<case "work in the brothel">>
- just like $he does between each customer.
- <<case "serve in the club">>
- just like $he does in the club.
- <<case "work in the dairy">>
- to avoid besmirching the nice clean dairy.
- <<case "work as a servant">>
- mostly to keep everything $he has to clean from getting any dirtier.
- <<case "whore">>
- before returning to offering it for sale.
- <<case "serve the public">>
- before returning to offering it for free.
- <<case "rest">>
- before crawling back into bed.
- <<case "get milked">>
- <<if $activeSlave.lactation > 0>>before going to get $his uncomfortably milk-filled tits drained<<else>>and then rests until $his balls are ready to be drained again<</if>>.
- <<case "be a servant">>
- since $his chores didn't perform themselves while you used $his fuckhole.
- <<case "please you">>
- before returning to await your next use of $his fuckhole, as though nothing had happened.
- <<case "be a subordinate slave">>
- though it's only a matter of time before another slave decides to play with $his fuckhole.
- <<case "be your Head Girl">>
- worried that $his charges got up to trouble while $he enjoyed $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s use.
- <<case "guard you">>
- so $he can be fresh and ready for more sexual use even as $he guards your person.
- <<case "be the Schoolteacher">>
- before $he returns to teaching $his classes.
- <<default>>
- before $he returns to $activeSlave.assignment.
- <</switch>>
+ <<if $postSexCleanUp > 0>>
+ $He uses <<if $activeSlave.vagina > 0>>a quick douche to clean $his <<if $activeSlave.vagina < 2>>tight<<elseif $activeSlave.vagina > 3>>loose<</if>> pussy<<else>>an enema to clean $his <<if $activeSlave.anus < 2>>tight<<elseif $activeSlave.anus < 3>>used<<else>>gaping<</if>> butthole<</if>>,
+
+ <<switch $activeSlave.assignment>>
+ <<case "work in the brothel">>
+ just like $he does between each customer.
+ <<case "serve in the club">>
+ just like $he does in the club.
+ <<case "work in the dairy">>
+ to avoid besmirching the nice clean dairy.
+ <<case "work as a servant">>
+ mostly to keep everything $he has to clean from getting any dirtier.
+ <<case "whore">>
+ before returning to offering it for sale.
+ <<case "serve the public">>
+ before returning to offering it for free.
+ <<case "rest">>
+ before crawling back into bed.
+ <<case "get milked">>
+ <<if $activeSlave.lactation > 0>>before going to get $his uncomfortably milk-filled tits drained<<else>>and then rests until $his balls are ready to be drained again<</if>>.
+ <<case "be a servant">>
+ since $his chores didn't perform themselves while you used $his fuckhole.
+ <<case "please you">>
+ before returning to await your next use of $his fuckhole, as though nothing had happened.
+ <<case "be a subordinate slave">>
+ though it's only a matter of time before another slave decides to play with $his fuckhole.
+ <<case "be your Head Girl">>
+ worried that $his charges got up to trouble while $he enjoyed $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s use.
+ <<case "guard you">>
+ so $he can be fresh and ready for more sexual use even as $he guards your person.
+ <<case "be the Schoolteacher">>
+ before $he returns to teaching $his classes.
+ <<default>>
+ before $he returns to $activeSlave.assignment.
+ <</switch>>
+ <</if>>
<</if>>
<</if>>
diff --git a/src/pregmod/fDick.tw b/src/pregmod/fDick.tw
index b80b663b95558fd442ef580c7945888f8af86708..3592321da162680b9097155e32325fe8894ef9af 100644
--- a/src/pregmod/fDick.tw
+++ b/src/pregmod/fDick.tw
@@ -216,7 +216,7 @@
<</if>>
<</if>>
-<<if canWalk($activeSlave) && $activeSlave.fetish != "mindbroken">>
+<<if canWalk($activeSlave) && $activeSlave.fetish != "mindbroken" && $postSexCleanUp > 0>>
<<switch $activeSlave.assignment>>
<<case "whore">>
$He heads to the bathroom to clean $his dick before returning to selling $his body publicly.
diff --git a/src/pregmod/pAssociatesPublicSlut.tw b/src/pregmod/pAssociatesPublicSlut.tw
index 7db5441520918b9301e2bbff353c3e7286109ad1..9d237f84b461c07bf7e60ebc4828a691e6c3edc5 100644
--- a/src/pregmod/pAssociatesPublicSlut.tw
+++ b/src/pregmod/pAssociatesPublicSlut.tw
@@ -1,12 +1,12 @@
:: P associates public slut [nobr]
-<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", _num = random(1,99)>>
+<<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 ddd803b34bf90cac9f21ec8c556d7640dbe7549f..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>>
@@ -3437,3 +3447,7 @@ Done!
<<if $releaseID < 1031>>
<<set $releaseID = 1031>>
<</if>>
+
+<<if ndef $postSexCleanUp>>
+ <<set $postSexCleanUp = 1>>
+<</if>>
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/options.tw b/src/uncategorized/options.tw
index c557c684bf1d271196fe13c1355f071675a30035..d10dd0107ad6677b71e7b40c3ca70d58b4025b72 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -301,6 +301,14 @@ Slave reactions to facility assignments are
@@.cyan;ENABLED@@. [[Disable|Options][$showAssignToScenes = 0]]
<</if>>
+<br>
+Post sex clean up
+<<if $postSexCleanUp < 1>>
+ @@.cyan;is not@@ displayed. [[Display|Options][$postSexCleanUp = 1]]
+<<else>>
+ @@.cyan;is @@ displayed. [[Do not display|Options][$postSexCleanUp = 0]]
+<</if>>
+
<br>
Appraisal miniscenes on slave sale are
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
index 9527724aba905cbd550bce8d39fb4e53f681c859..322d92c5460f06049368a69bc0613fd5126619a9 100644
--- a/src/uncategorized/pRivalryCapture.tw
+++ b/src/uncategorized/pRivalryCapture.tw
@@ -267,11 +267,13 @@ the delicious moment of finding your rival on her knees in front of you with a b
<<set $activeSlave.pregType = random(20,35)>>
<<set $activeSlave.birthsTotal = random(120,180)>>
<<set $activeSlave.bellySag = 30, $activeSlave.bellySagPreg = 30>>
+ <<set $activeSlave.pregAdaptation = $activeSlave.birthsTotal*2>>
<<else>>
<<set $activeSlave.vagina = 5>>
<<set $activeSlave.pregType = either(3,3,4,4,4,5,5,6,6,7,7,8,8,8)>>
<<set $activeSlave.birthsTotal = random(18,27)>>
<<set $activeSlave.bellySag = 2, $activeSlave.bellySagPreg = 2>>
+ <<set $activeSlave.pregAdaptation = random(60,100)>>
<</if>>
<<set $activeSlave.pregKnown = 1>>
<<set $activeSlave.pregWeek = $activeSlave.preg>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 89e222f462a30a380819cbd0c44eb572e825abbf..c214795282ef224206323fcb70aab6028d06f551 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -59,8 +59,8 @@
<</if>> /* closes no nicknames option */
<</if>> /* CLOSES FUCKDOLL CHECK */
-
- <<if $week >= 10 >>
+
+ <<if $week >= 10>>
<<set $events.push("P associates public slut")>>
<</if>>
<<set $legendaryFacility = 1>>
diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw
index a4496f8e9405f40769c50033dafcec377769173e..a3d6b450e76c3ae553caaf8018a29db30320bc7a 100644
--- a/src/uncategorized/saDrugs.tw
+++ b/src/uncategorized/saDrugs.tw
@@ -784,7 +784,7 @@
<<case "super fertility drugs">>
<<if $slaves[$i].pregKnown == 1>>
- @@.yellow$He's already pregnant, so the fertility drugs $he's on do $him no good.@@
+ @@.yellow;$He's already pregnant, so the fertility drugs $he's on do $him no good.@@
<<elseif $slaves[$i].pregWeek < 0>>
$He's still recovering from a recent pregnancy, so the fertility drugs $he's on do $him little good.
<<elseif ($slaves[$i].preg > 1)>>
@@ -824,7 +824,7 @@
<<case "fertility drugs">>
<<if $slaves[$i].pregKnown == 1>>
- @@.yellow$He's already pregnant, so the fertility drugs $he's on do $him no good.@@
+ @@.yellow;$He's already pregnant, so the fertility drugs $he's on do $him no good.@@
<<elseif $slaves[$i].pregWeek < 0>>
$He's still recovering from a recent pregnancy, so the fertility drugs $he's on do $him little good.
<<elseif ($slaves[$i].preg > 1)>>
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>>