diff --git a/devNotes/Useful JS Function Documentation.txt b/devNotes/Useful JS Function Documentation.txt
index b51924b0d311744fbea9a488ca648782825fc94a..2afb2f932ab210dcade087d8199f6cca23bd4a0e 100644
--- a/devNotes/Useful JS Function Documentation.txt
+++ b/devNotes/Useful JS Function Documentation.txt
@@ -173,6 +173,16 @@ relationshipChecks [script] All work as expected with <<if X.rivalryTarget == $s
relationshipTermShort(id) Prints the short form of the above. e.g. line 321 of slaveInteract.
`"Fuck $him with $his <<print relationshipTermShort($activeSlave)>> <<= SlaveFullName($slaves[_si])>>"`
Would print 'Fuck $him with $his BFF <<= SlaveFullName($slaves[_si])>>'
+
+ PCrelationshipTerm(id) Prints the relationship term for the input (relative to the PC) if the relationship is < -1.
+ <<if $slaves[$i].relationship < -1>>
+ $He loves being your <<print PCrelationshipTerm($slaves[$i])>>.
+ Would print '$He loves being your wife.'
+
+ contextualIntro(context, actor, insertComma=false) - Introduces an actor by using any meaningful relationship(s) with an already on-screen actor, and their name.
+ Returns strings like: "your husband John", "his growing rival and mother Alice", or "her best friend and twin sister Carla".
+ If there is no known relationship between them, retuns the name alone. If insertComma is true, it will generate "her father, Dave" instead of "her father Dave".
+ Use this function instead of just printing the slave's name when you'd like to let the player to know if two actors are related, even though it's not going to have any mechanical impact on the scene.
bellyAdjective(slave) - Returns a string describing her belly size.
diff --git a/src/facilities/nursery/nurseryWidgets.js b/src/facilities/nursery/nurseryWidgets.js
index 24b26a21c59a8669c9d50dfc6c32fe244f69cbcd..19aa9e0b94a7c045ee5a5e2a375e19dfb8f64f1a 100644
--- a/src/facilities/nursery/nurseryWidgets.js
+++ b/src/facilities/nursery/nurseryWidgets.js
@@ -1522,11 +1522,8 @@ App.Facilities.Nursery.InfantSummary = function(child) {
r += " ";
} else if (child.mother === -1) {
r += `Your daughter`;
- if (child.relationship === -3) {
- r += ` & wife`;
- handled = 1;
- } else if (child.relationship === -2) {
- r += ` & lover`;
+ if (child.relationship < -1) {
+ res += ` & ${PCrelationshipTerm(child)}`;
handled = 1;
}
r += " ";
@@ -1548,11 +1545,8 @@ App.Facilities.Nursery.InfantSummary = function(child) {
r += " ";
} else if (child.father === -1 && child.mother !== -1) {
r += `Your daughter`;
- if (child.relationship === -3) {
- r += ` & wife`;
- handled = 1;
- } else if (child.relationship === -2) {
- r += ` & lover`;
+ if (child.relationship < -1) {
+ res += ` & ${PCrelationshipTerm(child)}`;
handled = 1;
}
r += " ";
@@ -1664,11 +1658,9 @@ App.Facilities.Nursery.InfantSummary = function(child) {
}
} else if (child.mother === -1) {
r += `Your `;
- if (child.relationship === -3) {
- r += `<span class="lightgreen">daughter and wife.</span> `;
- handled = 1;
- } else if (child.relationship === -2) {
- r += `<span class="lightgreen">daughter and lover.</span> `;
+
+ if (child.relationship < -1) {
+ r += `<span class="lightgreen">daughter and ${PCrelationshipTerm(child)}.</span> `;
handled = 1;
} else {
r += `<span class="lightgreen">daughter.</span> `;
@@ -1691,11 +1683,8 @@ App.Facilities.Nursery.InfantSummary = function(child) {
}
} else if (child.father === -1 && child.father !== child.mother) {
r += `Your `;
- if (child.relationship === -3) {
- r += `<span class="lightgreen">daughter and wife.</span> `;
- handled = 1;
- } else if (child.relationship === -2) {
- r += `<span class="lightgreen">daughter and lover.</span> `;
+ if (child.relationship < -1) {
+ r += `<span class="lightgreen">daughter and ${PCrelationshipTerm(child)}.</span> `;
handled = 1;
} else {
r += `<span class="lightgreen">daughter.</span> `;
@@ -6205,11 +6194,8 @@ App.Facilities.Nursery.ChildSummary = function(child) {
r += " ";
} else if (child.mother === -1) {
r += `Your daughter`;
- if (child.relationship === -3) {
- r += ` & wife`;
- handled = 1;
- } else if (child.relationship === -2) {
- r += ` & lover`;
+ if (child.relationship < -1) {
+ res += ` & ${PCrelationshipTerm(child)}`;
handled = 1;
}
r += " ";
@@ -6231,11 +6217,8 @@ App.Facilities.Nursery.ChildSummary = function(child) {
r += " ";
} else if (child.father === -1 && child.mother !== -1) {
r += `Your daughter`;
- if (child.relationship === -3) {
- r += ` & wife`;
- handled = 1;
- } else if (child.relationship === -2) {
- r += ` & lover`;
+ if (child.relationship < -1) {
+ res += ` & ${PCrelationshipTerm(child)}`;
handled = 1;
}
r += " ";
@@ -6390,11 +6373,8 @@ App.Facilities.Nursery.ChildSummary = function(child) {
}
} else if (child.mother === -1) {
r += `Your `;
- if (child.relationship === -3) {
- r += `<span class="lightgreen">daughter and wife.</span> `;
- handled = 1;
- } else if (child.relationship === -2) {
- r += `<span class="lightgreen">daughter and lover.</span> `;
+ if (child.relationship < -1) {
+ r += `<span class="lightgreen">daughter and ${PCrelationshipTerm(child)}.</span> `;
handled = 1;
} else {
r += `<span class="lightgreen">daughter.</span> `;
@@ -6417,11 +6397,8 @@ App.Facilities.Nursery.ChildSummary = function(child) {
}
} else if (child.father === -1 && child.father !== child.mother) {
r += `Your `;
- if (child.relationship === -3) {
- r += `<span class="lightgreen">daughter and wife.</span> `;
- handled = 1;
- } else if (child.relationship === -2) {
- r += `<span class="lightgreen">daughter and lover.</span> `;
+ if (child.relationship < -1) {
+ r += `<span class="lightgreen">daughter and ${PCrelationshipTerm(child)}.</span> `;
handled = 1;
} else {
r += `<span class="lightgreen">daughter.</span> `;
diff --git a/src/js/relationshipChecks.js b/src/js/relationshipChecks.js
index 284e052c6676cef93d5fa91ec696178b362a0a38..754618b2dd0a69e210a1c86193907bc859b11c30 100644
--- a/src/js/relationshipChecks.js
+++ b/src/js/relationshipChecks.js
@@ -47,3 +47,58 @@ window.relationshipTermShort = function(id) {
return `${getPronouns(id).wife}`;
}
};
+
+/**
+ * @param {{ relationship: number; }} id
+ * @returns {string}
+ */
+window.PCrelationshipTerm = function(id) {
+ if (id.relationship === -2) {
+ return "lover";
+ } else if (id.relationship === -3) {
+ return `${getPronouns(id).wife}`;
+ }
+};
+
+/**
+ * Introduces an actor by using any meaningful relationship(s) with an already on-screen actor, and their name.
+ * Returns strings like: "your husband John", "his growing rival and mother Alice", or "her best friend and twin sister Carla".
+ * If there is no known relationship between them, retuns the name alone.
+ * Use this function instead of just printing the slave's name when you'd like to let the player to know if two actors are related,
+ * even though it's not going to have any mechanical impact on the scene.
+ * @param {App.Entity.SlaveState|App.Entity.PlayerState} context
+ * @param {App.Entity.SlaveState|App.Entity.PlayerState} actor
+ * @param {boolean} [insertComma=false] - when true, if a relationship is found, it will be separated from the actor's name by a comma ("her father, Dave" instead of "her father Dave")
+ * @returns {string}
+ */
+window.contextualIntro = function(context, actor, insertComma=false) {
+ let first = true;
+ let r = ``;
+ const firstPreamble = (context === V.PC) ? "your" : getPronouns(context).possessive;
+ let preamble = () => {
+ let s = first ? `${firstPreamble} ` : ` and `;
+ first = false;
+ return s;
+ };
+
+ if (context.relationship > 0 && context.relationshipTarget === actor.ID) {
+ r += preamble() + relationshipTerm(context);
+ } else if (context === V.PC && actor.relationship < -1) {
+ r += preamble() + PCrelationshipTerm(actor);
+ } else if (actor === V.PC && context.relationship < -1) {
+ r += preamble() + PCrelationshipTerm(context);
+ } else if (context.rivalry > 0 && context.rivalryTarget === actor.ID) {
+ r += preamble() + rivalryTerm(context);
+ }
+
+ const _relative = relativeTerm(context, actor);
+ if (_relative) {
+ r += preamble() + _relative;
+ }
+
+ if (r !== ``) {
+ r += (insertComma || actor === V.PC) ? ", " : " ";
+ }
+ r += actor === V.PC ? "you" : actor.slaveName;
+ return r;
+};
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 8d7236d2f770f35847ae504d430b1191546ebd73..426c0a6aff9702d63b58554ccdd15fc050a3e482 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -3654,11 +3654,8 @@ window.SlaveSummaryUncached = (function() {
res += " ";
} else if (slave.mother === -1) {
res += `Your ${getPronouns(slave).daughter}`;
- if (slave.relationship === -3) {
- res += ` & ${getPronouns(slave).wife}`;
- handled = 1;
- } else if (slave.relationship === -2) {
- res += ` & lover`;
+ if (slave.relationship < -1) {
+ res += ` & ${PCrelationshipTerm(slave)}`;
handled = 1;
}
res += " ";
@@ -3678,11 +3675,8 @@ window.SlaveSummaryUncached = (function() {
res += " ";
} else if (slave.father === -1 && slave.mother !== -1) {
res += `Your ${getPronouns(slave).daughter}`;
- if (slave.relationship === -3) {
- res += ` & ${getPronouns(slave).wife}`;
- handled = 1;
- } else if (slave.relationship === -2) {
- res += ` & lover`;
+ if (slave.relationship < -1) {
+ res += ` & ${PCrelationshipTerm(slave)}`;
handled = 1;
}
res += " ";
@@ -3831,11 +3825,8 @@ window.SlaveSummaryUncached = (function() {
}
} else if (slave.mother === -1) {
addText(block, `Your `);
- if (slave.relationship === -3) {
- makeSpan(block, `${getPronouns(slave).daughter} and ${getPronouns(slave).wife}.`, "lightgreen");
- handled = 1;
- } else if (slave.relationship === -2) {
- makeSpan(block, `${getPronouns(slave).daughter} and lover.`, "lightgreen");
+ if (slave.relationship < -1) {
+ makeSpan(block, `${getPronouns(slave).daughter} and ${PCrelationshipTerm(slave)}.`, "lightgreen");
handled = 1;
} else {
makeSpan(block, `${getPronouns(slave).daughter}.`, "lightgreen");
@@ -3858,11 +3849,8 @@ window.SlaveSummaryUncached = (function() {
}
} else if (slave.father === -1 && slave.father !== slave.mother) {
addText(block, `Your `);
- if (slave.relationship === -3) {
- makeSpan(block, `${getPronouns(slave).daughter} and ${getPronouns(slave).wife}.`, "lightgreen");
- handled = 1;
- } else if (slave.relationship === -2) {
- makeSpan(block, `${getPronouns(slave).daughter} and lover.`, "lightgreen");
+ if (slave.relationship < -1) {
+ makeSpan(block, `${getPronouns(slave).daughter} and ${PCrelationshipTerm(slave)}.`, "lightgreen");
handled = 1;
} else {
makeSpan(block, `${getPronouns(slave).daughter}.`, "lightgreen");
@@ -3873,11 +3861,8 @@ window.SlaveSummaryUncached = (function() {
}
if (areSisters(V.PC, slave) > 0) {
addText(block, `Your `);
- if (slave.relationship === -3) {
- makeSpan(block, `${relativeTerm(V.PC, slave)} and ${getPronouns(slave).wife}.`, "lightgreen");
- handled = 1;
- } else if (slave.relationship === -2) {
- makeSpan(block, `${relativeTerm(V.PC, slave)} and lover.`, "lightgreen");
+ if (slave.relationship < -1) {
+ makeSpan(block, `${relativeTerm(V.PC, slave)} and ${PCrelationshipTerm(slave)}.`, "lightgreen");
handled = 1;
} else {
makeSpan(block, `${relativeTerm(V.PC, slave)}.`, "lightgreen");
diff --git a/src/npc/agent/agentCompany.tw b/src/npc/agent/agentCompany.tw
index 2cfd63cb1ec883d977d27054493b31141f4bef97..858fdf55deee3b3b6bdb4ba30e8bb5aad422de3c 100644
--- a/src/npc/agent/agentCompany.tw
+++ b/src/npc/agent/agentCompany.tw
@@ -25,7 +25,7 @@ Working in _neighborArcology.name's penthouse office, $subSlave.slaveName gets a
<br><br>
-_His2 question is answered when you bring $activeSlave.slaveName in close, putting $him in $subSlave.slaveName's view. $subSlave.slaveName's <<= App.Desc.eyesColor($subSlave)>> fly open with pleased surprise, but before _he2 can speak, $activeSlave.slaveName goes first.
+_His2 question is answered when you bring <<= contextualIntro($subSlave, $activeSlave)>> in close, putting $him in $subSlave.slaveName's view. $subSlave.slaveName's <<= App.Desc.eyesColor($subSlave)>> fly open with pleased surprise, but before _he2 can speak, $activeSlave.slaveName goes first.
<<if !canTalk($activeSlave)>>
Unable to speak $himself, $he simply makes a heart shape with $his hand<<if hasBothArms($activeSlave)>>s<</if>> in view of the video call, and blows $his <<if $activeSlave.relationship == 4>>lover<<else>>_wife2<</if>> a kiss.
<<else>>
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index 2bf80a0c7e89a72dea98ea776a1848b17420029b..5d14e795cabd9998e7bad5f941dec86d82b06bbb 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -116,13 +116,13 @@ $subSlave.slaveName is at the head of the class. In this case, the literal head
<<case "abusive wardeness">>
-As you pass the entrance to the hall of cells where <<EventNameLink>> breaks bitches late one night, you hear some muffled cursing, followed by moans. Curious, you lean into the one cell with an open door and are treated to the sight of $activeSlave.slaveName holding $subSlave.slaveName's head <<if hasBothLegs($activeSlave)>>between $his legs<<else>>at $his groin<</if>>, receiving what is very obviously non-consensual oral sex. $activeSlave.slaveName is clearly enjoying $himself, but gathers $himself together and greets you properly, without stopping.
+As you pass the entrance to the hall of cells where <<EventNameLink>> breaks bitches late one night, you hear some muffled cursing, followed by moans. Curious, you lean into the one cell with an open door and are treated to the sight of $activeSlave.slaveName holding <<= contextualIntro($activeSlave, $subSlave)>>'s head <<if hasBothLegs($activeSlave)>>between $his legs<<else>>at $his groin<</if>>, receiving what is very obviously non-consensual oral sex. $activeSlave.slaveName is clearly enjoying $himself, but gathers $himself together and greets you properly, without stopping.
<br><br>
"Told thi<<s>> whore I wa<<s>>n't turning the light<<s>> off in <<his 2>> cell until <<he 2>> got me off. <<He 2>> can't <<s>>leep with 'em on, and bitche<<s>> do anything for a little <<s>>leep," $he explains.
<<case "comforting attendant">>
-You decide to knit up care's raveled sleave with a break in the spa. You have your own bath, of course, but the <<if $seeDicks != 100>>female <</if>>company is always nice even if you aren't actively using the spa's resting inhabitants. The steam in the warm pool room is turned up very high, and you can hardly see. As you lower yourself into the warm water, you see <<EventNameLink>> across from you, sitting in the water against the pool wall. $He's holding $subSlave.slaveName in $his arms, rubbing a comforting hand up and down _his2 back and murmuring into _his2 ear. $subSlave.slaveName has _his2 head <<if ($activeSlave.boobs > 2000)>>almost hidden between $activeSlave.slaveName's massive tits<<elseif ($activeSlave.boobs > 1000)>>between $activeSlave.slaveName's huge boobs<<elseif ($activeSlave.boobs > 300)>>between $activeSlave.slaveName's breasts<<else>>against $activeSlave.slaveName's flat chest<</if>>, but it's a nonsexual embrace. You can't hear what $activeSlave.slaveName is saying, but it's clearly comforting; $subSlave.slaveName has a happy little smile on _his2 face and has _his2 eyes closed in relaxation.
+You decide to knit up care's raveled sleave with a break in the spa. You have your own bath, of course, but the <<if $seeDicks != 100>>female <</if>>company is always nice even if you aren't actively using the spa's resting inhabitants. The steam in the warm pool room is turned up very high, and you can hardly see. As you lower yourself into the warm water, you see <<EventNameLink>> across from you, sitting in the water against the pool wall. $He's holding <<= contextualIntro($activeSlave, $subSlave)>> in $his arms, rubbing a comforting hand up and down _his2 back and murmuring into _his2 ear. $subSlave.slaveName has _his2 head <<if ($activeSlave.boobs > 2000)>>almost hidden between $activeSlave.slaveName's massive tits<<elseif ($activeSlave.boobs > 1000)>>between $activeSlave.slaveName's huge boobs<<elseif ($activeSlave.boobs > 300)>>between $activeSlave.slaveName's breasts<<else>>against $activeSlave.slaveName's flat chest<</if>>, but it's a nonsexual embrace. You can't hear what $activeSlave.slaveName is saying, but it's clearly comforting; $subSlave.slaveName has a happy little smile on _his2 face and has _his2 eyes closed in relaxation.
<<default>>
<br>ERROR: bad PETS event $PETSevent
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index c06821fea4ff03beac517fbe7511dc28083953d3..c92b5ffb0516e5a6130e94cd4598cd33a4ca1097 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -183,7 +183,7 @@ a few rubs before unceremoniously stuffing it into _his2 victim's asshole. You c
<<else>>
<<if $activeSlave.nipples != "fuckable">>$his nipples are hard and <</if>>there is a clear scent of lust around $him.
<</if>>
-It seems $he passed by while $subSlave.slaveName was beating the _girlU and found the <<if canSee($activeSlave)>>sight<<elseif canHear($activeSlave)>>sounds<<else>>sensations<</if>> rather compelling. It should be possible to either encourage this fascination or steer $him away from it for now.
+It seems $he passed by while <<= contextualIntro($activeSlave, $subSlave)>> was beating the _girlU and found the <<if canSee($activeSlave)>>sight<<elseif canHear($activeSlave)>>sounds<<else>>sensations<</if>> rather compelling. It should be possible to either encourage this fascination or steer $him away from it for now.
<<case "masochist">>
@@ -274,7 +274,7 @@ After you finish and _he2 leaves, wincing in agony<<if $subSlave.belly >= 1500>>
<<else>>
<<if $activeSlave.nipples != "fuckable">>$his nipples are hard and <</if>>there is a clear scent of lust around $him.
<</if>>
-It seems $he passed by while you were beating $subSlave.slaveName and found the <<if canSee($activeSlave)>>sight<<elseif canHear($activeSlave)>>sounds<<else>>sensations<</if>> rather compelling. It should be possible to either encourage this fascination or steer $him away from it for now.
+It seems $he passed by while you were beating <<= contextualIntro($activeSlave, $subSlave)>> and found the <<if canSee($activeSlave)>>sight<<elseif canHear($activeSlave)>>sounds<<else>>sensations<</if>> rather compelling. It should be possible to either encourage this fascination or steer $him away from it for now.
<<case "pregnancy">>
@@ -492,7 +492,7 @@ Though you never touch anything but _his2 nipples, _he2 climaxes twice. After yo
<<else>>
<<if $activeSlave.nipples != "fuckable">>$his nipples are hard and <</if>>there is a clear scent of lust around $him.
<</if>>
-It seems $he passed by while you were drinking from $subSlave.slaveName and found the <<if canSee($activeSlave)>>sight<<elseif canHear($activeSlave)>>sounds<<else>>sensations<</if>> rather compelling. It should be possible to either encourage this fascination or steer $him away from it for now.
+It seems $he passed by while you were drinking from <<= contextualIntro($activeSlave, $subSlave)>> and found the <<if canSee($activeSlave)>>sight<<elseif canHear($activeSlave)>>sounds<<else>>sensations<</if>> rather compelling. It should be possible to either encourage this fascination or steer $him away from it for now.
<<case "dom">>
@@ -571,7 +571,7 @@ a troubled look on $his face.
<<else>>
<<if $activeSlave.nipples != "fuckable">>$his nipples are hard and <</if>>there is a clear scent of lust around $him.
<</if>>
-It seems $he passed by while $subSlave.slaveName was dominating the other slave<<= _girlU>> and found the sight rather compelling. It should be possible to either encourage this fascination with domination or steer $him away from it for now.
+It seems $he passed by while <<= contextualIntro($activeSlave, $subSlave)>> was dominating the other slave<<= _girlU>> and found the sight rather compelling. It should be possible to either encourage this fascination with domination or steer $him away from it for now.
<<case "submissive">>
@@ -630,7 +630,7 @@ a troubled look on $his face.
<<else>>
<<if $activeSlave.nipples != "fuckable">>$his nipples are hard and <</if>>there is a clear scent of lust around $him.
<</if>>
-It seems $he passed by while you were dominating $subSlave.slaveName. <<if hasAnyArms($activeSlave)>>As though it has a mind of its own, $his hand reaches up toward $his throat. <</if>>It should be possible to either encourage this fascination with submission or steer $him away from it for now.
+It seems $he passed by while you were dominating <<= contextualIntro($activeSlave, $subSlave)>>. <<if hasAnyArms($activeSlave)>>As though it has a mind of its own, $his hand reaches up toward $his throat. <</if>>It should be possible to either encourage this fascination with submission or steer $him away from it for now.
<<case "buttslut">>
@@ -679,7 +679,7 @@ In the middle of the afternoon, you take a break from work to fuck $subSlave.sla
<<else>>
<<if $activeSlave.nipples != "fuckable">>$his nipples are hard and <</if>>there is a clear scent of lust around $him.
<</if>>
-It seems $he passed by while you were buttfucking $subSlave.slaveName and found the <<if canSee($activeSlave)>>sight<<elseif canHear($activeSlave)>>sounds<<else>>sensations<</if>> rather compelling. It should be possible to either encourage this fascination or steer $him away from it for now.
+It seems $he passed by while you were buttfucking <<= contextualIntro($activeSlave, $subSlave)>> and found the <<if canSee($activeSlave)>>sight<<elseif canHear($activeSlave)>>sounds<<else>>sensations<</if>> rather compelling. It should be possible to either encourage this fascination or steer $him away from it for now.
<<case "cumslut">>
@@ -736,7 +736,7 @@ It seems $he passed by while you were buttfucking $subSlave.slaveName and found
<<else>>
<<if $activeSlave.nipples != "fuckable">>$his nipples are hard and <</if>>there is a clear scent of lust around $him.
<</if>>
-It seems $he passed by while $subSlave.slaveName was <<if $PC.dick == 0>>in the midst of _his2 little oral party<<else>>blowing you<</if>>. $He swallows painfully at the <<if canSee($activeSlave)>>sight of the satisfied cumslut swirling the ejaculate around _his2 mouth<<elseif canHear($activeSlave)>>sound of the satisfied cumslut savoring the fresh load<<else>>reminder of the <<if canTaste($activeSlave)>>taste<<else>>warmth<</if>> and texture of the cum<</if>>. It should be possible to either encourage this fascination or steer $him away from it for now.
+It seems $he passed by while <<= contextualIntro($activeSlave, $subSlave)>> was <<if $PC.dick == 0>>in the midst of _his2 little oral party<<else>>blowing you<</if>>. $He swallows painfully at the <<if canSee($activeSlave)>>sight of the satisfied cumslut swirling the ejaculate around _his2 mouth<<elseif canHear($activeSlave)>>sound of the satisfied cumslut savoring the fresh load<<else>>reminder of the <<if canTaste($activeSlave)>>taste<<else>>warmth<</if>> and texture of the cum<</if>>. It should be possible to either encourage this fascination or steer $him away from it for now.
<<case "humiliation">>
@@ -785,7 +785,7 @@ You have $subSlave.slaveName pinned up against a railing on a balcony that overl
<<else>>
<<if $activeSlave.nipples != "fuckable">>$his nipples are hard and <</if>>there is a clear scent of lust around $him.
<</if>>
-There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<elseif canHear($activeSlave)>>across $his face as $he listened to<<else>>in $his expression as $he basked in the heat of<</if>> $subSlave.slaveName's satisfaction at being publicly used. It should be possible to either encourage this fascination with humiliation or steer $him away from it for now.
+There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<elseif canHear($activeSlave)>>across $his face as $he listened to<<else>>in $his expression as $he basked in the heat of<</if>> <<= contextualIntro($activeSlave, $subSlave)>>'s satisfaction at being publicly used. It should be possible to either encourage this fascination with humiliation or steer $him away from it for now.
<<default>>
<br>ERROR: bad REFI event $REFIevent
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 89823e3b288c51e3cf533b2fe1da942cd6d0b56e..c9eb2459e3c36c8f1a4a610dff71d8f1ed7d6b83 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -224,7 +224,7 @@ but you make a dismissive "go back to what you were doing" <<if canSee($activeSl
<<else>>
goes back to drinking
<</if>>
-$his breakfast. You pull out a tablet and start getting some work done, enjoying the low, human sounds of your chattel going about their business in the rooms all around you. $subSlave.slaveName pads in, looking not quite awake yet. Not noticing you in _his2 stupor, _he2
+$his breakfast. You pull out a tablet and start getting some work done, enjoying the low, human sounds of your chattel going about their business in the rooms all around you. <<= capFirstChar(contextualIntro($activeSlave, $subSlave))>> pads in, looking not quite awake yet. Not noticing you in _his2 stupor, _he2
<<if $cockFeeder == 1>>
chooses the phallus next to $activeSlave.slaveName's and starts to suck too.
<<else>>
@@ -252,7 +252,7 @@ $activeSlave.slaveName
<br><br>
$activeSlave.slaveName smiles and murmurs, "Mm hm." There is a distinct <<if canSee($activeSlave)>>glint in $his eye<<else>>look on $his face<</if>>. $He's got a healthy libido, to put it mildly. Like all slaves, $subSlave.slaveName sleeps nude and hasn't gotten dressed yet, and $activeSlave.slaveName has
<<if canSee($activeSlave)>>
-obviously noticed $his
+obviously noticed _his2
<<if $subSlave.dick > 4>>
enormous cock
<<elseif $subSlave.labia > 1>>
@@ -275,7 +275,7 @@ obviously noticed $his
nudity
<</if>>
<<else>>
- noticed $his
+ noticed _his2
<<if $subSlave.dick > 4>>
enormous cock
<<elseif $subSlave.boobs > 5000>>
diff --git a/src/uncategorized/reFullBed.tw b/src/uncategorized/reFullBed.tw
index f7932be11abaa8b97479c7ddef9f4dbfef0eb766..850090d38cdcc5887a5702f33cf25484cef3fac3 100644
--- a/src/uncategorized/reFullBed.tw
+++ b/src/uncategorized/reFullBed.tw
@@ -21,7 +21,7 @@
<<setLocalPronouns $slaves[_bedSlaveOne]>>
<<setLocalPronouns $slaves[_bedSlaveTwo] 2>>
-You have the luxury of being attended to by a coterie of devoted sex slaves. Tonight, $slaves[_bedSlaveTwo].slaveName and $slaves[_bedSlaveOne].slaveName are with you when it's time for bed, so they strip naked and climb under the sheets with you, one on either side. They snuggle in under both of your arms so that each can rest their head on your shoulder, a hand on your chest, <<if $slaves[_bedSlaveTwo].boobs > 300 && $slaves[_bedSlaveOne].boobs > 300>>their breasts against your flank, <</if>><<if $slaves[_bedSlaveTwo].belly > 5000 && $slaves[_bedSlaveOne].belly > 5000>>their swollen belly against yours, <</if>>and the warmth between their legs against your hip.
+You have the luxury of being attended to by a coterie of devoted sex slaves. Tonight, $slaves[_bedSlaveTwo].slaveName and <<= contextualIntro($slaves[_bedSlaveTwo], $slaves[_bedSlaveOne])>> are with you when it's time for bed, so they strip naked and climb under the sheets with you, one on either side. They snuggle in under both of your arms so that each can rest their head on your shoulder, a hand on your chest, <<if $slaves[_bedSlaveTwo].boobs > 300 && $slaves[_bedSlaveOne].boobs > 300>>their breasts against your flank, <</if>><<if $slaves[_bedSlaveTwo].belly > 5000 && $slaves[_bedSlaveOne].belly > 5000>>their swollen belly against yours, <</if>>and the warmth between their legs against your hip.
<br><br>