From 79b8fba76a31b533d782aa8399e4ae151ed65b5d Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sat, 8 Dec 2018 00:17:39 -0600
Subject: [PATCH] FixedWithWidgets
---
devNotes/twine JS.txt | 10 +++++-
src/js/assayJS.tw | 8 +++++
src/js/storyJS.tw | 2 +-
src/npc/fFeelings.tw | 39 ++++++++++++-----------
src/pregmod/reMaleArcologyOwner.tw | 6 ++--
src/pregmod/widgets/pregmodWidgets.tw | 10 ++++++
src/uncategorized/PETS.tw | 3 +-
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/RETS.tw | 9 ++----
src/uncategorized/hgSelect.tw | 2 +-
src/uncategorized/peConcubineInterview.tw | 5 +--
src/uncategorized/reMilfTourist.tw | 6 ++--
src/uncategorized/reRelativeRecruiter.tw | 28 +++++++++-------
src/uncategorized/rename.tw | 4 +--
src/utility/miscWidgets.tw | 5 +++
15 files changed, 88 insertions(+), 51 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 1d2b27a6e1d..f6b29ff8061 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -401,7 +401,7 @@ window.canSee = function(slave) {
window.canHear = function(slave) {
if (!slave) {
return null;
- } else if ((slave.hears > -2) || (slave.earwear != "deafening ear plugs")) {
+ } else if ((slave.hears > -2) && (slave.earwear != "deafening ear plugs")) {
return true;
} else {
return false;
@@ -8071,6 +8071,14 @@ window.SlaveFullName = function SlaveFullName(slave) {
return pair.join(" ");
};
+window.SlaveFullBirthName = function SlaveFullBirthName(slave) {
+ const V = State.variables;
+ const pair = slave.birthSurname ? [slave.birthName, slave.birthSurname] : [slave.birthName];
+ if (V.surnameOrder !== 1 && ["Cambodian", "Chinese", "Hungarian", "Japanese", "Korean", "Mongolian", "Taiwanese", "Vietnamese"].includes(slave.nationality))
+ pair.reverse();
+ return pair.join(" ");
+};
+
window.PlayerName = function PlayerName() {
const V = State.variables;
const surnamesFirstCountries = [
diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw
index 5ed6ba58536..7d1ec2ed3ad 100644
--- a/src/js/assayJS.tw
+++ b/src/js/assayJS.tw
@@ -635,6 +635,14 @@ window.SlaveFullName = function SlaveFullName(slave) {
return pair.join(" ");
};
+window.SlaveFullBirthName = function SlaveFullBirthName(slave) {
+ const V = State.variables;
+ const pair = slave.birthSurname ? [slave.birthName, slave.birthSurname] : [slave.birthName];
+ if (V.surnameOrder !== 1 && ["Cambodian", "Chinese", "Hungarian", "Japanese", "Korean", "Mongolian", "Taiwanese", "Vietnamese"].includes(slave.nationality))
+ pair.reverse();
+ return pair.join(" ");
+};
+
window.PlayerName = function PlayerName() {
const V = State.variables;
const surnamesFirstCountries = [
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index ef9fdf35b04..db03ff4ec8d 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -399,7 +399,7 @@ window.canSee = function(slave) {
window.canHear = function(slave) {
if (!slave) {
return null;
- } else if ((slave.hears > -2) || (slave.earwear != "deafening ear plugs")) {
+ } else if ((slave.hears > -2) && (slave.earwear != "deafening ear plugs")) {
return true;
} else {
return false;
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index a2efc671dd3..e283bef43a9 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -1091,13 +1091,14 @@ My favorite part of my body i<<s>>
<<set _partnerName = $slaves[_partner].slaveName>>
<</if>>
<<setLocalPronouns $slaves[_partner] 2>>
+ <<setSpokenLocalPronouns $activeSlave $slaves[_partner]>>
<<else>>
@@.red;Error, relationshipTarget not found.@@
<</if>>
<<if $activeSlave.relationship <= 2>>
- I really like <<s>>eeing _partnerName every day, _he2'<<s>> a good friend." $He blushes. "_He2'<<s>> kind of hot, too.
+ I really like <<s>>eeing _partnerName every day, <,he 2>>'<<s>> a good friend." $He blushes. "<<He 2>>'<<s>> kind of hot, too.
<<elseif $activeSlave.relationship <= 3>>
- I really like <<s>>eeing _partnerName every day, _he2's a good friend -" $He blushes. "- even when we're not fucking.
+ I really like <<s>>eeing _partnerName every day, <<he 2>>'s a good friend -" $He blushes. "- even when we're not fucking.
<<elseif $activeSlave.relationship <= 4>>
I really love _partnerName." $He blushes. "Thank you for letting u<<s>> be together, <<Master>>.
<<else>>
@@ -1105,42 +1106,42 @@ My favorite part of my body i<<s>>
<</if>>
<<if $activeSlave.relationship >= 3>>
<<if $activeSlave.mother == $slaves[_partner].ID>>
- "I - I'm fucking my mother," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but _he2'<<s>> <<s>>uch a hot MILF, I can't <<s>>top.
+ "I - I'm fucking my mother," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but <<he 2>>'<<s>> <<s>>uch a hot MILF, I can't <<s>>top.
<<elseif $activeSlave.father == $slaves[_partner].ID>>
- I - I'm fucking my father," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but _he2 know<<s>> <<s>>o much about penetration, I can't <<s>>top.
+ I - I'm fucking my father," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but <<he 2>> know<<s>> <<s>>o much about penetration, I can't <<s>>top.
<<elseif $slaves[_partner].mother == $activeSlave.ID>>
- I - I'm fucking my daughter," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but _he2 ha<<s>> <<s>>uch a hot little body, I can't <<s>>top.
+ I - I'm fucking my daughter," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but <<he 2>> ha<<s>> <<s>>uch a hot little body, I can't <<s>>top.
<<elseif $slaves[_partner].father == $activeSlave.ID>>
- I - I'm fucking my daughter," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but _he2 ha<<s>> <<s>>uch a hot little body. _He2 looks <<s>>o much like $his mother, I can't <<s>>top.
+ I - I'm fucking my daughter," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but <<he 2>> ha<<s>> <<s>>uch a hot little body. <<He 2>> looks <<s>>o much like $his mother, I can't <<s>>top.
<<elseif areSisters($activeSlave, $slaves[_partner]) == 1>>
- I - I'm fucking my twin <<s>>i<<s>>ter," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but _he2'<<s>> <<s>>o hot, I can't <<s>>top.
+ I - I'm fucking my twin <<s>>i<<s>>ter," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but <<he 2>>'<<s>> <<s>>o hot, I can't <<s>>top.
<<elseif areSisters($activeSlave, $slaves[_partner]) == 2>>
- I - I'm fucking my <<s>>i<<s>>ter," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but _he2'<<s>> <<s>>o hot, I can't <<s>>top.
+ I - I'm fucking my <<s>>i<<s>>ter," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but <<he 2>>'<<s>> <<s>>o hot, I can't <<s>>top.
<<elseif areSisters($activeSlave, $slaves[_partner]) == 3>>
- I - I'm fucking my half-<<s>>i<<s>>ter," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but _he2'<<s>> <<s>>o hot, I can't <<s>>top.
+ I - I'm fucking my half-<<s>>i<<s>>ter," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but <<he 2>>'<<s>> <<s>>o hot, I can't <<s>>top.
<<elseif ($activeSlave.relation != 0) && ($slaves[_partner].ID == $activeSlave.relationTarget)>>
- I - I'm fucking my <<if ($activeSlave.relation == "mother")>>daughter<<elseif ($activeSlave.relation == "daughter")>>mother<<else>>$activeSlave.relation<</if>>," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but <<if ($activeSlave.relation == "mother")>>_he2 ha<<s>> <<s>>uch a hot little body<<elseif ($activeSlave.relation == "daughter")>>_he2'<<s>> <<s>>uch a hot MILF<<else>>_he2'<<s>> <<s>>o hot<</if>>, I can't <<s>>top.
+ I - I'm fucking my <<if ($activeSlave.relation == "mother")>>daughter<<elseif ($activeSlave.relation == "daughter")>>mother<<else>>$activeSlave.relation<</if>>," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but <<if ($activeSlave.relation == "mother")>><<he 2>> ha<<s>> <<s>>uch a hot little body<<elseif ($activeSlave.relation == "daughter")>><<he 2>>'<<s>> <<s>>uch a hot MILF<<else>><<he 2>>'<<s>> <<s>>o hot<</if>>, I can't <<s>>top.
<<elseif ($activeSlave.actualAge + 14) < $slaves[_partner].actualAge>>
- _He2'<<s>> old enough to be my mother." $He looks down, blushing a little harder. "But I'm lucky, _he2'<<s>> <<s>>uch a hot MILF.
+ <<He 2>>'<<s>> old enough to be my mother." $He looks down, blushing a little harder. "But I'm lucky, <<he 2>>'<<s>> <<s>>uch a hot MILF.
<<elseif ($activeSlave.actualAge - 14) > $slaves[_partner].actualAge>>
- _He2'<<s>> young enough to be my daughter." $He looks down, blushing a little harder. "But I love _his2 hot young body.
+ <<He 2>>'<<s>> young enough to be my daughter." $He looks down, blushing a little harder. "But I love <<his 2>> hot young body.
<</if>>
<<if (($activeSlave.actualAge - 5) > $slaves[_partner].actualAge) && (20 > $slaves[_partner].actualAge)>>
- _He2'<<s>> a little immature at time<<s>>, but having <<s>>e<<x>> with a teenager i<<s>> so awe<<s>>ome, it'<<s>> worth it.
+ <<He 2>>'<<s>> a little immature at time<<s>>, but having <<s>>e<<x>> with a teenager i<<s>> so awe<<s>>ome, it'<<s>> worth it.
<</if>>
<<if $slaves[_partner].amp != 0>>
<<if $slaves[_partner].amp == -1>>
- I really do like _his2 P-Limb<<s>>. They're a little awkward, and kind of cold, but that'<<s>> ju<<s>>t how _he2 i<<s>>.
+ I really do like <<his 2>> P-Limb<<s>>. They're a little awkward, and kind of cold, but that'<<s>> ju<<s>>t how <<he 2>> i<<s>>.
<<elseif $slaves[_partner].amp == -2>>
- And, um." $He giggles. "_He2 ha<<s>> vibe finger<<s>>. <<S>>o that'<<s>> awesome.
+ And, um." $He giggles. "<<He 2>> ha<<s>> vibe finger<<s>>. <<S>>o that'<<s>> awesome.
<<elseif $slaves[_partner].amp == -3>>
- I really like _his2 P-Limb<<s>>. They're very pretty, but kind of cold. That'<<s>> ju<<s>>t how _he2 i<<s>>.
+ I really like <<his 2>> P-Limb<<s>>. They're very pretty, but kind of cold. That'<<s>> ju<<s>>t how <<he 2>> i<<s>>.
<<elseif $slaves[_partner].amp == -4>>
- _His2 P-Limb<<s>> do <<s>>care me a little, <<s>>ometime<<s>>. Though of course _he2 di<<s>>able<<s>> the weapon<<s>> when we're together." $He giggles. "Though I did get _him2 to extend _his2 blades on<<c>>e, so I could ki<<ss>> them for luck.
+ <<His 2>> P-Limb<<s>> do <<s>>care me a little, <<s>>ometime<<s>>. Though of course <<he 2>> di<<s>>able<<s>> the weapon<<s>> when we're together." $He giggles. "Though I did get _him2 to extend <<his 2>> blades on<<c>>e, so I could ki<<ss>> them for luck.
<<elseif $slaves[_partner].amp == -5>>
- _His2 P-Limb<<s>> do look cool and I like how <<s>>trong they can make _him2 but they <<s>>care me a little, <<s>>ometime<<s>>. Though of cour<<s>>e _he2 di<<s>>able<<s>> the weapon<<s>> when we're together." $He giggles. "_He2 ha<<s>> vibe finger<<s>>, <<s>>o that'<<s>> awe<<s>>ome.
+ <<His 2>> P-Limb<<s>> do look cool and I like how <<s>>trong they can make _him2 but they <<s>>care me a little, <<s>>ometime<<s>>. Though of cour<<s>>e <<he 2>> di<<s>>able<<s>> the weapon<<s>> when we're together." $He giggles. "<<He 2>> ha<<s>> vibe finger<<s>>, <<s>>o that'<<s>> awe<<s>>ome.
<<else>>
- _He2's an amputee, of course, <<s>>o that'<<s>> a little <<s>>ad.
+ <<He 2>>'s an amputee, of course, <<s>>o that'<<s>> a little <<s>>ad.
<</if>>
<</if>>
<</if>>
diff --git a/src/pregmod/reMaleArcologyOwner.tw b/src/pregmod/reMaleArcologyOwner.tw
index 26d98113c17..acd3537dd74 100644
--- a/src/pregmod/reMaleArcologyOwner.tw
+++ b/src/pregmod/reMaleArcologyOwner.tw
@@ -36,7 +36,7 @@ He strikes a fine balance in conversation with you, firm enough to not overpower
<<if _randomForeignFS > 90>>
It's immediately clear by the look on his face that you made a mistake. The man clearly comes from a society that dislikes pregnant woman leading and your attempt to manipulate him into being your lover has pushed him past his level of tolerance. He storms out in anger and, upon returning to the party, makes your underhanded efforts known. @@.red;Your reputation has taken a major hit.@@
<<set $rep -= 1000>>
- <<elseif _randomForeignFS > 70>> /* repop */
+ <<elseif _randomForeignFS > 70>> repop
It's immediately clear by the look on his face that you made a mistake. He wastes no time in leaping onto the bed, and in his haste, barely manages to disrobe. Before you can attempt to take control, he's hilted in your needy vagina and giving you the fucking your body has been craving. He leaves a few hours later with a satisfied expression and returns to the party, where he puts in a good word for just how good you were. @@.green;Your reputation has slightly improved,@@ though nowhere near as much as his.
<<set $rep += 100>>
<<set $desc = "a thank-you note from a male arcology owner of your acquaintance that smells strongly of lust">>
@@ -49,9 +49,9 @@ He strikes a fine balance in conversation with you, firm enough to not overpower
<</if>>
<<elseif $PC.boobsBonus >= 2>>
You adjust your dress to better emphasize your huge <<if $PC.boobsImplant == 1>>fake tits<<else>>soft breasts<</if>> and head over to join to the
- <<if _randomForeignFS > 80>> slimness
+ <<if _randomForeignFS > 80>> slimness
conversation between him and the woman trying to convince him to invest in her solar power concern. After a few minutes of you jiggling your cleavage around, however, it becomes apparent that this is not turning him on at all. He excuses himself and withdraws. You return to your <<if $PC.refreshmentType == 0>>$PC.refreshment<<elseif $PC.refreshmentType == 1>>glass of $PC.refreshment<<elseif $PC.refreshmentType == 2>>plate of $PC.refreshment<<elseif $PC.refreshmentType == 3>>pouch of $PC.refreshment<<elseif $PC.refreshmentType == 4>>syringe of $PC.refreshment<<elseif $PC.refreshmentType == 5>>bottle of $PC.refreshment<<elseif $PC.refreshmentType == 6>>sheet of $PC.refreshment<</if>>, consoling yourself that you are not exactly starved for company.
- <<elseif _randomForeignFS > 60>> /* transformation */
+ <<elseif _randomForeignFS > 60>> transformation
conversation between him and the woman trying to convince him to invest in her solar power concern.
<<if $PC.boobsImplant != 1>>
After a few minutes of you jiggling your cleavage around, however, it becomes apparent that, while he does frequently eye it, it just isn't to his tastes. He excuses himself and withdraws. You return to your <<if $PC.refreshmentType == 0>>$PC.refreshment<<elseif $PC.refreshmentType == 1>>glass of $PC.refreshment<<elseif $PC.refreshmentType == 2>>plate of $PC.refreshment<<elseif $PC.refreshmentType == 3>>pouch of $PC.refreshment<<elseif $PC.refreshmentType == 4>>syringe of $PC.refreshment<<elseif $PC.refreshmentType == 5>>bottle of $PC.refreshment<<elseif $PC.refreshmentType == 6>>sheet of $PC.refreshment<</if>>, consoling yourself that you are not exactly starved for company.
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 6357faa7609..2f967991991 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -262,6 +262,16 @@
<</if>>
<</widget>>
+<<widget "setSpokenPlayerPronouns">>
+ <<set _playerSlaveLisp = SlaveStatsChecker.checkForLisp($args[0])>>
+
+ <<set _hePLisp = _heP.replace(/sh/g, "th")>>
+ <<set _hisPLisp = _hisP.replace(/s/g, "th")>>
+
+ <<set _HePLisp = _HeP.replace(/Sh/g, "Th")>>
+ <<set _HisPLisp = _HisP.replace(/s/g, "th")>>
+<</widget>>
+
<<widget "AgeImplantAdjustment">>
<<if $args[0].visualAge > 80>>
<<set $args[0].visualAge -= 40>>
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index fb707fe1bb1..e762579ad46 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -70,6 +70,7 @@
<<setLocalPronouns $activeSlave>>
<<setLocalPronouns $subSlave 2>>
<<run Enunciate($activeSlave)>>
+<<setSpokenLocalPronouns $activeSlave $subSlave>>
<<switch $PETSevent>>
@@ -348,7 +349,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
<<link "Meet with the Attendant later to see if the slave $he's helping can be assisted further">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You meet $activeSlave.slaveName after $subSlave.slaveName leaves. $He likes to take a cool shower after spending time in the steam, so you get under the refreshing water with $him, encircling $his <<if ($activeSlave.weight > 10)>>plush<<else>>taut<</if>> midriff with your arms and giving $him a hug before asking $him about $subSlave.slaveName. In $activeSlave.slaveName's opinion, there's nothing really wrong with _him2: _he2's just having a little trouble accepting different expectations about human interactions. "_He2 ju<<s>>t need<<s>> a little help a<<cc>>epting that _he2'<<s>> a <<s>>lave and it'<<s>> _his2 place to serve you, <<Master>>," $he says. "Like I have!" $He wriggles around in your arms and plants a wet kiss on your nose. $He's clean now, so you release $him and $he steps over to $his towel. As $he does, you land a wet slap on $his <<if ($activeSlave.butt > 5)>>massive<<elseif ($activeSlave.butt > 3)>>big<<else>>nice<</if>> butt, eliciting a @@.hotpink;delighted@@ squeal. You use the information to @@.hotpink;subtly address@@ $subSlave.slaveName's unhappiness.
+ You meet $activeSlave.slaveName after $subSlave.slaveName leaves. $He likes to take a cool shower after spending time in the steam, so you get under the refreshing water with $him, encircling $his <<if ($activeSlave.weight > 10)>>plush<<else>>taut<</if>> midriff with your arms and giving $him a hug before asking $him about $subSlave.slaveName. In $activeSlave.slaveName's opinion, there's nothing really wrong with _him2: _he2's just having a little trouble accepting different expectations about human interactions. "<<He 2>> ju<<s>>t need<<s>> a little help a<<cc>>epting that <<he 2>>'<<s>> a <<s>>lave and it'<<s>> <<his 2>> place to serve you, <<Master>>," $he says. "Like I have!" $He wriggles around in your arms and plants a wet kiss on your nose. $He's clean now, so you release $him and $he steps over to $his towel. As $he does, you land a wet slap on $his <<if ($activeSlave.butt > 5)>>massive<<elseif ($activeSlave.butt > 3)>>big<<else>>nice<</if>> butt, eliciting a @@.hotpink;delighted@@ squeal. You use the information to @@.hotpink;subtly address@@ $subSlave.slaveName's unhappiness.
<<set $activeSlave.devotion += 4>>
<<set $subSlave.devotion += 4>>
<<set $slaves[$slaveIndices[$subSlave.ID]] = $subSlave>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 098fed116d7..f2ead8e1158 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -148,7 +148,7 @@ Finishing your work, you lean back for a break well deserved break. Your peace i
<<else>>
where _he2 settles _his2 weight on the struggling rebel, lacking any better idea of what to do.
<</if>>
- I'm <<s>>orry, <<Master>>, <<he>> tried to knock me out on <<his>> way here. But a<<s>> <<s>>oon as I got up, I came running. I promi<<s>>e I <<s>>aw nothing, but what <<sh>>ould we do about $him?
+ I'm <<s>>orry, <<Master>>, <<he>> tried to knock me out on <<his>> way here. But a<<s>> <<s>>oon as I got up, I came running. I promi<<s>>e I <<s>>aw nothing, but what <<sh>>ould we do about <<him>>?
<<set $mutinery = 0>>
<<else>>
You try to fight $him off, but $his grip is stronger than you expected, so you will just have to bear with it, at least until an opening arises. If this gets out of the penthouse, your reputation as both arcology owner and as a slaver will be devastated.
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index d6f0499eafb..135d6a0b2fb 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -618,12 +618,9 @@ $activeSlave.slaveName chuckles into $subSlave.slaveName's ear, crooning,
<<else>>
"You <<s>>tupid <<s>>lut. Too bad you never went to <<s>>chool, maybe you could have learned <<s>>omething and not ended up a<<s>> a fuck <<s>>lave."
<</if>>
-<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
- <<set _heP = lispReplace($PC.pronoun), _HeP = lispReplace(capFirstChar(_heP)), _hisP = lispReplace($PC.possessive)>>
-<<else>>
- <<set _heP = $PC.pronoun, _HeP = capFirstChar(_heP), _hisP = $PC.possessive>>
-<</if>>
-$He grinds against the wilting $subSlave.slaveName, and then continues, "I felt your <<if ($activeSlave.butt > 4)>>fat butt<<elseif ($activeSlave.butt > 2)>>big butt<<else>>tiny little butt<</if>> clench ju<<s>>t now." $He gives $subSlave.slaveName's <<if ($subSlave.balls > 0 && $subSlave.scrotum > 0)>>balls a gentle squeeze<<elseif ($subSlave.dick > 0)>>dick a gentle tug<<elseif $subSlave.vagina == -1>>butthole a gentle massage<<else>>pussylips a gentle massage<</if>>. "_HeP ha<<s>>n't fucked you back there yet, ha<<s>> _heP? It'<<s>> going to hurt, you little bitch. _HeP'<<s>> going to hold you down and <<sh>>ove _hisP <<if $PC.dick == 1>>huge cockhead<<else>>bigge<<s>>t <<s>>trap-on<</if>> right up again<<s>>t thi<<s>> tight little hole." $He gropes the quivering slave's virgin anus, careful not to penetrate it. "You're going to do your be<<s>>t to relax like a good little _girl2. But it'<<s>> going to be so big. It'<<s>> going to burn. And then you're going to panic, and <<s>>truggle, and _heP'<<s>> going to hold you down and rape your butt while you <<s>>cream and cry."
+<<setPlayerPronouns>>
+<<setSpokenPlayerPronouns $activeSlave>>
+$He grinds against the wilting $subSlave.slaveName, and then continues, "I felt your <<if ($subSlave.butt > 4)>>fat butt<<elseif ($subSlave.butt > 2)>>big butt<<else>>tiny little butt<</if>> clench ju<<s>>t now." $He gives $subSlave.slaveName's <<if ($subSlave.balls > 0 && $subSlave.scrotum > 0)>>balls a gentle squeeze<<elseif ($subSlave.dick > 0)>>dick a gentle tug<<elseif $subSlave.vagina == -1>>butthole a gentle massage<<else>>pussylips a gentle massage<</if>>. "<<HeP>> ha<<s>>n't fucked you back there yet, ha<<s>> <<heP>>? It'<<s>> going to hurt, you little bitch. <<HeP>>'<<s>> going to hold you down and <<sh>>ove <<hisP>> <<if $PC.dick == 1>>huge cockhead<<else>>bigge<<s>>t <<s>>trap-on<</if>> right up again<<s>>t thi<<s>> tight little hole." $He gropes the quivering slave's virgin anus, careful not to penetrate it. "You're going to do your be<<s>>t to relax like a good little _girl2. But it'<<s>> going to be so big. It'<<s>> going to burn. And then you're going to panic, and <<s>>truggle, and <<heP>>'<<s>> going to hold you down and rape your butt while you <<s>>cream and cry."
<br><br>
$subSlave.slaveName keeps _his2 eyes clamped shut and _his2 hands down at _his2 sides, balled into fists, but _his2 self-control finally cracks and _he2 lets out a great gasping sob before bursting into tears.
diff --git a/src/uncategorized/hgSelect.tw b/src/uncategorized/hgSelect.tw
index d922f30885a..168ed9c184c 100644
--- a/src/uncategorized/hgSelect.tw
+++ b/src/uncategorized/hgSelect.tw
@@ -80,7 +80,7 @@ _HGName
[["Rescind " + $his + " impregnation responsibility"|HG Select][$universalRulesImpregnation = "none"]] | [[See to it yourself|HG Select][$universalRulesImpregnation = "PC"]]
<<else>>
<<if canPenetrate($HeadGirl) && $HeadGirl.pubertyXY == 1>>
- <br><br>_HGName is capable of impregnating slaves, but it's not part of $his responsibilities. [["Assign " + $his + " to impregnate"|HG Select][$universalRulesImpregnation = "HG"]]
+ <br><br>_HGName is capable of impregnating slaves, but it's not part of $his responsibilities. [["Assign " + $him + " to impregnate"|HG Select][$universalRulesImpregnation = "HG"]]
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/peConcubineInterview.tw b/src/uncategorized/peConcubineInterview.tw
index d61f4efaffb..dde4361337a 100644
--- a/src/uncategorized/peConcubineInterview.tw
+++ b/src/uncategorized/peConcubineInterview.tw
@@ -10,6 +10,7 @@
<<set _lisps = 0>>
<</if>>
<<setPlayerPronouns>>
+<<setSpokenPlayerPronouns $activeSlave>>
You receive an official communication from a popular talk show e-hosted in one of the old world's still-thriving first world countries. Your fame has become known even in the old world, and they'd like to interview <<EventNameLink $activeSlave>> about you. They frankly warn you that you'll have no right to review the interview and no ability to control what she says, and that they'll be asking about anything the interviewer thinks is juicy. This could be great for your reputation, but it could be hazardous, too.
@@ -75,7 +76,7 @@ You receive an official communication from a popular talk show e-hosted in one o
<br>
The host asks her some soft, nonjudgmental questions about her life and how she became your slave. Then he hits her: "So, $activeSlave.slaveName. Tell us about <<= PlayerName()>>."
<<if $activeSlave.devotion > 95>>
- @@.green;Without a moment's hesitation,@@ $he <<if _lisps>>lisps<<else>>proclaims<</if>>, "I love _himP. _HeP'<<s>> so <<if $PC.title != 0>>hand<<s>>ome<<else>>pretty<</if>>, and," $he manages to blush prettily, "_heP'<<s>> <<s>>o good to me."
+ @@.green;Without a moment's hesitation,@@ $he <<if _lisps>>lisps<<else>>proclaims<</if>>, "I love _himP. <<HeP>>'<<s>> so <<if $PC.title != 0>>hand<<s>>ome<<else>>pretty<</if>>, and," $he manages to blush prettily, "<<heP>>'<<s>> <<s>>o good to me."
<<set $rep += 100>>
<<elseif $activeSlave.devotion <= 60>>
$He struggles for an instant and then says @@.red;unconvincingly@@ that $he loves you.
@@ -398,7 +399,7 @@ You receive an official communication from a popular talk show e-hosted in one o
<<if $PC.dick == 0>>
We ju<<s>>t pay the right amount of attention to the <<s>>u<<cc>>e<<ss>> and the power." $He quirks a corner of her mouth. "I know //I// do."
<<else>>
- $He quirks a corner of her mouth. "And _heP ha<<s>> a //wonderful// cock."
+ $He quirks a corner of her mouth. "And <<heP>> ha<<s>> a //wonderful// cock."
<</if>>
<<set $rep += 100>>
<</if>>
diff --git a/src/uncategorized/reMilfTourist.tw b/src/uncategorized/reMilfTourist.tw
index 86ac68c65c7..44531ceeb04 100644
--- a/src/uncategorized/reMilfTourist.tw
+++ b/src/uncategorized/reMilfTourist.tw
@@ -86,7 +86,8 @@
<span id="result">
<<link "Decline politely">>
<<replace "#result">>
- You have $assistantName instruct _milfSlave.slaveName to pass on your regrets, and add a message for _milfSlave.slaveName expressing confidence in $him to represent you and the arcology perfectly well without you. $He's @@.mediumaquamarine;affirmed@@ by your trust in $him. "<<Master>>," $he reports the next time you see $him, "that touri<<s>>t wa<<s>> really nice. Al<<s>>o, I got _him2 to have <<s>>e<<x>> with me, after all. _He2 was all he<<s>>itant and blu<<sh>>y about doing it in public, but _he2 got better after the fir<<s>>t time I ate _him2 out." $He looks pleased with $himself. "I bet _he2 @@.green;tell<<s>> all _his2 friend<<s>>@@ back home how much fun it i<<s>> here."
+ <<setSpokenLocalPronouns _milfSlave $activeSlave>>
+ You have $assistantName instruct _milfSlave.slaveName to pass on your regrets, and add a message for _milfSlave.slaveName expressing confidence in $him to represent you and the arcology perfectly well without you. $He's @@.mediumaquamarine;affirmed@@ by your trust in $him. "<<Master>>," $he reports the next time you see $him, "that touri<<s>>t wa<<s>> really nice. Al<<s>>o, I got _him2 to have <<s>>e<<x>> with me, after all. <<He 2>> was all he<<s>>itant and blu<<sh>>y about doing it in public, but <<he 2>> got better after the fir<<s>>t time I ate _him2 out." $He looks pleased with $himself. "I bet <<he 2>> @@.green;tell<<s>> all <<his 2>> friend<<s>>@@ back home how much fun it i<<s>> here."
<<set $rep += 100>>
<<set $slaves[_milfed].trust += 4, $slaves[_milfed].oralCount++>>
<<set $oralTotal++>>
@@ -112,6 +113,7 @@
<</link>>
<br><<link "Encourage _him2 to enjoy the slave with your compliments">>
<<replace "#result">>
+ <<setSpokenLocalPronouns _milfSlave $activeSlave>>
You have _milfSlave.slaveName bring the tourist up to meet you, and exchange some minor pleasantries. You tell _him2 that if _he2 really wants to experience Free Cities life, though, _he2 really should enjoy _milfSlave.slaveName, pointing at the slave hovering behind _him2. _He2 blushes furiously, but before _he2 can stammer a refusal, the slave whispers something into _his2 ear. "I'm, um, not really a lesbian," the tourist responds hesitantly.
<<if _milfSlave.dick > 0>>
"You don't have to be," _milfSlave.slaveName purrs. "I have a cock." $He slides in, just close enough to prove it. "Plea<<s>>e,
@@ -120,7 +122,7 @@
<</if>>
give me a try." The tourist turns to stare at $him, and _he2 offers just the right kind of plaintive expression. "O-okay," the tourist says in a tiny voice, and _milfSlave.slaveName giggles, hugging _him2 from behind. $He takes the tourist's hand, and they leave your office together.
<br><br>
- "<<Master>>," $he reports the next time you see $him, "that touri<<s>>t was really nice. Al<<s>>o, I got _him2 to have <<s>>e<<x>> with me, after all. _He2 was going to take me back to _his2 hotel but I got _him2 to do me on the way. _He2 wa<<s>> all he<<s>>itant and blu<<sh>>y about doing it in public, but _he2 got better after the fir<<s>>t time I ate _him2 out." $He looks pleased with $himself. "I bet _he2 @@.green;tell<<s>> all _his2 friend<<s>>@@ back home how much fun it i<<s>> here."
+ "<<Master>>," $he reports the next time you see $him, "that touri<<s>>t was really nice. Al<<s>>o, I got _him2 to have <<s>>e<<x>> with me, after all. <<He 2>> was going to take me back to <<his 2>> hotel but I got _him2 to do me on the way. <<He 2>> wa<<s>> all he<<s>>itant and blu<<sh>>y about doing it in public, but <<he 2>> got better after the fir<<s>>t time I ate _him2 out." $He looks pleased with $himself. "I bet <<he 2>> @@.green;tell<<s>> all <<his 2>> friend<<s>>@@ back home how much fun it i<<s>> here."
<<set $slaves[_milfed].trust += 4, $slaves[_milfed].oralCount++>>
<<set $oralTotal++>>
<<set $rep += 100>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index e378dd28e7d..201c26befa0 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -504,6 +504,7 @@
<<set $activeSlave.ID = $newRelativeRecruitID++>>
<<setLocalPronouns $activeSlave 2>>
+<<setSpokenLocalPronouns $eventSlave $activeSlave>>
$eventSlave.slaveName requests an interview with you. $He's a devoted slave, and you grant it, and are happy you did when you see the troubled expression on $his face. $He explains<<if !canTalk($eventSlave)>> with desperate gestures<</if>> that
<<switch _relationType>>
@@ -528,7 +529,7 @@
<</switch>>
<<if !canTalk($eventSlave)>>$He urgently gestures for permission to write. It's unusual, but $he seems quite serious, so you grant it. $He writes,<</if>>
-"You've been <<s>>o good to me, <<Master>>. I'm <<s>>ure _he2 look<<s>> like I did when you bought me. Plea<<s>>e, <<Master>>, will you buy _him2 like you bought me? I'm afraid _he2'll go to a cruel Ma<<s>>ter." $He bites $his lip. "And, <<Master>>, I'm <<s>>ure _he2'd learn to love
+"You've been <<s>>o good to me, <<Master>>. I'm <<s>>ure <<he 2>> look<<s>> like I did when you bought me. Plea<<s>>e, <<Master>>, will you buy _him2 like you bought me? I'm afraid <<he 2>>'ll go to a cruel Ma<<s>>ter." $He bites $his lip. "And, <<Master>>, I'm <<s>>ure <<he 2>>'d learn to love
<<if $eventSlave.fetish == "cumslut">>
the ta<<s>>te of your cum
<<elseif $eventSlave.fetish == "submissive">>
@@ -536,7 +537,7 @@
<<elseif $eventSlave.fetish == "humiliation">>
being treated like a dirty <<s>>lut
<<elseif $eventSlave.fetish == "buttslut">>
- the feeling of your cock in _his2 butt
+ the feeling of your cock in <<his 2>> butt
<<elseif $eventSlave.fetish == "sadist">>
hurting your other <<s>>lave<<s>>
<<elseif $eventSlave.fetish == "pregnancy" && _relationType != "father" && _relationType != "son" && _relationType != "older brother" && _relationType != "younger brother">>
@@ -554,7 +555,7 @@
<<elseif $eventSlave.bellyPreg >= 50 && $eventSlave.pregKnown == 1 && _relationType != "father" && _relationType != "son" && _relationType != "older brother" && _relationType != "younger brother">>
<<s>>welling with life
<<elseif $eventSlave.anus > 2>>
- getting _his2 butt <<s>>tretched out
+ getting <<his 2>> butt <<s>>tretched out
<<elseif $eventSlave.boobsImplant > 20>>
getting turned into a bimbo <<s>>lut
<<else>>
@@ -572,13 +573,13 @@ a<<s>> much a<<s>> I do.
<<elseif $eventSlave.fetish == "pregnancy" && _relationType != "father" && _relationType != "son" && _relationType != "older brother" && _relationType != "younger brother">>
You could knock u<<s>> up next to each other, <<Master>>!"
<<elseif $eventSlave.fetish == "sadist">>
- I'm <<s>>ure _he2'd love to help me, <<Master>>!"
+ I'm <<s>>ure <<he 2>>'d love to help me, <<Master>>!"
<<elseif $eventSlave.fetish == "masochist">>
You could whip u<<s>> both, <<Master>>!"
<<elseif $eventSlave.fetish == "dom">>
- I'm <<s>>ure _he2'd love to help me u<<s>>e other <<s>>lave<<s>>, <<Master>>!"
+ I'm <<s>>ure <<he 2>>'d love to help me u<<s>>e other <<s>>lave<<s>>, <<Master>>!"
<<elseif $eventSlave.energy > 95>>
- I'm <<s>>ure _he2'd love to have three<<s>>ome<<s>>, <<Master>>!"
+ I'm <<s>>ure <<he 2>>'d love to have three<<s>>ome<<s>>, <<Master>>!"
<<elseif $eventSlave.birthsTotal > 3 && _relationType != "father" && _relationType != "son" && _relationType != "older brother" && _relationType != "younger brother">>
<<if $PC.dick == 1>>
We could compete over who carried more of your children, <<Master>>!
@@ -1045,6 +1046,9 @@ You look up the _relationType. _He2 costs <<print cashFormat($slaveCost)>>, a ba
<<set $activeSlave.relationTarget = $eventSlave.ID>>
<<set $activeSlave.recruiter = 0>>
+<<setLocalPronouns $activeSlave 2>>
+<<setSpokenLocalPronouns $eventSlave $activeSlave>>
+
$eventSlave.slaveName requests an interview with you. $He's a devoted slave, and you grant it, and are happy you did when you see the troubled expression on $his face. $He explains<<if !canTalk($eventSlave)>> with desperate gestures<</if>> that
<<switch $eventSlave.recruiter>>
<<case "mother">>
@@ -1060,7 +1064,7 @@ $eventSlave.slaveName requests an interview with you. $He's a devoted slave, and
<</switch>>
<br><br>
<<if !canTalk($eventSlave)>>$He urgently gestures for permission to write. It's unusual, but $he seems quite serious, so you grant it. $He writes,<</if>>
-"You've been <<s>>o good to me, <<Master>>. I'm <<s>>ure _he2 look<<s>> like I did when you bought me. Plea<<s>>e, <<Master>>, will you buy _him2 like you bought me? I'm afraid _he2'll go to a cruel <<Master>>." $He bites $his lip. "And, <<Master>>, I'm <<s>>ure _he2'd learn to love
+"You've been <<s>>o good to me, <<Master>>. I'm <<s>>ure <<he 2>> look<<s>> like I did when you bought me. Plea<<s>>e, <<Master>>, will you buy _him2 like you bought me? I'm afraid <<he 2>>'ll go to a cruel <<Master>>." $He bites $his lip. "And, <<Master>>, I'm <<s>>ure <<he 2>>'d learn to love
<<if $eventSlave.fetish == "cumslut">>
the ta<<s>>te of your cum
<<elseif $eventSlave.fetish == "submissive">>
@@ -1068,7 +1072,7 @@ $eventSlave.slaveName requests an interview with you. $He's a devoted slave, and
<<elseif $eventSlave.fetish == "humiliation">>
being treated like a dirty <<s>>lut
<<elseif $eventSlave.fetish == "buttslut">>
- the feeling of your cock in _his2 butt
+ the feeling of your cock in <<his 2>> butt
<<elseif $eventSlave.fetish == "sadist">>
hurting your other <<s>>laves
<<elseif $eventSlave.fetish == "pregnancy">>
@@ -1086,7 +1090,7 @@ $eventSlave.slaveName requests an interview with you. $He's a devoted slave, and
<<elseif $eventSlave.bellyPreg >= 50 && $eventSlave.pregKnown == 1>>
<<s>>welling with life
<<elseif $eventSlave.anus > 2>>
- getting _his2 butt <<s>>tretched out
+ getting <<his 2>> butt <<s>>tretched out
<<elseif $eventSlave.boobsImplant > 20>>
getting turned into a bimbo <<s>>lut
<<else>>
@@ -1104,13 +1108,13 @@ a<<s>> much a<<s>> I do.
<<elseif $eventSlave.fetish == "pregnancy">>
You could knock u<<s>> up next to each other, <<Master>>!"
<<elseif $eventSlave.fetish == "sadist">>
- I'm <<s>>ure _he2'd love to help me, <<Master>>!"
+ I'm <<s>>ure <<he 2>>'d love to help me, <<Master>>!"
<<elseif $eventSlave.fetish == "masochist">>
You could whip u<<s>> both, <<Master>>!"
<<elseif $eventSlave.fetish == "dom">>
- I'm <<s>>ure _he2'd love to help me u<<s>>e other <<s>>lave<<s>>, <<Master>>!"
+ I'm <<s>>ure <<he 2>>'d love to help me u<<s>>e other <<s>>lave<<s>>, <<Master>>!"
<<elseif $eventSlave.energy > 95>>
- I'm <<s>>ure _he2'd love to have three<<s>>ome<<s>>, <<Master>>!"
+ I'm <<s>>ure <<he 2>>'d love to have three<<s>>ome<<s>>, <<Master>>!"
<<elseif $eventSlave.births > 3>>
<<if $PC.dick == 1>>
We could compete over who carried more of your children, <<Master>>!
diff --git a/src/uncategorized/rename.tw b/src/uncategorized/rename.tw
index 0582ca7640f..59f3c224d66 100644
--- a/src/uncategorized/rename.tw
+++ b/src/uncategorized/rename.tw
@@ -20,7 +20,7 @@
<<elseif $activeSlave.devotion >= -50>>
happily accepts $his original name.
<<elseif $activeSlave.trust > 20>>
- scoffs at the notion that $he was ever anything other than <<= SlaveFullName($activeSlave)>>, @@.orangered;weakening your control over $him.@@
+ scoffs at the notion that $he was ever anything other than <<= SlaveFullBirthName($activeSlave)>>, @@.orangered;weakening your control over $him.@@
<<set $activeSlave.trust += 5>>
<<else>>
cautiously accepts the return of $his name.
@@ -36,7 +36,7 @@
<<elseif $activeSlave.devotion >= -50>>
reluctantly accepts $his new name.
<<else>>
- angrily tries to resist $his new name, insisting that $his name is <<= SlaveFullName($activeSlave)>>. This resistance @@.mediumorchid; increases $his rebelliousness.@@
+ angrily tries to resist $his new name, insisting that $his name is <<= SlaveFullBirthName($activeSlave)>>. This resistance @@.mediumorchid; increases $his rebelliousness.@@
<<set $activeSlave.devotion -= 5>>
<</if>>
<<else>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 9aa8c4f78b1..a6bd23cf0ad 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -704,6 +704,11 @@
<<widget "Hers">><<if ndef $args[0]>><<if _secondarySlaveLisp>>_HersLisp<<else>>$Hers<</if>><<else>><<if _primarySlaveLisp>>_Hers2Lisp<<else>>_Hers2<</if>><</if>><</widget>>
<<widget "Himself">><<if ndef $args[0]>><<if _secondarySlaveLisp>>_HimselfLisp<<else>>$Himself<</if>><<else>><<if _primarySlaveLisp>>_Himself2Lisp<<else>>_Himself2<</if>><</if>><</widget>>
+<<widget "heP">><<if _playerSlaveLisp>>_hePLisp<<else>>_heP<</if>><</widget>>
+<<widget "hisP">><<if _playerSlaveLisp>>_hisPLisp<<else>>_hisP<</if>><</widget>>
+<<widget "HeP">><<if _playerSlaveLisp>>_HePLisp<<else>>_HeP<</if>><</widget>>
+<<widget "HisP">><<if _playerSlaveLisp>>_HisPLisp<<else>>_HisP<</if>><</widget>>
+
/%
Call as <<EventFetish>>
$args[0]: Slave.
--
GitLab