From 8adfd264277eb6f61b5901f619161f43f8d2bbfc Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Wed, 9 Jan 2019 19:28:31 -0600
Subject: [PATCH] Commit
---
src/uncategorized/checkinChecks.tw | 39 ++++++++++++
src/uncategorized/reMalefactor.tw | 2 +-
src/uncategorized/reRelativeRecruiter.tw | 2 +-
src/uncategorized/remoteSurgery.tw | 12 ++--
src/uncategorized/schoolteacherSelect.tw | 3 +-
src/uncategorized/spaReport.tw | 71 +++++++++++-----------
src/uncategorized/specialSlave.tw | 3 +-
src/uncategorized/stewardessSelect.tw | 3 +-
src/uncategorized/surgeryDegradation.tw | 10 +--
src/utility/descriptionWidgetsFlesh.tw | 27 ++++----
src/utility/descriptionWidgetsPiercings.tw | 10 +--
src/utility/ptWidgets.tw | 26 ++++----
12 files changed, 126 insertions(+), 82 deletions(-)
create mode 100644 src/uncategorized/checkinChecks.tw
diff --git a/src/uncategorized/checkinChecks.tw b/src/uncategorized/checkinChecks.tw
new file mode 100644
index 00000000000..358c12732e6
--- /dev/null
+++ b/src/uncategorized/checkinChecks.tw
@@ -0,0 +1,39 @@
+:: Checkin Checks [nobr]
+
+<<if $activeSlave.dick > 0>>
+ <<if $activeSlave.balls > 0>>
+ <<if $activeSlave.devotion <= 50>>
+ <<if ($activeSlave.fetish != "buttslut") || ($activeSlave.fetishKnown != 1)>>
+ <<if $activeSlave.sexualFlaw != "hates women">>
+ <<set $REFeminizationCheckinIDs.push($activeSlave.ID)>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
+<</if>>
+
+<<if $activeSlave.physicalAge > 35>>
+ <<if $activeSlave.face < 40>>
+ <<if $activeSlave.analSkill <= 30>>
+ <<set $REMILFCheckinIDs.push($activeSlave.ID)>>
+ <</if>>
+ <</if>>
+<</if>>
+
+<<if $activeSlave.attrXY <= 60>>
+ <<if $activeSlave.attrXX > 0>>
+ <<set $REOrientationCheckinIDs.push($activeSlave.ID)>>
+ <</if>>
+<</if>>
+
+<<if $activeSlave.face < -10>>
+ <<set $REUglyCheckinIDs.push($activeSlave.ID)>>
+<</if>>
+
+<<if $activeSlave.anus < 2>>
+ <<set $REButtholeCheckinIDs.push($activeSlave.ID)>>
+<</if>>
+
+<<if $activeSlave.boobs < 800>>
+ <<set $REReductionCheckinIDs.push($activeSlave.ID)>>
+<</if>>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index e0e3c7fa622..60864a4132e 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -558,7 +558,7 @@ She is easily taken into custody and her contraband confiscated once the jeering
<<if $arcologies[0].FSRepopulationFocus != "unset">>
<br><<link "Grant $him citizenship">>
<<replace "#result">>
- You help the exhausted mother to her feet and hand her her second newborn. She watches you, uncertain of your motives, until you have her escorted to the proper welcoming facility and put in a good word for having her added to your arcology's free population. You announce to the public that such a fertile <<if $activeSlave.physicalAge > 30>>milf<<elseif $activeSlave.physicalAge > 19>>woman<<elseif $activeSlave.physicalAge > 12>>teen<<else>>youth<</if>> will be a boon to Repopulationism, and that the contract she is signing mandates she be on powerful fertility agents whenever she isn't pregnant. During her residency, free or not, she will provide society with dozens of future children. The public @@.green;approves of breeders, free or not,@@ and word spreads that any and all mothers are welcome into your arcology @@.green;adding to its prosperity.@@
+ You help the exhausted mother to her feet and hand her her second newborn. She watches you, uncertain of your motives, until you have her escorted to the proper welcoming facility and put in a good word for having her added to your arcology's free population. You announce to the public that such a fertile <<if $activeSlave.physicalAge > 30>>MILF<<elseif $activeSlave.physicalAge > 19>>woman<<elseif $activeSlave.physicalAge > 12>>teen<<else>>youth<</if>> will be a boon to Repopulationism, and that the contract she is signing mandates she be on powerful fertility agents whenever she isn't pregnant. During her residency, free or not, she will provide society with dozens of future children. The public @@.green;approves of breeders, free or not,@@ and word spreads that any and all mothers are welcome into your arcology @@.green;adding to its prosperity.@@
<<set $rep += 10>>
<<set $arcologies[0].prosperity += 1>>
<</replace>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 5d94bbe06b4..2ee04afdbe1 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -608,7 +608,7 @@ You look up the _relationType. _He2 costs <<print cashFormat($slaveCost)>>, a ba
<<case "son">>
mother. _His2 listing states that _he2 was used as a shemale prostitute by _his2 previous owner.
<<case "mother">>
- daughter. _His2 listing states that _he2 was used as a bed slave by _his2 milf-loving owner.
+ daughter. _His2 listing states that _he2 was used as a bed slave by _his2 MILF-loving owner.
<<case "father">>
daughter. _His2 listing states that _he2 was gelded and used as a house servant.
<<case "older sister">>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index d643116ba2d..c699fb47840 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -150,7 +150,7 @@ $His $activeSlave.faceShape face is
<</if>>
<<if ($cyberMod == 1) && ($stockpile.ocularImplant > 0) && ($activeSlave.origEye != "implant")>>
<<if ($activeSlave.eyes != -3)>> <</if>>
- | [[Give her ocular implants|Surgery Degradation][$activeSlave.origEye = "implant", $stockpile.ocularImplant--,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "ocular implant"]]
+ | [["Give " + $him + " ocular implants"|Surgery Degradation][$activeSlave.origEye = "implant", $stockpile.ocularImplant--,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "ocular implant"]]
<</if>>
<</if>>
<</if>>
@@ -185,7 +185,7 @@ $His $activeSlave.faceShape face is
<</if>>
<</if>>
<<if ($cyberMod == 1) && ($stockpile.cochlearImplant > 0) && ($activeSlave.earImplant != 1)>>
- | [[Give her cochlear implants|Surgery Degradation][$activeSlave.earImplant = 1, $stockpile.cochlearImplant--,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "cochlear implant"]]
+ | [["Give " + $him + " cochlear implants"|Surgery Degradation][$activeSlave.earImplant = 1, $stockpile.cochlearImplant--,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "cochlear implant"]]
<</if>>
<</if>>
<</if>>
@@ -337,7 +337,7 @@ $He has
<br><br>
-Work on her chest:
+Work on $his chest:
<br>
$His
@@ -547,7 +547,7 @@ Work on her chest:
<br><br>
-Work on her midriff:
+Work on $his midriff:
<<if $activeSlave.indentureRestrictions >= 2 && $activeSlave.weight > 30>>
<br>
@@ -584,7 +584,7 @@ waist.
<</if>>
<<if ($activeSlave.waist >= -95) && ($activeSlave.waist < -75) && ($seeExtreme == 1)>>
<<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
- [[Remove ribs to severely narrow her waist|Surgery Degradation][$activeSlave.waist = -100,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "ribs"]]
+ [["Remove ribs to severely narrow " + $his + " waist"|Surgery Degradation][$activeSlave.waist = -100,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "ribs"]]
<</if>>
<</if>>
@@ -713,7 +713,7 @@ $He's
<br><br>
-Work on her butt:
+Work on $his butt:
<br>
$He's got a
<<if $activeSlave.butt <= 1>>flat and <<print either("skinny", "slim", "taut")>> ass.
diff --git a/src/uncategorized/schoolteacherSelect.tw b/src/uncategorized/schoolteacherSelect.tw
index d81f3f7aae7..0cc6eab471a 100644
--- a/src/uncategorized/schoolteacherSelect.tw
+++ b/src/uncategorized/schoolteacherSelect.tw
@@ -3,7 +3,8 @@
<<set $nextButton = "Back", $nextLink = "Schoolroom", $showEncyclopedia = 1, $encyclopedia = "Schoolteacher">>
<<showallAssignmentFilter>>
<<if ($Schoolteacher != 0)>>
- ''__@@.pink;<<= SlaveFullName($Schoolteacher)>>@@__'' is serving as your Schoolteacher.<br><br>She will help teach your slaves.
+ <<setLocalPronouns $Schoolteacher>>
+ ''__@@.pink;<<= SlaveFullName($Schoolteacher)>>@@__'' is serving as your Schoolteacher.<br><br>$He will help teach your slaves.
<<else>>
You have not selected a Schoolteacher.
<</if>>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index c566bcaa904..3314a61e140 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -40,53 +40,55 @@
<<set _devBonus++>>
<</if>>
<<set $slaves[_FLs].devotion += _devBonus, $Attendant = $slaves[_FLs]>>
- <<= SlaveFullName($Attendant)>> is serving as the spa attendant.<<if $Attendant.relationship == -3 && $Attendant.devotion > 50>> She tries her best to be your perfect attentive, caring and loving wife.<</if>>
+ <<setLocalPronouns $Attendant>>
+ <<= SlaveFullName($Attendant)>> is serving as the spa attendant.<<if $Attendant.relationship == -3 && $Attendant.devotion > 50>> $He tries $his best to be your perfect attentive, caring and loving wife.<</if>>
<<if (_FLsFetish == 1)>>
- When she is paid a visit by a slave with sexual issues to work out, she provides her with an understanding, willing, giving partner. She finds real satisfaction in helping your slaves find sexual gratification, and @@.lightsalmon;becomes a submissive.@@
+ When $he is paid a visit by a slave with sexual issues to work out, $he provides her with an understanding, willing, giving partner. $He finds real satisfaction in helping your slaves find sexual gratification, and @@.lightsalmon;becomes a submissive.@@
<<elseif (_FLsFetish == 2)>>
- Every new slave in the spa is a new girl she gets to connect with and serve. Sexually. @@.lightsalmon;She becomes more submissive.@@
+ Every new slave in the spa is a new girl $he gets to connect with and serve. Sexually. @@.lightsalmon;$He becomes more submissive.@@
<</if>>
<<if setup.attendantCareers.includes($Attendant.career)>>
- She has experience with counseling from her life before she was a slave, making her better at building rapport with troubled slaves, and giving her a better chance of softening flaws into beneficial quirks.
+ $He has experience with counseling from $his life before $he was a slave, making $him better at building rapport with troubled slaves, and giving $him a better chance of softening flaws into beneficial quirks.
<<set _bonusToggle = 1, _idleBonus++>>
<<elseif $Attendant.skillAT >= $masteredXP>>
- She has experience with counseling from working for you, making her better at building rapport with troubled slaves, and giving her a better chance of softening flaws into beneficial quirks.
+ $He has experience with counseling from working for you, making $him better at building rapport with troubled slaves, and giving $him a better chance of softening flaws into beneficial quirks.
<<set _bonusToggle = 1, _idleBonus++>>
<<else>>
<<set $slaves[_FLs].skillAT += random(1,Math.ceil(($Attendant.intelligence+$Attendant.intelligenceImplant)/15) + 8)>>
<</if>>
<<if ($Attendant.eyes == -2)>>
- Her blindness allows her to deeply connect with her girls.
+ $His blindness allows $him to deeply connect with $his girls.
<<set _idleBonus++>>
<</if>>
<<if ($Attendant.fetish == "none")>>
$Attendant.slaveName respects the slaves lounging in the spa, allowing them to relax completely.
<<set _idleBonus++>>
<<elseif ($Attendant.fetish == "submissive")>>
- $Attendant.slaveName lets the slaves resting in the spa take the lead sexually, doing her best to please them.
+ $Attendant.slaveName lets the slaves resting in the spa take the lead sexually, doing $his best to please them.
<<set _idleBonus++>>
<<elseif ($Attendant.fetishKnown == 1)>>
- $Attendant.slaveName can't keep her hands to herself, preventing the slaves in the spa from relaxing completely.
+ $Attendant.slaveName can't keep $his hands to $himself, preventing the slaves in the spa from relaxing completely.
<</if>>
<<if ($Attendant.visualAge > 35)>>
- Her apparent maturity encourages the slaves in the spa to relax and pour out their troubles to her.
+ $His apparent maturity encourages the slaves in the spa to relax and pour out their troubles to $him.
<<set _healthBonus++, _idleBonus++>>
<</if>>
<<if ($Attendant.intelligence+$Attendant.intelligenceImplant > 15)>>
- She's so intelligent she can suss out the cause of slaves' emotional issues and counsel them effectively.
+ $He's so intelligent $he can suss out the cause of slaves' emotional issues and counsel them effectively.
<<set _idleBonus++>>
<</if>>
<<if isFertile($Attendant) || ($Attendant.bellyPreg >= 1500) || ($Attendant.birthsTotal > 0) || ($Attendant.bellyImplant >= 1500)>>
- She has a natural mothering instinct and really makes her girls feel at home.
+ $He has a natural mothering instinct and really makes $his girls feel at home.
<<set _idleBonus++, _healthBonus++>>
<</if>>
<<set _attendantUsedCure = 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$SpaiIDs[_dI]]>>
+ <<setLocalPronouns $slaves[$i] 2>>
<<if ($slaves[$i].fetish == "mindbroken") && ($slaves[$i].health > 20) && (_attendantUsedCure == 0) && ($spaFix != 2)>>
<<set _attendantUsedCure = 1>>
<<if (random(1,100) > 90-$Attendant.devotion)>>
- <br> @@.green;Something almost miraculous has happened.@@ $Attendant.slaveName has always refused to believe that $slaves[$i].slaveName could not be reached, and has lavished patient tenderness on her in $spaName. $slaves[$i].slaveName has begun to respond, and is stirring from her mental torpor.
+ <br> @@.green;Something almost miraculous has happened.@@ $Attendant.slaveName has always refused to believe that $slaves[$i].slaveName could not be reached, and has lavished patient tenderness on _him2 in $spaName. $slaves[$i].slaveName has begun to respond, and is stirring from _his2 mental torpor.
<<set $slaves[$i].devotion = -3, $slaves[$i].sexualFlaw = "apathetic", $slaves[$i].behavioralFlaw = either("hates men", "odd"), $slaves[$i].fetish = "none", $slaves[$i].fetishKnown = 1>>
<<set _spr = $genePool.findIndex(function(s) { return s.ID == $slaves[$i].ID; })>>
<<if $genePool[_spr].intelligence >= -95>>
@@ -103,40 +105,40 @@
<<set $slaves[$i].trust++>>
<</if>>
<<if $Attendant.rivalryTarget == $slaves[$i].ID>>
- She constantly harasses her <<print rivalryTerm($Stewardess)>>, $slaves[$i].slaveName, preventing her from getting comfortable and forcing her to keep her guard up.
+ $He constantly harasses $his <<print rivalryTerm($Attendant)>>, $slaves[$i].slaveName, preventing _him2 from getting comfortable and forcing _him2 to keep _his2 guard up.
<<set $slaves[$i].devotion -= 4, $slaves[$i].trust -= 4>>
<<if random(1,100) > 35>>
<<set $Attendant.rivalry++, $slaves[_FLs].rivalry++, $slaves[$i].rivalry++>>
<</if>>
<<elseif $Attendant.relationshipTarget == $slaves[$i].ID>>
- She dedicates most of her attention to her <<print relationshipTerm($Attendant)>>, $slaves[$i].slaveName, making her stress, both physical and mental, wash away.
+ $He dedicates most of $his attention to $his <<print relationshipTerm($Attendant)>>, $slaves[$i].slaveName, making _his2 stress, both physical and mental, wash away.
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<<elseif $familyTesting == 1 && areRelated($Attendant, $slaves[$i]) > 0>>
- She makes sure to spend extra time caring for her <<print relativeTerm($Attendant.ID,$slaves[$i].ID)>>, $slaves[$i].slaveName.
+ $He makes sure to spend extra time caring for $his <<print relativeTerm($Attendant.ID,$slaves[$i].ID)>>, $slaves[$i].slaveName.
<<set $slaves[$i].trust++, $slaves[$i].health++>>
<<elseif $Attendant.relationTarget == $slaves[$i].ID && $familyTesting == 0>>
- She makes sure to spend extra time caring for her $slaves[$i].relation, $slaves[$i].slaveName.
+ $He makes sure to spend extra time caring for $his $slaves[$i].relation, $slaves[$i].slaveName.
<<set $slaves[$i].trust++>>
<</if>>
<<switch $slaves[$i].prestigeDesc>>
<<case "She is a famed Free Cities whore, and commands top prices.">>
- She does her best to relax the famous whore, $slaves[$i].slaveName, making sure to
+ $He does $his best to relax the famous whore, $slaves[$i].slaveName, making sure to
<<if $slaves[$i].vagina > 2 || $slaves[$i].anus > 2>>
- pay special attention to her worn holes.
+ pay special attention to _his2 worn holes.
<<else>>
- get her clean and relaxed for her next usage.
+ get _him2 clean and relaxed for _his2 next usage.
<</if>>
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<<case "She is a famed Free Cities slut, and can please anyone.">>
- She does her best to soothe the famous entertainer, $slaves[$i].slaveName, letting her relax in blissful peace.
+ $He does $his best to soothe the famous entertainer, $slaves[$i].slaveName, letting _him2 relax in blissful peace.
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<<case "She is remembered for winning best in show as a cockmilker.">>
<<if ($slaves[$i].balls > 6) && ($slaves[$i].dick != 0)>>
<<if $Attendant.fetish == "cumslut">>
- She can't keep her hands off $slaves[$i].slaveName's cock and balls, but she doesn't mind being milked constantly. Before long, strands of cum can be found floating all throughout the bath.
+ $He can't keep $his hands off $slaves[$i].slaveName's cock and balls, but _he2 doesn't mind being milked constantly. Before long, strands of cum can be found floating all throughout the bath.
<<set $Attendant.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
<<else>>
- She does her best to accommodate $slaves[$i].slaveName's massive genitals and tends to her whenever she feels a need for release.
+ $He does $his best to accommodate $slaves[$i].slaveName's massive genitals and tends to _him2 whenever _he2 feels a need for release.
<<if random(1,100) > 65 && $Attendant.fetish == "none">>
After taking several massive loads to the face, $Attendant.slaveName begins to find satisfaction in being coated in cum.
<<set $Attendant.fetish = "cumslut", $slaves[_FLs].fetish = "cumslut">>
@@ -147,10 +149,10 @@
<<case "She is remembered for winning best in show as a dairy cow.">>
<<if ($slaves[$i].lactation > 0) && (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 6000)>>
<<if $Attendant.fetish == "boobs">>
- She can't keep her hands off $slaves[$i].slaveName's huge breasts, but she doesn't mind being milked constantly. Before long the bath gains a white tint.
+ $He can't keep $his hands off $slaves[$i].slaveName's huge breasts, but _he2 doesn't mind being milked constantly. Before long the bath gains a white tint.
<<set $Attendant.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
<<else>>
- She does her best to accommodate $slaves[$i].slaveName's massive breasts and tends to her whenever she feels a need for release.
+ $He does $his best to accommodate $slaves[$i].slaveName's massive breasts and tends to _him2 whenever _he2 feels a need for release.
<<if random(1,100) > 65 && $Attendant.fetish == "none">>
After multiple milking sessions, $Attendant.slaveName begins to find herself fantasizing about having giant milky breasts too.
<<set $Attendant.fetish = "boobs", $slaves[_FLs].fetish = "boobs">>
@@ -161,22 +163,22 @@
<<case "She is remembered for winning best in show as a breeder.">>
<<if $slaves[$i].bellyPreg >= 5000>>
<<if $Attendant.fetish == "pregnancy">>
- She can't keep her hands off $slaves[$i].slaveName's pregnancy, but she doesn't mind her full belly being fondled.
+ $He can't keep $his hands off $slaves[$i].slaveName's pregnancy, but _he2 doesn't mind _his2 full belly being fondled.
<<set $Attendant.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
<<else>>
- She does her best to accommodate $slaves[$i].slaveName's pregnancy and to make sure the mother-to-be is happy and comfortable.
+ $He does $his best to accommodate $slaves[$i].slaveName's pregnancy and to make sure the mother-to-be is happy and comfortable.
<<if random(1,100) > 65 && $Attendant.fetish == "none">>
- After massaging $slaves[$i].slaveName's growing belly multiple times, $Attendant.slaveName begins to find herself fantasizing about being swollen with life too.
+ After massaging $slaves[$i].slaveName's growing belly multiple times, $Attendant.slaveName begins to find $himself fantasizing about being swollen with life too.
<<set $Attendant.fetish = "pregnancy", $slaves[_FLs].fetish = "pregnancy">>
<</if>>
<</if>>
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<<else>>
<<if $Attendant.fetish == "pregnancy">>
- She can't help but pester $slaves[$i].slaveName with questions about her famous pregnancy, limiting her ability to truly relax.
+ $He can't help but pester $slaves[$i].slaveName with questions about _his2 famous pregnancy, limiting _his2 ability to truly relax.
<<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
<<elseif canGetPregnant($slaves[$i])>>
- She does her best to encourage $slaves[$i].slaveName's fertilization by performing any fertility boosting actions she can.
+ $He does $his best to encourage $slaves[$i].slaveName's fertilization by performing any fertility boosting actions $he can.
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<</if>>
<</if>>
@@ -185,11 +187,11 @@
<<if $slaves[$i].behavioralFlaw != "none">>
<<run SoftenBehavioralFlaw($slaves[$i])>>
<<set _attendantUsedCure += 1>>
- <br> $Attendant.slaveName works carefully with $slaves[$i].slaveName, and successfully @@.green;softens her behavioral flaw@@ into an appealing quirk.
+ <br> $Attendant.slaveName works carefully with $slaves[$i].slaveName, and successfully @@.green;softens _his2 behavioral flaw@@ into an appealing quirk.
<<elseif $slaves[$i].sexualFlaw != "none">>
<<run SoftenSexualFlaw($slaves[$i])>>
<<set _attendantUsedCure += 1>>
- <br> $Attendant.slaveName works carefully with $slaves[$i].slaveName, and successfully @@.green;softens her sexual flaw@@ into an appealing quirk.
+ <br> $Attendant.slaveName works carefully with $slaves[$i].slaveName, and successfully @@.green;softens _his2 sexual flaw@@ into an appealing quirk.
<</if>>
<</if>>
<<if $slaves[$i].lactation > 0>>
@@ -200,7 +202,7 @@
<<if (_DL < $spa)>>
<<set _seed = random(1,10)+(($spa-_DL)*(random(150,170)+(_idleBonus*10)))>>
<<set $cash += _seed>>
- <br> Since she doesn't have enough girls to occupy all her time, the spa takes in citizens' slaves on a contract basis and she helps them too, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@
+ <br> Since $he doesn't have enough girls to occupy all $his time, the spa takes in citizens' slaves on a contract basis and $he helps them too, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@
<<if ($arcologies[0].FSHedonisticDecadence > 0) && (_DL == 0)>>
Society @@.green;loves@@ being allowed to lounge in your spa, greatly advancing your laid back culture.
<<= FSChange("Hedonism", 2)>>
@@ -255,6 +257,7 @@
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$SpaiIDs[_dI]]>>
+ <<setLocalPronouns $slaves[$i] 2>>
<<set $slaves[$i].devotion += _devBonus, $slaves[$i].trust += _trustBonus, $slaves[$i].health += _healthBonus>>
<<if ($slaves[$i].devotion < 60) && ($slaves[$i].trust < 60)>>
<<set $slaves[$i].devotion++, $slaves[$i].trust++>>
@@ -275,7 +278,7 @@
<<set $slaves[$i].livingRules = "luxurious">>
<</switch>>
<<if ($slaves[$i].health >= 20) && ($slaves[$i].trust > 60) && ($slaves[$i].devotion > 60) && ($slaves[$i].fetish != "mindbroken") && ($slaves[$i].sexualFlaw == "none") && ($slaves[$i].behavioralFlaw == "none")>>
- <br><br>''__@@.pink;$slaves[$i].slaveName@@__'' is feeling well enough to leave $spaName, so @@.yellow;her assignment has defaulted to rest@@.
+ <br><br>''__@@.pink;$slaves[$i].slaveName@@__'' is feeling well enough to leave $spaName, so @@.yellow;_his2 assignment has defaulted to rest@@.
<<= removeJob($slaves[$i], "rest in the spa")>>
<<set _restedSlaves++, _DL--, _dI-->>
<<continue>>
@@ -295,7 +298,7 @@
<<else>>
is resting in $spaName.
<</if>>
- <br> She <<= saRest($slaves[$i])>>
+ <br> _He2 <<= saRest($slaves[$i])>>
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
<<include "SA rules">>
diff --git a/src/uncategorized/specialSlave.tw b/src/uncategorized/specialSlave.tw
index de88f739257..414ca98d4dc 100644
--- a/src/uncategorized/specialSlave.tw
+++ b/src/uncategorized/specialSlave.tw
@@ -25,7 +25,7 @@
<<case "blind blue">>
<<set $activeSlave.origEye = "deep blue">>
<<case "milky white" "implant">>
- <<set $activeSlave.origEye = random("blue", "green", "brown", "hazel", "light blue", "light green", "dark green", "dark blue")>>
+ <<set $activeSlave.origEye = random("blue", "brown", "dark blue", "dark green", "green", "hazel", "light blue", "light green")>>
<<default>>
<<set $activeSlave.origEye = $activeSlave.eyeColor>>
<</switch>>
@@ -109,4 +109,3 @@
<<set $specialSlavesPriceOverride = 0>>
<</if>>
-
diff --git a/src/uncategorized/stewardessSelect.tw b/src/uncategorized/stewardessSelect.tw
index 45d64a5b854..a328f48ee9c 100644
--- a/src/uncategorized/stewardessSelect.tw
+++ b/src/uncategorized/stewardessSelect.tw
@@ -3,7 +3,8 @@
<<set $nextButton = "Back", $nextLink = "Servants' Quarters", $showEncyclopedia = 1, $encyclopedia = "Stewardesses">>
<<showallAssignmentFilter>>
<<if ($Stewardess != 0)>>
- ''__@@.pink;<<= SlaveFullName($Stewardess)>>@@__'' is serving as your Stewardess.<br><br>She will manage the Servants' Quarters.
+ <<setLocalPronouns $Stewardess>>
+ ''__@@.pink;<<= SlaveFullName($Stewardess)>>@@__'' is serving as your Stewardess.<br><br>$He will manage the Servants' Quarters.
<<else>>
You have not selected a Stewardess.
<</if>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 11580862578..6885bd31606 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -1720,7 +1720,7 @@ As the remote surgery's long recovery cycle completes,
$He's @@.hotpink;overwhelmed with gratitude,@@ in part because $he didn't think you'd do something like this for $him. $He thanks you profusely the first chance $he gets, and follows the acclimation program diligently, trying to deserve the expense you went to. $He @@.mediumaquamarine;places more trust in you,@@ too, since you seem to have a plan for $him.
<<set $activeSlave.devotion += 5, $activeSlave.trust += 5>>
<<else>>
- Despite $his hatred of you, $he can't help but @@.mediumaquamarine;trust you a bit more,@@ since you clearly have a plan that involves putting a good deal of value into $him. Your goals might not be hers, but at least $he has an indication that you're not toying with $him.
+ Despite $his hatred of you, $he can't help but @@.mediumaquamarine;trust you a bit more,@@ since you clearly have a plan that involves putting a good deal of value into $him. Your goals might not be $hers, but at least $he has an indication that you're not toying with $him.
<<set $activeSlave.trust += 5>>
<</if>>
<</if>>
@@ -1766,7 +1766,7 @@ As the remote surgery's long recovery cycle completes,
$He's @@.hotpink;overwhelmed with gratitude,@@ in part because $he didn't think you'd do something like this for $him. $He thanks you profusely the first chance $he gets, and follows the acclimation program diligently, trying to deserve the expense you went to. $He @@.mediumaquamarine;places more trust in you,@@ too, since you seem to have a plan for $him.
<<set $activeSlave.devotion += 5, $activeSlave.trust += 5>>
<<else>>
- Despite $his hatred of you, $he can't help but @@.mediumaquamarine;trust you a bit more,@@ since you clearly have a plan that involves putting a good deal of value into $him. Your goals might not be hers, but at least $he has an indication that you're not toying with $him.
+ Despite $his hatred of you, $he can't help but @@.mediumaquamarine;trust you a bit more,@@ since you clearly have a plan that involves putting a good deal of value into $him. Your goals might not be $hers, but at least $he has an indication that you're not toying with $him.
<<set $activeSlave.trust += 5>>
<</if>>
<</if>>
@@ -1781,7 +1781,7 @@ As the remote surgery's long recovery cycle completes,
$He's @@.hotpink;overwhelmed with gratitude,@@ in part because $he didn't think you'd do something like this for $him. $He thanks you profusely the first chance $he gets, and follows the acclimation program diligently, trying to deserve the expense you went to. $He @@.mediumaquamarine;places more trust in you,@@ too, since you seem to have a plan for $him.
<<set $activeSlave.devotion += 5, $activeSlave.trust += 5>>
<<else>>
- Despite $his hatred of you, $he can't help but @@.mediumaquamarine;trust you a bit more,@@ since you clearly have a plan that involves putting a good deal of value into $him. Your goals might not be hers, but at least $he has an indication that you're not toying with $him.
+ Despite $his hatred of you, $he can't help but @@.mediumaquamarine;trust you a bit more,@@ since you clearly have a plan that involves putting a good deal of value into $him. Your goals might not be $hers, but at least $he has an indication that you're not toying with $him.
<<set $activeSlave.trust += 5>>
<</if>>
<</if>>
@@ -1796,7 +1796,7 @@ As the remote surgery's long recovery cycle completes,
$He's @@.hotpink;overwhelmed with joy and gratitude,@@ when $he finds out this upgrade will allow $him to //feel// with $his limbs again, in part because $he didn't think you'd do something like this for $him. $He thanks you profusely the first chance $he gets and is determined to prove $himself worthy of the expense you went to for $him. $He @@.mediumaquamarine;places more trust in you,@@ too, since you seem to have a plan for $him.
<<set $activeSlave.devotion += 5, $activeSlave.trust += 5>>
<<else>>
- Despite $his hatred of you, $he can't help but feel some @@.mediumaquamarine;trust@@ and @@.hotpink;gratitude,@@ towards you, since you clearly have a plan that involves putting a good deal of value into $him. Your goals might not be hers, but at least $he has an indication that you're not toying with $him.
+ Despite $his hatred of you, $he can't help but feel some @@.mediumaquamarine;trust@@ and @@.hotpink;gratitude,@@ towards you, since you clearly have a plan that involves putting a good deal of value into $him. Your goals might not be $hers, but at least $he has an indication that you're not toying with $him.
<<set $activeSlave.devotion += 5, $activeSlave.trust += 5>>
<</if>>
<</if>>
@@ -1811,7 +1811,7 @@ As the remote surgery's long recovery cycle completes,
$He's @@.hotpink;overwhelmed with gratitude,@@ in part because $he didn't think you'd do something like this for $him. $He thanks you profusely the first chance $he gets, and follows the acclimation program diligently, trying to deserve the expense you went to. $He @@.mediumaquamarine;places more trust in you,@@ too, since you seem to have a plan for $him.
<<set $activeSlave.devotion += 5, $activeSlave.trust += 5>>
<<else>>
- Despite $his hatred of you, $he can't help but @@.mediumaquamarine;trust you a bit more,@@ since you clearly have a plan that involves putting a good deal of value into $him. Your goals might not be hers, but at least $he has an indication that you're not toying with $him.
+ Despite $his hatred of you, $he can't help but @@.mediumaquamarine;trust you a bit more,@@ since you clearly have a plan that involves putting a good deal of value into $him. Your goals might not be $hers, but at least $he has an indication that you're not toying with $him.
<<set $activeSlave.trust += 5>>
<</if>>
<</if>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 5208764df7f..9c5185ab085 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -5554,7 +5554,8 @@ $He has
<<else>>
<<if canTalk($activeSlave)>>
<<if $activeSlave.lips > 70>>
- $He can barely enunciate past $his dick-sucking lips; '<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>' comes out as '<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>.'
+ <<run Enunciate($activeSlave)>>
+ $He can barely enunciate past $his dick-sucking lips; '<<= WrittenMaster($activeSlave)>>' comes out as '<<Master>>.'
<</if>>
<</if>>
<<if $activeSlave.teeth != "normal">>
@@ -10878,9 +10879,9 @@ $He has
<<elseif $activeSlave.belly >= 750000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
- $activeSlave.slaveName's mini dress is specially tailored to fit such an dangerously gravid girl. It tightly clings to $his monolithic implant-filled belly and draws the eye right to $his protruding navel.
+ $activeSlave.slaveName's mini dress is specially tailored to fit such a dangerously gravid girl. It tightly clings to $his monolithic implant-filled belly and draws the eye right to $his protruding navel.
<<else>>
- $activeSlave.slaveName's mini dress is specially tailored to fit such an dangerously gravid girl. It tightly clings to $his monolithic pregnant belly, drawing the eye to $his protruding navel, the clear bulges of the life growing within $him, and every slight twitch inside $his taut middle.
+ $activeSlave.slaveName's mini dress is specially tailored to fit such a dangerously gravid girl. It tightly clings to $his monolithic pregnant belly, drawing the eye to $his protruding navel, the clear bulges of the life growing within $him, and every slight twitch inside $his taut middle.
<</if>>
<<elseif $activeSlave.belly >= 600000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
@@ -10977,9 +10978,9 @@ $He has
<<elseif $activeSlave.belly >= 750000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
- $activeSlave.slaveName's tunic is specially tailored to fit such an dangerously gravid girl. It tightly clings to $his monolithic implant-filled belly and draws the eye right to $his protruding navel.
+ $activeSlave.slaveName's tunic is specially tailored to fit such a dangerously gravid girl. It tightly clings to $his monolithic implant-filled belly and draws the eye right to $his protruding navel.
<<else>>
- $activeSlave.slaveName's tunic is specially tailored to fit such an dangerously gravid girl. It tightly clings to $his monolithic pregnant belly, drawing the eye to $his protruding navel, the clear bulges of the life growing within $him, and every slight twitch inside $his taut middle.
+ $activeSlave.slaveName's tunic is specially tailored to fit such a dangerously gravid girl. It tightly clings to $his monolithic pregnant belly, drawing the eye to $his protruding navel, the clear bulges of the life growing within $him, and every slight twitch inside $his taut middle.
<</if>>
<<elseif $activeSlave.belly >= 600000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
@@ -11076,9 +11077,9 @@ $He has
<<elseif $activeSlave.belly >= 750000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
- $activeSlave.slaveName's dress is specially tailored to fit such an dangerously gravid girl. It tightly clings to $his monolithic implant-filled belly and draws the eye right to $his protruding navel.
+ $activeSlave.slaveName's dress is specially tailored to fit such a dangerously gravid girl. It tightly clings to $his monolithic implant-filled belly and draws the eye right to $his protruding navel.
<<else>>
- $activeSlave.slaveName's dress is specially tailored to fit such an dangerously gravid girl. It tightly clings to $his monolithic pregnant belly, drawing the eye to $his protruding navel, the clear bulges of the life growing within $him, and every slight twitch inside $his taut middle.
+ $activeSlave.slaveName's dress is specially tailored to fit such a dangerously gravid girl. It tightly clings to $his monolithic pregnant belly, drawing the eye to $his protruding navel, the clear bulges of the life growing within $him, and every slight twitch inside $his taut middle.
<</if>>
<<elseif $activeSlave.belly >= 600000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
@@ -11175,9 +11176,9 @@ $He has
<<elseif $activeSlave.belly >= 750000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
- $activeSlave.slaveName's dress is specially tailored to fit such an dangerously gravid girl. It tightly clings to $his monolithic implant-filled belly and draws the eye right to $his protruding navel.
+ $activeSlave.slaveName's dress is specially tailored to fit such a dangerously gravid girl. It tightly clings to $his monolithic implant-filled belly and draws the eye right to $his protruding navel.
<<else>>
- $activeSlave.slaveName's dress is specially tailored to fit such an dangerously gravid girl. It tightly clings to $his monolithic pregnant belly, drawing the eye to $his protruding navel, the clear bulges of the life growing within $him, and every slight twitch inside $his taut middle.
+ $activeSlave.slaveName's dress is specially tailored to fit such a dangerously gravid girl. It tightly clings to $his monolithic pregnant belly, drawing the eye to $his protruding navel, the clear bulges of the life growing within $him, and every slight twitch inside $his taut middle.
<</if>>
<<elseif $activeSlave.belly >= 600000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
@@ -11274,9 +11275,9 @@ $He has
<<elseif $activeSlave.belly >= 750000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
- $activeSlave.slaveName's dress is specially tailored to fit such an dangerously gravid girl. It tightly clings to $his monolithic implant-filled belly and draws the eye right to $his protruding navel.
+ $activeSlave.slaveName's dress is specially tailored to fit such a dangerously gravid girl. It tightly clings to $his monolithic implant-filled belly and draws the eye right to $his protruding navel.
<<else>>
- $activeSlave.slaveName's dress is specially tailored to fit such an dangerously gravid girl. It tightly clings to $his monolithic pregnant belly, drawing the eye to $his protruding navel, the clear bulges of the life growing within $him, and every slight twitch inside $his taut middle.
+ $activeSlave.slaveName's dress is specially tailored to fit such a dangerously gravid girl. It tightly clings to $his monolithic pregnant belly, drawing the eye to $his protruding navel, the clear bulges of the life growing within $him, and every slight twitch inside $his taut middle.
<</if>>
<<elseif $activeSlave.belly >= 600000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
@@ -11378,9 +11379,9 @@ $He has
<<elseif $activeSlave.belly >= 750000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
- $activeSlave.slaveName's armor is specially tailored to fit such an dangerously gravid girl. It tightly clings to $his monolithic implant-filled belly and draws the eye right to $his protruding navel.
+ $activeSlave.slaveName's armor is specially tailored to fit such a dangerously gravid girl. It tightly clings to $his monolithic implant-filled belly and draws the eye right to $his protruding navel.
<<else>>
- $activeSlave.slaveName's armor is specially tailored to fit such an dangerously gravid girl. It tightly clings to $his monolithic pregnant belly, drawing the eye to $his protruding navel, the clear bulges of the life growing within $him, and every slight twitch inside $his taut middle.
+ $activeSlave.slaveName's armor is specially tailored to fit such a dangerously gravid girl. It tightly clings to $his monolithic pregnant belly, drawing the eye to $his protruding navel, the clear bulges of the life growing within $him, and every slight twitch inside $his taut middle.
<</if>>
<<elseif $activeSlave.belly >= 600000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
diff --git a/src/utility/descriptionWidgetsPiercings.tw b/src/utility/descriptionWidgetsPiercings.tw
index 4fc4809cf59..3743cce78de 100644
--- a/src/utility/descriptionWidgetsPiercings.tw
+++ b/src/utility/descriptionWidgetsPiercings.tw
@@ -131,7 +131,7 @@
<<if canTalk($activeSlave)>>
<<if $activeSlave.lips <= 70>>
<<if $activeSlave.lipsPiercing == 2>>
- $He can barely enunciate past $his piercings; '<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>' comes out as '<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>.'
+ $He can barely enunciate past $his piercings; '<<= WrittenMaster($activeSlave)>>' comes out as '<<Master $activeSlave>>.'
<</if>>
<</if>>
<</if>>
@@ -141,7 +141,7 @@
<<set _nippleColor = nippleColor($activeSlave)>>
<<if $activeSlave.fuckdoll > 0>>
<<if $activeSlave.nipplesPiercing > 0>>
- Its nipple piercings help secure the suit material to its breasts.
+ $His nipple piercings help secure the suit material to $his breasts.
<</if>>
<<else>>
<<if $activeSlave.nipplesPiercing == 1>>
@@ -345,13 +345,13 @@
<<widget "anusPiercingDescription">>
<<if ($activeSlave.vagina > -1)>>
<<if ($activeSlave.anusPiercing == 1)>>
- $He has a simple piercing between $his pussy and $his asshole<<if $activeSlave.fuckdoll > 0>> which helps keep the strip of material <<if $activeSlave.vagina > -1>>between its holes<<else>>below its rear hole<</if>> in place<</if>>.
+ $He has a simple piercing between $his pussy and $his asshole<<if $activeSlave.fuckdoll > 0>> which helps keep the strip of material <<if $activeSlave.vagina > -1>>between $his holes<<else>>below $his rear hole<</if>> in place<</if>>.
<<elseif ($activeSlave.anusPiercing == 2)>>
- $He has a big ring between $his pussy and $his asshole<<if $activeSlave.fuckdoll > 0>>, which helps keep the strip of material <<if $activeSlave.vagina > -1>>between its holes<<else>>below its rear hole<</if>> in place,<</if>> and studs in all around $his anus.
+ $He has a big ring between $his pussy and $his asshole<<if $activeSlave.fuckdoll > 0>>, which helps keep the strip of material <<if $activeSlave.vagina > -1>>between $his holes<<else>>below $his rear hole<</if>> in place,<</if>> and studs in all around $his anus.
<</if>>
<<else>>
<<if ($activeSlave.anusPiercing == 1)>>
- $He has a simple perianal piercing between the base of $his dick and $his girly butthole<<if $activeSlave.fuckdoll > 0>> which helps keep the strip of material <<if $activeSlave.vagina > -1>>between its holes<<else>>below its rear hole<</if>> in place<</if>>.
+ $He has a simple perianal piercing between the base of $his dick and $his girly butthole<<if $activeSlave.fuckdoll > 0>> which helps keep the strip of material <<if $activeSlave.vagina > -1>>between $his holes<<else>>below $his rear hole<</if>> in place<</if>>.
<<elseif ($activeSlave.anusPiercing == 2)>>
$He has a big ring between the base of $his dick and $his girly butthole, which has studs all around it.
<</if>>
diff --git a/src/utility/ptWidgets.tw b/src/utility/ptWidgets.tw
index 3683b9af6d2..cd4364ca0e3 100644
--- a/src/utility/ptWidgets.tw
+++ b/src/utility/ptWidgets.tw
@@ -2,14 +2,14 @@
<<widget "InduceFlawAbuseEffects">>
<<if $activeSlave.devotion > 20>>
- She's @@.mediumorchid;desperately confused@@ by this treatment, since the effect would be ruined if you explained it to her, and her @@.gold;trust in you is reduced.@@
+ $He's @@.mediumorchid;desperately confused@@ by this treatment, since the effect would be ruined if you explained it to $him, and $his @@.gold;trust in you is reduced.@@
<<elseif $activeSlave.devotion >= -20>>
- She's @@.mediumorchid;confused, depressed@@ and @@.gold;frightened@@ by this treatment, since the effect would be ruined if you explained it to her.
+ $He's @@.mediumorchid;confused, depressed@@ and @@.gold;frightened@@ by this treatment, since the effect would be ruined if you explained it to $him.
<<else>>
- She's @@.mediumorchid;angry@@ and @@.gold;afraid@@ that you would treat her like this.
+ $He's @@.mediumorchid;angry@@ and @@.gold;afraid@@ that you would treat $him like this.
<</if>>
<<if $activeSlave.energy > 10>>
- Her @@.red;appetite for sex is also reduced.@@
+ $His @@.red;appetite for sex is also reduced.@@
<<set $activeSlave.energy -= 2>>
<</if>>
<<set $activeSlave.devotion -= 5>>
@@ -18,7 +18,7 @@
<<widget "InduceFlawLenityEffects">>
<<if $activeSlave.devotion <= 20>>
- She doesn't understand what you intend by this strange treatment, but it does make her @@.mediumaquamarine;inappropriately trusting.@@
+ $He doesn't understand what you intend by this strange treatment, but it does make $him @@.mediumaquamarine;inappropriately trusting.@@
<<set $activeSlave.trust += 5>>
<</if>>
<</widget>>
@@ -27,22 +27,22 @@
<br>
<<set _pti = $personalAttention.findIndex(function(s) { return s.ID == $activeSlave.ID; })>>
<<if ($activeSlave.devotion > 20) && ($activeSlave.behavioralFlaw != "none") && ($activeSlave.behavioralQuirk == "none")>>
- Since she's obedient, @@.yellow;her training assignment has defaulted to softening her behavioral flaw.@@
+ Since $he's obedient, @@.yellow;$his training assignment has defaulted to softening $his behavioral flaw.@@
<<set $personalAttention[_pti].trainingRegimen = "soften her behavioral flaw">>
- <<elseif ($activeSlave.devotion > 20) && ($activeSlave.sexualQuirk == "none") && !["cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "neglectful", "breeder", "none"].includes($activeSlave.sexualFlaw)>>
- Since she's obedient, @@.yellow;her training assignment has defaulted to softening her sexual flaw.@@
+ <<elseif ($activeSlave.devotion > 20) && ($activeSlave.sexualQuirk == "none") && !["abusive", "anal addict", "attention whore", "breast growth", "breeder", "cum addict", "malicious", "neglectful", "none", "self hating"].includes($activeSlave.sexualFlaw)>>
+ Since $he's obedient, @@.yellow;$his training assignment has defaulted to softening $his sexual flaw.@@
<<set $personalAttention[_pti].trainingRegimen = "soften her sexual flaw">>
<<elseif ($activeSlave.devotion > 20) && ($activeSlave.behavioralFlaw != "none") && ($activeSlave.behavioralQuirk != "none")>>
- Since she's obedient and already has a behavioral quirk, @@.yellow;her training assignment has defaulted to removing her behavioral flaw.@@
+ Since $he's obedient and already has a behavioral quirk, @@.yellow;$his training assignment has defaulted to removing $his behavioral flaw.@@
<<set $personalAttention[_pti].trainingRegimen = "fix her behavioral flaw">>
- <<elseif ($activeSlave.devotion > 20) && !["cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "neglectful", "breeder", "none"].includes($activeSlave.sexualFlaw)>>
- Since she's obedient and already has a sexual quirk, @@.yellow;her training assignment has defaulted to removing her sexual flaw.@@
+ <<elseif ($activeSlave.devotion > 20) && !["abusive", "anal addict", "attention whore", "breast growth", "breeder", "cum addict", "malicious", "neglectful", "none", "self hating"].includes($activeSlave.sexualFlaw)>>
+ Since $he's obedient and already has a sexual quirk, @@.yellow;$his training assignment has defaulted to removing $his sexual flaw.@@
<<set $personalAttention[_pti].trainingRegimen = "fix her sexual flaw">>
<<elseif ($activeSlave.devotion <= 20) && ($activeSlave.trust >= -20)>>
- @@.yellow;Her training assignment has defaulted to breaking her will.@@
+ @@.yellow;$His training assignment has defaulted to breaking $his will.@@
<<set $personalAttention[_pti].trainingRegimen = "break her will">>
<<else>>
- She is now fully broken; @@.yellow;her training assignment has defaulted to fostering devotion.@@
+ $He is now fully broken; @@.yellow;$his training assignment has defaulted to fostering devotion.@@
<<set $personalAttention[_pti].trainingRegimen = "build her devotion">>
<</if>>
<<set $activeSlave.training = 0, $slaves[$slaveIndices[$activeSlave.ID]].training = 0>>
--
GitLab