From 5c6d68be5294970f5b5531eced590ad152604c09 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sat, 13 Jul 2019 21:29:00 -0500
Subject: [PATCH] OtherPronounStuff
---
src/interaction/main/useGuard.js | 6 +++---
src/js/walkPastJS.js | 20 ++++++++++----------
src/uncategorized/PESS.tw | 2 +-
src/uncategorized/RESS.tw | 7 +++++--
src/uncategorized/RETS.tw | 2 +-
src/uncategorized/assistantEvents.tw | 4 ++--
src/uncategorized/officeDescription.tw | 2 +-
src/uncategorized/pHostageAcquisition.tw | 2 +-
src/uncategorized/pRivalryHostage.tw | 2 +-
src/uncategorized/resSale.tw | 2 +-
src/uncategorized/seRaidingAssault.tw | 2 +-
11 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/src/interaction/main/useGuard.js b/src/interaction/main/useGuard.js
index 86a563220e8..35c3f174191 100644
--- a/src/interaction/main/useGuard.js
+++ b/src/interaction/main/useGuard.js
@@ -5,7 +5,7 @@ App.Interact.UseGuard = function(slave) {
let r = ``;
/* eslint-disable no-unused-vars*/
const {
- he, him, his, hers, himself, boy,
+ he, him, his, hers, himself, boy, man,
He, His
} = getPronouns(slave);
/* eslint-enable */
@@ -186,13 +186,13 @@ App.Interact.UseGuard = function(slave) {
r += `${His} leotard and weapons make ${him} look like the heroine of an old exploitation film.`;
break;
case "a bunny outfit":
- r += `${His} bunny outfit and weapons make ${him} look like the henchwoman of a villain from a cheesy vintage spy film.`;
+ r += `${His} bunny outfit and weapons make ${him} look like the hench${man} of a villain from a cheesy vintage spy film.`;
break;
case "a slutty nurse outfit":
r += `Between ${his} nurse outfit and ${his} weapons ${he} looks prepared to do harm, and then to heal it.`;
break;
case "a schoolgirl outfit":
- r += `This schoolgirl is well armed, bringing to mind more than one farcical action film.`;
+ r += `This school${boy} is well armed, bringing to mind more than one farcical action film.`;
break;
case "a kimono":
r += `${His} kimono has discreet cuts that allow ${him} to fight reasonably well in it if necessary, and are almost invisible when ${he} stands straight.`;
diff --git a/src/js/walkPastJS.js b/src/js/walkPastJS.js
index 20366c30186..7fa158e0724 100644
--- a/src/js/walkPastJS.js
+++ b/src/js/walkPastJS.js
@@ -1710,7 +1710,7 @@ window.walkPasts = function(slave, _seed) {
t += `is teaching classes in ${V.schoolroomName}: ${he} is leading the slave students in rote recitation.`;
break;
case "be the Attendant":
- t += `is seeing to girls in ${V.spaName}: ${he} is gently soaping an exhausted slave.`;
+ t += `is seeing to the guests in ${V.spaName}: ${he} is gently soaping an exhausted slave.`;
break;
case "be the DJ":
if (_seed > 50) {
@@ -2435,11 +2435,11 @@ window.buttWatch = function(slave) {
break;
case "a schoolgirl outfit":
if (slave.anus === 0) {
- t += `This schoolgirl clearly needs to lose ${his} anal virginity.`;
+ t += `This school${boy} clearly needs to lose ${his} anal virginity.`;
} else if (slave.vagina === 0) {
- t += `This schoolgirl clearly takes it up the ass; that way, ${he} can remain a virgin, and be, like, totally pure and innocent.`;
+ t += `This school${boy} clearly takes it up the ass; that way, ${he} can remain a virgin, and be, like, totally pure and innocent.`;
} else {
- t += `This schoolgirl clearly takes it up the ass.`;
+ t += `This school${boy} clearly takes it up the ass.`;
}
break;
case "a kimono":
@@ -2519,12 +2519,12 @@ window.buttWatch = function(slave) {
t += `${His} loincloth only partially covers ${his} butt, giving frequent glimpses of the bare flesh beneath it.`;
break;
case "a gothic lolita dress":
- t += `${His} dress can be lifted easily enough to get as ${his} rear.`;
+ t += `${His} dress can be lifted easily enough to get at ${his} rear.`;
break;
case "a hanbok":
- t += `${His} hanbok can be lifted easily enough to get as ${his} `;
+ t += `${His} hanbok can be lifted easily enough to get at ${his} `;
if (slave.butt > 7) {
- t += `rear and its motion beneath the fabric certainly invites it.`;
+ t += `rear, and its motion beneath the fabric certainly invites it.`;
} else {
t += `rear.`;
}
@@ -2689,11 +2689,11 @@ window.anusWatch = function(slave) {
break;
case "a schoolgirl outfit":
if (slave.anus === 0) {
- t += `This schoolgirl clearly needs to lose ${his} anal virginity.`;
+ t += `This school${boy} clearly needs to lose ${his} anal virginity.`;
} else if (slave.vagina === 0) {
- t += `This schoolgirl clearly takes it up the ass; that way, ${he} can remain a virgin, and be, like, totally pure and innocent.`;
+ t += `This school${boy} clearly takes it up the ass; that way, ${he} can remain a virgin, and be, like, totally pure and innocent.`;
} else {
- t += `This schoolgirl clearly takes it up the ass.`;
+ t += `This school${boy} clearly takes it up the ass.`;
}
break;
case "a kimono":
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 6b2cb78fbf6..f05b33bc907 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -477,7 +477,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
<<if $activeSlave.hormoneBalance >= 100>>
Since $he's doped up on hormones, you take $him out onto the balcony, arm an extra security system so $he can relax, and have gentle, loving anal sex with $him until $he's climaxed twice.
<<elseif ($activeSlave.chastityPenis == 1)>>
- Since $he's a caged dickgirl, you take $him out onto the balcony, arm an extra security system so $he can relax, and use $his anus until $he's exhausted.
+ Since $he's a caged dick<<= $girl>>, you take $him out onto the balcony, arm an extra security system so $he can relax, and use $his anus until $he's exhausted.
<<elseif ($activeSlave.dick > 0) && ($activeSlave.balls == 0)>>
Since $he's chemically castrated, you take $him out onto the balcony, arm an extra security system so $he can relax, and have gentle, loving anal sex with $him until $he's climaxed twice.
<<elseif ($activeSlave.dick > 0) && ($activeSlave.balls == 0)>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 9bc978ed2e7..6c7827ce058 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -12349,7 +12349,10 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<br><<link "These slaves clearly have too much time on their hands">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You thank $him kindly, tell $him to put $his offering on your desk, and go back to your work. $He flees, and once $he's gone, you <<if $HeadGirl != 0>>have $assistantName pass a note to your Head Girl instructing $him<<else>>instruct $assistantName<</if>> to tighten up your slaves' schedules, since you feel that they have too much time on their hands. Then you direct another slave to return the napkin to its proper place. Your slaves find their spare moments occupied by household minutiae during the coming week, @@.yellowgreen;saving you some money@@ on penthouse and slave upkeep.
+ <<if $HeadGirl != 0>>
+ <<setLocalPronouns $HeadGirl 2>>
+ <</if>>
+ You thank $him kindly, tell $him to put $his offering on your desk, and go back to your work. $He flees, and once $he's gone, you <<if $HeadGirl != 0>>have $assistantName pass a note to your Head Girl instructing _him2<<else>>instruct $assistantName<</if>> to tighten up your slaves' schedules, since you feel that they have too much time on their hands. Then you direct another slave to return the napkin to its proper place. Your slaves find their spare moments occupied by household minutiae during the coming week, @@.yellowgreen;saving you some money@@ on penthouse and slave upkeep.
<<run cashX(2000, "event", $activeSlave)>>
<</replace>>
<</link>>
@@ -15537,7 +15540,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<br><<link "Attend a milonga">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You inform $activeSlave.slaveName of your plans and tell $him to get dressed appropriately. $He meets you at the door wearing classy heels and a gorgeous long dress cunningly designed to adhere to $him while $he dances despite the fact that it displays all of one leg, $his entire back<<if $activeSlave.belly >= 5000>>, $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly<</if>>, cleavage, and the sides of both breasts. $He has $his hair up in a perfect bun accented with a spray of the latest jewelry, and is wearing severe makeup that makes $him look aristocratic and elegant by turns. The host of the milonga, an old-world tango enthusiast, knows well the social graces and invites you, as the most prominent attendee, to perform the traditional demonstration tango that begins the dance. It goes wonderfully, and the entire party sighs in appreciation as you perform the classic tango. You lower $activeSlave.slaveName<<if $activeSlave.belly >= 10000 || $activeSlave.weight > 130>>'s heavy body<</if>> gracefully and pull $him back up into a close embrace, and breath catches in more than one throat. As tradition dictates $he dances with many partners throughout the night. One concession to Free Cities sensibilities is that the male and female roles in the tango may be filled by anyone, and $activeSlave.slaveName switches flawlessly between playing the female role to the elderly host one dance and the male role to his teenage granddaughter the next. The poor girl spends the rest of the evening staring at $activeSlave.slaveName with $his tongue tied. Whoever $activeSlave.slaveName dances with, $he always subtly shows by glance and gesture that it's you $he truly wants. Everyone is quite envious of you; @@.green;your reputation has increased.@@
+ You inform $activeSlave.slaveName of your plans and tell $him to get dressed appropriately. $He meets you at the door wearing classy heels and a gorgeous long dress cunningly designed to adhere to $him while $he dances despite the fact that it displays all of one leg, $his entire back<<if $activeSlave.belly >= 5000>>, $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly<</if>>, cleavage, and the sides of both breasts. $He has $his hair up in a perfect bun accented with a spray of the latest jewelry, and is wearing severe makeup that makes $him look aristocratic and elegant by turns. The host of the milonga, an old-world tango enthusiast, knows well the social graces and invites you, as the most prominent attendee, to perform the traditional demonstration tango that begins the dance. It goes wonderfully, and the entire party sighs in appreciation as you perform the classic tango. You lower $activeSlave.slaveName<<if $activeSlave.belly >= 10000 || $activeSlave.weight > 130>>'s heavy body<</if>> gracefully and pull $him back up into a close embrace, and breath catches in more than one throat. As tradition dictates $he dances with many partners throughout the night. One concession to Free Cities sensibilities is that the male and female roles in the tango may be filled by anyone, and $activeSlave.slaveName switches flawlessly between playing the female role to the elderly host one dance and the male role to his teenage granddaughter the next. The poor girl spends the rest of the evening staring at $activeSlave.slaveName with her tongue tied. Whoever $activeSlave.slaveName dances with, $he always subtly shows by glance and gesture that it's you $he truly wants. Everyone is quite envious of you; @@.green;your reputation has increased.@@
<<run repX(500, "event", $activeSlave)>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 3900d1b0534..d902b416c02 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -366,7 +366,7 @@ Surprisingly, the slave on top doesn't seem too unhappy with this. _He2's no sla
<<elseif ($subSlave.dick > 0)>>
_he2 looks aroused, though _his2 flopping dick can't show it.
<<elseif ($subSlave.vaginaLube > 0)>>
- _his2 cunt is gushing female lubricant as the pistoning phallus alternately pushes and pulls at _his2 vaginal walls.
+ _his2 cunt is gushing <<if _girl2 == "girl">>female <</if>>lubricant as the pistoning phallus alternately pushes and pulls at _his2 vaginal walls.
<<elseif ($subSlave.labia > 0)>>
_his2 generous petals move gently with the motion of the pounding, and they're far from dry.
<<elseif ($subSlave.vagina == -1)>>
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index dac4ba1e6b8..5ffcf294556 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -1605,7 +1605,7 @@ __Personal Assistant and Market Assistant relationship styles:__
<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
would be a lovely vessel for _hisA young. $assistantName wastes no time to unraveling and entangling the excited new _girlM. "My my, aren't you frisky?" _heM flirts, caressing a rather phallic tentacle. "I bet you'd love to fill me with these, wouldn't you?" _HeM squirms, _hisM skirt falling down low enough to reveal _hisM moist pussy. "Fill me! Be my lover! My body is YOURS!" $assistantName drives as many tentacles into _hisM body as physically possible before enclosing the lust crazed _girlM within _hisA body. $assistantName reverts to _hisA human figure, albeit with an immense, pulsating stomach, and begins to slowly waddle back to _hisA lair.
<<case "amazon">>
- would be a good partner. $assistantName laughs nervously and turns to the new tribeswoman, saying "Um, would you keep my fireside? I'm, um, very strong." The market assistant's avatar smiles and kisses _himA. "And you're very beautiful," _heM says, placing the amazon's hands on _hisM bare breasts. The amazon sweeps _hisA new tribal wife up into _hisA arms with a shout of triumph.
+ would be a good partner. $assistantName laughs nervously and turns to the new tribes<<= _womanM>>, saying "Um, would you keep my fireside? I'm, um, very strong." The market assistant's avatar smiles and kisses _himA. "And you're very beautiful," _heM says, placing the amazon's hands on _hisM bare breasts. The amazon sweeps _hisA new tribal wife up into _hisA arms with a shout of triumph.
<</switch>>
<<set $marketAssistantRelationship = "romantic">>
<</replace>>
@@ -1649,7 +1649,7 @@ __Personal Assistant and Market Assistant relationship styles:__
<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
You add that _heM would be a lovely vessel for _hisA young. $assistantName wastes no time unraveling and entangling the screeching new _girlM. $assistantName drives as many tentacles into _hisM body as physically possible before vigorously fucking _himM, spreading copious amount of aphrodisiac throughout _hisM body. The last you see of the market assistant as _heM is pulled into $assistantName is _hisM steadily swelling belly. $assistantName reverts to _hisA human figure, albeit with a truly unfathomable, pulsating stomach, and collapses to the ground, unable to move. _HeA slowly crawls out of sight; you swear _hisA own middle was steadily growing too.
<<case "amazon">>
- $assistantName snaps _hisA fingers, and the new tribeswoman's paint and tribal markings change to that of a different group. That done, $assistantName promptly knocks _himM out, scoops _himM up, and carries _hisA prize off.
+ $assistantName snaps _hisA fingers, and the new tribes<<= _womanM>>'s paint and tribal markings change to that of a different group. That done, $assistantName promptly knocks _himM out, scoops _himM up, and carries _hisA prize off.
<</switch>>
<<set $marketAssistantRelationship = "nonconsensual">>
<</replace>>
diff --git a/src/uncategorized/officeDescription.tw b/src/uncategorized/officeDescription.tw
index 9654807d4a6..42fd1a45dfe 100644
--- a/src/uncategorized/officeDescription.tw
+++ b/src/uncategorized/officeDescription.tw
@@ -118,7 +118,7 @@
<<case "chinese revivalist">>
_heA's depicted wearing colorful silk robes; _heA's pulled them open to flash _hisA lovely body.
<<case "supremacist">>
- _heA's depicted wearing the dress of an old world $arcologies[0].FSSupremacistRace noblewoman and blowing a kiss in a sexy manner.
+ _heA's depicted wearing the dress of an old world $arcologies[0].FSSupremacistRace noble<<= _womanA>> and blowing a kiss in a sexy manner.
<<case "subjugationist">>
_heA's depicted sitting with _hisA legs wide open and using _hisA fingers to spread _hisA $arcologies[0].FSSubjugationistRace pussy lips apart in a lewd manner.
<<case "chattel religionist">>
diff --git a/src/uncategorized/pHostageAcquisition.tw b/src/uncategorized/pHostageAcquisition.tw
index 55fde756aa0..6582512c67d 100644
--- a/src/uncategorized/pHostageAcquisition.tw
+++ b/src/uncategorized/pHostageAcquisition.tw
@@ -30,7 +30,7 @@
<<case "mercenary">>
a logistics officer
<<case "engineer">>
- an arcology saleswoman
+ an arcology sales<<= $woman>>
<<case "medicine">>
a surgical nurse
<<case "slaver">>
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index 1a6533765b6..3bcac270955 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -264,7 +264,7 @@ Only a few days into your inter-arcology war, you receive a video message from y
<<case "mercenary">>
career as a mercenary. $He was in logistical support, and was clever and pretty, but without the essential hardness. You were never that close,
<<case "engineer">>
- career as an arcology engineer. $He was a glorified saleswoman, with the gorgeous looks and extreme intelligence necessary to sell entire arcologies. You were never close,
+ career as an arcology engineer. $He was a glorified sales<<= $woman>>, with the gorgeous looks and extreme intelligence necessary to sell entire arcologies. You were never close,
<<case "medicine">>
career in medicine. $He was a surgical nurse, one of the best. $He was smart, pretty, and $he had sure hands. You were never that close,
<<case "slaver">>
diff --git a/src/uncategorized/resSale.tw b/src/uncategorized/resSale.tw
index 8d3ed8aacd3..aa2def24b28 100644
--- a/src/uncategorized/resSale.tw
+++ b/src/uncategorized/resSale.tw
@@ -172,7 +172,7 @@ You pause for a moment, and $he plunges on: "<<if $PC.title != 0>>Sir<<else>>Ma'
<<case "amazon">>
put $him out to pasture," the amazon exclaims, indicating the skin of milk on _hisA belt.
<<case "businesswoman">>
- put that cow in the dairy," the businesswoman exclaims.
+ put that cow in the dairy," the business<<= _womanA>> exclaims.
<<case "fairy">>
bounce on those nipples until they fill me with milk!" the fairy exclaims, rubbing _hisA belly.
<<case "pregnant fairy">>
diff --git a/src/uncategorized/seRaidingAssault.tw b/src/uncategorized/seRaidingAssault.tw
index a864a45297e..e7b67fa1718 100644
--- a/src/uncategorized/seRaidingAssault.tw
+++ b/src/uncategorized/seRaidingAssault.tw
@@ -136,7 +136,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<elseif _raidescape == 1>>
Despite being outnumbered and outgunned, the officers stand their ground to the last. The sterling officer of the law your $mercenariesTitle sought to capture is the last to fall, stifled by a hail of bullets.
<<else>>
- Your $mercenariesTitle break through the door of the precinct with their guns drawn. The precinct is so understaffed that each officer has a number of weapons drawn on them from every angle, so its no surprise when the precinct's sterling policewoman formally surrenders the precinct and its officers to your mercenaries.
+ Your $mercenariesTitle break through the door of the precinct with their guns drawn. The precinct is so understaffed that each officer has a number of weapons drawn on them from every angle, so its no surprise when the precinct's sterling police<<= $woman>> formally surrenders the precinct and its officers to your mercenaries.
The officer spends the VTOL ride watching impassively as $his fellow officers are raped by your $mercenariesTitle all around $him. Before $he exits the VTOL upon $his arrival, $he informs your $mercenariesTitle that $he intends to bring each of them to justice for their supposed crimes.
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
--
GitLab