diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index 98752fcf4215a6bd3a35e82feb4a01dac5059a8e..ebc75b4c97a723100e341c2b66c5d865c0a1c7c4 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -486,7 +486,7 @@ window.saWhore = (function saWhore() {
slave.health -= 10 - 7*canA*canV; //Any limitations means an injury inflicts the harsher 10 instead of 3
injury = 1;
}
-
+
if (slave.vagina < 0) {
if (!injury) {
r += ` ${He}'s such an expert whore that ${he} copes with the stress of being a ${SlaveTitle(slave)} slut.`;
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index 0428e24e658c1410714788cc5f70b44addf35f52..d8e9aa3ca126f0a5a474dfd6c5cbadc1fefaea9e 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -181,52 +181,54 @@
| <<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 != 0>>
+ <<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>>
- <<else>>
- <<if $activeChild.sisters == 1>>
- | <<link "Fuck $him with $his sister">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "sister">><<include "FRelation">><br> <</replace>><</link>>
+ <<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/descriptionWidgets.js b/src/js/descriptionWidgets.js
index 1389cdef5c65527fc42de38cf180316159e47b5b..867b672af09568dcc29de76aa9e1761adfe962fc 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -504,6 +504,14 @@ App.Desc.ageAndHealth = function(slave) {
r += `barely seventy. `;
} else if (slave.visualAge < 80) {
r += `still in ${his} seventies. `;
+ } else if (slave.visualAge < 85) {
+ r += `barely eighty. `;
+ } else if (slave.visualAge < 90) {
+ r += `still in ${his} eighties. `;
+ } else if (slave.visualAge < 95) {
+ r += `barely ninety. `;
+ } else if (slave.visualAge < 100) {
+ r += `still in ${his} nineties. `;
} else {
r += `a younger ${slave.visualAge}. `;
}
@@ -536,6 +544,12 @@ App.Desc.ageAndHealth = function(slave) {
r += `just over seventy. `;
} else if (slave.visualAge < 80) {
r += `nearly eighty. `;
+ } else if (slave.visualAge < 85) {
+ r += `just over eighty. `;
+ } else if (slave.visualAge < 90) {
+ r += `nearly ninety. `;
+ } else if (slave.visualAge < 95) {
+ r += `just over ninety. `;
} else {
r += `an ancient ${slave.visualAge}. `;
}
@@ -553,7 +567,7 @@ App.Desc.ageAndHealth = function(slave) {
} else if (slave.health <= 20) {
r += `<span class="yellow">healthy</span>`;
} else if (slave.health <= 50) {
- r += `<span class="green">very health</span>`;
+ r += `<span class="green">very healthy</span>`;
} else {
r += `<span class="green">extremely healthy</span>`;
}
diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js
index ddf4573c3be77eb338916fa2f474a81d2fcdf103..35da96dafb9ea09f2591d5bfb0ac1f1ce55baf26 100644
--- a/src/js/extendedFamilyModeJS.js
+++ b/src/js/extendedFamilyModeJS.js
@@ -12,20 +12,50 @@ window.isParentP = function isParentP(daughter, parent) {
return isMotherP(daughter, parent) || isFatherP(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)) {
+ 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)) {
+ return true;
+ }
+ return false;
+};
+
+window.isGrandparentP = function isGrandparentP(granddaughter, grandparent) {
+ return isGrandmotherP(daughter, parent) || isGrandfatherP(daughter, parent);
+};
+
window.sameDad = function(slave1, slave2) {
- if ((slave1.father === slave2.father) && (slave1.father !== 0 && slave1.father !== -2)) {
+ if ((slave1.father === slave2.father) && (specificDad(slave1))) {
return true;
}
return false;
};
window.sameMom = function(slave1, slave2) {
- if ((slave1.mother === slave2.mother) && (slave1.mother !== 0 && slave1.mother !== -2)) {
+ if ((slave1.mother === slave2.mother) && (specificMom(slave1))) {
return true;
}
return false;
};
+window.specificDad = function(slave) {
+ return (slave.father !== 0 && slave.father !== -2 && slave.father !== -4 && slave.father !== -5 && slave.father !== -6 && slave.father !== -7 && slave.father !== -8 && slave.father !== -9);
+};
+
+window.specificMom = function(slave) {
+ return (slave.mother !== 0 && slave.mother !== -2 && slave.mother !== -4 && slave.mother !== -5 && slave.mother !== -6 && slave.mother !== -7 && slave.mother !== -8 && slave.mother !== -9);
+};
+
/**
* @param {App.Entity.SlaveState} niece
* @param {App.Entity.SlaveState} aunt
@@ -39,13 +69,11 @@ window.isAunt = function(niece, aunt) {
if (!niece || !aunt || (niece.ID === aunt.ID)) {
return false;
}
-
- let mother;
- let father;
-
- if ((mother = getSlave(niece.mother)) && (mother.ID !== aunt.ID) && !sameTParent(mother, aunt) && sameMom(mother, aunt) && sameDad(mother, aunt)) {
+ let father = getSlave(niece.father);
+ let mother = getSlave(niece.mother);
+ if ((mother.ID !== aunt.ID) && !sameTParent(mother, aunt) && sameMom(mother, aunt) && sameDad(mother, aunt)) {
return true;
- } else if ((father = getSlave(niece.father)) && (father.ID !== aunt.ID) && !sameTParent(father, aunt) && sameMom(father, aunt) && sameDad(father, aunt)) {
+ } else if ((father.ID !== aunt.ID) && !sameTParent(father, aunt) && sameMom(father, aunt) && sameDad(father, aunt)) {
return true;
}
@@ -56,9 +84,9 @@ window.isAunt = function(niece, aunt) {
window.sameTParent = function(slave1, slave2) {
if (slave1.mother === -1 && slave1.father === -1 && slave2.mother === -1 && slave2.father === -1) {
return 1;
- } else if (slave1.mother === slave2.father && slave1.father === slave2.mother && slave1.mother !== 0 && slave1.mother !== -2 && slave1.father !== 0 && slave1.father !== -2 && slave1.mother !== slave1.father) {
+ } else if (slave1.mother === slave2.father && slave1.father === slave2.mother && specificMom(slave1) && specificDad(slave1)) {
return 2;
- } else if ((slave1.mother === slave2.father || slave1.father === slave2.mother) && slave1.mother !== 0 && slave1.mother !== -2 && slave2.mother !== 0 && slave2.mother !== -2 && slave1.mother !== slave1.father) {
+ } else if ((slave1.mother === slave2.father || slave1.father === slave2.mother) && specificMom(slave1) && specificMom(slave2) && slave1.mother !== slave1.father) {
return 3;
}
return 0;
@@ -93,7 +121,7 @@ window.areTwins = function(slave1, slave2) {
window.areSisters = function(slave1, slave2) {
if (slave1.ID === slave2.ID) {
return 0; // you are not your own sister
- } else if (((slave1.father === 0) || (slave1.father === -2)) && ((slave1.mother === 0) || (slave1.mother === -2))) {
+ } else if (!specificDad(slave1) && !specificMom(slave1)) {
return 0; // not related
} else {
if (!sameDad(slave1, slave2) && sameMom(slave1, slave2)) {
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 1ae2bcda956771ff6727d49ba5e177672ad16b02..f931c98e452ebfd822f9cf6fc349eef7ecf7ea61 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 3f19eebf0a042391d783fc234133595361aceeda..6abd8b0bd12e9dc4f99bda7a64a23f37cccd3d90 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 39cad9a73937d2186aa709c98a0ec6681c697e52..d5a47fb28ebddf12fd90e7f6efa73225d406795a 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/pregmod/geneLab.tw b/src/pregmod/geneLab.tw
index 5084f806e5eae18f022336e36e858b7ab55e9ebd..6c37d50260aae30b6e1ec476520eaa8329959b68 100644
--- a/src/pregmod/geneLab.tw
+++ b/src/pregmod/geneLab.tw
@@ -6,8 +6,6 @@
The Gene Lab
<hr>
-
-
<<if $geneticMappingUpgrade == 1>>
//The gene lab is fully operational. It is capable of mapping a slave's genes, identifying genetic traits and abnormalities. It can be used to modify a slave's genome should you obtain the data necessary to adjust it.//
<br>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index c4538ba9b4eadbd075f63318a0440789c5b6f79c..44ecf45118c65500412be23463575074bb8c193a 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -241,95 +241,97 @@
<</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 != 0>>
+ <<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++>>
+ <<setLocalPronouns $slaves[$i] 2>>
+ <<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 _daughter2 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 _daughter2">><<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++>>
- <<setLocalPronouns $slaves[$i] 2>>
- <<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 _daughter2 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>>
+ <<if $activeSlave.sisters > 0>>
+ <<set $relation = 0>>
+ <<for $i = 0; $i < _SL; $i++>>
+ <<setLocalPronouns $slaves[$i] 2>>
+ <<if areSisters($activeSlave, $slaves[$i]) > 0 && !isSlaveAvailable($slaves[$i])>>
+ <<set $relation++>>
+ <</if>>
+ <</for>>
+ <<if $relation == $activeSlave.sisters>>
+ <<if $activeSlave.sisters == 1>>
+ //$His _sister2 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 _sister2">><<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++>>
- <<setLocalPronouns $slaves[$i] 2>>
- <<if areSisters($activeSlave, $slaves[$i]) > 0 && !isSlaveAvailable($slaves[$i])>>
- <<set $relation++>>
- <</if>>
- <</for>>
- <<if $relation == $activeSlave.sisters>>
- <<if $activeSlave.sisters == 1>>
- //$His _sister2 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>>
- <<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)>>
- <<setLocalPronouns _assayedSlave 2>>
- <<if ($activeSlave.relation == "mother")>>
- | <<link "Fuck $him with $his _daughter2">><<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 _sister2">><<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)>>
+ <<setLocalPronouns _assayedSlave 2>>
+ <<if ($activeSlave.relation == "mother")>>
+ | <<link "Fuck $him with $his _daughter2">><<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 _sister2">><<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/uncategorized/summaryOptions.tw b/src/uncategorized/summaryOptions.tw
index 7f5c9dfbb8c6419bd21314658b4bed2594b6150a..04c1edc13df07a73c0d3bb984224ef21d746dd22 100644
--- a/src/uncategorized/summaryOptions.tw
+++ b/src/uncategorized/summaryOptions.tw
@@ -18,18 +18,18 @@
<br>
<<options $sortSlavesMain>>
- Sortting main menu options are
+ Sorting main menu options are
<<option 1 "Shown">>
<<option 0 "Hidden">>
<</options>>
-<<if $sortSlavesMain > 0>>
+<<if $sortSlavesMain > 0>>
<<options $sortSlavesOrder>>
, sorted by
<<option "ascending" "Ascending">>
<<option "descending" "Descending">>
<</options>>
-
+
<br>
<<options $sortSlavesBy>>
and
@@ -146,7 +146,7 @@
<</options>>
<<options $rulesAssistantMain>>
- Rules Assistant visability:
+ Rules Assistant visibility:
<<option 1 "Shown">>
<<option 0 "Hidden">>
<</options>>