From fff1b49c6d9a467e252d9958b58a31fb3c4283b0 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 4 Aug 2020 18:46:23 -0500
Subject: [PATCH] HostagePronouns

---
 src/uncategorized/pHostageAcquisition.tw | 11 ++++---
 src/uncategorized/pRivalryActions.tw     | 40 ++++++++++++------------
 src/uncategorized/pRivalryHostage.tw     |  7 +++--
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/uncategorized/pHostageAcquisition.tw b/src/uncategorized/pHostageAcquisition.tw
index 372dafdcfd9..fd794612e3e 100644
--- a/src/uncategorized/pHostageAcquisition.tw
+++ b/src/uncategorized/pHostageAcquisition.tw
@@ -8,6 +8,7 @@
 <<set $activeSlave.weekAcquired = $week>>
 <<run Enunciate($activeSlave)>>
 <<setLocalPronouns $activeSlave>>
+<<setNonlocalPronouns $seeDicks>>
 
 <<if $hostageWife != 0>>
 	<<setLocalPronouns $hostageWife 2>>
@@ -302,7 +303,7 @@ Your hired mercenaries are en route now with your precious cargo.
 <<case "Youth Preferentialism">>
 	<<run setHealth($activeSlave, 60, $activeSlave.health.shortDamage, $activeSlave.health.longDamage)>>
 	<<if $rivalryDuration <= 5>>
-		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "Thi<<s>> old woman tried to make me her pet!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
+		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "Thi<<s>> old _woman2 tried to make me <<his 2>> pet!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They made me make out with an old lady!" $He's exactly as you remember.
 	<<elseif $rivalryDuration <= 15>>
@@ -313,13 +314,13 @@ Your hired mercenaries are en route now with your precious cargo.
 	<<else>>
 		<<run setHealth($activeSlave, 80, $activeSlave.health.shortDamage, $activeSlave.health.longDamage)>>
 		Your mercenaries radio you upon arrival. "This one's got quite some spunk in $him, you better ready yourself. We're coming in now."
-		Upon seeing you, $activeSlave.slaveName's eyes fill with a distinct hatred. As you step forward, $he stands $his ground. After several steps, $he shouts "How fucking DARE you <<s>>plit me up from my MILFy <<wife 2>>! I <<s>>aw your arcology on the way in, and it'<<s>> <<S>>ICK. <<S>>o many young girl<<s>>, you're <<s>>ick, you hear me!? <<S>>I-"
+		Upon seeing you, $activeSlave.slaveName's eyes fill with a distinct hatred. As you step forward, $he stands $his ground. After several steps, $he shouts "How fucking DARE you <<s>>plit me up from my MILFy <<wife 2>>! I <<s>>aw your arcology on the way in, and it'<<s>> <<S>>ICK. <<S>>o many young _girlU<<s>>, you're <<s>>ick, you hear me!? <<S>>I-"
 		The mercenary captain quickly gags $him, "My apologies, I did warn you $he was a handful. Please be careful when you unbind $him, $he may try to do something stupid," he says as he and his group exit your penthouse, leaving you with the enraged $activeSlave.slaveName. $He looks the same as you remember, but $he acts nothing like the $girl you used to know. Odds are high that $he'll cause problems for you in the future, given $his hatred for young people.
 	<</if>>
 <<case "Maturity Preferentialism">>
 	<<run setHealth($activeSlave, 60, $activeSlave.health.shortDamage, $activeSlave.health.longDamage)>>
 	<<if $rivalryDuration <= 5>>
-		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "Thi<<s>> young girl kept mole<<s>>ting me!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
+		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "Thi<<s>> young _girl2 kept mole<<s>>ting me!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They made me make out with <<s>>ome young harlot!" $He's exactly as you remember.
 	<<elseif $rivalryDuration <= 15>>
@@ -504,7 +505,7 @@ Your hired mercenaries are en route now with your precious cargo.
 <<case "Petite Admiration">>
 	<<run setHealth($activeSlave, 60, $activeSlave.health.shortDamage, $activeSlave.health.longDamage)>>
 	<<if $rivalryDuration <= 5>>
