diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index e8894f0df883121e4c505169de8a8b7970d8403c..2c8d35a6332f00dda4d142a304578f744c60dfd1 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -734,16 +734,21 @@ App.Data.resetOnNGPlus = {
masterSuiteNameCaps: "The Master Suite",
// Nursery Subsection
- nursery: 0, /* counts the number of children the nursery can support */
- nurseryNannies: 0, /* counts the number of nannies the nursery can support */
- nurseryBabies: 0, /* counts the number of children currently in the nursery */
- MatronInfluence: 0, /* check for whether the children are influenced by the Matron */
- nannyInfluence: 0, /* check for whether the children are influenced by the nannies */
+ /** Counts the number of children the nursery can support */
+ nursery: 0,
+ /** Counts the number of nannies the nursery can support */
+ nurseryNannies: 0,
+ /** Counts the number of children currently in the nursery */
+ nurseryChildren: 0,
+ /** Check for whether the children are influenced by the Matron */
+ MatronInfluence: 0,
+ /** Check for whether the children are influenced by the nannies */
+ nannyInfluence: 0,
nurseryDecoration: "standard",
nurseryWeight: 0,
nurseryMuscles: 0,
nurseryHormones: 0,
- nurseryOrgans: 0, /* not currently in use */
+ nurseryOrgans: 0, // not currently in use
nurseryImprintSetting: 0,
nurseryWeightSetting: 0,
nurseryMusclesSetting: 0,
@@ -751,7 +756,8 @@ App.Data.resetOnNGPlus = {
nurseryName: "the Nursery",
nurseryNameCaps: "The Nursery",
reservedChildrenNursery: 0,
- cribs: [], /* array of children in the nursery */
+ /** Array of children in the Nursery */
+ cribs: [],
cribsIndices: {},
sortNurseryList: "Unsorted",
targetAgeNursery: 18,
diff --git a/src/endWeek/childrenReport.js b/src/endWeek/childrenReport.js
deleted file mode 100644
index 9b7517a753796630b4ffffbcdeb9d8566d3308ac..0000000000000000000000000000000000000000
--- a/src/endWeek/childrenReport.js
+++ /dev/null
@@ -1,380 +0,0 @@
-/**
- * Details week-to-week changes in children in the Nursery
- * @returns {string}
- */
-App.Facilities.Nursery.childrenReport = function childrenReport() {
- "use strict";
-
- const
- Matron = S.Matron,
- NL = App.Entity.facilities.nursery.employeesIDs().size,
- CL = V.cribs.length;
-
- let
- r = ``;
-
- for (const child of V.cribs) {
- const
- { he, his, He, His } = getPronouns(child);
-
- if (child.growTime > 0) {
- r += `<br><span class="pink">${child.slaveName}</span> is growing steadily. ${He} will be ready for release in about ${years(child.growTime)}. `;
- } else {
- r += `<span class="pink">${child.slaveName}</span> is <span class="lime">ready for release.</span> ${He} will be removed from ${V.nurseryName} upon your approach.`;
- }
-
- // TODO: add Matron and nanny effects
- if (child.actualAge >= 3) {
- if (Matron || NL) {
- let
- chance = jsRandom(1, 100);
-
- if (jsDef(Matron)) {
- if (Matron.fetish !== "none") {
- if (chance > 90) {
- if (child.fetish === "none") {
- // TODO: clean up the following blocks
- r += `${child.slaveName} has taken a few cues from ${Matron.slaveName}, and `;
- switch (child.fetish) {
- case "submissive":
- r += `is now a submissive`;
- break;
- case "cumslut":
- r += `is now a cumslut`;
- break;
- case "humiliation":
- r += `now has a fetish for humiliation`;
- break;
- case "buttslut":
- r += `is now a buttslut`;
- break;
- case "boobs":
- r += `now has a fetish for boobs and breastplay`; // TODO: not happy with this wording
- break;
- case "sadist":
- r += `now gets off on causing pain`;
- break;
- case "masochist":
- r += `now gets off on pain`;
- break;
- case "dom":
- r += `is now very sexually dominant`;
- break;
- case "pregnancy":
- r += `has developed a facination for all things pregnancy-related`;
- break;
- }
- r += `. `;
- child.fetish = Matron.fetish;
- } else {
- if (chance > 95) {
- r += `${Matron.slaveName} has rubbed off on ${child.slaveName}, in more ways than one. ${He} `;
- switch (child.fetish) {
- case "submissive":
- r += `is now a submissive`;
- break;
- case "cumslut":
- r += `is now a cumslut`;
- break;
- case "humiliation":
- r += `now has a fetish for humiliation`;
- break;
- case "buttslut":
- r += `is now a buttslut`;
- break;
- case "boobs":
- r += `now has a fetish for boobs and breastplay`; // TODO: not happy with this wording
- break;
- case "sadist":
- r += `now gets off on causing pain`;
- break;
- case "masochist":
- r += `now gets off on pain`;
- break;
- case "dom":
- r += `is now very sexually dominant`;
- break;
- case "pregnancy":
- r += `has developed a facination for all things pregnancy-related`;
- break;
- }
- r += `. `;
- child.fetish = Matron.fetish;
- }
- }
- }
- }
- }
-
- if (NL > 0) {
- for (const slave of App.Utils.sortedEmployees(App.Entity.facilities.nursery)) {
- if (slave.fetish !== "none") {
- if (chance > 85) {
- if (child.fetish === "none") {
- r += `${slave.slaveName} has left quite an impression on ${child.slaveName}, and ${he} `;
- switch (child.fetish) {
- case "submissive":
- r += `is now a submissive`;
- break;
- case "cumslut":
- r += `is now a cumslut`;
- break;
- case "humiliation":
- r += `now has a fetish for humiliation`;
- break;
- case "buttslut":
- r += `is now a buttslut`;
- break;
- case "boobs":
- r += `now has a fetish for boobs and breastplay`; // TODO: not happy with this wording
- break;
- case "sadist":
- r += `now gets off on causing pain`;
- break;
- case "masochist":
- r += `now gets off on pain`;
- break;
- case "dom":
- r += `is now very sexually dominant`;
- break;
- case "pregnancy":
- r += `has developed a facination for all things pregnancy-related`;
- break;
- }
- r += `. `;
- child.fetish = slave.fetish;
- } else {
- if (chance > 90) {
- r += `${child.slaveName} seems to have taken to ${slave.slaveName}'s example, and `;
- switch (child.fetish) {
- case "submissive":
- r += `is now a submissive`;
- break;
- case "cumslut":
- r += `is now a cumslut`;
- break;
- case "humiliation":
- r += `now has a fetish for humiliation`;
- break;
- case "buttslut":
- r += `is now a buttslut`;
- break;
- case "boobs":
- r += `now has a fetish for boobs and breastplay`; // TODO: not happy with this wording
- break;
- case "sadist":
- r += `now gets off on causing pain`;
- break;
- case "masochist":
- r += `now gets off on pain`;
- break;
- case "dom":
- r += `is now very sexually dominant`;
- break;
- case "pregnancy":
- r += `has developed a facination for all things pregnancy-related`;
- break;
- }
- r += `. `;
- child.fetish = slave.fetish;
- }
- }
- }
- }
- }
- }
-
- // TODO: add education system
- if (jsDef(Matron) && Matron) {
- const {
- // eslint-disable-next-line no-unused-vars
- he2, him2, his2, hers2, himself2, boy2, He2, His2
- } = getPronouns(Matron).appendSuffix('2');
-
- if (Matron.intelligence + Matron.intelligenceImplant > 65) {
- r += `${Matron.slaveName} is so intelligent and well-educated that ${he2} is able to teach ${CL > 1 ? `the children` : `${child.slaveName}`} very effectively, and so ${CL > 1 ? child.slaveName : `${he}`} gradually grows smarter. `; // TODO: not happy with this
- child.intelligenceImplant += 3; // TODO: should this raise intelligence instead?
- } else if (Matron.intelligenceImplant > 30) {
- r += `${Matron.slaveName}'s education makes up for the fact that ${CL > 1 ? child.slaveName : `${he}`} isn't the brightest and allows ${him2} to teach ${CL > 1 ? `the children` : `${child.slaveName}`} quite effectively, and so ${CL > 1 ? child.slaveName : `${he}`} grows a bit smarter. `; // TODO:
- child.intelligenceImplant += 2;
- } else if (Matron.intelligence > 50) {
- r += `Though ${Matron.slaveName} has had little to no formal education, ${his2} natural brilliance allows ${him2} to teach ${CL > 1 ? `the children` : `${child.slaveName}`} quite effectively, and so ${CL > 1 ? child.slaveName : `${he}`} grows a bit smarter. `; // TODO:
- child.intelligenceImplant += 2;
- } else {
- r += `${Matron.slaveName} isn't the brightest, and isn't as effective at teaching as ${he2} otherwise could be. ${He2} is only somewhat effective at teaching ${CL > 1 ? `the children` : `${child.slaveName}`}, and so ${CL > 1 ? child.slaveName : `${he}`} grows just a little bit smarter. `; // TODO:
- child.intelligenceImplant++;
- }
- }
-
- if (NL > 0) {
- let
- averageIntelligence = 0,
- averageIntelligenceImplant = 0;
-
- const nannies = App.Entity.facilities.nursery.employees();
- for (const nanny of nannies) {
- averageIntelligence += nanny.intelligence;
- averageIntelligenceImplant += nanny.intelligenceImplant;
- }
-
- const firstNanny = nannies[0];
-
- averageIntelligence = averageIntelligence / NL;
- averageIntelligenceImplant = averageIntelligenceImplant / NL;
-
- if (averageIntelligence + averageIntelligenceImplant > 65) {
- r += `${NL > 1 ? `The nannies are mostly` : `${firstNanny.slaveName} is`} very intelligent and well educated and are able to teach ${CL > 1 ? `the children` : child.slaveName} very effectively. `;
- child.intelligenceImplant += 3;
- } else if (averageIntelligence > 50) {
- r += `${NL > 1 ? `The nannies are mostly` : `${firstNanny.slaveName} is`} very intelligent and able to teach ${CL > 1 ? `the children` : child.slaveName} quite effectively. `;
- child.intelligenceImplant += 2;
- } else if (averageIntelligenceImplant > 25) {
- r += `${NL > 1 ? `The nannies are mostly` : `${firstNanny.slaveName} is`} very well educated and able to teach ${CL > 1 ? `the children` : child.slaveName} quite effectively. `;
- child.intelligenceImplant += 2;
- } else if (averageIntelligenceImplant > 15) {
- r += `${NL > 1 ? `The nannies are mostly` : `${firstNanny.slaveName} is`} well educated and able to teach ${CL > 1 ? `the children` : child.slaveName} fairly effectively. `;
- child.intelligenceImplant++;
- }
- }
-
- // TODO: add fitness system
- if (jsDef(Matron) && Matron) {
- // TODO:
- }
-
- if (NL > 0) {
- // TODO:
- }
- }
-
- // TODO: add friend / rivalry system
- // TODO: add relations to friend system
- for (let j = 0; j < CL; j++) {
- const
- c = V.cribs[j];
-
- let
- friend = 0,
- rival = 0,
- chance = jsRandom(1, 100);
-
- if (c.actualAge >= 3) {
- if (c.fetish === child.fetish) {
- r += ``; // TODO:
- friend++;
- }
-
- if (c.sexualQuirk === child.sexualQuirk || c.behavioralQuirk === child.behavioralQuirk) {
- r += ``; // TODO:
- friend++;
- }
-
- if (c.fetish === "sadist" || c.fetish === "dom") {
- r += ``; // TODO:
- rival++;
- } else if (child.fetish === "sadist" || child.fetish === "dom") {
- r += ``; // TODO:
- rival++;
- }
-
- if (friend) {
- if (rival) {
- if (friend > rival) {
- if (chance > 75) {
- r += ``; // TODO:
- child.relationship = 1, child.relationshipTarget = c.ID;
- c.relationship = 1, c.relationshipTarget = child.ID;
- }
- }
- } else {
- if (chance > 60) {
- r += ``; // TODO:
- child.relationship = 1, child.relationshipTarget = c.ID;
- c.relationship = 1, c.relationshipTarget = child.ID;
- }
- }
- }
-
- if (rival) {
- if (friend) {
- if (rival > friend) {
- if (chance > 75) {
- r += ``; // TODO:
- }
- }
- } else {
- if (chance > 60) {
- r += ``; // TODO:
- }
- }
- }
- }
- }
-
- // TODO: rework these entirely
- if (Matron || NL) {
- if (V.nurseryWeight) {
- const firstNanny = NL > 0 ? App.Entity.facilities.nursery.employees()[0] : null;
- r += `<br>`;
- if (V.nurseryWeightSetting === 1) {
- if (child.weight < 200) {
- child.weight += 5;
- }
- r += `${He} is being fed an excessive amount of food, causing <span class="red">rapid weight gain.</span> `;
- } else if (V.nurseryWeightSetting === 2) {
- if (child.weight > 10) {
- child.weight--;
- r += `${Matron ? Matron.slaveName : NL > 1 ? `A nanny` : firstNanny.slaveName} notices ${he} is overweight and <span class="green">decreases the amount of food ${he} eats.</span> `;
- } else if (child.weight <= -10) {
- child.weight++;
- r += `${Matron ? Matron.slaveName : NL > 1 ? `A nanny` : firstNanny.slaveName} notices ${he} is underweight and <span class="green">increases the amount of food ${he} eats.</span> `;
- } else {
- r += `${He} is <span class="lime">currently a healthy weight;</span> efforts will be made to maintain it. `;
- }
- } else if (V.nurseryWeightSetting === 0) {
- if (child.weight > -20) {
- r += `${His} developing body <span class="red">quickly sheds its gained weight.</span> `;
- child.weight -= 40;
- }
- }
- } else {
- if (child.weight > -20) {
- child.weight -= 40;
- r += `${His} developing body <span class="red">quickly sheds its gained weight.</span>`;
- }
- }
-
- // TODO: rewrite these
- if (V.nurseryMuscles) {
- r += `${He} is being given anabolic steroids causing <span class="green">rapid muscle development.</span> `; // TODO: not happy with this
- if (V.nurseryMusclesSetting === 2) {
- if (child.muscles < 100) {
- child.muscles += 5;
- }
- r += `${Matron ? Matron : NL > 1 ? `A nanny` : firstNanny.slaveName} notices ${he} is overly muscular and <span class="green">decreases ${his} steroid dosage.</span> `;
- } else if (V.nurseryMusclesSetting === 1) {
- if (child.muscles > 10) {
- child.muscles--;
- r += `${Matron ? Matron : NL > 1 ? `A nanny` : firstNanny.slaveName} notices ${he} is weak and <span class="green">increases ${his} steroid dosage.</span> `;
- } else if (child.muscles < -10) {
- child.muscles++;
- r += `${He} has <span class="lime">a healthy musculature;</span> efforts will be made to maintain it. `;
- } else {
- r += `${His} developing body <span class="red">quickly loses its gained muscle.</span> `;
- }
- } else if (V.nurseryMusclesSetting === 0) {
- if (child.muscles > -100) {
- child.muscles -= 40;
- r += `${His} developing body <span class="red">quickly loses its gained muscle.</span> `;
- }
- }
- }
- }
- } else {
- // TODO:
- }
- r += `<br>`;
- }
-
- return r;
-};
diff --git a/src/endWeek/reports/childrenReport.js b/src/endWeek/reports/childrenReport.js
new file mode 100644
index 0000000000000000000000000000000000000000..5090f870b49714888ba806a6b3bf95f8360193ac
--- /dev/null
+++ b/src/endWeek/reports/childrenReport.js
@@ -0,0 +1,549 @@
+/**
+ * Details week-to-week changes in children in the Nursery
+ * @returns {HTMLElement}
+ */
+App.Facilities.Nursery.childrenReport = function childrenReport() {
+ const
+ frag = new DocumentFragment(),
+
+ Matron = S.Matron,
+ nannies = App.Utils.sortedEmployees(App.Entity.facilities.nursery),
+ NL = App.Entity.facilities.nursery.employeesIDs().size,
+ CL = V.cribs.length,
+
+ medianNannyIntelligence = NL ? findMedianNannyIntelligence() : null,
+ medianNannyIntelligenceImplant = NL ? findMedianNannyIntelligenceImplant() : null;
+
+ for (const child of V.cribs) {
+ const childDiv = App.UI.DOM.appendNewElement("div", frag, '', "child-section");
+
+ childDiv.append(childGrowTime(child));
+
+ if (child.actualAge >= 3) {
+ if (Matron) {
+ if (Matron.fetish !== "none") {
+ childDiv.append(matronFetishEffects(child));
+ }
+
+ childDiv.append(matronEducationEffects(child));
+ // childDiv.append(matronFitnessEffects(child));
+ }
+
+ if (NL > 0) {
+ const
+ randomNanny = NL > 1 ? jsRandom(0, nannies.length - 1) : 0,
+ nanny = nannies[randomNanny];
+
+ if (nanny.fetish !== "none") {
+ childDiv.append(nannyFetishEffects(child, nanny));
+ }
+
+ childDiv.append(nannyEducationEffects(child));
+ // childDiv.append(nannyFitnessEffects(child));
+ }
+
+ if (multipleChildrenOverTargetAge(V.cribs.findIndex(c => c.ID === child.ID))) {
+ childDiv.append(childFriendshipRivalries(child));
+ }
+
+ // TODO: rework these entirely
+ if (Matron || nannies) {
+ childDiv.appendChild(weightRulesEffects(child));
+ childDiv.appendChild(musclesRulesEffects(child));
+ }
+ } else {
+ // TODO:
+ }
+ }
+
+
+
+ // MARK: Matron Effects
+
+ function matronFetishEffects(child) {
+ const
+ { He } = getPronouns(child),
+ chance = jsRandom(1, 100);
+
+ if ((chance > 90 && child.fetish === "none") || chance > 95) {
+ child.fetish = Matron.fetish;
+
+ return `${child.slaveName} has taken a few cues from ${Matron.slaveName}, and ${newChildFetish(child.fetish)}. `;
+ }
+ }
+
+ function matronEducationEffects(child) {
+ // TODO: expand this
+ const
+ { he, him, his } = getPronouns(Matron),
+
+ theChildren = CL > 1 ? `the children` : `${child.slaveName}`;
+
+ if (Matron.intelligence + Matron.intelligenceImplant > 65) {
+ child.intelligenceImplant += 3;
+
+ return `${Matron.slaveName} is so intelligent and well-educated that ${he} is able to teach ${theChildren} very effectively, and so ${CL > 1 ? `they gradually grow` : `${child.slaveName} gradually grows`} smarter. `;
+ } else if (Matron.intelligenceImplant > 20) {
+ child.intelligenceImplant += 2;
+
+ return `${Matron.slaveName}'s education makes up for the fact that ${he} isn't the brightest and allows ${him} to teach ${theChildren} quite effectively, and so ${CL > 1 ? `they grow` : `${child.slaveName} grows`} a bit smarter. `;
+ } else if (Matron.intelligence > 50) {
+ child.intelligenceImplant += 2;
+
+ return `Though ${Matron.slaveName} has had little to no formal education, ${his} natural brilliance allows ${him} to teach ${theChildren} quite effectively, and so ${CL > 1 ? `they grow` : `${child.slaveName} grows`} a bit smarter. `;
+ } else {
+ const
+ totalSpan = App.UI.DOM.makeElement("span", `${Matron.slaveName} isn't the brightest and not well educated, `),
+ damageSpan = App.UI.DOM.makeElement("span", `damaging the amount of real education ${theChildren} receive. `, "red");
+
+ child.intelligenceImplant--;
+
+ totalSpan.appendChild(damageSpan);
+
+ return totalSpan;
+ }
+ }
+
+ // function matronFitnessEffects(child) {
+ // // TODO:
+ // return;
+ // }
+
+
+
+ // MARK: Nanny Effects
+
+ function nannyFetishEffects(child, slave) {
+ const
+ { he } = getPronouns(child),
+ chance = jsRandom(1, 100);
+
+ if (chance > 85) {
+ if (child.fetish === "none") {
+ child.fetish = slave.fetish;
+
+ return `${slave.slaveName} has left quite an impression on ${child.slaveName}, and ${he} ${newChildFetish(child.fetish)}. `;
+ } else {
+ if (chance > 90) {
+ child.fetish = slave.fetish;
+
+ return `${child.slaveName} seems to have taken to ${slave.slaveName}'s example, and ${newChildFetish(child.fetish)}. `;
+ }
+ }
+ }
+ }
+
+ function nannyEducationEffects(child) {
+ // TODO: redo this entire section
+ // TODO: expand this
+ const
+ firstNanny = nannies[0],
+ theNanniesAre = NL > 1 ? `The nannies are mostly` : `${firstNanny.slaveName} is`,
+ theChildren = CL > 1 ? `the children` : child.slaveName;
+
+ if (medianNannyIntelligence + medianNannyIntelligenceImplant > 65) {
+ child.intelligenceImplant += 3;
+
+ return `${theNanniesAre} very intelligent and well educated and are able to teach ${theChildren} very effectively. `;
+ } else if (medianNannyIntelligence > 50) {
+ child.intelligenceImplant += 2;
+
+ return `${theNanniesAre} very intelligent and able to teach ${theChildren} quite effectively. `;
+ } else if (medianNannyIntelligenceImplant > 25) {
+ child.intelligenceImplant += 2;
+
+ return `${theNanniesAre} very well educated and able to teach ${theChildren} quite effectively. `;
+ } else if (medianNannyIntelligenceImplant > 15) {
+ child.intelligenceImplant++;
+
+ return `${theNanniesAre} well educated and able to teach ${theChildren} fairly effectively. `;
+ }
+ }
+
+ // function nannyFitnessEffects(child) {
+ // // TODO:
+ // return;
+ // }
+
+
+
+ // MARK: Nursery Rules Effects
+
+ function weightRulesEffects(child) {
+ // TODO: redo this entire section
+ // TODO: double check these classes, make sure they make sense
+ const
+ span = document.createElement("span"),
+ { he, He, His } = getPronouns(child);
+
+ if (V.nurseryWeight) {
+ const
+ caretaker = Matron ? Matron.slaveName : NL > 1 ? `A nanny` : firstNanny.slaveName,
+ firstNanny = NL > 0 ? nannies[0] : null;
+
+ if (V.nurseryWeightSetting === 1) {
+ const weightSpan = App.UI.DOM.makeElement("span", 'rapid weight gain.', ["health", "dec"]);
+
+ if (child.weight < 200) {
+ child.weight += 5;
+ }
+
+ span.append(`${He} is being fed an excessive amount of food, causing`, weightSpan);
+ } else if (V.nurseryWeightSetting === 2) {
+ const weightSpan = App.UI.DOM.makeElement("span", `decreases the amount of food ${he} eats. `, "improvement");
+
+ if (child.weight > 10) {
+ child.weight--;
+
+ span.append(`${caretaker} notices ${he} is overweight and `, weightSpan);
+ } else if (child.weight <= -10) {
+ const weightSpan = App.UI.DOM.makeElement("span", `increases the amount of food ${he} eats. `, "improvement");
+
+ child.weight++;
+
+ span.append(`${caretaker} notices ${he} is underweight and `, weightSpan);
+ } else {
+ const weightSpan = App.UI.DOM.makeElement("span", 'currently a healthy weight;', ["change", "positive"]);
+
+ span.append(`${He} is `, weightSpan, ` efforts will be made to maintain it. `);
+ }
+ } else if (V.nurseryWeightSetting === 0) {
+ if (child.weight > -20) {
+ const weightSpan = App.UI.DOM.makeElement("span", 'quickly sheds its gained weight.', ["health", "dec"]);
+
+ child.weight -= 40;
+
+ span.append(`${His} developing body `, weightSpan);
+ }
+ }
+ } else {
+ if (child.weight > -20) {
+ const weightSpan = App.UI.DOM.makeElement("span", 'quickly sheds its gained weight. ', ["health", "dec"]);
+
+ child.weight -= 40;
+
+ span.append(`${His} developing body `, weightSpan);
+ }
+ }
+
+ return span;
+ }
+
+ function musclesRulesEffects(child) {
+ const div = document.createElement("div");
+
+ // TODO: rewrite these
+ // FIXME: this entire section needs a rewrite - numbers and text don't line up at all
+ if (V.nurseryMuscles) {
+ const
+ caretaker = Matron ? Matron.slaveName : NL > 1 ? `A nanny` : firstNanny.slaveName,
+ firstNanny = NL > 0 ? nannies[0] : null;
+
+ const muscleSpan = App.UI.DOM.makeElement("div", 'rapid muscle development.', "improvement");
+
+ div.append(`${He} is being worked out as often as possible, resulting in `, muscleSpan);
+
+ if (V.nurseryMusclesSetting === 2) {
+ const muscleSpan = App.UI.DOM.makeElement("span", `decreases the amount of exercise ${he} receives. `, "improvement");
+
+ if (child.muscles > 100) {
+ child.muscles -= 5;
+ }
+
+ div.append(`${caretaker} notices ${he} is overly muscular and `, muscleSpan);
+ } else if (V.nurseryMusclesSetting === 1) {
+ if (child.muscles < -10) {
+ const muscleSpan = App.UI.DOM.makeElement("span", `increases the amount of exercise ${he} receives. `, "improvement");
+
+ child.muscles--;
+
+ div.append(`${caretaker} notices ${he} is weak and `, muscleSpan);
+ } else if (child.muscles > 10) {
+ const muscleSpan = App.UI.DOM.makeElement("span", 'a healthy musculature;', ["change", "positive"]);
+
+ child.muscles++;
+
+ div.append(`${He} has `, muscleSpan, ` efforts will be made to maintain it. `);
+ } else {
+ const muscleSpan = App.UI.DOM.makeElement("span", 'quickly loses its gained muscle.', ["health", "dec"]);
+
+ div.append(`${His} developing body `, muscleSpan);
+ }
+ } else if (V.nurseryMusclesSetting === 0) {
+ const muscleSpan = App.UI.DOM.makeElement("span", 'quickly loses its gained muscle.', ["health", "dec"]);
+
+ if (child.muscles > 100) {
+ child.muscles -= 40;
+ div.append(`${His} developing body `, muscleSpan);
+ }
+ }
+ }
+
+ return div;
+ }
+
+
+
+ // MARK: Miscellaneous Functions
+
+ function childFriendshipRivalries(child) {
+ const cribsCopy = Array.from(V.cribs);
+
+ cribsCopy.splice(V.cribs.findIndex(c => c.ID === child.ID));
+
+ for (const target of cribsCopy) {
+ const
+ becomeFriends = () => `${child.slaveName} and ${target.slaveName} have realized that they have more in common that they originally thought, and have become friends. `,
+ becomeRivals = () => `${child.slaveName} and ${target.slaveName} have more differences between them than they could put aside and have become rivals. `,
+ haveSameFetish = () => child.fetish === target.fetish && child.fetish !== "none",
+ haveSameBehavioralQuirk = () => child.behavioralQuirk && child.behavioralQuirk === target.behavioralQuirk && child.behavioralQuirk !== "none",
+ haveSameSexualQuirk = () => child.sexualQuirk && child.sexualQuirk === target.sexualQuirk && child.sexualQuirk !== "none",
+
+ div = document.createElement("div"),
+
+ { his } = getPronouns(target),
+ chance = jsRandom(1, 100);
+
+ let
+ friend = 0,
+ rival = 0;
+
+ if (target.actualAge >= 3) {
+ if (haveSameFetish()) {
+ div.append(`${sameFetish(child, target)}, a fact over which they bond. `);
+
+ friend++;
+ }
+
+ if (haveSameBehavioralQuirk()) { // TODO:
+ div.append(`Since ${sameBehavioralQuirk(child, target)}, they learn to get along a bit better. `);
+
+ friend++;
+ }
+
+ if (haveSameSexualQuirk()) {
+ div.append(`Because ${sameSexualQuirk(child, target)}, the two grow a bit closer. `);
+
+ friend++;
+ }
+
+ if (target.fetish === "sadist" || target.fetish === "dom") {
+ div.append(`${target.slaveName} is a ${target.fetish}, and ${child.slaveName} is often ${his} target, which ${child.slaveName} doesn't particularly like. `);
+
+ rival++;
+ } else if (child.fetish === "sadist" || child.fetish === "dom") {
+ div.append(`${child.slaveName} is a ${child.fetish}, and ${target.slaveName} is often ${his} target, which ${target.slaveName} doesn't particularly like. `);
+
+ rival++;
+ }
+
+ if (areRelated(child, target) || areCousins(child, target)) {
+ if (areRelated(child, target)) {
+ if (rival) {
+ div.append(`${child.slaveName} and ${target.slaveName} are siblings, and find it difficult to really stay mad at each other, and they make up their differences somewhat. `);
+
+ friend += 2;
+ } else {
+ div.append(`${child.slaveName} and ${target.slaveName} are siblings, a fact that draws them closer together. `);
+
+ friend += 2;
+ }
+ } else {
+ if (rival) {
+ div.append(`${child.slaveName} and ${target.slaveName} are cousins, and find it difficult to really stay mad at each other, and they make up their differences somewhat. `);
+
+ friend++;
+ } else {
+ div.append(`${child.slaveName} and ${target.slaveName} are cousins, a fact that draws them closer together. `);
+
+ friend++;
+ }
+ }
+ }
+
+ if (friend) {
+ if (rival) {
+ if (friend > rival && child.relationshipTarget !== target.ID) {
+ if (chance > 75) {
+ div.append(becomeFriends());
+
+ child.relationship = 1;
+ child.relationshipTarget = target.ID;
+
+ target.relationship = 1;
+ target.relationshipTarget = child.ID;
+ }
+ }
+ } else {
+ if (chance > 60) {
+ div.append(becomeRivals());
+
+ child.relationship = 1;
+ child.relationshipTarget = target.ID;
+
+ target.relationship = 1;
+ target.relationshipTarget = child.ID;
+ }
+ }
+ }
+
+ if (rival) {
+ if (friend) {
+ if (rival > friend) {
+ if (chance > 75) {
+ div.append(becomeRivals());
+ }
+ }
+ } else {
+ if (chance > 60) {
+ div.append(becomeFriends());
+ }
+ }
+ }
+ }
+
+ return div;
+ }
+
+ function sameFetish(child, target) {
+ switch (child.fetish) {
+ case "submissive":
+ return `${child.slaveName} and ${target.slaveName} are both sexually submissive`;
+ case "cumslut":
+ return `Neither ${child.slaveName} nor ${target.slaveName} can get enough cum`;
+ case "humiliation":
+ return `Both ${child.slaveName} and ${target.slaveName} have a fetish for humiliation`;
+ case "buttslut":
+ return `Neither ${child.slaveName} nor ${target.slaveName} can get enough assplay`;
+ case "boobs":
+ return `${child.slaveName} and ${target.slaveName} both love breastplay`;
+ case "sadist":
+ return `Both ${child.slaveName} are ${target.slaveName} are sadists`;
+ case "masochist":
+ return `${child.slaveName} and ${target.slaveName} are both masochists`;
+ case "dom":
+ return `Both ${child.slaveName} and ${target.slaveName} are sexually dominant`;
+ case "pregnancy":
+ return `The idea of pregnancy titillates both ${child.slaveName} and ${target.slaveName}`;
+ default:
+ throw `Unexpected value ${child.fetish} in sameFetish(). Please report this.`;
+ }
+ }
+
+ function sameBehavioralQuirk(child, target) {
+ switch (child.behavioralQuirk) {
+ case "confident":
+ return `${child.slaveName} and ${target.slaveName} are both naturally confident`;
+ case "cutting":
+ return `both ${child.slaveName} and ${target.slaveName} have a cutting wit about them`;
+ case "funny":
+ return `${child.slaveName} and ${target.slaveName} can both make the other laugh`;
+ case "fitness":
+ return `${child.slaveName} and ${target.slaveName} both love to try to stay in shape`;
+ case "adores women":
+ return `${child.slaveName} and ${target.slaveName} both adore women`;
+ case "adores men":
+ return `both ${child.slaveName} are ${target.slaveName} adore men`;
+ case "insecure":
+ return `${child.slaveName} and ${target.slaveName} are both equally insecure`;
+ case "sinful":
+ return `both ${child.slaveName} and ${target.slaveName} love breaking cultural and religious mores`;
+ case "advocate":
+ return `${child.slaveName} and ${target.slaveName} can both make a strong case for slavery`;
+ default:
+ throw `Unexpected value ${child.behavioralQuirk} in sameBehavioralQuirk(). Please report this.`;
+ }
+ }
+
+ // TODO: incorporate minimumSlaveAge
+ function sameSexualQuirk(child, target) {
+ switch (child.sexualQuirk) {
+ case "gagfuck queen":
+ return `${haveSameBehavioralQuirk() ? `the two also` : `${child.slaveName} and ${target.slaveName} both`} love having their little throats fucked`;
+ case "painal queen":
+ return `${haveSameBehavioralQuirk() ? `neither` : `neither ${child.slaveName} nor ${target.slaveName}`} can get enough painal`;
+ case "strugglefuck queen":
+ return `${haveSameBehavioralQuirk() ? `the two also` : `${child.slaveName} and ${target.slaveName} both`} love to put up a struggle during sex`;
+ case "tease":
+ return `${haveSameBehavioralQuirk() ? `the two are also both teases` : `${child.slaveName} and ${target.slaveName} are both teases`}`;
+ case "romantic":
+ return `${haveSameBehavioralQuirk() ? `the two also` : `${child.slaveName} and ${target.slaveName} both`} see the world under from a romantic lense`;
+ case "perverted":
+ return `${haveSameBehavioralQuirk() ? `the two are also` : `${child.slaveName} and ${target.slaveName} are both`} big-time perverts`;
+ case "caring":
+ return `${haveSameBehavioralQuirk() ? `the two also` : `${child.slaveName} and ${target.slaveName} both`} care about their partners`;
+ case "unflinching":
+ return `${haveSameBehavioralQuirk() ? `the two can also` : `${child.slaveName} and ${target.slaveName} both can`} take whatever their partner might throw at them `;
+ case "size queen":
+ return `${haveSameBehavioralQuirk() ? `the two also` : `${child.slaveName} and ${target.slaveName} both`} have a love for huge cock`;
+ default:
+ throw `Unexpected value ${child.fetish} in sameSexualQuirk(). Please report this.`;
+ }
+ }
+ }
+
+ function newChildFetish(fetish = "none") {
+ switch (fetish) {
+ case "submissive":
+ return `is now sexually submissive`;
+ case "cumslut":
+ return `is now a cumslut`;
+ case "humiliation":
+ return `now has a fetish for humiliation`;
+ case "buttslut":
+ return `is now a buttslut`;
+ case "boobs":
+ return `now has a fetish for all things breast-related`;
+ case "sadist":
+ return `now gets off on causing pain`;
+ case "masochist":
+ return `now gets off on pain`;
+ case "dom":
+ return `is now very sexually dominant`;
+ case "pregnancy":
+ return `has developed a facination for all things pregnancy-related`;
+ default:
+ throw `<span class="error">Unexpected fetish value of "${fetish}" in newChildFetish(). Please report this.</span>`;
+ }
+ }
+
+ function childGrowTime(child) {
+ const
+ nameSpan = App.UI.DOM.makeElement("span", child.slaveName, "pink"),
+ limeSpan = App.UI.DOM.makeElement("span", 'ready for release.', "lime"),
+ mainSpan = document.createElement("span"),
+
+ { He } = getPronouns(child);
+
+ if (child.growTime > 0) {
+ mainSpan.append(nameSpan, ` is growing steadily. ${He} will be ready for release in about ${years(child.growTime)}. `);
+ } else {
+ mainSpan.append(nameSpan, ' is ', limeSpan, ` ${He} will be removed from ${V.nurseryName} upon your approach. `);
+ }
+
+ return mainSpan;
+ }
+
+ function findMedianNannyIntelligence() {
+ return median(nannies.map(n => n.intelligence));
+ }
+
+ function findMedianNannyIntelligenceImplant() {
+ return median(nannies.map(n => n.intelligenceImplant));
+ }
+
+ /**
+ * Checks if there are more than one children over the target age in the Nursery
+ * @param {number} index
+ * @param {number=3} age
+ */
+ function multipleChildrenOverTargetAge(index, age = 3) {
+ const cribsCopy = Array.from(V.cribs);
+
+ cribsCopy.splice(index, 1);
+
+ return V.cribs.length > 1 && cribsCopy.some(c => c.actualAge >= age);
+ }
+
+ return frag;
+};
diff --git a/src/endWeek/nurseryReport.js b/src/endWeek/reports/nurseryReport.js
similarity index 96%
rename from src/endWeek/nurseryReport.js
rename to src/endWeek/reports/nurseryReport.js
index 6b564bf847da06a1165f04078fb1f5034027d744..a365777f6b1a643f0105a02c9830d937e700a8f5 100644
--- a/src/endWeek/nurseryReport.js
+++ b/src/endWeek/reports/nurseryReport.js
@@ -98,14 +98,14 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
matronBonus += S.Matron.intelligence + S.Matron.intelligenceImplant;
}
- if (V.nurseryBabies < V.nursery) {
- let seed = jsRandom(1, 10) + ((V.nursery - V.nurseryBabies) * (jsRandom(150, 170) + (matronBonus * 10)));
+ if (V.nurseryChildren < V.nursery) {
+ let seed = jsRandom(1, 10) + ((V.nursery - V.nurseryChildren) * (jsRandom(150, 170) + (matronBonus * 10)));
cashX(seed, "nursery", S.Matron);
r.push(`<p class="indent">Since ${he} doesn't have enough children to occupy all ${his} time, ${V.nurseryName} takes in citizens' children on a contract basis and ${he} cares for them too, earning <span class='yellowgreen'>${cashFormat(seed)}.</span></p>`);
}
- if (arcology.FSRepopulationFocus > 0 && V.nurseryBabies > 0) {
+ if (arcology.FSRepopulationFocus > 0 && V.nurseryChildren > 0) {
r.push(`Society <span class='green'>loves</span> the way you are raising more children for ${arcology.name}. `);
FutureSocieties.Change("Repopulationist", 2);
}
@@ -128,7 +128,7 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
r.push(`${slaves.length > 1 ? `There are ${slaves.length} slaves` : `There is one slave`} working in ${V.nurseryName}.</strong>`);
- if (arcology.FSRepopulationFocus > 0 && V.nurseryBabies > 0) {
+ if (arcology.FSRepopulationFocus > 0 && V.nurseryChildren > 0) {
r.push(`Society <span class="green">approves</span> of your bringing more children into this world.`);
} else if (arcology.FSGenderFundamentalist > 0) {
r.push(`Society <span class="green">approves</span> of your assigning slaves to a traditionally feminine role.`);
diff --git a/src/endWeek/saNanny.js b/src/endWeek/saNanny.js
index 1027fd6abf9b221d17f4a42289a68b97fb69fff3..7a240125c1c05af3474e5d790c6e543317dc038d 100644
--- a/src/endWeek/saNanny.js
+++ b/src/endWeek/saNanny.js
@@ -7,10 +7,10 @@
App.SlaveAssignment.nanny = function(slave) {
const
{ he, him, his, He, His } = getPronouns(slave),
- child = `child${V.nurseryBabies > 0 ? `ren` : ``}`;
+ child = `child${V.nurseryChildren > 0 ? `ren` : ``}`;
- let t = `works as a nanny. ${He} ${V.nurseryBabies ?
- `looks after the ${child} in ${V.nurseryName}, ensuring their needs are met and that they are being raised as ${V.nurseryBabies === 1 ?
+ let t = `works as a nanny. ${He} ${V.nurseryChildren ?
+ `looks after the ${child} in ${V.nurseryName}, ensuring their needs are met and that they are being raised as ${V.nurseryChildren === 1 ?
`a good future slave` :
`good future slaves`}. ` :
`keeps ${V.nurseryName} neat and tidy for the children it will one day support`}. `;
@@ -32,7 +32,7 @@ App.SlaveAssignment.nanny = function(slave) {
t += ` ${He} is `;
if (slave.trust < -20) {
- t += `frightened of punishment and works very hard, <span class="cash inc">reducing the upkeep</span> of ${V.nurseryName}${V.nurseryBabies ? ` and the children within` : ``}.`;
+ t += `frightened of punishment and works very hard, <span class="cash inc">reducing the upkeep</span> of ${V.nurseryName}${V.nurseryChildren ? ` and the children within` : ``}.`;
} else if (slave.devotion <= 20) {
t += `hesitant, requiring your other slaves to demand ${his} services, and only slightly <span class="cash inc">reduces upkeep</span> of your slaves.`;
} else if (slave.devotion <= 50) {
diff --git a/src/endWeek/slaveAssignmentReport.js b/src/endWeek/slaveAssignmentReport.js
index afa14f53c9fd77ad4ccd5c57b3c53debf96a0fcb..ad99dff32444c793dea9a1e25573547ec9541072 100644
--- a/src/endWeek/slaveAssignmentReport.js
+++ b/src/endWeek/slaveAssignmentReport.js
@@ -326,7 +326,7 @@ App.EndWeek.slaveAssignmentReport = function() {
["Spa Report", App.Entity.facilities.spa],
["Servants' Quarters Report", App.Entity.facilities.servantsQuarters],
["Nursery Report", App.Entity.facilities.nursery],
- ["Children Report", "Nursery Children", V.nursery, V.nurseryBabies],
+ ["Children Report", "Nursery Children", V.nursery, V.nurseryChildren],
["Incubator Report", App.Entity.facilities.incubator],
["Master Suite Report", App.Entity.facilities.masterSuite],
["Penthouse Report", "The Penthouse"],
diff --git a/src/facilities/nursery/nursery.css b/src/facilities/nursery/nursery.css
new file mode 100644
index 0000000000000000000000000000000000000000..f2276b59eeaa1d146949dd10b1c48286e0e3b609
--- /dev/null
+++ b/src/facilities/nursery/nursery.css
@@ -0,0 +1,6 @@
+/* FEEL FREE TO MOVE */
+
+.child-section {
+ margin-top: 1em;
+ margin-bottom: 1em;
+}
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 577151882dc763ed73ef36aba149c34d7751a094..ccba47ae1b2a103cd0865127fd6192998f5d90fa 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -8,7 +8,7 @@
<<set $nurseryNameCaps = $nurseryName.replace("the ", "The ")>>
<</if>>
-<<set $nurseryBabies = $cribs.length, _freecribs = $nursery - $nurseryBabies, _NL = App.Entity.facilities.nursery.employeesIDs().size, _SL = $slaves.length, _eligibility = 0, $reservedChildren = FetusGlobalReserveCount("incubator"), $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
+<<set $nurseryChildren = $cribs.length, _freecribs = $nursery - $nurseryChildren, _NL = App.Entity.facilities.nursery.employeesIDs().size, _SL = $slaves.length, _eligibility = 0, $reservedChildren = FetusGlobalReserveCount("incubator"), $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
<p class="scene-intro">
$nurseryNameCaps
<<switch $nurseryDecoration>>
@@ -84,7 +84,7 @@
<<elseif $MatronID>>
_S.Matron.slaveName is alone in $nurseryName, and keeps the place clean and looks after the children $himself.
<<set $MatronInfluence = 1>>
- <<elseif (_NL <= 0) && ($nurseryBabies <= 0)>>
+ <<elseif (_NL <= 0) && ($nurseryChildren <= 0)>>
$nurseryNameCaps is empty and quiet.
<div class="choices" style="font-style:normal">
<<link "Decommission the Nursery" "Main">>
@@ -110,7 +110,7 @@
<<set _Tmult0 = Math.trunc($nurseryNannies*1000*$upgradeMultiplierArcology)>>
<br>It can support $nurseryNannies nann<<if $nurseryNannies != 1>>ies<<else>>y<</if>>.
There <<if _NL == 1>>is<<else>>are<</if>> _NL nann<<if _NL != 1>>ies<<else>>y<</if>> in $nurseryName.
- <<if $nurseryBabies > 0 && _NL < 1 && (!_S.Matron)>>
+ <<if $nurseryChildren > 0 && _NL < 1 && (!_S.Matron)>>
<div class="note">
You must have a Matron or at least one nanny to be able to influence the children's upbringing
</div>
@@ -304,7 +304,7 @@
</span>
</p>
- It can support $nursery child<<if $nursery != 1>>ren<</if>>. There <<if $nurseryBabies == 1>>is<<else>>are<</if>> currently $nurseryBabies room<<if $nurseryBabies != 1>>s<</if>> in use in $nurseryName.
+ It can support $nursery child<<if $nursery != 1>>ren<</if>>. There <<if $nurseryChildren == 1>>is<<else>>are<</if>> currently $nurseryChildren room<<if $nurseryChildren != 1>>s<</if>> in use in $nurseryName.
<<if $nursery < 50>>
<div class="choices">
[[Add another room|Nursery][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "nursery"), $nursery += 5]]
diff --git a/src/facilities/nursery/nurseryFramework.js b/src/facilities/nursery/nurseryFramework.js
index 54591cd222ae98136e5025b4531124e33925d9a8..12f33efb971608e1a0768fad38f588329b07a8e0 100644
--- a/src/facilities/nursery/nurseryFramework.js
+++ b/src/facilities/nursery/nurseryFramework.js
@@ -66,8 +66,8 @@ App.Entity.Facilities.Nursery = class extends App.Entity.Facilities.SingleJobFac
/** @override */
occupancyReport(long) {
return long
- ? `${V.nurseryBabies}/${V.nursery} babies, ${this.hostedSlaves}/${V.nurseryNannies} nannies${this.manager.currentEmployee ? `, ${this.manager.desc.position}` : ""}`
- : `${V.nurseryBabies}/${V.nursery}, ${this.hostedSlaves}/${V.nurseryNannies}${this.manager.currentEmployee ? ", L" : ""}`;
+ ? `${V.nurseryChildren}/${V.nursery} babies, ${this.hostedSlaves}/${V.nurseryNannies} nannies${this.manager.currentEmployee ? `, ${this.manager.desc.position}` : ""}`
+ : `${V.nurseryChildren}/${V.nursery}, ${this.hostedSlaves}/${V.nurseryNannies}${this.manager.currentEmployee ? ", L" : ""}`;
}
};
diff --git a/src/facilities/nursery/nurseryRetrievalWorkaround.tw b/src/facilities/nursery/nurseryRetrievalWorkaround.tw
index 0a15f53b40e3736bd75083d1a11e66a9ae767c36..6f87de31a986c94f8077fe72b60891c98a1eaf54 100644
--- a/src/facilities/nursery/nurseryRetrievalWorkaround.tw
+++ b/src/facilities/nursery/nurseryRetrievalWorkaround.tw
@@ -5,7 +5,7 @@ $readySlave.slaveName has been discharged from $nurseryName and is ready to beco
<br><br>
<<set $activeSlave = $readySlave>>
-<<set $nurseryBabies-->>
+<<set $nurseryChildren-->>
<<includeDOM App.Desc.longSlave(V.activeSlave)>>
<<run newSlave($activeSlave)>>
<<set $nextLink = "AS Dump">>
diff --git a/src/facilities/nursery/utils/nurseryUtils.js b/src/facilities/nursery/utils/nurseryUtils.js
index b3102a003ab8ebe73425968f39d9108ea8a8ea31..9706437409af261508363b8f9d984ba4e2b0e8a0 100644
--- a/src/facilities/nursery/utils/nurseryUtils.js
+++ b/src/facilities/nursery/utils/nurseryUtils.js
@@ -10,7 +10,7 @@ App.Facilities.Nursery.childList = function childList() {
frag = document.createDocumentFragment(),
r = [];
- if (V.nurseryBabies) {
+ if (V.nurseryChildren) {
App.UI.DOM.appendNewElement("h3", frag, `Children in ${V.nurseryName}`, "indent");
const
@@ -67,10 +67,6 @@ App.Facilities.Nursery.childList = function childList() {
return frag;
};
-App.Facilities.Nursery.slaveList = function slaveList() {
-
-};
-
/**
* Converts the infant object into a new child object
* @param {object} child
@@ -674,7 +670,7 @@ App.Facilities.Nursery.newChild = function newChild(child) {
child.growTime = V.targetAgeNursery * 52;
V.cribs.push(child);
V.cribsIndices = App.Facilities.Nursery.cribsToIndices();
- V.nurseryBabies++;
+ V.nurseryChildren++;
};
/**
diff --git a/src/npc/children/childrenReport.tw b/src/npc/children/childrenReport.tw
index 3f3d82eda13e217e7175946439fc6e3b9a4f4e88..25e61aba4a5364839ca02d639891c2e218bf7350 100644
--- a/src/npc/children/childrenReport.tw
+++ b/src/npc/children/childrenReport.tw
@@ -1,3 +1,3 @@
:: Children Report [nobr]
-<<print App.Facilities.Nursery.childrenReport()>>
\ No newline at end of file
+<<includeDOM App.Facilities.Nursery.childrenReport()>>
diff --git a/src/npc/descriptions/sceneIntro.js b/src/npc/descriptions/sceneIntro.js
index a069b6a4426157f5ce00c33c9007e5729f39a778..159e1cbb6dd65e84b367f2feb99349db312fd573 100644
--- a/src/npc/descriptions/sceneIntro.js
+++ b/src/npc/descriptions/sceneIntro.js
@@ -75,9 +75,9 @@ App.Desc.sceneIntro = function(slave, {market, eventDescription} = {}) {
break;
case "work as a nanny":
r.push(`from where ${he} was`);
- if (V.nurseryBabies === 1) {
+ if (V.nurseryChildren === 1) {
r.push(`taking care of a child.`);
- } else if (V.nurseryBabies > 0) {
+ } else if (V.nurseryChildren > 0) {
r.push(`taking care of children.`);
} else {
r.push(`keeping ${V.nurseryName} clean.`);
diff --git a/src/npc/infants/customizeInfant.tw b/src/npc/infants/customizeInfant.tw
index 18c5933084fca6c4bfb899420db5cd9298e9a63a..605ce8b7f1c125c9e14d555ea77973341f1111f7 100644
--- a/src/npc/infants/customizeInfant.tw
+++ b/src/npc/infants/customizeInfant.tw
@@ -9,7 +9,7 @@ You may enter custom descriptors for your child's hair color, hair style, tattoo
<<if (def $activeChild.custom) && ($activeChild.custom.title != "")>>
You have instructed $him to always refer to you as $activeChild.custom.title, which, should $he lisp, comes out as $activeChild.custom.titleLisp.
<<else>>
- You expect $him to refer to you as all the other <<if $nurseryBabies > 1>>children and <</if>>slaves do.
+ You expect $him to refer to you as all the other <<if $nurseryChildren > 1>>children and <</if>>slaves do.
<</if>>
<br>
<span id="result">
@@ -199,4 +199,4 @@ jQuery(function() {
<</if>>
<<link "Reset" "Add custom descriptors">><<set $activeChild.custom.hairVector = 0>><</link>>
<</if>>
-*/
\ No newline at end of file
+*/
diff --git a/src/player/js/playerJS.js b/src/player/js/playerJS.js
index 52fc84d514d609d8d5c89e7f133e6cd848f2e0b8..8c90125c73e9a48518b9968c1b61091345de4071 100644
--- a/src/player/js/playerJS.js
+++ b/src/player/js/playerJS.js
@@ -479,7 +479,7 @@ globalThis.PCTitle = function() {
if (facilities.arcade.employeesIDs().size >= 15) {
titles.push("Comptroller of the Arcade");
}
- if (V.nurseryBabies >= 10) {
+ if (V.nurseryChildren >= 10) {
titles.push("Caretaker of the Youth");
}
diff --git a/src/pregmod/huskSlaveSwapWorkaround.tw b/src/pregmod/huskSlaveSwapWorkaround.tw
index 44d5ff879f999f931582970fd938dd2ae4aad1ab..112c4ccb092363baabaf74ad3793c93874941b34 100644
--- a/src/pregmod/huskSlaveSwapWorkaround.tw
+++ b/src/pregmod/huskSlaveSwapWorkaround.tw
@@ -6,7 +6,7 @@
<<set $nextButton = "Abort Operation", $nextLink = "Main", $returnTo = "Incubator">>
<</if>>
-"This operation is neither simple nor is it perfected. There are extreme health risks involved and no guarantee of success. Strap a slave into your remote surgery to consent to the operation. Indentured servants<<if ($incubator > 0) || ($nurseryBabies)>> and slaves with reserved children<</if>> are not eligible."
+"This operation is neither simple nor is it perfected. There are extreme health risks involved and no guarantee of success. Strap a slave into your remote surgery to consent to the operation. Indentured servants<<if ($incubator > 0) || ($nurseryChildren)>> and slaves with reserved children<</if>> are not eligible."
<br>
//Select the slave whose mind will be transferred into the waiting husk. Amputated slaves must not be wearing prosthetics. This operation will cost <<print cashFormat(10000)>>.//
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index 46500b717530a9d20522020ac8ebd1ed7a7258b6..d28ab9b1a09aa9811404ba729cd81d66cbe72d04 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -251,7 +251,7 @@
<<if _S.Attendant>>_S.Attendant.slaveName <<if $slaves[$i].fetish == "mindbroken">>leads<<else>>escorts<</if>> $him to a special pool designed to give birth in. Once $he is safely in the water alongside _S.Attendant.slaveName,<<else>>$He is escorted to a special pool designed to give birth in. Once $he is safely in the water alongside $his assistant,<</if>> $he begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, <<if $slaves[$i].fetish == "mindbroken">>indifferent to<<else>>aided by<</if>> $his helper. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, $he is taken back to the spa.
<<case "work as a nanny">>
- $He finishes <<if $nurseryBabies>>changing the child's diaper<<else>>cleaning the area of $nurseryName that $he's been working on<</if>> and heads back to $his little room before stripping and getting into bed. $He begins the ordeal of childbirth, and after $he is finished, rests for a bit while $his child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> collected. After a short shower, $he returns to $his duties in $nurseryName.
+ $He finishes <<if $nurseryChildren>>changing the child's diaper<<else>>cleaning the area of $nurseryName that $he's been working on<</if>> and heads back to $his little room before stripping and getting into bed. $He begins the ordeal of childbirth, and after $he is finished, rests for a bit while $his child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> collected. After a short shower, $he returns to $his duties in $nurseryName.
<<case "learn in the schoolroom">>
Having been notified in the weeks leading up to $his birth, $he <<if canWalk($slaves[$i])>>heads<<else>>is helped<</if>> to the front of the class and strips. $He is being used as a learning aid in this lesson. Blushing strongly, $he begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, fully aware of the rapt attention of the other students. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning and fresh change of clothes, $he returns to $his seat. $He can't help but <<if canSee($slaves[$i])>>notice some of the detailed notes the class took on $his genitals<<else>>overhear the descriptions of $his <<if $slaves[$i].mpreg == 1>>asshole<<else>>vagina<</if>> being passed between $his peers<</if>>.
@@ -1018,7 +1018,7 @@
<</if>>
<<case "work as a nanny">>
- In the middle of <<if $nurseryBabies>>changing a baby's diaper<<else>>cleaning $nurseryName<</if>>, $slaves[$i].slaveName's water breaks. $He hurries into a changing room and assumes a birthing position.
+ In the middle of <<if $nurseryChildren>>changing a baby's diaper<<else>>cleaning $nurseryName<</if>>, $slaves[$i].slaveName's water breaks. $He hurries into a changing room and assumes a birthing position.
<<ClothingBirth>>
Several of the other slaves present help $him with $his newborn<<if $slaves[$i].pregType > 1>>s<</if>>. <<if _S.Matron>>_S.Matron.slaveName, lured in by the commotion, shoos the other slaves out and helps the new mother to a private room to unwind<<else>>Soon a servant arrives to take $his child<<if $slaves[$i].pregType > 1>>ren<</if>> away, and $he is ushered into a shower to clean up and relax<</if>>.