From 59d1e6fdbbcdde7bbb27fbca14f21da6f119f421 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Thu, 8 Oct 2020 21:47:59 -0500
Subject: [PATCH] Miscs
---
src/npc/children/childSummary.js | 18 ++++++++++--------
src/npc/infants/infantSummary.js | 8 ++++----
src/npc/interaction/fKiss.tw | 2 +-
src/npc/interaction/fPat.tw | 2 +-
src/npc/slaveStats.tw | 2 +-
src/uncategorized/PESS.tw | 2 +-
src/uncategorized/RESS.tw | 2 +-
7 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/npc/children/childSummary.js b/src/npc/children/childSummary.js
index af022e0d9c2..51fe14dafa0 100644
--- a/src/npc/children/childSummary.js
+++ b/src/npc/children/childSummary.js
@@ -3801,13 +3801,15 @@ App.Facilities.Nursery.ChildSummary = function(child) {
* @param {App.Entity.SlaveState} child
*/
function shortExtendedFamily(child) {
+ const
+ {daughter, sister, wife} = getPronouns(child);
let handled = 0;
if (child.mother > 0) {
const _ssj = V.slaves.findIndex(function(s) {
return s.ID === child.mother;
});
if (_ssj !== -1) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s daughter`;
+ r += `${SlaveFullName(V.slaves[_ssj])}'s ${daughter}`;
if (child.relationshipTarget === V.slaves[_ssj].ID) {
const friendShipShort = relationshipTermShort(child);
r += ` & ${friendShipShort}`;
@@ -3816,21 +3818,21 @@ App.Facilities.Nursery.ChildSummary = function(child) {
}
r += " ";
} else if (child.mother === -1) {
- r += `Your daughter`;
+ r += `Your ${daughter}`;
if (child.relationship < -1) {
r += ` & ${PCrelationshipTerm(child)}`;
handled = 1;
}
r += " ";
} else if (child.mother in V.missingTable && V.showMissingSlavesSD && V.showMissingSlaves) {
- r += `${V.missingTable[child.mother].fullName}'s daughter `;
+ r += `${V.missingTable[child.mother].fullName}'s ${daughter} `;
}
if (child.father > 0 && child.father !== child.mother) {
const _ssj = V.slaves.findIndex(function(s) {
return s.ID === child.father;
});
if (_ssj !== -1) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s daughter`;
+ r += `${SlaveFullName(V.slaves[_ssj])}'s ${daughter}`;
if (child.relationshipTarget === V.slaves[_ssj].ID && handled !== 1) {
const friendShipShort = relationshipTermShort(child);
r += ` & ${friendShipShort}`;
@@ -3839,14 +3841,14 @@ App.Facilities.Nursery.ChildSummary = function(child) {
}
r += " ";
} else if (child.father === -1 && child.mother !== -1) {
- r += `Your daughter`;
+ r += `Your ${daughter}`;
if (child.relationship < -1) {
r += ` & ${PCrelationshipTerm(child)}`;
handled = 1;
}
r += " ";
} else if (child.father in V.missingTable && child.father !== child.mother && V.showMissingSlavesSD && V.showMissingSlaves) {
- r += `${V.missingTable[child.father].fullName}'s daughter`;
+ r += `${V.missingTable[child.father].fullName}'s ${daughter}`;
}
if (child.daughters === 1) {
let _ssj = V.slaves.findIndex(function(s) {
@@ -3881,7 +3883,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
return areSisters(s, child) > 0;
});
if (_ssj !== -1) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s sister`;
+ r += `${SlaveFullName(V.slaves[_ssj])}'s ${sister}`;
if (child.relationshipTarget === V.slaves[_ssj].ID) {
const friendShipShort = relationshipTermShort(child);
r += `& ${friendShipShort}`;
@@ -3902,7 +3904,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
r += ` ${friendShipShort}`;
}
} else if (child.relationship === -3 && child.mother !== -1 && child.father !== -1) {
- r += `Your wife`;
+ r += `Your ${wife}`;
} else if (child.relationship === -2) {
r += `E Bonded`;
} else if (child.relationship === -1) {
diff --git a/src/npc/infants/infantSummary.js b/src/npc/infants/infantSummary.js
index 9e1cb4dd192..7c7da98707e 100644
--- a/src/npc/infants/infantSummary.js
+++ b/src/npc/infants/infantSummary.js
@@ -1599,7 +1599,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
function shortExtendedFamily() {
const
- {daughter, sister} = getPronouns(child);
+ {daughter, sister, wife} = getPronouns(child);
let
handled = 0,
@@ -1709,7 +1709,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
r += ` ${friendShipShort}`;
}
} else if (child.relationship === -3 && child.mother !== -1 && child.father !== -1) {
- r += `Your wife`;
+ r += `Your ${wife}`;
} else if (child.relationship === -2) {
r += `E Bonded`;
} else if (child.relationship === -1) {
@@ -1721,7 +1721,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
function longExtendedFamily() {
const
- {daughter, sister} = getPronouns(child);
+ {daughter, sister, wife} = getPronouns(child);
let
handled = 0,
@@ -1846,7 +1846,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
r += `<span class="lightgreen">${friendship}.</span> `;
}
} else if (child.relationship === -3 && child.mother !== -1 && child.father !== -1) {
- r += `<span class="lightgreen">Your wife.</span> `;
+ r += `<span class="lightgreen">Your ${wife}.</span> `;
} else if (child.relationship === -2) {
r += `<span class="lightgreen">Emotionally bonded to you.</span> `;
} else if (child.relationship === -1) {
diff --git a/src/npc/interaction/fKiss.tw b/src/npc/interaction/fKiss.tw
index d58c6643497..1019969fc2f 100644
--- a/src/npc/interaction/fKiss.tw
+++ b/src/npc/interaction/fKiss.tw
@@ -50,7 +50,7 @@ You tell <<= getSlave($AS).slaveName>> to
<<if getSlave($AS).fetish == "mindbroken">>
$He complies mechanically. $He remembers that when <<= getWrittenTitle(getSlave($AS))>>'s commands are not obeyed, there is punishment. You kiss $him deeply and intensely; $he doesn't understand why.
<<elseif getSlave($AS).devotion+getSlave($AS).trust >= 175>>
- $He complies in a wifely fashion, moving $his body as $he approaches to best catch your desire. Once $he's close, you take a moment to gaze deeply
+ $He complies in a <<= $wife>>ly fashion, moving $his body as $he approaches to best catch your desire. Once $he's close, you take a moment to gaze deeply
<<if canSee(getSlave($AS))>>
into $his <<= App.Desc.eyesColor(getSlave($AS))>>. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile, running $his eyes over your <<if $PC.boobs >= 300>>bosom<<else>>chest<</if>>.
<<else>>
diff --git a/src/npc/interaction/fPat.tw b/src/npc/interaction/fPat.tw
index 20baa39edec..57c3865213a 100644
--- a/src/npc/interaction/fPat.tw
+++ b/src/npc/interaction/fPat.tw
@@ -39,7 +39,7 @@ You tell <<= getSlave($AS).slaveName>> to
<<if getSlave($AS).fetish == "mindbroken">>
$He complies mechanically. $He remembers that when <<= getWrittenTitle(getSlave($AS))>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his empty <<= App.Desc.eyesColor(getSlave($AS))>>. $He shows no reaction
<<elseif getSlave($AS).devotion+getSlave($AS).trust >= 175>>
- $He complies in a wifely fashion, moving $his body as $he approaches to best enflame your desire, eager to be close to the _womanP who married $him. Once $he's close, you hold $his face in your palms and gaze
+ $He complies in a <<= $wife>>ly fashion, moving $his body as $he approaches to best enflame your desire, eager to be close to the _womanP who married $him. Once $he's close, you hold $his face in your palms and gaze
<<if canSee(getSlave($AS))>>
deeply into $his <<= App.Desc.eyesColor(getSlave($AS))>>. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile, running $his eyes over your <<if $PC.boobs >= 300>>bosom<<else>>chest<</if>>.
<<else>>
diff --git a/src/npc/slaveStats.tw b/src/npc/slaveStats.tw
index dffd1e2393e..64ea16a3807 100644
--- a/src/npc/slaveStats.tw
+++ b/src/npc/slaveStats.tw
@@ -254,7 +254,7 @@ Income: <<= num(_slave.lastWeeksRepIncome)>>
<br>UnderArm:
HColor: _slave.underArmHColor,
Style: _slave.underArmHStyle,
- Override H Colour: _slave.override_Arm_H_Color
+ Override H Color: _slave.override_Arm_H_Color
<br>Nails: _slave.nails
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index d4c61a5b433..70a4da847f3 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -569,7 +569,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
<<link "Compliment your Head Girl's efforts, and encourage $him">>
<<replace "#result">>
- As you walk into the room to offer $activeSlave.slaveName some positive reinforcement, $he groans, arches $his back, and shoots $his load down $slaves[$j].slaveName's retching <<if $seeRace == 1>>$slaves[$j].race <</if>>throat. $activeSlave.slaveName immediately greets you with perfect decorum, despite $his recent orgasm, and delivers $slaves[$j].slaveName an agonizing flick to the ear when _he2 does not, in $activeSlave.slaveName's opinion, follow suit with sufficient speed. You inform $activeSlave.slaveName that $he is a fine Head Girl, and that if $he continues to apply $himself $he will bring credit to you as a slaveowner. $He looks a little surprised, but thanks you correctly. It is only due to the arcology's monitoring system that you know that, as you turn your back and go, a single tear escapes from $his eye and rolls down $his pretty <<if $seeRace == 1>>$activeSlave.race <</if>>cheek. In the coming week, no shirker is safe from $his wrath. @@.hotpink;Every single slave in your penthouse has become better broken to your will.@@
+ As you walk into the room to offer $activeSlave.slaveName some positive reinforcement, $he groans, arches $his back, and shoots $his load down $slaves[$j].slaveName's retching <<if $seeRace == 1>>$slaves[$j].race <</if>>throat. $activeSlave.slaveName immediately greets you with perfect decorum, despite $his recent orgasm, and delivers $slaves[$j].slaveName <<if $slaves[$j].earShape == "none">>a quick slap to the back of the head<<else>>an agonizing flick to the ear<</if>> when _he2 does not, in $activeSlave.slaveName's opinion, follow suit with sufficient speed. You inform $activeSlave.slaveName that $he is a fine Head Girl, and that if $he continues to apply $himself $he will bring credit to you as a slaveowner. $He looks a little surprised, but thanks you correctly. It is only due to the arcology's monitoring system that you know that, as you turn your back and go, a single tear escapes from $his eye and rolls down $his pretty <<if $seeRace == 1>>$activeSlave.race <</if>>cheek. In the coming week, no shirker is safe from $his wrath. @@.hotpink;Every single slave in your penthouse has become better broken to your will.@@
<<run seX($activeSlave, "oral", $PC, "penetrative")>>
<<for $i = 0; $i < _SL; $i++>>
<<if assignmentVisible($slaves[$i])>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 0cf72b8a1e0..ca2dc227004 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -1237,7 +1237,7 @@ Your order $him to turn around and present $his anus for inspection. $He doesn't
In the morning the penthouse is a busy bustle of female energy. Slaves get up promptly, eat, shower, dress themselves, and head out to work. They chatter if able and allowed, and draw a good deal of strength from each other. As you pass by the kitchen, you are narrowly avoided by a rush of slaves heading to the showers. They're almost bouncing, feeding off each others' youthful energy. At the back of the pack is <<= App.UI.slaveDescriptionDialog($activeSlave)>>. $He looks as young as any of them, but after they're out, $he leans against the door frame for a moment and exhales slowly.
<br><br>
$His <<= App.Desc.eyeColor($activeSlave)>>-eyed gaze catches yours for a moment, and you are reminded that $he isn't as young as they are, not at all. $His face might look youthful, but $his eyes don't. <<if canSee($activeSlave)>>$He sees your consideration, and<<else>>You make yourself known, and $he<</if>> murmurs, "<<S>>orry, <<Master>>. Ju<<s>>t a little <<s>>low thi<<s>> morning."
-$He hurries after $his sisters, $his
+$He hurries after $his companions, $his
<<if $activeSlave.butt > 12>>
massive
<<elseif $activeSlave.butt > 8>>
--
GitLab