-		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "Thi<<s>> giant woman tried to make me her pet!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
+		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "Thi<<s>> giant _woman2 tried to make me <<his 2>> pet!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They made me make out with a giant!" $He's exactly as you remember.
 	<<elseif $rivalryDuration <= 15>>
@@ -544,7 +545,7 @@ Your hired mercenaries are en route now with your precious cargo.
 	<<else>>
 		<<set $activeSlave.trust = 80>>
 		Your mercenaries radio you upon arrival. "This one's got quite some spunk in $him, you better ready yourself. We're coming in now."
-		Upon seeing you, $activeSlave.slaveName's eyes fill with a distinct hatred. As you step forward, $he stands $his ground. After several steps, $he shouts "How fucking DARE you <<s>>plit me up from my tiny <<wife 2>>! There wa<<s>> more love in her tiny body than in your entire arcology! To think that you fuck<<s>> pla<<c>>e everything on hei-"
+		Upon seeing you, $activeSlave.slaveName's eyes fill with a distinct hatred. As you step forward, $he stands $his ground. After several steps, $he shouts "How fucking DARE you <<s>>plit me up from my tiny <<wife 2>>! There wa<<s>> more love in <<his 2>> tiny body than in your entire arcology! To think that you fuck<<s>> pla<<c>>e everything on hei-"
 		The mercenary captain quickly gags $him, "My apologies, I did warn you $he was a handful. Please be careful when you unbind $him, $he may try to do something stupid," he says as he and his group exit your penthouse, leaving you with the enraged $activeSlave.slaveName. $He looks the same as you remember, but $he acts nothing like the $girl you used to know. Odds are high that $he'll cause problems for you in the future, given $his hatred for tall people.
 	<</if>>
 <<default>>
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index 1a8334f6f7d..964d3e7d553 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -1522,7 +1522,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 		<<set $hostage.boobs = 50000>>
 		<<set $hostage.boobsImplant = 45000>>
 		<<set $hostage.boobsImplantType = "hyper fillable">>
-		giving an interview. $He gushes over how great it feels being more silicone than $girl and how terrible it is that some people want to deny girls this pleasure.
+		giving an interview. $He gushes over how great it feels being more silicone than $girl and how terrible it is that some people want to deny <<= $girl>>s this pleasure.
 	<<case "Transformation Fetishism">>
 		<<set $hostage.counter.vaginal += 1>>
 		giving an interview. $He gushes over how great it feels being implant free and how terrible some people are to force inhumane implants into their slaves.
@@ -1540,14 +1540,14 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 		<<set $hostage.boobs = 50000>>
 		<<set $hostage.weight = 100>>
 		<<set $hostage.butt = 9>>
-		giving an interview. $He gushes over how great it feels being more breast than $girl and how terrible it is that some people want to keep girls anorexic toothpicks.
+		giving an interview. $He gushes over how great it feels being more breast than $girl and how terrible it is that some people want to keep <<= $girl>>s anorexic toothpicks.
 	<<case "Asset Expansionism">>
 		<<set $hostage.counter.vaginal += 1>>
-		giving an interview. $He gushes over how great it feels being more thin and fit and how terrible it is that some people want to keep girls nothing more than bloated cows.
+		giving an interview. $He gushes over how great it feels being more thin and fit and how terrible it is that some people want to keep <<= $girl>>s nothing more than bloated cows.
 	<<case "Pastoralism">>
 		<<set $hostage.muscles = 100>>
 		<<set $hostage.counter.vaginal += 1>>
-		giving an interview. $He gushes over how great it feels being a chiseled goddess and how terrible it is that some people want to keep girls as obese<<if $seePreg != 0>>, pregnant,<</if>> milky cows.
+		giving an interview. $He gushes over how great it feels being a chiseled goddess and how terrible it is that some people want to keep <<= $girl>>s as obese<<if $seePreg != 0>>, pregnant,<</if>> milky cows.
 	<<case "Cummunism">>
 		<<set $hostage.boobs = 24300>>
 		<<set $hostage.weight = 100>>
