From 476b98640286b58884878c4ec2f17d4bdd385234 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Tue, 15 Dec 2020 10:20:09 -0500
Subject: [PATCH] apply
---
src/npc/startingGirls/editFamily.js | 79 +++++++++++++-------------
src/npc/startingGirls/startingGirls.tw | 2 +-
2 files changed, 40 insertions(+), 41 deletions(-)
diff --git a/src/npc/startingGirls/editFamily.js b/src/npc/startingGirls/editFamily.js
index 05fb3497ee0..a5532fc317a 100644
--- a/src/npc/startingGirls/editFamily.js
+++ b/src/npc/startingGirls/editFamily.js
@@ -19,16 +19,22 @@ App.Intro.editFamily = function(slave) {
}
editFamily.append(familyTable);
editFamily.append(makeElWithID("family-tree"));
+ el.append(editFamily);
+ const familySummary = makeElWithID("familySummary");
+ $(familySummary).append(App.Desc.family(slave));
+ el.append(familySummary);
+
+ return el;
function mother() {
- const div = new DocumentFragment();
+ const div = document.createElement("div");
const linkArray = [];
div.append("Mother: ");
- const nameEl = makeElWithID("motherName");
- nameEl.append(parentName("mother"));
+ const nameEl = makeElWithID("motherName", "span");
+ nameEl.append(parentName("mother"), " ");
div.append(nameEl);
linkArray.push(
@@ -73,13 +79,13 @@ App.Intro.editFamily = function(slave) {
}
function father() {
- const div = new DocumentFragment();
+ const div = document.createElement("div");
const linkArray = [];
div.append("Father: ");
- const nameEl = makeElWithID("fatherName");
- nameEl.append(parentName("father"));
+ const nameEl = makeElWithID("fatherName", "span");
+ nameEl.append(parentName("father"), " ");
div.append(nameEl);
linkArray.push(
@@ -124,15 +130,15 @@ App.Intro.editFamily = function(slave) {
}
function sameMotherAs() {
- const div = new DocumentFragment();
+ const div = document.createElement("div");
const linkArray = [];
- const nameEl = makeElWithID("sameMotherNames");
- nameEl.append(App.StartingGirls.listOfSlavesWithParent('mother', slave.mother));
- div.append(nameEl);
-
div.append("Same mother as: ");
+ const nameEl = makeElWithID("sameMotherNames", "span");
+ nameEl.append(App.StartingGirls.listOfSlavesWithParent('mother', slave.mother), " ");
+ div.append(nameEl);
+
linkArray.push(
App.UI.DOM.link(
"Reset",
@@ -186,14 +192,15 @@ App.Intro.editFamily = function(slave) {
}
function sameFatherAs() {
- const div = new DocumentFragment();
+ const div = document.createElement("div");
const linkArray = [];
- const nameEl = makeElWithID("sameFatherNames");
- nameEl.append(App.StartingGirls.listOfSlavesWithParent('father', slave.father));
+ div.append("Same father as: ");
+
+ const nameEl = makeElWithID("sameFatherNames", "span");
+ nameEl.append(App.StartingGirls.listOfSlavesWithParent('father', slave.father), " ");
div.append(nameEl);
- div.append("Same father as: ");
linkArray.push(
App.UI.DOM.link(
@@ -216,7 +223,7 @@ App.Intro.editFamily = function(slave) {
)
);
}
-
+debugger;
for (const potentialRel of V.slaves) {
if (canBeDad(potentialRel) && ((potentialRel.actualAge - slave.actualAge) >= potentialRel.pubertyAgeXY) && potentialRel.newGamePlus === 0) {
linkArray.push(
@@ -248,15 +255,15 @@ App.Intro.editFamily = function(slave) {
}
function motherOfTheChildren() {
- const div = new DocumentFragment();
+ const div = document.createElement("div");
const linkArray = [];
- const nameEl = makeElWithID("motheredNames");
- nameEl.append(App.StartingGirls.listOfSlavesWithParent("mother", slave.ID));
- div.append(nameEl);
-
div.append("Mother of the children: ");
+ const nameEl = makeElWithID("motheredNames", "span");
+ nameEl.append(App.StartingGirls.listOfSlavesWithParent("mother", slave.ID), " ");
+ div.append(nameEl);
+
linkArray.push(
App.UI.DOM.link(
"Reset",
@@ -315,15 +322,15 @@ App.Intro.editFamily = function(slave) {
}
function fatherOfTheChildren() {
- const div = new DocumentFragment();
+ const div = document.createElement("div");
const linkArray = [];
- const nameEl = makeElWithID("fatheredNames");
- nameEl.append(App.StartingGirls.listOfSlavesWithParent("father", slave.ID));
- div.append(nameEl);
-
div.append("Father of the children: ");
+ const nameEl = makeElWithID("fatheredNames", "span");
+ nameEl.append(App.StartingGirls.listOfSlavesWithParent("father", slave.ID), " ");
+ div.append(nameEl);
+
linkArray.push(
App.UI.DOM.link(
"Reset",
@@ -431,20 +438,12 @@ App.Intro.editFamily = function(slave) {
);
}
-
function makeElWithID(id, elType = "div") {
const el = document.createElement(elType);
el.id = id;
return el;
}
- const familySummary = makeElWithID("familySummary");
- familySummary.append(App.Desc.family(slave));
- el.append(familySummary);
-
-
- return el;
-
/**
*
* @param {string} rel "mother", etc. Property of slave object.
@@ -460,13 +459,13 @@ App.Intro.editFamily = function(slave) {
function refresh() {
jQuery('#dont-be-dumb').empty().append(App.UI.DOM.makeElement("div", "You will break things by making impossible relations such as being your own father. If you do this, clearing all PC relations will fix it. Probably.", "note"));
- jQuery('#fatheredNames').empty().append(App.StartingGirls.listOfSlavesWithParent("father", slave.ID));
- jQuery('#motheredNames').empty().append(App.StartingGirls.listOfSlavesWithParent("mother", slave.ID));
+ jQuery('#fatheredNames').empty().append(App.StartingGirls.listOfSlavesWithParent("father", slave.ID), " ");
+ jQuery('#motheredNames').empty().append(App.StartingGirls.listOfSlavesWithParent("mother", slave.ID), " ");
jQuery('#familySummary').empty().append(App.Desc.family(slave));
- jQuery('#motherName').empty().append(parentName("mother"));
- jQuery('#fatherName').empty().append(parentName("father"));
- jQuery('#sameMotherNames').empty().append(App.StartingGirls.listOfSlavesWithParent("mother", slave.mother));
- jQuery('#sameFatherNames').empty().append(App.StartingGirls.listOfSlavesWithParent("father", slave.father));
+ jQuery('#motherName').empty().append(parentName("mother"), " ");
+ jQuery('#fatherName').empty().append(parentName("father"), " ");
+ jQuery('#sameMotherNames').empty().append(App.StartingGirls.listOfSlavesWithParent("mother", slave.mother), " ");
+ jQuery('#sameFatherNames').empty().append(App.StartingGirls.listOfSlavesWithParent("father", slave.father), " ");
App.StartingGirls.uncommittedFamilyTree(slave);
}
};
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index d6725d87aad..0cabf80ab67 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -894,7 +894,7 @@
<div id="Family" class="tab-content">
<div class="content">
- <<editFamily>>
+ <<includeDOM App.Intro.editFamily($activeSlave)>>
</div>
</div>
--
GitLab