From 0b14a2c6e60b250fec44c527ec7288119c566943 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Mon, 15 Jul 2019 17:37:03 -0500
Subject: [PATCH] IncestFixes
---
Changelog.txt | 2 +-
src/facilities/nursery/childInteract.tw | 89 +++++-----
src/js/slaveCostJS.js | 8 +-
src/pregmod/fSlaveSlaveDick.tw | 2 +-
src/pregmod/fSlaveSlaveVag.tw | 2 +-
.../personalAssistantAppearance.tw | 2 +-
src/uncategorized/reFSAcquisition.tw | 2 +-
src/uncategorized/saLongTermEffects.tw | 2 +-
src/uncategorized/slaveInteract.tw | 152 +++++++++---------
src/utility/descriptionWidgets.tw | 4 +-
10 files changed, 139 insertions(+), 126 deletions(-)
diff --git a/Changelog.txt b/Changelog.txt
index 80d4fe5e8bf..78f1e847de2 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -3068,7 +3068,7 @@ Pregmod
252
-SFanon's cleaned up introSummary
- -fixed numerous zero'd stats in export slave
+ -fixed numerous zeroed stats in export slave
-gave most ddDatabase slaves scrotums
251
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index 11035cf9cda..7cd25dad1f9 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -181,52 +181,63 @@
| <<link "Check $his deadliness @@.red;FOR TESTING@@">><<replace "#miniscene">><<set $childSex = 1>><<include "Deadliness">><br> <</replace>><</link>>
<</if>>
| <<link "Abuse $him">><<replace "#miniscene">><<set $childSex = 1>><<include "FAbuse">><</replace>><</link>>
- <<if $familyTesting == 1>>
- <<for $i = 0; $i < _SL; $i++>>
- <<if $activeChild.mother == $slaves[$i].ID>>
- <<if isSlaveAvailable($slaves[$i])>>
- | <<link "Fuck $him with $his mother">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "mother">><<include "FRelation">><br> <</replace>><</link>>
- <<else>>
- //$His mother, $slaves[$i].slaveName, is unavailable//
- <</if>>
- <</if>>
- <</for>>
- <<if $activeChild.sisters > 0>>
- <<set $relation = 0>>
+ <<if $seeIncest == 1>>
+ <<if $familyTesting == 1>>
<<for $i = 0; $i < _SL; $i++>>
- <<if areSisters($activeChild, $slaves[$i]) > 0 && !isSlaveAvailable($slaves[$i])>>
- <<set $relation++>>
+ <<if $activeChild.mother == $slaves[$i].ID>>
+ <<if isSlaveAvailable($slaves[$i])>>
+ | <<link "Fuck $him with $his mother">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "mother">><<include "FRelation">><br> <</replace>><</link>>
+ <<else>>
+ //$His mother, $slaves[$i].slaveName, is unavailable//
+ <</if>>
<</if>>
- <</for>>
- <<if $relation == $activeChild.sisters>>
- <<if $activeChild.sisters == 1>>
- //$His sister is unavailable//
- <<else>>
- //$His sisters are unavailable//
+ /*
+ <<if $activeChild.father == $slaves[$i].ID>>
+ <<if isSlaveAvailable($slaves[$i])>>
+ | <<link "Fuck $him with $his father">><<replace "#miniscene">><<set $partner = "father">><<include "FRelation">><br> <</replace>><</link>>
+ <<else>>
+ //$His father, $slaves[$i].slaveName, is unavailable//
+ <</if>>
<</if>>
- <<else>>
- <<if $activeChild.sisters == 1>>
- | <<link "Fuck $him with $his sister">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "sister">><<include "FRelation">><br> <</replace>><</link>>
+ */
+ <</for>>
+ <<if $activeChild.sisters > 0>>
+ <<set $relation = 0>>
+ <<for $i = 0; $i < _SL; $i++>>
+ <<if areSisters($activeChild, $slaves[$i]) > 0 && !isSlaveAvailable($slaves[$i])>>
+ <<set $relation++>>
+ <</if>>
+ <</for>>
+ <<if $relation == $activeChild.sisters>>
+ <<if $activeChild.sisters == 1>>
+ //$His sister is unavailable//
+ <<else>>
+ //$His sisters are unavailable//
+ <</if>>
<<else>>
- | <<link "Fuck $him with one of $his sisters">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "sister">><<include "FRelation">><br> <</replace>><</link>>
+ <<if $activeChild.sisters == 1>>
+ | <<link "Fuck $him with $his sister">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "sister">><<include "FRelation">><br> <</replace>><</link>>
+ <<else>>
+ | <<link "Fuck $him with one of $his sisters">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "sister">><<include "FRelation">><br> <</replace>><</link>>
+ <</if>>
<</if>>
<</if>>
- <</if>>
- <<else>>
- <<if ($activeChild.relation != 0)>>
- <<set _assayedSlave = getSlave($activeChild.relationTarget)>>
- <<if isSlaveAvailable(_assayedSlave)>>
- <<if ($activeChild.relation == "mother")>>
- | <<link "Fuck $him with $his daughter">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>>
- <<elseif ($activeChild.relation == "daughter")>>
- | <<link "Fuck $him with $his mother">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>>
- <<elseif ($activeChild.relation == "sister")>>
- | <<link "Fuck $him with $his sister">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>>
- <<elseif ($activeChild.relation == "twin")>>
- | <<link "Fuck $him with $his twin">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>>
+ <<else>>
+ <<if ($activeChild.relation != 0)>>
+ <<set _assayedSlave = getSlave($activeChild.relationTarget)>>
+ <<if isSlaveAvailable(_assayedSlave)>>
+ <<if ($activeChild.relation == "mother")>>
+ | <<link "Fuck $him with $his daughter">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>>
+ <<elseif ($activeChild.relation == "daughter")>>
+ | <<link "Fuck $him with $his mother">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>>
+ <<elseif ($activeChild.relation == "sister")>>
+ | <<link "Fuck $him with $his sister">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>>
+ <<elseif ($activeChild.relation == "twin")>>
+ | <<link "Fuck $him with $his twin">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>>
+ <</if>>
+ <<else>>
+ //_assayedSlave.slaveName is unavailable//
<</if>>
- <<else>>
- //_assayedSlave.slaveName is unavailable//
<</if>>
<</if>>
<</if>>
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 1ae2bcda956..f931c98e452 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -1438,7 +1438,7 @@ window.FResult = (function() {
if (!forSale) {
result += Math.max(0, slave.aphrodisiacs) * 2;
-
+
if (slave.inflationType === "aphrodisiac") {
result += slave.inflation * 4;
}
@@ -1465,13 +1465,13 @@ window.FResult = (function() {
if (V.arcologies[0].FSHedonisticDecadence > 20) {
calcHedonismWeight(slave);
}
-
+
if (slave.fetish === "mindbroken") {
result = Math.trunc(result * 0.4);
} else {
result = Math.trunc(result * 0.7);
}
-
+
if (result < 2) {
if (supremeRaceP(slave) && V.arcologies[0].FSSupremacist > 20) {
result = 0;
@@ -1479,7 +1479,7 @@ window.FResult = (function() {
result = 2;
}
}
-
+
return result;
}
diff --git a/src/pregmod/fSlaveSlaveDick.tw b/src/pregmod/fSlaveSlaveDick.tw
index 3f19eebf0a0..6abd8b0bd12 100644
--- a/src/pregmod/fSlaveSlaveDick.tw
+++ b/src/pregmod/fSlaveSlaveDick.tw
@@ -8,7 +8,7 @@
__Select an eligible slave:__
<<for _i = 0; _i < $slaves.length; _i++>>
- <<if ($slaves[_i].ID != $activeSlave.ID) && isSlaveAvailable($slaves[_i]) && canDoVaginal($slaves[_i]) && canWalk($slaves[_i])>> /* amp-amp scene is not written */
+ <<if ($slaves[_i].ID != $activeSlave.ID) && isSlaveAvailable($slaves[_i]) && canDoVaginal($slaves[_i]) && canWalk($slaves[_i]) && ($seeIncest != 0 || !areRelated($activeSlave, $slaves[_i]))>> /* amp-amp scene is not written */
<<set _name = SlaveFullName($slaves[_i])>>
<br><<print "[[_name|FSlaveSlaveDick Consummate][$slaverapistx = $slaves[" + _i + "]]]">>
<<if $slaves[_i].custom.label>> (@@.yellow;''<<print $slaves[_i].custom.label>>''@@)<</if>>
diff --git a/src/pregmod/fSlaveSlaveVag.tw b/src/pregmod/fSlaveSlaveVag.tw
index 39cad9a7393..d5a47fb28eb 100644
--- a/src/pregmod/fSlaveSlaveVag.tw
+++ b/src/pregmod/fSlaveSlaveVag.tw
@@ -13,7 +13,7 @@ __Select an eligible slave:__
<br>
<<for _i = 0; _i < $slaves.length; _i++>>
- <<if (canPenetrate($slaves[_i])) || ($slaves[_i].clit >= 4)>>
+ <<if (canPenetrate($slaves[_i])) || ($slaves[_i].clit >= 4) && ($seeIncest != 0 || !areRelated($activeSlave, $slaves[_i])>>
<<if ($slaves[_i].ID != $activeSlave.ID)>>
<<set _name = SlaveFullName($slaves[_i])>>
<br><<print "[[_name|FSlaveSlaveVag Consummate][$slaverapistx = $slaves[" + _i + "]]]">>
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 80da3e53529..835136fd746 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -242,7 +242,7 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<if $marketAssistantRelationship == "cute">>
They're chatting companionably as $assistantName stretches and the market assistant's avatar does a complex calculation on _hisM fingers. $assistantName is telling a long story, and the market assistant is listening kindly.
<<elseif $marketAssistantRelationship == "nonconsensual">>
- $assistantName is taking _hisA tribal slave from behind. It's technically tribbing, since all _heA's doing is grinding _hisA cunt against the market assistants', but the poor little tribes<<= _womanM>> is being fucked hard regardless.
+ $assistantName is taking _hisA tribal slave from behind. It's technically tribbing, since all _heA's doing is grinding _hisA cunt against the market assistant's, but the poor little tribes<<= _womanM>> is being fucked hard regardless.
<<elseif $marketAssistantRelationship == "incestuous">>
$assistantName is getting some manual stimulation from _hisA _sisterM, who is watching _hisM muscular sibling's aroused thrashing with amusement as _heM slides _hisM whole hand in and out of $assistantName's cunt.
<<else>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index bb0e7526c34..ce000820abb 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -1311,7 +1311,7 @@ The call comes in from an office, and you suppress the urge to check whether $as
<<case "Transformation Fetishist">>
$He arrives with various medical devices still attached to $him, wrapped up in supportive hospital clothing. Despite this, it's obvious that you've made a good decision. The new tits that got $him into this situation are so cartoonish that some of the medical tubing has been hastily routed between them. After a few weeks on curatives and a few more in training, $he'll be ready to bounce those fake boobs up and down as $he takes dick.
<<case "Transformation Fetishist Two">>
- $He arrives unapologetically in $his fine clothing. "I'm not <<s>>orry," $he says harshly, "but I'm wearing my best one last time whether you like it or not." Eventually $he sighs, squares $his shoulders, and visibly steels $himself. "I'll <<s>>ay <<a>>s a free $woman, <<s>>in<<c>>e it'<<s>> my la<<s>>t chan<<c>>e to <<s>>ay anything a<<s>> a free $woman, you're good-looking, for an evil slaveholding oligarch." $He delivers this last with a little smile on $his plush lips and a sense of bitter irony in $his voice. "If we'd met at a ni<<c>>e party la<<s>>t week I might have made a pa<<ss>> at you. You'd be a better choi<<c>>e than my e<<x>>-husband at lea<<s>>t."
+ $He arrives unapologetically in $his fine clothing. "I'm not <<s>>orry," $he says harshly, "but I'm wearing my best one last time whether you like it or not." Eventually $he sighs, squares $his shoulders, and visibly steels $himself. "I'll <<s>>ay <<a>>s a free $woman, <<s>>in<<c>>e it'<<s>> my la<<s>>t chan<<c>>e to <<s>>ay anything a<<s>> a free $woman, you're good-looking, for an evil slaveholding oligarch." $He delivers this last with a little smile on $his plush lips and a sense of bitter irony in $his voice. "If we'd met at a ni<<c>>e party la<<s>>t week I might have made a pa<<ss>> at you. You'd be a better choi<<c>>e than my e<<x>>-hu<<s>>band at lea<<s>>t."
<<case "Slimness Enthusiast">>
$He arrives apologizing for $his fine clothing. "I'm sorry," $he apologizes sadly, "but I wanted to wear my best one last time." $He sighs, squares $his shoulders, and visibly steels $himself. "I'll say as a free $woman, since it's my la<<s>>t chance to <<s>>ay anything a<<s>> a free $woman, you're good-looking, for an evil <<s>>laveholding oligarch." $He delivers this last with a little smile on $his lips and rich turn of humor in $his voice. "If we'd met at a ni<<c>>e party la<<s>>t week I might have made a pa<<ss>> at you. I <<s>>uppo<<s>>e that'<<s>> be<<s>>ide the point now."
<<case "Slimness Enthusiast Two">>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 705941003ff..4c18ba58e95 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -7913,7 +7913,7 @@
<<else>>
$His giant pregnancy makes life a struggle: <<if $buttAccessibility == 1 || $boobAccessibility == 1 || $ballsAccessibility == 1>>$he has trouble using appliances and furniture, and constantly bumps into things, but at least the doors have already been widened for your other slaves<<else>>$he barely fits through doors, has trouble using appliances and furniture, and constantly bumps into things<</if>>.
<<if $slaves[$i].sexualFlaw == "breeder">>
- But all this justs feeds $his obsession with being a breeder.
+ But all this just feeds $his obsession with being a breeder.
<<elseif ($slaves[$i].devotion > 50)>>
Since $he's devoted to you, $he just does $his best.
<<elseif ($slaves[$i].trust >= -20)>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 29de5c7cf03..fff029a1794 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -241,92 +241,94 @@
<</if>>
<</if>>
| <<link "Abuse $him">><<replace "#miniscene">><<include "FAbuse">><</replace>><</link>>
- <<if $familyTesting == 1>>
- <<for $i = 0; $i < _SL; $i++>>
- <<if $activeSlave.mother == $slaves[$i].ID>>
- <<if isSlaveAvailable($slaves[$i])>>
- | <<link "Fuck $him with $his mother">><<replace "#miniscene">><<set $partner = "mother">><<include "FRelation">><br> <</replace>><</link>>
+ <<if $seeIncest == 1>>
+ <<if $familyTesting == 1>>
+ <<for $i = 0; $i < _SL; $i++>>
+ <<if $activeSlave.mother == $slaves[$i].ID>>
+ <<if isSlaveAvailable($slaves[$i])>>
+ | <<link "Fuck $him with $his mother">><<replace "#miniscene">><<set $partner = "mother">><<include "FRelation">><br> <</replace>><</link>>
+ <<else>>
+ //$His mother, $slaves[$i].slaveName, is unavailable//
+ <</if>>
+ <</if>>
+ /*
+ <<if $activeSlave.father == $slaves[$i].ID>>
+ <<if isSlaveAvailable($slaves[$i])>>
+ | <<link "Fuck $him with $his father">><<replace "#miniscene">><<set $partner = "father">><<include "FRelation">><br> <</replace>><</link>>
+ <<else>>
+ //$His father, $slaves[$i].slaveName, is unavailable//
+ <</if>>
+ <</if>>
+ */
+ <</for>>
+ <<if $activeSlave.daughters > 0>>
+ <<set $relation = 0>>
+ <<for $i = 0; $i < _SL; $i++>>
+ <<if ($activeSlave.ID == $slaves[$i].father || $activeSlave.ID == $slaves[$i].mother) && !isSlaveAvailable($slaves[$i])>>
+ <<set $relation++>>
+ <</if>>
+ <</for>>
+ <<if $relation == $activeSlave.daughters>>
+ <<if $activeSlave.daughters == 1>>
+ //$His daughter is unavailable//
+ <<else>>
+ //$His daughters are unavailable//
+ <</if>>
<<else>>
- //$His mother, $slaves[$i].slaveName, is unavailable//
+ <<if $activeSlave.daughters == 1>>
+ | <<link "Fuck $him with $his daughter">><<replace "#miniscene">><<set $partner = "daughter">><<include "FRelation">><br> <</replace>><</link>>
+ <<else>>
+ | <<link "Fuck $him with one of $his daughters">><<replace "#miniscene">><<set $partner = "daughter">><<include "FRelation">><br> <</replace>><</link>>
+ <</if>>
<</if>>
<</if>>
/*
- <<if $activeSlave.father == $slaves[$i].ID>>
- <<if isSlaveAvailable($slaves[$i])>>
- | <<link "Fuck $him with $his father">><<replace "#miniscene">><<set $partner = "father">><<include "FRelation">><br> <</replace>><</link>>
- <<else>>
- //$His father, $slaves[$i].slaveName, is unavailable//
- <</if>>
+ <<if $activeSlave.daughters > 1>>
+ | <<link "Fuck $him with $his daughters">><<replace "#miniscene">><<set $partner = "daughters">><<include "FRelation">><br> <</replace>><</link>>
<</if>>
*/
- <</for>>
- <<if $activeSlave.daughters > 0>>
- <<set $relation = 0>>
- <<for $i = 0; $i < _SL; $i++>>
- <<if ($activeSlave.ID == $slaves[$i].father || $activeSlave.ID == $slaves[$i].mother) && !isSlaveAvailable($slaves[$i])>>
- <<set $relation++>>
- <</if>>
- <</for>>
- <<if $relation == $activeSlave.daughters>>
- <<if $activeSlave.daughters == 1>>
- //$His daughter is unavailable//
- <<else>>
- //$His daughters are unavailable//
- <</if>>
- <<else>>
- <<if $activeSlave.daughters == 1>>
- | <<link "Fuck $him with $his daughter">><<replace "#miniscene">><<set $partner = "daughter">><<include "FRelation">><br> <</replace>><</link>>
+ <<if $activeSlave.sisters > 0>>
+ <<set $relation = 0>>
+ <<for $i = 0; $i < _SL; $i++>>
+ <<if areSisters($activeSlave, $slaves[$i]) > 0 && !isSlaveAvailable($slaves[$i])>>
+ <<set $relation++>>
+ <</if>>
+ <</for>>
+ <<if $relation == $activeSlave.sisters>>
+ <<if $activeSlave.sisters == 1>>
+ //$His sister is unavailable//
+ <<else>>
+ //$His sisters are unavailable//
+ <</if>>
<<else>>
- | <<link "Fuck $him with one of $his daughters">><<replace "#miniscene">><<set $partner = "daughter">><<include "FRelation">><br> <</replace>><</link>>
+ <<if $activeSlave.sisters == 1>>
+ | <<link "Fuck $him with $his sister">><<replace "#miniscene">><<set $partner = "sister">><<include "FRelation">><br> <</replace>><</link>>
+ <<else>>
+ | <<link "Fuck $him with one of $his sisters">><<replace "#miniscene">><<set $partner = "sister">><<include "FRelation">><br> <</replace>><</link>>
+ <</if>>
<</if>>
<</if>>
- <</if>>
- /*
- <<if $activeSlave.daughters > 1>>
- | <<link "Fuck $him with $his daughters">><<replace "#miniscene">><<set $partner = "daughters">><<include "FRelation">><br> <</replace>><</link>>
- <</if>>
- */
- <<if $activeSlave.sisters > 0>>
- <<set $relation = 0>>
- <<for $i = 0; $i < _SL; $i++>>
- <<if areSisters($activeSlave, $slaves[$i]) > 0 && !isSlaveAvailable($slaves[$i])>>
- <<set $relation++>>
- <</if>>
- <</for>>
- <<if $relation == $activeSlave.sisters>>
- <<if $activeSlave.sisters == 1>>
- //$His sister is unavailable//
- <<else>>
- //$His sisters are unavailable//
- <</if>>
- <<else>>
- <<if $activeSlave.sisters == 1>>
- | <<link "Fuck $him with $his sister">><<replace "#miniscene">><<set $partner = "sister">><<include "FRelation">><br> <</replace>><</link>>
- <<else>>
- | <<link "Fuck $him with one of $his sisters">><<replace "#miniscene">><<set $partner = "sister">><<include "FRelation">><br> <</replace>><</link>>
- <</if>>
+ /*
+ <<if $activeSlave.sisters > 1>>
+ | <<link "Fuck $him with $his sisters">><<replace "#miniscene">><<set $partner = "sisters">><<include "FRelation">><br> <</replace>><</link>>
<</if>>
- <</if>>
- /*
- <<if $activeSlave.sisters > 1>>
- | <<link "Fuck $him with $his sisters">><<replace "#miniscene">><<set $partner = "sisters">><<include "FRelation">><br> <</replace>><</link>>
- <</if>>
- */
- <<else>>
- <<if ($activeSlave.relation != 0)>>
- <<set _assayedSlave = getSlave($activeSlave.relationTarget)>>
- <<if isSlaveAvailable(_assayedSlave)>>
- <<if ($activeSlave.relation == "mother")>>
- | <<link "Fuck $him with $his daughter">><<replace "#miniscene">><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>>
- <<elseif ($activeSlave.relation == "daughter")>>
- | <<link "Fuck $him with $his mother">><<replace "#miniscene">><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>>
- <<elseif ($activeSlave.relation == "sister")>>
- | <<link "Fuck $him with $his sister">><<replace "#miniscene">><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>>
- <<elseif ($activeSlave.relation == "twin")>>
- | <<link "Fuck $him with $his twin">><<replace "#miniscene">><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>>
+ */
+ <<else>>
+ <<if ($activeSlave.relation != 0)>>
+ <<set _assayedSlave = getSlave($activeSlave.relationTarget)>>
+ <<if isSlaveAvailable(_assayedSlave)>>
+ <<if ($activeSlave.relation == "mother")>>
+ | <<link "Fuck $him with $his daughter">><<replace "#miniscene">><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>>
+ <<elseif ($activeSlave.relation == "daughter")>>
+ | <<link "Fuck $him with $his mother">><<replace "#miniscene">><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>>
+ <<elseif ($activeSlave.relation == "sister")>>
+ | <<link "Fuck $him with $his sister">><<replace "#miniscene">><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>>
+ <<elseif ($activeSlave.relation == "twin")>>
+ | <<link "Fuck $him with $his twin">><<replace "#miniscene">><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>>
+ <</if>>
+ <<else>>
+ //_assayedSlave.slaveName is unavailable//
<</if>>
- <<else>>
- //_assayedSlave.slaveName is unavailable//
<</if>>
<</if>>
<</if>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index ff2b1165d12..41ebd5efa9d 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -90,10 +90,10 @@
$He has an exceedingly rare trait associated with some of the ugliest mugs in history.
<</if>>
<<if $activeSlave.geneticQuirks.pFace == 1 && $geneticMappingUpgrade >= 2>>
- $He is a carrier of a combination of triats that can result in perfect facial beauty.
+ $He is a carrier of a combination of traits that can result in perfect facial beauty.
<</if>>
<<if $activeSlave.geneticQuirks.uFace == 1 && $geneticMappingUpgrade >= 2>>
- $He is a carrier of a combination of triats that can result in raw ugliness.
+ $He is a carrier of a combination of traits that can result in raw ugliness.
<</if>>
<<if $activeSlave.geneticQuirks.fertility == 2 && $activeSlave.geneticQuirks.hyperFertility == 2>>
$He has a unique genetic condition resulting in inhumanly high
--
GitLab