@@ -1604,7 +1604,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 	<<case "Hedonistic Decadence">>
 		<<set $hostage.muscles = 100>>
 		<<set $hostage.counter.vaginal += 1>>
-		giving an interview. $He gushes over how great it feels being a chiseled goddess and how terrible it is that some people want to keep girls obese, slovenly wastes of flesh.
+		giving an interview. $He gushes over how great it feels being a chiseled goddess and how terrible it is that some people want to keep <<= $girl>>s obese, slovenly wastes of flesh.
 	<<case "Chattel Religionism">>
 		<<set $hostage.counter.vaginal += 1>>
 		giving an interview. $He gushes over how great it is to experience all manners of class and culture, both physically and spiritually.
@@ -1718,9 +1718,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 			<<set $hostage.counter.oral += 10>>
 			<<set $hostage.counter.vaginal += 10>>
 			<<set $hostage.counter.anal += 10>>
-			<<set _hostageAction.push("struggling to escape the grasp of a pair of $arcologies[0].FSSubjugationistRace girls.")>>
-			<<set _hostageAction.push("struggling to avoid giving an $arcologies[0].FSSubjugationistRace girl oral.")>>
-			<<set _hostageAction.push("screaming as $he gets fucked by an $arcologies[0].FSSubjugationistRace girl.")>>
+			<<set _hostageAction.push("struggling to escape the grasp of a pair of $arcologies[0].FSSubjugationistRace <<= _girlU>>s.")>>
+			<<set _hostageAction.push("struggling to avoid giving an $arcologies[0].FSSubjugationistRace _girlU oral.")>>
+			<<set _hostageAction.push("screaming as $he gets fucked by an $arcologies[0].FSSubjugationistRace _girlU.")>>
 		<<elseif $rivalryDuration <= 10>>
 			<<set $hostage.trust -= 5>>
 			<<set $hostage.devotion -= 5>>
@@ -1728,9 +1728,9 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 			<<set $hostage.counter.oral += 10>>
 			<<set $hostage.counter.vaginal += 10>>
 			<<set $hostage.counter.anal += 10>>
-			<<set _hostageAction.push("crying gently while a pair of $arcologies[0].FSSubjugationistRace girls fondle $him.")>>
-			<<set _hostageAction.push("reluctantly giving an $arcologies[0].FSSubjugationistRace girl oral.")>>
-			<<set _hostageAction.push("crying as $he gets fucked by an $arcologies[0].FSSubjugationistRace girl.")>>
+			<<set _hostageAction.push("crying gently while a pair of $arcologies[0].FSSubjugationistRace <<= _girlU>>s fondle $him.")>>
+			<<set _hostageAction.push("reluctantly giving an $arcologies[0].FSSubjugationistRace _girlU oral.")>>
+			<<set _hostageAction.push("crying as $he gets fucked by an $arcologies[0].FSSubjugationistRace _girlU.")>>
 		<<elseif $rivalryDuration <= 15>>
 			<<set $hostage.trust -= 5>>
 			<<set $hostage.devotion -= 5>>
@@ -1738,25 +1738,25 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 			<<set $hostage.counter.oral += 20>>
 			<<set $hostage.counter.vaginal += 20>>
 			<<set $hostage.counter.anal += 20>>
-			<<set _hostageAction.push("fooling around with a pair of $arcologies[0].FSSubjugationistRace girls.")>>
-			<<set _hostageAction.push("giving an $arcologies[0].FSSubjugationistRace girl oral.")>>
-			<<set _hostageAction.push("panting as $he gets fucked by an $arcologies[0].FSSubjugationistRace girl.")>>
+			<<set _hostageAction.push("fooling around with a pair of $arcologies[0].FSSubjugationistRace <<= _girlU>>s.")>>
+			<<set _hostageAction.push("giving an $arcologies[0].FSSubjugationistRace _girlU oral.")>>
+			<<set _hostageAction.push("panting as $he gets fucked by an $arcologies[0].FSSubjugationistRace _girlU.")>>
 		<<elseif $rivalryDuration <= 20>>
 			<<set $hostage.trust -= 5>>
 			<<set $hostage.devotion -= 5>>
 			<<set $hostage.counter.oral += 40>>
 			<<set $hostage.counter.vaginal += 40>>
 			<<set $hostage.counter.anal += 20>>
