diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js index 44f1bb4c4c128f8f068fac442ca46c596b339fe0..a0926745c0be124592a60c468d5b11263dedcd54 100644 --- a/src/js/extendedFamilyModeJS.js +++ b/src/js/extendedFamilyModeJS.js @@ -375,7 +375,7 @@ window.randomAvailableParent = function(slave) { */ window.availableRelatives = function(slave) { let avail = { - mother: false, motherName: null, father: false, fatherName: null, sisters: 0, daughters: 0 + mother: false, motherName: null, father: false, fatherName: null, sisters: 0, daughters: 0, oneSisterRel: null, oneDaughterRel: null }; V.slaves.forEach((other) => { @@ -394,9 +394,15 @@ window.availableRelatives = function(slave) { } if (slave.ID === other.mother || slave.ID === other.father) { avail.daughters++; + if (avail.daughters === 1) { + avail.oneDaughterRel = relativeTerm(slave, other); + } } if (areSisters(slave, other) > 0) { avail.sisters++; + if (avail.sisters === 1) { + avail.oneSisterRel = relativeTerm(slave, other); + } } } }); diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index decf1cadd7482623ea0018b9b341ff505f067d91..7b94e9f1e5099b779d10d8bedfaaf14bc2fb19a0 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -259,13 +259,13 @@ <<if $activeSlave.daughters > 0>> <<if _availRelatives.daughters == 0>> <<if $activeSlave.daughters == 1>> - //$His _daughter2 is unavailable// + //$His _availRelatives.oneDaughterRel is unavailable// <<else>> //$His daughters are unavailable// <</if>> <<else>> <<if $activeSlave.daughters == 1>> - | <<link "Fuck $him with $his _daughter2">><<replace "#miniscene">><<set $partner = "daughter">><<include "FRelation">><br> <</replace>><</link>> + | <<link "Fuck $him with $his _availRelatives.oneDaughterRel">><<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>> @@ -279,13 +279,13 @@ <<if $activeSlave.sisters > 0>> <<if _availRelatives.sisters == 0>> <<if $activeSlave.sisters == 1>> - //$His _sister2 is unavailable// + //$His _availRelatives.oneSisterRel is unavailable// <<else>> //$His sisters are unavailable// <</if>> <<else>> <<if $activeSlave.sisters == 1>> - | <<link "Fuck $him with $his _sister2">><<replace "#miniscene">><<set $partner = "sister">><<include "FRelation">><br> <</replace>><</link>> + | <<link "Fuck $him with $his _availRelatives.oneSisterRel">><<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>>