diff --git a/sanityCheck b/sanityCheck
index 07d94b78d3a737bfb834e74ef34abdf0d4b99582..bf95103d3fa27a7b4b8a6ed7bbaa7bb5930d3a0b 100755
--- a/sanityCheck
+++ b/sanityCheck
@@ -50,8 +50,8 @@ $GREP "<<[^<>]*[<>]\?[^<>]*>>>" -- "src/*.tw" | myprint "TooManyAngleBrackets"
# Check for too many <<<. e.g.: <<</if>>
$GREP "<<<[^<>]*[<>]\?[^<>]*>>" -- "src/*.tw" | myprint "TooManyAngleBrackets"
# Check for wrong capitalization on 'activeslave' and other common typos
-$GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeArcology\|activeStandard\|activeOrgan\|activeLimbs\|setBellySize\|SetbellySize\|setbellySize\|bellypreg\|bellyimplant\|bellyfluid\)" -- "src/*" | myprint "WrongCapitilization"
-$GREP "\(csae\|[a-z] She \|attepmts\|youreslf\|advnaces\|canAcheive\)" -- 'src/*' | myprint "SpellCheck"
+$GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeArcology\|activeStandard\|activeOrgan\|activeLimbs\)" -- "src/*" | myprint "WrongCapitilization"
+$GREP "\(csae\|[a-z] She \|attepmts\|youreslf\|advnaces\|canAcheive\|setBellySize\|SetbellySize\|setbellySize\|bellypreg\|bellyimplant\|bellyfluid\|pronounCaps\)" -- 'src/*' | myprint "SpellCheck"
$GREP "\$slave\[" -- 'src/*' | myprint "ShouldBeSlaves"
# Check for strange spaces e.g. $slaves[$i]. lips
$GREP "\$slaves\[\$i\]\. " -- 'src/*' | myprint "MissingPropertyAfterSlaves"
diff --git a/src/player/actions/fondleDick.tw b/src/player/actions/fondleDick.tw
index 5ab36996f4c47b1b9eb335d01a14cede279ac365..d6d1761e6fa35c732d3b0fcf7f95979a377cc349 100644
--- a/src/player/actions/fondleDick.tw
+++ b/src/player/actions/fondleDick.tw
@@ -213,7 +213,7 @@ You call her over so you can fondle her
Her dick remains flaccid as it cannot get stiff and you continue tenderly stroking her soft dick.
<<else>>
Her prick stiffens like a rod in your hands and you continue your expert strokes along the erect shaft.
- <</if>> Soon, her movements indicate that she is orgasming. She shudders and leaks her cockmilk as she orgasms in your hands and get cleaned up.
+ <</if>> Soon, her movements indicate that she is orgasming. She shudders and leaks her cockmilk as she orgasms in your hands before submissively avoiding your gaze as you get cleaned up.
<<elseif $activeSlave.devotion < -20>>
She clearly dislikes the thought of getting her dick fondled by you. Her lower lip quivers with trepidation as she watches your hands move towards her. She has no choice but to obey if she wants to avoid punishment. She gasps and shakes as you gently trace along her
<<if $activeSlave.dick == 1>>
@@ -314,7 +314,7 @@ You call her over so you can fondle her
Her dick remains flaccid as it cannot get stiff and you continue tenderly stroking her soft dick.
<<else>>
Her prick stiffens like a rod in your hands and you continue your expert strokes along the erect shaft.
- <</if>> Your rough play leaves red marks on her breasts and nipples and she becomes even more aroused. Soon, her movements indicate that she is orgasming. She shudders and leaks her cockmilk as she orgasms in your hands and get cleaned up. She rubs the marks on her dick and balls with her hands, an ecstatic look on her $activeSlave.skin face. She looks at you longingly, hungry for more.
+ <</if>> Your rough play leaves red marks on her breasts and nipples and she becomes even more aroused. Soon, her movements indicate that she is orgasming. She shudders and leaks her cockmilk as she orgasms in your hands. She rubs the marks on her dick and balls with her hands, an ecstatic look on her $activeSlave.skin face. She looks at you longingly as you get cleaned up, hungry for more.
<<elseif $activeSlave.devotion <= 20>>
She obeys silently, standing in front of you as you move your hands towards her. You gently trace your fingers along her
<<if $activeSlave.dick == 1>>
diff --git a/src/pregmod/generateChild.tw b/src/pregmod/generateChild.tw
index 9af6ab94daa6ed23f89da5265cda20412edb545c..e459315cc85d76a222e49920a8278bceaa4af94c 100644
--- a/src/pregmod/generateChild.tw
+++ b/src/pregmod/generateChild.tw
@@ -562,6 +562,9 @@
<<if $activeSlave.underArmHStyle != "hairless">>
<<set $activeSlave.underArmHStyle = either("bushy", "bushy", "bushy", "bushy", "bushy", "bushy", "bushy", "bushy", "bushy", "bushy", "bushy", "bushy", "hairless")>>
<</if>>
+<<if $activeSlave.fetish == "mindbroken">>
+ <<set $activeSlave.fetish = "none">>
+<</if>>
<<if $incubatorImprintSetting == "terror">>
<<set $activeSlave.origin = "Shortly after birth, she was sealed in an aging tank until she was of age. She knows only of the terror that awaits her should she not obey her master.">>
<<else>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index f5ff83423f8a087b09b9e6b28cd09c6b89d58597..d37a2a60d3e6065a61688d52be180fb0e13c3fe9 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -7370,21 +7370,21 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<EventNameDelink $activeSlave>>
<<replace "#result">>
You load the injection gun you keep in your desk, and tap it repeatedly against the cooperative slave's
- <<if $seed == "boobs">>
+ <<if _injection == "boobs">>
tits,
- <<elseif $seed == "butt">>
+ <<elseif _injection == "butt">>
rear end,
- <<elseif $seed == "lips">>
+ <<elseif _injection == "lips">>
lips,
- <<elseif $seed == "dick">>
+ <<elseif _injection == "dick">>
cock,
- <<elseif $seed == "dickMinus">>
+ <<elseif _injection == "dickMinus">>
girly dick,
<</if>>
producing a hiss each time as pressurized gas painlessly drives the drugs deep into her tissues. She leaves @@.hotpink;thanking@@ you profusely, massaging herself in anticipation.
<<set $activeSlave.devotion += 2>>
Before the end of the week, her
- <<if $seed == "boobs">>
+ <<if _injection == "boobs">>
@@.lime;boobs have grown,@@ delighting her.
<<if ($activeSlave.markings == "freckles") || ($activeSlave.markings == "heavily freckled")>>
She proudly shows your other slaves her breast growth by keeping track of the increasing distance between a couple of chosen freckles on the front of her boobs.
@@ -7392,17 +7392,17 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<set $activeSlave.boobs += 200>>
The dose of growth hormones necessary to cause such rapid tissue changes left her feeling @@.red;rather ill,@@ but she is recovering normally.
<<set $activeSlave.health -= 10>>
- <<elseif $seed == "butt">>
+ <<elseif _injection == "butt">>
@@.lime;buttocks have grown,@@ delighting her.
<<set $activeSlave.butt += 1>>
The dose of growth hormones necessary to cause such rapid tissue changes left her feeling @@.red;rather ill,@@ but she is recovering normally.
<<set $activeSlave.health -= 10>>
- <<elseif $seed == "lips">>
+ <<elseif _injection == "lips">>
@@.lime;lips have swelled,@@ delighting her.
<<set $activeSlave.lips += 10>>
The dose of growth hormones necessary to cause such rapid tissue changes left her feeling @@.red;rather ill,@@ but she is recovering normally.
<<set $activeSlave.health -= 10>>
- <<elseif $seed == "dick">>
+ <<elseif _injection == "dick">>
@@.lime;cock has grown,@@ delighting her.
<<set $activeSlave.dick += 1>>
<<if $activeSlave.balls < 5>>
@@ -7413,7 +7413,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<</if>>
The dose of growth hormones and male hormone treatment necessary to cause such rapid change left her feeling @@.red;rather ill,@@ but she is recovering normally.
<<set $activeSlave.health -= 10>>
- <<elseif $seed == "dickMinus">>
+ <<elseif _injection == "dickMinus">>
@@.orange;dick has shrunk,@@ delighting her.
<<set $activeSlave.dick -= 1>>
<<if $activeSlave.balls > 1>>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index a21480a636264a3a227169bbd85b5a6b58814f80..7bcce990c9f6d348f08346be6648647c26197d17 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -787,7 +787,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<</if>>
<<set _queen = clone($activeSlave)>>
<<AddSlave _queen>> /* skip New Slave Intro */
- <</for>>
<</replace>>
<</if>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index c3ca928dabac7fbc2f30751e22b8bea79b431c6c..93e1fcc2eb12dfa6f74e469ee0d3e88f68ef0757 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -61,7 +61,7 @@
<</if>>
<</if>>
<<if $activeSlave.sexualFlaw == "hates oral">>
- $pronounCaps has trouble thinking of her mouth as a warm, wet, playful hole, so her new piercings will be theraputic. Having something to suck on at all times should force her past her hangups.
+ $pronounCap has trouble thinking of her mouth as a warm, wet, playful hole, so her new piercings will be theraputic. Having something to suck on at all times should force her past her hangups.
<</if>>
<</if>>
<</if>>
@@ -112,7 +112,7 @@
<</if>>
<</if>>
<<if $activeSlave.sexualFlaw == "hates penetration">>
- $pronounCaps has trouble thinking of her vagina as a fuckhole rather than something special to protect and cherish, so her new piercings will be theraputic. The constant, inescapable stimulation of her labia should force her past her hangups.
+ $pronounCap has trouble thinking of her vagina as a fuckhole rather than something special to protect and cherish, so her new piercings will be theraputic. The constant, inescapable stimulation of her labia should force her past her hangups.
<</if>>
<</if>>
<</if>>
@@ -147,7 +147,7 @@
<</if>>
<</if>>
<<if $activeSlave.sexualFlaw == "hates anal">>
- $pronounCaps has trouble thinking of her asshole as a sexy, fuckable hole, so her new piercings will be theraputic. The constant tickling back there should force her past her hangups.
+ $pronounCap has trouble thinking of her asshole as a sexy, fuckable hole, so her new piercings will be theraputic. The constant tickling back there should force her past her hangups.
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw
index af706f14e21dfcc7361f98d8b86fef865439f051..10fdb400a64cd24c243ff7cdbccf8e45a9c4c14c 100644
--- a/src/uncategorized/fullReport.tw
+++ b/src/uncategorized/fullReport.tw
@@ -89,9 +89,9 @@
<br>
<</if>>
-<<for _i = 0; _i < $HGTrainSlavesIDs.length; _i++>>
- <<if $slaves[$i].ID == $HGTrainSlavesIDs[_i].ID>>
- <<set $activeSlave = $slaves[$i], $HGtraining = $HGTrainSlavesIDs[_i].training>>
+<<for _hgtsidx = 0; _hgtsidx < $HGTrainSlavesIDs.length; _hgtsidx++>>
+ <<if $slaves[$i].ID == $HGTrainSlavesIDs[_hgtsidx].ID>>
+ <<set $activeSlave = $slaves[$i], $HGtraining = $HGTrainSlavesIDs[_hgtsidx].training>>
<<include "HG Application">>
<br>
<</if>>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index de1bf63dc882a60e2cbb36f17603b78d103667c9..83277f1fbab5cbb3a344ebebf9c5b6192680aef9 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -963,7 +963,7 @@
<<if $eventSlave.trust > 20>>
<<if $eventSlave.energy > 40>>
-<<if $eventSlave.preg < 300000>>
+<<if $eventSlave.belly < 300000>>
<<if $PC.belly < 5000 && $PC.ballsImplant < 3 && $PC.balls < 3>>
<<if canSee($eventSlave)>>
<<set $RESSevent.push("comfortable seat")>>
diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw
index 955180c04519864c8903991875da50fe043e70fa..0ca520021039cda79a84f829d731edd147eb2f00 100644
--- a/src/uncategorized/rulesAssistant.tw
+++ b/src/uncategorized/rulesAssistant.tw
@@ -121,7 +121,21 @@
//<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I will review your slaves and make changes that will have a beneficial effect. Apologies, sir, but this function is... not fully complete. It may have some serious limitations. Please use the 'no default setting' option to identify areas I should not address.//
+<br><br> /* Control method for quick switching to specific rule in list */
+List of rules: <br>
+<<if _length > 1>>
+ <<set _crule = $r-1>>
+ <<for _r = 0; _r < _length; _r++>>
+ <<if _r > 0 >> | <</if>>
+ <<rbutton "_crule" _r>> $defaultRules[_r].name
+ <</for>>
+ <br>
+ <<link "Switch to selected rule">>
+ <<set $currentRule = $defaultRules[_crule]>>
+ <<goto "Rules Assistant">>
+ <</link>>
<br><br>
+<</if>>
<<if _length < 1>>
''No rules.''
@@ -131,7 +145,7 @@
__Rule $r Automatic Activation__
<span id="activation"></span>
-<<if isSimpleCondition($currentRule.condition, ["devotion", "trust", "health", "energy", "weight", "actualAge", "physicalAge", "visualAge", "muscles", "lactation", "preg", "pregType", "bellyImplant"])>>
+<<if isSimpleCondition($currentRule.condition, ["devotion", "trust", "health", "energy", "weight", "actualAge", "physicalAge", "visualAge", "muscles", "lactation", "preg", "pregType", "bellyImplant", "belly"])>>
<<timed 50ms>>
<<RAChangeActivation>>
@@ -245,6 +259,13 @@ __Rule $r Automatic Activation__
<</link>>
<</if>>
|
+<<link "Belly Size">>
+ <<unset _customCondition>>
+ <<set $currentRule.condition = changeVariable($currentRule.condition, "belly")>>
+ <<RAChangeActivation>>
+ <<RARuleModified>>
+<</link>>
+|
<<link "Custom">>
<<if (def _customConditionOld)>>
<<set _customCondition = _customConditionOld>>
@@ -981,47 +1002,47 @@ Growth hormone regimes for healthy slaves:
<br>
//Breasts://
-<<textbox "$currentRule.growth.boobs" $currentRule.growth.boobs "Rules Assistant">>
-<<link "No default setting" "Rules Assistant">><<set $currentRule.growth.boobs = "no default setting">><</link>> |
-<<link "B Cup" "Rules Assistant">><<set $currentRule.growth.boobs = 350>><</link>> |
-<<link "D Cup" "Rules Assistant">><<set $currentRule.growth.boobs = 1000>><</link>> |
-<<link "Monstrous" "Rules Assistant">><<set $currentRule.growth.boobs = 9000>><</link>> |
-<<link "Unlimited" "Rules Assistant">><<set $currentRule.growth.boobs = 48000>><</link>> |
-<<link "None" "Rules Assistant">><<set $currentRule.growth.boobs = 0>><</link>>
+<span id="textBoobs"><<textbox "$currentRule.growth.boobs" $currentRule.growth.boobs "Rules Assistant">></span>
+<<link "No default setting">><<set $currentRule.growth.boobs = "no default setting">><<replace "#textBoobs">><<textbox "$currentRule.growth.boobs" $currentRule.growth.boobs "Rules Assistant">><</replace>><</link>> |
+<<link "B Cup">><<set $currentRule.growth.boobs = 350>><<replace "#textBoobs">><<textbox "$currentRule.growth.boobs" $currentRule.growth.boobs "Rules Assistant">><</replace>><</link>> |
+<<link "D Cup">><<set $currentRule.growth.boobs = 1000>><<replace "#textBoobs">><<textbox "$currentRule.growth.boobs" $currentRule.growth.boobs "Rules Assistant">><</replace>><</link>> |
+<<link "Monstrous">><<set $currentRule.growth.boobs = 9000>><<replace "#textBoobs">><<textbox "$currentRule.growth.boobs" $currentRule.growth.boobs "Rules Assistant">><</replace>><</link>> |
+<<link "Unlimited">><<set $currentRule.growth.boobs = 48000>><<replace "#textBoobs">><<textbox "$currentRule.growth.boobs" $currentRule.growth.boobs "Rules Assistant">><</replace>><</link>> |
+<<link "None">><<set $currentRule.growth.boobs = 0>><<replace "#textBoobs">><<textbox "$currentRule.growth.boobs" $currentRule.growth.boobs "Rules Assistant">><</replace>><</link>>
<br>
//Butts://
-<<textbox "$currentRule.growth.butt" $currentRule.growth.butt "Rules Assistant">>
-<<link "No default setting" "Rules Assistant">><<set $currentRule.growth.butt = "no default setting">><</link>> |
-<<link "Cute" "Rules Assistant">><<set $currentRule.growth.butt = 2>><</link>> |
-<<link "Big" "Rules Assistant">><<set $currentRule.growth.butt = 4>><</link>> |
-<<link "Huge" "Rules Assistant">><<set $currentRule.growth.butt = 6>><</link>> |
-<<link "Unlimited" "Rules Assistant">><<set $currentRule.growth.butt = 10>><</link>> |
-<<link "None" "Rules Assistant">><<set $currentRule.growth.butt = 0>><</link>>
+<span id="textButt"><<textbox "$currentRule.growth.butt" $currentRule.growth.butt "Rules Assistant">></span>
+<<link "No default setting">><<set $currentRule.growth.butt = "no default setting">><<replace "#textButt">><<textbox "$currentRule.growth.butt" $currentRule.growth.butt "Rules Assistant">><</replace>><</link>> |
+<<link "Cute">><<set $currentRule.growth.butt = 2>><<replace "#textButt">><<textbox "$currentRule.growth.butt" $currentRule.growth.butt "Rules Assistant">><</replace>><</link>> |
+<<link "Big">><<set $currentRule.growth.butt = 4>><<replace "#textButt">><<textbox "$currentRule.growth.butt" $currentRule.growth.butt "Rules Assistant">><</replace>><</link>> |
+<<link "Huge">><<set $currentRule.growth.butt = 6>><<replace "#textButt">><<textbox "$currentRule.growth.butt" $currentRule.growth.butt "Rules Assistant">><</replace>><</link>> |
+<<link "Unlimited">><<set $currentRule.growth.butt = 10>><<replace "#textButt">><<textbox "$currentRule.growth.butt" $currentRule.growth.butt "Rules Assistant">><</replace>><</link>> |
+<<link "None">><<set $currentRule.growth.butt = 0>><<replace "#textButt">><<textbox "$currentRule.growth.butt" $currentRule.growth.butt "Rules Assistant">><</replace>><</link>>
<br>
//Lips://
-<<textbox "$currentRule.growth.lips" $currentRule.growth.lips "Rules Assistant">>
-<<link "No default setting" "Rules Assistant">><<set $currentRule.growth.lips = "no default setting">><</link>> |
-<<link "Plump" "Rules Assistant">><<set $currentRule.growth.lips = 25>><</link>> |
-<<link "Beestung" "Rules Assistant">><<set $currentRule.growth.lips = 45>><</link>> |
-<<link "Facepussy" "Rules Assistant">><<set $currentRule.growth.lips = 100>><</link>> |
-<<link "None" "Rules Assistant">><<set $currentRule.growth.lips = 0>><</link>>
+<span id="textLips"><<textbox "$currentRule.growth.lips" $currentRule.growth.lips "Rules Assistant">></span>
+<<link "No default setting">><<set $currentRule.growth.lips = "no default setting">><<replace "#textLips">><<textbox "$currentRule.growth.lips" $currentRule.growth.lips "Rules Assistant">><</replace>><</link>> |
+<<link "Plump">><<set $currentRule.growth.lips = 25>><<replace "#textLips">><<textbox "$currentRule.growth.lips" $currentRule.growth.lips "Rules Assistant">><</replace>><</link>> |
+<<link "Beestung">><<set $currentRule.growth.lips = 45>><<replace "#textLips">><<textbox "$currentRule.growth.lips" $currentRule.growth.lips "Rules Assistant">><</replace>><</link>> |
+<<link "Facepussy">><<set $currentRule.growth.lips = 100>><<replace "#textLips">><<textbox "$currentRule.growth.lips" $currentRule.growth.lips "Rules Assistant">><</replace>><</link>> |
+<<link "None">><<set $currentRule.growth.lips = 0>><<replace "#textLips">><<textbox "$currentRule.growth.lips" $currentRule.growth.lips "Rules Assistant">><</replace>><</link>>
<<if ($seeDicks > 0 || $makeDicks > 0)>>
<br>
//Dicks, if present://
- <<textbox "$currentRule.growth.dick" $currentRule.growth.dick "Rules Assistant">>
- <<link "No default setting" "Rules Assistant">><<set $currentRule.growth.dick = "no default setting">><</link>> |
- <<link "Above average" "Rules Assistant">><<set $currentRule.growth.dick = 4>><</link>> |
- <<link "Pornstar" "Rules Assistant">><<set $currentRule.growth.dick = 6>><</link>> |
- <<link "Unlimited" "Rules Assistant">><<set $currentRule.growth.dick = 10>><</link>> |
- <<link "None" "Rules Assistant">><<set $currentRule.growth.dick = 0>><</link>>
+ <span id="textDick"><<textbox "$currentRule.growth.dick" $currentRule.growth.dick "Rules Assistant">></span>
+ <<link "No default setting">><<set $currentRule.growth.dick = "no default setting">><<replace "#textDick">><<textbox "$currentRule.growth.dick" $currentRule.growth.dick "Rules Assistant">><</replace>><</link>> |
+ <<link "Above average">><<set $currentRule.growth.dick = 4>><<replace "#textDick">><<textbox "$currentRule.growth.dick" $currentRule.growth.dick "Rules Assistant">><</replace>><</link>> |
+ <<link "Pornstar">><<set $currentRule.growth.dick = 6>><<replace "#textDick">><<textbox "$currentRule.growth.dick" $currentRule.growth.dick "Rules Assistant">><</replace>><</link>> |
+ <<link "Unlimited">><<set $currentRule.growth.dick = 10>><<replace "#textDick">><<textbox "$currentRule.growth.dick" $currentRule.growth.dick "Rules Assistant">><</replace>><</link>> |
+ <<link "None">><<set $currentRule.growth.dick = 0>><<replace "#textDick">><<textbox "$currentRule.growth.dick" $currentRule.growth.dick "Rules Assistant">><</replace>><</link>>
<br>
//Balls, if present://
- <<textbox "$currentRule.growth.balls" $currentRule.growth.balls "Rules Assistant">>
- <<link "No default setting" "Rules Assistant">><<set $currentRule.growth.balls = "no default setting">><</link>> |
- <<link "Sizeable" "Rules Assistant">><<set $currentRule.growth.balls = 4>><</link>> |
- <<link "Cumslave" "Rules Assistant">><<set $currentRule.growth.balls = 6>><</link>> |
- <<link "Unlimited" "Rules Assistant">><<set $currentRule.growth.balls = 10>><</link>> |
- <<link "None" "Rules Assistant">><<set $currentRule.growth.balls = 0>><</link>>
+ <span id="textBalls"><<textbox "$currentRule.growth.balls" $currentRule.growth.balls "Rules Assistant">></span>
+ <<link "No default setting">><<set $currentRule.growth.balls = "no default setting">><<replace "#textBalls">><<textbox "$currentRule.growth.balls" $currentRule.growth.balls "Rules Assistant">><</replace>><</link>> |
+ <<link "Sizeable">><<set $currentRule.growth.balls = 4>><<replace "#textBalls">><<textbox "$currentRule.growth.balls" $currentRule.growth.balls "Rules Assistant">><</replace>><</link>> |
+ <<link "Cumslave">><<set $currentRule.growth.balls = 6>><<replace "#textBalls">><<textbox "$currentRule.growth.balls" $currentRule.growth.balls "Rules Assistant">><</replace>><</link>> |
+ <<link "Unlimited">><<set $currentRule.growth.balls = 10>><<replace "#textBalls">><<textbox "$currentRule.growth.balls" $currentRule.growth.balls "Rules Assistant">><</replace>><</link>> |
+ <<link "None">><<set $currentRule.growth.balls = 0>><<replace "#textBalls">><<textbox "$currentRule.growth.balls" $currentRule.growth.balls "Rules Assistant">><</replace>><</link>>
<</if>>
/*
<br>
@@ -2373,7 +2394,9 @@ Relationship rules: <span id="relation">''$currentRule.relationshipRules.''</spa
<br><br>
-<<if _length < 10>>
+<<if _length >= 10>>''@@.red;ATTENTION! Current rules count is 10 or above. High rules count can dramaticaly slow down game speed (especially if slaves count is high too), or even cause freeze of game page/browser. Use at you own risk!@@''
+<br><br>
+<</if>>
<<link "Add a new rule">>
@@ -2391,7 +2414,6 @@ Relationship rules: <span id="relation">''$currentRule.relationshipRules.''</spa
<</link>> |
-<</if>>
<<if _length > 0>>
<span id="applyresult"></span>
diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw
index ef24b954c1629dbcfdbb473cad0297f6e37c9c4f..604a1a49ef68d81fb442849c56fd3fd257bd29a3 100644
--- a/src/uncategorized/saDrugs.tw
+++ b/src/uncategorized/saDrugs.tw
@@ -1211,7 +1211,7 @@
<<set $slaves[$i].dick = Math.clamp($slaves[$i].dick,0,10), $slaves[$i].drugs = "no drugs">>
<<elseif $slaves[$i].clit >= 5 && $slaves[$i].dick == 0>>
$possessiveCap clit is now so huge that further drug enhancement will not increase its size. @@.yellow;$possessiveCap drug regimen has been ended.@@
- <<set $slaves[$i].clit = Math.clamp($slaves[$i].dick,0,5), $slaves[$i].drugs = "no drugs">>
+ <<set $slaves[$i].clit = Math.clamp($slaves[$i].clit,0,5), $slaves[$i].drugs = "no drugs">>
<</if>>
<<case "testicle enhancement" "intensive testicle enhancement">>
<<if ($slaves[$i].balls >= 10)>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 14cd4cc116da33cd3fd98fbde874c021a25173f7..2652a3a74ffcee1c5246910707a4443f4ffb16f0 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -1032,7 +1032,7 @@
<</if>>
<<if ($slaves[$i].dick > 0)>>
<<if ($slaves[$i].energy >= 40)>>
- <<if ($slaves[$i].analCount > 0)>>
+ <<if ($slaves[$i].analCount > 0) && canDoAnal($activeSlave)>>
Every time she cums with a dick up her ass, her @@.green;resistance to sex with men is worn away.@@
<<set $slaves[$i].attrXY += 3>>
<</if>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 04d7fd0980206b13ba6e4e151c8a33128ea603ee..cf06109c317a02abaed7d26eb2409cbfa8a1fdad 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -568,6 +568,100 @@ will
<</if>> /* CLOSES FUCKDOLL CHECK */
<</if>>
+<<set _numFacilities = $brothel+$club+$dairy+$servantsQuarters+$masterSuite+$spa+$clinic+$schoolroom+$cellblock+$arcade+$HGSuite>>
+
+<<if _numFacilities > 0>>
+
+ <<if _Pass == "Main" || _Pass == "Head Girl Suite" || _Pass == "Spa" || _Pass == "Brothel" || _Pass == "Club" || _Pass == "Arcade" || _Pass == "Clinic" || _Pass == "Schoolroom" || _Pass == "Dairy" || _Pass == "Servants' Quarters" || _Pass == "Master Suite" || _Pass == "Cellblock" >>
+ <<set $returnTo=_Pass >>
+
+ <br>Transfer to:
+
+ <<if _Slave.assignment != "rest" && _Slave.assignment != "please you" && _Slave.assignment != "take classes" && _Slave.assignment != "be a servant" && _Slave.assignment != "whore" && _Slave.assignment != "serve the public" && _Slave.assignment != "get milked" && _Slave.assignment != "stay confined">>
+ [[Penthouse|Rest Workaround][$i = _ssi]] |
+ <<else>>
+ Penthouse |
+ <</if>>
+
+ <<if $arcade != 0>>
+ <<if $arcade > $arcadeSlaves && (_Slave.indentureRestrictions <= 0) && _Slave.breedingMark != 1>>
+ [[Arcade|Assign][$assignTo = "Arcade", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
+ <<else>>Arcade<</if>>
+ <<if _numFacilities-- > 1>>|<</if>>
+ <</if>>
+
+ <<if _Slave.fuckdoll == 0>> /* NON-FUCKDOLL FACILITIES */
+
+ <<if $clinic != 0>>
+ <<if $clinic > $clinicSlaves && (_Slave.health < 20 || ($Nurse != 0 && (_Slave.chem > 15 && $clinicUpgradeFilters == 1) || ($bellyImplants == 1 && _Slave.bellyImplant > -1) || (_Slave.pregKnown == 1 && ($clinicSpeedGestation >= 0 || _Slave.pregControl == "speed up"))))>>
+ [[Clinic|Assign][$assignTo = "Clinic", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
+ <<else>>Clinic<</if>>
+ <<if _numFacilities-- > 1>>|<</if>>
+ <</if>>
+
+ <<if $masterSuite != 0>>
+ <<if $masterSuite > $masterSuiteSlaves && ((_Slave.devotion > 20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50))>>
+ [[Master Suite|Assign][$assignTo = "Master Suite", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
+ <<else>>Master Suite<</if>>
+ <<if _numFacilities-- > 1>>|<</if>>
+ <</if>>
+
+ <<if $cellblock != 0>>
+ <<if $cellblock > $cellblockSlaves && ((_Slave.devotion < -20 && _Slave.trust >= -20) || (_Slave.devotion < -50 && _Slave.trust >= -50))>>
+ [[Cellblock|Assign][$assignTo = "Cellblock", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
+ <<else>>Cellblock<</if>>
+ <<if _numFacilities-- > 1>>|<</if>>
+ <</if>>
+
+ <<if $schoolroom != 0>>
+ <<if $schoolroom > $schoolroomSlaves && (_Slave.fetish != "mindbroken" && (_Slave.devotion >= -20 || (_Slave.devotion >= -50 && _Slave.trust < -20) || _Slave.trust < -50) && ((_Slave.intelligenceImplant < 1) || (_Slave.voice != 0 && _Slave.accent+$schoolroomUpgradeLanguage > 2) || (_Slave.oralSkill <= 10+$schoolroomUpgradeSkills*20) || (_Slave.whoreSkill <= 10+$schoolroomUpgradeSkills*20) || (_Slave.entertainSkill <= 10+$schoolroomUpgradeSkills*20) || (_Slave.analSkill < 10+$schoolroomUpgradeSkills*20) || (_Slave.vagina >= 0 && _Slave.vaginalSkill < 10+$schoolroomUpgradeSkills*20)))>>
+ [[Schoolroom|Assign][$assignTo = "Schoolroom", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
+ <<else>>Schoolroom<</if>>
+ <<if _numFacilities-- > 1>>|<</if>>
+ <</if>>
+
+ <<if $servantsQuarters != 0>>
+ <<if $servantsQuarters > $servantsQuartersSlaves && (canWalk(_Slave) && canSee(_Slave) && (_Slave.devotion >= -20 || (_Slave.devotion >= -50 && _Slave.trust <= 20) || _Slave.trust < -20))>>
+ [[Servants' Quarters|Assign][$assignTo = "Servants' Quarters", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
+ <<else>>Servants' Quarters<</if>>
+ <<if _numFacilities-- > 1>>|<</if>>
+ <</if>>
+
+ <<if $brothel != 0>>
+ <<if $brothel > $brothelSlaves && (((_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)) && _Slave.breedingMark != 1)>>
+ [[Brothel|Assign][$assignTo = "Brothel", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
+ <<else>>Brothel<</if>>
+ <<if _numFacilities-- > 1>>|<</if>>
+ <</if>>
+
+ <<if $club != 0>>
+ <<if $club > $clubSlaves && (((_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)) && _Slave.breedingMark != 1)>>
+ [[Club|Assign][$assignTo = "Club", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
+ <<else>>Club<</if>>
+ <<if _numFacilities-- > 1>>|<</if>>
+ <</if>>
+
+ <<if $dairy != 0>>
+ <<if $dairy > $dairySlaves && (((_Slave.indentureRestrictions > 0) && ($dairyRestraintsSetting > 1)) || ((_Slave.indentureRestrictions > 1) && ($dairyRestraintsSetting > 0)) || (_Slave.breedingMark == 1 && $dairyRestriantsSettings > 0) || (($dairyPregSetting > 0) && ((_Slave.bellyImplant != -1) || (_Slave.pregType >= 50))))>>
+ Dairy
+ <<elseif ((_Slave.lactation > 0) || (_Slave.balls > 0)) || (($dairyFeedersUpgrade == 1) && ($dairyFeedersSetting > 0) && ($dairySlimMaintainUpgrade == 0))>>
+ [[Dairy|Assign][$assignTo = "Dairy", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
+ <<else>>Dairy<</if>>
+ <<if _numFacilities-- > 1>>|<</if>>
+ <</if>>
+
+ <<if $spa != 0>>
+ <<if $spa > $spaSlaves && ((_Slave.devotion >= -20 || _Slave.fetish == "mindbroken") && (_Slave.health < 20 || _Slave.trust < 60 || _Slave.devotion <= 60 || _Slave.fetish == "mindbroken" || _Slave.sexualFlaw !== "none" || _Slave.behavioralFlaw !== "none"))>>
+ [[Spa|Assign][$assignTo = "Spa", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
+ <<else>>Spa<</if>>
+ <</if>>
+
+ <</if>> /* Closes transfer options check */
+
+ <</if>> /* CLOSES FUCKDOLL CHECK */
+
+<</if>> /* closes _numFacilities */
+
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
<<SlaveSummary _Slave>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index f7ec8980069f264c32bd27966d8383c7daeacf0b..55d33d90ec076814805ebd71dec2a40768553347 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -2728,7 +2728,7 @@ $pronounCap's got a
<</if>>
<<if $activeSlave.balls > 0 && $activeSlave.vasectomy == 1>>
- $possessiveCap shoots blanks thanks to $possessive vasectomy.
+ $pronounCap shoots blanks thanks to $possessive vasectomy.
<</if>>
<<if $activeSlave.physicalAge <= 3>>
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index b5caf05358bbba4482bbfa5caa454b4dbce2c3e3..27b97216a1ba53aaadc37e5b0c39a1b7d507dc0e 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -133,6 +133,8 @@
<br>// Fetus count, rule can be applied only after week 10 of pregnancy. //
<<case "bellyImplant">>
<br>// Volume of belly implant in ccs. -1 - none. //
+ <<case "belly">>
+ <br>// Volume of belly in ccs. Any source. //
<<case "custom">>
<br>// Enter custom condition. //
<</switch>>
@@ -4061,14 +4063,17 @@ Your brand design is ''$brandDesign.''
<</if>>
<<if (def _combinedRule.hColor) && (_combinedRule.hColor !== "no default setting")>>
+<<if $args[0].bald != 1>>
<<if ($args[0].hColor !== _combinedRule.hColor)>>
<<set $args[0].hColor = _combinedRule.hColor>>
<<set $cash -= $modCost>>
<br>$args[0].slaveName's hair has been dyed _combinedRule.hColor.
<</if>>
<</if>>
+<</if>>
<<if (def _combinedRule.hStyle) && (_combinedRule.hStyle !== "no default setting")>>
+<<if $args[0].bald != 1>>
<<if ($args[0].hStyle !== _combinedRule.hStyle)>>
<<set $args[0].hStyle = _combinedRule.hStyle>>
<<set $cash -= $modCost>>
@@ -4080,8 +4085,10 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
<</if>>
+<</if>>
<<if (def _combinedRule.hLength) && (_combinedRule.hLength !== "no default setting")>>
+<<if $args[0].bald != 1>>
<<if ($args[0].hLength !== _combinedRule.hLength)>>
<<if ($args[0].hLength > _combinedRule.hLength)>>
<<set $cash -= $modCost>>
@@ -4094,38 +4101,47 @@ is now _combinedRule.hLength cm long.
<<set $args[0].hLength = _combinedRule.hLength>>
<</if>>
<</if>>
+<</if>>
<<if (def _combinedRule.pubicHColor) && (_combinedRule.pubicHColor !== "no default setting")>>
+<<if $args[0].pubicHStyle != "bald" && $args[0].pubicHStyle != "hairless">>
<<if ($args[0].pubicHColor !== _combinedRule.pubicHColor)>>
<<set $args[0].pubicHColor = _combinedRule.pubicHColor>>
<<set $cash -= $modCost>>
<br>$args[0].slaveName's pubic hair, if present, has been dyed _combinedRule.pubicHColor.
<</if>>
<</if>>
+<</if>>
<<if (def _combinedRule.pubicHStyle) && (_combinedRule.pubicHStyle !== "no default setting")>>
+<<if $args[0].pubicHStyle != "bald" && $args[0].pubicHStyle != "hairless">>
<<if ($args[0].pubicHStyle !== _combinedRule.pubicHStyle)>>
<<set $args[0].pubicHStyle = _combinedRule.pubicHStyle>>
<<set $cash -= $modCost>>
<br>$args[0].slaveName's pubic hair has been restyled; it is now _combinedRule.pubicHStyle.
<</if>>
<</if>>
+<</if>>
<<if (def _combinedRule.underArmHColor) && (_combinedRule.underArmHColor !== "no default setting")>>
+<<if $args[0].underArmHStyle != "bald" && $args[0].underArmHStyle != "hairless">>
<<if ($args[0].underArmHColor !== _combinedRule.underArmHColor)>>
<<set $args[0].underArmHColor = _combinedRule.underArmHColor>>
<<set $cash -= $modCost>>
<br>$args[0].slaveName's underarm hair, if present, has been dyed _combinedRule.underArmHColor.
<</if>>
<</if>>
+<</if>>
<<if (def _combinedRule.underArmHStyle) && (_combinedRule.underArmHStyle !== "no default setting")>>
+<<if $args[0].underArmHStyle != "bald" && $args[0].underArmHStyle != "hairless">>
<<if ($args[0].underArmHStyle !== _combinedRule.underArmHStyle)>>
<<set $args[0].underArmHStyle = _combinedRule.underArmHStyle>>
<<set $cash -= $modCost>>
<br>$args[0].slaveName's underarm hair has been restyled; it is now _combinedRule.underArmHStyle.
<</if>>
<</if>>
+<</if>>
<<if (def _combinedRule.nipplesPiercing) && (_combinedRule.nipplesPiercing !== "no default setting")>>
<<if ($args[0].nipplesPiercing !== _combinedRule.nipplesPiercing)>>