-			<<set _hostageAction.push("having a threesome with a pair of $arcologies[0].FSSubjugationistRace girls.")>>
-			<<set _hostageAction.push("eagerly giving an $arcologies[0].FSSubjugationistRace girl oral.")>>
-			<<set _hostageAction.push("moaning as $he gets fucked by an $arcologies[0].FSSubjugationistRace girl.")>>
+			<<set _hostageAction.push("having a threesome with a pair of $arcologies[0].FSSubjugationistRace <<= _girlU>>s.")>>
+			<<set _hostageAction.push("eagerly giving an $arcologies[0].FSSubjugationistRace _girlU oral.")>>
+			<<set _hostageAction.push("moaning as $he gets fucked by an $arcologies[0].FSSubjugationistRace _girlU.")>>
 		<<else>>
 			<<set $hostage.counter.oral += 50>>
 			<<set $hostage.counter.vaginal += 50>>
 			<<set $hostage.counter.anal += 50>>
-			<<set _hostageAction.push("making love to $his favorite two $arcologies[0].FSSubjugationistRace girls.")>>
-			<<set _hostageAction.push("enthusiastically giving an $arcologies[0].FSSubjugationistRace girl oral.")>>
-			<<set _hostageAction.push("enthusiastically wiggling $his rear as $he gets fucked by an $arcologies[0].FSSubjugationistRace girl.")>>
+			<<set _hostageAction.push("making love to $his favorite two $arcologies[0].FSSubjugationistRace <<= _girlU>>s.")>>
+			<<set _hostageAction.push("enthusiastically giving an $arcologies[0].FSSubjugationistRace _girlU oral.")>>
+			<<set _hostageAction.push("enthusiastically wiggling $his rear as $he gets fucked by an $arcologies[0].FSSubjugationistRace _girlU.")>>
 		<</if>>
 	<<case "Racial Supremacism">>
 		<<if $rivalryDuration <= 5>>
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index 174a092c4cd..f02aee2379f 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -249,6 +249,7 @@
 <<else>>
 	<<set _heR = "she">>
 <</if>>
+<<setNonlocalPronouns $seeDicks>>
 <<setLocalPronouns $activeSlave>>
 <<setPlayerPronouns>>
 
@@ -285,7 +286,7 @@ but you do remember $him, and your rival knows it. This is obviously the best _h
 "Hello, <<= PlayerName()>>," your rival sneers. "Sorry to pull you away from
 <<switch $rivalryFS>>
 <<case "Racial Subjugationism">>
-	whipping some poor $arcologies[0].FSSubjugationistRace girl's back bloody,
+	whipping some poor $arcologies[0].FSSubjugationistRace _girlU's back bloody,
 <<case "Racial Supremacism">>
 	blowing your $arcologies[0].FSSubjugationistRace girls, or whatever it is you do with your spare time,
 <<case "Gender Radicalism">>
@@ -299,11 +300,11 @@ but you do remember $him, and your rival knows it. This is obviously the best _h
 <<case "Paternalism">>
 	handholding time with your slaves,
 <<case "Degradationism">>
-	stitching your name into some poor girl's taint, or whatever it is you do with your spare time,
+	stitching your name into some poor _girlU's taint, or whatever it is you do with your spare time,
 <<case "Body Purism">>
 	playing house with your perfect pure little angels, or whatever it is you do with your spare time,
 <<case "Transformation Fetishism">>
-	stuffing silicone up some poor girl's nostrils,
+	stuffing silicone up some poor _girlU's nostrils,
 <<case "Youth Preferentialism">>
 	your horrible schoolgirl fantasy playtime,
 <<case "Maturity Preferentialism">>
-- 
GitLab