diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 229b88a72fcce5f367c2b2376240ba29474deb9b..6ef37118fd0bf2b21e0a2da7865e1a836e7bc63e 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -676,7 +676,7 @@ App.Data.resetOnNGPlus = {
/** No longer used */
nurseryNannies: 0,
/** Counts the number of children the nursery can support */
- nurseryCribs: 0,
+ nurseryCribs: 0,
/** Counts the number of children currently in the nursery */
nurseryChildren: 0,
/** Check for whether the children are influenced by the nannies */
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 26cddca9d78927bcce9a311f400a9c5d7ad8084a..586e477af727665c54e308fbd328145b00af9afe 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -2447,11 +2447,11 @@ App.Update.oldVersions = function(node) {
}
if (V.releaseID < 1184) {
- if (V.nurseryNannies > 0) {
- V.nurseryCribs = V.nursery;
- V.nursery = V.nurseryNannies;
- V.nurseryNannies = 0;
- }
+ if (V.nurseryNannies > 0) {
+ V.nurseryCribs = V.nursery;
+ V.nursery = V.nurseryNannies;
+ V.nurseryNannies = 0;
+ }
}
if ((typeof V.familyTesting === "undefined") && V.releaseID < 1065) {
diff --git a/src/endWeek/reports/nurseryReport.js b/src/endWeek/reports/nurseryReport.js
index 0c1b6d9e33dc621699a9d2865ef95c8a8b9e1808..d7e2e52249540e4e5b19554cf152140837d05682 100644
--- a/src/endWeek/reports/nurseryReport.js
+++ b/src/endWeek/reports/nurseryReport.js
@@ -8,7 +8,7 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
const slaves = App.Utils.sortedEmployees(App.Entity.facilities.nursery);
const devBonus = (V.nurseryDecoration !== "standard") ? 1 : 0;
const arcology = V.arcologies[0];
- const NL = App.Entity.facilities.nursery.employeesIDs().size;
+ const NL = App.Entity.facilities.nursery.employeesIDs().size;
let matronBonus = 0;
diff --git a/src/facilities/nursery/nursery.js b/src/facilities/nursery/nursery.js
index f3cc6b278450a4658aa4c1976b1733bf762a36dd..d76f3c87d14c482e8d88ad757a9731e9ad0d93c7 100644
--- a/src/facilities/nursery/nursery.js
+++ b/src/facilities/nursery/nursery.js
@@ -319,11 +319,11 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
const reservedChildrenN = FetusGlobalReserveCount('nursery');
const freeRooms = V.nurseryCribs - V.nurseryChildren;
const reservedChildrenI = FetusGlobalReserveCount('incubator');
- const incubatorSlaves = V.incubator.tanks.length;
- const freeTanks = V.incubator.capacity - incubatorSlaves;
+ const incubatorSlaves = V.incubator.tanks.length;
+ const freeTanks = V.incubator.capacity - incubatorSlaves;
r.push(`Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of ${V.nurseryCribs} rooms, ${numberWithPlural(freeRooms, 'is', 'are')} unoccupied. Of those, ${numberWithPlural(FetusGlobalReserveCount("nursery"), 'room is', 'rooms are')} reserved.`);
if (V.incubator.capacity > 0) {
- r.push(`Of ${V.incubator.capacity} incubation tanks, ${numberWithPlural(freeTanks, 'is', 'are')} unoccupied. Of those, ${numberWithPlural(FetusGlobalReserveCount("incubator"), 'tank is', 'tanks are')} reserved.`);
+ r.push(`Of ${V.incubator.capacity} incubation tanks, ${numberWithPlural(freeTanks, 'is', 'are')} unoccupied. Of those, ${numberWithPlural(FetusGlobalReserveCount("incubator"), 'tank is', 'tanks are')} reserved.`);
}
App.Events.addNode(el, r, "div");
@@ -443,282 +443,282 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
r.push(`All ${reservedNursery} of ${his} children`);
}
r.push(`will be placed in ${V.nurseryName}.`);
- if ((reservedIncubator + reservedNursery < WL) && (reservedChildrenN < freeRooms)) {
- if (V.pregnancyMonitoringUpgrade === 1) {
- linkArray.push(
- App.UI.DOM.link(
- `Inspect pregnancy`,
- () => {
- V.AS = slave.ID;
- },
- [],
- `Analyze Pregnancy`
- )
- );
- }
- linkArray.push(
- App.UI.DOM.link(
- `Keep another child here`,
- () => {
- WombAddToGenericReserve(slave, 'nursery', 1);
- refresh();
- }
- )
- );
- if (reservedNursery > 0) {
- linkArray.push(
- App.UI.DOM.link(
- `Keep one less child here`,
- () => {
- WombCleanGenericReserve(slave, 'nursery', 1);
- refresh();
- }
- )
- );
- }
- if (reservedNursery > 1) {
- linkArray.push(
- App.UI.DOM.link(
- `Keep none of ${his} children here`,
- () => {
- WombCleanGenericReserve(slave, 'nursery', 9999);
- refresh();
- }
- )
- );
- }
- if ((reservedChildrenN + WL - reservedNursery) <= freeRooms) { //GammaNote Maths Order
- linkArray.push(
- App.UI.DOM.link(
- `Keep the rest of ${his} children here`,
- () => {
- WombAddToGenericReserve(slave, 'nursery', 9999);
- refresh();
- }
- )
- );
- }
- } else if ((reservedNursery === WL) || (reservedChildrenN === freeRooms) || (reservedIncubator + reservedNursery === WL)) {
- if (V.pregnancyMonitoringUpgrade === 1) {
- linkArray.push(
- App.UI.DOM.link(
- `Inspect pregnancy`,
- () => {
- V.AS = slave.ID;
- },
- [],
- `Analyze Pregnancy`
- )
- );
- }
- if (reservedNursery > 0) {
- linkArray.push(
- App.UI.DOM.link(
- `Keep one less child here`,
- () => {
- WombCleanGenericReserve(slave, 'nursery', 1);
- refresh();
- }
- )
- );
- }
- if (reservedNursery > 1) {
- linkArray.push(
- App.UI.DOM.link(
- `Keep none of ${his} children here`,
- () => {
- WombCleanGenericReserve(slave, 'nursery', 9999);
- refresh();
- }
- )
- );
- }
- }
+ if ((reservedIncubator + reservedNursery < WL) && (reservedChildrenN < freeRooms)) {
+ if (V.pregnancyMonitoringUpgrade === 1) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Inspect pregnancy`,
+ () => {
+ V.AS = slave.ID;
+ },
+ [],
+ `Analyze Pregnancy`
+ )
+ );
+ }
+ linkArray.push(
+ App.UI.DOM.link(
+ `Keep another child here`,
+ () => {
+ WombAddToGenericReserve(slave, 'nursery', 1);
+ refresh();
+ }
+ )
+ );
+ if (reservedNursery > 0) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Keep one less child here`,
+ () => {
+ WombCleanGenericReserve(slave, 'nursery', 1);
+ refresh();
+ }
+ )
+ );
+ }
+ if (reservedNursery > 1) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Keep none of ${his} children here`,
+ () => {
+ WombCleanGenericReserve(slave, 'nursery', 9999);
+ refresh();
+ }
+ )
+ );
+ }
+ if ((reservedChildrenN + WL - reservedNursery) <= freeRooms) { //GammaNote Maths Order
+ linkArray.push(
+ App.UI.DOM.link(
+ `Keep the rest of ${his} children here`,
+ () => {
+ WombAddToGenericReserve(slave, 'nursery', 9999);
+ refresh();
+ }
+ )
+ );
+ }
+ } else if ((reservedNursery === WL) || (reservedChildrenN === freeRooms) || (reservedIncubator + reservedNursery === WL)) {
+ if (V.pregnancyMonitoringUpgrade === 1) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Inspect pregnancy`,
+ () => {
+ V.AS = slave.ID;
+ },
+ [],
+ `Analyze Pregnancy`
+ )
+ );
+ }
+ if (reservedNursery > 0) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Keep one less child here`,
+ () => {
+ WombCleanGenericReserve(slave, 'nursery', 1);
+ refresh();
+ }
+ )
+ );
+ }
+ if (reservedNursery > 1) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Keep none of ${his} children here`,
+ () => {
+ WombCleanGenericReserve(slave, 'nursery', 9999);
+ refresh();
+ }
+ )
+ );
+ }
+ }
} else if (reservedIncubator + reservedNursery < WL ) {
- r.push(`You have `);
- if (freeRooms === 1) {
- r.push(`an <span class="lime">available aging room.</span>`);
- } else {
- r.push(`<span class="lime">available aging rooms.</span>`);
- }
- if (V.pregnancyMonitoringUpgrade === 1) {
- linkArray.push(
- App.UI.DOM.link(
- `Inspect pregnancy`,
- () => {
- V.AS = slave.ID;
- },
- [],
- `Analyze Pregnancy`
- )
- );
- }
- linkArray.push(
- App.UI.DOM.link(
- `Keep ${(WL > 1) ? "a" : "the"} child here`,
- () => {
- WombAddToGenericReserve(slave, 'nursery', 1);
- refresh();
- }
- )
- );
- if ((WL > 1) && (reservedChildrenN + WL - reservedNursery) <= freeRooms) {
- linkArray.push(
- App.UI.DOM.link(
- `Keep all of ${his} children here`,
- () => {
- WombAddToGenericReserve(slave, 'nursery', 9999);
- refresh();
- }
- )
- );
- }
- }
- if(V.incubator.capacity > 0) {
- if (reservedIncubator > 0) { //GammaNote
- childrenReserved = 1;
- if (WL === 1) {
- r.push(`${His} child`);
- } else if (reservedIncubator < WL) {
- r.push(`${reservedIncubator} of ${his} children`);
- } else if (WL === 2) {
- r.push(`Both of ${his} children`);
- } else {
- r.push(`All ${reservedIncubator} of ${his} children`);
- }
- r.push(`will be placed in ${V.incubator.name}.`);
- if ((reservedIncubator + reservedNursery < WL) && (reservedChildrenI < freeTanks)) {
- if (V.pregnancyMonitoringUpgrade === 1) {
- linkArray.push(
- App.UI.DOM.link(
- `Inspect pregnancy`,
- () => {
- V.AS = slave.ID;
- },
- [],
- `Analyze Pregnancy`
- )
- );
- }
- linkArray.push(
- App.UI.DOM.link(
- `Keep another child in ${V.incubator.name}`,
- () => {
- WombAddToGenericReserve(slave, 'incubator', 1);
- refresh();
- }
- )
- );
- if (reservedIncubator > 0) {
- linkArray.push(
- App.UI.DOM.link(
- `Keep one less child in ${V.incubator.name}`,
- () => {
- WombCleanGenericReserve(slave, 'incubator', 1);
- refresh();
- }
- )
- );
- }
- if (reservedIncubator > 1) {
- linkArray.push(
- App.UI.DOM.link(
- `Keep none of ${his} children in ${V.incubator.name}`,
- () => {
- WombCleanGenericReserve(slave, 'incubator', 9999);
- refresh();
- }
- )
- );
- }
- if ((reservedChildrenI + WL - reservedIncubator) <= freeTanks) { //GammaNote maths order?
- linkArray.push(
- App.UI.DOM.link(
- `Keep the rest of ${his} children in ${V.incubator.name}`,
- () => {
- WombAddToGenericReserve(slave, 'incubator', 9999);
- refresh();
- }
- )
- );
- }
- }
- } else if ((reservedIncubator === WL) || (reservedChildrenI === freeTanks) || (reservedIncubator + reservedNursery === WL)) {
- if (V.pregnancyMonitoringUpgrade === 1) {
- linkArray.push(
- App.UI.DOM.link(
- `Inspect pregnancy`,
- () => {
- V.AS = slave.ID;
- },
- [],
- `Analyze Pregnancy`
- )
- );
- }
- if (reservedIncubator > 0) {
- linkArray.push(
- App.UI.DOM.link(
- `Keep one less child in ${V.incubator.name}`,
- () => {
- WombCleanGenericReserve(slave, 'incubator', 1);
- refresh();
- }
- )
- );
- }
- if (reservedIncubator > 1) {
- linkArray.push(
- App.UI.DOM.link(
- `Keep none of ${his} children in ${V.incubator.name}`,
- () => {
- WombCleanGenericReserve(slave, 'incubator', 9999);
- refresh();
- }
- )
- );
- }
- } else if (reservedIncubator + reservedNursery < WL ) {
- r.push(`You have `);
- if (freeTanks === 1) {
- r.push(`an <span class="lime">available aging tank.</span>`);
- } else {
- r.push(`<span class="lime">available aging tanks.</span>`);
- }
- if (V.pregnancyMonitoringUpgrade === 1) {
- linkArray.push(
- App.UI.DOM.link(
- `Inspect pregnancy`,
- () => {
- V.AS = slave.ID;
- },
- [],
- `Analyze Pregnancy`
- )
- );
- }
- linkArray.push(
- App.UI.DOM.link(
- `Keep ${(WL > 1) ? "a" : "the"} child in ${V.incubator.name}`,
- () => {
- WombAddToGenericReserve(slave, 'incubator', 1);
- refresh();
- }
- )
- );
- if ((WL > 1) && (reservedChildrenN + WL - reservedNursery) <= freeRooms) {
- linkArray.push(
- App.UI.DOM.link(
- `Keep all of ${his} children in ${V.incubator.name}`,
- () => {
- WombAddToGenericReserve(slave, 'incubator', 9999);
- refresh();
- }
- )
- );
- }
- }
- }
+ r.push(`You have `);
+ if (freeRooms === 1) {
+ r.push(`an <span class="lime">available aging room.</span>`);
+ } else {
+ r.push(`<span class="lime">available aging rooms.</span>`);
+ }
+ if (V.pregnancyMonitoringUpgrade === 1) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Inspect pregnancy`,
+ () => {
+ V.AS = slave.ID;
+ },
+ [],
+ `Analyze Pregnancy`
+ )
+ );
+ }
+ linkArray.push(
+ App.UI.DOM.link(
+ `Keep ${(WL > 1) ? "a" : "the"} child here`,
+ () => {
+ WombAddToGenericReserve(slave, 'nursery', 1);
+ refresh();
+ }
+ )
+ );
+ if ((WL > 1) && (reservedChildrenN + WL - reservedNursery) <= freeRooms) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Keep all of ${his} children here`,
+ () => {
+ WombAddToGenericReserve(slave, 'nursery', 9999);
+ refresh();
+ }
+ )
+ );
+ }
+ }
+ if (V.incubator.capacity > 0) {
+ if (reservedIncubator > 0) { //GammaNote
+ childrenReserved = 1;
+ if (WL === 1) {
+ r.push(`${His} child`);
+ } else if (reservedIncubator < WL) {
+ r.push(`${reservedIncubator} of ${his} children`);
+ } else if (WL === 2) {
+ r.push(`Both of ${his} children`);
+ } else {
+ r.push(`All ${reservedIncubator} of ${his} children`);
+ }
+ r.push(`will be placed in ${V.incubator.name}.`);
+ if ((reservedIncubator + reservedNursery < WL) && (reservedChildrenI < freeTanks)) {
+ if (V.pregnancyMonitoringUpgrade === 1) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Inspect pregnancy`,
+ () => {
+ V.AS = slave.ID;
+ },
+ [],
+ `Analyze Pregnancy`
+ )
+ );
+ }
+ linkArray.push(
+ App.UI.DOM.link(
+ `Keep another child in ${V.incubator.name}`,
+ () => {
+ WombAddToGenericReserve(slave, 'incubator', 1);
+ refresh();
+ }
+ )
+ );
+ if (reservedIncubator > 0) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Keep one less child in ${V.incubator.name}`,
+ () => {
+ WombCleanGenericReserve(slave, 'incubator', 1);
+ refresh();
+ }
+ )
+ );
+ }
+ if (reservedIncubator > 1) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Keep none of ${his} children in ${V.incubator.name}`,
+ () => {
+ WombCleanGenericReserve(slave, 'incubator', 9999);
+ refresh();
+ }
+ )
+ );
+ }
+ if ((reservedChildrenI + WL - reservedIncubator) <= freeTanks) { //GammaNote maths order?
+ linkArray.push(
+ App.UI.DOM.link(
+ `Keep the rest of ${his} children in ${V.incubator.name}`,
+ () => {
+ WombAddToGenericReserve(slave, 'incubator', 9999);
+ refresh();
+ }
+ )
+ );
+ }
+ }
+ } else if ((reservedIncubator === WL) || (reservedChildrenI === freeTanks) || (reservedIncubator + reservedNursery === WL)) {
+ if (V.pregnancyMonitoringUpgrade === 1) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Inspect pregnancy`,
+ () => {
+ V.AS = slave.ID;
+ },
+ [],
+ `Analyze Pregnancy`
+ )
+ );
+ }
+ if (reservedIncubator > 0) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Keep one less child in ${V.incubator.name}`,
+ () => {
+ WombCleanGenericReserve(slave, 'incubator', 1);
+ refresh();
+ }
+ )
+ );
+ }
+ if (reservedIncubator > 1) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Keep none of ${his} children in ${V.incubator.name}`,
+ () => {
+ WombCleanGenericReserve(slave, 'incubator', 9999);
+ refresh();
+ }
+ )
+ );
+ }
+ } else if (reservedIncubator + reservedNursery < WL ) {
+ r.push(`You have `);
+ if (freeTanks === 1) {
+ r.push(`an <span class="lime">available aging tank.</span>`);
+ } else {
+ r.push(`<span class="lime">available aging tanks.</span>`);
+ }
+ if (V.pregnancyMonitoringUpgrade === 1) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Inspect pregnancy`,
+ () => {
+ V.AS = slave.ID;
+ },
+ [],
+ `Analyze Pregnancy`
+ )
+ );
+ }
+ linkArray.push(
+ App.UI.DOM.link(
+ `Keep ${(WL > 1) ? "a" : "the"} child in ${V.incubator.name}`,
+ () => {
+ WombAddToGenericReserve(slave, 'incubator', 1);
+ refresh();
+ }
+ )
+ );
+ if ((WL > 1) && (reservedChildrenN + WL - reservedNursery) <= freeRooms) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Keep all of ${his} children in ${V.incubator.name}`,
+ () => {
+ WombAddToGenericReserve(slave, 'incubator', 9999);
+ refresh();
+ }
+ )
+ );
+ }
+ }
+ }
eligibility = 1;
App.Events.addNode(momEl, r, "div");
@@ -746,8 +746,8 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
WombCleanGenericReserve(slave, 'incubator', 9999);
}
if (WombReserveCount(slave, "nursery") !== 0) {
- WombCleanGenericReserve(slave, 'nursery', 9999);
- }
+ WombCleanGenericReserve(slave, 'nursery', 9999);
+ }
}
WombCleanGenericReserve(V.PC, 'incubator', 9999);
WombCleanGenericReserve(V.PC, 'nursery', 9999);
@@ -860,7 +860,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
/** @returns {HTMLDivElement[]} */
get customNodes() {
return [
- this.rooms,
+ this.rooms,
this.mothers,
this.children,
this.targetAge,