From 94d0dabb803922fae8e7d15424204f69431d28bd Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Mon, 13 Apr 2020 21:33:00 -0700
Subject: [PATCH] Purge newly-introduced LFM code from merge
---
src/js/extendedFamilyModeJS.js | 16 +++----
src/js/generateRelatedSlave.js | 14 +-----
src/npc/startingGirls/commitStartingGirl.tw | 48 +++++----------------
3 files changed, 20 insertions(+), 58 deletions(-)
diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js
index e893316657e..11930ccaa14 100644
--- a/src/js/extendedFamilyModeJS.js
+++ b/src/js/extendedFamilyModeJS.js
@@ -497,14 +497,12 @@ window.resetFamilyCounters = function() {
window.setMissingParents = function(slave) {
function untraceableParentID(ID) { return ID === 0 || (ID < -1 && ID >= -20 && ID !== -3); }
- if (V.familyTesting === 1) {
- if (untraceableParentID(slave.mother)) {
- slave.mother = V.missingParentID;
- V.missingParentID--;
- }
- if (untraceableParentID(slave.father)) {
- slave.father = V.missingParentID;
- V.missingParentID--;
- }
+ if (untraceableParentID(slave.mother)) {
+ slave.mother = V.missingParentID;
+ V.missingParentID--;
+ }
+ if (untraceableParentID(slave.father)) {
+ slave.father = V.missingParentID;
+ V.missingParentID--;
}
};
diff --git a/src/js/generateRelatedSlave.js b/src/js/generateRelatedSlave.js
index be51bc64bfb..e29472e48c2 100644
--- a/src/js/generateRelatedSlave.js
+++ b/src/js/generateRelatedSlave.js
@@ -108,11 +108,6 @@ window.generateRelatedSlave = (function() {
* @param {App.Entity.SlaveState} slave - the new sibling
*/
function makeOlderSibling(slave) {
- if (!V.familyTesting) {
- slave.relation = "sister";
- slave.relationTarget = sourceID;
- }
-
// increase age
const maxDifference = (V.retirementAge - 1) - slave.actualAge;
const ageDifference = Math.min(random(2, 6), maxDifference);
@@ -167,13 +162,8 @@ window.generateRelatedSlave = (function() {
* @param {App.Entity.SlaveState} slave - the new parent
*/
function makeParent(slave) {
- if (!V.familyTesting) {
- slave.relation = "mother"; // no fathers without family testing
- slave.relationTarget = sourceID;
- } else {
- slave.mother = 0;
- slave.father = 0;
- }
+ slave.mother = 0;
+ slave.father = 0;
// select age
const childAge = slave.actualAge;
diff --git a/src/npc/startingGirls/commitStartingGirl.tw b/src/npc/startingGirls/commitStartingGirl.tw
index 122e48bb76e..107479cde5d 100644
--- a/src/npc/startingGirls/commitStartingGirl.tw
+++ b/src/npc/startingGirls/commitStartingGirl.tw
@@ -24,46 +24,33 @@
<<set $activeSlave = clone($activeSlave)>>
<<set $activeSlave.ID = generateSlaveID()>>
<<run nationalityToName($activeSlave), randomizeUnknowns($activeSlave)>>
- <<if $familyTesting == 1>>
- <<set $activeSlave.mother = 0, $activeSlave.father = 0>>
- <<else>>
- <<set $activeSlave.relation = 0, $activeSlave.relationTarget = 0>>
- <</if>>
+ <<set $activeSlave.mother = 0, $activeSlave.father = 0>>
<<goto "Starting Girls">>
<</link>>
- <<if ($familyTesting === 1) || ($activeSlave.relation === 0)>>
+ <<if $activeSlave.relation === 0>>
<<set _srcID = $activeSlave.ID>>
<br>
//Add another slave, related to the previous slave://
<div class="indent">
<<link "Twin">>
- <<if $familyTesting == 1>>
- <<run setMissingParents(getSlave(_srcID))>>
- <</if>>
+ <<run setMissingParents(getSlave(_srcID))>>
<<set $activeSlave = generateRelatedSlave(getSlave(_srcID), "twin")>>
<<run randomizeUnknowns($activeSlave)>>
- <<if $familyTesting != 1>>
- <<set getSlave(_srcID).relation = "twin", getSlave(_srcID).relationTarget = $activeSlave.ID>>
- <</if>>
<<goto "Starting Girls">>
<</link>>
</div>
<<if $activeSlave.actualAge + $minimumSlaveAge < $retirementAge - 1>>
- <<if $seeDicks !== 100 && ($familyTesting === 0 || $activeSlave.mother === 0)>>
+ <<if $seeDicks !== 100 && $activeSlave.mother === 0>>
<div class="indent">
<<link "Mother">>
<<set $activeSlave = generateRelatedSlave(getSlave(_srcID), "parent", getSlave(_srcID).genes === "XY")>>
<<run randomizeUnknowns($activeSlave)>>
- <<if $familyTesting === 1>>
- <<set getSlave(_srcID).mother = $activeSlave.ID>>
- <<else>>
- <<set getSlave(_srcID).relation = "daughter", getSlave(_srcID).relationTarget = $activeSlave.ID>>
- <</if>>
+ <<set getSlave(_srcID).mother = $activeSlave.ID>>
<<goto "Starting Girls">>
<</link>>
</div>
<</if>>
- <<if $familyTesting === 1 && $seeDicks !== 0 && $activeSlave.father === 0>>
+ <<if $seeDicks !== 0 && $activeSlave.father === 0>>
<div class="indent">
<<link "Father">>
<<set $activeSlave = generateRelatedSlave(getSlave(_srcID), "parent", getSlave(_srcID).genes === "XX")>>
@@ -78,19 +65,14 @@
<<if $seeDicks !== 100>>
<div class="indent">
<<link "Older Sister">>
- <<if $familyTesting == 1>>
- <<run setMissingParents(getSlave(_srcID))>>
- <</if>>
+ <<run setMissingParents(getSlave(_srcID))>>
<<set $activeSlave = generateRelatedSlave(getSlave(_srcID), "older sibling", getSlave(_srcID).genes === "XY")>>
<<run randomizeUnknowns($activeSlave)>>
- <<if $familyTesting != 1>>
- <<set getSlave(_srcID).relation = "sister", getSlave(_srcID).relationTarget = $activeSlave.ID>>
- <</if>>
<<goto "Starting Girls">>
<</link>>
</div>
<</if>>
- <<if $familyTesting === 1 && $seeDicks !== 0>>
+ <<if $seeDicks !== 0>>
<div class="indent">
<<link "Older Brother">>
<<run setMissingParents(getSlave(_srcID))>>
@@ -105,19 +87,14 @@
<<if $seeDicks !== 100>>
<div class="indent">
<<link "Younger Sister">>
- <<if $familyTesting == 1>>
- <<run setMissingParents(getSlave(_srcID))>>
- <</if>>
+ <<run setMissingParents(getSlave(_srcID))>>
<<set $activeSlave = generateRelatedSlave(getSlave(_srcID), "younger sibling", getSlave(_srcID).genes === "XY")>>
<<run randomizeUnknowns($activeSlave)>>
- <<if $familyTesting != 1>>
- <<set getSlave(_srcID).relation = "sister", getSlave(_srcID).relationTarget = $activeSlave.ID>>
- <</if>>
<<goto "Starting Girls">>
<</link>>
</div>
<</if>>
- <<if $familyTesting === 1 && $seeDicks !== 0>>
+ <<if $seeDicks !== 0>>
<div class="indent">
<<link "Younger Brother">>
<<run setMissingParents(getSlave(_srcID))>>
@@ -134,14 +111,11 @@
<<link "Daughter">>
<<set $activeSlave = generateRelatedSlave(getSlave(_srcID), "child", getSlave(_srcID).genes === "XY")>>
<<run randomizeUnknowns($activeSlave)>>
- <<if $familyTesting != 1>>
- <<set getSlave(_srcID).relation = "mother", getSlave(_srcID).relationTarget = $activeSlave.ID>>
- <</if>>
<<goto "Starting Girls">>
<</link>>
</div>
<</if>>
- <<if $familyTesting === 1 && $seeDicks !== 0>>
+ <<if $seeDicks !== 0>>
<div class="indent">
<<link "Son">>
<<set $activeSlave = generateRelatedSlave(getSlave(_srcID), "child", getSlave(_srcID).genes === "XX")>>
--
GitLab