Merge branch 'hotfixes' into 'pregmod-master'

Nursery reservation bugfix

Closes #3445

See merge request pregmodfan/fc-pregmod!10247

src/facilities/nursery/nursery.js

@@ -320,19 +320,18 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
 			let eligibility = 0;
 			let linkArray;
 			const reservedChildren = FetusGlobalReserveCount("incubator");
-			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 tank upon birth. Of ${V.incubator.capacity} tanks, ${freeTanks}`);
-			if (freeTanks === 1) {
+			const freeRooms = V.nursery - V.nurseryChildren;
+			r.push(`Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of ${V.nursery} rooms, ${freeRooms}`);
+			if (freeRooms === 1) {
 				r.push(`is`);
 			} else {
 				r.push(`are`);
 			}
 			r.push(`unoccupied. Of those, ${reservedChildren}`);
 			if (reservedChildren === 1) {
-				r.push(`tank is`);
+				r.push(`room is`);
 			} else {
-				r.push(`tanks are`);
+				r.push(`rooms are`);
 			}
 			r.push(`reserved.`);
 			App.Events.addNode(el, r, "div");
@@ -389,7 +388,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
 						const {
 							His, his
 						} = getPronouns(slave);
-						const freeTanks = V.incubator.capacity - incubatorSlaves;
+						const freeRooms = V.nursery - V.nurseryChildren;
 						const WL = slave.womb.length;
 						const reservedIncubator = WombReserveCount(slave, "incubator");
 						const reservedNursery = WombReserveCount(slave, "nursery");
@@ -449,8 +448,8 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
 							} else {
 								r.push(`All ${reservedIncubator} of ${his} children`);
 							}
-							r.push(`will be placed in ${V.incubator.name}.`);
-							if ((reservedIncubator + reservedNursery < WL) && (reservedChildren < freeTanks)) {
+							r.push(`will be placed in ${V.nurseryName}.`);
+							if ((reservedIncubator + reservedNursery < WL) && (reservedChildren < freeRooms)) {
 								if (V.pregnancyMonitoringUpgrade === 1) {
 									linkArray.push(
 										App.UI.DOM.link(
@@ -494,7 +493,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
 										)
 									);
 								}
-								if ((reservedChildren + WL - reservedIncubator) <= freeTanks) {
+								if ((reservedChildren + WL - reservedIncubator) <= freeRooms) {
 									linkArray.push(
 										App.UI.DOM.link(
 											`Keep the rest of ${his} children`,
@@ -505,7 +504,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
 										)
 									);
 								}
-							} else if ((reservedIncubator === WL) || (reservedChildren === freeTanks) || (reservedIncubator + reservedNursery === WL)) {
+							} else if ((reservedIncubator === WL) || (reservedChildren === freeRooms) || (reservedIncubator + reservedNursery === WL)) {
 								if (V.pregnancyMonitoringUpgrade === 1) {
 									linkArray.push(
 										App.UI.DOM.link(
@@ -539,7 +538,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
 									);
 								}
 							}
-						} else if (reservedChildren < freeTanks) {
+						} else if (reservedChildren < freeRooms) {
 							if (WL - reservedNursery === 0) {
 								r.push(App.UI.DOM.makeElement("span", `${His} children are already reserved for ${V.nurseryName}`, "note"));
 								if (V.pregnancyMonitoringUpgrade === 1) {
@@ -565,10 +564,10 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
 								);
 							} else {
 								r.push(`You have `);
-								if (freeTanks === 1) {
-									r.push(`an <span class="lime">available aging tank.</span>`);
+								if (freeRooms === 1) {
+									r.push(`an <span class="lime">available aging room.</span>`);
 								} else {
-									r.push(`<span class="lime">available aging tanks.</span>`);
+									r.push(`<span class="lime">available aging rooms.</span>`);
 								}
 								if (V.pregnancyMonitoringUpgrade === 1) {
 									if (V.pregnancyMonitoringUpgrade === 1) {
@@ -593,7 +592,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
 										}
 									)
 								);
-								if ((WL > 1) && (reservedChildren + WL - reservedIncubator) <= freeTanks) {
+								if ((WL > 1) && (reservedChildren + WL - reservedIncubator) <= freeRooms) {
 									linkArray.push(
 										App.UI.DOM.link(
 											`Keep all of ${his} children`,
@@ -605,7 +604,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
 									);
 								}
 							}
-						} else if (reservedChildren === freeTanks) {
+						} else if (reservedChildren === freeRooms) {
 							if (V.pregnancyMonitoringUpgrade === 1) {
 								linkArray.push(
 									App.UI.DOM.link(