diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index 55a040e4935cd783ae13337389b546c7fe5e0086..52a3e3cad0dff8d6030b7e37632052d0599deeae 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -1884,7 +1884,7 @@ window.cumAmount = function(slave) {
window.randomRelatedSlave = function(slave, filterFunction) {
if(!slave || !SugarCube) { return undefined; }
if(typeof filterFunction !== 'function') { filterFunction = function(s, index, array) { return true; }; }
- return SugarCube.State.variables.slaves.filter(filterFunction).shuffle().find(function(s, index, array) {return areSisters(slave, s) || s.mother == slave.ID || s.father == slave.ID || slave.ID == s.mother || slave.ID == father; })
+ return SugarCube.State.variables.slaves.filter(filterFunction).shuffle().find(function(s, index, array) {return areSisters(slave, s) || s.mother == slave.ID || s.father == slave.ID || slave.ID == s.mother || slave.ID == s.father; })
}
window.randomRelatedAvailableSlave = function(slave) {
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index f6fac6c312f80bae9cd193c66fcf71537396feb8..c954bcfd20bd913f330fb92920af716536b16953 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -82,7 +82,7 @@
<<set $activeSlaveOneTimeMinAge to 10>>
<<set $activeSlaveOneTimeMaxAge to 18>>
<<display "Generate XX Slave">>
-<<set $activeSlave.origin to "She thought she was important, she was not.">>
+<<set $activeSlave.origin to "She thought she was important; she was not.">>
<<set $activeSlave.career to "a student from a private school">>
<<set $activeSlave.intelligence to random(1,2)>>
<<set $activeSlave.intelligenceImplant to 1>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index d7851bfbdfe32e08a517283508966dbda6e47ead..0b1fe031a37ad3ace2350ec39dc39a4a37ce8fa3 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -893,17 +893,21 @@ She waits anxiously for your decision.
<<set $activeSlave.lactation to 0>>
<<set $activeSlave.actualAge += random(15,20)>>
<<case "older sister">>
+ <<set $activeSlave.origin to "She was recruited into your service by her older sister.">>
<<if $activeSlave.ovaries == 1>>
<<set $activeSlave.boobs += 200>>
<<set $activeSlave.butt += 1>>
<</if>>
<<set $activeSlave.actualAge to $activeSlave.actualAge+2>>
<<case "young sister">>
+ <<set $activeSlave.origin to "She was recruited into your service by her younger sister.">>
<<if $activeSlave.ovaries == 1>>
<<set $activeSlave.boobs = Math.trunc($activeSlave.boobs-200,0,25000)>>
<<set $activeSlave.butt = Math.trunc($activeSlave.butt-1,0,10)>>
<</if>>
<<set $activeSlave.actualAge to $activeSlave.actualAge-2>>
+<<default>>
+ <<set $activeSlave.origin to "She was recruited into your service by her twin sister.">>
<</switch>>
<<if $eventSlave.recruiter != "twin">>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index b5c3d4afcf9d528c99f59e1c206ea6e21f36c2bc..b9a4f3471749a800b5beb6894c88dde56115268d 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -412,6 +412,11 @@ $pronounCap's got a
<</if>>
<</if>>
+<<if ($activeSlave.cSec == 1)>>
+ <br>$pronounCap has an unsightly c-section scar.
+ [[Remove Caesarean scar|Surgery Degradation][$activeSlave.cSec to 0,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType to "bellyscar"]]
+ <br>
+<</if>>
<<if $activeSlave.vagina > -1>>
<br>
@@ -455,7 +460,6 @@ $pronounCap has
| [[Increase clit|Surgery Degradation][$activeSlave.clit += 1,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType to "clitoral enlargement"]]
<</if>>
<</if>>
-<</if>>
<<if ($activeSlave.preg > -2) && ($activeSlave.preg < 1) && ($activeSlave.vagina > -1) && ($activeSlave.ovaries != 0) && ($activeSlave.pubertyXX == 0)>>
<br>$pronounCap has not had $possessive first period.
@@ -511,18 +515,13 @@ $pronounCap has
<</if>>
<</if>>
-<<if ($activeSlave.cSec == 1)>>
- <br>$pronounCap has an unsightly c-section scar.
- [[Remove Caesarean scar|Surgery Degradation][$activeSlave.cSec to 0,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType to "bellyscar"]]
- <br>
-<</if>>
-
<<if ($activeSlave.vagina > -1) && ($activeSlave.dick > 0)>>
<<if $activeSlave.indentureRestrictions < 1 && $activeSlave.breedingMark != 1>>
<br>Since $pronoun has both a penis and a vagina, it's possible to remove $possessive pussy and leave $possessive sexually functional.
[[Remove pussy|Surgery Degradation][$activeSlave.vagina to -1,$activeSlave.ovaries to 0,$activeSlave.preg to -2,$activeSlave.pregSource to 0,$activeSlave.vaginalSkill = 0,$cash -= $surgeryCost,$activeSlave.health -= 20,$surgeryType to "vaginaRemoval"]] <<if $activeSlave.ovaries == 1>>//This will remove $possessive ovaries as well//<</if>>
<</if>>
<</if>>
+<</if>>
<br>
$pronounCap has
diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw
index 03aa8ff8253b1667442305f2b0d20a5fa6d650f0..04cf466f4a31060293030dffe33025e56675f85a 100644
--- a/src/uncategorized/seBirth.tw
+++ b/src/uncategorized/seBirth.tw
@@ -203,6 +203,7 @@
<<else>>
<<if $slaves[$i].amp == 1>>
+ With childbirth approaching, $slaves[$i].slaveName is carried to her prepared birthing area.
<<AmpBirth>>
<<else>>
<<BroodmotherBirth>>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index 7c5c493bb9c5d44fd776ef7cf3f2140b717330b6..0f202fb20d7dd80b4fe0dbb05ea34b79fd9c22c4 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -19,7 +19,7 @@
<<RandomizeAttraction>>
<<set $activeSlave.fetishStrength = random(0,90)>>
-<<set $activeSlave.fetish to either("none", "none", "none", "none", "none", "none", "submissive", "cumslut", "humiliation", "buttslut", "boobs","pregnancy")>>
+<<set $activeSlave.fetish to either("none", "none", "none", "none", "none", "none", "submissive", "cumslut", "humiliation", "buttslut", "boobs", "pregnancy")>>
<<set $activeSlave.sexualFlaw to either("none")>>
<<set $activeSlave.behavioralFlaw to either("none")>>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 72e0bbc5de1c6cd186398452f4163d8b460b292e..d68721cf2166e955d6a81112444161d89b726cb8 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -15,7 +15,17 @@
<<set $spaSlaves += 1>>
<<silently>>
<<display [[SA rest]]>>
+ <<if $slaves[$i].choosesOwnClothes == 1>>
+ <<display "SA chooses own clothes">>
+ <<if ($slaves[$i].devotion <= 20)>>
+ <<set $slaves[$i].devotion -= 5>>
+ <<else>>
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
+ <</if>>
+ <<display "SA diet">>
<<display "SA long term effects">>
+ <<display "SA drugs">>
<<display "SA relationships">>
<<display "SA rivalries">>
<</silently>>
@@ -36,8 +46,8 @@
<<if (random(1,100) > 90-$Attendant.devotion)>>
@@color:green;Something almost miraculous has happened.@@ $Attendant.slaveName has always refused to believe that $slaves[$i].slaveName could not be reached, and has spent weeks lavishing patient tenderness on her in $spaName. $slaves[$i].slaveName has begun to respond, and is stirring from her mental torpor.
<<set $slaves[$i].devotion to -3>>
- <<set $slaves[$i].sexualFlaw to "hates men">>
- <<set $slaves[$i].behavioralFlaw to "odd">>
+ <<set $slaves[$i].sexualFlaw to "apathetic">>
+ <<set $slaves[$i].behavioralFlaw to either("hates men", "odd")>>
<<set $slaves[$i].fetish to "none">>
<<set $slaves[$i].fetishKnown to 1>>
<<if ($arcologies[0].FSPaternalist > 0)>>
@@ -134,7 +144,17 @@
<<elseif ($Attendant != 0) && ($slaves[$i].ID is $Attendant.ID)>>
<<silently>>
+ <<if $slaves[$i].choosesOwnClothes == 1>>
+ <<display "SA chooses own clothes">>
+ <<if ($slaves[$i].devotion <= 20)>>
+ <<set $slaves[$i].devotion -= 5>>
+ <<else>>
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
+ <</if>>
+ <<display "SA diet">>
<<display "SA long term effects">>
+ <<display "SA drugs">>
<<display "SA relationships">>
<<display "SA rivalries">>
<</silently>>
@@ -352,6 +372,48 @@
$Attendant.slaveName works carefully with $flawSoftened, and successfully @@color:green;softens her behavioral flaw@@ into an appealing quirk.
<</if>>
+ <<for $i to 0; $i < $slaves.length; $i++>>
+ <<if ($slaves[$i].ID is $Attendant.ID)>>
+ <br><br>
+ <<if $showEWD == 0>>
+ ''__@@color:pink;$slaves[$i].slaveName@@__'' is serving as the Attendant in the spa.<br>
+ <<else>>
+ ''__@@color:pink;$slaves[$i].slaveName@@__'' is serving as the Attendant in the spa.
+ <<if $slaves[$i].choosesOwnClothes == 1>>
+ <<display "SA chooses own clothes">>
+ <</if>>
+ <<display "SA diet">>
+ <<display "SA long term effects">>
+ <<display "SA drugs">>
+ <<display "SA relationships">>
+ <<display "SA rivalries">>
+ <br>
+ <<display "SA devotion">>
+ <br>
+ <</if>>
+ <<elseif ($slaves[$i].assignment is "rest in the spa")>>
+ <br>
+ <<if $showEWD == 0>>
+ ''__@@color:pink;$slaves[$i].slaveName@@__'' is resting in the spa.
+ <<else>>
+ ''__@@color:pink;$slaves[$i].slaveName@@__''
+ <<display [[SA rest]]>>
+ <br>
+ <<if $slaves[$i].choosesOwnClothes == 1>>
+ <<display "SA chooses own clothes">>
+ <</if>>
+ <<display "SA diet">>
+ <<display "SA long term effects">>
+ <<display "SA drugs">>
+ <<display "SA relationships">>
+ <<display "SA rivalries">>
+ <br>
+ <<display "SA devotion">>
+ <br>
+ <</if>>
+ <</if>>
+ <</for>>
+
<<elseif ($Attendant != 0)>>
''$spaNameCaps is empty'' except for $Attendant.slaveName, the attendant.
<<set $seed to random(1,10)+(($spa-$spaSlaves)*(random(150,170)+($idleBonus*10)))>>
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index 782d4fb2472118e74c7005bc1550a4e94133e18c..64835101cb6e96fce480cb90450af90210e3a571 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -691,6 +691,12 @@
<<set $FResult to (3-$args[0].anus)+($args[0].muscles/30)>>
+<<if $args[0].muscles < -95>>
+ <<set $FResult -= 5>>
+<<elseif $args[0].muscles < -30>>
+ <<set $FResult -= 2>>
+<</if>>
+
<<set $seed to $oralUseWeight + $vaginalUseWeight + $analUseWeight>>
<<if $seed > 0>>
@@ -714,7 +720,7 @@
<<if $args[0].fuckdoll == 0>> /* NOT A FUCKDOLL */
<<if $familyTesting == 1>>
- <<if $args[0].mother > 0 || $args[0].father > 0 || $args[0].daughters > 0 || $args[0].sisters > 0>>
+ <<if totalRelatives($args[0]) > 0>>
<<for $j to 0; $j < $slaves.length; $j++>>
<<if $args[0].mother == $slaves[$j].ID>>
<<if $slaves[$j].assignment is $args[0].assignment>>