From 393fa8d47bf9cb61ca2e9a55bd5b92a631be79da Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Wed, 17 Jul 2019 19:13:09 -0500
Subject: [PATCH] FixFamily
---
src/js/extendedFamilyModeJS.js | 20 ++++++++++----------
src/uncategorized/RESS.tw | 4 ++--
src/uncategorized/RETS.tw | 6 +++---
src/uncategorized/longSlaveDescription.tw | 8 ++++++--
src/uncategorized/saGuardsYou.tw | 3 ++-
src/uncategorized/saRelationships.tw | 4 ++--
6 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js
index 35da96dafb9..58869f087f0 100644
--- a/src/js/extendedFamilyModeJS.js
+++ b/src/js/extendedFamilyModeJS.js
@@ -13,18 +13,18 @@ window.isParentP = function isParentP(daughter, parent) {
};
window.isGrandmotherP = function isGrandmotherP(granddaughter, grandmother) {
- let father = getSlave(granddaughter.father);
- let mother = getSlave(granddaughter.mother);
- if ((mother.mother === grandmother.ID) || (father.mother === grandmother.ID)) {
+ let father;
+ let mother;
+ if (((mother = getSlave(granddaughter.mother)) && (mother.mother === grandmother.ID)) || ((father = getSlave(granddaughter.father)) && (father.mother === grandmother.ID))) {
return true;
}
return false;
};
window.isGrandfatherP = function isGrandfatherP(granddaughter, grandfather) {
- let father = getSlave(granddaughter.father);
- let mother = getSlave(granddaughter.mother);
- if ((mother.father === grandfather.ID) || (father.father === grandfather.ID)) {
+ let father;
+ let mother;
+ if (((mother = getSlave(granddaughter.mother)) && (mother.father === grandfather.ID)) || ((father = getSlave(granddaughter.father)) && (father.father === grandfather.ID))) {
return true;
}
return false;
@@ -69,11 +69,11 @@ window.isAunt = function(niece, aunt) {
if (!niece || !aunt || (niece.ID === aunt.ID)) {
return false;
}
- let father = getSlave(niece.father);
- let mother = getSlave(niece.mother);
- if ((mother.ID !== aunt.ID) && !sameTParent(mother, aunt) && sameMom(mother, aunt) && sameDad(mother, aunt)) {
+ let father;
+ let mother;
+ if ((mother = getSlave(niece.mother)) && (mother.ID !== aunt.ID) && !sameTParent(mother, aunt) && sameMom(mother, aunt) && sameDad(mother, aunt)) {
return true;
- } else if ((father.ID !== aunt.ID) && !sameTParent(father, aunt) && sameMom(father, aunt) && sameDad(father, aunt)) {
+ } else if ((father = getSlave(niece.father)) && (father.ID !== aunt.ID) && !sameTParent(father, aunt) && sameMom(father, aunt) && sameDad(father, aunt)) {
return true;
}
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 15676285dca..5704c1e1956 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -4181,7 +4181,7 @@ in front of you, awaiting further direction.
<</if>>
showing unmistakably how badly $he needs release.
<<else>>
- $He keeps $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>face<</if>> slightly downcast, $his hands lightly smoothing the folds from $his tight skirt while $his breasts visibly rise and fall under $his even tighter blouse<<if $activeSlave.belly >= 5000>>. Between the two, there is little $he can do to cover $his exposed <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>middle<</if>><</if>>. $He's the perfect picture of an attentive little old world girlfriend<<if $activeSlave.height > 185>> (though, of course, $he's anything but physically small)<</if>>.
+ $He keeps $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>face<</if>> slightly downcast, $his hands lightly smoothing the folds from $his tight skirt while $his breasts visibly rise and fall under $his even tighter blouse<<if $activeSlave.belly >= 5000>>. Between the two, there is little $he can do to cover $his exposed <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>middle<</if>><</if>>. $He's the perfect picture of an attentive little old world <<= $girl>>friend<<if $activeSlave.height > 185>> (though, of course, $he's anything but physically small)<</if>>.
<</if>>
<<case "devoted shortstack">>
@@ -4306,9 +4306,9 @@ You pass through your slaves' living area as some of them are starting their day
<<elseif $activeSlave.livingRules == "normal">>
gotten out of $his neat little cot.
<<elseif $activeSlave.relationship >= 4>>
- climbed out of bed. ($activeSlave.slaveName's <<if $activeSlave.relationship == 5>>wife<<else>>girlfriend<</if>>
<<set _ress = $slaveIndices[$activeSlave.relationshipTarget]>>
<<setLocalPronouns $slaves[_ress] 2>>
+ climbed out of bed. ($activeSlave.slaveName's <<if $activeSlave.relationship == 5>>wife<<else>><<= _girl2>>friend<</if>>
$slaves[_ress].slaveName is still asleep in it, and the shape of _his2
<<if $slaves[_ress].belly >= 120000>>_belly belly is
<<elseif $slaves[_ress].boobs > 25000>>immense <<if ($slaves[_ress].boobsImplant/$slaves[_ress].boobs) >= .60>>fake <</if>> breasts are
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 328dd8e21cf..9436d80774b 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -330,7 +330,7 @@ _He2 stiffens with the lewd feeling of the warm fluid pressing into _his2 mouth.
After you complete your weekly inspection of <<EventNameLink>>, the $desc asks if $he can beg a favor. Absurd though it sounds, $he does exactly that, saying in $his <<if $activeSlave.voice > 2>>high<<elseif $activeSlave.voice > 1>>feminine<<else>>bimbo<</if>> voice, "<<Master>>, may I a<<s>>k a favor?" You take a moment to look at $him, standing there in front of your desk. $He's devoted to you, willing to please you for the sake of pleasing you, rather than to avoid punishment or make $his own life easier. And $he's very trusting, confident that $he can say such an odd thing without fear. So, you hear $him out.
<br><br>
-"Thank you, <<Master>>," $he <<say>>s. "I would like to do <<s>>omething for $subSlave.slaveName." You ask if $he's worried about $his <<if $activeSlave.relationship >= 5>>wife<<else>>girlfriend<</if>> for some reason. "Oh no, <<Master>>," $he answers hurriedly. "No, no, that came out wrong. It'<<s>> ju<<s>>t that I love _him2 and I want to, you know, get _him2 <<s>>omething or do <<s>>omething <<s>>pe<<c>>ial for _him2. We don't really have <<s>>tuff of our own, <<s>>o I can't give _him2 a pre<<s>>ent, and we already do everything either one of u<<s>> want<<s>> in bed, <<s>>o I can't really think of anything." $He <<if canSee($activeSlave)>>looks<<else>>gazes<</if>> at you hopefully.
+"Thank you, <<Master>>," $he <<say>>s. "I would like to do <<s>>omething for $subSlave.slaveName." You ask if $he's worried about $his <<if $activeSlave.relationship >= 5>>wife<<else>><<= _girl2>>friend<</if>> for some reason. "Oh no, <<Master>>," $he answers hurriedly. "No, no, that came out wrong. It'<<s>> ju<<s>>t that I love _him2 and I want to, you know, get _him2 <<s>>omething or do <<s>>omething <<s>>pe<<c>>ial for _him2. We don't really have <<s>>tuff of our own, <<s>>o I can't give _him2 a pre<<s>>ent, and we already do everything either one of u<<s>> want<<s>> in bed, <<s>>o I can't really think of anything." $He <<if canSee($activeSlave)>>looks<<else>>gazes<</if>> at you hopefully.
<<case "anal cowgirl">>
@@ -1131,7 +1131,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<</replace>>
<<replace "#result">>
- Rather than answering $him directly, you tell $assistantName to clear $activeSlave.slaveName's and $subSlave.slaveName's schedules for the evening. $He <<if canSee($activeSlave)>>looks<<else>>smiles<</if>> at you with happy anticipation, but is puzzled when you don't give $him any further orders. "Um, thank you, <<Master>>," $he asks hesitantly. "But, I don't under<<s>>tand. What are we going to do?" Whatever you want, you tell $him. $He furrows $his brow, looking troubled, as though the concept is somehow alien to $him. After some thought, $he brightens and asks if $he can go tell $his <<if $activeSlave.relationship >= 5>>wife<<else>>girlfriend<</if>>. $He can, you respond, and the slave bounces over to give you a kiss before running out. It costs you a small sum in upkeep and other trifles to cover an unexpected unavailability of both slaves, but they deserve it. Their busy lives mean that their shifts rarely align exactly, and this is more time than they've had together in a long time. It isn't particularly exciting, but they enjoy themselves. They eat a meal in the kitchen together, watch the sunset from one of the penthouse balconies, make love out there, share a long shower, and then go to bed, spending the rest of the night cuddling and chatting quietly. The next morning, they come to see you hand in hand, and @@.hotpink;thank you in unison.@@ As they leave, $activeSlave.slaveName looks back over $his shoulder at you, and mouths 'that was perfect, <<= WrittenMaster($activeSlave)>>!'
+ Rather than answering $him directly, you tell $assistantName to clear $activeSlave.slaveName's and $subSlave.slaveName's schedules for the evening. $He <<if canSee($activeSlave)>>looks<<else>>smiles<</if>> at you with happy anticipation, but is puzzled when you don't give $him any further orders. "Um, thank you, <<Master>>," $he asks hesitantly. "But, I don't under<<s>>tand. What are we going to do?" Whatever you want, you tell $him. $He furrows $his brow, looking troubled, as though the concept is somehow alien to $him. After some thought, $he brightens and asks if $he can go tell $his <<if $activeSlave.relationship >= 5>>wife<<else>><<= _girl2>>friend<</if>>. $He can, you respond, and the slave bounces over to give you a kiss before running out. It costs you a small sum in upkeep and other trifles to cover an unexpected unavailability of both slaves, but they deserve it. Their busy lives mean that their shifts rarely align exactly, and this is more time than they've had together in a long time. It isn't particularly exciting, but they enjoy themselves. They eat a meal in the kitchen together, watch the sunset from one of the penthouse balconies, make love out there, share a long shower, and then go to bed, spending the rest of the night cuddling and chatting quietly. The next morning, they come to see you hand in hand, and @@.hotpink;thank you in unison.@@ As they leave, $activeSlave.slaveName looks back over $his shoulder at you, and mouths 'that was perfect, <<= WrittenMaster($activeSlave)>>!'
<<run cashX(-500, "event", $activeSlave)>>
<<set $subSlave.devotion += 2>>
<<set $activeSlave.devotion += 2>>
@@ -1196,7 +1196,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<set $subSlave.clothes = _clothesTemp2>>
<<replace "#result">>
- Rather than answering $him directly, you tell $assistantName to clear $activeSlave.slaveName's and $subSlave.slaveName's schedules for the evening. $He looks at you with happy anticipation, but this is nothing to $his gratitude when you tell $him that you'll arrange a date night for them. Trusted slaves are often seen unchaperoned in your arcology, and there are several establishments that cater to slaveowners who wish to bring their chattel out or even send them out alone. You tell $him you've made a reservation for $him and $his <<if $activeSlave.relationship >= 5>>wife<<else>>girlfriend<</if>> at one of the less formal places, an ethnic restaurant that manages to add spice to liquid slave nutrition without ruining its good qualities. They're to spend the night out, and can wear what they like. $He hurries off to collect $his _girl2 and get dressed, but also tries to keep thanking you on $his way out, and almost runs into the door frame as $he goes.
+ Rather than answering $him directly, you tell $assistantName to clear $activeSlave.slaveName's and $subSlave.slaveName's schedules for the evening. $He looks at you with happy anticipation, but this is nothing to $his gratitude when you tell $him that you'll arrange a date night for them. Trusted slaves are often seen unchaperoned in your arcology, and there are several establishments that cater to slaveowners who wish to bring their chattel out or even send them out alone. You tell $him you've made a reservation for $him and $his <<if $activeSlave.relationship >= 5>>wife<<else>><<= _girl2>>friend<</if>> at one of the less formal places, an ethnic restaurant that manages to add spice to liquid slave nutrition without ruining its good qualities. They're to spend the night out, and can wear what they like. $He hurries off to collect $his _girl2 and get dressed, but also tries to keep thanking you on $his way out, and almost runs into the door frame as $he goes.
<br><br>
Since $he trusts you, they dress very daringly for slaves. That is, they dress about as conservatively as slaves can dress, in comfortable pants and soft sweaters whose high collars they roll down to keep their collars visible. Any hesitations citizens who see them might have are banished by their obvious love for each other, and their total lack of shame about having it seen. Indeed, as the night wears on they attract more than a few @@.green;admiring glances@@ from citizens who envy you the favors of the pair of <<if $girl == _girl2>>$girl<<else>>slave<</if>>s occupying one side of the corner booth. After all, they'd rather lean against each other than look at each other from across a table. The next day, they both come to you individually and @@.mediumaquamarine;thank you almost gravely,@@ quite aware of the trust you've placed in them.
<<run cashX(-1000, "event", $activeSlave)>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 5b57ad27de9..ddac80c5cce 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -234,6 +234,10 @@ is
<</if>>
<<if $activeSlave.fuckdoll == 0>>
+ <<set _lover = getSlave($activeSlave.relationshipTarget)>>
+ <<if def _lover>>
+ <<setLocalPronouns _lover 2>>
+ <</if>>
<<if ($activeSlave.ID == $HeadGirl.ID) && ($HGSuite == 1)>>
$He lives in $his own suite within your penthouse,
<<elseif ($activeSlave.ID == $Bodyguard.ID) && ($dojo > 1)>>
@@ -245,7 +249,7 @@ is
<<elseif $activeSlave.livingRules == "normal">>
$He sleeps on a cot,
<<elseif $activeSlave.relationship >= 4>>
- $He has $his own room, which $he shares with $his <<if $activeSlave.relationship == 5>>wife<<else>>girlfriend<</if>> whenever they can manage it,
+ $He has $his own room, which $he shares with $his <<if $activeSlave.relationship == 5>>wife<<else>><<= _girl2>>friend<</if>> whenever they can manage it,
<<else>>
$He sleeps in $his own little room,
<</if>>
@@ -255,7 +259,7 @@ is
<<if ($activeSlave.relationship == 5)>>
slaves other than $his wife.
<<elseif ($activeSlave.relationship == 4)>>
- slaves other than $his girlfriend.
+ slaves other than $his <<= _girl2>>friend.
<<elseif ($activeSlave.relationship == 3)>>
slaves other than $his fuckbuddy.
<<else>>
diff --git a/src/uncategorized/saGuardsYou.tw b/src/uncategorized/saGuardsYou.tw
index dd19908e478..5e0aaa59433 100644
--- a/src/uncategorized/saGuardsYou.tw
+++ b/src/uncategorized/saGuardsYou.tw
@@ -188,8 +188,9 @@ Being continually trusted with your life @@.hotpink;increases $his devotion to y
<<if $slaves[$i].relationship > 1>>
<<set $subSlave = getSlave($slaves[$i].relationshipTarget)>>
<<if (def $subSlave) && $subSlave.skill.combat == 0 && bodyguardSuccessorEligible($subSlave)>>
+ <<setLocalPronouns $subSlave 2>>
$He does $his best to train $subSlave.slaveName whenever $he can, hoping that $his
- <<if $slaves[$i].relationship > 4>>wife<<elseif $slaves[$i].relationship == 4>>lover<<elseif $slaves[$i].relationship == 3>>girlfriend<<else>>best friend<</if>>
+ <<if $slaves[$i].relationship > 4>>wife<<elseif $slaves[$i].relationship == 4>>lover<<elseif $slaves[$i].relationship == 3>><<= _girl2>>friend<<else>>best friend<</if>>
can be made capable of stepping into $his place.
<</if>>
<</if>>
diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw
index bf8a762c188..a6a094393be 100644
--- a/src/uncategorized/saRelationships.tw
+++ b/src/uncategorized/saRelationships.tw
@@ -926,11 +926,11 @@
$He is @@.hotpink;happy@@ to be allowed to live a rather nice life close to you, since $he's your wife. In addition, $his formal relationship to you produces a steady increase of both @@.hotpink;devotion@@ and @@.mediumaquamarine;trust.@@
<<set _SlaveI.devotion += 2, _SlaveI.trust += 2>>
<<case "whore" "work in the brothel" "serve the public" "serve in the club" "work a glory hole" "be confined in the arcade">>
- $His formal relationship to you produces a steady increase of both @@.hotpink;devotion@@ and @@.mediumaquamarine;trust,@@ though this is reduced by being on a public sexual assignment rather than being kept for you alone, not that $he minds; just as you ordered $him to marry you, so may you order $him to fuck others. The public is less forgiving of you ordering your slave wife to fuck random citizens, however, @@.red;seriously damaging your reputation.@@
+ $His formal relationship to you produces a steady increase of both @@.hotpink;devotion@@ and @@.mediumaquamarine;trust,@@ though this is reduced by being on a public sexual assignment rather than being kept for you alone, not that $he minds; just as you ordered $him to marry you, so may you order $him to fuck others. The public, however, is less forgiving of you ordering your slave wife to fuck random citizens, @@.red;seriously damaging your reputation.@@
<<set _SlaveI.devotion++, _SlaveI.trust++>>
<<run repX(-100, "PCRelationships", _SlaveI)>>
<<default>>
- $His formal relationship to you produces a steady increase of both @@.hotpink;devotion@@ and @@.mediumaquamarine;trust@@ as $he gradually grows closer to $his husband.
+ $His formal relationship to you produces a steady increase of both @@.hotpink;devotion@@ and @@.mediumaquamarine;trust@@ as $he gradually grows closer to $his <<if $PC.title != 0>>husband<<else>>wife<</if>>.
<<set _SlaveI.devotion++, _SlaveI.trust++>>
<</switch>>
<</if>>
--
GitLab