From 64b62f3ff8199cabe2cad38c8ca7bf5b2f92cbdd Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sun, 5 Apr 2020 17:14:29 -0700
Subject: [PATCH] Remove legacy family mode (first pass).
---
js/003-data/gameVariableData.js | 2 -
slave variables documentation - Pregmod.txt | 24 --
src/Mods/DinnerParty/dinnerPartyExecution.tw | 85 ++---
src/cheats/mod_EditChildCheatNew.tw | 23 +-
src/cheats/mod_EditInfantCheatNew.tw | 23 +-
src/cheats/mod_EditSlaveCheat.tw | 26 +-
src/cheats/mod_editSlaveCheatNew.tw | 23 +-
.../backwardsCompatibility/datatypeCleanup.js | 6 -
.../updateSlaveObject.js | 7 -
src/data/newGamePlus.js | 28 --
src/endWeek/saBeYourHeadGirl.js | 148 +++-----
src/endWeek/saPleaseYou.js | 95 +++--
src/endWeek/saServeThePublic.js | 62 +---
src/endWeek/saWhore.js | 66 ++--
src/events/intro/introSummary.tw | 46 +--
src/facilities/nursery/childInteract.tw | 130 +++----
.../nursery/nurseryDatatypeCleanup.js | 3 -
src/facilities/nursery/nurseryWidgets.js | 136 +------
src/interaction/main/walkPast.js | 17 +-
src/interaction/slaveInteract.js | 112 +++---
src/js/SlaveState.js | 8 -
src/js/assayJS.js | 38 +-
src/js/eventSelectionJS.js | 20 +-
src/js/extendedFamilyModeJS.js | 150 ++++----
src/js/generateRelatedSlave.js | 19 +-
src/js/heroCreator.js | 57 ++-
src/js/releaseRules.js | 6 +-
src/js/removeActiveSlave.js | 8 -
src/js/slaveCostJS.js | 17 +-
src/js/slaveSummaryWidgets.js | 85 +----
src/js/storyJS.js | 15 -
src/npc/acquisition.tw | 110 +++---
src/npc/databases/cheatmodeDatabase.tw | 12 +-
src/npc/interaction/fFeelings.tw | 2 -
src/npc/interaction/fSlaveFeed.tw | 66 ----
src/npc/interaction/passage/fSlaveImpreg.tw | 2 +-
.../interaction/passage/fSlaveSlaveDick.tw | 2 +-
src/npc/interaction/passage/fSlaveSlaveVag.tw | 2 +-
src/npc/rgASDump.tw | 24 --
src/npc/slaveStats.tw | 3 -
src/npc/startingGirls/commitStartingGirl.tw | 80 +----
src/npc/startingGirls/startingGirls.tw | 96 +----
src/player/js/enslavePlayer.js | 3 -
src/pregmod/eliteTakeOverResult.tw | 2 -
src/pregmod/killSlave.tw | 151 ++++----
src/pregmod/managePersonalAffairs.tw | 38 +-
src/pregmod/reTheSirenStrikesBack.tw | 4 -
src/uncategorized/RETS.tw | 12 +-
src/uncategorized/REroyalblood.tw | 118 ++-----
src/uncategorized/householdLiquidator.tw | 40 +--
src/uncategorized/longSlaveDescription.tw | 39 +-
src/uncategorized/managePenthouse.tw | 6 +-
src/uncategorized/newSlaveIntro.tw | 15 -
src/uncategorized/nextWeek.tw | 3 -
src/uncategorized/options.tw | 36 +-
src/uncategorized/pCoupAttempt.tw | 74 ++--
src/uncategorized/pCoupBetrayal.tw | 74 ++--
src/uncategorized/pUndergroundRailroad.tw | 168 ++++-----
src/uncategorized/randomNonindividualEvent.tw | 154 +++-----
src/uncategorized/reBoomerang.tw | 89 ++---
.../reFSEgyptianRevivalistAcquisition.tw | 21 +-
src/uncategorized/reMilfTourist.tw | 1 -
src/uncategorized/reRelativeRecruiter.tw | 332 ------------------
src/uncategorized/recETS.tw | 319 ++++-------------
src/uncategorized/saRecruitGirls.tw | 56 +--
src/uncategorized/saRelationships.tw | 76 ++--
src/uncategorized/saRules.tw | 2 +-
src/uncategorized/seLethalPit.tw | 9 -
src/uncategorized/slaveInteract.tw | 14 +-
src/uncategorized/slaveSold.tw | 172 ++++-----
src/uncategorized/surgeryDegradation.tw | 50 +--
src/utility/slaveCreationWidgets.tw | 6 +-
72 files changed, 1105 insertions(+), 2863 deletions(-)
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 3bae3e47e6a..42443539173 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -587,8 +587,6 @@ App.Data.resetOnNGPlus = {
invasionVictory: 0,
daughtersVictory: 0,
startingGirlCopied: 0,
- startingGirlRelation: 0,
- createRelatedSlave: 0,
slavesVisible: 0,
dormitory: 20,
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 5900a574bcc..4159abc1469 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -798,30 +798,6 @@ accepts string
"$He is a famed Free Cities slut, and can please anyone."
"$He is a famed Free Cities whore, and commands top prices."
-recruiter:
-
-slave's relation to recruited slave? (used in some events)
-"mother"
-"daughter"
-"older sister"
-"younger sister"
-"twin"
-good idea to leave at 0
-
-relation:
-
-relation to relationTarget
-accepts string
-"twin"
-"sister"
-"mother"
-"daughter"
-
-relationTarget:
-
-target of relation
-accepts ID
-
relationship:
slave's relationship
diff --git a/src/Mods/DinnerParty/dinnerPartyExecution.tw b/src/Mods/DinnerParty/dinnerPartyExecution.tw
index 72b03b3cccf..12625b45142 100644
--- a/src/Mods/DinnerParty/dinnerPartyExecution.tw
+++ b/src/Mods/DinnerParty/dinnerPartyExecution.tw
@@ -465,56 +465,43 @@
<br><br>
/% Clean up and slaves reactions %/
When the last of your guests has stumbled drunkenly out your door, your slaves begin the daunting task of cleanup.
- <<if $familyTesting == 1>>
- <<for _dpe = 0; _dpe < $slaves.length; _dpe++>>
- <<setLocalPronouns $slaves[_dpe] 2>>
- <<if $activeSlave.mother == $slaves[_dpe].ID>>
- $slaves[_dpe].slaveName is @@.mediumorchid;distraught@@ that you ate _his2 $daughter. _He2 also @@.gold;fears@@ that _he2 will be next.
- <br><br>
- <<set $slaves[_dpe].devotion -= 20, $slaves[_dpe].trust -= 20>>
- <</if>>
- <<if $activeSlave.father == $slaves[_dpe].ID>>
- $slaves[_dpe].slaveName is @@.mediumorchid;distraught@@ that you ate _his2 $daughter. _He2 also @@.gold;fears@@ that _he2 will be next.
- <br><br>
- <<set $slaves[_dpe].devotion -= 10, $slaves[_dpe].trust -= 10>>
- <</if>>
- <<if $activeSlave.ID == $slaves[_dpe].father>>
- $slaves[_dpe].slaveName is @@.mediumorchid;grieved@@ that you ate _his2 father. _He2 also @@.gold;fears@@ that _he2 will be next.
- <br><br>
- <<set $slaves[_dpe].devotion -= 10, $slaves[_dpe].trust -= 10>>
- <</if>>
- <<if $activeSlave.ID == $slaves[_dpe].mother>>
- $slaves[_dpe].slaveName is @@.mediumorchid;grieved@@ that you ate _his2 mother. _He2 also @@.gold;fears@@ that _he2 will be next.
- <br><br>
- <<set $slaves[_dpe].devotion -= 20, $slaves[_dpe].trust -= 20>>
- <</if>>
- <<switch areSisters($activeSlave, $slaves[_dpe])>>
- <<case 1>>
- $slaves[_dpe].slaveName is @@.mediumorchid;devastated@@ that you ate _his2 twin. _He2 also @@.gold;fears@@ that _he2 will be next.
- <br><br>
- <<set $slaves[_dpe].devotion -= 30, $slaves[_dpe].trust -= 30>>
- <<case 2>>
- $slaves[_dpe].slaveName is @@.mediumorchid;grieved@@ that you ate _his2 $sister. _He2 also @@.gold;fears@@ that _he2 will be next.
- <br><br>
- <<set $slaves[_dpe].devotion -= 20, $slaves[_dpe].trust -= 20>>
- <<case 3>>
- $slaves[_dpe].slaveName is @@.mediumorchid;disheartened@@ that you ate _his2 half-<<= $sister>>. _He2 also @@.gold;fears@@ that _he2 will be next.
- <br><br>
- <<set $slaves[_dpe].devotion -= 10, $slaves[_dpe].trust -= 10>>
- <</switch>>
- <</for>>
- <<else>>
- <<if $activeSlave.relation != 0>>
- <<for _dpe = 0; _dpe < $slaves.length; _dpe++>>
- <<setLocalPronouns $slaves[_dpe]>>
- <<if ($slaves[_dpe].ID == $activeSlave.relationTarget) && ($slaves[_dpe].fetish != "mindbroken")>>
- $slaves[_dpe].slaveName is @@.mediumorchid;distraught@@ that you ate _his2 $activeSlave.relation. _He2 also @@.gold;fears@@ that _he2 will be next.
- <<set $slaves[_dpe].devotion -= 20, $slaves[_dpe].trust -= 20>>
- <<break>>
- <</if>>
- <</for>>
+ <<for _dpe = 0; _dpe < $slaves.length; _dpe++>>
+ <<setLocalPronouns $slaves[_dpe] 2>>
+ <<if $activeSlave.mother == $slaves[_dpe].ID>>
+ $slaves[_dpe].slaveName is @@.mediumorchid;distraught@@ that you ate _his2 $daughter. _He2 also @@.gold;fears@@ that _he2 will be next.
+ <br><br>
+ <<set $slaves[_dpe].devotion -= 20, $slaves[_dpe].trust -= 20>>
<</if>>
- <</if>>
+ <<if $activeSlave.father == $slaves[_dpe].ID>>
+ $slaves[_dpe].slaveName is @@.mediumorchid;distraught@@ that you ate _his2 $daughter. _He2 also @@.gold;fears@@ that _he2 will be next.
+ <br><br>
+ <<set $slaves[_dpe].devotion -= 10, $slaves[_dpe].trust -= 10>>
+ <</if>>
+ <<if $activeSlave.ID == $slaves[_dpe].father>>
+ $slaves[_dpe].slaveName is @@.mediumorchid;grieved@@ that you ate _his2 father. _He2 also @@.gold;fears@@ that _he2 will be next.
+ <br><br>
+ <<set $slaves[_dpe].devotion -= 10, $slaves[_dpe].trust -= 10>>
+ <</if>>
+ <<if $activeSlave.ID == $slaves[_dpe].mother>>
+ $slaves[_dpe].slaveName is @@.mediumorchid;grieved@@ that you ate _his2 mother. _He2 also @@.gold;fears@@ that _he2 will be next.
+ <br><br>
+ <<set $slaves[_dpe].devotion -= 20, $slaves[_dpe].trust -= 20>>
+ <</if>>
+ <<switch areSisters($activeSlave, $slaves[_dpe])>>
+ <<case 1>>
+ $slaves[_dpe].slaveName is @@.mediumorchid;devastated@@ that you ate _his2 twin. _He2 also @@.gold;fears@@ that _he2 will be next.
+ <br><br>
+ <<set $slaves[_dpe].devotion -= 30, $slaves[_dpe].trust -= 30>>
+ <<case 2>>
+ $slaves[_dpe].slaveName is @@.mediumorchid;grieved@@ that you ate _his2 $sister. _He2 also @@.gold;fears@@ that _he2 will be next.
+ <br><br>
+ <<set $slaves[_dpe].devotion -= 20, $slaves[_dpe].trust -= 20>>
+ <<case 3>>
+ $slaves[_dpe].slaveName is @@.mediumorchid;disheartened@@ that you ate _his2 half-<<= $sister>>. _He2 also @@.gold;fears@@ that _he2 will be next.
+ <br><br>
+ <<set $slaves[_dpe].devotion -= 10, $slaves[_dpe].trust -= 10>>
+ <</switch>>
+ <</for>>
<<if $activeSlave.relationship != 0>>
<<for _dpe = 0; _dpe < $slaves.length; _dpe++>>
<<setLocalPronouns $slaves[_dpe]>>
diff --git a/src/cheats/mod_EditChildCheatNew.tw b/src/cheats/mod_EditChildCheatNew.tw
index 5c3398eb7c8..29a8e4cecf8 100644
--- a/src/cheats/mod_EditChildCheatNew.tw
+++ b/src/cheats/mod_EditChildCheatNew.tw
@@ -120,21 +120,14 @@
<br>
''Active Slaves ID : @@.yellow;$tempSlave.ID@@''
<br><br>
- <<if $familyTesting == 1>>
- ''Enter the IDs for this slave's parents (0: unknown, -1: you, -2: citizen):''
- <br>
- ''mother ID''
- <<textbox "$tempSlave.mother" $tempSlave.mother>>
- <br>
- ''father ID''
- <<textbox "$tempSlave.father" $tempSlave.father>>
- <br><br>
- <<else>>
- ''Slave Blood Relations (twin, sister, mother, daughter):''
- <<textbox "$tempSlave.relation" $tempSlave.relation>>
- ''Blood Relations Target ID:''
- <<textbox "$tempSlave.relationTarget" $tempSlave.relationTarget>>
- <</if>>
+ ''Enter the IDs for this slave's parents (0: unknown, -1: you, -2: citizen):''
+ <br>
+ ''mother ID''
+ <<textbox "$tempSlave.mother" $tempSlave.mother>>
+ <br>
+ ''father ID''
+ <<textbox "$tempSlave.father" $tempSlave.father>>
+ <br><br>
<br><br>
''Relationship (-3:married to you, -2:relationship, -1:emotional slut, 0:none, 1:like, 2:friend, 3:sex friend, 4:lover, 5:married):''
diff --git a/src/cheats/mod_EditInfantCheatNew.tw b/src/cheats/mod_EditInfantCheatNew.tw
index 271192a80d1..0aaa53a152f 100644
--- a/src/cheats/mod_EditInfantCheatNew.tw
+++ b/src/cheats/mod_EditInfantCheatNew.tw
@@ -122,21 +122,14 @@
<br>
''Active Slaves ID : @@.yellow;$tempSlave.ID@@''
<br><br>
- <<if $familyTesting == 1>>
- ''Enter the IDs for this slave's parents (0: unknown, -1: you, -2: citizen):''
- <br>
- ''mother ID''
- <<textbox "$tempSlave.mother" $tempSlave.mother>>
- <br>
- ''father ID''
- <<textbox "$tempSlave.father" $tempSlave.father>>
- <br><br>
- <<else>>
- ''Slave Blood Relations (twin, sister, mother, daughter):''
- <<textbox "$tempSlave.relation" $tempSlave.relation>>
- ''Blood Relations Target ID:''
- <<textbox "$tempSlave.relationTarget" $tempSlave.relationTarget>>
- <</if>>
+ ''Enter the IDs for this slave's parents (0: unknown, -1: you, -2: citizen):''
+ <br>
+ ''mother ID''
+ <<textbox "$tempSlave.mother" $tempSlave.mother>>
+ <br>
+ ''father ID''
+ <<textbox "$tempSlave.father" $tempSlave.father>>
+ <br><br>
<br><br>
''Relationship (-3:married to you, -2:relationship, -1:emotional slut, 0:none, 1:like, 2:friend, 3:sex friend, 4:lover, 5:married):''
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index 29b97e893d6..525c142dc31 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -25,24 +25,14 @@
<br>
-<<if $familyTesting == 1>>
- ''Enter the IDs for this slave's parents(0: unknown, -1: you, -2: citizen):''
- <br>
- ''mother ID''
- <<textbox "$tempSlave.mother" $tempSlave.mother>>
- <br>
- ''father ID''
- <<textbox "$tempSlave.father" $tempSlave.father>>
- <br><br>
-<<else>>
- ''Slave Blood Relations (twin, sister, mother, daughter):''
- <<textbox "$tempSlave.relation" $tempSlave.relation>>
-
- <br>
-
- ''Blood Relations Target ID:''
- <<textbox "$tempSlave.relationTarget" $tempSlave.relationTarget>>
-<</if>>
+''Enter the IDs for this slave's parents(0: unknown, -1: you, -2: citizen):''
+<br>
+''mother ID''
+<<textbox "$tempSlave.mother" $tempSlave.mother>>
+<br>
+''father ID''
+<<textbox "$tempSlave.father" $tempSlave.father>>
+<br><br>
<br>
''Relationship (-3:married to you, -2:relationship, -1:emotional slut, 0:none, 1:like, 2:friend, 3:sex friend, 4:lover, 5:married): $tempSlave.relationship |''
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index bb4f6e37e8a..c0b5488f576 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -54,21 +54,14 @@
<br>
''Active Slaves ID : @@.yellow;$tempSlave.ID@@''
<br><br>
- <<if $familyTesting == 1>>
- ''Enter the IDs for this slave's parents (0: unknown, -1: you, -2: citizen):''
- <br>
- ''mother ID''
- <<textbox "$tempSlave.mother" $tempSlave.mother>>
- <br>
- ''father ID''
- <<textbox "$tempSlave.father" $tempSlave.father>>
- <br><br>
- <<else>>
- ''Slave Blood Relations (twin, sister, mother, daughter):''
- <<textbox "$tempSlave.relation" $tempSlave.relation>>
- ''Blood Relations Target ID:''
- <<textbox "$tempSlave.relationTarget" $tempSlave.relationTarget>>
- <</if>>
+ ''Enter the IDs for this slave's parents (0: unknown, -1: you, -2: citizen):''
+ <br>
+ ''mother ID''
+ <<textbox "$tempSlave.mother" $tempSlave.mother>>
+ <br>
+ ''father ID''
+ <<textbox "$tempSlave.father" $tempSlave.father>>
+ <br><br>
<br><br>
''Relationship (-3:married to you, -2:relationship, -1:emotional slut, 0:none, 1:like, 2:friend, 3:sex friend, 4:lover, 5:married):''
diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index c60a6ff8ae6..a54151896c9 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -935,9 +935,6 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
function slaveRelationDatatypeCleanup(slave) {
slave.mother = +slave.mother || 0;
slave.father = +slave.father || 0;
- if (V.familyTesting === 0) {
- slave.relationTarget = Math.max(+slave.relationTarget, 0) || 0;
- }
slave.canRecruit = Math.clamp(+slave.canRecruit, 0, 1) || 0;
slave.relationship = Math.clamp(+slave.relationship, -3, 5) || 0;
slave.relationshipTarget = Math.max(+slave.relationshipTarget, 0) || 0;
@@ -1493,9 +1490,6 @@ window.childPornDatatypeCleanup = function childPornDatatypeCleanup(child) {
window.childRelationDatatypeCleanup = function childRelationDatatypeCleanup(child) {
child.mother = +child.mother || 0;
child.father = +child.father || 0;
- if (State.variables.familyTesting === 0) {
- child.relationTarget = Math.max(+child.relationTarget, 0) || 0;
- }
child.canRecruit = Math.clamp(+child.canRecruit, 0, 1) || 0;
child.relationship = Math.clamp(+child.relationship, -3, 5) || 0;
child.relationshipTarget = Math.max(+child.relationshipTarget, 0) || 0;
diff --git a/src/data/backwardsCompatibility/updateSlaveObject.js b/src/data/backwardsCompatibility/updateSlaveObject.js
index 89c8ce1546a..4b74333a5c6 100644
--- a/src/data/backwardsCompatibility/updateSlaveObject.js
+++ b/src/data/backwardsCompatibility/updateSlaveObject.js
@@ -279,13 +279,6 @@ App.Update.Slave = function(slave, genepool=false) {
slave.relationshipTarget = 0;
}
}
- if (V.familyTesting === 0 && slave.relation !== 0) {
- backwardsCompatibility = V.slaveIndices[slave.relationTarget];
- if (backwardsCompatibility === undefined) {
- slave.relation = 0;
- slave.relationTarget = 0;
- }
- }
if (slave.race === "surgically altered to look amerindian") {
slave.race = "amerindian";
diff --git a/src/data/newGamePlus.js b/src/data/newGamePlus.js
index 3301f7de6be..6da636ff813 100644
--- a/src/data/newGamePlus.js
+++ b/src/data/newGamePlus.js
@@ -95,7 +95,6 @@ App.Data.NewGamePlus = (function() {
if (typeof V.ngpParams.nationality === 'string') {
slave.nationality = V.ngpParams.nationality;
}
- slave.relationTarget = ngpSlaveID(slave.relationTarget);
slave.relationshipTarget = ngpSlaveID(slave.relationshipTarget);
slave.cloneID = ngpSlaveID(slave.cloneID);
slave.pregSource = ngpSlaveID(slave.pregSource, true);
@@ -116,7 +115,6 @@ App.Data.NewGamePlus = (function() {
slave.pregSource = slaveOrZero(slave.pregSource);
slave.cloneID = slaveOrZero(slave.cloneID);
slave.relationshipTarget = slaveOrZero(slave.relationshipTarget);
- slave.relationTarget = slaveOrZero(slave.relationTarget);
}
V.genePool = ngUpdateGenePool(V.genePool);
if (typeof V.missingTable === undefined || V.showMissingSlaves === false) {
@@ -124,34 +122,8 @@ App.Data.NewGamePlus = (function() {
} else {
V.missingTable = ngUpdateMissingTable(V.missingTable);
}
- let validRelation = (s) => (s.relationTarget !== 0 && getSlave(s.relationTarget).relationTarget === s.ID);
let validRelationship = (s) => (s.relationshipTarget !== 0 && getSlave(s.relationshipTarget).relationshipTarget === s.ID);
for (let slave of V.slaves) {
- if (V.familyTesting === 1) {
- if (slave.canRecruit === 1) {
- /* V.recruiters.push(slave);*/
- }
- } else {
- if (slave.relation === 0) {
- if (random(1, 100) <= 5) {
- slave.recruiter = "twin";
- } else if ((slave.actualAge > 32) && (random(1, 100) <= 41)) {
- slave.recruiter = "mother";
- } else if ((slave.actualAge < 24) && (random(1, 100) <= 40)) {
- slave.recruiter = "daughter";
- } else if ((slave.actualAge < 43) && (random(1, 100) <= 20)) {
- slave.recruiter = "older sister";
- } else if ((slave.actualAge < 25) && (slave.actualAge > 18) && (random(1, 100) <= 20)) {
- slave.recruiter = "young sister";
- }
- } else {
- if (!validRelation(slave)) {
- slave.relation = 0;
- slave.relationTarget = 0;
- }
- slave.recruiter = 0;
- }
- }
if ((slave.relationship < 0 && V.freshPC === 1) || (slave.relationship > 0 && !validRelationship(slave))) {
slave.relationship = 0;
slave.relationshipTarget = 0;
diff --git a/src/endWeek/saBeYourHeadGirl.js b/src/endWeek/saBeYourHeadGirl.js
index e94554dc8a7..239293364f3 100644
--- a/src/endWeek/saBeYourHeadGirl.js
+++ b/src/endWeek/saBeYourHeadGirl.js
@@ -61,116 +61,78 @@ window.saBeYourHeadGirl = (function saBeYourHeadGirl() {
function jobPreface(slave) {
if (arcology.FSEgyptianRevivalistLaw === 0) {
r.push(`helps manage your other slaves. ${He} helps them when they try and fail, and punishes them when they fail to try.`);
- if (V.HGEnergy === 0) {
- r.push(`${He} was <span class="red">too exhausted</span> to make any real progress this week, however.`);
- }
} else {
r.push(`serves as your Consort. Though ${he} is still your slave, ${his} status is scarcely below that of a citizen. ${He} <span class="green">contributes to your reputation</span> just like a Concubine, and ${he} is <span class="hotpink">conscious</span> of the <span class="mediumaquamarine">trust</span> you place in ${him}.`);
slave.devotion += 1;
slave.trust += 1;
saPleaseYou(slave);
- if (slave.relationship > 4) {
- if (V.familyTesting === 1) {
- if (slave.relationshipTarget === V.Concubine.ID) {
- const concubinePronouns = getPronouns(V.Concubine);
- if (areRelated(V.Concubine, slave) > 0) {
- if (V.Concubine.mother === slave.ID || V.Concubine.father === slave.ID) {
- r.push(`Your Concubine is your Consort's ${concubinePronouns.daughter}-${concubinePronouns.wife}. Truly, ${arcology.name} looks up to you <span class="green">as children to a father.</span>`);
+ if (slave.relationship > 4 && slave.relationshipTarget === V.Concubine.ID) {
+ if (areRelated(V.Concubine, slave)) {
+ const concubinePronouns = getPronouns(V.Concubine);
+ if (V.Concubine.mother === slave.ID || V.Concubine.father === slave.ID) {
+ r.push(`Your Concubine is your Consort's ${concubinePronouns.daughter}-${concubinePronouns.wife}. Truly, ${arcology.name} looks up to you <span class="green">as children to a father.</span>`);
+ repX(1000, "headGirl", slave);
+ } else if (slave.mother === V.Concubine.ID) {
+ r.push(`Your Concubine is your Consort's mother-${concubinePronouns.wife}. Truly, ${arcology.name} looks up to you <span class="green">as children to a father.</span>`);
+ repX(1000, "headGirl", slave);
+ } else if (slave.father === V.Concubine.ID) {
+ r.push(`Your Concubine is your Consort's father-${concubinePronouns.wife}. Truly, ${arcology.name} looks up to you <span class="green">as children to a father.</span>`);
+ repX(1000, "headGirl", slave);
+ } else {
+ switch (areSisters(slave, V.Concubine)) {
+ case 1:
+ r.push(`Your Concubine is your Consort's twin-${concubinePronouns.wife}. Truly, ${arcology.name} looks up to you <span class="green">as children to a father.</span>`);
repX(1000, "headGirl", slave);
- } else if (slave.mother === V.Concubine.ID) {
- r.push(`Your Concubine is your Consort's mother-${concubinePronouns.wife}. Truly, ${arcology.name} looks up to you <span class="green">as children to a father.</span>`);
+ break;
+ case 2:
+ r.push(`Your Concubine is your Consort's ${concubinePronouns.sister}-${concubinePronouns.wife}. Truly, ${arcology.name} looks up to you <span class="green">as children to a father.</span>`);
repX(1000, "headGirl", slave);
- } else if (slave.father === V.Concubine.ID) {
- r.push(`Your Concubine is your Consort's father-${concubinePronouns.wife}. Truly, ${arcology.name} looks up to you <span class="green">as children to a father.</span>`);
+ break;
+ case 3:
+ r.push(`Your Concubine is your Consort's half-${concubinePronouns.sister}-${concubinePronouns.wife}. Truly, ${arcology.name} looks up to you <span class="green">as children to a father.</span>`);
repX(1000, "headGirl", slave);
- } else {
- switch (areSisters(slave, V.Concubine)) {
- case 1:
- r.push(`Your Concubine is your Consort's twin-${concubinePronouns.wife}. Truly, ${arcology.name} looks up to you <span class="green">as children to a father.</span>`);
- repX(1000, "headGirl", slave);
- break;
- case 2:
- r.push(`Your Concubine is your Consort's ${concubinePronouns.sister}-${concubinePronouns.wife}. Truly, ${arcology.name} looks up to you <span class="green">as children to a father.</span>`);
- repX(1000, "headGirl", slave);
- break;
- case 3:
- r.push(`Your Concubine is your Consort's half-${concubinePronouns.sister}-${concubinePronouns.wife}. Truly, ${arcology.name} looks up to you <span class="green">as children to a father.</span>`);
- repX(1000, "headGirl", slave);
- break;
- default:
- r.push(`<span style="bold">Shit went wrong! Post this in a bug report!</span> This is <span class="red">NOT as it should be.</span>`);
- repX(500, "headGirl", slave);
- }
- }
- } else {
- r.push(`Your Consort and your Concubine are`);
- if (wife === concubinePronouns.wife) {
- r.push(`${wives}`);
- } else {
- r.push(`married`);
- }
- r.push(`to each other and to Pharaoh. This is <span class="green"> as it should be.</span>`);
- repX(500, "headGirl", slave);
+ break;
+ default:
+ r.push(`<span style="bold">Shit went wrong! Post this in a bug report!</span> This is <span class="red">NOT as it should be.</span>`);
+ repX(500, "headGirl", slave);
}
+ }
+ }
+ } else {
+ if (totalRelatives(slave) > 0) {
+ let relation = getSlave(slave.relationshipTarget);
+ const relationPronouns = getPronouns(relation);
+ if (relation.mother === slave.ID || relation.father === slave.ID) {
+ r.push(`Your Consort has a ${relationPronouns.daughter}-${relationPronouns.wife}. This is <span class="green">as it should be.</span>`);
+ repX(500, "headGirl", slave);
+ } else if (slave.mother === relation.ID) {
+ r.push(`Your Consort has a mother-${relationPronouns.wife}. This is <span class="green">as it should be.</span>`);
+ repX(500, "headGirl", slave);
+ } else if (slave.father === relation.ID) {
+ r.push(`Your Consort has a father-${relationPronouns.wife}. This is <span class="green">as it should be.</span>`);
+ repX(500, "headGirl", slave);
} else {
- if (totalRelatives(slave) > 0) {
- let relation = getSlave(slave.relationshipTarget);
- const relationPronouns = getPronouns(relation);
- if (relation.mother === slave.ID || relation.father === slave.ID) {
- r.push(`Your Consort has a ${relationPronouns.daughter}-${relationPronouns.wife}. This is <span class="green">as it should be.</span>`);
+ switch (areSisters(slave, relation)) {
+ case 1:
+ r.push(`Your Consort has a twin-${relationPronouns.wife}. This is <span class="green">as it should be.</span>`);
repX(500, "headGirl", slave);
- } else if (slave.mother === relation.ID) {
- r.push(`Your Consort has a mother-${relationPronouns.wife}. This is <span class="green">as it should be.</span>`);
+ break;
+ case 2:
+ r.push(`Your Consort has a ${relationPronouns.sister}-${relationPronouns.wife}. This is <span class="green">as it should be.</span>`);
repX(500, "headGirl", slave);
- } else if (slave.father === relation.ID) {
- r.push(`Your Consort has a father-${relationPronouns.wife}. This is <span class="green">as it should be.</span>`);
+ break;
+ case 3:
+ r.push(`Your Consort has a half-${relationPronouns.sister}-${relationPronouns.wife}. This is <span class="green">as it should be.</span>`);
repX(500, "headGirl", slave);
- } else {
- switch (areSisters(slave, relation)) {
- case 1:
- r.push(`Your Consort has a twin-${relationPronouns.wife}. This is <span class="green">as it should be.</span>`);
- repX(500, "headGirl", slave);
- break;
- case 2:
- r.push(`Your Consort has a ${relationPronouns.sister}-${relationPronouns.wife}. This is <span class="green">as it should be.</span>`);
- repX(500, "headGirl", slave);
- break;
- case 3:
- r.push(`Your Consort has a half-${relationPronouns.sister}-${relationPronouns.wife}. This is <span class="green">as it should be.</span>`);
- repX(500, "headGirl", slave);
- break;
- }
- }
- }
- }
- } else {
- if (slave.relationshipTarget === V.Concubine.ID) {
- const concubinePronouns = getPronouns(V.Concubine);
- if (slave.relationTarget === V.Concubine.ID) {
- r.push(`Your Concubine is your Consort's slave.relation-${concubinePronouns.wife}. Truly, ${arcology.name} looks up to you <span class="green">as children to a father.</span>`);
- repX(1000, "headGirl", slave);
- } else {
- r.push(`Your Consort and your Concubine are`);
- if (wife === concubinePronouns.wife) {
- r.push(`${wives}`);
- } else {
- r.push(`married`);
- }
- r.push(`to each other and to Pharaoh. This is <span class="green"> as it should be.</span>`);
- repX(500, "headGirl", slave);
+ break;
}
- } else if (slave.relationshipTarget === slave.relationTarget) {
- let relation = getSlave(slave.relationshipTarget);
- const relationPronouns = getPronouns(relation);
- r.push(`Your Consort has a slave.relation-${relationPronouns.wife}. This is <span class="green">as it should be.</span>`);
- repX(500, "headGirl", slave);
}
- } /* closes extended family mode */
- }
- if (V.HGEnergy === 0) {
- r.push(`${He} was <span class="red">too exhausted</span> to make any real progress with your slaves this week, however.`);
+ }
}
}
+ if (V.HGEnergy === 0) {
+ r.push(`${He} was <span class="red">too exhausted</span> to make any real progress with your slaves this week, however.`);
+ }
}
/**
diff --git a/src/endWeek/saPleaseYou.js b/src/endWeek/saPleaseYou.js
index da7b2eda3e5..4cf0837761e 100644
--- a/src/endWeek/saPleaseYou.js
+++ b/src/endWeek/saPleaseYou.js
@@ -1596,67 +1596,58 @@ window.saPleaseYou = (function saPleaseYou() {
let spy;
let children;
- if (V.familyTesting === 1) {
- if (slave.father === -1 && slave.mother !== -1) {
- r.push(`Keeping your own ${daughter} as a personal fucktoy leaves quite a public impression.`);
- } else if (slave.father > 0 && slave.mother !== slave.father) {
- spy = V.slaveIndices[slave.father];
- if ((spy !== undefined) && (V.slaves[spy].assignment === "please you" || V.slaves[spy].assignment === "serve in the master suite" || V.slaves[spy].assignment === "be your Concubine")) {
- r.push(`Since you are also keeping ${his} father as a sexual servant, you often use them together, which leaves quite a public impression.`);
- }
+ if (slave.father === -1 && slave.mother !== -1) {
+ r.push(`Keeping your own ${daughter} as a personal fucktoy leaves quite a public impression.`);
+ } else if (slave.father > 0 && slave.mother !== slave.father) {
+ spy = V.slaveIndices[slave.father];
+ if ((spy !== undefined) && (V.slaves[spy].assignment === "please you" || V.slaves[spy].assignment === "serve in the master suite" || V.slaves[spy].assignment === "be your Concubine")) {
+ r.push(`Since you are also keeping ${his} father as a sexual servant, you often use them together, which leaves quite a public impression.`);
}
+ }
- if (slave.mother === -1) {
- r.push(`Keeping your own ${daughter} as a personal fucktoy leaves quite a public impression.`);
- } else if (slave.mother > 0) {
- spy = V.slaveIndices[slave.mother];
- if ((spy !== undefined) && (V.slaves[spy].assignment === "please you" || V.slaves[spy].assignment === "serve in the master suite" || V.slaves[spy].assignment === "be your Concubine")) {
- r.push(`Since you are also keeping ${his} mother as a sexual servant, you often use them together, which leaves quite a public impression.`);
- }
+ if (slave.mother === -1) {
+ r.push(`Keeping your own ${daughter} as a personal fucktoy leaves quite a public impression.`);
+ } else if (slave.mother > 0) {
+ spy = V.slaveIndices[slave.mother];
+ if ((spy !== undefined) && (V.slaves[spy].assignment === "please you" || V.slaves[spy].assignment === "serve in the master suite" || V.slaves[spy].assignment === "be your Concubine")) {
+ r.push(`Since you are also keeping ${his} mother as a sexual servant, you often use them together, which leaves quite a public impression.`);
}
+ }
- children = V.slaves.filter(function(s) { return (s.father === slave.ID || s.mother === slave.ID) && (s.assignment === "please you" || s.assignment === "serve in the master suite" || s.assignment === "be your Concubine"); });
- if (children.length > 2) {
- r.push(`Since you are also keeping ${his} daughters,`);
- for (spy = 0; spy < children.length; spy++) {
- if (spy < children.length - 1) {
- r.push(`${children[spy].slaveName},`);
- } else {
- r.push(`and ${children[spy].slaveName},`);
- }
+ children = V.slaves.filter(function(s) { return (s.father === slave.ID || s.mother === slave.ID) && (s.assignment === "please you" || s.assignment === "serve in the master suite" || s.assignment === "be your Concubine"); });
+ if (children.length > 2) {
+ r.push(`Since you are also keeping ${his} daughters,`);
+ for (spy = 0; spy < children.length; spy++) {
+ if (spy < children.length - 1) {
+ r.push(`${children[spy].slaveName},`);
+ } else {
+ r.push(`and ${children[spy].slaveName},`);
}
- r.push(`as sexual servants, you often enjoy them all at once, which leaves quite a public impression.`);
- } else if (children.length > 1) {
- r.push(`Since you are also keeping ${his} daughters, ${children[0].slaveName} and ${children[1].slaveName}, as sexual servants, you often use them together, leaving quite a public impression.`);
- } else if (children.length > 0) {
- const childPronouns = getPronouns(children[0]);
- r.push(`Since you are also keeping ${his} ${childPronouns.daughter} as a sexual servant, you often use them together, which leaves quite a public impression.`);
}
+ r.push(`as sexual servants, you often enjoy them all at once, which leaves quite a public impression.`);
+ } else if (children.length > 1) {
+ r.push(`Since you are also keeping ${his} daughters, ${children[0].slaveName} and ${children[1].slaveName}, as sexual servants, you often use them together, leaving quite a public impression.`);
+ } else if (children.length > 0) {
+ const childPronouns = getPronouns(children[0]);
+ r.push(`Since you are also keeping ${his} ${childPronouns.daughter} as a sexual servant, you often use them together, which leaves quite a public impression.`);
+ }
- children = V.slaves.filter(function(s) { return (areSisters(slave, s) > 0) && (s.assignment === "please you" || s.assignment === "serve in the master suite" || s.assignment === "be your Concubine"); });
- if (children.length > 2) {
- r.push(`Since you are also keeping ${his} sisters,`);
- for (spy = 0; spy < children.length; spy++) {
- if (spy < children.length - 1) {
- r.push(`${children[spy].slaveName},`);
- } else {
- r.push(`and ${children[spy].slaveName},`);
- }
- }
- r.push(`as sexual servants, you often enjoy them all at once, which leaves quite a public impression.`);
- } else if (children.length > 1) {
- r.push(`Since you are also keeping ${his} sisters, ${children[0].slaveName} and ${children[1].slaveName}, as sexual servants, you often use them together, leaving quite a public impression.`);
- } else if (children.length > 0) {
- const childPronouns = getPronouns(children[0]);
- r.push(`Since you are also keeping ${his} ${childPronouns.sister} as a sexual servant, you often use them together, which leaves quite a public impression.`);
- }
- } else {
- if (slave.relation !== 0) {
- spy = V.slaveIndices[slave.relationTarget];
- if ((spy !== undefined) && (V.slaves[spy].assignment === "please you" || V.slaves[spy].assignment === "serve in the master suite" || V.slaves[spy].assignment === "be your Concubine")) {
- r.push(`Since you are also keeping ${his} ${V.slaves[spy].relation} as a sexual servant, you often use them together, which leaves quite a public impression.`);
+ children = V.slaves.filter(function(s) { return (areSisters(slave, s) > 0) && (s.assignment === "please you" || s.assignment === "serve in the master suite" || s.assignment === "be your Concubine"); });
+ if (children.length > 2) {
+ r.push(`Since you are also keeping ${his} sisters,`);
+ for (spy = 0; spy < children.length; spy++) {
+ if (spy < children.length - 1) {
+ r.push(`${children[spy].slaveName},`);
+ } else {
+ r.push(`and ${children[spy].slaveName},`);
}
}
+ r.push(`as sexual servants, you often enjoy them all at once, which leaves quite a public impression.`);
+ } else if (children.length > 1) {
+ r.push(`Since you are also keeping ${his} sisters, ${children[0].slaveName} and ${children[1].slaveName}, as sexual servants, you often use them together, leaving quite a public impression.`);
+ } else if (children.length > 0) {
+ const childPronouns = getPronouns(children[0]);
+ r.push(`Since you are also keeping ${his} ${childPronouns.sister} as a sexual servant, you often use them together, which leaves quite a public impression.`);
}
}
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index db878594dd5..659590ea627 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -549,52 +549,28 @@ window.saServeThePublic = (function saServeThePublic() {
r += ` ${He}'s a better slut because public service is ${his} main sexual outlet.`;
}
- // Someone double check this block
- if (V.familyTesting === 1) {
- if (totalRelatives(slave) > 0) {
- let children = V.slaves.filter((s) => areRelated(slave, s) && (s.assignment === slave.assignment));
- if (children.length > 2) {
- r += ` Since ${his} relatives,`;
- sstp = 0;
- for (; sstp < children.length; sstp++) {
- if (sstp < children.length - 1) {
- r += ` ${children[sstp].slaveName},`;
- } else {
- r += ` and ${children[sstp].slaveName},`;
- }
- }
- r += ` are public sluts too, ${he} earns extra attention.`;
- if (arcology.FSEgyptianRevivalist > 20) {
- r += ` Citizens are very excited about being able to participate in incestuous sex like the ancient Egyptians.`;
- } else if (arcology.FSEgyptianRevivalistIncestPolicy === 1) {
- r += ` Citizens are very excited about being able to participate in incestuous sex.`;
- }
- } else if (children.length > 1) {
- r += ` Since ${his} relatives, ${children[0].slaveName} and ${children[1].slaveName}, are public sluts too, ${he} earns extra attention.`;
- if (arcology.FSEgyptianRevivalist > 20) {
- r += ` Citizens are very excited about being able to participate in incestuous sex like the ancient Egyptians.`;
- } else if (arcology.FSEgyptianRevivalistIncestPolicy === 1) {
- r += ` Citizens are very excited about being able to participate in incestuous sex.`;
- }
- } else if (children.length > 0) {
- r += ` Since ${his} relative, ${children[0].slaveName}, is a public slut too, ${he} earns extra attention.`;
- if (arcology.FSEgyptianRevivalist > 20) {
- r += ` Citizens are very excited about being able to participate in incestuous sex like the ancient Egyptians.`;
- } else if (arcology.FSEgyptianRevivalistIncestPolicy === 1) {
- r += ` Citizens are very excited about being able to participate in incestuous sex.`;
+ if (totalRelatives(slave) > 0) {
+ let children = V.slaves.filter((s) => areRelated(slave, s) && (s.assignment === slave.assignment));
+ if (children.length > 2) {
+ r += ` Since ${his} relatives,`;
+ for (sstp = 0; sstp < children.length; sstp++) {
+ if (sstp < children.length - 1) {
+ r += ` ${children[sstp].slaveName},`;
+ } else {
+ r += ` and ${children[sstp].slaveName},`;
}
}
+ r += ` are public sluts too, ${he} earns extra attention.`;
+ } else if (children.length > 1) {
+ r += ` Since ${his} relatives, ${children[0].slaveName} and ${children[1].slaveName}, are public sluts too, ${he} earns extra attention.`;
+ } else if (children.length > 0) {
+ r += ` Since ${his} relative, ${children[0].slaveName}, is a public slut too, ${he} earns extra attention.`;
}
- } else {
- if (slave.relation !== 0) {
- sstp = V.slaveIndices[slave.relationTarget];
- if (sstp !== undefined && slave.assignment === V.slaves[sstp].assignment) {
- r += ` Since ${his} ${V.slaves[sstp].relation} ${V.slaves[sstp].slaveName} is a public slut too, ${he} earns extra attention.`;
- if (arcology.FSEgyptianRevivalist > 20) {
- r += ` Citizens are very excited about being able to participate in incestuous sex like the ancient Egyptians.`;
- } else if (arcology.FSEgyptianRevivalistIncestPolicy === 1) {
- r += ` Citizens are very excited about being able to participate in incestuous sex.`;
- }
+ if (children.length > 0) {
+ if (arcology.FSEgyptianRevivalist > 20) {
+ r += ` Citizens are very excited about being able to participate in incestuous sex like the ancient Egyptians.`;
+ } else if (arcology.FSEgyptianRevivalistIncestPolicy === 1) {
+ r += ` Citizens are very excited about being able to participate in incestuous sex.`;
}
}
}
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index 2a087e5757f..ac1c20de4cc 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -627,53 +627,29 @@ window.saWhore = (function saWhore() {
r += ` ${He}'s a better whore because prostitution is ${his} main sexual outlet.`;
}
- if (V.familyTesting === 1) {
- if (totalRelatives(slave) > 0) {
- let children = V.slaves.filter((s) => areRelated(slave, s) && (s.assignment === slave.assignment));
- if (children.length > 2) {
- r += ` Since ${his} relatives,`;
- SWi = 0;
- for (; SWi < children.length; SWi++) {
- if (SWi < children.length - 1) {
- r += ` ${children[SWi].slaveName},`;
- } else {
- r += ` and ${children[SWi].slaveName},`;
- }
- }
- r += ` are selling themselves too, ${he} earns extra ¤ by working with them.`;
- if (arcology.FSEgyptianRevivalist > 20) {
- r += ` Customers are very enthusiastic about being able to participate in incestuous sex like the ancient Egyptians.`;
- } else if (arcology.FSEgyptianRevivalistIncestPolicy === 1) {
- r += ` Customers are very enthusiastic about being able to participate in incestuous sex.`;
- }
- } else if (children.length > 1) {
- r += ` Since ${his} relatives, ${children[0].slaveName} and ${children[1].slaveName}, are selling themselves too, ${he} earns extra ¤ by working with them.`;
- if (arcology.FSEgyptianRevivalist > 20) {
- r += ` Customers are very enthusiastic about being able to participate in incestuous sex like the ancient Egyptians.`;
- } else if (arcology.FSEgyptianRevivalistIncestPolicy === 1) {
- r += ` Customers are very enthusiastic about being able to participate in incestuous sex.`;
- }
- } else if (children.length > 0) {
- const relativePronouns = getPronouns(children[0]);
- r += ` Since ${his} relative, ${children[0].slaveName}, is selling ${relativePronouns.objectReflexive} too, ${he} earns extra ¤ by working with ${relativePronouns.object}.`;
- if (arcology.FSEgyptianRevivalist > 20) {
- r += ` Customers are very enthusiastic about being able to participate in incestuous sex like the ancient Egyptians.`;
- } else if (arcology.FSEgyptianRevivalistIncestPolicy === 1) {
- r += ` Customers are very enthusiastic about being able to participate in incestuous sex.`;
+ if (totalRelatives(slave) > 0) {
+ let children = V.slaves.filter((s) => areRelated(slave, s) && (s.assignment === slave.assignment));
+ if (children.length > 2) {
+ r += ` Since ${his} relatives,`;
+ for (SWi = 0; SWi < children.length; SWi++) {
+ if (SWi < children.length - 1) {
+ r += ` ${children[SWi].slaveName},`;
+ } else {
+ r += ` and ${children[SWi].slaveName},`;
}
}
- }
- } else {
- if (slave.relation !== 0) {
- SWi = V.slaveIndices[slave.relationTarget];
- if (SWi !== undefined && slave.assignment === V.slaves[SWi].assignment) {
- const relativePronouns = getPronouns(V.slaves[SWi]);
- r += ` Since ${his} ${V.slaves[SWi].relation} ${V.slaves[SWi].slaveName} is selling ${relativePronouns.objectReflexive} too, ${he} earns extra ¤ by working with ${relativePronouns.object}.`;
- if (arcology.FSEgyptianRevivalist > 20) {
- r += ` Customers are very enthusiastic about being able to participate in incestuous sex like the ancient Egyptians.`;
- } else if (arcology.FSEgyptianRevivalistIncestPolicy === 1) {
- r += ` Customers are very enthusiastic about being able to participate in incestuous sex.`;
- }
+ r += ` are selling themselves too, ${he} earns extra ¤ by working with them.`;
+ } else if (children.length > 1) {
+ r += ` Since ${his} relatives, ${children[0].slaveName} and ${children[1].slaveName}, are selling themselves too, ${he} earns extra ¤ by working with them.`;
+ } else if (children.length > 0) {
+ const relativePronouns = getPronouns(children[0]);
+ r += ` Since ${his} relative, ${children[0].slaveName}, is selling ${relativePronouns.objectReflexive} too, ${he} earns extra ¤ by working with ${relativePronouns.object}.`;
+ }
+ if (children.length > 0) {
+ if (arcology.FSEgyptianRevivalist > 20) {
+ r += ` Customers are very enthusiastic about being able to participate in incestuous sex like the ancient Egyptians.`;
+ } else if (arcology.FSEgyptianRevivalistIncestPolicy === 1) {
+ r += ` Customers are very enthusiastic about being able to participate in incestuous sex.`;
}
}
}
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 280283e9c55..a73836da10c 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -204,38 +204,26 @@ All the things you need to run your arcology are getting more expensive
Names will always be ''Surname Name''.
<</options>>
-<<options $familyTesting>>
- <<option 1 "Enable extended families">>
- Slaves ''can'' have extended families instead of just a single relative.
- //May cause lag.//
- <<option 0 "Disable extended families">>
- Slaves ''cannot'' have extended families, just a single relative. //Vanilla Mode.//
- <<comment>>
- Extended family mode must be on for the incubation facility to be enabled.
+<<options $showDistantRelatives>>
+ <<option 1 "Enable distant relatives">>
+ Distant relatives ''will'' be tracked. //May cause lag.//
+ <<option 0 "Disable distant relatives">>
+ Distant relatives ''will not'' be tracked.
<</options>>
-<<if $familyTesting == 1>>
- <<options $showDistantRelatives>>
- <<option 1 "Enable distant relatives">>
- Distant relatives ''will'' be tracked.
- <<option 0 "Disable distant relatives">>
- Distant relatives ''will not'' be tracked.
- <</options>>
-
- <<options $inbreeding>>
- <<option 1 "Enable inbreeding damage">>
- Successive breeding ''will'' result in sub-average slaves.
- <<option 0 "Disable inbreeding damage">>
- Successive breeding ''will not'' result in sub-average slaves.
- <</options>>
+<<options $inbreeding>>
+ <<option 1 "Enable inbreeding damage">>
+ Successive breeding ''will'' result in sub-average slaves.
+ <<option 0 "Disable inbreeding damage">>
+ Successive breeding ''will not'' result in sub-average slaves.
+<</options>>
- <<options $allowFamilyTitles>>
- <<option 1 "Enable family titles">>
- Your relatives ''will'' use family titles.
- <<option 0 "Disable family titles">>
- Your relatives ''will not'' use family titles.
- <</options>>
-<</if>>
+<<options $allowFamilyTitles>>
+ <<option 1 "Enable family titles">>
+ Your relatives ''will'' use family titles.
+ <<option 0 "Disable family titles">>
+ Your relatives ''will not'' use family titles.
+<</options>>
<<options $weightAffectsAssets>>
<<option 1 "Enable">>
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index aa1ed9772fc..3f6912fea55 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -322,82 +322,46 @@ FIXME:
<<replace "#miniscene">><<include "FAbuse">><</replace>>
<</link>>
<<if $seeIncest == 1>>
- <<if $familyTesting == 1>>
- <<set _availRelatives = availableRelatives($activeChild)>>
- <<if _availRelatives.mother>>
- | <<link "Fuck $him with $his mother">>
- <<replace "#miniscene">>
- <<set $partner = "mother">>
- <<include "FRelation">><br> <</replace>>
- <</link>>
- <<elseif _availRelatives.motherName !== null>>
- //$His mother, _availRelatives.motherName, is unavailable//
- <</if>>
- /*
- <<if _availRelatives.father>>
- | <<link "Fuck $him with $his father">>
- <<replace "#miniscene">><<set $partner = "father">>
- <<include "FRelation">><br> <</replace>>
- <</link>>
- <<elseif _availRelatives.fatherName !== null>>
- //$His father, _availRelatives.fatherName, is unavailable//
- <</if>>
- */
- <<if $activeChild.sisters > 0>>
- <<if _availRelatives.sisters == 0>>
- <<if $activeChild.sisters == 1>>
- //$His _sister2 is unavailable//
- <<else>>
- //$His sisters are unavailable//
- <</if>>
+ <<set _availRelatives = availableRelatives($activeChild)>>
+ <<if _availRelatives.mother>>
+ | <<link "Fuck $him with $his mother">>
+ <<replace "#miniscene">>
+ <<set $partner = "mother">>
+ <<include "FRelation">><br> <</replace>>
+ <</link>>
+ <<elseif _availRelatives.motherName !== null>>
+ //$His mother, _availRelatives.motherName, is unavailable//
+ <</if>>
+ /*
+ <<if _availRelatives.father>>
+ | <<link "Fuck $him with $his father">>
+ <<replace "#miniscene">><<set $partner = "father">>
+ <<include "FRelation">><br> <</replace>>
+ <</link>>
+ <<elseif _availRelatives.fatherName !== null>>
+ //$His father, _availRelatives.fatherName, is unavailable//
+ <</if>>
+ */
+ <<if $activeChild.sisters > 0>>
+ <<if _availRelatives.sisters == 0>>
+ <<if $activeChild.sisters == 1>>
+ //$His _sister2 is unavailable//
<<else>>
- <<if $activeChild.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>>
+ //$His sisters are unavailable//
<</if>>
- <</if>>
- <<else>>
- <<if ($activeChild.relation != 0)>>
- <<set _assayedSlave = getSlave($activeChild.relationTarget)>>
- <<setLocalPronouns _assayedSlave 2>>
- <<if isSlaveAvailable(_assayedSlave)>>
- <<if ($activeChild.relation == "mother")>>
- | <<link "Fuck $him with $his _daughter2">>
- <<replace "#miniscene">>
- <<set $partner = "relation">>
- <<include "FRelation">><br> <</replace>>
- <</link>>
- <<elseif ($activeChild.relation == "daughter")>>
- | <<link "Fuck $him with $his mother">>
- <<replace "#miniscene">>
- <<set $partner = "relation">>
- <<include "FRelation">><br> <</replace>>
- <</link>>
- <<elseif ($activeChild.relation == "sister")>>
- | <<link "Fuck $him with $his _sister2">>
- <<replace "#miniscene">>
- <<set $partner = "relation">>
- <<include "FRelation">><br> <</replace>>
- <</link>>
- <<elseif ($activeChild.relation == "twin")>>
- | <<link "Fuck $him with $his twin">>
- <<replace "#miniscene">>
- <<set $partner = "relation">>
- <<include "FRelation">><br> <</replace>>
- <</link>>
- <</if>>
+ <<else>>
+ <<if $activeChild.sisters == 1>>
+ | <<link "Fuck $him with $his _sister2">>
+ <<replace "#miniscene">>
+ <<set $partner = "sister">>
+ <<include "FRelation">><br> <</replace>>
+ <</link>>
<<else>>
- //_assayedSlave.slaveName is unavailable//
+ | <<link "Fuck $him with one of $his sisters">>
+ <<replace "#miniscene">>
+ <<set $partner = "sister">>
+ <<include "FRelation">><br> <</replace>>
+ <</link>>
<</if>>
<</if>>
<</if>>
@@ -454,18 +418,16 @@ FIXME:
<</if>>
<</if>>
-<<if $familyTesting>>
- <br><br>
- <span id="family">
- <div id="familyTree"></div>
- <span id="familyTreeLink">
- <<link "Pull up the file on $his family tree.">>
- <<replace #familyTreeLink>>
- /* TODO: this may need to be updated */<<run renderFamilyTree($slaves, $activeChild.ID)>><</replace>>
- <</link>>
- </span>
+<br><br>
+<span id="family">
+ <div id="familyTree"></div>
+ <span id="familyTreeLink">
+ <<link "Pull up the file on $his family tree.">>
+ <<replace #familyTreeLink>>
+ /* TODO: this may need to be updated */<<run renderFamilyTree($slaves, $activeChild.ID)>><</replace>>
+ <</link>>
</span>
-<</if>>
+</span>
<br><br>
/* TODO: the RA may need to be reworked to work with children in the Nursery */
diff --git a/src/facilities/nursery/nurseryDatatypeCleanup.js b/src/facilities/nursery/nurseryDatatypeCleanup.js
index 9e80c4b3e2c..c062138b137 100644
--- a/src/facilities/nursery/nurseryDatatypeCleanup.js
+++ b/src/facilities/nursery/nurseryDatatypeCleanup.js
@@ -384,9 +384,6 @@ App.Facilities.Nursery.ChildDatatypeCleanup = function(child) {
function childRelationDatatypeCleanup(child) {
child.mother = +child.mother || 0;
child.father = +child.father || 0;
- if (State.variables.familyTesting === 0) {
- child.relationTarget = Math.max(+child.relationTarget, 0) || 0;
- }
child.canRecruit = Math.clamp(+child.canRecruit, 0, 1) || 0;
child.relationship = Math.clamp(+child.relationship, -3, 5) || 0;
child.relationshipTarget = Math.max(+child.relationshipTarget, 0) || 0;
diff --git a/src/facilities/nursery/nurseryWidgets.js b/src/facilities/nursery/nurseryWidgets.js
index ee6ffe658f3..d12ba992996 100644
--- a/src/facilities/nursery/nurseryWidgets.js
+++ b/src/facilities/nursery/nurseryWidgets.js
@@ -91,7 +91,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
longBehaviorFlaw(child);
longSexFlaw(child);
}
- if ((child.relationship !== 0) || (child.relation !== 0) || (V.abbreviateClothes === 2) || (V.abbreviateRulesets === 2)) {
+ if ((child.relationship !== 0) || (V.abbreviateClothes === 2) || (V.abbreviateRulesets === 2)) {
r += `<br> `;
if (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) {
r += ` `;
@@ -2287,7 +2287,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
if (child.custom.label) {
r += `<strong><span class="yellow">${capFirstChar(child.custom.label)}</span></strong> `;
}
- if ((child.relationship !== 0) || (child.relation !== 0) || (V.abbreviateClothes === 2) || (V.abbreviateRulesets === 2)) {
+ if ((child.relationship !== 0) || (V.abbreviateClothes === 2) || (V.abbreviateRulesets === 2)) {
r += `<br> `;
if (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) {
r += ` `;
@@ -2295,22 +2295,12 @@ App.Facilities.Nursery.ChildSummary = function(child) {
}
if (V.abbreviateMental === 1) {
r += `<span class="lightgreen">`;
- if (V.familyTesting === 1) {
- shortExtendedFamily(child);
- } else {
- shortLegacyFamily(child);
- }
+ shortExtendedFamily(child);
r += `</span> `;
shortClone(child);
shortRival(child);
} else if (V.abbreviateMental === 2) {
- if (V.familyTesting === 1) {
- longExtendedFamily(child);
- } else {
- longLegacyFamily(child);
- }
- longClone(child);
- longRival(child);
+ longExtendedFamily(child);
}
if (child.fuckdoll === 0) {
if (V.abbreviateClothes === 2) {
@@ -5982,40 +5972,6 @@ App.Facilities.Nursery.ChildSummary = function(child) {
}
}
- /**
- * @param {App.Entity.SlaveState} child
- */
- function shortLegacyFamily(child) {
- if (child.relation !== 0) {
- const _ssj = V.slaves.findIndex(function(s) {
- return s.ID === child.relationTarget;
- });
- if (_ssj !== -1) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s ${child.relation}`;
- }
- }
- if (child.relationship > 0) {
- const _ssj = V.slaves.findIndex(function(s) {
- return s.ID === child.relationshipTarget;
- });
- if (_ssj !== -1) {
- const friendship = relationshipTerm(child);
- if (child.relationshipTarget !== child.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s`;
- } else {
- r += ` &`;
- }
- r += ` ${friendship}`;
- }
- } else if (child.relationship === -3) {
- r += `Your wife`;
- } else if (child.relationship === -2) {
- r += `E Bonded`;
- } else if (child.relationship === -1) {
- r += `E Slut`;
- }
- }
-
/**
* @param {App.Entity.SlaveState} child
*/
@@ -6175,48 +6131,6 @@ App.Facilities.Nursery.ChildSummary = function(child) {
}
}
- /**
- * @param {App.Entity.SlaveState} child
- */
- function longLegacyFamily(child) {
- if (child.relation !== 0) {
- const _ssj = V.slaves.findIndex(function(s) {
- return s.ID === child.relationTarget;
- });
- if (_ssj !== -1) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s `;
- if (child.relationshipTarget !== child.relationTarget) {
- r += `<span class="lightgreen">${child.relation}.</span> `;
- } else {
- r += `<span class="lightgreen">${child.relation}</span> `;
- }
- if (child.relationship <= 0) {
- r += ` `;
- }
- }
- }
- if (child.relationship > 0) {
- const _ssj = V.slaves.findIndex(function(s) {
- return s.ID === child.relationshipTarget;
- });
- if (_ssj !== -1) {
- const friendship = relationshipTerm(child);
- if (child.relationshipTarget !== child.relationTarget) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s `;
- } else {
- r += ` and `;
- }
- r += `<span class="lightgreen">${friendship}.</span> `;
- }
- } else if (child.relationship === -3) {
- r += `<span class="lightgreen">Your wife.</span> `;
- } else if (child.relationship === -2) {
- r += `<span class="lightgreen">Emotionally bonded to you.</span> `;
- } else if (child.relationship === -1) {
- r += `<span class="lightgreen">Emotional slut.</span> `;
- }
- }
-
/**
* @param {App.Entity.SlaveState} child
*/
@@ -13749,40 +13663,23 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
r += App.Desc.brand(child, "ear");
r += App.Desc.brand(child, "neck");
- /* OPEN FAMILY */
-
- if (V.familyTesting) {
- r += App.Desc.family(child) + ' ';
+ r += App.Desc.family(child) + ' ';
- if (child.relationship >= 3 && totalRelatives(child) > 0) {
- const lover = getSlave(child.relationshipTarget);
- if (jsDef(lover)) {
- const relTerm = relativeTerm($activeSlave, _lover);
- if (relTerm !== null) {
- r += `${He} is in an <span class="lightgreen">incestuous relationship with ${his} ${relTerm}, ${SlaveFullName(lover)}.</span> `;
- }
- }
- } else if (child.relationship <= -2) {
- const relTerm = relativeTerm($activeSlave, $PC);
+ if (child.relationship >= 3 && totalRelatives(child) > 0) {
+ const lover = getSlave(child.relationshipTarget);
+ if (jsDef(lover)) {
+ const relTerm = relativeTerm($activeSlave, _lover);
if (relTerm !== null) {
- r += `${He} is in an <span class="lightgreen">incestuous relationship with ${his} ${relTerm}, you.</span> `;
+ r += `${He} is in an <span class="lightgreen">incestuous relationship with ${his} ${relTerm}, ${SlaveFullName(lover)}.</span> `;
}
}
- } else {
- if (child.relation !== 0) {
- let lcd = V.slaveIndices[child.relationTarget];
- if (jsDef(lcd)) {
- if (slaves[lcd].ID === child.relationshipTarget && child.relationship >= 3) {
- r += `${He} is <span class="lightgreen">${SlaveFullName(slaves[lcd])}'s ${child.relation}, making their relationship incestuous.</span> `;
- } else {
- r += `${He} is <span class="lightgreen">${SlaveFullName(slaves[lcd])}'s ${child.relation}.</span> `;
- }
- }
+ } else if (child.relationship <= -2) {
+ const relTerm = relativeTerm($activeSlave, $PC);
+ if (relTerm !== null) {
+ r += `${He} is in an <span class="lightgreen">incestuous relationship with ${his} ${relTerm}, you.</span> `;
}
}
- /* CLOSE FAMILY */
-
if (child.rivalry) {
let lcd = V.slaveIndices[child.rivalryTarget];
if (jsDef(lcd)) {
@@ -15871,11 +15768,6 @@ App.Facilities.Nursery.ChildState = class ChildState {
this.career = 0;
/** Child's ID */
this.ID = 0;
- /** Relation to relationTarget
- * @type {string|number} */
- this.relation = 0;
- /** Target of relation (ID) */
- this.relationTarget = 0;
/**
* TODO:
* Child's relationship
diff --git a/src/interaction/main/walkPast.js b/src/interaction/main/walkPast.js
index 517c347277b..451d7630ca0 100644
--- a/src/interaction/main/walkPast.js
+++ b/src/interaction/main/walkPast.js
@@ -41,7 +41,7 @@ window.walkPast = (function() {
watchArray = [];
name = activeSlave.slaveName;
- if (V.familyTesting === 1 && totalRelatives(activeSlave) > 0 && ((fixed && V.target === "FRelation") || (!fixed && jsRandom(1, 100) > 80))) {
+ if (totalRelatives(activeSlave) > 0 && ((fixed && V.target === "FRelation") || (!fixed && jsRandom(1, 100) > 80))) {
V.relation = randomRelatedSlave(activeSlave);
if (V.relation.mother === activeSlave.ID || V.relation.father === activeSlave.ID) {
V.relationType = "daughter";
@@ -64,9 +64,6 @@ window.walkPast = (function() {
}
flag = 110;
V.partner = "relation";
- } else if (V.familyTesting === 0 && activeSlave.relation !== 0 && ((fixed && V.target === "FRelation") || (!fixed && jsRandom(1, 100) > 80))) {
- flag = 110;
- V.partner = "relation";
} else if (activeSlave.relationship > 0 && ((fixed && V.target === "FRelation") || (!fixed && jsRandom(1, 100) > 70))) {
flag = 120;
V.partner = "relationship";
@@ -1466,11 +1463,7 @@ window.walkPast = (function() {
} = getPronouns(activeSlave);
if (V.partner === "relation") {
- if (V.familyTesting === 1) {
- partnerSlave = V.relation;
- } else {
- partnerSlave = getSlave(activeSlave.relationTarget);
- }
+ partnerSlave = V.relation;
} else {
activeSlaveRel = relationshipTerm(activeSlave);
partnerSlave = getSlave(activeSlave.relationshipTarget);
@@ -1479,11 +1472,7 @@ window.walkPast = (function() {
if (partnerSlave !== undefined) { /* potential problem point */
r += ` ${His} `;
if (V.partner === "relation") {
- if (V.familyTesting === 1) {
- r += `${V.relationType} `;
- } else {
- r += `${partnerSlave.relation} `;
- }
+ r += `${V.relationType} `;
} else {
r += `${activeSlaveRel} `;
}
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index e90f0c6e085..95b52821386 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -631,81 +631,57 @@ App.UI.SlaveInteract.useSlaveDisplay = function(slave) {
}
sexOptions.push({text: `Abuse ${him}`, scene: `FAbuse`});
if (V.seeIncest === 1) {
- if (V.familyTesting === 1) {
- const availRelatives = availableRelatives(slave);
- if (availRelatives.mother) {
- sexOptions.push({text: `Fuck ${him} with ${his} mother`, scene: `FRelation`, update: {partner: "mother"}});
- } else if (availRelatives.motherName !== null) {
- sexOptions.push({text: `${His} mother, ${availRelatives.motherName}, is unavailable`});
- }
- /*
- if (availRelatives.father) {
- sexOptions.push({text: `Fuck ${him} with ${his} father`, scene: `FRelation`, update: {partner: "father"}});
- } else if (availRelatives.fatherName !== null) {
- sexOptions.push({text: `${His} father, ${availRelatives.motherName}, is unavailable`});
- }
- */
- if (slave.daughters > 0) {
- if (availRelatives.daughters === 0) {
- if (slave.daughters === 1) {
- sexOptions.push({text: `Fuck ${him} with ${his} daughter`, disabled: `${His} ${availRelatives.oneDaughterRel} is unavailable`});
- } else {
- sexOptions.push({text: `Fuck ${him} with one of ${his} daughters`, disabled: `${His} daughters are unavailable`});
- }
+ const availRelatives = availableRelatives(slave);
+ if (availRelatives.mother) {
+ sexOptions.push({text: `Fuck ${him} with ${his} mother`, scene: `FRelation`, update: {partner: "mother"}});
+ } else if (availRelatives.motherName !== null) {
+ sexOptions.push({text: `${His} mother, ${availRelatives.motherName}, is unavailable`});
+ }
+ /*
+ if (availRelatives.father) {
+ sexOptions.push({text: `Fuck ${him} with ${his} father`, scene: `FRelation`, update: {partner: "father"}});
+ } else if (availRelatives.fatherName !== null) {
+ sexOptions.push({text: `${His} father, ${availRelatives.motherName}, is unavailable`});
+ }
+ */
+ if (slave.daughters > 0) {
+ if (availRelatives.daughters === 0) {
+ if (slave.daughters === 1) {
+ sexOptions.push({text: `Fuck ${him} with ${his} daughter`, disabled: `${His} ${availRelatives.oneDaughterRel} is unavailable`});
} else {
- if (slave.daughters === 1) {
- sexOptions.push({text: `Fuck ${him} with ${his} ${availRelatives.oneDaughterRel}`, scene: `FRelation`, update: {partner: "daughter"}});
- } else {
- sexOptions.push({text: `Fuck ${him} with one of ${his} daughters`, scene: `FRelation`, update: {partner: "daughter"}});
- }
- /*
- if (availRelatives.daughters > 1) {
- sexOptions.push({text: `Fuck ${him} with ${his} daughters`, scene: `FRelation`, update: {partner: "daughter"}});
- }
- */
+ sexOptions.push({text: `Fuck ${him} with one of ${his} daughters`, disabled: `${His} daughters are unavailable`});
}
- }
- if (slave.sisters > 0) {
- if (availRelatives.sisters === 0) {
- if (slave.sisters === 1) {
- sexOptions.push({text: `Fuck ${him} with ${his} sister`, disabled: `${His} ${availRelatives.oneSisterRel} is unavailable`});
- } else {
- sexOptions.push({text: `Fuck ${him} with one of ${his} sisters`, disabled: `${His} sisters are unavailable`});
- }
+ } else {
+ if (slave.daughters === 1) {
+ sexOptions.push({text: `Fuck ${him} with ${his} ${availRelatives.oneDaughterRel}`, scene: `FRelation`, update: {partner: "daughter"}});
} else {
- if (slave.sisters === 1) {
- sexOptions.push({text: `Fuck ${him} with ${his} ${availRelatives.oneSisterRel}`, scene: `FRelation`, update: {partner: "sister"}});
- } else {
- sexOptions.push({text: `Fuck ${him} with one of ${his} sisters`, scene: `FRelation`, update: {partner: "sister"}});
- }
- /*
- if (availRelatives.sisters > 1) {
- sexOptions.push({text: `Fuck ${him} with ${his} sisters`, scene: `FRelation`, update: {partner: "sisters}});
- }
- */
+ sexOptions.push({text: `Fuck ${him} with one of ${his} daughters`, scene: `FRelation`, update: {partner: "daughter"}});
}
+ /*
+ if (availRelatives.daughters > 1) {
+ sexOptions.push({text: `Fuck ${him} with ${his} daughters`, scene: `FRelation`, update: {partner: "daughter"}});
+ }
+ */
}
- } else {
- if (slave.relation !== 0) {
- let assayedSlave = getSlave(slave.relationTarget);
- getPronouns(assayedSlave); // Update global pronouns and then save them.
- const daughter2 = V.daughter;
- const mother2 = V.mother;
- const sister2 = V.sister;
- getPronouns(slave);
- if (isSlaveAvailable(assayedSlave)) {
- if (slave.relation === "mother") {
- sexOptions.push({text: `Fuck ${him} with ${his} ${daughter2}`, scene: `FRelation`, update: {partner: "relation"}});
- } else if (slave.relation === "daughter") {
- sexOptions.push({text: `Fuck ${him} with ${his} ${mother2}`, scene: `FRelation`, update: {partner: "relation"}});
- } else if (slave.relation === "sister") {
- sexOptions.push({text: `Fuck ${him} with ${his} ${sister2}`, scene: `FRelation`, update: {partner: "relation"}});
- } else if (slave.relation === "twin") {
- sexOptions.push({text: `Fuck ${him} with ${his} twin`, scene: `FRelation`, update: {partner: "relation"}});
- }
+ }
+ if (slave.sisters > 0) {
+ if (availRelatives.sisters === 0) {
+ if (slave.sisters === 1) {
+ sexOptions.push({text: `Fuck ${him} with ${his} sister`, disabled: `${His} ${availRelatives.oneSisterRel} is unavailable`});
} else {
- sexOptions.push({text: `Fuck ${him} with ${his} sibling`, disabled: `${assayedSlave.slaveName} is unavailable`});
+ sexOptions.push({text: `Fuck ${him} with one of ${his} sisters`, disabled: `${His} sisters are unavailable`});
+ }
+ } else {
+ if (slave.sisters === 1) {
+ sexOptions.push({text: `Fuck ${him} with ${his} ${availRelatives.oneSisterRel}`, scene: `FRelation`, update: {partner: "sister"}});
+ } else {
+ sexOptions.push({text: `Fuck ${him} with one of ${his} sisters`, scene: `FRelation`, update: {partner: "sister"}});
+ }
+ /*
+ if (availRelatives.sisters > 1) {
+ sexOptions.push({text: `Fuck ${him} with ${his} sisters`, scene: `FRelation`, update: {partner: "sisters}});
}
+ */
}
}
}
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index cf787f4df74..aafa402ad7c 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -477,14 +477,6 @@ App.Entity.SlaveState = class SlaveState {
/** reason for prestige
* @type {string|number} */
this.prestigeDesc = 0;
- /** slave's relation to recruited slave? (used in some events)
- * @type {string|number} */
- this.recruiter = 0;
- /** relation to relationTarget
- * @type {string|number} */
- this.relation = 0;
- /** target of relation (ID) */
- this.relationTarget = 0;
/**
* slave's relationship
* * -3: married to you
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 443245cab40..2429d679891 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -150,26 +150,24 @@ window.newSlave = function newSlave(slave) {
slave.canRecruit = 0;
}
- if (V.familyTesting === 1) {
- slave.sisters = 0;
- slave.daughters = 0;
- if (slave.mother === -1 || slave.father === -1) {
- V.PC.daughters += 1;
- }
- if (areSisters(V.PC, slave) > 0) {
- V.PC.sisters += 1;
- }
- for (let k = 0; k < V.slaves.length; k++) {
- if (V.slaves[k].mother === slave.ID || V.slaves[k].father === slave.ID) {
- slave.daughters++;
- }
- if (slave.mother === V.slaves[k].ID || slave.father === V.slaves[k].ID) {
- V.slaves[k].daughters++;
- }
- if (areSisters(V.slaves[k], slave) > 0) {
- slave.sisters++;
- V.slaves[k].sisters++;
- }
+ slave.sisters = 0;
+ slave.daughters = 0;
+ if (slave.mother === -1 || slave.father === -1) {
+ V.PC.daughters += 1;
+ }
+ if (areSisters(V.PC, slave) > 0) {
+ V.PC.sisters += 1;
+ }
+ for (let k = 0; k < V.slaves.length; k++) {
+ if (V.slaves[k].mother === slave.ID || V.slaves[k].father === slave.ID) {
+ slave.daughters++;
+ }
+ if (slave.mother === V.slaves[k].ID || slave.father === V.slaves[k].ID) {
+ V.slaves[k].daughters++;
+ }
+ if (areSisters(V.slaves[k], slave) > 0) {
+ slave.sisters++;
+ V.slaves[k].sisters++;
}
}
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index e6d115e243d..175334b6844 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -35,14 +35,8 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (eventSlave.lactation > 0) {
if (eventSlave.nipples !== "fuckable") {
if (eventSlave.rules.release.family === 1) {
- if (State.variables.familyTesting === 0) {
- if (eventSlave.relation === "mother") {
- State.variables.RETSevent.push("incestuous nursing");
- }
- } else {
- if (eventSlave.daughters > 0) {
- State.variables.RETSevent.push("incestuous nursing");
- }
+ if (eventSlave.daughters > 0) {
+ State.variables.RETSevent.push("incestuous nursing");
}
}
}
@@ -1857,14 +1851,8 @@ window.generateRandomEventPoolServant = function(eventSlave) {
if (eventSlave.lactation > 0) {
if (eventSlave.nipples !== "fuckable") {
if (eventSlave.rules.release.family === 1) {
- if (State.variables.familyTesting === 0) {
- if (eventSlave.relation === "mother") {
- State.variables.RETSevent.push("incestuous nursing");
- }
- } else {
- if (eventSlave.daughters > 0) {
- State.variables.RETSevent.push("incestuous nursing");
- }
+ if (eventSlave.daughters > 0) {
+ State.variables.RETSevent.push("incestuous nursing");
}
}
}
diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js
index c1d74f93f29..352875f692b 100644
--- a/src/js/extendedFamilyModeJS.js
+++ b/src/js/extendedFamilyModeJS.js
@@ -188,11 +188,7 @@ window.areCousins = function(slave1, slave2) {
* @returns {boolean}
*/
window.areRelated = function(slave1, slave2) {
- if (V.familyTesting === 1) {
- return (slave1.father === slave2.ID || slave1.mother === slave2.ID || slave2.father === slave1.ID || slave2.mother === slave1.ID || areSisters(slave1, slave2) > 0);
- } else {
- return slave1.relationTarget === slave2.ID;
- }
+ return (slave1.father === slave2.ID || slave1.mother === slave2.ID || slave2.father === slave1.ID || slave2.mother === slave1.ID || areSisters(slave1, slave2) > 0);
};
/**
@@ -409,73 +405,59 @@ window.totalPlayerRelatives = function(pc) {
* @returns {string|null} - returns null if the slaves are not related, even distantly.
*/
window.relativeTerm = function(slave1, slave2) {
- if (V.familyTesting === 1) {
- if (slave2.mother === slave1.ID || slave2.father === slave1.ID) {
- if (slave2.genes === "XY" && V.diversePronouns) {
- return "son";
- } else {
- return "daughter";
- }
- } else if (slave1.mother === slave2.ID && slave1.father === slave2.ID) {
- return "sole parent";
- } else if (slave1.mother === slave2.ID) {
- return "mother";
- } else if (slave1.father === slave2.ID) {
- return "father";
- } else if (areSisters(slave2, slave1) === 1) {
- if (slave2.genes === "XY" && V.diversePronouns) {
- return "twin brother";
- } else {
- return "twin sister";
- }
- } else if (areSisters(slave2, slave1) === 2) {
- if (slave2.genes === "XY" && V.diversePronouns) {
- return "brother";
- } else {
- return "sister";
- }
- } else if (areSisters(slave2, slave1) === 3) {
- if (slave2.genes === "XY" && V.diversePronouns) {
- return "half-brother";
- } else {
- return "half-sister";
- }
- } else if (isAunt(slave1, slave2)) {
- if (slave2.genes === "XY" && V.diversePronouns) {
- return "nephew";
- } else {
- return "niece";
- }
- } else if (isAunt(slave2, slave1)) {
- if (slave2.genes === "XY" && V.diversePronouns) {
- return "uncle";
- } else {
- return "aunt";
- }
- } else if (areCousins(slave2, slave1)) {
- return "cousin";
- } else if (isGrandfatherP(slave1, slave2)) {
- return "grandfather";
- } else if (isGrandmotherP(slave1, slave2)) {
- return "grandmother";
- } else if (isGrandparentP(slave2, slave1)) {
- if (slave2.genes === "XY" && V.diversePronouns) {
- return "grandson";
- } else {
- return "granddaughter";
- }
+ if (slave2.mother === slave1.ID || slave2.father === slave1.ID) {
+ if (slave2.genes === "XY" && V.diversePronouns) {
+ return "son";
+ } else {
+ return "daughter";
}
- } else {
- if (slave2.relationTarget === slave1.ID && slave2.relation !== 0) {
- if (slave2.relation === "sister" || slave2.relation === "twin") {
- let r = (slave1.actualAge === slave2.actualAge) ? "twin " : "";
- if (slave2.genes === "XY" && V.diversePronouns) {
- return r + "brother";
- } else {
- return r + "sister";
- }
- }
- return slave2.relation;
+ } else if (slave1.mother === slave2.ID && slave1.father === slave2.ID) {
+ return "sole parent";
+ } else if (slave1.mother === slave2.ID) {
+ return "mother";
+ } else if (slave1.father === slave2.ID) {
+ return "father";
+ } else if (areSisters(slave2, slave1) === 1) {
+ if (slave2.genes === "XY" && V.diversePronouns) {
+ return "twin brother";
+ } else {
+ return "twin sister";
+ }
+ } else if (areSisters(slave2, slave1) === 2) {
+ if (slave2.genes === "XY" && V.diversePronouns) {
+ return "brother";
+ } else {
+ return "sister";
+ }
+ } else if (areSisters(slave2, slave1) === 3) {
+ if (slave2.genes === "XY" && V.diversePronouns) {
+ return "half-brother";
+ } else {
+ return "half-sister";
+ }
+ } else if (isAunt(slave1, slave2)) {
+ if (slave2.genes === "XY" && V.diversePronouns) {
+ return "nephew";
+ } else {
+ return "niece";
+ }
+ } else if (isAunt(slave2, slave1)) {
+ if (slave2.genes === "XY" && V.diversePronouns) {
+ return "uncle";
+ } else {
+ return "aunt";
+ }
+ } else if (areCousins(slave2, slave1)) {
+ return "cousin";
+ } else if (isGrandfatherP(slave1, slave2)) {
+ return "grandfather";
+ } else if (isGrandmotherP(slave1, slave2)) {
+ return "grandmother";
+ } else if (isGrandparentP(slave2, slave1)) {
+ if (slave2.genes === "XY" && V.diversePronouns) {
+ return "grandson";
+ } else {
+ return "granddaughter";
}
}
@@ -491,21 +473,19 @@ window.resetFamilyCounters = function() {
V.PC.daughters = 0;
V.PC.sisters = 0;
- if (V.familyTesting === 1) {
- for (let slave of V.slaves) {
- if (slave.mother === -1 || slave.father === -1) {
- V.PC.daughters++;
- }
- if (areSisters(slave, V.PC)) {
- V.PC.sisters++;
+ for (let slave of V.slaves) {
+ if (slave.mother === -1 || slave.father === -1) {
+ V.PC.daughters++;
+ }
+ if (areSisters(slave, V.PC)) {
+ V.PC.sisters++;
+ }
+ for (let otherSlave of V.slaves) {
+ if (isParentP(otherSlave, slave)) {
+ slave.daughters++;
}
- for (let otherSlave of V.slaves) {
- if (isParentP(otherSlave, slave)) {
- slave.daughters++;
- }
- if (areSisters(otherSlave, slave)) {
- slave.sisters++;
- }
+ if (areSisters(otherSlave, slave)) {
+ slave.sisters++;
}
}
}
diff --git a/src/js/generateRelatedSlave.js b/src/js/generateRelatedSlave.js
index fef0c394869..02225afd7a7 100644
--- a/src/js/generateRelatedSlave.js
+++ b/src/js/generateRelatedSlave.js
@@ -75,10 +75,7 @@ window.generateRelatedSlave = (function() {
* @param {App.Entity.SlaveState} slave - the new twin
*/
function makeTwin(slave) {
- if (!V.familyTesting) {
- slave.relation = "twin";
- slave.relationTarget = sourceID;
- }
+ /* twins are identical, change nothing.
}
/**
@@ -86,11 +83,6 @@ window.generateRelatedSlave = (function() {
* @param {App.Entity.SlaveState} slave - the new sibling
*/
function makeSibling(slave) {
- if (!V.familyTesting) {
- slave.relation = "sister";
- slave.relationTarget = sourceID;
- }
-
// reduce age
slave.actualAge -= random(2, 6);
slave.actualAge = Math.max(slave.actualAge, V.minimumSlaveAge);
@@ -115,13 +107,8 @@ window.generateRelatedSlave = (function() {
* @param {App.Entity.SlaveState} slave - the new daughter
*/
function makeDaughter(slave) {
- if (!V.familyTesting) {
- slave.relation = "daughter";
- slave.relationTarget = sourceID;
- } else {
- slave.mother = slave.genes === "XX" ? sourceID : 0;
- slave.father = slave.genes !== "XX" ? sourceID : 0;
- }
+ slave.mother = slave.genes === "XX" ? sourceID : 0;
+ slave.father = slave.genes !== "XX" ? sourceID : 0;
// select age
const parentAge = slave.actualAge;
diff --git a/src/js/heroCreator.js b/src/js/heroCreator.js
index dd98d99813c..7eb32cce059 100644
--- a/src/js/heroCreator.js
+++ b/src/js/heroCreator.js
@@ -28,11 +28,6 @@ App.Utils.buildHeroArray = function() {
hero--;
continue;
}
- if (V.familyTesting !== 1 && [900110, 900111].includes(array[hero].ID)) {
- array.splice(hero, 1);
- hero--;
- continue;
- }
if (V.heroSlavesPurchased.includes(array[hero].ID)) {
array.splice(hero, 1);
hero--;
@@ -138,41 +133,41 @@ App.Utils.getHeroSlave = function(heroSlave) {
}
SetBellySize(newSlave);
- if (V.familyTesting === 1) {
- /* special slaves exceptions to keep siblings sensible */
- if (newSlave.mother === -9999 && newSlave.father === -9998) {
- /* The twins — Camille & Kennerly */
- for (let k = 0; k < V.slaves.length; k++) {
- if (areSisters(V.slaves[k], newSlave) > 0) {
- newSlave.actualAge = V.slaves[k].actualAge, newSlave.physicalAge = newSlave.actualAge, newSlave.visualAge = newSlave.actualAge, newSlave.ovaryAge = newSlave.actualAge, newSlave.birthWeek = V.slaves[k].birthWeek;
- }
+
+ /* special slaves exceptions to keep siblings sensible */
+ if (newSlave.mother === -9999 && newSlave.father === -9998) {
+ /* The twins — Camille & Kennerly */
+ for (let k = 0; k < V.slaves.length; k++) {
+ if (areSisters(V.slaves[k], newSlave) > 0) {
+ newSlave.actualAge = V.slaves[k].actualAge, newSlave.physicalAge = newSlave.actualAge, newSlave.visualAge = newSlave.actualAge, newSlave.ovaryAge = newSlave.actualAge, newSlave.birthWeek = V.slaves[k].birthWeek;
}
}
- if (newSlave.mother === -9997 && newSlave.father === -9996) {
- /* The siblings — Elisa & Martin */
- for (let k = 0; k < V.slaves.length; k++) {
- if (areSisters(V.slaves[k], newSlave) > 0) {
- if (newSlave.birthName === "Elisa") {
- newSlave.actualAge = V.slaves[k].actualAge - 1, newSlave.physicalAge = newSlave.actualAge, newSlave.visualAge = newSlave.actualAge, newSlave.ovaryAge = newSlave.actualAge;
- } else if (newSlave.birthName === "Martin") {
- newSlave.actualAge = V.slaves[k].actualAge + 1, newSlave.physicalAge = newSlave.actualAge, newSlave.visualAge = newSlave.actualAge, newSlave.ovaryAge = newSlave.actualAge;
- }
+ }
+ if (newSlave.mother === -9997 && newSlave.father === -9996) {
+ /* The siblings — Elisa & Martin */
+ for (let k = 0; k < V.slaves.length; k++) {
+ if (areSisters(V.slaves[k], newSlave) > 0) {
+ if (newSlave.birthName === "Elisa") {
+ newSlave.actualAge = V.slaves[k].actualAge - 1, newSlave.physicalAge = newSlave.actualAge, newSlave.visualAge = newSlave.actualAge, newSlave.ovaryAge = newSlave.actualAge;
+ } else if (newSlave.birthName === "Martin") {
+ newSlave.actualAge = V.slaves[k].actualAge + 1, newSlave.physicalAge = newSlave.actualAge, newSlave.visualAge = newSlave.actualAge, newSlave.ovaryAge = newSlave.actualAge;
}
}
}
- if (newSlave.mother === -9995 && newSlave.father === -9994) {
- /* The fruit siblings — Green & Purple Grape */
- for (let k = 0; k < V.slaves.length; k++) {
- if (areSisters(V.slaves[k], newSlave) > 0) {
- if (newSlave.birthName === "Green Grape") {
- newSlave.actualAge = V.slaves[k].actualAge - 5, newSlave.physicalAge = newSlave.actualAge, newSlave.visualAge = newSlave.actualAge, newSlave.ovaryAge = newSlave.actualAge;
- } else if (newSlave.birthName === "Purple Grape") {
- newSlave.actualAge = V.slaves[k].actualAge + 5, newSlave.physicalAge = newSlave.actualAge, newSlave.visualAge = newSlave.actualAge, newSlave.ovaryAge = newSlave.actualAge;
- }
+ }
+ if (newSlave.mother === -9995 && newSlave.father === -9994) {
+ /* The fruit siblings — Green & Purple Grape */
+ for (let k = 0; k < V.slaves.length; k++) {
+ if (areSisters(V.slaves[k], newSlave) > 0) {
+ if (newSlave.birthName === "Green Grape") {
+ newSlave.actualAge = V.slaves[k].actualAge - 5, newSlave.physicalAge = newSlave.actualAge, newSlave.visualAge = newSlave.actualAge, newSlave.ovaryAge = newSlave.actualAge;
+ } else if (newSlave.birthName === "Purple Grape") {
+ newSlave.actualAge = V.slaves[k].actualAge + 5, newSlave.physicalAge = newSlave.actualAge, newSlave.visualAge = newSlave.actualAge, newSlave.ovaryAge = newSlave.actualAge;
}
}
}
}
+
nationalityToAccent(newSlave);
return newSlave;
};
diff --git a/src/js/releaseRules.js b/src/js/releaseRules.js
index 2f1775813bc..311efef96b9 100644
--- a/src/js/releaseRules.js
+++ b/src/js/releaseRules.js
@@ -38,11 +38,7 @@ App.Utils.hasFamilySex = function hasFamilySex(slave) {
if (V.seeIncest === 0 || slave.rules.release.family === 0) {
return false;
}
- if (V.familyTesting === 0 && slave.relationTarget > 0) {
- return this.sexAllowed(slave, getSlave(slave.relationTarget));
- } else { // familyTesting === 1
- return jsDef(randomRelatedSlave(slave, (s) => { return this.sexAllowed(slave, s); }));
- }
+ return jsDef(randomRelatedSlave(slave, (s) => this.sexAllowed(slave, s)));
};
/**
diff --git a/src/js/removeActiveSlave.js b/src/js/removeActiveSlave.js
index 82882699038..531734a5f0e 100644
--- a/src/js/removeActiveSlave.js
+++ b/src/js/removeActiveSlave.js
@@ -80,10 +80,6 @@ window.removeActiveSlave = function removeActiveSlave() {
slave.sisters--;
}
}
- if (slave.ID === V.activeSlave.relationTarget) {
- slave.relation = 0;
- slave.relationTarget = 0;
- }
if (slave.milkSource !== 0) {
if (slave.milkSource === AS_ID) {
slave.milkSource = 0;
@@ -295,10 +291,6 @@ window.removeNonNGPSlave = function removeNonNGPSlave(removedSlave) {
}
missing = true;
}
- if (slave.ID === removedSlave.relationTarget) {
- slave.relation = 0;
- slave.relationTarget = 0;
- }
if (slave.milkSource !== 0) {
if (slave.milkSource === ID) {
slave.milkSource = 0;
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 4abd0af972c..06ff0aa7606 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -1760,19 +1760,6 @@ window.FResultArray = (function() {
});
}
- /**
- * @param {App.Entity.SlaveState} slave
- */
- function calcWorksWithRelativesVanilla(slave) {
- const fre = getSlave(slave.relationTarget);
- if (fre !== undefined && sameAssignmentP(slave, fre)) {
- adjustFResult(`Works with relative`, 2);
- if (incestBonus) {
- adjustFResult(`Works with relative: incest bonus`, 2);
- }
- }
- }
-
/**
* @param {App.Entity.SlaveState} slave
*/
@@ -1974,10 +1961,8 @@ window.FResultArray = (function() {
*/
function calcNotFuckdoll(slave, forSale=0) {
if (!forSale) {
- if (V.familyTesting === 1 && totalRelatives(slave) > 0) {
+ if (totalRelatives(slave) > 0) {
calcWorksWithRelatives(slave);
- } else if (!V.familyTesting && slave.relation !== 0) {
- calcWorksWithRelativesVanilla(slave);
}
if (slave.relationship > 0) {
calcWorksWithRelationship(slave);
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 2e17e1723f3..a5b28aa5561 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -191,19 +191,15 @@ window.SlaveSummary = (function() {
if (slave.custom.label) {
makeSpan(res, `${capFirstChar(slave.custom.label)}.`, ["yellow", "strong"]);
}
- if ((slave.relationship !== 0) || (slave.relation !== 0) || (V.abbreviateClothes === 2) || (V.abbreviateRulesets === 2)) {
+ if ((slave.relationship !== 0) || (V.abbreviateClothes === 2) || (V.abbreviateRulesets === 2)) {
para = makeParagraph(res);
}
if (V.abbreviateMental === 1) {
- makeSpan(para, V.familyTesting === 1 ? short_extended_family(slave) : short_legacy_family(slave), "lightgreen");
+ makeSpan(para, short_extended_family(slave), "lightgreen");
short_clone(slave, para);
short_rival(slave, para);
} else if (V.abbreviateMental === 2) {
- if (V.familyTesting === 1) {
- long_extended_family(slave, para);
- } else {
- long_legacy_family(slave, para);
- }
+ long_extended_family(slave, para);
long_clone(slave, para);
long_rival(slave, para);
}
@@ -3718,39 +3714,6 @@ window.SlaveSummary = (function() {
return res;
}
- /**
- * @param {App.Entity.SlaveState} slave
- * @returns {string}
- */
- function short_legacy_family(slave) {
- let res = "";
- if (slave.relation !== 0) {
- const _ssj = V.slaves.findIndex(s => s.ID === slave.relationTarget);
- if (_ssj !== -1) {
- res += `${SlaveFullName(V.slaves[_ssj])}'s ${slave.relation}`;
- }
- }
- if (slave.relationship > 0) {
- const _ssj = V.slaves.findIndex(s => s.ID === slave.relationshipTarget);
- if (_ssj !== -1) {
- const friendship = relationshipTerm(slave);
- if (slave.relationshipTarget !== slave.relationTarget) {
- res += `${SlaveFullName(V.slaves[_ssj])}'s`;
- } else {
- res += ` &`;
- }
- res += ` ${friendship}`;
- }
- } else if (slave.relationship === -3) {
- res += `Your ${getPronouns(slave).wife}`;
- } else if (slave.relationship === -2) {
- res += `E Bonded`;
- } else if (slave.relationship === -1) {
- res += `E Slut`;
- }
- return res;
- }
-
/**
* @param {App.Entity.SlaveState} slave
* @param {Node} c
@@ -3921,48 +3884,6 @@ window.SlaveSummary = (function() {
}
}
- /**
- * @param {App.Entity.SlaveState} slave
- * @param {Node} c
- * @returns {void}
- */
- function long_legacy_family(slave, c) {
- const block = makeBlock();
- if (slave.relation !== 0) {
- const _ssj = V.slaves.findIndex(s => s.ID === slave.relationTarget);
- if (_ssj !== -1) {
- addText(block, `${SlaveFullName(V.slaves[_ssj])}'s `);
- if (slave.relationshipTarget !== slave.relationTarget) {
- makeSpan(block, `${slave.relation}.`, "lightgreen");
- } else {
- makeSpan(block, `${slave.relation}`, "lightgreen");
- }
- }
- }
- if (slave.relationship > 0) {
- const _ssj = V.slaves.findIndex(s => s.ID === slave.relationshipTarget);
- if (_ssj !== -1) {
- const friendship = relationshipTerm(slave);
- if (slave.relationshipTarget !== slave.relationTarget) {
- addText(block, `${SlaveFullName(V.slaves[_ssj])}'s `);
- } else {
- addText(block, `and `);
- }
- makeSpan(block, `${friendship}.`, "lightgreen");
- }
- } else if (slave.relationship === -3) {
- makeSpan(block, `Your ${getPronouns(slave).wife}.`, "lightgreen");
- } else if (slave.relationship === -2) {
- makeSpan(block, "Emotionally bonded to you.", "lightgreen");
- } else if (slave.relationship === -1) {
- makeSpan(block, "Emotional slut.", "lightgreen");
- }
-
- if (block.textContent.length > 0) {
- c.appendChild(block);
- }
- }
-
/**
* @param {App.Entity.SlaveState} slave
* @param {Node} c
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index b01452d869e..f4aed7f1e86 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -140,21 +140,6 @@ window.canFemImpreg = function(slave1, slave2) {
}
};
-/**
- * @param {App.Entity.SlaveState} slave
- * @returns {string|number}
- */
-window.relationTargetWord = function(slave) {
- if (!slave) {
- return null;
- } else if (slave.relation === "daughter") {
- return "mother";
- } else if (slave.relation === "mother") {
- return "daughter";
- }
- return slave.relation;
-};
-
/**
* @param {App.Entity.SlaveState} slave
* @returns {number}
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 18f3d0bb6a5..5a001f6e94a 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -1,6 +1,6 @@
:: Acquisition [nobr]
-<<unset $slaveWithoutBonuses, $startingGirlCopied, $startingGirlRelation>>
+<<unset $slaveWithoutBonuses, $startingGirlCopied>>
<<set $showEncyclopedia = 0>>
@@ -123,64 +123,62 @@
<</if>>
<<set $PC.ovaryAge = $PC.physicalAge>>
<</if>>
-<<if $familyTesting == 1>>
- <<set _pcMomFound = 0, _pcDadFound = 0>>
- <<if def $slaveIndices[$PC.mother]>>
- <<set _pcMomFound = 1>>
+<<set _pcMomFound = 0, _pcDadFound = 0>>
+<<if def $slaveIndices[$PC.mother]>>
+ <<set _pcMomFound = 1>>
+<</if>>
+<<if def $slaveIndices[$PC.father]>>
+ <<set _pcDadFound = 1>>
+<</if>>
+<<if _pcMomFound == 0 && $PC.mother > 0>>
+ <<set _lostMom = $PC.mother>>
+ <<set $PC.mother = $missingParentId>>
+ <<for _i = 0; _i < $slaves.length; _i++>>
+ <<if $slaves[_i].mother == _lostMom>>
+ <<set $slaves[_i].mother = $missingParentId>>
+ <</if>>
+ <</for>>
+ <<set $missingParentId-->>
+<</if>>
+<<if _pcDadFound == 0 && $PC.father > 0>>
+ <<set _lostDad = $PC.father>>
+ <<set $PC.father = $missingParentId>>
+ <<for _i = 0; _i < $slaves.length; _i++>>
+ <<if $slaves[_i].father == _lostDad>>
+ <<set $slaves[_i].father = $missingParentId>>
+ <</if>>
+ <</for>>
+ <<set $missingParentId-->>
+<</if>>
+<<for _i = 0; _i < $slaves.length; _i++>>
+ <<set _slaveMomFound = 0, _slaveDadFound = 0>>
+ <<if def $slaveIndices[$slaves[_i].mother]>>
+ <<set _slaveMomFound = 1>>
<</if>>
- <<if def $slaveIndices[$PC.father]>>
- <<set _pcDadFound = 1>>
+ <<if def $slaveIndices[$slaves[_i].father]>>
+ <<set _slaveDadFound = 1>>
<</if>>
- <<if _pcMomFound == 0 && $PC.mother > 0>>
- <<set _lostMom = $PC.mother>>
- <<set $PC.mother = $missingParentId>>
- <<for _i = 0; _i < $slaves.length; _i++>>
- <<if $slaves[_i].mother == _lostMom>>
- <<set $slaves[_i].mother = $missingParentId>>
+ <<if _slaveMomFound == 0 && $slaves[_i].mother > 0>>
+ <<set _lostMom = $slaves[_i].mother>>
+ <<set $slaves[_i].mother = $missingParentID>>
+ <<for _j = 0; _j < $slaves.length; _j++>>
+ <<if $slaves[_j].mother == _lostMom>>
+ <<set $slaves[_j].mother = $missingParentID>>
<</if>>
<</for>>
- <<set $missingParentId-->>
+ <<set $missingParentID-->>
<</if>>
- <<if _pcDadFound == 0 && $PC.father > 0>>
- <<set _lostDad = $PC.father>>
- <<set $PC.father = $missingParentId>>
- <<for _i = 0; _i < $slaves.length; _i++>>
- <<if $slaves[_i].father == _lostDad>>
- <<set $slaves[_i].father = $missingParentId>>
+ <<if _slaveDadFound == 0 && $slaves[_i].father > 0>>
+ <<set _lostDad = $slaves[_i].father>>
+ <<set $slaves[_i].father = $missingParentID>>
+ <<for _j = 0; _j < $slaves.length; _j++>>
+ <<if $slaves[_j].father == _lostDad>>
+ <<set $slaves[_j].father = $missingParentID>>
<</if>>
<</for>>
- <<set $missingParentId-->>
+ <<set $missingParentID-->>
<</if>>
- <<for _i = 0; _i < $slaves.length; _i++>>
- <<set _slaveMomFound = 0, _slaveDadFound = 0>>
- <<if def $slaveIndices[$slaves[_i].mother]>>
- <<set _slaveMomFound = 1>>
- <</if>>
- <<if def $slaveIndices[$slaves[_i].father]>>
- <<set _slaveDadFound = 1>>
- <</if>>
- <<if _slaveMomFound == 0 && $slaves[_i].mother > 0>>
- <<set _lostMom = $slaves[_i].mother>>
- <<set $slaves[_i].mother = $missingParentID>>
- <<for _j = 0; _j < $slaves.length; _j++>>
- <<if $slaves[_j].mother == _lostMom>>
- <<set $slaves[_j].mother = $missingParentID>>
- <</if>>
- <</for>>
- <<set $missingParentID-->>
- <</if>>
- <<if _slaveDadFound == 0 && $slaves[_i].father > 0>>
- <<set _lostDad = $slaves[_i].father>>
- <<set $slaves[_i].father = $missingParentID>>
- <<for _j = 0; _j < $slaves.length; _j++>>
- <<if $slaves[_j].father == _lostDad>>
- <<set $slaves[_j].father = $missingParentID>>
- <</if>>
- <</for>>
- <<set $missingParentID-->>
- <</if>>
- <</for>>
-<</if>>
+<</for>>
<<if $plot == 1 && $neighboringArcologies > 0>>
<<set _bestProsperity = 0, _bestProsperityIndex = 1>>
<<for _acq = 1; _acq < $arcologies.length; _acq++>>
@@ -811,20 +809,10 @@ The previous owner seems to have left in something of a hurry.
<</if>>
//
-/* RELATIONSHIP MUTUALITY CHECK, OLDMENTAL */
-
<<set $averageTrust = 0>>
<<set $averageDevotion = 0>>
<<set _slavesContributing = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].relation != 0>>
- <<set $seed = $slaveIndices[$slaves[$i].relationTarget]>>
- <<if (def $seed && $slaves[$seed].relationTarget != $slaves[$i].ID) || (ndef $seed)>>
- <<set $slaves[$i].relation = 0>>
- <<set $slaves[$i].relationTarget = 0>>
- <<goto "Acquisition">>
- <</if>>
- <</if>>
<<set $slaves[$i].oldDevotion = $slaves[$i].devotion>>
<<set $slaves[$i].oldTrust = $slaves[$i].trust>>
/* AVERAGE VALUES UPDATE */
diff --git a/src/npc/databases/cheatmodeDatabase.tw b/src/npc/databases/cheatmodeDatabase.tw
index ec3c192f3e3..40bf844ea2c 100644
--- a/src/npc/databases/cheatmodeDatabase.tw
+++ b/src/npc/databases/cheatmodeDatabase.tw
@@ -2,7 +2,7 @@
<<set $activeSlave = BaseSlave()>>
<<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Miss Anne", _HS.birthName = "Lindy Anne", _HS.ID = 990000, _HS.relation = "mother", _HS.relationTarget = 990004, _HS.relationship = 4, _HS.relationshipTarget = 990001, _HS.rivalry = 1, _HS.rivalryTarget = 990002, _HS.assignment = "be your Head Girl", _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.ageImplant = 1, setHealth(_HS, 50), _HS.devotion = 100, _HS.height = 175, _HS.eye.origColor = "green", _HS.origHColor = "honey blonde", _HS.origSkin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.buttImplantType = "normal", _HS.face = 55, _HS.lips = 35, _HS.anus = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.skill.entertainment = 100, _HS.clothes = "a slave gown", _HS.intelligence = 100, _HS.energy = 65, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "'Miss Anne' is tattooed in lovely flowing script over $his collarbone.", _HS.custom.desc = "$He speaks with the rich accent of the Old South.">>
+<<set _HS.slaveName = "Miss Anne", _HS.birthName = "Lindy Anne", _HS.ID = 990000, _HS.relationship = 4, _HS.relationshipTarget = 990001, _HS.rivalry = 1, _HS.rivalryTarget = 990002, _HS.assignment = "be your Head Girl", _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.ageImplant = 1, setHealth(_HS, 50), _HS.devotion = 100, _HS.height = 175, _HS.eye.origColor = "green", _HS.origHColor = "honey blonde", _HS.origSkin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.buttImplantType = "normal", _HS.face = 55, _HS.lips = 35, _HS.anus = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.skill.entertainment = 100, _HS.clothes = "a slave gown", _HS.intelligence = 100, _HS.energy = 65, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.tattoo = "'Miss Anne' is tattooed in lovely flowing script over $his collarbone.", _HS.custom.desc = "$He speaks with the rich accent of the Old South.">>
<<if $seeDicks != 100>>
<<set _HS.genes = "XX", _HS.vagina = 2, _HS.ovaries = 1, _HS.skill.vaginal = 100, _HS.pubertyXX = 1>>
<<else>>
@@ -13,7 +13,7 @@
//There are quite a few left; their names are _HS.slaveName,//
<<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Cornelia", _HS.birthName = "Cora", _HS.ID = 990001, _HS.relation = "mother", _HS.relationTarget = 990002, _HS.relationship = 4, _HS.relationshipTarget = 990000, _HS.assignment = "whore", _HS.birthWeek = random(0,51), _HS.actualAge = 36, _HS.physicalAge = 36, _HS.visualAge = 36, _HS.ovaryAge = 36, _HS.ageImplant = 1, setHealth(_HS, 10), _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "dark", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.boobsImplantType = "fillable", _HS.areolae = 2, _HS.butt = 5, _HS.buttImplant = 3, _HS.buttImplantType = "fillable", _HS.preg = -2, _HS.face = 15, _HS.faceImplant = 65, _HS.lips = 35, _HS.lipsImplant = 10, _HS.anus = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.skill.entertainment = 100, _HS.clothes = "a slave gown", _HS.energy = 65, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.brand["left hand"] = "a large letter 'S'", _HS.custom.desc = "$He speaks with the demeaning accent of slaves from the Old South.">>
+<<set _HS.slaveName = "Cornelia", _HS.birthName = "Cora", _HS.ID = 990001, _HS.relationship = 4, _HS.relationshipTarget = 990000, _HS.assignment = "whore", _HS.birthWeek = random(0,51), _HS.actualAge = 36, _HS.physicalAge = 36, _HS.visualAge = 36, _HS.ovaryAge = 36, _HS.ageImplant = 1, setHealth(_HS, 10), _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "dark", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.boobsImplantType = "fillable", _HS.areolae = 2, _HS.butt = 5, _HS.buttImplant = 3, _HS.buttImplantType = "fillable", _HS.preg = -2, _HS.face = 15, _HS.faceImplant = 65, _HS.lips = 35, _HS.lipsImplant = 10, _HS.anus = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.skill.entertainment = 100, _HS.clothes = "a slave gown", _HS.energy = 65, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.brand["left hand"] = "a large letter 'S'", _HS.custom.desc = "$He speaks with the demeaning accent of slaves from the Old South.">>
<<if $seeDicks != 0>>
<<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 3, _HS.balls = 3, _HS.scrotum = 3, _HS.foreskin = 3, _HS.prostate = 1, _HS.pubertyXY = 1>>
<<else>>
@@ -23,7 +23,7 @@
//_HS.slaveName,//
<<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Sheba", _HS.birthName = "Shaneequa", _HS.ID = 990002, _HS.relation = "daughter", _HS.relationTarget = 990001, _HS.rivalry = 1, _HS.rivalryTarget = 990000, _HS.assignment = "whore", _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, setHealth(_HS, 10), _HS.devotion = 12, _HS.height = 175, _HS.race = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1600, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 1, _HS.areolae = 1, _HS.butt = 6, _HS.buttImplant = 2, _HS.buttImplantType = "normal", _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 55, _HS.lipsImplant = 10, _HS.anus = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.whoring = 35, _HS.skill.entertainment = 35, _HS.clothes = "a slave gown", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.brand["left hand"] = "a large letter 'S'", _HS.custom.desc = "$He speaks with the demeaning accent of slaves from the Old South.", _HS.mother = 990001>>
+<<set _HS.slaveName = "Sheba", _HS.birthName = "Shaneequa", _HS.ID = 990002, _HS.rivalry = 1, _HS.rivalryTarget = 990000, _HS.assignment = "whore", _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, setHealth(_HS, 10), _HS.devotion = 12, _HS.height = 175, _HS.race = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1600, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 1, _HS.areolae = 1, _HS.butt = 6, _HS.buttImplant = 2, _HS.buttImplantType = "normal", _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 55, _HS.lipsImplant = 10, _HS.anus = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.whoring = 35, _HS.skill.entertainment = 35, _HS.clothes = "a slave gown", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.brand["left hand"] = "a large letter 'S'", _HS.custom.desc = "$He speaks with the demeaning accent of slaves from the Old South.", _HS.mother = 990001>>
<<if $seeDicks != 100>>
<<set _HS.genes = "XX", _HS.vagina = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.pubertyXX = 1>>
<<else>>
@@ -33,7 +33,7 @@
//_HS.slaveName,//
<<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Cornflower", _HS.birthName = "Alysa", _HS.ID = 990003, _HS.relation = "daughter", _HS.relationTarget = 990005, _HS.relationship = 3, _HS.relationshipTarget = 990005, _HS.assignment = "get milked", _HS.birthWeek = random(0,51), setHealth(_HS, 20), _HS.devotion = 12, _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.waist = -100, _HS.heels = 1, _HS.voice = 0, _HS.boobs = 6000, _HS.nipples = "huge", _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 3, _HS.buttTat = "bovine patterns", _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "bovine patterns", _HS.anus = 3, _HS.anusTat = "bovine patterns", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.custom.tattoo = "A pretty blue cornflower is tattooed on each of $his cheeks.", _HS.custom.desc = "$He once spoke with the demeaning accent of slaves from the Old South.", _HS.mother = 990005>>
+<<set _HS.slaveName = "Cornflower", _HS.birthName = "Alysa", _HS.ID = 990003, _HS.relationship = 3, _HS.relationshipTarget = 990005, _HS.assignment = "get milked", _HS.birthWeek = random(0,51), setHealth(_HS, 20), _HS.devotion = 12, _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.waist = -100, _HS.heels = 1, _HS.voice = 0, _HS.boobs = 6000, _HS.nipples = "huge", _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 3, _HS.buttTat = "bovine patterns", _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "bovine patterns", _HS.anus = 3, _HS.anusTat = "bovine patterns", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.custom.tattoo = "A pretty blue cornflower is tattooed on each of $his cheeks.", _HS.custom.desc = "$He once spoke with the demeaning accent of slaves from the Old South.", _HS.mother = 990005>>
<<if $seeDicks != 100>>
<<set _HS.genes = "XX", _HS.vagina = 1, _HS.vaginaTat = "bovine patterns", _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.pubertyXX = 1>>
<<else>>
@@ -43,7 +43,7 @@
//_HS.slaveName,//
<<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Miss Lily", _HS.birthName = "Lillian", _HS.ID = 990004, _HS.relation = "daughter", _HS.relationTarget = 990000, _HS.assignment = "guard you", _HS.birthWeek = random(0,51), setHealth(_HS, 20), _HS.devotion = 30, _HS.muscles = 50, _HS.height = 175, _HS.eye.origColor = "green", _HS.origHColor = "straw blonde", _HS.origSkin = "pale", _HS.hLength = 40, _HS.hStyle = "in a short ponytail", _HS.waist = -55, _HS.boobs = 600, _HS.butt = 3, _HS.face = 15, _HS.lips = 35, _HS.preg = -2, _HS.anus = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.custom.tattoo = "'Miss Lily' is tattooed in lovely flowing script over $his collarbone.", _HS.custom.desc = "$He once spoke with the rich accent of the Old South.", _HS.mother = 990000>>
+<<set _HS.slaveName = "Miss Lily", _HS.birthName = "Lillian", _HS.ID = 990004, _HS.assignment = "guard you", _HS.birthWeek = random(0,51), setHealth(_HS, 20), _HS.devotion = 30, _HS.muscles = 50, _HS.height = 175, _HS.eye.origColor = "green", _HS.origHColor = "straw blonde", _HS.origSkin = "pale", _HS.hLength = 40, _HS.hStyle = "in a short ponytail", _HS.waist = -55, _HS.boobs = 600, _HS.butt = 3, _HS.face = 15, _HS.lips = 35, _HS.preg = -2, _HS.anus = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.custom.tattoo = "'Miss Lily' is tattooed in lovely flowing script over $his collarbone.", _HS.custom.desc = "$He once spoke with the rich accent of the Old South.", _HS.mother = 990000>>
<<if $seeDicks != 100>>
<<set _HS.genes = "XX", _HS.ovaries = 1, _HS.pubertyXX = 1>>
<<else>>
@@ -54,7 +54,7 @@
//_HS.slaveName,//
<<set _HS = clone($activeSlave)>>
-<<set _HS.slaveName = "Lilac", _HS.birthName = "Lillian", _HS.ID = 990005, _HS.relation = "mother", _HS.relationTarget = 990003, _HS.relationship = 3, _HS.relationshipTarget = 990003, _HS.assignment = "get milked", _HS.birthWeek = random(0,51), _HS.actualAge = 36, _HS.physicalAge = 36, _HS.visualAge = 36, _HS.ovaryAge = 36, setHealth(_HS, 20), _HS.devotion = 12, _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 8000, _HS.nipples = "huge", _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 4, _HS.buttTat = "bovine patterns", _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "bovine patterns", _HS.anus = 3, _HS.anusTat = "bovine patterns", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.custom.tattoo = "A pretty purple lilac is tattooed on each of $his cheeks.", _HS.custom.desc = "$He once spoke with the demeaning accent of slaves from the Old South.">>
+<<set _HS.slaveName = "Lilac", _HS.birthName = "Lillian", _HS.ID = 990005, _HS.relationship = 3, _HS.relationshipTarget = 990003, _HS.assignment = "get milked", _HS.birthWeek = random(0,51), _HS.actualAge = 36, _HS.physicalAge = 36, _HS.visualAge = 36, _HS.ovaryAge = 36, setHealth(_HS, 20), _HS.devotion = 12, _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 8000, _HS.nipples = "huge", _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 4, _HS.buttTat = "bovine patterns", _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "bovine patterns", _HS.anus = 3, _HS.anusTat = "bovine patterns", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.custom.tattoo = "A pretty purple lilac is tattooed on each of $his cheeks.", _HS.custom.desc = "$He once spoke with the demeaning accent of slaves from the Old South.">>
<<if $seeDicks != 100>>
<<set _HS.genes = "XX", _HS.vagina = 1, _HS.vaginaTat = "bovine patterns", _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.pubertyXX = 1>>
<<else>>
diff --git a/src/npc/interaction/fFeelings.tw b/src/npc/interaction/fFeelings.tw
index 30631c8d618..02a1f016a4e 100644
--- a/src/npc/interaction/fFeelings.tw
+++ b/src/npc/interaction/fFeelings.tw
@@ -1232,8 +1232,6 @@ My favorite part of my body i<<s>>
I — I'm fucking my <<sister 2>>," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but <<he 2>>'<<s>> <<s>>o hot, I can't <<s>>top.
<<elseif areSisters(getSlave($AS), $slaves[_partner]) == 3>>
I — I'm fucking my half-<<sister 2>>," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but <<he 2>>'<<s>> <<s>>o hot, I can't <<s>>top.
- <<elseif (getSlave($AS).relation != 0) && ($slaves[_partner].ID == getSlave($AS).relationTarget)>>
- I — I'm fucking my <<if (getSlave($AS).relation == "mother")>><<daughter 2>><<elseif (getSlave($AS).relation == "daughter")>>mother<<else>>getSlave($AS).relation<</if>>," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but <<if (getSlave($AS).relation == "mother")>><<he 2>> ha<<s>> <<s>>uch a hot little body<<elseif (getSlave($AS).relation == "daughter")>><<he 2>>'<<s>> <<s>>uch a hot MILF<<else>><<he 2>>'<<s>> <<s>>o hot<</if>>, I can't <<s>>top.
<<elseif (getSlave($AS).actualAge + 14) < $slaves[_partner].actualAge>>
<<He 2>>'<<s>> old enough to be my mother." $He looks down, blushing a little harder. "But I'm lucky, <<he 2>>'<<s>> <<s>>uch a hot MILF.
<<elseif (getSlave($AS).actualAge - 14) > $slaves[_partner].actualAge>>
diff --git a/src/npc/interaction/fSlaveFeed.tw b/src/npc/interaction/fSlaveFeed.tw
index 88a2de4a90b..cf62f44f5de 100644
--- a/src/npc/interaction/fSlaveFeed.tw
+++ b/src/npc/interaction/fSlaveFeed.tw
@@ -66,17 +66,6 @@ The first necessary step is to prepare the milk cow and _his2 udders.
<<elseif areSisters(getSlave($AS), $milkTap) == 3>>
This is slightly difficult, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 <<print relativeTerm($milkTap, getSlave($AS))>>. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _him2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
-<<elseif $milkTap.relationTarget == getSlave($AS).ID>>
- <<if $milkTap.relation == "twin">>
- This is easy enough, as $milkTap.slaveName wants _his2 <<print relativeTerm($milkTap, getSlave($AS))>> to try _his2 milk, but only if $he can taste _hers2 too. <<if $milkTap.lactation > 1>>_he2 is practically gushing milk with excitement<<else>>It takes minimal effort to get _his2 milk flowing<</if>>.
- <<elseif $milkTap.relation == "sister">>
- This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 <<print relativeTerm($milkTap, getSlave($AS))>>. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _his2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _his2 eager for relief<</if>>.
- <<elseif $milkTap.relation == "mother">>
- This is easy enough, as $milkTap.slaveName fondly remembers nursing _his2 <<print relativeTerm($milkTap, getSlave($AS))>>. <<if $milkTap.lactation > 1>>$he is practically gushing milk with nostalgia<<else>>It takes minimal effort to get _his2 milk flowing<</if>>.
- <<elseif $milkTap.relation == "daughter">>
- This is moderately tough, as $milkTap.slaveName finds it awkward to nurse _his2 own <<print relativeTerm($milkTap, getSlave($AS))>>. <<if $milkTap.lactation > 1>>_His2 excessive milk production quickly leaves _him2 eager for release<<else>>It takes some coaxing and kneading to get _his2 milk flowing and _him2 eager for relief<</if>>.
- <</if>>
-
<<elseif ($milkTap.lactation > 1) && ($milkTap.devotion >= -20)>>
Since $milkTap.slaveName produces so much milk, _he2 eagerly accepts any source of relief _he2 can manage.
@@ -139,17 +128,6 @@ Next, you see to <<= getSlave($AS).slaveName>>.
<<elseif areSisters(getSlave($AS), $milkTap) == 3>>
$He hesitatingly lowers $himself to $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s nipple.
-<<elseif getSlave($AS).relationTarget == $milkTap.ID>>
- <<if getSlave($AS).relation == "twin">>
- $He readily gets in position to <<if canTaste(getSlave($AS))>>taste<<else>>suckle from<</if>> $his <<print relativeTerm(getSlave($AS), $milkTap)>><<if getSlave($AS).lactation > 0>> while coaxing $his own milk to flow<</if>>.
- <<elseif getSlave($AS).relation == "sister">>
- $He hesitatingly lowers $himself to $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s nipple.
- <<elseif getSlave($AS).relation == "mother">>
- $He awkwardly brings $his lips to $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s nipple.
- <<elseif getSlave($AS).relation == "daughter">>
- $He draws close to $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s nipples, trying to remember if $he once had a favorite.
- <</if>>
-
<<elseif (getSlave($AS).fetish == "boobs") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 60) && (getSlave($AS).devotion >= -20)>>
$He can't wait to <<if hasBothArms(getSlave($AS))>>wrap $his hands around<<else>>get between<</if>> $milkTap.slaveName's massive milky breasts and eagerly approaches $his nipples to suckle.
@@ -210,17 +188,6 @@ Next, you see to <<= getSlave($AS).slaveName>>.
<<elseif areSisters(getSlave($AS), $milkTap) == 3>>
$milkTap.slaveName moans lewdly as _his2 <<print relativeTerm($milkTap, getSlave($AS))>> suckles from _his2 breasts. You enjoy the show, specifically the sight of <<= getSlave($AS).slaveName>>'s belly steadily growing larger until <<if getSlave($AS).inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and rubbing $his gurgling stomach<</if>><<elseif getSlave($AS).inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his wobbling, gurgling stomach<</if>><<elseif getSlave($AS).inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his gurgling stomach<</if>><</if>>.
-<<elseif $milkTap.relationTarget == getSlave($AS).ID>>
- <<if $milkTap.relation == "twin">>
- $milkTap.slaveName sighs contently as _his2 <<print relativeTerm($milkTap, getSlave($AS))>> suckles from _his2 breasts. You enjoy the show, specifically the sight of <<= getSlave($AS).slaveName>>'s belly steadily growing larger until <<if getSlave($AS).inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and rubbing $his gurgling stomach<</if>><<elseif getSlave($AS).inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his wobbling, gurgling stomach<</if>><<elseif getSlave($AS).inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his gurgling stomach<</if>><</if>>.
- <<elseif $milkTap.relation == "sister">>
- $milkTap.slaveName moans lewdly as _his2 <<if $milkTap.actualAge >= getSlave($AS).actualAge>>little<<else>>big<</if>> <<print relativeTerm($milkTap, getSlave($AS))>> suckles from _his2 breasts. You enjoy the show, specifically the sight of <<= getSlave($AS).slaveName>>'s belly steadily growing larger until <<if getSlave($AS).inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and rubbing $his gurgling stomach<</if>><<elseif getSlave($AS).inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his wobbling, gurgling stomach<</if>><<elseif getSlave($AS).inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his gurgling stomach<</if>><</if>>.
- <<elseif $milkTap.relation == "mother">>
- $milkTap.slaveName sighs contently as _his2 little $girl once again suckles from _his2 breasts. You enjoy the show, specifically the sight of <<= getSlave($AS).slaveName>>'s belly steadily growing larger until <<if getSlave($AS).inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his mother's nipple and settles into _his2 breasts for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and rubbing $his gurgling stomach<</if>><<elseif getSlave($AS).inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his mother's nipple and settles into _his2 breasts for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his wobbling, gurgling stomach<</if>><<elseif getSlave($AS).inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his mother's nipple and settles into _his2 breasts for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his gurgling stomach<</if>><</if>>.
- <<elseif $milkTap.relation == "daughter">>
- $milkTap.slaveName moans lewdly as $he enjoys some role reversal as _his2 mother suckles from _his2 breasts. You enjoy the show, specifically the sight of <<= getSlave($AS).slaveName>>'s belly steadily growing larger until <<if getSlave($AS).inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and rubbing $his gurgling stomach<</if>><<elseif getSlave($AS).inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his wobbling, gurgling stomach<</if>><<elseif getSlave($AS).inflation == 1>>$his belly is distended and sloshing with milk. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s nipple and settles into _his2 breasts for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his gurgling stomach<</if>><</if>>.
- <</if>>
-
<<elseif (getSlave($AS).devotion < -20) && ($milkTap.devotion < -20)>>
Since you have two restrained and unwilling slaves, the work of milking $milkTap.slaveName's breasts falls to you. That doesn't mean you can't have fun doing it though.
<<if canDoVaginal($milkTap)>>
@@ -422,17 +389,6 @@ The first necessary step is to prepare the cum slave and $his cock and balls.
<<elseif areSisters(getSlave($AS), $milkTap) == 3>>
This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 <<print relativeTerm($milkTap, getSlave($AS))>>, but _he2 can't really complain about getting _his2 overfilled nuts drained.
-<<elseif $milkTap.relationTarget == getSlave($AS).ID>>
- <<if $milkTap.relation == "twin">>
- This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 <<print relativeTerm($milkTap, getSlave($AS))>><<if $milkTap.energy >= 95>>, though as a nymphomaniac, the thought of someone who looks so much like _his2 is a major turn on<<else>> but _he2 can't really complain about getting _his2 overfilled nuts drained<</if>>.
- <<elseif $milkTap.relation == "sister">>
- This is moderately tough, as $milkTap.slaveName is uncomfortable getting so intimate with _his2 <<print relativeTerm($milkTap, getSlave($AS))>>, but _he2 can't really complain about getting _his2 overfilled nuts drained.
- <<elseif $milkTap.relation == "mother">>
- This is tough, as $milkTap.slaveName is very uncomfortable having _his2 dick sucked by _his2 <<print relativeTerm($milkTap, getSlave($AS))>>, but _he2 can't really complain about getting _his2 overfilled nuts drained.
- <<elseif $milkTap.relation == "daughter">>
- This is moderately tough, as $milkTap.slaveName is very uncomfortable having _his2 dick sucked by _his2 own <<print relativeTerm($milkTap, getSlave($AS))>>, but _he2 can't really complain about getting _his2 overfilled nuts drained.
- <</if>>
-
<<elseif ($milkTap.fetish == "cumslut") && ($milkTap.fetishKnown == 1) && ($milkTap.fetishStrength > 60) && ($milkTap.devotion >= -20)>>
This is very easy, since $milkTap.slaveName loves blasting loads whenever _he2 can, and it is just a bonus to _his2 that _he2 gets a blowjob in the process.
@@ -515,17 +471,6 @@ Next, you see to <<= getSlave($AS).slaveName>>.
<<elseif areSisters(getSlave($AS), $milkTap) == 3>>
$He hesitatingly lowers $himself to $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s cock.
-<<elseif getSlave($AS).relationTarget == $milkTap.ID>>
- <<if getSlave($AS).relation == "twin">>
- $He gets in position to suck $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s dick.
- <<elseif getSlave($AS).relation == "sister">>
- $He hesitatingly lowers $himself to $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s cock.
- <<elseif getSlave($AS).relation == "mother">>
- $He awkwardly brings $his lips to $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s cock.
- <<elseif getSlave($AS).relation == "daughter">>
- $He awkwardly brings $his lips to $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s cock.
- <</if>>
-
<<elseif (getSlave($AS).fetish == "cumslut") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 60) && (getSlave($AS).devotion >= -20)>>
$He can't wait to wrap $his lips around $milkTap.slaveName's cock and balloon with cum, so $he eagerly approaches the waiting shaft.
@@ -586,17 +531,6 @@ Next, you see to <<= getSlave($AS).slaveName>>.
<<elseif areSisters(getSlave($AS), $milkTap) == 3>>
$milkTap.slaveName moans lewdly as _his2 <<print relativeTerm($milkTap, getSlave($AS))>> sucks _his2 dick. You enjoy the show, specifically the sight of <<= getSlave($AS).slaveName>>'s belly steadily growing larger with each orgasm until <<if getSlave($AS).inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if hasAnyArms(getSlave($AS))>> and rubbing $his gurgling stomach<</if>><<elseif getSlave($AS).inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his wobbling, gurgling stomach<</if>><<elseif getSlave($AS).inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his gurgling stomach<</if>><</if>>.
-<<elseif $milkTap.relationTarget == getSlave($AS).ID>>
- <<if $milkTap.relation == "twin">>
- $milkTap.slaveName moans lewdly as _his2 <<print relativeTerm($milkTap, getSlave($AS))>> <<print relativeTerm($milkTap, getSlave($AS))>> sucks _his2 off. You enjoy the show, specifically the sight of <<= getSlave($AS).slaveName>>'s belly steadily growing larger with each orgasm until <<if getSlave($AS).inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if hasAnyArms(getSlave($AS))>> and rubbing $his gurgling stomach<</if>><<elseif getSlave($AS).inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his wobbling, gurgling stomach<</if>><<elseif getSlave($AS).inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his gurgling stomach<</if>><</if>>.
- <<elseif $milkTap.relation == "sister">>
- $milkTap.slaveName moans lewdly as _his2 <<if $milkTap.actualAge >= getSlave($AS).actualAge>>little<<else>>big<</if>> <<print relativeTerm($milkTap, getSlave($AS))>> energetically sucks _his2 dick. You enjoy the show, specifically the sight of <<= getSlave($AS).slaveName>>'s belly steadily growing larger with each orgasm until <<if getSlave($AS).inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if hasAnyArms(getSlave($AS))>> and rubbing $his gurgling stomach<</if>><<elseif getSlave($AS).inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his wobbling, gurgling stomach<</if>><<elseif getSlave($AS).inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his gurgling stomach<</if>><</if>>.
- <<elseif $milkTap.relation == "mother">>
- $milkTap.slaveName moans lewdly as _his2 <<print relativeTerm($milkTap, getSlave($AS))>> energetically sucks _his2 dick. You enjoy the show, specifically the sight of <<= getSlave($AS).slaveName>>'s belly steadily growing larger with each orgasm until <<if getSlave($AS).inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his mother's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if hasAnyArms(getSlave($AS))>> and rubbing $his gurgling stomach<</if>><<elseif getSlave($AS).inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his mother's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his wobbling, gurgling stomach<</if>><<elseif getSlave($AS).inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his mother's cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his gurgling stomach<</if>><</if>>.
- <<elseif $milkTap.relation == "daughter">>
- $milkTap.slaveName moans lewdly as _his2 mother energetically sucks _his2 dick. You enjoy the show, specifically the sight of <<= getSlave($AS).slaveName>>'s belly steadily growing larger with each orgasm until <<if getSlave($AS).inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if hasAnyArms(getSlave($AS))>> and rubbing $his gurgling stomach<</if>><<elseif getSlave($AS).inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his wobbling, gurgling stomach<</if>><<elseif getSlave($AS).inflation == 1>>$his belly is distended and sloshing with cum. $He pops off $his <<print relativeTerm(getSlave($AS), $milkTap)>>'s cock and takes a seat facing the smiling $milkTap.slaveName while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his gurgling stomach<</if>><</if>>.
- <</if>>
-
<<elseif (getSlave($AS).devotion < -20) && ($milkTap.devotion < -20)>>
Since you have two restrained and unwilling slaves, though $milkTap.slaveName's twitching penis betrays _him2, you are going to have to take an active role in forcing <<= getSlave($AS).slaveName>> to suck.
<<if canDoVaginal(getSlave($AS))>>
diff --git a/src/npc/interaction/passage/fSlaveImpreg.tw b/src/npc/interaction/passage/fSlaveImpreg.tw
index 9e2ec702d14..66f2dcfaf40 100644
--- a/src/npc/interaction/passage/fSlaveImpreg.tw
+++ b/src/npc/interaction/passage/fSlaveImpreg.tw
@@ -17,7 +17,7 @@
<<if _eligibles[_i].custom.label>>
(@@.yellow;''<<print _eligibles[_i].custom.label>>''@@)
<</if>>
- <<if $familyTesting == 1 && totalRelatives(getSlave($AS)) > 0>>
+ <<if totalRelatives(getSlave($AS)) > 0>>
<<set _relTerm = relativeTerm(getSlave($AS), _eligibles[_i])>>
<<if _relTerm != null>>
@@.lightgreen;<<= capFirstChar(_relTerm)>>@@
diff --git a/src/npc/interaction/passage/fSlaveSlaveDick.tw b/src/npc/interaction/passage/fSlaveSlaveDick.tw
index d3b066b52b7..f2dd04775fa 100644
--- a/src/npc/interaction/passage/fSlaveSlaveDick.tw
+++ b/src/npc/interaction/passage/fSlaveSlaveDick.tw
@@ -17,7 +17,7 @@
<<if (canImpreg(_eligibles[_i], $activeSlave))>>
@@.green;Fertile@@
<</if>>
- <<if $familyTesting == 1 && totalRelatives($activeSlave) > 0>>
+ <<if totalRelatives($activeSlave) > 0>>
<<set _relTerm = relativeTerm($activeSlave, _eligibles[_i])>>
<<if _relTerm != null>>
@@.lightgreen;<<= capFirstChar(_relTerm)>>@@
diff --git a/src/npc/interaction/passage/fSlaveSlaveVag.tw b/src/npc/interaction/passage/fSlaveSlaveVag.tw
index f1337a2cdb6..4b4e3fb3f55 100644
--- a/src/npc/interaction/passage/fSlaveSlaveVag.tw
+++ b/src/npc/interaction/passage/fSlaveSlaveVag.tw
@@ -18,7 +18,7 @@
<<if (canImpreg($activeSlave, _eligibles[_i]))>>
@@.green;Virile@@
<</if>>
- <<if $familyTesting == 1 && totalRelatives($activeSlave) > 0>>
+ <<if totalRelatives($activeSlave) > 0>>
<<set _relTerm = relativeTerm($activeSlave, _eligibles[_i])>>
<<if _relTerm != null>>
@@.lightgreen;<<= capFirstChar(_relTerm)>>@@
diff --git a/src/npc/rgASDump.tw b/src/npc/rgASDump.tw
index bfd0c1e6fec..e72a9ea0283 100644
--- a/src/npc/rgASDump.tw
+++ b/src/npc/rgASDump.tw
@@ -14,30 +14,6 @@
<<set $activeSlave.analArea = $activeSlave.anus>>
<</if>>
-/* RECRUITERS */
-
-<<if $familyTesting == 1>>
- <<if $activeSlave.canRecruit == 1>>
- /*<<set $recruiters.push($activeSlave)>>*/
- <</if>>
-<<else>>
-
-<<if ($activeSlave.relation == 0)>>
- <<if random(1,100) <= 5>>
- <<set $activeSlave.recruiter = "twin">>
- <<elseif ($activeSlave.actualAge > 32) && (random(1,100) <= 41)>>
- <<set $activeSlave.recruiter = "mother">>
- <<elseif ($activeSlave.actualAge < 24) && (random(1,100) <= 40)>>
- <<set $activeSlave.recruiter = "daughter">>
- <<elseif ($activeSlave.actualAge < 43) && (random(1,100) <= 20)>>
- <<set $activeSlave.recruiter = "older sister">>
- <<elseif ($activeSlave.actualAge < 25) && ($activeSlave.actualAge > 18) && (random(1,100) <= 20)>>
- <<set $activeSlave.recruiter = "young sister">>
- <</if>>
-<</if>>
-
-<</if>>
-
<<if $applyCareerBonus == 1>>
<<set _seed = 2>>
<<if $PC.career == "capitalist">>
diff --git a/src/npc/slaveStats.tw b/src/npc/slaveStats.tw
index 689bb699756..efc6b9785b4 100644
--- a/src/npc/slaveStats.tw
+++ b/src/npc/slaveStats.tw
@@ -474,8 +474,6 @@ Income: <<= num($activeSlave.lastWeeksRepIncome)>>
<br><br> <h2>Relationships</h2>
<br>Rules: $activeSlave.rules.relationship
- <br>Relation: $activeSlave.relation,
- Target: $activeSlave.relationTarget
<br>Relationship: $activeSlave.relationship,
Target: $activeSlave.relationshipTarget
<br>Rivalry: $activeSlave.rivalry,
@@ -515,7 +513,6 @@ Income: <<= num($activeSlave.lastWeeksRepIncome)>>
<div id="Misc" class="tabcontent">
<div class="content">
- <br>Recruiter: $activeSlave.recruiter
<br>Deadliness <<print Deadliness($activeSlave)>>
<br>Count: Penetrative: $activeSlave.counter.penetrative,
Public: $activeSlave.counter.publicUse
diff --git a/src/npc/startingGirls/commitStartingGirl.tw b/src/npc/startingGirls/commitStartingGirl.tw
index 56b2d86dfd5..c4e9e603107 100644
--- a/src/npc/startingGirls/commitStartingGirl.tw
+++ b/src/npc/startingGirls/commitStartingGirl.tw
@@ -30,84 +30,6 @@
<<set $activeSlave = generateStartingSlave()>>
<<goto "Starting Girls">>
<</link>>
- <<if $familyTesting == 1>>
- <br>[[Add another slave, based on the previous slave|Starting Girls][$activeSlave = $slaveWithoutBonuses, $startingGirlCopied = 1, $activeSlave.mother = 0, $activeSlave.father = 0]]
- <<else>>
- <br>[[Add another slave, based on the previous slave|Starting Girls][$activeSlave = $slaveWithoutBonuses, $activeSlave.relation = 0, $activeSlave.relationTarget = 0, $startingGirlCopied = 1]]
- <</if>>
- <<if $createRelatedSlave == 1>>
- <br>
- //Add another slave, related to the previous slave://
- <br>
- <<if $familyTesting == 1>>
- /* Not needed due to stuffedanon's work
- <<if $activeSlave.actualAge >= 34>>
- <<if $activeSlave.ovaries>>
- <br>
- [[Daughter|RG AS Dump][$returnTo = "Starting Girls", $startingGirlRelation = "mother", $startingGirlCopied = 1]]
- <</if>>
- <<if $activeSlave.balls>>
- <br>
- [[Dick-daughter|RG AS Dump][$returnTo = "Starting Girls", $startingGirlRelation = "father", $startingGirlCopied = 1]]
- //A slave daughter carried and birthed by another woman, impregnated by $activeSlave.slaveName.//
- <</if>>
- /% I'm aware this term is ridiculous. If anyone can come up with a better word to reconcile all slaves being female with the act of fatherhood and the masculine nature of the word father, I'm all ears. Wrote myself into a corner on this one. %/
- <</if>>
- <<if $activeSlave.actualAge <= 28>>
- <<if $activeSlave.mother <= 0>>
- <br>
- [[Mother|RG AS Dump][$returnTo = "Starting Girls", $activeSlave.mother = $IDNumber, $startingGirlRelation = "daughter", $startingGirlCopied = 1]]
- <<else>>
- //This slave already has a mother.//
- <</if>>
- <<if $seeDicks>>
- <<if $activeSlave.father <= 0>>
- <br>
- [[Dick-mother|RG AS Dump][$returnTo = "Starting Girls", $activeSlave.father = $IDNumber, $startingGirlRelation = "dickdaughter", $startingGirlCopied = 1]]
- //A slave who provided the impregnation to create $activeSlave.slaveName.//
- <<else>>
- //This slave already has a dick-mother.//
- <</if>>
- <</if>>
- <</if>>
- <<if $activeSlave.actualAge < 44>>
- <br>
- [[Older Sister|RG AS Dump][$returnTo = "Starting Girls", $startingGirlRelation = "older sister", $startingGirlCopied = 1]]
- <</if>>
- <br>
- [[Twin|RG AS Dump][$returnTo = "Starting Girls", $startingGirlRelation = "twin", $startingGirlCopied = 1]]
- <<if $activeSlave.actualAge > 19>>
- <br>
- [[Younger Sister|RG AS Dump][$returnTo = "Starting Girls", $startingGirlRelation = "younger sister", $startingGirlCopied = 1]]
- <</if>>
- */
- <br> //Use "based on the previous slave" and the available .father and .mother controls to create your family//
- <<else>>
- <br>
- <<if $activeSlave.actualAge <= 8 && ($PC.career == "servant" || $PC.career == "escort") && ($PC.vagina != -1)>>
- <<else>>
- <<if $activeSlave.actualAge >= ($fertilityAge + $minimumSlaveAge)>>
- <br>
- [[Daughter|RG AS Dump][$returnTo = "Starting Girls", $activeSlave.relation = "mother", $startingGirlRelation = "mother", $activeSlave.counter.birthsTotal += 1, $activeSlave.relationTarget = $activeSlave.ID+1, $startingGirlCopied = 1]]
- <</if>>
- <<if $activeSlave.actualAge <= 24>>
- <br>
- [[Mother|RG AS Dump][$returnTo = "Starting Girls", $activeSlave.relation = "daughter", $startingGirlRelation = "daughter", $activeSlave.relationTarget = $activeSlave.ID+1, $startingGirlCopied = 1]]
- <</if>>
- <<if $activeSlave.actualAge < 44>>
- <br>
- [[Older Sister|RG AS Dump][$returnTo = "Starting Girls", $activeSlave.relation = "sister", $startingGirlRelation = "older sister", $activeSlave.relationTarget = $activeSlave.ID+1, $startingGirlCopied = 1]]
- <</if>>
- <br>
- [[Twin|RG AS Dump][$returnTo = "Starting Girls", $activeSlave.relation = "twin", $startingGirlRelation = "twin", $activeSlave.relationTarget = $activeSlave.ID+1, $startingGirlCopied = 1]]
- <<if $activeSlave.actualAge > $minimumSlaveAge+1>>
- <br>
- [[Younger Sister|RG AS Dump][$returnTo = "Starting Girls", $activeSlave.relation = "sister", $startingGirlRelation = "younger sister", $activeSlave.relationTarget = $activeSlave.ID+1, $startingGirlCopied = 1]]
- <</if>>
- <</if>>
- <</if>>
- <<elseif $activeSlave.relation == 0>>
- <br>[[Add another slave, related to the previous slave|Commit Starting Girl][$createRelatedSlave = 1]]
- <</if>>
+ <br>[[Add another slave, based on the previous slave|Starting Girls][$activeSlave = $slaveWithoutBonuses, $startingGirlCopied = 1, $activeSlave.mother = 0, $activeSlave.father = 0]]
<</if>>
<br>[[Stop adding slaves and take control of the arcology|Acquisition]]
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 9b8b1e1b54b..75d4b20108b 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -28,90 +28,6 @@
<<set _tempSlave = clone($activeSlave), $activeSlave = $slaveWithoutBonuses>>
<<set $activeSlave.ID = generateSlaveID()>>
<<if $startingGirlRelation>>
- <<if $familyTesting == 1>>
- /*
- <<switch $startingGirlRelation>>
- <<case "mother">>
- <<set $activeSlave.mother = _tempSlave.ID, $activeSlave.actualAge -= random(16,24)>>
- <<set $activeSlave.father = 0>>
- <<case "father">>
- <<set $activeSlave.father = _tempSlave.ID, $activeSlave.actualAge -= random(16,24)>>
- <<set $activeSlave.mother = 0>>
- <<case "daughter">>
- <<set $activeSlave.actualAge += random(16,24), $activeSlave.birthWeek = random(0,51)>>
- <<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
- <<if $activeSlave.ovaries == 0>><<set $activeSlave.vagina++>><</if>>
- <<if $activeSlave.father < -2>> /% Find existing siblings. %/
- <<for _i = 0; _i < $slaves.length; _i++>>
- <<if $slaves[_i].father == $activeSlave.father>>
- <<set $slaves[_i].mother = $activeSlave.ID>>
- <</if>>
- <</for>>
- <</if>>
- <<set $activeSlave.mother = 0, $activeSlave.father = 0>>
- <<case "dickdaughter">>
- <<set $activeSlave.actualAge += random(16,24), $activeSlave.birthWeek = random(0,51)>>
- <<set $activeSlave.dick = Math.clamp($activeSlave.dick,2,10)>>
- <<set $activeSlave.balls = Math.clamp($activeSlave.balls,2,10)>>
- <<set $activeSlave.scrotum = Math.clamp($activeSlave.scrotum,2,10)>>
- <<set $activeSlave.father = 0>>
- <<if $activeSlave.mother < -2>> /% Find existing siblings. %/
- <<for _i = 0; _i < $slaves.length; _i++>>
- <<if $slaves[_i].mother == $activeSlave.mother>>
- <<set $slaves[_i].father = $activeSlave.ID>>
- <</if>>
- <</for>>
- <</if>>
- <<set $activeSlave.mother = 0, $activeSlave.father = 0>>
- <<case "older sister">>
- <<set $activeSlave.actualAge += random(2,4)>>
- <<case "younger sister">>
- <<set $activeSlave.actualAge -= random(2,4)>>
- <</switch>>
- <<if $startingGirlRelation == "older sister" || $startingGirlRelation == "younger sister" || $startingGirlRelation == "twin">> /% Sibling parentage. If the previous slave has defined parentage, that's already shared with the new sibling via the clone. If not, a shared missing parent is applied. %/
- <<if $activeSlave.mother == 0>>
- <<set $activeSlave.mother = $missingParentID>>
- <<set $missingParentID-->>
- <<for _i = 0; _i < $slaves.length; _i++>><<if $slaves[_i].ID == _tempSlave.ID>><<set $slaves[_i].mother = $activeSlave.mother>><<break>><</if>><</for>>
- <</if>>
- <<if $activeSlave.father == 0>>
- <<set $activeSlave.father = $missingParentID>>
- <<set $missingParentID-->>
- <<for _i = 0; _i < $slaves.length; _i++>><<if $slaves[_i].ID == _tempSlave.ID>><<set $slaves[_i].father = $activeSlave.father>><<break>><</if>><</for>>
- <</if>>
- <</if>>
- <<if $activeSlave.mother && $activeSlave.father>> /% Propagate missing family information across existing slaves. Assumes monogamous reproduction, e.g. all sets of siblings have a pair of exclusive parents. %/
- <<for _i = 0; _i < $slaves.length; _i++>>
- <<if $slaves[_i].mother == $activeSlave.mother>>
- <<if $slaves[_i].father == 0>>
- <<set $slaves[_i].father = $activeSlave.father>>
- <</if>>
- <</if>>
- <<if $slaves[_i].father == $activeSlave.father>>
- <<if $slaves[_i].mother == 0>>
- <<set $slaves[_i].mother = $activeSlave.mother>>
- <</if>>
- <</if>>
- <</for>>
- <</if>>
- */
- <<else>>
- <<switch $startingGirlRelation>>
- <<case "mother">>
- <<set $activeSlave.relation = "daughter", $activeSlave.actualAge -= random(16,24)>>
- <<case "daughter">>
- <<set $activeSlave.relation = "mother", $activeSlave.actualAge += random(16,24)>>
- <<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
- <<case "older sister">>
- <<set $activeSlave.relation = "sister", $activeSlave.actualAge += random(2,4)>>
- <<case "younger sister">>
- <<set $activeSlave.relation = "sister", $activeSlave.actualAge -= random(2,4)>>
- <<default>>
- <<set $activeSlave.relation = "twin">>
- <</switch>>
- <<set $activeSlave.relationTarget = _tempSlave.ID>>
- <</if>>
- <<if $startingGirlRelation != "twin">><<set $activeSlave.birthWeek = random(0,51)>><</if>>
<<if $activeSlave.slaveSurname>><<set _familyName = $activeSlave.slaveSurname>><</if>>
<<if $activeSlave.birthSurname>><<set _familyBirthSurname = $activeSlave.birthSurname>><</if>>
<</if>>
@@ -131,7 +47,7 @@
<<set $activeSlave.fetishStrength = random(0,90)>>
<<set $activeSlave.fetish = either("boobs", "buttslut", "cumslut", "dom", "humiliation", "masochist", "none", "none", "none", "none", "none", "none", "none", "none", "none", "none", "pregnancy", "sadist", "submissive")>>
<</if>>
- <<set $startingGirlCopied = 0, $startingGirlRelation = 0>>
+ <<set $startingGirlCopied = 0>>
<</if>>
<h2>You are customizing this slave:</h2>
@@ -561,9 +477,7 @@
@@.yellow;XY@@ (Male)
<</options>>
-<<if $familyTesting == 1>>
- <<editFamily>>
-<</if>>
+<<editFamily>>
<<options $activeSlave.health.condition>>
''Condition:''
@@ -1580,7 +1494,7 @@
<<if $PC.career != "engineer">>
<div class="indent">
<<link "Add this slave">>
- <<set $returnTo = "Commit Starting Girl", $createRelatedSlave = 0, $applyCareerBonus = 1, $careerBonusApplied = 0>>
+ <<set $returnTo = "Commit Starting Girl", $applyCareerBonus = 1, $careerBonusApplied = 0>>
<<set _slaveCost = startingSlaveCost($activeSlave)>>
<<run cashX(forceNeg(_slaveCost), "slaveTransfer", $activeSlave)>>
<<goto "RG AS Dump">>
@@ -1614,7 +1528,7 @@
</div>
<div class="indent">
<<link "Add slave without career bonus">>
- <<set $returnTo = "Commit Starting Girl", $createRelatedSlave = 0, $applyCareerBonus = 0, $careerBonusApplied = 0>>
+ <<set $returnTo = "Commit Starting Girl", $applyCareerBonus = 0, $careerBonusApplied = 0>>
<<set _slaveCost = startingSlaveCost($activeSlave)>>
<<run cashX(forceNeg(_slaveCost), "slaveTransfer", $activeSlave)>>
<<goto "RG AS Dump">>
@@ -1623,7 +1537,7 @@
<<else>>
<div class="indent">
<<link "Add this slave">>
- <<set $returnTo = "Commit Starting Girl", $createRelatedSlave = 0, $applyCareerBonus = 0, $careerBonusApplied = 0>>
+ <<set $returnTo = "Commit Starting Girl", $applyCareerBonus = 0, $careerBonusApplied = 0>>
<<set _slaveCost = startingSlaveCost($activeSlave)>>
<<run cashX(forceNeg(_slaveCost), "slaveTransfer", $activeSlave)>>
<<goto "RG AS Dump">>
diff --git a/src/player/js/enslavePlayer.js b/src/player/js/enslavePlayer.js
index 29937ed936c..b6a20e12957 100644
--- a/src/player/js/enslavePlayer.js
+++ b/src/player/js/enslavePlayer.js
@@ -52,9 +52,6 @@ window.convertPlayerToSlave = function(slave, badEnd = "boring") {
slave.weekAcquired = 0;
slave.origin = "A former arcology owner that made some poor decisions in $his life.";
slave.porn = new App.Entity.PlayerPornPerformanceState();
- slave.recruiter = 0;
- slave.relation = 0;
- slave.relationTarget = 0;
slave.relationship = 0;
slave.relationshipTarget = 0;
slave.rivalry = 0;
diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw
index a4047f30a3d..2c0534278c1 100644
--- a/src/pregmod/eliteTakeOverResult.tw
+++ b/src/pregmod/eliteTakeOverResult.tw
@@ -158,7 +158,6 @@
<<run setHealth($activeSlave, jsRandom(60, 75), 0, 0, 0, jsRandom(0, 20))>>
<<set $activeSlave.canRecruit = 0>>
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
- <<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</if>>
<<for _i = $eliteLeft; _i > 0; _i-->>
<<set $activeSlaveOneTimeMinAge = 25>>
@@ -205,7 +204,6 @@
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
- <<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
<</if>>
diff --git a/src/pregmod/killSlave.tw b/src/pregmod/killSlave.tw
index ae04e94e954..3cb552dfd4e 100644
--- a/src/pregmod/killSlave.tw
+++ b/src/pregmod/killSlave.tw
@@ -135,95 +135,82 @@ you <<if canHear($activeSlave)>>quietly <</if>>reach behind your desk and pull o
rings through the room. You have another servant clean up the mess as you continue with what you were previously doing.
<br><br>
- <<if $familyTesting == 1>>
- <<for _ss = 0; _ss < $slaves.length; _ss++>>
- <<if $activeSlave.mother == $slaves[_ss].ID>>
- <<setLocalPronouns $slaves[_ss] 2>>
- $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed _his2 $daughter.
- <br><br>
- <<set $slaves[_ss].devotion -= 30>>
- <</if>>
- <<if $activeSlave.father == $slaves[_ss].ID>>
- <<setLocalPronouns $slaves[_ss] 2>>
- $slaves[_ss].slaveName is @@.mediumorchid;disappointed@@ that you have killed _his2 $daughter.
- <br><br>
- <<set $slaves[_ss].devotion -= 20>>
- <</if>>
- <<if $activeSlave.ID == $slaves[_ss].father>>
- <<setLocalPronouns $slaves[_ss] 2>>
- $slaves[_ss].slaveName is @@.mediumorchid;saddened@@ that you have killed _his2 father.
- <br><br>
- <<set $slaves[_ss].devotion -= 20>>
- <</if>>
- <<if $activeSlave.ID == $slaves[_ss].mother>>
- <<setLocalPronouns $slaves[_ss] 2>>
- $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed _his2 mother.
- <br><br>
- <<set $slaves[_ss].devotion -= 30>>
- <</if>>
- <<switch areSisters($activeSlave, $slaves[_ss])>>
- <<case 1>>
- <<setLocalPronouns $slaves[_ss] 2>>
- $slaves[_ss].slaveName is @@.mediumorchid;devastated@@ that you have killed _his2 twin.
- <br><br>
- <<set $slaves[_ss].devotion -= 30>>
- <<case 2>>
- <<setLocalPronouns $slaves[_ss] 2>>
- $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed _his2 $sister.
- <br><br>
- <<set $slaves[_ss].devotion -= 30>>
- <<case 3>>
- <<setLocalPronouns $slaves[_ss] 2>>
- $slaves[_ss].slaveName is @@.mediumorchid;disheartened@@ that you have killed _his2 half-<<= $sister>>.
- <br><br>
- <<set $slaves[_ss].devotion -= 20>>
- <</switch>>
- <</for>>
- <<else>>
- <<if $activeSlave.relation != 0>>
- <<set _ss = $slaveIndices[$activeSlave.relationTarget]>>
- <<if (def _ss) && $slaves[_ss].fetish != "mindbroken">>
- <<setLocalPronouns $slaves[_ss] 2>>
- $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed _his2 $activeSlave.relation.
- <br><br>
- <<set $slaves[_ss].devotion -= 30>>
- <<set $display = 1>>
- <</if>>
- <</if>>
+ <<for _ss = 0; _ss < $slaves.length; _ss++>>
+ <<if $activeSlave.mother == $slaves[_ss].ID>>
+ <<setLocalPronouns $slaves[_ss] 2>>
+ $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed _his2 $daughter.
+ <br><br>
+ <<set $slaves[_ss].devotion -= 30>>
<</if>>
- <<if $activeSlave.relationship > 0>>
- <<set _ss = $slaveIndices[$activeSlave.relationshipTarget]>>
- <<if (def _ss) && $slaves[_ss].fetish != "mindbroken">>
- <<setLocalPronouns $slaves[_ss] 2>>
- $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed _his2 best source of comfort and companionship in a life of bondage.
- <br><br>
- <<set $slaves[_ss].devotion -= $slaves[_ss].relationship*10>>
- <<set $display = 1>>
- <</if>>
- <<elseif $activeSlave.relationship == -3>>
- Killing one of your slave $wives is @@.red;socially unacceptable.@@ In addition, your other devoted slaves are @@.gold;worried@@ that you may not respect their status.
+ <<if $activeSlave.father == $slaves[_ss].ID>>
+ <<setLocalPronouns $slaves[_ss] 2>>
+ $slaves[_ss].slaveName is @@.mediumorchid;disappointed@@ that you have killed _his2 $daughter.
<br><br>
- <<run repX(-200, "event")>>
+ <<set $slaves[_ss].devotion -= 20>>
+ <</if>>
+ <<if $activeSlave.ID == $slaves[_ss].father>>
+ <<setLocalPronouns $slaves[_ss] 2>>
+ $slaves[_ss].slaveName is @@.mediumorchid;saddened@@ that you have killed _his2 father.
+ <br><br>
+ <<set $slaves[_ss].devotion -= 20>>
+ <</if>>
+ <<if $activeSlave.ID == $slaves[_ss].mother>>
+ <<setLocalPronouns $slaves[_ss] 2>>
+ $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed _his2 mother.
+ <br><br>
+ <<set $slaves[_ss].devotion -= 30>>
+ <</if>>
+ <<switch areSisters($activeSlave, $slaves[_ss])>>
+ <<case 1>>
+ <<setLocalPronouns $slaves[_ss] 2>>
+ $slaves[_ss].slaveName is @@.mediumorchid;devastated@@ that you have killed _his2 twin.
+ <br><br>
+ <<set $slaves[_ss].devotion -= 30>>
+ <<case 2>>
+ <<setLocalPronouns $slaves[_ss] 2>>
+ $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed _his2 $sister.
+ <br><br>
+ <<set $slaves[_ss].devotion -= 30>>
+ <<case 3>>
+ <<setLocalPronouns $slaves[_ss] 2>>
+ $slaves[_ss].slaveName is @@.mediumorchid;disheartened@@ that you have killed _his2 half-<<= $sister>>.
+ <br><br>
+ <<set $slaves[_ss].devotion -= 20>>
+ <</switch>>
+ <</for>>
+ <<if $activeSlave.relationship > 0>>
+ <<set _ss = $slaveIndices[$activeSlave.relationshipTarget]>>
+ <<if (def _ss) && $slaves[_ss].fetish != "mindbroken">>
+ <<setLocalPronouns $slaves[_ss] 2>>
+ $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed _his2 best source of comfort and companionship in a life of bondage.
+ <br><br>
+ <<set $slaves[_ss].devotion -= $slaves[_ss].relationship*10>>
<<set $display = 1>>
- <<for _ss = 0; _ss < $slaves.length; _ss++>>
- <<if $slaves[_ss].devotion > 50>>
- <<set $slaves[_ss].trust -= 10>>
- <</if>>
- <</for>>
<</if>>
- <<if $activeSlave.rivalry != 0>>
- <<set _ss = $slaveIndices[$activeSlave.rivalryTarget]>>
- <<if (def _ss) && $slaves[_ss].fetish != "mindbroken">>
- <<setLocalPronouns $slaves[_ss] 2>>
- $slaves[_ss].slaveName is @@.hotpink;pleased@@ that $he won't have to see _his2 rival any more.
- <br><br>
- <<set $slaves[_ss].devotion += $slaves[_ss].rivalry*3>>
- <<set $display = 1>>
+ <<elseif $activeSlave.relationship == -3>>
+ Killing one of your slave $wives is @@.red;socially unacceptable.@@ In addition, your other devoted slaves are @@.gold;worried@@ that you may not respect their status.
+ <br><br>
+ <<run repX(-200, "event")>>
+ <<set $display = 1>>
+ <<for _ss = 0; _ss < $slaves.length; _ss++>>
+ <<if $slaves[_ss].devotion > 50>>
+ <<set $slaves[_ss].trust -= 10>>
<</if>>
+ <</for>>
+ <</if>>
+ <<if $activeSlave.rivalry != 0>>
+ <<set _ss = $slaveIndices[$activeSlave.rivalryTarget]>>
+ <<if (def _ss) && $slaves[_ss].fetish != "mindbroken">>
+ <<setLocalPronouns $slaves[_ss] 2>>
+ $slaves[_ss].slaveName is @@.hotpink;pleased@@ that $he won't have to see _his2 rival any more.
+ <br><br>
+ <<set $slaves[_ss].devotion += $slaves[_ss].rivalry*3>>
+ <<set $display = 1>>
<</if>>
+ <</if>>
- <<= removeActiveSlave() >>
- <<set $nextLink = "Main", $killChoice = -1>>
+ <<= removeActiveSlave() >>
+ <<set $nextLink = "Main", $killChoice = -1>>
<</replace>><</link>>
<br><<link "Have mercy on $him">><<set $killChoice = 1>>
<<replace "#killScene">>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index eb1818ee712..40d1b89e9cc 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -492,27 +492,25 @@
</p>
<</if>>
-<<if $familyTesting == 1>>
- <h3>Family</h3>
- <p>
- <span id="family">
- <div id="familyTree">
- </div>
- <span id="familyTreeLink">
- <<link "Pull up the file on your family tree.">>
- <<replace #familyTreeLink>>
- <<run renderFamilyTree($slaves, -1)>>
- <</replace>>
- <</link>>
- </span>
+<h3>Family</h3>
+<p>
+ <span id="family">
+ <div id="familyTree">
+ </div>
+ <span id="familyTreeLink">
+ <<link "Pull up the file on your family tree.">>
+ <<replace #familyTreeLink>>
+ <<run renderFamilyTree($slaves, -1)>>
+ <</replace>>
+ <</link>>
</span>
- <<if totalPlayerRelatives($PC) > 0 || ($showMissingSlaves && ($PC.mother in $missingTable || $PC.father in $missingTable))>>
- <div>
- <<= App.Desc.family($PC)>>
- </div>
- <</if>>
- </p>
-<</if>>
+ </span>
+ <<if totalPlayerRelatives($PC) > 0 || ($showMissingSlaves && ($PC.mother in $missingTable || $PC.father in $missingTable))>>
+ <div>
+ <<= App.Desc.family($PC)>>
+ </div>
+ <</if>>
+</p>
<<if $PC.vagina != -1>>
<h2>Contraceptives and Fertility</h2>
diff --git a/src/pregmod/reTheSirenStrikesBack.tw b/src/pregmod/reTheSirenStrikesBack.tw
index 6a0c0c32216..dfea4411d81 100644
--- a/src/pregmod/reTheSirenStrikesBack.tw
+++ b/src/pregmod/reTheSirenStrikesBack.tw
@@ -83,13 +83,11 @@ Several weeks have passed since you gained the musical prodigy and you couldn't
You decide to spare the coward from _his2 former subordinate's wrath and simply enslave _him2.
<br>
<<include "New Slave Intro">>
- <<set $activeSlave.recruiter = 0>>
<</replace>>
<</link>>
<<if !isAmputee(_ssb)>>
<br><<link "Enslave _him2 and throw _him2 to _ssb.slaveName">>
<<set $activeSlave.clothes = "no clothing">>
- <<set $activeSlave.recruiter = 0>>
<<run healthDamage($activeSlave, 20)>>
<<replace "#artFrame">>
/* 000-250-006 */
@@ -119,7 +117,6 @@ Several weeks have passed since you gained the musical prodigy and you couldn't
<span id="result">
<<link "Enslave _him2">>
<<set $activeSlave.clothes = "no clothing">>
- <<set $activeSlave.recruiter = 0>>
<<replace "#artFrame">>
/* 000-250-006 */
<<if $seeImages == 1>>
@@ -139,7 +136,6 @@ Several weeks have passed since you gained the musical prodigy and you couldn't
<</link>>
<br><<link "Enslave _him2 and punish _him2 for their actions">>
<<set $activeSlave.clothes = "no clothing">>
- <<set $activeSlave.recruiter = 0>>
<<run healthDamage($activeSlave, 20)>>
<<replace "#artFrame">>
/* 000-250-006 */
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index a078763fdeb..4e4fc6ce069 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -148,13 +148,9 @@
<<case "incestuous nursing">>
-<<if $familyTesting == 0>>
- <<set $subSlave = $slaves[$slaveIndices[$activeSlave.relationTarget]]>>
-<<else>>
- <<set $subSlave = randomAvailableDaughter($activeSlave)>>
- <<if ndef $subSlave>>
- <<set $subSlave = randomDaughter($activeSlave)>>
- <</if>>
+<<set $subSlave = randomAvailableDaughter($activeSlave)>>
+<<if ndef $subSlave>>
+ <<set $subSlave = randomDaughter($activeSlave)>>
<</if>>
<<default>>
@@ -949,7 +945,7 @@ $activeSlave.slaveName is almost in tears.
<<case "incestuous nursing">>
<<set _meal = either("breakfast", "lunch", "dinner")>>
-<<if $familyTesting != 1 || $subSlave.mother == $activeSlave.ID>>
+<<if $subSlave.mother == $activeSlave.ID>>
<<set _mother = "mother">>
<<set _mommy = "Mommy">>
<<else>>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 16ad198a98a..0c9d3e0e02f 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -274,7 +274,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<run repX(-2000, "event", _princess)>>
<<set $activeSlave = _princess>>
<<include "New Slave Intro">>
- <<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</replace>>
<</link>> // You will need to utilize a portion of your reputation and <<print cashFormat(50000)>> to enslave $him.//
<<else>>
@@ -292,7 +291,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set _princess.origin = "$He was a princess of a royal kingdom, till $his family was overthrown and $he was acquired by "+$SF.Lower+".">>
<<set $activeSlave = _princess>>
<<include "New Slave Intro">>
- <<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<<run repX(-18000, "event", $activeSlave)>>
<</replace>>
<</link>> //You will be despised for this action, and trade will be greatly damaged.//
@@ -308,7 +306,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<run cashX(-35000, "slaveTransfer", _prince)>>
<<set $activeSlave = _prince>>
<<include "New Slave Intro">>
- <<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</replace>>
<</link>> // Purchasing the goods and hiring the VTOLs will cost about <<print cashFormat(35000)>>.//
<<else>>
@@ -327,7 +324,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set _prince.origin = "$He was the crown prince of a royal kingdom, till $his family was overthrown and $he was acquired by "+$SF.Lower+".">>
<<set $activeSlave = _prince>>
<<include "New Slave Intro">>
- <<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</replace>>
<</link>> //You will be despised for this action, and trade will be greatly damaged.//
<</if>>
@@ -340,29 +336,17 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<br><br>
/* princess */
<<set _princess.origin = "$He was a princess of a royal kingdom, till $his family was overthrown and $he was sold to you in exchange for aid.">>
- <<set _princess.recruiter = 0>>
- <<if $familyTesting == 1>>
- <<set _princess.mother = $missingParentID>>
- <<set $missingParentID-->>
- <<set _princess.father = $missingParentID>>
- <<set $missingParentID-->>
- <<else>>
- <<set _princess.relation = "sister">>
- <<set _princess.relationTarget = _prince.ID>>
- <</if>>
+ <<set _princess.mother = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set _princess.father = $missingParentID>>
+ <<set $missingParentID-->>
<<run cashX(-60000, "slaveTransfer", _princess)>>
<<run repX(-6000, "event", _princess)>>
<<run newSlave(_princess)>> /* skip New Slave Intro */
/* prince */
<<set _prince.origin = "$He was the crown prince of a royal kingdom, till $his family was overthrown and $he was sold to you in exchange for aid.">>
- <<set _prince.recruiter = 0>>
- <<if $familyTesting == 1>>
- <<set _prince.mother = _princess.mother>>
- <<set _prince.father = _princess.father>>
- <<else>>
- <<set _prince.relation = "sister">>
- <<set _prince.relationTarget = _princess.ID>>
- <</if>>
+ <<set _prince.mother = _princess.mother>>
+ <<set _prince.father = _princess.father>>
<<run cashX(-40000, "slaveTransfer", _prince)>>
<<run repX(-4000, "event", _prince)>>
<<run newSlave(_prince)>> /* skip New Slave Intro */
@@ -382,28 +366,16 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $arcologies[0].prosperity -= 15>>
/* princess */
<<set _princess.origin = "$He was a princess of a royal kingdom, till $his family was overthrown and $he was acquired by "+$SF.Lower+".">>
- <<set _princess.recruiter = 0>>
- <<if $familyTesting == 1>>
- <<set _princess.mother = $missingParentID>>
- <<set $missingParentID-->>
- <<set _princess.father = $missingParentID>>
- <<set $missingParentID-->>
- <<else>>
- <<set _princess.relation = "sister">>
- <<set _princess.relationTarget = _prince.ID>>
- <</if>>
+ <<set _princess.mother = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set _princess.father = $missingParentID>>
+ <<set $missingParentID-->>
<<run newSlave(_princess)>> /* skip New Slave Intro */
<<run repX(-10000, "event", _princess)>>
/* prince */
<<set _prince.origin = "$He was the crown prince of a royal kingdom, till $his family was overthrown and $he was acquired by "+$SF.Lower+".">>
- <<set _prince.recruiter = 0>>
- <<if $familyTesting == 1>>
- <<set _prince.mother = _princess.mother>>
- <<set _prince.father = _princess.father>>
- <<else>>
- <<set _prince.relation = "sister">>
- <<set _prince.relationTarget = _princess.ID>>
- <</if>>
+ <<set _prince.mother = _princess.mother>>
+ <<set _prince.father = _princess.father>>
<<run newSlave(_prince)>> /* skip New Slave Intro */
<<run repX(-8000, "event", _prince)>>
<</replace>>
@@ -451,7 +423,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
- <<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<<run cashX(-8333, "slaveTransfer", $activeSlave)>>
<</for>>
<</replace>>
@@ -503,7 +474,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
- <<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<<run repX(-3333, "event", $activeSlave)>>
<</for>>
<</replace>>
@@ -532,7 +502,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<run cashX(-15000, "slaveTransfer", _queen)>>
<<set $activeSlave = _queen>>
<<include "New Slave Intro">>
- <<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</replace>>
<</link>> // It will cost about <<print cashFormat(15000)>> to enslave _him3.//
<<else>>
@@ -560,7 +529,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set _queen.origin = "$He was the Queen of a royal kingdom, till $his husband was overthrown and $he was acquired by "+$SF.Lower+".">>
<<set $activeSlave = _queen>>
<<include "New Slave Intro">>
- <<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<<run repX(-12000, "event", _queen)>>
<</replace>>
<</link>> //You will be despised for this action, and trade will be greatly damaged.//
@@ -573,27 +541,15 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
Eventually they both arrive in your penthouse. The princess is flushed with embarrassment in $his compromising position, struggling to maintain a façade of poise and grace. The slightest trembling of $his balled up fists, the minute tremors that mar $his immaculate posture, $his inability to meet your eyes with $his own — all signs that $he is still a scared $girl despite all $his royal trappings. Nonetheless, though the princess's court training is unlikely to be very beneficial to $him in $his new life in the penthouse, it does stand in stark contrast to $his more common slave peers. The Queen, on the other hand, seems almost relieved and basks in the opulence of _his3 new surroundings. Yet, it seems likely that _his3 relief has more to do with saving _him3 from a lifetime of gang rape at the mercy of _his3 former subjects, than it does the familiar luxury. _He3 submits to biometric scanning obediently and without fuss<<if $seePreg != 0>>, during which you discover to _his3 surprise that _he3 is pregnant. Since _he3 hasn't begun to show yet, it's unclear whether the child is the former King's or the new arcology owner's. You don't have the means to discern the father of the child, but you notice _he3 cradles _his3 ever so slightly rounded stomach protectively nonetheless<</if>>.
/* princess */
<<set _princess.origin = "$He was a princess of a royal kingdom, till $his family was overthrown and $he was sold for credits.">>
- <<set _princess.recruiter = 0>>
- <<if $familyTesting == 1>>
- <<set _princess.mother = _queen.ID>>
- <<set _princess.father = $missingParentID>>
- <<set $missingParentID-->>
- <<else>>
- <<set _princess.relation = "daughter">>
- <<set _princess.relationTarget = _queen.ID>>
- <</if>>
+ <<set _princess.mother = _queen.ID>>
+ <<set _princess.father = $missingParentID>>
+ <<set $missingParentID-->>
<<run cashX(-400000, "slaveTransfer", _princess)>>
<<run newSlave(_princess)>> /* skip New Slave Intro */
/*Queen*/
<<set _queen.origin = "$He was the Queen of a royal kingdom, till $his husband was overthrown and $he was sold for credits.">>
- <<set _queen.recruiter = 0>>
- <<if $familyTesting == 1>>
- <<set _queen.mother = 0>>
- <<set _queen.father = 0>>
- <<else>>
- <<set _queen.relation = "mother">>
- <<set _queen.relationTarget = _princess.ID>>
- <</if>>
+ <<set _queen.mother = 0>>
+ <<set _queen.father = 0>>
<<run cashX(-100000, "slaveTransfer", _queen)>>
<<run newSlave(_queen)>> /* skip New Slave Intro */
<</replace>>
@@ -611,27 +567,15 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $arcologies[0].prosperity -= 13>>
/* princess */
<<set _princess.origin = "$He was a princess of a royal kingdom, till $his family was overthrown and $he was sold for credits.">>
- <<set _princess.recruiter = 0>>
- <<if $familyTesting == 1>>
- <<set _princess.mother = _queen.ID>>
- <<set _princess.father = $missingParentID>>
- <<set $missingParentID-->>
- <<else>>
- <<set _princess.relation = "daughter">>
- <<set _princess.relationTarget = _queen.ID>>
- <</if>>
+ <<set _princess.mother = _queen.ID>>
+ <<set _princess.father = $missingParentID>>
+ <<set $missingParentID-->>
<<run newSlave(_princess)>> /* skip New Slave Intro */
<<run repX(-10000, "event", _princess)>>
/*Queen*/
<<set _queen.origin = "$He was the Queen of a royal kingdom, till $his husband was overthrown and $he was sold for credits.">>
- <<set _queen.recruiter = 0>>
- <<if $familyTesting == 1>>
- <<set _queen.mother = 0>>
- <<set _queen.father = 0>>
- <<else>>
- <<set _queen.relation = "mother">>
- <<set _queen.relationTarget = _princess.ID>>
- <</if>>
+ <<set _queen.mother = 0>>
+ <<set _queen.father = 0>>
<<run newSlave(_queen)>> /* skip New Slave Intro */
<<run repX(-3000, "event", _queen)>>
<</replace>>
@@ -680,12 +624,10 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
- <<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<<run cashX(-100000, "slaveTransfer", $activeSlave)>>
<</for>>
/*Queen*/
<<set _queen.origin = "$He was the Queen of a royal kingdom, till $his husband was overthrown and $he was sold for credits.">>
- <<set _queen.recruiter = 0>>
<<set _queen.mother = $missingParentID>>
<<set $missingParentID-->>
<<set _queen.father = $missingParentID>>
@@ -740,12 +682,10 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
- <<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<<run repX(-3000, "event", $activeSlave)>>
<</for>>
/*Queen*/
<<set _queen.origin = "$He was the Queen of a royal kingdom, till $his husband was overthrown and $he was acquired by "+$SF.Lower+".">>
- <<set _queen.recruiter = 0>>
<<set _queen.mother = $missingParentID>>
<<set $missingParentID-->>
<<set _queen.father = $missingParentID>>
@@ -756,7 +696,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<</link>> //You will be despised for this action, and trade will be greatly damaged.//
<</if>>
-<<if $cash >= 2500000 && $familyTesting == 1>>
+<<if $cash >= 2500000>>
<br><<link "Send an unheard amount of credits and goods to retrieve the entire court.">>
<<replace "#result">>
You take a tablet and transmit a communication request to the new arcology owner with your intent. Once his shock wears off, he readily accepts with little need for negotiation. Soon, a flight of VTOLs land in the new arcology laden with goods. When they take off again they have the prince and princess, clad in chains and bound face to face in a forced embrace, the Queen, who is resigned to _his3 fate, and a gaggle of terrified court ladies.
@@ -798,12 +738,10 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
- <<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<<run cashX(-250000, "slaveTransfer", $activeSlave)>>
<</for>>
/* princess */
<<set _princess.origin = "$He was a princess of a royal kingdom, till $his family was overthrown and $he was sold for credits.">>
- <<set _princess.recruiter = 0>>
<<set _princess.mother = _queen.ID>>
<<set _princess.father = $missingParentID>>
<<set $missingParentID-->>
@@ -812,7 +750,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
/* prince */
<<if $seeDicks > 0>>
<<set _prince.origin = "$He was the crown prince of a royal kingdom, till $his family was overthrown and $he was sold for credits.">>
- <<set _prince.recruiter = 0>>
<<set _prince.mother = _princess.mother>>
<<set _prince.father = _princess.father>>
<<run newSlave(_prince)>> /* skip New Slave Intro */
@@ -820,7 +757,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<</if>>
/*Queen*/
<<set _queen.origin = "$He was the Queen of a royal kingdom, till $his husband was overthrown and $he was sold for credits.">>
- <<set _queen.recruiter = 0>>
<<set _queen.mother = $missingParentID>>
<<set $missingParentID-->>
<<set _queen.father = $missingParentID>>
@@ -829,11 +765,11 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<run cashX(-600000, "slaveTransfer", _queen)>>
<</replace>>
<</link>> // It will cost about <<print cashFormat(2500000)>> to enslave the entire court.//
-<<elseif $familyTesting == 1>>
+<<else>>
<br>//You lack the necessary funds to enslave the entire court.//
<</if>>
-<<if $SF.Toggle && $SF.Active >= 1 && $familyTesting == 1>>
+<<if $SF.Toggle && $SF.Active >= 1>>
<br><<link "Dispatch $SF.Lower on a night time raid to take everything of value.">>
<<replace "#result">>
<<set _loot = random(10,300)*100>>
@@ -879,12 +815,10 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
- <<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<<run repX((1*_repShares), "event", $activeSlave)>>
<</for>>
/* princess */
<<set _princess.origin = "$He was a princess of a royal kingdom, till $his family was overthrown and $he was acquired by "+$SF.Lower+".">>
- <<set _princess.recruiter = 0>>
<<set _princess.mother = _queen.ID>>
<<set _princess.father = $missingParentID>>
<<set $missingParentID-->>
@@ -893,7 +827,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
/* prince */
<<if $seeDicks > 0>>
<<set _prince.origin = "$He was the crown prince of a royal kingdom, till $his family was overthrown and $he was acquired by "+$SF.Lower+".">>
- <<set _prince.recruiter = 0>>
<<set _prince.mother = _princess.mother>>
<<set _prince.father = _princess.father>>
<<run newSlave(_prince)>> /* skip New Slave Intro */
@@ -901,7 +834,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<</if>>
/*Queen*/
<<set _queen.origin = "$He was the Queen of a royal kingdom, till $his husband was overthrown and $he was acquired by "+$SF.Lower+".">>
- <<set _queen.recruiter = 0>>
<<set _queen.mother = $missingParentID>>
<<set $missingParentID-->>
<<set _queen.father = $missingParentID>>
diff --git a/src/uncategorized/householdLiquidator.tw b/src/uncategorized/householdLiquidator.tw
index 23e5fb99a49..ad1578ae0c2 100644
--- a/src/uncategorized/householdLiquidator.tw
+++ b/src/uncategorized/householdLiquidator.tw
@@ -13,22 +13,16 @@
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
<<set $activeSlave.oldTrust = $activeSlave.trust>>
<<run setHealth($activeSlave, jsRandom(-50, 20))>>
-<<if $familyTesting == 1>>
- <<set $activeSlave.mother = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.father = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.canRecruit = 0>>
-<</if>>
+<<set $activeSlave.mother = $missingParentID>>
+<<set $missingParentID-->>
+<<set $activeSlave.father = $missingParentID>>
+<<set $missingParentID-->>
+<<set $activeSlave.canRecruit = 0>>
The household liquidator is offering a set of siblings for sale. As usual, you will only be permitted to inspect the older, but there is a guarantee that the younger will be similar.
<br><br>
<<set _relativeSlave = generateRelatedSlave($activeSlave, "sibling")>>
-<<if $familyTesting != 1>>
- <<set $activeSlave.relation = "sister">>
- <<set $activeSlave.relationTarget = _relativeSlave.ID>>
-<</if>>
<<run _newSlaves.push($activeSlave), _newSlaves.push(_relativeSlave)>>
<<set _slaveCost = slaveCost($activeSlave)>>
@@ -54,19 +48,13 @@ The household liquidator is offering a set of siblings for sale. As usual, you w
<<set $activeSlave.butt += 1>>
<<if $activeSlave.vagina > -1>><<set $activeSlave.vagina += 1>><</if>>
<<set $activeSlave.counter.birthsTotal = 1>>
-<<if $familyTesting == 1>>
- <<set $activeSlave.canRecruit = 0>>
-<</if>>
+<<set $activeSlave.canRecruit = 0>>
<<setLocalPronouns $activeSlave>>
The household liquidator is offering a mother and $his daughter for sale. As usual, you will only be permitted to inspect the mother, but there is a guarantee that the daughter will be similar.
<br><br>
<<set _relativeSlave = generateRelatedSlave($activeSlave, "daughter")>>
-<<if $familyTesting != 1>>
- <<set $activeSlave.relation = "mother">>
- <<set $activeSlave.relationTarget = _relativeSlave.ID>>
-<</if>>
<<run _newSlaves.push($activeSlave), _newSlaves.push(_relativeSlave)>>
<<set _slaveCost = slaveCost($activeSlave)>>
@@ -83,22 +71,16 @@ The household liquidator is offering a mother and $his daughter for sale. As usu
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
<<set $activeSlave.oldTrust = $activeSlave.trust>>
<<run setHealth($activeSlave, jsRandom(-50, 20))>>
-<<if $familyTesting == 1>>
- <<set $activeSlave.mother = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.father = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.canRecruit = 0>>
-<</if>>
+<<set $activeSlave.mother = $missingParentID>>
+<<set $missingParentID-->>
+<<set $activeSlave.father = $missingParentID>>
+<<set $missingParentID-->>
+<<set $activeSlave.canRecruit = 0>>
The household liquidator is offering something special: identical twins. The markup is huge, but the merchandise isn't something you see every day.
<br><br>
<<set _relativeSlave = generateRelatedSlave($activeSlave, "twin")>>
-<<if $familyTesting != 1>>
- <<set $activeSlave.relation = "twin">>
- <<set $activeSlave.relationTarget = _relativeSlave.ID>>
-<</if>>
<<run _newSlaves.push($activeSlave), _newSlaves.push(_relativeSlave)>>
<<set _slaveCost = slaveCost($activeSlave)>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index ce5ebfdba68..6e13851619e 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -952,39 +952,22 @@ is
<</if>>
<</if>>
-<<if $familyTesting == 1>>
+<<= App.Desc.family($activeSlave)>>
- <<= App.Desc.family($activeSlave)>>
-
- <<if $activeSlave.relationship >= 3 && totalRelatives($activeSlave) > 0>>
- <<set _lover = getSlave($activeSlave.relationshipTarget)>>
- <<if def _lover>>
- <<set _relTerm = relativeTerm($activeSlave, _lover)>>
- <<if _relTerm !== null>>
- $He is in an <span class="lightgreen">incestuous relationship with $his _relTerm, <<= SlaveFullName(_lover)>>.</span>
- <</if>>
- <</if>>
- <<elseif $activeSlave.relationship <= -2>>
- <<set _relTerm = relativeTerm($activeSlave, $PC)>>
+<<if $activeSlave.relationship >= 3 && totalRelatives($activeSlave) > 0>>
+ <<set _lover = getSlave($activeSlave.relationshipTarget)>>
+ <<if def _lover>>
+ <<set _relTerm = relativeTerm($activeSlave, _lover)>>
<<if _relTerm !== null>>
- $He is in an <span class="lightgreen">incestuous relationship with $his _relTerm, you.</span>
+ $He is in an <span class="lightgreen">incestuous relationship with $his _relTerm, <<= SlaveFullName(_lover)>>.</span>
<</if>>
<</if>>
-
-<<else>>
-
- <<if $activeSlave.relation != 0>>
- <<set _lsd = $slaveIndices[$activeSlave.relationTarget]>>
- <<if def _lsd>>
- <<if ($slaves[_lsd].ID == $activeSlave.relationshipTarget) && ($activeSlave.relationship >= 3)>>
- $He is <span class="lightgreen"><<= SlaveFullName($slaves[_lsd])>>'s $activeSlave.relation, making their relationship incestuous.</span>
- <<else>>
- $He is <span class="lightgreen"><<= SlaveFullName($slaves[_lsd])>>'s $activeSlave.relation.</span>
- <</if>>
- <</if>>
+<<elseif $activeSlave.relationship <= -2>>
+ <<set _relTerm = relativeTerm($activeSlave, $PC)>>
+ <<if _relTerm !== null>>
+ $He is in an <span class="lightgreen">incestuous relationship with $his _relTerm, you.</span>
<</if>>
-
-<</if>> /* closes extended family mode */
+<</if>>
<<if $activeSlave.rivalry != 0>>
<<set _lsd = $slaveIndices[$activeSlave.rivalryTarget]>>
diff --git a/src/uncategorized/managePenthouse.tw b/src/uncategorized/managePenthouse.tw
index f59c83755ff..c639e08f585 100644
--- a/src/uncategorized/managePenthouse.tw
+++ b/src/uncategorized/managePenthouse.tw
@@ -87,14 +87,14 @@
<</if>>
</div>
- <<if $familyTesting == 1 && $seePreg != 0>>
+ <<if $seePreg != 0>>
<<if $experimental.nursery == 1>>
<div>
<<if $nursery == 0>>
[[Build a nursery to raise children from birth|Manage Penthouse][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $nursery = 5, $nurseryNannies = 1, $PC.skill.engineering += 1]]
<span class="detail">Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>></span>
<<else>>
- The penthouse has a nursery built where infants can be brought up.
+ The penthouse has a nursery built where infants can be brought up.
<</if>>
</div>
<</if>>
@@ -118,7 +118,7 @@
<</if>>
</div>
- <<if $familyTesting == 1 && $seePreg != 0>>
+ <<if $seePreg != 0>>
<div>
<<if $arcologyUpgrade.grid == 1>>
<<if $incubator == 0>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index a27f70cef9e..32fbebe2f67 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -186,21 +186,6 @@ The legalities completed, <span class='slave-name'><<= SlaveFullName($activeSlav
<</if>>
<</if>>
-<<if $familyTesting == 0 && ($activeSlave.indenture < 0) && ($activeSlave.relation == 0)>>
- <<if random(1,100) <= 5>>
- <<set $activeSlave.recruiter = "twin">>
- <<elseif ($activeSlave.actualAge > 32) && ($activeSlave.vagina != 0) && $activeSlave.trueVirgin != 1 && (random(1,100) <= 41)>>
- <<set $activeSlave.recruiter = "mother">>
- <<elseif ($activeSlave.actualAge < 24) && (random(1,100) <= 40)>>
- <<set $activeSlave.recruiter = "daughter">>
- <<elseif ($activeSlave.actualAge < 43) && (random(1,100) <= 20)>>
- <<set $activeSlave.recruiter = "older sister">>
- <<elseif ($activeSlave.actualAge < 25) && ($activeSlave.actualAge > 18) && (random(1,100) <= 20)>>
- <<set $activeSlave.recruiter = "young sister">>
- <</if>>
-<</if>>
-
-
<<if ($activeSlave.vagina > -1) && ($activeSlave.dick == 0)>>
<<if ($PC.dick == 0) && ($PC.boobs >= 300)>>
$He looks to you and sees a fellow woman, and is @@.mediumaquamarine;a little less afraid@@ that you will rape and abuse $him.
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 0843290b2ec..3e0e6b65e25 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -166,9 +166,6 @@
<<if $slaves[_i].weekAcquired < 0>>
<<set $slaves[_i].weekAcquired = 0>>
<</if>>
- <<if $slaves[_i].relation == 0>>
- <<set $slaves[_i].relationTarget = 0>>
- <</if>>
<<if $slaves[_i].relationship == 0>>
<<set $slaves[_i].relationshipTarget = 0>>
<</if>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index b6437eac4e9..83d34a1002e 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -57,13 +57,11 @@ This save was created using FC version $ver build $releaseID.
<<goto "Options">>
<</link>>
<</if>>
-<<if $familyTesting == 1>>
- <br><<link "Reset extended family mode controllers">>
- <<run resetFamilyCounters()>>
- <<replace "#familyHint">>//@@.lightgreen;Done:@@ all family relations flushed and rebuilt.//<</replace>>
- <</link>>
- <span id="familyHint">//Clears and rebuilds .sister and .daughter tracking.//</span>
-<</if>>
+<br><<link "Reset extended family mode controllers">>
+ <<run resetFamilyCounters()>>
+ <<replace "#familyHint">>//@@.lightgreen;Done:@@ all family relations flushed and rebuilt.//<</replace>>
+ <</link>>
+<span id="familyHint">//Clears and rebuilds .sister and .daughter tracking.//</span>
<<if isNaN($rep)>>
<br>[[Reset Reputation|Options][$rep = 0]]
<</if>>
@@ -608,19 +606,17 @@ This save was created using FC version $ver build $releaseID.
<<option 0 "Disabled">>
<</options>>
- <<if $familyTesting > 0>>
- <<options $allowFamilyTitles>>
- Family titles for relatives
- <<option 1 "Enabled">>
- <<option 0 "Disabled">>
- <</options>>
+ <<options $allowFamilyTitles>>
+ Family titles for relatives
+ <<option 1 "Enabled">>
+ <<option 0 "Disabled">>
+ <</options>>
- <<options $showDistantRelatives>>
- Distant relatives such as aunts, nieces and cousins are
- <<option 1 "Enabled">>
- <<option 0 "Disabled">>
- <</options>>
- <</if>>
+ <<options $showDistantRelatives>>
+ Distant relatives such as aunts, nieces and cousins are
+ <<option 1 "Enabled">>
+ <<option 0 "Disabled">>
+ <</options>>
</div>
</div>
@@ -1061,7 +1057,7 @@ This save was created using FC version $ver build $releaseID.
<<print App.UI.DOM.includeDOM(App.UI.Theme.selector(), "themeSelector")>>
</p>
- <<if ($familyTesting === 1 && $seePreg !== 0)>>
+ <<if $seePreg !== 0>>
<<options $experimental.nursery>>
Nursery is
<<option 1 "Enabled">>
diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw
index 71db6f8479e..5aacd745fc4 100644
--- a/src/uncategorized/pCoupAttempt.tw
+++ b/src/uncategorized/pCoupAttempt.tw
@@ -232,55 +232,45 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<run setHealth($traitor, $traitor.health.condition, $traitor.health.condition - $traitor.health.shortDamage + 80, $traitor.health.longDamage, $traitor.health.illness, $traitor.health.tired)>>
<<set $traitor.origin = "$He was your slave, but you freed $him, which $he repaid by participating in a coup attempt against you. It failed, and $he is again your chattel.">>
<</if>>
- <<if $familyTesting == 1>>
- <<if $traitorStats.PCpregSource > 0 && $PC.preg > 0 && $PC.pregSource == 0>>
- <<set $PC.pregSource = $traitor.ID>>
+ <<if $traitorStats.PCpregSource > 0 && $PC.preg > 0 && $PC.pregSource == 0>>
+ <<set $PC.pregSource = $traitor.ID>>
+ <</if>>
+ <<if $traitorStats.PCmother > 0>>
+ <<set $PC.mother = $traitor.ID>>
+ <</if>>
+ <<if $traitorStats.PCfather > 0>>
+ <<set $PC.father = $traitor.ID>>
+ <</if>>
+ <<for _pca = 0; _pca < $slaves.length; _pca++>>
+ <<if $traitorStats.traitorMother.includes($slaves[_pca].ID)>>
+ <<set $slaves[_pca].mother = $traitor.ID>>
<</if>>
- <<if $traitorStats.PCmother > 0>>
- <<set $PC.mother = $traitor.ID>>
+ <<if $traitorStats.traitorFather.includes($slaves[_pca].ID)>>
+ <<set $slaves[_pca].father = $traitor.ID>>
<</if>>
- <<if $traitorStats.PCfather > 0>>
- <<set $PC.father = $traitor.ID>>
+ <<if $traitorStats.traitorPregSources.includes($slaves[_pca].ID) && $slaves[_pca].preg > 0 && $slaves[_pca].pregSource == 0>>
+ <<set $slaves[_pca].pregSource = $traitor.ID>>
<</if>>
- <<for _pca = 0; _pca < $slaves.length; _pca++>>
- <<if $traitorStats.traitorMother.includes($slaves[_pca].ID)>>
- <<set $slaves[_pca].mother = $traitor.ID>>
+ <</for>>
+ <<if $incubator > 0>>
+ <<for _pca = 0; _pca < $tanks.length; _pca++>>
+ <<if $traitorStats.traitorMotherTank.includes($tanks[_pca].ID)>>
+ <<set $tanks[_pca].mother = $traitor.ID>>
<</if>>
- <<if $traitorStats.traitorFather.includes($slaves[_pca].ID)>>
- <<set $slaves[_pca].father = $traitor.ID>>
+ <<if $traitorStats.traitorFatherTank.includes($tanks[_pca].ID)>>
+ <<set $tanks[_pca].father = $traitor.ID>>
<</if>>
- <<if $traitorStats.traitorPregSources.includes($slaves[_pca].ID) && $slaves[_pca].preg > 0 && $slaves[_pca].pregSource == 0>>
- <<set $slaves[_pca].pregSource = $traitor.ID>>
+ <</for>>
+ <</if>>
+ <<if $nursery > 0>>
+ <<for _pca = 0; _pca < $cribs.length; _pca++>>
+ <<if $traitorStats.traitorMotherTank.includes($cribs[_pca].ID)>>
+ <<set $cribs[_pca].mother = $traitor.ID>>
+ <</if>>
+ <<if $traitorStats.traitorFatherTank.includes($cribs[_pca].ID)>>
+ <<set $cribs[_pca].father = $traitor.ID>>
<</if>>
<</for>>
- <<if $incubator > 0>>
- <<for _pca = 0; _pca < $tanks.length; _pca++>>
- <<if $traitorStats.traitorMotherTank.includes($tanks[_pca].ID)>>
- <<set $tanks[_pca].mother = $traitor.ID>>
- <</if>>
- <<if $traitorStats.traitorFatherTank.includes($tanks[_pca].ID)>>
- <<set $tanks[_pca].father = $traitor.ID>>
- <</if>>
- <</for>>
- <</if>>
- <<if $nursery > 0>>
- <<for _pca = 0; _pca < $cribs.length; _pca++>>
- <<if $traitorStats.traitorMotherTank.includes($cribs[_pca].ID)>>
- <<set $cribs[_pca].mother = $traitor.ID>>
- <</if>>
- <<if $traitorStats.traitorFatherTank.includes($cribs[_pca].ID)>>
- <<set $cribs[_pca].father = $traitor.ID>>
- <</if>>
- <</for>>
- <</if>>
- <<else>>
- <<if $traitorStats.traitorPregSources.length > 0>>
- <<for _pca = 0; _pca < $slaves.length; _pca++>>
- <<if $traitorStats.traitorPregSources.includes($slaves[_pca].ID) && $slaves[_pca].preg > 0 && $slaves[_pca].pregSource == 0>>
- <<set $slaves[_pca].pregSource = $traitor.ID>>
- <</if>>
- <</for>>
- <</if>>
<</if>>
<<if $traitorStats.boomerangBody > 0>>
<<set _pca = $slaveIndices[$traitorStats.traitorBody]>>
diff --git a/src/uncategorized/pCoupBetrayal.tw b/src/uncategorized/pCoupBetrayal.tw
index 4cc634a8be6..2c8f6ed9768 100644
--- a/src/uncategorized/pCoupBetrayal.tw
+++ b/src/uncategorized/pCoupBetrayal.tw
@@ -57,55 +57,45 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
When $traitor.slaveName finally manages to return to you, $he explains what happened. $He caught wind of the military contractors working in the area and succeeded in goading the Daughters of Liberty into attacking the supposed slaver troop. Once it became clear that the untrained ex-slaves and their saviors stood no chance against a coordinated force, they beat a hasty retreat for your arcology under the assumption that the codes you gave them would allow them a fortifiable position. But alas, they found nothing more than their demise.
<<set $traitor.assignment = "rest">>
-<<if $familyTesting == 1>>
- <<if $traitorStats.PCpregSource > 0 && $PC.preg > 0 && $PC.pregSource == 0>>
- <<set $PC.pregSource = $traitor.ID>>
+<<if $traitorStats.PCpregSource > 0 && $PC.preg > 0 && $PC.pregSource == 0>>
+ <<set $PC.pregSource = $traitor.ID>>
+<</if>>
+<<if $traitorStats.PCmother > 0>>
+ <<set $PC.mother = $traitor.ID>>
+<</if>>
+<<if $traitorStats.PCfather > 0>>
+ <<set $PC.father = $traitor.ID>>
+<</if>>
+<<for _pca = 0; _pca < $slaves.length; _pca++>>
+ <<if $traitorStats.traitorMother.includes($slaves[_pca].ID)>>
+ <<set $slaves[_pca].mother = $traitor.ID>>
<</if>>
- <<if $traitorStats.PCmother > 0>>
- <<set $PC.mother = $traitor.ID>>
+ <<if $traitorStats.traitorFather.includes($slaves[_pca].ID)>>
+ <<set $slaves[_pca].father = $traitor.ID>>
<</if>>
- <<if $traitorStats.PCfather > 0>>
- <<set $PC.father = $traitor.ID>>
+ <<if $traitorStats.traitorPregSources.includes($slaves[_pca].ID) && $slaves[_pca].preg > 0 && $slaves[_pca].pregSource == 0>>
+ <<set $slaves[_pca].pregSource = $traitor.ID>>
<</if>>
- <<for _pca = 0; _pca < $slaves.length; _pca++>>
- <<if $traitorStats.traitorMother.includes($slaves[_pca].ID)>>
- <<set $slaves[_pca].mother = $traitor.ID>>
+<</for>>
+<<if $incubator > 0>>
+ <<for _pca = 0; _pca < $tanks.length; _pca++>>
+ <<if $traitorStats.traitorMotherTank.includes($tanks[_pca].ID)>>
+ <<set $tanks[_pca].mother = $traitor.ID>>
+ <</if>>
+ <<if $traitorStats.traitorFatherTank.includes($tanks[_pca].ID)>>
+ <<set $tanks[_pca].father = $traitor.ID>>
<</if>>
- <<if $traitorStats.traitorFather.includes($slaves[_pca].ID)>>
- <<set $slaves[_pca].father = $traitor.ID>>
+ <</for>>
+<</if>>
+<<if $nursery > 0>>
+ <<for _pca = 0; _pca < $cribs.length; _pca++>>
+ <<if $traitorStats.traitorMotherTank.includes($cribs[_pca].ID)>>
+ <<set $cribs[_pca].mother = $traitor.ID>>
<</if>>
- <<if $traitorStats.traitorPregSources.includes($slaves[_pca].ID) && $slaves[_pca].preg > 0 && $slaves[_pca].pregSource == 0>>
- <<set $slaves[_pca].pregSource = $traitor.ID>>
+ <<if $traitorStats.traitorFatherTank.includes($cribs[_pca].ID)>>
+ <<set $cribs[_pca].father = $traitor.ID>>
<</if>>
<</for>>
- <<if $incubator > 0>>
- <<for _pca = 0; _pca < $tanks.length; _pca++>>
- <<if $traitorStats.traitorMotherTank.includes($tanks[_pca].ID)>>
- <<set $tanks[_pca].mother = $traitor.ID>>
- <</if>>
- <<if $traitorStats.traitorFatherTank.includes($tanks[_pca].ID)>>
- <<set $tanks[_pca].father = $traitor.ID>>
- <</if>>
- <</for>>
- <</if>>
- <<if $nursery > 0>>
- <<for _pca = 0; _pca < $cribs.length; _pca++>>
- <<if $traitorStats.traitorMotherTank.includes($cribs[_pca].ID)>>
- <<set $cribs[_pca].mother = $traitor.ID>>
- <</if>>
- <<if $traitorStats.traitorFatherTank.includes($cribs[_pca].ID)>>
- <<set $cribs[_pca].father = $traitor.ID>>
- <</if>>
- <</for>>
- <</if>>
-<<else>>
- <<if $traitorStats.traitorPregSources.length > 0>>
- <<for _pca = 0; _pca < $slaves.length; _pca++>>
- <<if $traitorStats.traitorPregSources.includes($slaves[_pca].ID) && $slaves[_pca].preg > 0 && $slaves[_pca].pregSource == 0>>
- <<set $slaves[_pca].pregSource = $traitor.ID>>
- <</if>>
- <</for>>
- <</if>>
<</if>>
<<if $traitorStats.boomerangBody > 0>>
<<set _pca = $slaveIndices[$traitorStats.traitorBody]>>
diff --git a/src/uncategorized/pUndergroundRailroad.tw b/src/uncategorized/pUndergroundRailroad.tw
index 4852044a728..a341d1473d1 100644
--- a/src/uncategorized/pUndergroundRailroad.tw
+++ b/src/uncategorized/pUndergroundRailroad.tw
@@ -137,59 +137,49 @@ This is disturbing, to say the least. After close investigation, it appears some
<<set $traitor.pregControl = "none">>
<<set $traitor.inflation = 0, $traitor.inflationType = "none", $traitor.inflationMethod = 0, SetBellySize($traitor)>>
<<set $traitorStats = {PCpregSource: 0, PCmother: 0, PCfather: 0, traitorMother: [], traitorFather: [], traitorPregSources: [], traitorMotherTank: [], traitorFatherTank: [], traitorBody: 0}>>
- <<if $familyTesting == 1>>
- <<if $traitor.ID == $PC.pregSource>>
- <<set $traitorStats.PCpregSource = $traitor.ID>>
- <</if>>
- <<if $PC.mother == $traitor.ID>>
- <<set $traitorStats.PCmother = $traitor.ID>>
- <</if>>
- <<if $PC.father == $traitor.ID>>
- <<set $traitorStats.PCfather = $traitor.ID>>
+ <<if $traitor.ID == $PC.pregSource>>
+ <<set $traitorStats.PCpregSource = $traitor.ID>>
+ <</if>>
+ <<if $PC.mother == $traitor.ID>>
+ <<set $traitorStats.PCmother = $traitor.ID>>
+ <</if>>
+ <<if $PC.father == $traitor.ID>>
+ <<set $traitorStats.PCfather = $traitor.ID>>
+ <</if>>
+ <<for _pur = 0; _pur < $slaves.length; _pur++>>
+ <<if $slaves[_pur].ID != $traitor.ID>>
+ <<if $slaves[_pur].mother == $traitor.ID>>
+ <<set $traitorStats.traitorMother.push($slaves[_pur].ID)>>
+ <</if>>
+ <<if $slaves[_pur].father == $traitor.ID>>
+ <<set $traitorStats.traitorFather.push($slaves[_pur].ID)>>
+ <</if>>
+ <<if $traitor.ID == $slaves[_pur].pregSource>>
+ <<set $traitorStats.traitorPregSources.push($slaves[_pur].ID)>>
+ <</if>>
<</if>>
- <<for _pur = 0; _pur < $slaves.length; _pur++>>
- <<if $slaves[_pur].ID != $traitor.ID>>
- <<if $slaves[_pur].mother == $traitor.ID>>
- <<set $traitorStats.traitorMother.push($slaves[_pur].ID)>>
- <</if>>
- <<if $slaves[_pur].father == $traitor.ID>>
- <<set $traitorStats.traitorFather.push($slaves[_pur].ID)>>
- <</if>>
- <<if $traitor.ID == $slaves[_pur].pregSource>>
- <<set $traitorStats.traitorPregSources.push($slaves[_pur].ID)>>
- <</if>>
+ <</for>>
+ <<if $incubator > 0>>
+ <<for _z = 0; _z < $tanks.length; _z++>>
+ <<if $traitor.ID == $tanks[_z].mother>>
+ <<set $traitorStats.traitorMotherTank.push($slaves[_z].ID)>>
+ <</if>>
+ <<if $traitor.ID == $tanks[_z].father>>
+ <<set $traitorStats.traitorFatherTank.push($slaves[_z].ID)>>
<</if>>
<</for>>
- <<if $incubator > 0>>
- <<for _z = 0; _z < $tanks.length; _z++>>
- <<if $traitor.ID == $tanks[_z].mother>>
- <<set $traitorStats.traitorMotherTank.push($slaves[_z].ID)>>
- <</if>>
- <<if $traitor.ID == $tanks[_z].father>>
- <<set $traitorStats.traitorFatherTank.push($slaves[_z].ID)>>
- <</if>>
- <</for>>
- <</if>>
- <<if $nursery > 0>>
- <<for _z = 0; _z < $cribs.length; _z++>>
- <<if $traitor.ID == $cribs[_z].mother>>
- <<set $traitorStats.traitorMotherTank.push($slaves[_z].ID)>>
- <</if>>
- <<if $traitor.ID == $cribs[_z].father>>
- <<set $traitorStats.traitorFatherTank.push($slaves[_z].ID)>>
- <</if>>
- <</for>>
- <</if>>
- <<set $traitor.sisters = 0, $traitor.daughters = 0>>
- <<else>>
- <<for _pur = 0; _pur < $slaves.length; _pur++>>
- <<if $slaves[_pur].ID != $traitor.ID>>
- <<if $traitor.ID == $slaves[_pur].pregSource>>
- <<set $traitorStats.traitorPregSources.push($slaves[_pur].ID)>>
- <</if>>
+ <</if>>
+ <<if $nursery > 0>>
+ <<for _z = 0; _z < $cribs.length; _z++>>
+ <<if $traitor.ID == $cribs[_z].mother>>
+ <<set $traitorStats.traitorMotherTank.push($slaves[_z].ID)>>
+ <</if>>
+ <<if $traitor.ID == $cribs[_z].father>>
+ <<set $traitorStats.traitorFatherTank.push($slaves[_z].ID)>>
<</if>>
<</for>>
<</if>>
+ <<set $traitor.sisters = 0, $traitor.daughters = 0>>
<<if $traitor.bodySwap > 0>>
<<set _myBody = $slaves.findIndex(function(s) { return s.origBodyOwnerID == $traitor.ID; })>>
<<if _myBody != -1>>
@@ -277,59 +267,49 @@ This is disturbing, to say the least. After close investigation, it appears some
<<set $traitor.pregControl = "none">>
<<set $traitor.inflation = 0, $traitor.inflationType = "none", $traitor.inflationMethod = 0, SetBellySize($traitor)>>
<<set $traitorStats = {PCpregSource: 0, PCmother: 0, PCfather: 0, traitorMother: [], traitorFather: [], traitorPregSources: [], traitorMotherTank: [], traitorFatherTank: [], traitorBody: 0}>>
- <<if $familyTesting == 1>>
- <<if $traitor.ID == $PC.pregSource>>
- <<set $traitorStats.PCpregSource = $traitor.ID>>
- <</if>>
- <<if $PC.mother == $traitor.ID>>
- <<set $traitorStats.PCmother = $traitor.ID>>
- <</if>>
- <<if $PC.father == $traitor.ID>>
- <<set $traitorStats.PCfather = $traitor.ID>>
+ <<if $traitor.ID == $PC.pregSource>>
+ <<set $traitorStats.PCpregSource = $traitor.ID>>
+ <</if>>
+ <<if $PC.mother == $traitor.ID>>
+ <<set $traitorStats.PCmother = $traitor.ID>>
+ <</if>>
+ <<if $PC.father == $traitor.ID>>
+ <<set $traitorStats.PCfather = $traitor.ID>>
+ <</if>>
+ <<for _pur = 0; _pur < $slaves.length; _pur++>>
+ <<if $slaves[_pur].ID != $traitor.ID>>
+ <<if $slaves[_pur].mother == $traitor.ID>>
+ <<set $traitorStats.traitorMother.push($slaves[_pur].ID)>>
+ <</if>>
+ <<if $slaves[_pur].father == $traitor.ID>>
+ <<set $traitorStats.traitorFather.push($slaves[_pur].ID)>>
+ <</if>>
+ <<if $traitor.ID == $slaves[_pur].pregSource>>
+ <<set $traitorStats.traitorPregSources.push($slaves[_pur].ID)>>
+ <</if>>
<</if>>
- <<for _pur = 0; _pur < $slaves.length; _pur++>>
- <<if $slaves[_pur].ID != $traitor.ID>>
- <<if $slaves[_pur].mother == $traitor.ID>>
- <<set $traitorStats.traitorMother.push($slaves[_pur].ID)>>
- <</if>>
- <<if $slaves[_pur].father == $traitor.ID>>
- <<set $traitorStats.traitorFather.push($slaves[_pur].ID)>>
- <</if>>
- <<if $traitor.ID == $slaves[_pur].pregSource>>
- <<set $traitorStats.traitorPregSources.push($slaves[_pur].ID)>>
- <</if>>
+ <</for>>
+ <<if $incubator > 0>>
+ <<for _z = 0; _z < $tanks.length; _z++>>
+ <<if $traitor.ID == $tanks[_z].mother>>
+ <<set $traitorStats.traitorMotherTank.push($slaves[_z].ID)>>
+ <</if>>
+ <<if $traitor.ID == $tanks[_z].father>>
+ <<set $traitorStats.traitorFatherTank.push($slaves[_z].ID)>>
<</if>>
<</for>>
- <<if $incubator > 0>>
- <<for _z = 0; _z < $tanks.length; _z++>>
- <<if $traitor.ID == $tanks[_z].mother>>
- <<set $traitorStats.traitorMotherTank.push($slaves[_z].ID)>>
- <</if>>
- <<if $traitor.ID == $tanks[_z].father>>
- <<set $traitorStats.traitorFatherTank.push($slaves[_z].ID)>>
- <</if>>
- <</for>>
- <</if>>
- <<if $nursery > 0>>
- <<for _z = 0; _z < $cribs.length; _z++>>
- <<if $traitor.ID == $cribs[_z].mother>>
- <<set $traitorStats.traitorMotherTank.push($slaves[_z].ID)>>
- <</if>>
- <<if $traitor.ID == $cribs[_z].father>>
- <<set $traitorStats.traitorFatherTank.push($slaves[_z].ID)>>
- <</if>>
- <</for>>
- <</if>>
- <<set $traitor.sisters = 0, $traitor.daughters = 0>>
- <<else>>
- <<for _pur = 0; _pur < $slaves.length; _pur++>>
- <<if $slaves[_pur].ID != $traitor.ID>>
- <<if $traitor.ID == $slaves[_pur].pregSource>>
- <<set $traitorStats.traitorPregSources.push($slaves[_pur].ID)>>
- <</if>>
+ <</if>>
+ <<if $nursery > 0>>
+ <<for _z = 0; _z < $cribs.length; _z++>>
+ <<if $traitor.ID == $cribs[_z].mother>>
+ <<set $traitorStats.traitorMotherTank.push($slaves[_z].ID)>>
+ <</if>>
+ <<if $traitor.ID == $cribs[_z].father>>
+ <<set $traitorStats.traitorFatherTank.push($slaves[_z].ID)>>
<</if>>
<</for>>
<</if>>
+ <<set $traitor.sisters = 0, $traitor.daughters = 0>>
<<if $traitor.bodySwap > 0>>
<<set _myBody = $slaves.findIndex(function(s) { return s.origBodyOwnerID == $traitor.ID; })>>
<<if _myBody != -1>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index fed74bc6481..71efb7c0a12 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -118,111 +118,57 @@
/* Relationship Events */
<<if $seeIncest == 1>>
- <<if $familyTesting == 0>>
-
- <<set _relatedSlaves = $slaves.filter(function(s) { return s.relation != 0; })>>
-
- <<set _devMothers = _relatedSlaves.filter(function(s) { return s.relation == "mother" && s.devotion > 50 && s.anus != 0 && s.relationshipTarget != s.relationTarget && canWalk(s); })>>
- <<for _devMothers.length > 0>>
- <<set $devMother = _devMothers.pluck()>>
- <<set $devDaughter = getSlave($devMother.relationTarget)>>
- <<if (def $devDaughter) && $devDaughter.devotion > 50 && $devDaughter.anus != 0 && canWalk($devDaughter)>>
- <<set $events.push("RE devoted mother daughter")>>
- <<set $devMother = $devMother.ID>>
- <<set $devDaughter = $devDaughter.ID>>
- <<break>>
- <</if>>
- <</for>>
-
- <<set _resMothers = _relatedSlaves.filter(function(s) { return s.relation == "mother" && s.devotion < 10 && s.anus != 0 && s.relationshipTarget != s.relationTarget && canWalk(s); })>>
- <<for _resMothers.length > 0>>
- <<set $motherSlave = _resMothers.pluck()>>
- <<set $daughterSlave = getSlave($motherSlave.relationTarget)>>
- <<if (def $daughterSlave) && $daughterSlave.devotion < 10 && $daughterSlave.anus != 0 && canWalk($daughterSlave)>>
- <<set $events.push("RE resistant mother daughter")>>
- <<set $motherSlave = $motherSlave.ID>>
- <<set $daughterSlave = $daughterSlave.ID>>
- <<break>>
- <</if>>
- <</for>>
-
- <<set _youngerSisters = _relatedSlaves.filter(function(s) { return s.relation == "sister" && s.origin == "$He was sold into slavery by $his older sister." && canPenetrate(s); })>>
- <<for _youngerSisters.length > 0>>
- <<set $youngerSister = _youngerSisters.pluck()>>
- <<set $olderSister = getSlave($youngerSister.relationTarget)>>
- <<if (def $olderSister) && $olderSister.anus == 0 && $youngerSister.devotion > ($olderSister.devotion+20)>>
- <<set $events.push("RE sibling revenge")>>
- <<set $youngerSister = $youngerSister.ID>>
- <<set $olderSister = $olderSister.ID>>
- <<break>>
- <</if>>
- <</for>>
-
- <<set _twins = _relatedSlaves.filter(function(s) { return s.relation == "twin" && s.anus > 0 && s.devotion > 50 && canWalk(s); })>>
- <<for _twins.length > 0>>
- <<set $alphaTwin = _twins.pluck()>>
- <<set $betaTwin = getSlave($alphaTwin.relationTarget)>>
- <<if (def $betaTwin) && $betaTwin.anus > 0 && $betaTwin.devotion > 50 && canWalk($betaTwin)>>
- <<set $events.push("RE devoted twins")>>
- <<set $alphaTwin = $alphaTwin.ID>>
- <<set $betaTwin = $betaTwin.ID>>
- <<break>>
- <</if>>
- <</for>>
- <<else>> /* $familyTesting == 1 */
+ <<set _relatedSlaves = $slaves.filter(function(s) { return s.daughters > 0 || s.sisters > 0; })>>
+
+ <<set _devMothers = _relatedSlaves.filter(function(s) { return s.daughters > 0 && s.devotion > 50 && s.anus != 0 && canWalk(s); })>>
+ <<for _devMothers.length > 0>>
+ <<set $devMother = _devMothers.pluck()>>
+ <<set $devDaughter = randomDaughter($devMother)>>
+ <<if (def $devDaughter) && ($devDaughter.devotion > 50) && ($devDaughter.anus != 0) && canWalk($devDaughter)>>
+ <<set $events.push("RE devoted mother daughter")>>
+ <<set $devMother = $devMother.ID>>
+ <<set $devDaughter = $devDaughter.ID>>
+ <<break>>
+ <</if>>
+ <</for>>
- <<set _relatedSlaves = $slaves.filter(function(s) { return s.daughters > 0 || s.sisters > 0; })>>
+ <<set _resMothers = _relatedSlaves.filter(function(s) { return s.daughters > 0 && s.devotion < 10 && s.anus != 0 && canWalk(s); })>>
+ <<for _resMothers.length > 0>>
+ <<set $motherSlave = _resMothers.pluck()>>
+ <<set $daughterSlave = randomDaughter($motherSlave)>>
+ <<if (def $daughterSlave) && ($daughterSlave.devotion < 10) && ($daughterSlave.anus != 0) && canWalk($daughterSlave)>>
+ <<set $events.push("RE resistant mother daughter")>>
+ <<set $motherSlave = $motherSlave.ID>>
+ <<set $daughterSlave = $daughterSlave.ID>>
+ <<break>>
+ <</if>>
+ <</for>>
- <<set _devMothers = _relatedSlaves.filter(function(s) { return s.daughters > 0 && s.devotion > 50 && s.anus != 0 && canWalk(s); })>>
- <<for _devMothers.length > 0>>
- <<set $devMother = _devMothers.pluck()>>
- <<set $devDaughter = randomDaughter($devMother)>>
- <<if (def $devDaughter) && ($devDaughter.devotion > 50) && ($devDaughter.anus != 0) && canWalk($devDaughter)>>
- <<set $events.push("RE devoted mother daughter")>>
- <<set $devMother = $devMother.ID>>
- <<set $devDaughter = $devDaughter.ID>>
- <<break>>
- <</if>>
- <</for>>
-
- <<set _resMothers = _relatedSlaves.filter(function(s) { return s.daughters > 0 && s.devotion < 10 && s.anus != 0 && canWalk(s); })>>
- <<for _resMothers.length > 0>>
- <<set $motherSlave = _resMothers.pluck()>>
- <<set $daughterSlave = randomDaughter($motherSlave)>>
- <<if (def $daughterSlave) && ($daughterSlave.devotion < 10) && ($daughterSlave.anus != 0) && canWalk($daughterSlave)>>
- <<set $events.push("RE resistant mother daughter")>>
- <<set $motherSlave = $motherSlave.ID>>
- <<set $daughterSlave = $daughterSlave.ID>>
- <<break>>
- <</if>>
- <</for>>
-
- <<set _youngerSisters = _relatedSlaves.filter(function(s) { return s.sisters > 0 && s.origin == "$He was sold into slavery by $his older sister." && canPenetrate(s); })>>
- <<for _youngerSisters.length > 0>>
- <<set $youngerSister = _youngerSisters.pluck()>>
- <<set $olderSister = randomSister($youngerSister)>>
- <<if (def $olderSister) && ($olderSister.anus == 0) && $youngerSister.devotion > ($olderSister.devotion+20)>>
- <<set $events.push("RE sibling revenge")>>
- <<set $youngerSister = $youngerSister.ID>>
- <<set $olderSister = $olderSister.ID>>
- <<break>>
- <</if>>
- <</for>>
-
- <<set _twins = _relatedSlaves.filter(function(s) { return s.sisters > 0 && s.anus > 0 && s.devotion > 50 && canWalk(s); })>>
- <<for _twins.length > 0>>
- <<set $alphaTwin = _twins.pluck()>>
- <<set $betaTwin = randomTwinSister($alphaTwin)>>
- <<if (def $betaTwin) && ($betaTwin.anus > 0) && ($betaTwin.devotion > 50) && canWalk($betaTwin)>>
- <<set $events.push("RE devoted twins")>>
- <<set $alphaTwin = $alphaTwin.ID>>
- <<set $betaTwin = $betaTwin.ID>>
- <<break>>
- <</if>>
- <</for>>
+ <<set _youngerSisters = _relatedSlaves.filter(function(s) { return s.sisters > 0 && s.origin == "$He was sold into slavery by $his older sister." && canPenetrate(s); })>>
+ <<for _youngerSisters.length > 0>>
+ <<set $youngerSister = _youngerSisters.pluck()>>
+ <<set $olderSister = randomSister($youngerSister)>>
+ <<if (def $olderSister) && ($olderSister.anus == 0) && $youngerSister.devotion > ($olderSister.devotion+20)>>
+ <<set $events.push("RE sibling revenge")>>
+ <<set $youngerSister = $youngerSister.ID>>
+ <<set $olderSister = $olderSister.ID>>
+ <<break>>
+ <</if>>
+ <</for>>
+
+ <<set _twins = _relatedSlaves.filter(function(s) { return s.sisters > 0 && s.anus > 0 && s.devotion > 50 && canWalk(s); })>>
+ <<for _twins.length > 0>>
+ <<set $alphaTwin = _twins.pluck()>>
+ <<set $betaTwin = randomTwinSister($alphaTwin)>>
+ <<if (def $betaTwin) && ($betaTwin.anus > 0) && ($betaTwin.devotion > 50) && canWalk($betaTwin)>>
+ <<set $events.push("RE devoted twins")>>
+ <<set $alphaTwin = $alphaTwin.ID>>
+ <<set $betaTwin = $betaTwin.ID>>
+ <<break>>
+ <</if>>
+ <</for>>
- <</if>> /* closes extended family mode */
<</if>>
/* Fetish Interest Events */
@@ -756,11 +702,7 @@
<</if>>
<</if>>
- <<if $familyTesting == 1>>
- <<set _recruiterSlaves = $slaves.filter(function(s) { return s.fuckdoll == 0 && s.canRecruit == 1 && s.devotion > 50 && canWalk(s); })>>
- <<else>>
- <<set _recruiterSlaves = $slaves.filter(function(s) { return s.recruiter != 0 && s.fuckdoll == 0 && s.devotion > 50 && s.relation == 0 && canWalk(s); })>>
- <</if>>
+ <<set _recruiterSlaves = $slaves.filter(function(s) { return s.fuckdoll == 0 && s.canRecruit == 1 && s.devotion > 50 && canWalk(s); })>>
<<for _recruiterSlaves.length > 0>>
<<set $recruiterSlave = _recruiterSlaves.pluck()>>
diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw
index e19a7b4ecd6..6fefe860d3c 100644
--- a/src/uncategorized/reBoomerang.tw
+++ b/src/uncategorized/reBoomerang.tw
@@ -387,70 +387,45 @@ It isn't obvious how $he managed to escape, though no doubt you could review the
<<if $cash >= _ContractCost>>
<br><<link "Obfuscate $his appearance and re-enslave $him">>
<<run cashX(forceNeg(_ContractCost), "slaveTransfer", $activeSlave)>>
- <<if $familyTesting == 1>>
- <<if $boomerangStats.PCpregSource > 0 && $PC.preg > 0 && $PC.pregSource == 0>>
- <<set $PC.pregSource = $activeSlave.ID>>
+ <<if $boomerangStats.PCpregSource > 0 && $PC.preg > 0 && $PC.pregSource == 0>>
+ <<set $PC.pregSource = $activeSlave.ID>>
+ <</if>>
+ <<if $boomerangStats.PCmother > 0>>
+ <<set $PC.mother = $activeSlave.ID>>
+ <</if>>
+ <<if $boomerangStats.PCfather > 0>>
+ <<set $PC.father = $activeSlave.ID>>
+ <</if>>
+ <<for _reb = 0; _reb < $slaves.length; _reb++>>
+ <<if $boomerangStats.boomerangMother.includes($slaves[_reb].ID)>>
+ <<set $slaves[_reb].mother = $activeSlave.ID>>
<</if>>
- <<if $boomerangStats.PCmother > 0>>
- <<set $PC.mother = $activeSlave.ID>>
+ <<if $boomerangStats.boomerangFather.includes($slaves[_reb].ID)>>
+ <<set $slaves[_reb].father = $activeSlave.ID>>
<</if>>
- <<if $boomerangStats.PCfather > 0>>
- <<set $PC.father = $activeSlave.ID>>
+ <<if $boomerangStats.boomerangPregSources.includes($slaves[_reb].ID) && $slaves[_reb].preg > 0 && $slaves[_reb].pregSource == 0>>
+ <<set $slaves[_reb].pregSource = $activeSlave.ID>>
<</if>>
- <<for _reb = 0; _reb < $slaves.length; _reb++>>
- <<if $boomerangStats.boomerangMother.includes($slaves[_reb].ID)>>
- <<set $slaves[_reb].mother = $activeSlave.ID>>
- <</if>>
- <<if $boomerangStats.boomerangFather.includes($slaves[_reb].ID)>>
- <<set $slaves[_reb].father = $activeSlave.ID>>
+ <</for>>
+ <<if $incubator > 0>>
+ <<for _reb = 0; _reb < $tanks.length; _reb++>>
+ <<if $boomerangStats.boomerangMotherTank.includes($tanks[_reb].ID)>>
+ <<set $tanks[_reb].mother = $activeSlave.ID>>
<</if>>
- <<if $boomerangStats.boomerangPregSources.includes($slaves[_reb].ID) && $slaves[_reb].preg > 0 && $slaves[_reb].pregSource == 0>>
- <<set $slaves[_reb].pregSource = $activeSlave.ID>>
+ <<if $boomerangStats.boomerangFatherTank.includes($tanks[_reb].ID)>>
+ <<set $tanks[_reb].father = $activeSlave.ID>>
<</if>>
<</for>>
- <<if $incubator > 0>>
- <<for _reb = 0; _reb < $tanks.length; _reb++>>
- <<if $boomerangStats.boomerangMotherTank.includes($tanks[_reb].ID)>>
- <<set $tanks[_reb].mother = $activeSlave.ID>>
- <</if>>
- <<if $boomerangStats.boomerangFatherTank.includes($tanks[_reb].ID)>>
- <<set $tanks[_reb].father = $activeSlave.ID>>
- <</if>>
- <</for>>
- <</if>>
- <<if $nursery > 0>>
- <<for _reb = 0; _reb < $cribs.length; _reb++>>
- <<if $boomerangStats.boomerangMotherTank.includes($cribs[_reb].ID)>>
- <<set $cribs[_reb].mother = $activeSlave.ID>>
- <</if>>
- <<if $boomerangStats.boomerangFatherTank.includes($cribs[_reb].ID)>>
- <<set $cribs[_reb].father = $activeSlave.ID>>
- <</if>>
- <</for>>
- <</if>>
- <<else>>
- <<if $boomerangStats.boomerangRelation > 0>>
- <<set _reb = $slaveIndices[$boomerangStats.boomerangRelation]>>
- <<if def _reb>>
- <<if $activeSlave.relation == "mother">>
- <<set $slaves[_reb].relation = "daughter">>
- <<elseif $activeSlave.relation == "daughter">>
- <<set $slaves[_reb].relation = "mother">>
- <<else>>
- <<set $slaves[_reb].relation = $activeSlave.relation>>
- <</if>>
- <<set $slaves[_reb].relationshipTarget = $activeSlave.ID>>
- <<else>>
- <<set $activeSlave.relation = 0, $activeSlave.relationTarget = 0>>
+ <</if>>
+ <<if $nursery > 0>>
+ <<for _reb = 0; _reb < $cribs.length; _reb++>>
+ <<if $boomerangStats.boomerangMotherTank.includes($cribs[_reb].ID)>>
+ <<set $cribs[_reb].mother = $activeSlave.ID>>
<</if>>
- <</if>>
- <<if $boomerangStats.boomerangPregSources.length > 0>>
- <<for _reb = 0; _reb < $slaves.length; _reb++>>
- <<if $boomerangStats.boomerangPregSources.includes($slaves[_reb].ID) && $slaves[_reb].preg > 0 && $slaves[_reb].pregSource == 0>>
- <<set $slaves[_reb].pregSource = $activeSlave.ID>>
- <</if>>
- <</for>>
- <</if>>
+ <<if $boomerangStats.boomerangFatherTank.includes($cribs[_reb].ID)>>
+ <<set $cribs[_reb].father = $activeSlave.ID>>
+ <</if>>
+ <</for>>
<</if>>
<<if $boomerangStats.boomerangRelationship > 0>>
<<set _reb = $slaveIndices[$boomerangStats.boomerangRelationship]>>
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
index 45405d5a43f..6a10c0c9f97 100644
--- a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
+++ b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
@@ -14,14 +14,11 @@
<<set $activeSlave.devotion = random(5,15)>>
<<set $activeSlave.trust = random(-15,-5)>>
<<run setHealth($activeSlave, jsRandom(-20, 0))>>
-<<set _slaveCost = slaveCost($activeSlave)>>
-<<if $familyTesting == 1>>
- <<set $activeSlave.mother = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.father = $missingParentID>>
- <<set $activeSlave.canRecruit = 0>>
- <<set $missingParentID-->>
-<</if>>
+<<set $activeSlave.mother = $missingParentID>>
+<<set $missingParentID-->>
+<<set $activeSlave.father = $missingParentID>>
+<<set $activeSlave.canRecruit = 0>>
+<<set $missingParentID-->>
<<if ($activeSlave.dick > 0) && ($activeSlave.balls == 0)>><<set $activeSlave.balls = random(1,5)>><</if>>
<<set _oppositeSex = $seeDicks > 0 && $seeDicks < 100 && (random(1, 4) <= 3)>>
@@ -31,10 +28,6 @@
<<set _secondSlave.relationshipTarget = $activeSlave.ID>>
<<set $activeSlave.relationship = 4>>
<<set $activeSlave.relationshipTarget = _secondSlave.ID>>
-<<if $familyTesting != 1>>
- <<set $activeSlave.relation = "sister">>
- <<set $activeSlave.relationTarget = _secondSlave.ID>>
-<</if>>
<<if (_secondSlave.actualAge <= 22)>>
<<set _secondSlave.career = setup.youngCareers.random()>>
@@ -72,7 +65,9 @@ You receive so many messages, as a noted titan of the new Free Cities world, tha
<br><br>
This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. In this case, however, the story is more unusual — the callers seem stressed, but otherwise normal. They haltingly and quietly explain, with many nervous glances off-camera to ensure they are not overheard, that they are both siblings and lovers, and their attempts to keep the truth of the nature of their relationship from their friends, family, and society at large have failed. They had heard of $arcologies[0].name's reverence for incestuous relationships, and have managed to talk themselves into the questionable conclusion that their only chance to be together was for them to sell themselves to someone who would not just accept but encourage their incest — namely, you.
<br><br>
-//Enslaving them will cost <<print cashFormat(_contractCost)>>. Selling them immediately will bring in approximately <<print cashFormat(_slaveCost*2-3000)>>.//
+
+<<set _totalValue = slaveCost($activeSlave) + slaveCost(_secondSlave)>>
+//Enslaving them will cost <<print cashFormat(_contractCost)>>. Selling them immediately will bring in approximately <<print cashFormat(_totalValue-_contractCost)>>.//
<br><br>
<<set $saleDescription = 0>>
<<include "Long Slave Description">>
diff --git a/src/uncategorized/reMilfTourist.tw b/src/uncategorized/reMilfTourist.tw
index fce56ffc972..89a30b0184f 100644
--- a/src/uncategorized/reMilfTourist.tw
+++ b/src/uncategorized/reMilfTourist.tw
@@ -172,7 +172,6 @@
<br>
<<run cashX(-20000, "event", $activeSlave)>>
<<include "New Slave Intro">>
- <<set $activeSlave.recruiter = 0>>
<</replace>>
<</link>> //This will require an unprofitable <<print cashFormat(20000)>>, since _he2 is wealthy and obfuscating _his2 fate will require considerable spending//
<<else>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 3e2898a9c69..b835a48d5fb 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -2,8 +2,6 @@
<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check">>
-<<if $familyTesting == 1>>
-
<<set $eventSlave = getSlave($recruiterSlave)>>
<<set $activeSlave = BaseSlave()>>
<<set $activeSlave = Object.assign($activeSlave, clone($genePool.find(function(o) { return o.ID == $eventSlave.ID; })))>>
@@ -807,333 +805,3 @@ You look up the _relationType. _He2 costs <<print cashFormat(_slaveCost)>>, a ba
</span>
<</if>> /* _recruitedType.length */
-
-<<else>> /* vanilla */
-
-<<set $i = $slaveIndices[$recruiterSlave]>>
-<<set $j = $genePool.findIndex(function(o) { return o.ID == $slaves[$i].ID; })>>
-
-<<set $eventSlave = $slaves[$i]>>
-<<set $activeSlave = BaseSlave()>>
-<<set $activeSlave = Object.assign($activeSlave, clone($genePool[$j]))>>
-<<run Enunciate($eventSlave)>>
-
-<span id="artFrame">
-/* 000-250-006 */
-<<if $seeImages == 1>>
- <<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($eventSlave, 2, 0)>></div>
- <<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($eventSlave, 2, 0)>></div>
- <</if>>
-<</if>>
-/* 000-250-006 */
-</span>
-
-<<if (random(0,99) < $seeDicks)>>
- <<if random(1,100) > 60>>
- <<if $activeSlave.dick > 0>>
- <<set $activeSlave.dick = 0>>
- <<set $activeSlave.balls = 0>>
- <<set $activeSlave.scrotum = 0>>
- <<set $activeSlave.ovaries = 1>>
- <<set $activeSlave.vagina = either(0,1,1,1,2,2)>>
- <<set $activeSlave.boobs += 100*random(1,4)>>
- <<set $activeSlave.butt += random(1,2)>>
- <<if $activeSlave.muscles > 5>>
- <<set $activeSlave.muscles -= random(0,10)>>
- <</if>>
- <<if $activeSlave.height >= 150>>
- <<set $activeSlave.height -= 10*random(0,1)>>
- <</if>>
- <<else>>
- <<set $activeSlave.dick = random(1,4)>>
- <<set $activeSlave.balls = random(1,4)>>
- <<set $activeSlave.ovaries = 0>>
- <<set $activeSlave.vagina = -1>>
- <<set $activeSlave.boobs = 100*random(1,4)>>
- <<if $activeSlave.boobsImplant > 0>>
- <<set $activeSlave.boobs += $activeSlave.boobsImplant>>
- <</if>>
- <<set $activeSlave.butt = random(1,3)>>
- <<if $activeSlave.buttImplant > 0>>
- <<set $activeSlave.butt += $activeSlave.buttImplant>>
- <</if>>
- <<if $activeSlave.muscles <= 95>>
- <<set $activeSlave.muscles += random(0,10)>>
- <</if>>
- <</if>>
- <</if>>
-<</if>>
-
-<<switch $eventSlave.recruiter>>
-<<case "mother">>
- <<set $activeSlave.origin = "$He was recruited into your service by $his mother.">>
- <<set $activeSlave.anus = 0>>
- <<if $activeSlave.vagina > -1>><<set $activeSlave.vagina = 0>><</if>>
- <<set $activeSlave.preg = -1>>
- <<set $activeSlave.skill.oral = 0>>
- <<set $activeSlave.skill.vaginal = 0>>
- <<set $activeSlave.skill.anal = 0>>
- <<set $activeSlave.skill.entertainment = 0>>
- <<set $activeSlave.skill.whoring = 0>>
- <<set $activeSlave.lactation = 0>>
- <<set $activeSlave.lactationDuration = 0>>
- <<set $activeSlave.boobsMilk = 0>>
- <<set $activeSlave.induceLactation = 0>>
- <<set $activeSlaveOneTimeMaxAge = Math.max($minimumSlaveAge, Math.min(18, ($activeSlave.actualAge - Math.min(11, $fertilityAge))))>>
- <<set $activeSlaveOneTimeMinAge = Math.max($minimumSlaveAge, Math.min(14, $activeSlaveOneTimeMaxAge))>>
- <<if $pedo_mode == 1>><<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>><</if>>
- <<set $activeSlave.actualAge = random($activeSlaveOneTimeMinAge, $activeSlaveOneTimeMaxAge)>>
- <<set $activeSlave.birthWeek = 0>>
-<<case "daughter">>
- <<set $activeSlave.origin = "$He was recruited into your service by $his daughter.">>
- <<if $activeSlave.vagina == 0>>
- <<set $activeSlave.vagina = 1>>
- <</if>>
- <<set $activeSlave.preg = -1>>
- <<set $activeSlave.skill.oral += random(0,20)>>
- <<set $activeSlave.skill.vaginal += random(0,20)>>
- <<set $activeSlave.skill.anal += random(0,20)>>
- <<set $activeSlave.skill.entertainment += random(0,20)>>
- <<set $activeSlave.skill.whoring += random(0,20)>>
- <<set $activeSlave.lactation = 0>>
- <<set $activeSlave.lactationDuration = 0>>
- <<set $activeSlave.boobsMilk = 0>>
- <<set $activeSlave.induceLactation = 0>>
- <<set $activeSlave.actualAge += random(15,20)>>
-<<case "older sister">>
- <<set $activeSlave.origin = "$He was recruited into your service by $his older sister.">>
- <<if $activeSlave.ovaries == 1>>
- <<set $activeSlave.boobs += 200>>
- <<set $activeSlave.butt += 1>>
- <</if>>
- <<set $activeSlave.actualAge = $activeSlave.actualAge-2>>
-<<case "young sister">>
- <<set $activeSlave.origin = "$He was recruited into your service by $his younger sister.">>
- <<if $activeSlave.ovaries == 1>>
- <<set $activeSlave.boobs = Math.trunc($activeSlave.boobs-200,0,50000)>>
- <<set $activeSlave.butt = Math.trunc($activeSlave.butt-1,0,10)>>
- <</if>>
- <<set $activeSlave.actualAge = $activeSlave.actualAge+2>>
-<<default>>
- <<set $activeSlave.origin = "$He was recruited into your service by $his twin sister.">>
-<</switch>>
-
-<<if $eventSlave.recruiter != "twin">>
- <<set $activeSlave.devotion = random(25,45)>>
- <<set $activeSlave.trust = random(-15,15)>>
- <<if $activeSlave.weight > 30>>
- <<set $activeSlave.weight -= random(0,50)>>
- <<elseif $activeSlave.weight < -30>>
- <<set $activeSlave.weight += random(0,50)>>
- <<else>>
- <<set $activeSlave.weight += random(-20,20)>>
- <</if>>
- <<set $activeSlave.height += random(-5,5)>>
-<</if>>
-
-<<set $activeSlave.visualAge = $activeSlave.actualAge>>
-<<set $activeSlave.physicalAge = $activeSlave.actualAge>>
-<<set $activeSlave.ovaryAge = $activeSlave.actualAge>>
-<<set $activeSlave.pubertyAgeXX = $fertilityAge>>
-<<if $activeSlave.ovaries == 1>>
- <<if $activeSlave.physicalAge >= $activeSlave.pubertyAgeXX>>
- <<set $activeSlave.pubertyXX = 1>>
- <<else>>
- <<set $activeSlave.pubertyXX = 0>>
- <</if>>
-<<else>>
- <<set $activeSlave.pubertyXX = 0>>
-<</if>>
-<<set $activeSlave.pubertyAgeXY = $potencyAge>>
-<<if $activeSlave.balls > 0>>
- <<if $activeSlave.physicalAge >= $activeSlave.pubertyAgeXY>>
- <<set $activeSlave.pubertyXY = 1>>
- <<else>>
- <<set $activeSlave.pubertyXY = 0>>
- <</if>>
-<<else>>
- <<set $activeSlave.pubertyXY = 0>>
-<</if>>
-<<set $activeSlave.ageImplant = 0>>
-<<if $activeSlave.career != "a Futanari Sister">><<set $activeSlave.career = "a slave">><</if>>
-<<set $activeSlave.relationship = 0>>
-<<set $activeSlave.relationshipTarget = 0>>
-<<set $activeSlave.counter.births = 0>>
-<<set $activeSlave.counter.oral = 0>>
-<<set $activeSlave.counter.vaginal = 0>>
-<<set $activeSlave.counter.anal = 0>>
-<<set $activeSlave.counter.mammary = 0>>
-<<set $activeSlave.counter.penetrative = 0>>
-<<set $activeSlave.counter.pitKills = 0>>
-<<set $activeSlave.drugs = "no drugs">>
-<<set $activeSlave.shoes = "none">>
-<<set $activeSlave.clothes = "no clothing">>
-<<set $activeSlave.hormones = 0>>
-<<set $activeSlave.assignment = "rest">>
-<<set $activeSlave.choosesOwnAssignment = 0>>
-<<set $activeSlave.fetishStrength = random(0,90)>>
-<<set $activeSlave.fetish = either("boobs", "buttslut", "cumslut", "humiliation", "none", "none", "none", "none", "none", "none", "pregnancy", "submissive")>>
-<<set $activeSlave.sexualFlaw = either("hates anal", "hates oral", "hates penetration", "none", "none", "none", "none")>>
-<<set $activeSlave.behavioralFlaw = either("anorexic", "arrogant", "bitchy", "hates men", "hates women", "hates women", "none", "none", "none", "odd")>>
-<<set $activeSlave.weekAcquired = $week>>
-<<run randomizeAttraction($activeSlave)>>
-<<if $activeSlave.nipples == "fuckable">>
- <<set $activeSlave.nipples = either("cute", "inverted", "partially inverted", "puffy")>>
-<</if>>
-<<set $activeSlave.prestige = 0>>
-<<set $activeSlave.porn = new App.Entity.SlavePornPerformanceState()>>
-<<set $activeSlave.prestigeDesc = "">>
-<<if ndef $activeSlave.geneMods>>
- <<set $activeSlave.geneMods = {NCS: 0, rapidCellGrowth: 0}>>
-<<else>>
- <<set $activeSlave.geneMods.NCS = 0>>
- <<set $activeSlave.geneMods.rapidCellGrowth = 0>>
-<</if>>
-<<set $activeSlave.NCSyouthening = 0>>
-<<set $activeSlave.slaveCost = 0>>
-<<set $activeSlave.lifetimeCashExpenses = 0>>
-<<set $activeSlave.lifetimeCashIncome = 0>>
-<<set $activeSlave.lastWeeksCashIncome = 0>>
-<<set $activeSlave.lifetimeRepExpenses = 0>>
-<<set $activeSlave.lifetimeRepIncome = 0>>
-<<set $activeSlave.lastWeeksRepIncome = 0>>
-<<set $activeSlave.custom.desc = "">>
-
-<<set _slaveCost = slaveCost($activeSlave)>>
-
-<<if $activeSlave.slaveSurname>><<set _familyName = $activeSlave.slaveSurname>><</if>>
-<<set _familyBirthSurname = $activeSlave.birthSurname>>
-<<run nationalityToName($activeSlave)>>
-<<if _familyName>><<set $activeSlave.slaveSurname = _familyName>><</if>>
-<<set $activeSlave.birthSurname = _familyBirthSurname>>
-
-<<set $activeSlave.slaveName = $activeSlave.birthName>>
-<<set $activeSlave.ID += 1000>>
-<<set $activeSlave.relation = $eventSlave.recruiter>>
-<<if $activeSlave.relation.indexOf("sister") != -1>><<set $activeSlave.relation = "sister">><</if>>
-<<set $activeSlave.relation = relationTargetWord($activeSlave)>>
-<<set $activeSlave.relationTarget = $eventSlave.ID>>
-<<set $activeSlave.recruiter = 0>>
-
-<<run generatePronouns($activeSlave)>>
-<<setLocalPronouns $activeSlave 2>>
-<<setSpokenLocalPronouns $eventSlave $activeSlave>>
-
-$eventSlave.slaveName requests an interview with you. $He's a devoted slave, and you grant it, and are happy you did when you see the troubled expression on $his face. $He explains<<if !canTalk($eventSlave)>> with desperate gestures<</if>> that
-<<switch $eventSlave.recruiter>>
-<<case "mother">>
- $he had a _daughter2, who was sent to the slave orphanages. $He's heard a rumor through other slaves that $his _daughter2 will go up for sale soon.
-<<case "daughter">>
- $his _mother2 has been enslaved. _He2 was free the last $eventSlave.slaveName knew of _him2. $He's heard a rumor through other slaves that $his _mother2 will go up for sale soon.
-<<case "older sister">>
- $his older _sister2 is being sold. _He2 was likely to be enslaved the last $eventSlave.slaveName knew of _him2, and now $he's heard a rumor through other slaves that $his big _sister2 is going to be sold to a new owner.
-<<case "young sister">>
- $his younger _sister2 is being sold. _He2 was likely to be enslaved the last $eventSlave.slaveName knew of _him2, and now $he's heard a rumor through other slaves that $his little _sister2 is going to be sold to a new owner.
-<<default>>
- $he has a twin _sister2, who was still free the last $eventSlave.slaveName knew of _him2. $He's heard a rumor through other slaves that $his twin has finally been enslaved, and will soon go up for sale.
-<</switch>>
-<br><br>
-<<if !canTalk($eventSlave)>>$He urgently gestures for permission to write. It's unusual, but $he seems quite serious, so you grant it. $He writes,<</if>>
-"You've been <<s>>o good to me, <<Master>>. I'm <<s>>ure <<he 2>> look<<s>> like I did when you bought me. Plea<<s>>e, <<Master>>, will you buy _him2 like you bought me? I'm afraid <<he 2>>'ll go to a cruel <<Master>>." $He bites $his lip. "And, <<Master>>, I'm <<s>>ure <<he 2>>'d learn to love
-<<if $eventSlave.fetish == "cumslut">>
- the ta<<s>>te of your cum
-<<elseif $eventSlave.fetish == "submissive">>
- <<s>>ubmi<<ss>>ion
-<<elseif $eventSlave.fetish == "humiliation">>
- being treated like a dirty <<s>>lut
-<<elseif $eventSlave.fetish == "buttslut">>
- the feeling of your cock in <<his 2>> butt
-<<elseif $eventSlave.fetish == "sadist">>
- hurting your other <<s>>laves
-<<elseif $eventSlave.fetish == "pregnancy">>
- being pregnant
-<<elseif $eventSlave.fetish == "masochist">>
- being beaten
-<<elseif $eventSlave.fetish == "dom">>
- fucking your other <<s>>lave<<s>>
-<<elseif $eventSlave.energy > 95>>
- being a good nympho <<s>>lut
-<<elseif $eventSlave.addict > 2>>
- being a druggie whore
-<<elseif $eventSlave.counter.births > 3>>
- bearing children
-<<elseif $eventSlave.bellyPreg >= 50 && $eventSlave.pregKnown == 1>>
- <<s>>welling with life
-<<elseif $eventSlave.anus > 2>>
- getting <<his 2>> butt <<s>>tretched out
-<<elseif $eventSlave.boobsImplant > 500>>
- getting turned into a bimbo <<s>>lut
-<<else>>
- the feeling of your cock in _him2
-<</if>>
-a<<s>> much a<<s>> I do.
-<<if $eventSlave.fetish == "cumslut">>
- We could blow you at the <<s>>ame time, <<Master>>! And <<sh>>are cum!"
-<<elseif $eventSlave.fetish == "submissive">>
- You could u<<s>>e u<<s>> together, <<Master>>!"
-<<elseif $eventSlave.fetish == "humiliation">>
- You could make u<<s>> fuck each other in public, <<Master>>!"
-<<elseif $eventSlave.fetish == "buttslut">>
- You could fuck our butt<<s>> right ne<<x>>t to each other, <<Master>>!"
-<<elseif $eventSlave.fetish == "pregnancy">>
- You could knock u<<s>> up ne<<x>>t to each other, <<Master>>!"
-<<elseif $eventSlave.fetish == "sadist">>
- I'm <<s>>ure <<he 2>>'d love to help me, <<Master>>!"
-<<elseif $eventSlave.fetish == "masochist">>
- You could whip u<<s>> both, <<Master>>!"
-<<elseif $eventSlave.fetish == "dom">>
- I'm <<s>>ure <<he 2>>'d love to help me u<<s>>e other <<s>>lave<<s>>, <<Master>>!"
-<<elseif $eventSlave.energy > 95>>
- I'm <<s>>ure <<he 2>>'d love to have three<<s>>ome<<s>>, <<Master>>!"
-<<elseif $eventSlave.counter.births > 3>>
- <<if $PC.dick != 0>>
- We could compete over who carried more of your children, <<Master>>!
- <<else>>
- We could compete over who carried more children for you, <<Master>>!
- <</if>>
-<<elseif $eventSlave.bellyPreg >= 50 && $eventSlave.pregKnown == 1>>
- You could compare how big our bellie<<s>> are ne<<x>>t to each other, <<Master>>!
-<<else>>
- You could fuck u<<s>> together, <<Master>>!"
-<</if>>
-$He waits anxiously for your decision.
-
-<br><br>
-
-You look up the $activeSlave.relation. _He2 costs <<print cashFormat(_slaveCost)>>, a bargain, but you won't be able to inspect _him2 beyond _his2 likely resemblance to _his2 <<print relationTargetWord($activeSlave)>>.
-
-<br><br>
-
-<<set $slaves[$i].recruiter = 0>> /* the chance to recruit this particular related slave will not be offered again, regardless of player decision */
-
-<span id="result">
-<<link "Buy _him2">>
- <<replace "#artFrame">>
- /* 000-250-006 */
- <<if $seeImages == 1>>
- <div class="imageColumn">
- <div class="imageRef medImg">
- <<= SlaveArt($activeSlave, 2, 0)>>
- </div>
- <div class="imageRef medImg">
- <<= SlaveArt($eventSlave, 2, 0)>>
- </div>
- </div>
- <</if>>
- /* 000-250-006 */
- <</replace>>
- <<replace "#result">>
- /* update $slaves[$i] (eventSlave) before calling any widgets */
- <<set $slaves[$i].relation = relationTargetWord($activeSlave)>>
- <<set $slaves[$i].relationTarget = $activeSlave.ID>>
- <<run cashX(forceNeg(_slaveCost), "slaveTransfer", $activeSlave)>>
- <<set $desc = SlaveTitle($eventSlave)>>
- You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName arrives shortly. The two slaves remember each other only dimly — they parted a long time ago — but they embrace. The devoted $desc explains the situation and encourages $his $activeSlave.relation to be a good slave to you. $activeSlave.slaveName looks a little fearful but clearly realizes that _he2's lucky to be here.
- <<include "New Slave Intro">>
- <</replace>>
-<</link>>
-</span>
-
-<</if>> /* close extended family mode */
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 8d879a0deeb..a1134aef678 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -87,12 +87,7 @@
<<run setHealth($activeSlave, jsRandom(-60, 20), Math.max(normalRandInt(5, 3), 0), Math.max(normalRandInt(5, 3), 0))>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
- <<if $familyTesting == 1>>
- <<set $activeSlave.canRecruit = 0>>
- <<else>>
- <<set $activeSlave.relation = "mother">>
- <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
- <</if>>
+ <<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.counter.birthsTotal += 1>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<set _slaveCost -= 1000>>
@@ -132,12 +127,7 @@
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<set $activeSlave.pubicHStyle = "neat">>
<<set $activeSlave.underArmHStyle = "shaved">>
- <<if $familyTesting == 1>>
- <<set $activeSlave.canRecruit = 0>>
- <<else>>
- <<set $activeSlave.relation = "mother">>
- <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
- <</if>>
+ <<set $activeSlave.canRecruit = 0>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<set _slaveCost -= 1500>>
<<case "incest mother son">>
@@ -178,12 +168,7 @@
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<set $activeSlave.pubicHStyle = "bushy">>
<<set $activeSlave.behavioralQuirk = "sinful">>
- <<if $familyTesting == 1>>
- <<set $activeSlave.canRecruit = 0>>
- <<else>>
- <<set $activeSlave.relation = "mother">>
- <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
- <</if>>
+ <<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID + 1000>>
/* _slaveCost not needed, no option to sell */
@@ -207,12 +192,7 @@
<<set $activeSlave.clothes = "conservative clothing">>
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<set $activeSlave.behavioralQuirk = "sinful">>
- <<if $familyTesting == 1>>
- <<set $activeSlave.canRecruit = 0>>
- <<else>>
- <<set $activeSlave.relation = "mother">>
- <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
- <</if>>
+ <<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID + 1000>>
/* _slaveCost not needed, no option to sell */
@@ -247,16 +227,11 @@
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<set $activeSlave.pubicHStyle = "in a strip">>
<<set $activeSlave.behavioralQuirk = "sinful">>
- <<if $familyTesting == 1>>
- <<set $activeSlave.mother = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.father = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.canRecruit = 0>>
- <<else>>
- <<set $activeSlave.relation = "sister">>
- <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
- <</if>>
+ <<set $activeSlave.mother = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set $activeSlave.father = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID + 1000>>
/* _slaveCost not needed, no option to sell */
@@ -281,16 +256,11 @@
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<set $activeSlave.pubicHStyle = "in a strip">>
<<set $activeSlave.behavioralQuirk = "sinful">>
- <<if $familyTesting == 1>>
- <<set $activeSlave.mother = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.father = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.canRecruit = 0>>
- <<else>>
- <<set $activeSlave.relation = "sister">>
- <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
- <</if>>
+ <<set $activeSlave.mother = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set $activeSlave.father = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID + 1000>>
/* _slaveCost not needed, no option to sell */
@@ -313,16 +283,11 @@
<<set $activeSlave.attrXY = 80>>
<<set $activeSlave.pubicHStyle = "bushy">>
<<set $activeSlave.behavioralQuirk = "sinful">>
- <<if $familyTesting == 1>>
- <<set $activeSlave.mother = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.father = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.canRecruit = 0>>
- <<else>>
- <<set $activeSlave.relation = "sister">>
- <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
- <</if>>
+ <<set $activeSlave.mother = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set $activeSlave.father = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID + 1000>>
/* _slaveCost not needed, no option to sell */
@@ -345,16 +310,11 @@
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<set $activeSlave.pubicHStyle = "in a strip">>
<<set $activeSlave.behavioralQuirk = "sinful">>
- <<if $familyTesting == 1>>
- <<set $activeSlave.mother = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.father = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.canRecruit = 0>>
- <<else>>
- <<set $activeSlave.relation = "sister">>
- <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
- <</if>>
+ <<set $activeSlave.mother = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set $activeSlave.father = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID + 1000>>
/* _slaveCost not needed, no option to sell */
@@ -376,16 +336,11 @@
<<set $activeSlave.attrXY = 80>>
<<set $activeSlave.pubicHStyle = "bushy">>
<<set $activeSlave.behavioralQuirk = "sinful">>
- <<if $familyTesting == 1>>
- <<set $activeSlave.mother = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.father = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.canRecruit = 0>>
- <<else>>
- <<set $activeSlave.relation = "sister">>
- <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
- <</if>>
+ <<set $activeSlave.mother = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set $activeSlave.father = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID + 1000>>
<<case "incest twins mixed">>
@@ -408,16 +363,11 @@
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<set $activeSlave.pubicHStyle = "in a strip">>
<<set $activeSlave.behavioralQuirk = "sinful">>
- <<if $familyTesting == 1>>
- <<set $activeSlave.mother = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.father = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.canRecruit = 0>>
- <<else>>
- <<set $activeSlave.relation = "sister">>
- <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
- <</if>>
+ <<set $activeSlave.mother = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set $activeSlave.father = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID + 1000>>
/* _slaveCost not needed, no option to sell */
@@ -452,12 +402,7 @@
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<set $activeSlave.pubicHStyle = "bushy">>
<<set $activeSlave.behavioralQuirk = "sinful">>
- <<if $familyTesting == 1>>
- <<set $activeSlave.canRecruit = 0>>
- <<else>>
- <<set $activeSlave.relation = "mother">>
- <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
- <</if>>
+ <<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID + 1000>>
/* _slaveCost not needed, no option to sell */
@@ -481,12 +426,7 @@
<<set $activeSlave.clothes = "conservative clothing">>
<<run setHealth($activeSlave, jsRandom(20, 40), 0, 0, 0)>>
<<set $activeSlave.behavioralQuirk = "sinful">>
- <<if $familyTesting == 1>>
- <<set $activeSlave.canRecruit = 0>>
- <<else>>
- <<set $activeSlave.relation = "mother">>
- <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
- <</if>>
+ <<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID + 1000>>
/* _slaveCost not needed, no option to sell */
@@ -531,16 +471,11 @@
<<set $activeSlave.hStyle = "in twin tails">>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
- <<if $familyTesting == 1>>
- <<set $activeSlave.mother = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.father = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.canRecruit = 0>>
- <<else>>
- <<set $activeSlave.relation = "sister">>
- <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
- <</if>>
+ <<set $activeSlave.mother = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set $activeSlave.father = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.rivalry = 3>>
<<set $activeSlave.rivalryTarget = $activeSlave.ID + 1000>>
<<set _slaveCost = slaveCost($activeSlave)>>
@@ -583,18 +518,11 @@
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.sexualFlaw = "none">>
<<set $activeSlave.behavioralFlaw = "none">>
- <<if $familyTesting == 1>>
- <<set $activeSlave.mother = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.father = $missingParentID>>
- <<set $activeSlave.canRecruit = 0>>
- <<set $missingParentID-->>
- <<else>>
- <<set $activeSlave.relation = "twin">>
- <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
- <</if>>
- <<set $activeSlave.relation = "twin">>
- <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
+ <<set $activeSlave.mother = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set $activeSlave.father = $missingParentID>>
+ <<set $activeSlave.canRecruit = 0>>
+ <<set $missingParentID-->>
<<set $activeSlave.relationship = 2>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID + 1000>>
<<set _slaveCost = slaveCost($activeSlave)>>
@@ -641,16 +569,11 @@
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.sexualQuirk = "none">>
<<set $activeSlave.behavioralQuirk = "none">>
- <<if $familyTesting == 1>>
- <<set $activeSlave.mother = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.father = $missingParentID>>
- <<set $activeSlave.canRecruit = 0>>
- <<set $missingParentID-->>
- <<else>>
- <<set $activeSlave.relation = "twin">>
- <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
- <</if>>
+ <<set $activeSlave.mother = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set $activeSlave.father = $missingParentID>>
+ <<set $activeSlave.canRecruit = 0>>
+ <<set $missingParentID-->>
<<set $activeSlave.relationship = 2>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID + 1000>>
<<set _slaveCost = slaveCost($activeSlave)>>
@@ -707,16 +630,11 @@
<<set $activeSlave.fetishStrength = 100>>
<<set $activeSlave.sexualQuirk = "perverted">>
<<set $activeSlave.behavioralQuirk = "none">>
- <<if $familyTesting == 1>>
- <<set $activeSlave.mother = $missingParentID>>
- <<set $missingParentID-->>
- <<set $activeSlave.father = $missingParentID>>
- <<set $activeSlave.canRecruit = 0>>
- <<set $missingParentID-->>
- <<else>>
- <<set $activeSlave.relation = "twin">>
- <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
- <</if>>
+ <<set $activeSlave.mother = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set $activeSlave.father = $missingParentID>>
+ <<set $activeSlave.canRecruit = 0>>
+ <<set $missingParentID-->>
<<set $activeSlave.relationship = 4>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID + 1000>>
<<set _slaveCost = slaveCost($activeSlave)>>
@@ -771,12 +689,7 @@
<<set $activeSlave.bellySag = 20>>
<<set $activeSlave.bellySagPreg = 20>>
<<set $activeSlave.pubertyXX = 1>>
- <<if $familyTesting == 1>>
- <<set $activeSlave.canRecruit = 0>>
- <<else>>
- <<set $activeSlave.relation = "mother">>
- <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
- <</if>>
+ <<set $activeSlave.canRecruit = 0>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<set _slaveCost -= 1500>>
<</switch>>
@@ -801,12 +714,7 @@
<<set $activeSlaveOneTimeMinAge = Math.min(Math.max(15, $minimumSlaveAge), $activeSlaveOneTimeMaxAge)>>
<<if $pedo_mode == 1>><<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>><</if>>
<<set $activeSlave.actualAge = random($activeSlaveOneTimeMinAge, $activeSlaveOneTimeMaxAge)>>
- <<if $familyTesting == 1>>
- <<set $activeSlave.mother = $activeSlave.ID - 1000>>
- <<else>>
- <<set $activeSlave.relation = "daughter">>
- <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
- <</if>>
+ <<set $activeSlave.mother = $activeSlave.ID - 1000>>
<<set $activeSlave.counter.birthsTotal = 0>>
<<set $activeSlave.visualAge = $activeSlave.actualAge>>
<<set $activeSlave.physicalAge = $activeSlave.actualAge>>
@@ -834,12 +742,7 @@
<<set $activeSlaveOneTimeMinAge = Math.min(18, $activeSlaveOneTimeMaxAge)>>
<<if $pedo_mode == 1>><<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>><</if>>
<<set $activeSlave.actualAge = random($activeSlaveOneTimeMinAge, $activeSlaveOneTimeMaxAge)>>
- <<if $familyTesting == 1>>
- <<set $activeSlave.mother = $activeSlave.ID - 1000>>
- <<else>>
- <<set $activeSlave.relation = "daughter">>
- <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
- <</if>>
+ <<set $activeSlave.mother = $activeSlave.ID - 1000>>
<<set $activeSlave.counter.birthsTotal = 0>>
<<set $activeSlave.preg = 0>>
<<set $activeSlave.visualAge = $activeSlave.actualAge>>
@@ -889,12 +792,7 @@
<<set $activeSlave.butt -= 2>>
<<set $activeSlave.behavioralQuirk = "none">>
<<set $activeSlave.sexualQuirk = "perverted">>
- <<if $familyTesting == 1>>
- <<set $activeSlave.mother = $activeSlave.ID - 1000>>
- <<else>>
- <<set $activeSlave.relation = "daughter">>
- <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
- <</if>>
+ <<set $activeSlave.mother = $activeSlave.ID - 1000>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
<<if $activeSlave.physicalAge < 6>>
@@ -940,12 +838,7 @@
<<set $activeSlave.faceShape = "cute">>
<<set $activeSlave.behavioralQuirk = "none">>
<<set $activeSlave.sexualQuirk = "perverted">>
- <<if $familyTesting == 1>>
- <<set $activeSlave.father = $activeSlave.ID - 1000>>
- <<else>>
- <<set $activeSlave.relation = "daughter">>
- <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
- <</if>>
+ <<set $activeSlave.father = $activeSlave.ID - 1000>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
<<if $activeSlave.physicalAge < 6>>
@@ -984,11 +877,6 @@
<<set $activeSlave.behavioralQuirk = "none">>
<<set $activeSlave.sexualQuirk = "perverted">>
<<set $activeSlave.clothes = "conservative clothing">>
- <<if $familyTesting == 1>>
- <<else>>
- <<set $activeSlave.relation = "sister">>
- <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
- <</if>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
<<if $activeSlave.physicalAge < 6>>
@@ -1005,11 +893,6 @@
<<set $activeSlave.ovaryAge = $activeSlave.actualAge>>
<<= resyncSlaveHight($activeSlave)>>
<<set $activeSlave.pubicHStyle = "shaved">>
- <<if $familyTesting == 1>>
- <<else>>
- <<set $activeSlave.relation = "sister">>
- <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
- <</if>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
<<case "incest brother brother">>
@@ -1027,11 +910,6 @@
<<if $activeSlave.foreskin>>
<<set $activeSlave.foreskin = $activeSlave.dick>>
<</if>>
- <<if $familyTesting == 1>>
- <<else>>
- <<set $activeSlave.relation = "sister">>
- <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
- <</if>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
<<if $activeSlave.physicalAge < 6>>
@@ -1043,22 +921,12 @@
<<set $activeSlave.slaveName = $activeSlave.birthName>>
<<set $activeSlave.ID = $activeSlave.ID + 1000>>
<<set $activeSlave.height += random(-5,5)>>
- <<if $familyTesting == 1>>
- <<else>>
- <<set $activeSlave.relation = "sister">>
- <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
- <</if>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
<<case "incest twin brother">>
<<set $activeSlave.slaveName = $activeSlave.birthName>>
<<set $activeSlave.ID = $activeSlave.ID + 1000>>
<<set $activeSlave.height += random(-5,5)>>
- <<if $familyTesting == 1>>
- <<else>>
- <<set $activeSlave.relation = "sister">>
- <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
- <</if>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
<<case "incest twins mixed">>
@@ -1086,11 +954,6 @@
<<set $activeSlave.behavioralQuirk = "none">>
<<set $activeSlave.sexualQuirk = "perverted">>
<<set $activeSlave.clothes = "conservative clothing">>
- <<if $familyTesting == 1>>
- <<else>>
- <<set $activeSlave.relation = "sister">>
- <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
- <</if>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
<<case "incest mother daughter">>
@@ -1123,12 +986,7 @@
<<set $activeSlave.boobsImplant = 0>>
<<set $activeSlave.boobsImplantType = "none">>
<<set $activeSlave.butt -= 2>>
- <<if $familyTesting == 1>>
- <<set $activeSlave.mother = $activeSlave.ID - 1000>>
- <<else>>
- <<set $activeSlave.relation = "daughter">>
- <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
- <</if>>
+ <<set $activeSlave.mother = $activeSlave.ID - 1000>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
<<if $activeSlave.physicalAge < 6>>
@@ -1159,12 +1017,7 @@
<<set $activeSlave.dick -= 2>>
<<set $activeSlave.balls -= 1>>
<<set $activeSlave.scrotum -= 1>>
- <<if $familyTesting == 1>>
- <<set $activeSlave.mother = $activeSlave.ID - 1000>>
- <<else>>
- <<set $activeSlave.relation = "daughter">>
- <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
- <</if>>
+ <<set $activeSlave.mother = $activeSlave.ID - 1000>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
<<if $activeSlave.physicalAge < 6>>
@@ -1204,11 +1057,6 @@
<<set $activeSlave.visualAge = $activeSlave.actualAge>>
<<set $activeSlave.physicalAge = $activeSlave.actualAge>>
<<set $activeSlave.ovaryAge = $activeSlave.actualAge>>
- <<if $familyTesting == 1>>
- <<else>>
- <<set $activeSlave.relation = "sister">>
- <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
- <</if>>
<<set $activeSlave.rivalry = 3>>
<<set $activeSlave.rivalryTarget = $activeSlave.ID - 1000>>
<<case "matched pair">>
@@ -1226,20 +1074,10 @@
<<set $activeSlave.boobsImplantType = "none">>
<<set $activeSlave.buttImplant = 0>>
<<set $activeSlave.buttImplantType = "none">>
- <<if $familyTesting == 1>>
- <<else>>
- <<set $activeSlave.relation = "twin">>
- <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
- <</if>>
<<set $activeSlave.relationship = 2>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
<<case "identical pair">>
<<set $activeSlave.ID = $activeSlave.ID + 1000>>
- <<if $familyTesting == 1>>
- <<else>>
- <<set $activeSlave.relation = "twin">>
- <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
- <</if>>
<<set $activeSlave.relationship = 2>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
<<case "identical herm pair">>
@@ -1252,11 +1090,6 @@
<<set $activeSlave.pregWeek = $activeSlave.preg>>
<<set $activeSlave.belly = 14000>>
<<set $activeSlave.bellyPreg = 14000>>
- <<if $familyTesting == 1>>
- <<else>>
- <<set $activeSlave.relation = "twin">>
- <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
- <</if>>
<<set $activeSlave.relationship = 4>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
<<case "desperate broodmother">>
@@ -1307,12 +1140,7 @@
<<set $activeSlave.scrotum = 3>>
<<set $activeSlave.prostate = 1>>
<<set $activeSlave.actualAge = 3>>
- <<if $familyTesting == 1>>
- <<set $activeSlave.mother = $activeSlave.ID - 1000>>
- <<else>>
- <<set $activeSlave.relation = "daughter">>
- <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
- <</if>>
+ <<set $activeSlave.mother = $activeSlave.ID - 1000>>
<<set $activeSlave.visualAge = $activeSlave.actualAge>>
<<set $activeSlave.physicalAge = $activeSlave.actualAge>>
<<set $activeSlave.ovaryAge = $activeSlave.actualAge>>
@@ -1371,12 +1199,7 @@
<<set $activeSlave.pregWeek = $activeSlave.preg>>
<<run SetBellySize($activeSlave)>>
<<set $activeSlave.actualAge = 3>>
- <<if $familyTesting == 1>>
- <<set $activeSlave.mother = $activeSlave.ID - 1000>>
- <<else>>
- <<set $activeSlave.relation = "daughter">>
- <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
- <</if>>
+ <<set $activeSlave.mother = $activeSlave.ID - 1000>>
<<set $activeSlave.visualAge = $activeSlave.actualAge>>
<<set $activeSlave.physicalAge = $activeSlave.actualAge>>
<<set $activeSlave.ovaryAge = $activeSlave.actualAge>>
@@ -1611,10 +1434,8 @@
<<switch $RecETSevent>>
<<case "addict mother daughter">>
<<link "Accept $his proposal and enslave $him">>
- <<set $activeSlave.relation = 0>>
- <<set $activeSlave.relationTarget = 0>>
- <<set $activeSlave.counter.oral += 1>>
- <<set $oralTotal += 1>>
+ <<set $activeSlave.counter.oral += 1>>
+ <<set $oralTotal += 1>>
<<run newSlave($activeSlave)>>
<<run cashX(forceNeg(_ContractCost), "slaveTransfer", $activeSlave)>>
<<replace "#result">>
@@ -1623,8 +1444,6 @@
<</link>>
<<case "posh mother daughter">>
<<link "Enslave the mother">>
- <<set $activeSlave.relation = 0>>
- <<set $activeSlave.relationTarget = 0>>
<<run newSlave($activeSlave)>>
<<run cashX(forceNeg(_ContractCost), "slaveTransfer", $activeSlave)>>
<<replace "#result">>
@@ -1635,8 +1454,6 @@
<<link "Enslave the sissy slut">>
<<set $activeSlave.mother = 0>>
<<set $activeSlave.father = 0>>
- <<set $activeSlave.relation = 0>>
- <<set $activeSlave.relationTarget = 0>>
<<set $activeSlave.rivalry = 0>>
<<set $activeSlave.rivalryTarget = 0>>
<<run newSlave($activeSlave)>>
@@ -1647,8 +1464,6 @@
<</link>>
<<case "desperate broodmother">>
<<link "Enslave the mother">>
- <<set $activeSlave.relation = 0>>
- <<set $activeSlave.relationTarget = 0>>
<<run newSlave($activeSlave)>>
<<run cashX(forceNeg(_ContractCost), "slaveTransfer", $activeSlave)>>
<<replace "#result">>
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index 59419b94c30..ea68967e36e 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -739,7 +739,7 @@
<</if>>
<</if>>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
- <<set _recruiterRelation = ($familyTesting === 1) ? randomAvailableRelatedSlave($slaves[$i]) : getSlave($slaves[$i].relationTarget)>>
+ <<set _recruiterRelation = randomAvailableRelatedSlave($slaves[$i])>>
<<if def _recruiterRelation>>
/* willingness; protip: relationship optional, and actual sex doesn't need to be allowed */
<<if ($slaves[$i].energy > 60 || $slaves[$i].sexualQuirk == "tease" || $slaves[$i].sexualQuirk == "perverted") && (_recruiterRelation.energy > 60 || _recruiterRelation.sexualQuirk == "tease" || _recruiterRelation.sexualQuirk == "perverted")>>
@@ -1113,53 +1113,29 @@
Dressed as $he is in the garments of a barbarian, the citizens of the New Rome ignore $him.
<</if>>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
- <<if $familyTesting == 1>>
- <<if totalRelatives($slaves[$i]) > 0>>
- <<if def _recruiterRelation>>
- <<setLocalPronouns _recruiterRelation 2>>
- <<set _relationType = relativeTerm($slaves[$i], _recruiterRelation)>>
- <<if $slaves[$i].energy > 60 || $slaves[$i].sexualQuirk == "tease" || $slaves[$i].sexualQuirk == "perverted">>
- <<if _recruiterRelation.energy > 60 || _recruiterRelation.sexualQuirk == "tease" || _recruiterRelation.sexualQuirk == "perverted">>
- $slaves[$i].slaveName and $his _relationType _recruiterRelation.slaveName collaborate on a series of short commercials showing them <<if canWalk($slaves[$i]) || canWalk(_recruiterRelation)>>walking and <</if>>playing in your arcology's public spaces. A little <<if hasAnyArms($slaves[$i]) || hasAnyArms(_recruiterRelation)>>hand on the ass<<else>>cuddling<</if>> here, a little lips almost touching there, and it's enough to tease your Ancient Egyptian sensibility about incest without running afoul of too many old world censors.
- <<elseif $slaves[$i].relationshipTarget == _recruiterRelation.ID>>
- Even though their incestuous relationship is not condemned here, $his _relationType _recruiterRelation.slaveName is too shy to act it out in front of the world.
- <<else>>
- The Ancient Egyptian sensibility of your arcology features slave incest, but your recruiter can't convince $his shy _relationType to play along for publicity.
- <</if>>
+ <<if totalRelatives($slaves[$i]) > 0>>
+ <<if def _recruiterRelation>>
+ <<setLocalPronouns _recruiterRelation 2>>
+ <<set _relationType = relativeTerm($slaves[$i], _recruiterRelation)>>
+ <<if $slaves[$i].energy > 60 || $slaves[$i].sexualQuirk == "tease" || $slaves[$i].sexualQuirk == "perverted">>
+ <<if _recruiterRelation.energy > 60 || _recruiterRelation.sexualQuirk == "tease" || _recruiterRelation.sexualQuirk == "perverted">>
+ $slaves[$i].slaveName and $his _relationType _recruiterRelation.slaveName collaborate on a series of short commercials showing them <<if canWalk($slaves[$i]) || canWalk(_recruiterRelation)>>walking and <</if>>playing in your arcology's public spaces. A little <<if hasAnyArms($slaves[$i]) || hasAnyArms(_recruiterRelation)>>hand on the ass<<else>>cuddling<</if>> here, a little lips almost touching there, and it's enough to tease your Ancient Egyptian sensibility about incest without running afoul of too many old world censors.
<<elseif $slaves[$i].relationshipTarget == _recruiterRelation.ID>>
- Even though $he shares a properly incestuous relationship with $his _relationType, $he is too shy to bring it on camera for the whole world.
+ Even though their incestuous relationship is not condemned here, $his _relationType _recruiterRelation.slaveName is too shy to act it out in front of the world.
<<else>>
- The Ancient Egyptian sensibility of your arcology features slave incest, but $he's too shy even to play-act with $his _relationType for publicity.
+ The Ancient Egyptian sensibility of your arcology features slave incest, but your recruiter can't convince $his shy _relationType to play along for publicity.
<</if>>
+ <<elseif $slaves[$i].relationshipTarget == _recruiterRelation.ID>>
+ Even though $he shares a properly incestuous relationship with $his _relationType, $he is too shy to bring it on camera for the whole world.
<<else>>
- One idea that comes up while brainstorming is to act out Ancient Egyptian incest with a family member, but all of them are confined and unavailable.
+ The Ancient Egyptian sensibility of your arcology features slave incest, but $he's too shy even to play-act with $his _relationType for publicity.
<</if>>
<<else>>
- One of the most prominent features of your Egyptian Revival is an open, even expectant, attitude toward slave incest, but $he doesn't have any close family living in your household.
+ One idea that comes up while brainstorming is to act out Ancient Egyptian incest with a family member, but all of them are confined and unavailable.
<</if>>
<<else>>
- <<if $slaves[$i].relation != 0 && (!(_recruiterRelation.assignment == "be your agent" || _recruiterRelation.assignment == "live with your agent"))>>
- <<if !isSlaveAvailable(_recruiterRelation)>>
- One idea that comes up while brainstorming is to act out Ancient Egyptian incest with $his _recruiterRelation.relation, but _recruiterRelation.slaveName is confined and unavailable.
- <<else>>
- <<if $slaves[$i].energy > 60 || $slaves[$i].sexualQuirk == "tease" || $slaves[$i].sexualQuirk == "perverted">>
- <<if _recruiterRelation.energy > 60 || _recruiterRelation.sexualQuirk == "tease" || _recruiterRelation.sexualQuirk == "perverted">>
- $slaves[$i].slaveName and $his _recruiterRelation.relation _recruiterRelation.slaveName collaborate on a series of short commercials showing them <<if canWalk($slaves[$i]) || canWalk(_recruiterRelation)>>walking and <</if>>playing in your arcology's public spaces. A little <<if hasAnyArms($slaves[$i]) || hasAnyArms(_recruiterRelation)>>hand on the ass<<else>>cuddling<</if>> here, a little lips almost touching there, and it's enough to tease your Ancient Egyptian sensibility about incest without running afoul of too many old world censors.
- <<elseif $slaves[$i].relationshipTarget == _recruiterRelation.ID>>
- Even though their incestuous relationship is not condemned here, $his _recruiterRelation.relation _recruiterRelation.slaveName is too shy to act it out in front of the world.
- <<else>>
- The Ancient Egyptian sensibility of your arcology features slave incest, but your recruiter can't convince $his shy _recruiterRelation.relation to play along for publicity.
- <</if>>
- <<elseif $slaves[$i].relationshipTarget == _recruiterRelation.ID>>
- Even though $he shares a properly incestuous relationship with $his _recruiterRelation.relation, $he is too shy to bring it on camera for the whole world.
- <<else>>
- The Ancient Egyptian sensibility of your arcology features slave incest, but $he's too shy even to playact with $his _recruiterRelation.relation for publicity.
- <</if>>
- <</if>>
- <<else>>
- One of the most prominent features of your Egyptian Revival is an open, even expectant, attitude toward slave incest, but $he doesn't have any close family living in your household.
- <</if>>
- <</if>> /*end extended family mode */
+ One of the most prominent features of your Egyptian Revival is an open, even expectant, attitude toward slave incest, but $he doesn't have any close family living in your household.
+ <</if>>
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
<<if $clubDecoration != "standard" && $ClubiIDs.length > 1>>
<<if _clubSeed >= 3>>
diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw
index ac9c3018dad..98ea14731b8 100644
--- a/src/uncategorized/saRelationships.tw
+++ b/src/uncategorized/saRelationships.tw
@@ -232,7 +232,7 @@
<</if>>
<<set _drop = 1>>
<</if>>
- <<if (_SlaveI.relationship > 0) || (_SlaveI.relation > 0)>>
+ <<if (_SlaveI.relationship > 0)>>
<<set _J = $slaveIndices[_SlaveI.relationshipTarget]>>
<<if def _J>>
<<set _SlaveJ = $slaves[_J], _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveJ.relationship = _SlaveI.relationship>>
@@ -934,64 +934,34 @@
<</if>> /% CLOSES RELATIONSHIP CHECK FOR LONG TERM RELATIONSHIP EFFECTS %/
/% FAMILY FEELINGS %/
- <<if $familyTesting == 1>>
- <<if totalRelatives(_SlaveI) > 0 && _SlaveI.trust <= 95>>
- <<set _relatives = $slaves.filter((s) => areRelated(_SlaveI, s))>>
- <<for _j = 0; _j < _relatives.length; _j++>>
- <<setLocalPronouns _relatives[_j] 2>>
- <<if _SlaveI.trust < -20>>
- <<if _SlaveI.rivalryTarget != _relatives[_j].ID>>
- <<if isParentP(_relatives[_j], _SlaveI)>>
- _SlaveI.slaveName is @@.gold;agonizingly aware@@ that $his child _relatives[_j].slaveName is also your slave and might suffer if either of them angers you, and @@.hotpink;does $his best@@ to protect _him2.
- <<set _SlaveI.trust -= 2, _SlaveI.devotion += 6>>
- <<else>>
- _SlaveI.slaveName is @@.gold;painfully conscious@@ that $his <<print relativeTerm(_SlaveI, _relatives[_j])>> _relatives[_j].slaveName is also your slave and might suffer if either of them displeases you, and @@.hotpink;tries to obey@@ as best $he can.
- <<set _SlaveI.trust -= 1, _SlaveI.devotion += 3>>
- <</if>>
- <</if>>
- <<else>>
- _SlaveI.slaveName knows that $his <<print relativeTerm(_SlaveI, _relatives[_j])>> _relatives[_j].slaveName
- <<if _relatives[_j].devotion > 50>>
- loves being your sex slave, and is @@.hotpink;happy@@ for _him2.
- <<set _SlaveI.devotion += 4>>
- <<elseif (_relatives[_j].devotion > 20) || (_relatives[_j].trust < -20)>>
- is an obedient sex slave, and hopes _he2'll avoid punishment.
+ <<if totalRelatives(_SlaveI) > 0 && _SlaveI.trust <= 95>>
+ <<set _relatives = $slaves.filter((s) => areRelated(_SlaveI, s))>>
+ <<for _j = 0; _j < _relatives.length; _j++>>
+ <<setLocalPronouns _relatives[_j] 2>>
+ <<if _SlaveI.trust < -20>>
+ <<if _SlaveI.rivalryTarget != _relatives[_j].ID>>
+ <<if isParentP(_relatives[_j], _SlaveI)>>
+ _SlaveI.slaveName is @@.gold;agonizingly aware@@ that $his child _relatives[_j].slaveName is also your slave and might suffer if either of them angers you, and @@.hotpink;does $his best@@ to protect _him2.
+ <<set _SlaveI.trust -= 2, _SlaveI.devotion += 6>>
<<else>>
- hates being a sex slave, and is @@.gold;afraid@@ for _him2.
- <<set _SlaveI.trust -= 1>>
+ _SlaveI.slaveName is @@.gold;painfully conscious@@ that $his <<print relativeTerm(_SlaveI, _relatives[_j])>> _relatives[_j].slaveName is also your slave and might suffer if either of them displeases you, and @@.hotpink;tries to obey@@ as best $he can.
+ <<set _SlaveI.trust -= 1, _SlaveI.devotion += 3>>
<</if>>
<</if>>
- <</for>>
- <</if>>
- <<else>>
- <<if _SlaveI.rivalryTarget != _SlaveI.relationTarget>>
- <<set _K = $slaveIndices[_SlaveI.relationTarget]>>
- <<if (def _K) && _SlaveI.trust <= 95>>
- <<setLocalPronouns $slaves[_K] 2>>
- _SlaveI.slaveName
- <<if _SlaveI.trust < -20>>
- <<if _SlaveI.relation == "daughter" || _SlaveI.relation == "son">>
- is @@.gold;agonizingly aware@@ that $his child $slaves[_K].slaveName is also your slave and might suffer if either of them angers you, and @@.hotpink;does $his best@@ to protect _him2.
- <<set _SlaveI.trust -= 4, _SlaveI.devotion += 4>>
- <<else>>
- is @@.gold;painfully conscious@@ that $his _SlaveI.relation $slaves[_K].slaveName is also your slave and might suffer if either of them displeases you, and @@.hotpink;tries to obey@@ as best $he can.
- <<set _SlaveI.trust -= 2, _SlaveI.devotion += 2>>
- <</if>>
+ <<else>>
+ _SlaveI.slaveName knows that $his <<print relativeTerm(_SlaveI, _relatives[_j])>> _relatives[_j].slaveName
+ <<if _relatives[_j].devotion > 50>>
+ loves being your sex slave, and is @@.hotpink;happy@@ for _him2.
+ <<set _SlaveI.devotion += 4>>
+ <<elseif (_relatives[_j].devotion > 20) || (_relatives[_j].trust < -20)>>
+ is an obedient sex slave, and hopes _he2'll avoid punishment.
<<else>>
- knows that $his _SlaveI.relation $slaves[_K].slaveName
- <<if $slaves[_K].devotion > 50>>
- loves being your sex slave, and is @@.hotpink;happy@@ for _him2.
- <<set _SlaveI.devotion += 2>>
- <<elseif ($slaves[_K].devotion > 20) || ($slaves[_K].trust < -20)>>
- is an obedient sex slave, and hopes $he'll avoid punishment.
- <<else>>
- hates being a sex slave, and is @@.gold;afraid@@ for _him2.
- <<set _SlaveI.trust -= 2>>
- <</if>>
+ hates being a sex slave, and is @@.gold;afraid@@ for _him2.
+ <<set _SlaveI.trust -= 1>>
<</if>>
<</if>>
- <</if>>
- <</if>> /* closes family mod */
+ <</for>>
+ <</if>>
<<set $slaves[$i] = _SlaveI>>
<<if _SlaveJ != null>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index e97817e4c52..fa7c74ae28c 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -1260,7 +1260,7 @@
<<else>>
<<set _lover = 0>>
<</if>>
- <<if _lover == 0 && $seeIncest == 1 && $familyTesting == 1>>
+ <<if _lover == 0 && $seeIncest == 1>>
<<set _famVisitor = randomRelatedSlave($slaves[$i], (s) => { return canWalk(s) && isSlaveAvailable(s) && App.Utils.sexAllowed($slaves[$i], s); } )>>
<</if>>
<<if $slaves[$i].devotion < -50>>
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index 97400193cf1..51ce4fefb42 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -670,15 +670,6 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
<<set _winner.devotion -= 50>>
<</if>>
<</switch>>
- <<elseif (_winner.relation != 0) && (_loser.ID == _winner.relationTarget)>>
- <<if (_winner.devotion > 95)>>
- $He is so worshipful of you that $he sees the death of $his <<print relativeTerm(_winner, _loser)>> at $his own hand as an @@.hotpink;honorable@@ end to their doomed family.
- <<set _winner.devotion += 4>>
- <<else>>
- $He shows little reaction to the death of $his <<print relativeTerm(_winner, _loser)>> at $his own hand. In the coming days, it becomes clear that this is because $he is @@.red;no longer capable@@ of reacting to anything on an emotional level. Ever again.
- <<set _winner.fetish = "mindbroken">>
- <<set _winner.fetishKnown = 1>>
- <</if>>
<</if>>
<<else>> /*if fighting an animal*/
<<if _winner == _fighterOne>> /*if slave wins*/
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 92a514128c5..dd339cdebaa 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -88,9 +88,7 @@
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Rules')" id="tab Rules">Rules</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Financial')" id="tab Financial">Financial</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Customize'), App.UI.SlaveInteract.custom(getSlave(V.activeSlave.ID))" id="tab Customize">Customize</button>
- <<if $familyTesting == 1>>
- <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'FamilyTab'), renderFamilyTree(V.slaves, V.activeSlave.ID)" id="tab FamilyTab">Family</button>
- <</if>>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'FamilyTab'), renderFamilyTree(V.slaves, V.activeSlave.ID)" id="tab FamilyTab">Family</button>
</div>
<div id="artFrame">
@@ -685,11 +683,9 @@
<div id="FamilyTab" class="tabcontent">
<div class="content">
- <<if $familyTesting == 1>>
- <p id="family">
- <div id="familyTree"></div>
- <span id="familyTreeLink"></span>
- </p>
- <</if>>
+ <p id="family">
+ <div id="familyTree"></div>
+ <span id="familyTreeLink"></span>
+ </p>
</div>
</div>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index 88b2b92183c..4d2d6cb79cf 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -16,62 +16,49 @@
<<set $boomerangSlave = clone($activeSlave), $boomerangWeeks = 1, $boomerangBuyer = $buyer>>
<<set $boomerangSlave.assignment = "rest">>
<<set $boomerangStats = {PCpregSource: 0, PCmother: 0, PCfather: 0, boomerangMother: [], boomerangFather: [], boomerangPregSources: [], boomerangMotherTank: [], boomerangFatherTank: [], boomerangRelationship: 0, boomerangRivalry: 0, boomerangRelation: 0, boomerangBody: 0}>>
- <<if $familyTesting == 1>>
- <<if $activeSlave.ID == $PC.pregSource>>
- <<set $boomerangStats.PCpregSource = $activeSlave.ID>>
- <</if>>
- <<if $PC.mother == $activeSlave.ID>>
- <<set $boomerangStats.PCmother = $activeSlave.ID>>
- <</if>>
- <<if $PC.father == $activeSlave.ID>>
- <<set $boomerangStats.PCfather = $activeSlave.ID>>
+ <<if $activeSlave.ID == $PC.pregSource>>
+ <<set $boomerangStats.PCpregSource = $activeSlave.ID>>
+ <</if>>
+ <<if $PC.mother == $activeSlave.ID>>
+ <<set $boomerangStats.PCmother = $activeSlave.ID>>
+ <</if>>
+ <<if $PC.father == $activeSlave.ID>>
+ <<set $boomerangStats.PCfather = $activeSlave.ID>>
+ <</if>>
+ <<for _ss = 0; _ss < $slaves.length; _ss++>>
+ <<if $slaves[_ss].ID != $activeSlave.ID>>
+ <<if $slaves[_ss].mother == $activeSlave.ID>>
+ <<set $boomerangStats.boomerangMother.push($slaves[_ss].ID)>>
+ <</if>>
+ <<if $slaves[_ss].father == $activeSlave.ID>>
+ <<set $boomerangStats.boomerangFather.push($slaves[_ss].ID)>>
+ <</if>>
+ <<if $activeSlave.ID == $slaves[_ss].pregSource>>
+ <<set $boomerangStats.boomerangPregSources.push($slaves[_ss].ID)>>
+ <</if>>
<</if>>
- <<for _ss = 0; _ss < $slaves.length; _ss++>>
- <<if $slaves[_ss].ID != $activeSlave.ID>>
- <<if $slaves[_ss].mother == $activeSlave.ID>>
- <<set $boomerangStats.boomerangMother.push($slaves[_ss].ID)>>
- <</if>>
- <<if $slaves[_ss].father == $activeSlave.ID>>
- <<set $boomerangStats.boomerangFather.push($slaves[_ss].ID)>>
- <</if>>
- <<if $activeSlave.ID == $slaves[_ss].pregSource>>
- <<set $boomerangStats.boomerangPregSources.push($slaves[_ss].ID)>>
- <</if>>
+ <</for>>
+ <<if $incubator > 0>>
+ <<for _z = 0; _z < $tanks.length; _z++>>
+ <<if $activeSlave.ID == $tanks[_z].mother>>
+ <<set $boomerangStats.boomerangMotherTank.push($slaves[_z].ID)>>
+ <</if>>
+ <<if $activeSlave.ID == $tanks[_z].father>>
+ <<set $boomerangStats.boomerangFatherTank.push($slaves[_z].ID)>>
<</if>>
<</for>>
- <<if $incubator > 0>>
- <<for _z = 0; _z < $tanks.length; _z++>>
- <<if $activeSlave.ID == $tanks[_z].mother>>
- <<set $boomerangStats.boomerangMotherTank.push($slaves[_z].ID)>>
- <</if>>
- <<if $activeSlave.ID == $tanks[_z].father>>
- <<set $boomerangStats.boomerangFatherTank.push($slaves[_z].ID)>>
- <</if>>
- <</for>>
- <</if>>
- <<if $nursery > 0>>
- <<for _z = 0; _z < $cribs.length; _z++>>
- <<if $activeSlave.ID == $cribs[_z].mother>>
- <<set $boomerangStats.boomerangMotherTank.push($slaves[_z].ID)>>
- <</if>>
- <<if $activeSlave.ID == $cribs[_z].father>>
- <<set $boomerangStats.boomerangFatherTank.push($slaves[_z].ID)>>
- <</if>>
- <</for>>
- <</if>>
- <<set $boomerangSlave.sisters = 0, $boomerangSlave.daughters = 0>>
- <<else>>
- <<if $activeSlave.relation != 0>>
- <<set $boomerangStats.boomerangRelation = $activeSlave.relationTarget>>
- <</if>>
- <<for _ss = 0; _ss < $slaves.length; _ss++>>
- <<if $slaves[_ss].ID != $activeSlave.ID>>
- <<if $activeSlave.ID == $slaves[_ss].pregSource>>
- <<set $boomerangStats.boomerangPregSources.push($slaves[_ss].ID)>>
- <</if>>
+ <</if>>
+ <<if $nursery > 0>>
+ <<for _z = 0; _z < $cribs.length; _z++>>
+ <<if $activeSlave.ID == $cribs[_z].mother>>
+ <<set $boomerangStats.boomerangMotherTank.push($slaves[_z].ID)>>
+ <</if>>
+ <<if $activeSlave.ID == $cribs[_z].father>>
+ <<set $boomerangStats.boomerangFatherTank.push($slaves[_z].ID)>>
<</if>>
<</for>>
<</if>>
+ <<set $boomerangSlave.sisters = 0, $boomerangSlave.daughters = 0>>
<<if $activeSlave.relationship > 0>>
<<set $boomerangStats.boomerangRelationship = $activeSlave.relationshipTarget>>
<</if>>
@@ -93,56 +80,43 @@
<</if>>
<</if>>
-<<if $familyTesting == 1>>
- <<for _ss = 0; _ss < $slaves.length; _ss++>>
- <<setLocalPronouns $slaves[_ss] 2>>
- <<if $activeSlave.mother == $slaves[_ss].ID>>
- $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 $daughter.
- <br><br>
- <<set $slaves[_ss].devotion -= 20>>
- <</if>>
- <<if $activeSlave.father == $slaves[_ss].ID>>
- $slaves[_ss].slaveName is @@.mediumorchid;disappointed@@ that you are selling _his2 $daughter.
- <br><br>
- <<set $slaves[_ss].devotion -= 10>>
- <</if>>
- <<if $activeSlave.ID == $slaves[_ss].father>>
- $slaves[_ss].slaveName is @@.mediumorchid;saddened@@ that you are selling _his2 father.
- <br><br>
- <<set $slaves[_ss].devotion -= 10>>
- <</if>>
- <<if $activeSlave.ID == $slaves[_ss].mother>>
- $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 mother.
- <br><br>
- <<set $slaves[_ss].devotion -= 20>>
- <</if>>
- <<switch areSisters($activeSlave, $slaves[_ss])>>
- <<case 1>>
- $slaves[_ss].slaveName is @@.mediumorchid;devastated@@ that you are selling _his2 twin.
- <br><br>
- <<set $slaves[_ss].devotion -= 30>>
- <<case 2>>
- $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 $sister.
- <br><br>
- <<set $slaves[_ss].devotion -= 20>>
- <<case 3>>
- $slaves[_ss].slaveName is @@.mediumorchid;disheartened@@ that you are selling _his2 half-<<= $sister>>.
- <br><br>
- <<set $slaves[_ss].devotion -= 10>>
- <</switch>>
- <</for>>
-<<else>>
- <<if $activeSlave.relation != 0>>
- <<set _ss = $slaveIndices[$activeSlave.relationTarget]>>
- <<if (def _ss) && $slaves[_ss].fetish != "mindbroken">>
- <<setLocalPronouns $slaves[_ss] 2>>
- $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 $activeSlave.relation.
- <br><br>
- <<set $slaves[_ss].devotion -= 20>>
- <<set $display = 1>>
- <</if>>
+<<for _ss = 0; _ss < $slaves.length; _ss++>>
+ <<setLocalPronouns $slaves[_ss] 2>>
+ <<if $activeSlave.mother == $slaves[_ss].ID>>
+ $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 $daughter.
+ <br><br>
+ <<set $slaves[_ss].devotion -= 20>>
<</if>>
-<</if>>
+ <<if $activeSlave.father == $slaves[_ss].ID>>
+ $slaves[_ss].slaveName is @@.mediumorchid;disappointed@@ that you are selling _his2 $daughter.
+ <br><br>
+ <<set $slaves[_ss].devotion -= 10>>
+ <</if>>
+ <<if $activeSlave.ID == $slaves[_ss].father>>
+ $slaves[_ss].slaveName is @@.mediumorchid;saddened@@ that you are selling _his2 father.
+ <br><br>
+ <<set $slaves[_ss].devotion -= 10>>
+ <</if>>
+ <<if $activeSlave.ID == $slaves[_ss].mother>>
+ $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 mother.
+ <br><br>
+ <<set $slaves[_ss].devotion -= 20>>
+ <</if>>
+ <<switch areSisters($activeSlave, $slaves[_ss])>>
+ <<case 1>>
+ $slaves[_ss].slaveName is @@.mediumorchid;devastated@@ that you are selling _his2 twin.
+ <br><br>
+ <<set $slaves[_ss].devotion -= 30>>
+ <<case 2>>
+ $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 $sister.
+ <br><br>
+ <<set $slaves[_ss].devotion -= 20>>
+ <<case 3>>
+ $slaves[_ss].slaveName is @@.mediumorchid;disheartened@@ that you are selling _his2 half-<<= $sister>>.
+ <br><br>
+ <<set $slaves[_ss].devotion -= 10>>
+ <</switch>>
+<</for>>
<<if $activeSlave.relationship > 0>>
<<set _ss = $slaveIndices[$activeSlave.relationshipTarget]>>
<<if (def _ss) && $slaves[_ss].fetish != "mindbroken">>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index f83d91f1d75..f3138c83028 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -129,37 +129,25 @@ As the remote surgery's long recovery cycle completes,
<<switch $surgeryType>>
<<case "fuckdoll">>
<<run App.Utils.setLocalPronouns(getSlave($AS))>>
- <<if $familyTesting == 1>>
- <<set _rels = $slaves.filter((s) => areRelated(s, getSlave($AS)) && !(s.ID === getSlave($AS).relationshipTarget))>>
- <<for _rel range _rels>>
- <<setLocalPronouns _rel 2>>
- <<if isParentP(getSlave($AS), _rel) || isParentP(_rel, getSlave($AS))>>
- _rel.slaveName will be @@.mediumorchid;horrified@@ and @@.gold;afraid@@ when _he2 finds out that _his2 <<print relativeTerm(_rel, getSlave($AS))>> is now a Fuckdoll.
- <<set _rel.devotion -= 40, _rel.trust -= 40>>
- <</if>>
- <<switch areSisters(getSlave($AS), _rel)>>
- <<case 1>>
- _rel.slaveName will be @@.mediumorchid;horrified@@ and @@.gold;afraid@@ when _he2 finds out that _his2 twin is now a Fuckdoll. Is _he2 next?
- <<set _rel.devotion -= 50, _rel.trust -= 50>>
- <<case 2>>
- _rel.slaveName will be @@.mediumorchid;horrified@@ and @@.gold;afraid@@ when _he2 finds out that _his2 $sister is now a Fuckdoll.
- <<set _rel.devotion -= 40, _rel.trust -= 40>>
- <<case 3>>
- _rel.slaveName will be @@.mediumorchid;horrified@@ and @@.gold;afraid@@ when _he2 finds out that _his2 half-<<= $sister>> is now a Fuckdoll.
- <<set _rel.devotion -= 30,_rel.trust -= 30>>
- <</switch>>
- <</for>>
- <<else>>
- <<if getSlave($AS).relation != 0>>
- <<set $j = $slaveIndices[getSlave($AS).relationTarget]>>
- <<if def $j>>
- <<setLocalPronouns $slaves[$j] 2>>
- $slaves[$j].slaveName will be @@.mediumorchid;horrified@@ and @@.gold;afraid@@ when _he2 finds out that _his2 <<= getSlave($AS).relation>> is now a Fuckdoll.
- <<set $slaves[$j].devotion -= 40>>
- <<set $slaves[$j].trust -= 40>>
- <</if>>
- <</if>>
- <</if>> /*closes extended family mode */
+ <<set _rels = $slaves.filter((s) => areRelated(s, getSlave($AS)) && !(s.ID === getSlave($AS).relationshipTarget))>>
+ <<for _rel range _rels>>
+ <<setLocalPronouns _rel 2>>
+ <<if isParentP(getSlave($AS), _rel) || isParentP(_rel, getSlave($AS))>>
+ _rel.slaveName will be @@.mediumorchid;horrified@@ and @@.gold;afraid@@ when _he2 finds out that _his2 <<print relativeTerm(_rel, getSlave($AS))>> is now a Fuckdoll.
+ <<set _rel.devotion -= 40, _rel.trust -= 40>>
+ <</if>>
+ <<switch areSisters(getSlave($AS), _rel)>>
+ <<case 1>>
+ _rel.slaveName will be @@.mediumorchid;horrified@@ and @@.gold;afraid@@ when _he2 finds out that _his2 twin is now a Fuckdoll. Is _he2 next?
+ <<set _rel.devotion -= 50, _rel.trust -= 50>>
+ <<case 2>>
+ _rel.slaveName will be @@.mediumorchid;horrified@@ and @@.gold;afraid@@ when _he2 finds out that _his2 $sister is now a Fuckdoll.
+ <<set _rel.devotion -= 40, _rel.trust -= 40>>
+ <<case 3>>
+ _rel.slaveName will be @@.mediumorchid;horrified@@ and @@.gold;afraid@@ when _he2 finds out that _his2 half-<<= $sister>> is now a Fuckdoll.
+ <<set _rel.devotion -= 30,_rel.trust -= 30>>
+ <</switch>>
+ <</for>>
<<if getSlave($AS).relationship > 0>>
<<set $j = $slaveIndices[getSlave($AS).relationshipTarget]>>
<<if def $j>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 31bc4c6554b..45eb57b52fa 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -41,7 +41,7 @@
<<if $PC.career != "engineer">>
<br>
<<link "Add this slave">>
- <<set $returnTo = "Commit Starting Girl", $createRelatedSlave = 0, $applyCareerBonus = 1, $careerBonusApplied = 0>>
+ <<set $returnTo = "Commit Starting Girl", $applyCareerBonus = 1, $careerBonusApplied = 0>>
<<set _slaveCost = startingSlaveCost($activeSlave)>>
<<run cashX(forceNeg(_slaveCost), "slaveTransfer", $activeSlave)>>
<<goto "RG AS Dump">>
@@ -72,7 +72,7 @@
<</if>>//
<br>
<<link "Add slave without career bonus">>
- <<set $returnTo = "Commit Starting Girl", $createRelatedSlave = 0, $applyCareerBonus = 0, $careerBonusApplied = 0>>
+ <<set $returnTo = "Commit Starting Girl", $applyCareerBonus = 0, $careerBonusApplied = 0>>
<<set _slaveCost = startingSlaveCost($activeSlave)>>
<<run cashX(forceNeg(_slaveCost), "slaveTransfer", $activeSlave)>>
<<goto "RG AS Dump">>
@@ -80,7 +80,7 @@
<<else>>
<br>
<<link "Add slave">>
- <<set $returnTo = "Commit Starting Girl", $createRelatedSlave = 0, $applyCareerBonus = 0, $careerBonusApplied = 0>>
+ <<set $returnTo = "Commit Starting Girl", $applyCareerBonus = 0, $careerBonusApplied = 0>>
<<set _slaveCost = startingSlaveCost($activeSlave)>>
<<run cashX(forceNeg(_slaveCost), "slaveTransfer", $activeSlave)>>
<<goto "RG AS Dump">>
--
GitLab