diff --git a/src/js/extendedFamilyModeJS.tw b/src/js/extendedFamilyModeJS.tw index fcffc8caa718c582645e14bb0a2d5f86041e590e..34e0c6d660605e1974d27f56862420c2cc1fb88f 100644 --- a/src/js/extendedFamilyModeJS.tw +++ b/src/js/extendedFamilyModeJS.tw @@ -119,7 +119,7 @@ window.totalRelatives = function(slave) { }; window.mutualChildren = function(slave1, slave2, slaves) { - return slaves.filter(function(s) { return s.ID != slave1.ID && s.ID != slave2.ID && ((s.mother == slave1.ID && s.father == slave2.ID) || (s.mother == slave2.ID && s.father == slave1.ID)); }).length; + return slaves.filter(function(s) { return s.ID != slave1.ID && s.ID != slave2.ID && s.mother > 0 && s.father > 0 && ((s.mother == slave1.ID && s.father == slave2.ID) || (s.mother == slave2.ID && s.father == slave1.ID)); }).length; } window.isSlaveAvailable = function(slave) { diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw index a283f633a6651abcf88dfd7a43748133cf74ffdf..690b3e67afb32c69ad1fc1e80193b5de0a07a092 100644 --- a/src/uncategorized/saRelationships.tw +++ b/src/uncategorized/saRelationships.tw @@ -169,11 +169,11 @@ <<elseif mutualChildren(_SlaveI, _SlaveJ, $slaves) > 0>> <<if (_SlaveI.releaseRules != "restrictive")>> <<if _SlaveJ.relationshipRules == "permissive">> - _SlaveI.slaveName and _SlaveJ.slaveName have <<if mutualChildren(_SlaveI, _SlaveJ, $slaves) == 0>>a child<<else>>children<</if>> living in your penthouse, so it's not surprising that their offsrping brings them together. They have @@.lightgreen;become friends@@ for their child's sake. + _SlaveI.slaveName and _SlaveJ.slaveName have <<if mutualChildren(_SlaveI, _SlaveJ, $slaves) == 0>>a child<<else>>children<</if>> living in your penthouse, so it's not surprising that their offspring brings them together. They have @@.lightgreen;become friends@@ for their child's sake. <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>> <<break>> <<else>> - _SlaveI.slaveName tries to strike up a sexual relationship with _SlaveJ.slaveName and is @@.gold;punished@@ for breaking the rules against such things; she @@.mediumorchid;resents@@ being prevented from pursuing her. + _SlaveI.slaveName tries to renew her relationship relationship with _SlaveJ.slaveName and is @@.gold;punished@@ for breaking the rules against such things; she @@.mediumorchid;resents@@ being prevented from reuniting with her. <<set _SlaveI.devotion -= 2, _SlaveI.trust -= 2>> <</if>> <</if>>