diff --git a/src/npc/generate/newChildIntro.js b/src/npc/generate/newChildIntro.js index 829f9809ee19b39b54bf6305788aaecc6a096590..17b7749c466772903b99f592ca513a4dcc4ad35d 100644 --- a/src/npc/generate/newChildIntro.js +++ b/src/npc/generate/newChildIntro.js @@ -1,7 +1,7 @@ /** * @param {App.Entity.SlaveState} slave */ -App.UI.newChildIntro = function(slave, slave2, familyStatus = true) { +App.UI.newChildIntro = function(slave) { const { His, He, his, him, he, girl, hers, himself, daughter } = getPronouns(slave); @@ -886,7 +886,7 @@ App.UI.newChildIntro = function(slave, slave2, familyStatus = true) { slave, null, { - isChild: familyStatus, + tankBorn: true, momInterest: momInterest, dadInterest: dadInterest } diff --git a/src/npc/generate/newSlaveIntro.js b/src/npc/generate/newSlaveIntro.js index f17b557b424e7d9d4d530204e5615d69dc91d17f..30d38c6059bb2cb6fd0466c6605c9ddb42ad1ea7 100644 --- a/src/npc/generate/newSlaveIntro.js +++ b/src/npc/generate/newSlaveIntro.js @@ -3,9 +3,8 @@ * @param {App.Entity.SlaveState} [slave2] recruiter slave, if present in the scene * @returns {DocumentFragment} */ -App.UI.newSlaveIntro = function(slave, slave2, familyStatus = {isChild: false}) { +App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest = null, dadInterest = null} = {}) { const desc = SlaveTitle(slave); - const tankBorn = familyStatus.isChild; const {title: Master} = getEnunciation(slave); const { His, He, his, him, he, girl, hers, himself, daughter @@ -23,7 +22,7 @@ App.UI.newSlaveIntro = function(slave, slave2, familyStatus = {isChild: false}) modSetup(); - if (!familyStatus.isChild) { + if (!tankBorn) { el.append(inspect()); } @@ -4753,16 +4752,16 @@ App.UI.newSlaveIntro = function(slave, slave2, familyStatus = {isChild: false}) function newChild() { let linkArray; let p = document.createElement("p"); - if (familyStatus.isChild) { + if (tankBorn) { let interestLine; - if ((familyStatus.momInterest === "boobs") || (familyStatus.dadInterest === "boobs")) { + if ((momInterest === "boobs") || (dadInterest === "boobs")) { interestLine = document.createElement("div"); linkArray = []; r = []; r.push(`You noticed ${his} interest in ${his}`); - if (familyStatus.momInterest === "boobs" && familyStatus.dadInterest === "boobs") { + if (momInterest === "boobs" && dadInterest === "boobs") { r.push(`parents'`); - } else if (familyStatus.momInterest === "boobs") { + } else if (momInterest === "boobs") { r.push(`mother's`); } else { r.push(`father's`); @@ -4938,14 +4937,14 @@ App.UI.newSlaveIntro = function(slave, slave2, familyStatus = {isChild: false}) p.append(interestLine); } - if (familyStatus.momInterest === "belly" || familyStatus.dadInterest === "belly") { + if (momInterest === "belly" || dadInterest === "belly") { interestLine = document.createElement("div"); linkArray = []; r = []; r.push(`You noticed ${his} interest in ${his}`); - if (familyStatus.momInterest === "belly" && familyStatus.dadInterest === "belly") { + if (momInterest === "belly" && dadInterest === "belly") { r.push(`parents'`); - } else if (familyStatus.momInterest === "belly") { + } else if (momInterest === "belly") { r.push(`mother's`); } else { r.push(`father's`); @@ -5041,14 +5040,14 @@ App.UI.newSlaveIntro = function(slave, slave2, familyStatus = {isChild: false}) p.append(App.UI.DOM.generateLinksStrip(linkArray)); } - if ((slave.geneMods.NCS === 0) && ((familyStatus.momInterest === "dick") || (familyStatus.dadInterest === "dick"))) { + if ((slave.geneMods.NCS === 0) && ((momInterest === "dick") || (dadInterest === "dick"))) { interestLine = document.createElement("div"); linkArray = []; r = []; r.push(`You noticed ${his} interest in ${his}`); - if (familyStatus.momInterest === "dick" && familyStatus.dadInterest === "dick") { + if (momInterest === "dick" && dadInterest === "dick") { r.push(`parents'`); - } else if (familyStatus.momInterest === "dick") { + } else if (momInterest === "dick") { r.push(`mother's`); } else { r.push(`father's`); @@ -5094,14 +5093,14 @@ App.UI.newSlaveIntro = function(slave, slave2, familyStatus = {isChild: false}) p.append(App.UI.DOM.generateLinksStrip(linkArray)); } - if ((slave.geneMods.NCS === 0) && ((familyStatus.momInterest === "balls") || (familyStatus.dadInterest === "balls"))) { + if ((slave.geneMods.NCS === 0) && ((momInterest === "balls") || (dadInterest === "balls"))) { interestLine = document.createElement("div"); linkArray = []; r = []; r.push(`You noticed ${his} interest in ${his}`); - if (familyStatus.momInterest === "balls" && familyStatus.dadInterest === "balls") { + if (momInterest === "balls" && dadInterest === "balls") { r.push(`parents'`); - } else if (familyStatus.momInterest === "balls") { + } else if (momInterest === "balls") { r.push(`mother's`); } else { r.push(`father's`); @@ -5147,14 +5146,14 @@ App.UI.newSlaveIntro = function(slave, slave2, familyStatus = {isChild: false}) p.append(App.UI.DOM.generateLinksStrip(linkArray)); } - if ((familyStatus.momInterest === "hips") || (familyStatus.dadInterest === "hips")) { + if ((momInterest === "hips") || (dadInterest === "hips")) { interestLine = document.createElement("div"); linkArray = []; r = []; r.push(`You noticed ${his} interest in ${his}`); - if (familyStatus.momInterest === "hips" && familyStatus.dadInterest === "hips") { + if (momInterest === "hips" && dadInterest === "hips") { r.push(`parents'`); - } else if (familyStatus.momInterest === "hips") { + } else if (momInterest === "hips") { r.push(`mother's`); } else { r.push(`father's`); @@ -5222,14 +5221,14 @@ App.UI.newSlaveIntro = function(slave, slave2, familyStatus = {isChild: false}) p.append(App.UI.DOM.generateLinksStrip(linkArray)); } - if ((familyStatus.momInterest === "butt") || (familyStatus.dadInterest === "butt")) { + if ((momInterest === "butt") || (dadInterest === "butt")) { interestLine = document.createElement("div"); linkArray = []; r = []; r.push(`You noticed ${his} interest in ${his}`); - if (familyStatus.momInterest === "butt" && familyStatus.dadInterest === "butt") { + if (momInterest === "butt" && dadInterest === "butt") { r.push(`parents'`); - } else if (familyStatus.momInterest === "butt") { + } else if (momInterest === "butt") { r.push(`mother's`); } else { r.push(`father's`); diff --git a/src/pregmod/incubatorRetrievalWorkaround.tw b/src/pregmod/incubatorRetrievalWorkaround.tw index 057280aba9f6790585640aad742c5a39c35a029c..22cbde23a388604272f789bb45af0ecae61e302d 100644 --- a/src/pregmod/incubatorRetrievalWorkaround.tw +++ b/src/pregmod/incubatorRetrievalWorkaround.tw @@ -25,7 +25,7 @@ <</if>> <</for>> <</if>> - <<includeDOM App.UI.newChildIntro($activeSlave, null, true)>> + <<includeDOM App.UI.newChildIntro($activeSlave)>> <<else>> A husk is ready to be used. <br>