From f98514ef1b223cef0166fd4595f800a5214970fd Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Mon, 17 Dec 2018 00:13:11 -0600 Subject: [PATCH] CommitMessage --- src/uncategorized/arcade.tw | 2 +- src/uncategorized/brothel.tw | 5 +++-- src/uncategorized/schoolroom.tw | 3 ++- src/uncategorized/servantsQuarters.tw | 5 +++-- src/uncategorized/spa.tw | 22 ++++++++++++---------- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw index a982751c35b..e5813e04131 100644 --- a/src/uncategorized/arcade.tw +++ b/src/uncategorized/arcade.tw @@ -97,7 +97,7 @@ $arcadeNameCaps <br> <<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology)>> <<if $arcadeUpgradeInjectors == 1>> - It has been upgraded with aphrodisiac injection systems and electroshock applicators. If the aphrodisiacs fail to force an orgasm from an inmate, she is shocked to tighten her holes regardless. + It has been upgraded with aphrodisiac injection systems and electroshock applicators. If the aphrodisiacs fail to force an orgasm from an inmate, they are shocked to tighten their holes regardless. <<elseif $arcadeUpgradeCollectors == 1>> It has been retrofitted to milk lactating slaves<<if $seeDicks != 0>> and cockmilk slaves capable of ejaculating<</if>>, though less efficiently than a dedicated facility. <<else>> diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw index a182ef9c691..4203f1edbca 100644 --- a/src/uncategorized/brothel.tw +++ b/src/uncategorized/brothel.tw @@ -164,11 +164,12 @@ $brothelNameCaps [[Expand the brothel|Brothel][$cash -= _Tmult0, $brothel += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs// <<if $Madam != 0>> + <<setLocalPronouns $Madam>> <br> <<if $MadamIgnoresFlaws != 1>> - $Madam.slaveName will attempt to fix flaws in whores serving under her. [[Ignore flaws|Brothel][$MadamIgnoresFlaws = 1]] + $Madam.slaveName will attempt to fix flaws in whores serving under $him. [[Ignore flaws|Brothel][$MadamIgnoresFlaws = 1]] <<else>> - $Madam.slaveName has been instructed to ignore flaws in the whores serving under her. [[Fix flaws|Brothel][$MadamIgnoresFlaws = 0]] + $Madam.slaveName has been instructed to ignore flaws in the whores serving under $him. [[Fix flaws|Brothel][$MadamIgnoresFlaws = 0]] <</if>> <</if>> diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw index 74072d25e59..1d3de43a188 100644 --- a/src/uncategorized/schoolroom.tw +++ b/src/uncategorized/schoolroom.tw @@ -65,7 +65,8 @@ $schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These <<elseif $schoolroomSlaves > 0>> $schoolroomNameCaps is sparsely populated, the few students repeating their lessons out loud to drill the instruction home. One girl is maintaining an uncomfortable position in the corner as punishment for poor work. <<elseif $Schoolteacher != 0>> - $Schoolteacher.slaveName is alone in $schoolroomName, and has nothing to do but work on her lesson plans. + <<setLocalPronouns $Schoolteacher>> + $Schoolteacher.slaveName is alone in $schoolroomName, and has nothing to do but work on $his lesson plans. <<else>> None of your slaves are learning in $schoolroomName. [[Decommission the schoolroom|Main][$schoolroom = 0, $schoolroomUpgradeSkills = 0, $schoolroomUpgradeLanguage = 0, $schoolroomUpgradeRemedial = 0, $schoolroomDecoration = "standard"]] diff --git a/src/uncategorized/servantsQuarters.tw b/src/uncategorized/servantsQuarters.tw index 4d158c7aeab..3b59bcf5c2e 100644 --- a/src/uncategorized/servantsQuarters.tw +++ b/src/uncategorized/servantsQuarters.tw @@ -104,14 +104,15 @@ $servantsQuartersNameCaps <br><br> <<if $Stewardess != 0>> + <<setLocalPronouns $Stewardess>> <<set $Flag = 2>> <<include "Slave Summary">> <<if canAchieveErection($Stewardess) && $Stewardess.pubertyXY == 1>> <br> <<if $stewardessImpregnates == 1>> - Keeping the maids pregnant is part of her job. [[Order her to stop impregnating|Servants' Quarters][$stewardessImpregnates = 0]] + Keeping the maids pregnant is part of $his job. [["Order " + $him + " to stop impregnating"|Servants' Quarters][$stewardessImpregnates = 0]] <<elseif $seePreg != 0>> - She could be directed to keep the maids pregnant herself. [[Order her to impregnate|Servants' Quarters][$stewardessImpregnates = 1]] + $He could be directed to keep the maids pregnant herself. [["Order " + $him + " to impregnate"|Servants' Quarters][$stewardessImpregnates = 1]] <</if>> <</if>> <<else>> diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw index 53d72b5ec08..0ec95ce6c52 100644 --- a/src/uncategorized/spa.tw +++ b/src/uncategorized/spa.tw @@ -65,7 +65,8 @@ $spaNameCaps <<elseif $spaSlaves > 0>> It's sparsely populated; though the few slaves here have little company they like having the water to themselves. <<elseif $Attendant != 0>> - $Attendant.slaveName is alone here, and has nothing to do but keep the place (and her own soft, wet body) spotlessly clean. + <<setLocalPronouns $Attendant>> + $Attendant.slaveName is alone here, and has nothing to do but keep the place (and $his own soft, wet body) spotlessly clean. <<else>> It's empty and quiet. [[Decommission the Spa|Main][$spa = 0, $spaDecoration = "standard", $spaUpgrade = 0, $spaFix = 0]] <</if>> @@ -99,19 +100,20 @@ $spaNameCaps <</if>> <<if $Attendant != 0>> +<<setLocalPronouns $Attendant>> <br> <<if $spaFix == 2>> - $Attendant.slaveName is focusing only on the health and wellness of the slaves under her care, obeying your orders to avoid attempting to right mental flaws. - [[Order her to only fix mindbroken slaves|Spa][$spaFix = 1]] | - [[Let her tend as she sees fit|Spa][$spaFix = 0]] + $Attendant.slaveName is focusing only on the health and wellness of the slaves under $his care, obeying your orders to avoid attempting to right mental flaws. + [["Order " + $him + " to only fix mindbroken slaves"|Spa][$spaFix = 1]] | + [["Let " + $him + " tend as she sees fit"|Spa][$spaFix = 0]] <<elseif $spaFix == 1>> - $Attendant.slaveName is focusing on the health and wellness of the slaves under her care, as well as trying to bring mindbroken slaves back, while ignoring any mental hangups a slave may have. - [[Order her to not fix flaws|Spa][$spaFix = 2]] | - [[Let her tend as she sees fit|Spa][$spaFix = 0]] + $Attendant.slaveName is focusing on the health and wellness of the slaves under $his care, as well as trying to bring mindbroken slaves back, while ignoring any mental hang-ups a slave may have. + [["Order " + $him + " to not fix flaws"|Spa][$spaFix = 2]] | + [["Let " + $him + " tend as she sees fit"|Spa][$spaFix = 0]] <<else>> - $Attendant.slaveName is not following any special orders and is tending to your slaves as she sees fit. - [[Order her to not fix any flaws|Spa][$spaFix = 2]] | - [[Order her to only fix mindbroken slaves|Spa][$spaFix = 1]] + $Attendant.slaveName is not following any special orders and is tending to your slaves as $he sees fit. + [["Order " + $him + " to not fix any flaws"|Spa][$spaFix = 2]] | + [["Order " + $him + " to only fix mindbroken slaves"|Spa][$spaFix = 1]] <</if>> <</if>> -- GitLab