diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index e087e17aca766a155fc6aac5053c8f15fe44b8c8..74d66e04b7d3fb726abd7b0516082f8857aaf05c 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -605,7 +605,6 @@ App.Data.resetOnNGPlus = {
incubatorPregAdaptationPower: 0,
incubatorName: "the Incubator",
- reservedChildren: 0,
tanks: [],
clinicDecoration: "standard",
diff --git a/src/facilities/incubator/incubatorInteract.js b/src/facilities/incubator/incubatorInteract.js
index af82760e8aaa130ece72c03f66cdc8bbd68853f2..1469610c2f7442d99c92362b963d14807dcca334 100644
--- a/src/facilities/incubator/incubatorInteract.js
+++ b/src/facilities/incubator/incubatorInteract.js
@@ -5,8 +5,6 @@ App.UI.incubator = function() {
V.encyclopedia = "The Incubation Facility";
V.readySlaves = 0;
V.readySlave = 0;
- V.reservedChildren = FetusGlobalReserveCount("incubator");
- V.reservedChildrenNursery = FetusGlobalReserveCount("nursery");
let tankOrgans = {};
const el = new DocumentFragment();
@@ -112,6 +110,7 @@ App.UI.incubator = function() {
let r = [];
let eligibility = 0;
let linkArray;
+ const reservedChildren = FetusGlobalReserveCount("incubator");
const incubatorSlaves = V.tanks.length;
const freeTanks = V.incubator - incubatorSlaves;
r.push(`Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of ${V.incubator} tanks, ${freeTanks}`);
@@ -120,8 +119,8 @@ App.UI.incubator = function() {
} else {
r.push(`are`);
}
- r.push(`unoccupied. Of those, ${V.reservedChildren}`);
- if (V.reservedChildren === 1) {
+ r.push(`unoccupied. Of those, ${reservedChildren}`);
+ if (reservedChildren === 1) {
r.push(`tank is`);
} else {
r.push(`tanks are`);
@@ -262,7 +261,7 @@ App.UI.incubator = function() {
} else {
r.push(`All ${_reservedIncubator} of ${his} children will be placed in ${V.incubatorName}.`);
}
- if ((_reservedIncubator + _reservedNursery < _WL) && (V.reservedChildren < freeTanks)) {
+ if ((_reservedIncubator + _reservedNursery < _WL) && (reservedChildren < freeTanks)) {
if (V.pregnancyMonitoringUpgrade === 1) {
linkArray.push(
App.UI.DOM.link(
@@ -306,7 +305,7 @@ App.UI.incubator = function() {
)
);
}
- if ((V.reservedChildren + _WL - _reservedIncubator) <= freeTanks) {
+ if ((reservedChildren + _WL - _reservedIncubator) <= freeTanks) {
linkArray.push(
App.UI.DOM.link(
`Keep the rest of ${his} children`,
@@ -317,7 +316,7 @@ App.UI.incubator = function() {
)
);
}
- } else if ((_reservedIncubator === _WL) || (V.reservedChildren === freeTanks) || (_reservedIncubator + _reservedNursery === _WL)) {
+ } else if ((_reservedIncubator === _WL) || (reservedChildren === freeTanks) || (_reservedIncubator + _reservedNursery === _WL)) {
if (V.pregnancyMonitoringUpgrade === 1) {
linkArray.push(
App.UI.DOM.link(
@@ -351,7 +350,7 @@ App.UI.incubator = function() {
);
}
}
- } else if ((V.reservedChildren < freeTanks)) {
+ } else if ((reservedChildren < freeTanks)) {
if (_WL - _reservedNursery === 0) {
r.push(App.UI.DOM.makeElement("span", `${His} children are already reserved for V.nurseryName`, "note"));
if (V.pregnancyMonitoringUpgrade === 1) {
@@ -405,7 +404,7 @@ App.UI.incubator = function() {
}
)
);
- if ((_WL > 1) && (V.reservedChildren + _WL - _reservedIncubator) <= freeTanks) {
+ if ((_WL > 1) && (reservedChildren + _WL - _reservedIncubator) <= freeTanks) {
linkArray.push(
App.UI.DOM.link(
`Keep all of ${his} children`,
@@ -417,7 +416,7 @@ App.UI.incubator = function() {
);
}
}
- } else if (V.reservedChildren === freeTanks) {
+ } else if (reservedChildren === freeTanks) {
if (V.pregnancyMonitoringUpgrade === 1) {
linkArray.push(
App.UI.DOM.link(
@@ -450,7 +449,7 @@ App.UI.incubator = function() {
App.UI.DOM.appendNewElement("div", el, `You have no pregnant slaves bearing eligible children.`, "note");
}
- if (V.reservedChildren !== 0 || childrenReserved === 1) {
+ if (reservedChildren !== 0 || childrenReserved === 1) {
/* the oops I made it go negative somehow button */
App.UI.DOM.appendNewElement(
"div",
@@ -520,6 +519,7 @@ App.UI.incubator = function() {
const el = new DocumentFragment();
let r = [];
let linkArray = [];
+ const reservedChildren = FetusGlobalReserveCount("incubator");
const incubatorSlaves = V.tanks.length;
const freeTanks = V.incubator - incubatorSlaves;
const _WL = V.PC.womb.length;
@@ -545,7 +545,7 @@ App.UI.incubator = function() {
r.push(`All ${_reservedIncubator} of your children will be placed in ${V.incubatorName}.`);
}
- if ((_reservedIncubator < _WL) && (V.reservedChildren < freeTanks) && (_reservedIncubator - _reservedNursery > 0)) {
+ if ((_reservedIncubator < _WL) && (reservedChildren < freeTanks) && (_reservedIncubator - _reservedNursery > 0)) {
if (V.pregnancyMonitoringUpgrade === 1) {
linkArray.push(
App.UI.DOM.link(
@@ -587,7 +587,7 @@ App.UI.incubator = function() {
)
);
}
- if ((V.reservedChildren + _WL - _reservedIncubator) <= freeTanks) {
+ if ((reservedChildren + _WL - _reservedIncubator) <= freeTanks) {
linkArray.push(
App.UI.DOM.link(
`Keep the rest of your children`,
@@ -598,7 +598,7 @@ App.UI.incubator = function() {
)
);
}
- } else if ((_reservedIncubator === _WL) || (V.reservedChildren === freeTanks) || (_reservedIncubator - _reservedNursery >= 0)) {
+ } else if ((_reservedIncubator === _WL) || (reservedChildren === freeTanks) || (_reservedIncubator - _reservedNursery >= 0)) {
if (V.pregnancyMonitoringUpgrade === 1) {
linkArray.push(
App.UI.DOM.link(
@@ -613,7 +613,7 @@ App.UI.incubator = function() {
App.UI.DOM.link(
`Keep one less child`,
() => {
- V.reservedChildren -= 1;
+ WombCleanGenericReserve(V.PC, 'incubator', 1);
refresh();
}
)
@@ -628,7 +628,7 @@ App.UI.incubator = function() {
);
}
}
- } else if (V.reservedChildren < freeTanks) {
+ } else if (reservedChildren < freeTanks) {
if (_WL - _reservedNursery === 0) {
r.push(
App.UI.DOM.makeElement(
@@ -668,7 +668,7 @@ App.UI.incubator = function() {
refresh();
}
);
- if ((_WL > 1) && (V.reservedChildren + _WL - _reservedIncubator) <= freeTanks) {
+ if ((_WL > 1) && (reservedChildren + _WL - _reservedIncubator) <= freeTanks) {
App.UI.DOM.link(
`Keep all of your children|Incubator`,
() => {
@@ -678,7 +678,7 @@ App.UI.incubator = function() {
);
}
}
- } else if (V.reservedChildren === freeTanks) {
+ } else if (reservedChildren === freeTanks) {
if (V.pregnancyMonitoringUpgrade === 1) {
linkArray.push(
App.UI.DOM.link(
@@ -710,6 +710,7 @@ App.UI.incubator = function() {
const el = new DocumentFragment();
let row;
let linkArray;
+ const reservedChildren = FetusGlobalReserveCount("incubator");
const incubatorSlaves = V.tanks.length;
if (incubatorSlaves > 0) {
App.UI.DOM.appendNewElement("h2", el, `Children in ${V.incubatorName}`);
@@ -1087,14 +1088,14 @@ App.UI.incubator = function() {
}
}
- for (let i = 0; i < V.reservedChildren; i++) {
+ for (let i = 0; i < reservedChildren; i++) {
const empty = document.createElement("div");
empty.classList.add("incubator-tank");
empty.append("This tank is currently reserved");
el.append(empty);
}
const freeTanks = V.incubator - incubatorSlaves;
- const empty = freeTanks - V.reservedChildren;
+ const empty = freeTanks - reservedChildren;
if (empty) {
for (let i = 0; i < empty; i++) {
const empty = document.createElement("div");
@@ -1115,7 +1116,7 @@ App.UI.incubator = function() {
el.append(empty);
}
}
- // if (V.incubator > 1 && V.reservedChildren < freeTanks)
+ // if (V.incubator > 1 && reservedChildren < freeTanks)
return el;
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index c2fc4eb2118ab7e90d97edd70f192cd3c6ca9fae..4700ad94edeb464e2db7d7096180c24e8f5b2c9c 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -4,7 +4,7 @@
<<set $targetAgeNursery = Number($targetAgeNursery) || $minimumSlaveAge>>
<<set $targetAgeNursery = Math.clamp($targetAgeNursery, $minimumSlaveAge, 42)>>
-<<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")>>
+<<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">
<<set _nurseryNameCaps = capFirstChar($nurseryName)>>
_nurseryNameCaps
@@ -86,7 +86,7 @@
_nurseryNameCaps is empty and quiet.
<div class="choices" style="font-style:normal">
<<link "Decommission the Nursery" "Main">>
- <<set $nursery = 0, $nurseryNannies = 0, $nannyInfluence = 0, $nurseryDecoration = "standard", $cribs = [], $reservedChildrenNursery = 0>>
+ <<set $nursery = 0, $nurseryNannies = 0, $nannyInfluence = 0, $nurseryDecoration = "standard", $cribs = [], _reservedChildrenNursery = 0>>
<<for _i = 0; _i < $slaves.length; _i++>>
<<run WombCleanGenericReserve($slaves[_i], "nursery", 9999)>>
<</for>>
@@ -159,7 +159,7 @@
<div id="pregnant-slaves" class="tab-content">
<div id="content">
<br><br>
- Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $nursery rooms, <<print _freecribs>> <<if _freecribs == 1>>is<<else>>are<</if>> unoccupied. Of those, $reservedChildrenNursery room<<if $reservedChildrenNursery == 1>> is<<else>>s are<</if>> reserved.
+ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $nursery rooms, <<print _freecribs>> <<if _freecribs == 1>>is<<else>>are<</if>> unoccupied. Of those, _reservedChildrenNursery room<<if _reservedChildrenNursery == 1>> is<<else>>s are<</if>> reserved.
<<if (0 < _SL)>>
<<set $sortNurseryList = $sortNurseryList || 'Unsorted'>>
@@ -239,7 +239,7 @@
<<else>>
All _reservedNursery of $his children will be placed in $nurseryName.
<</if>>
- <<if (_reservedIncubator + _reservedNursery < _WL) && ($reservedChildrenNursery < _freecribs)>>
+ <<if (_reservedIncubator + _reservedNursery < _WL) && (_reservedChildrenNursery < _freecribs)>>
<br>
<<print "[[Keep another child|Nursery][WombAddToGenericReserve($slaves[" + _u + "], 'nursery', 1)]]">>
<<if _reservedNursery > 0>>
@@ -248,17 +248,17 @@
<<if _reservedNursery > 1>>
| <<print "[[Keep none of " + $his + " children|Nursery][WombCleanGenericReserve($slaves[" + _u + "], 'nursery', 9999)]]">>
<</if>>
- <<if ($reservedChildrenNursery + _WL - _reservedNursery) <= _freecribs>>
+ <<if (_reservedChildrenNursery + _WL - _reservedNursery) <= _freecribs>>
| <<print "[[Keep the rest of " + $his + " children|Nursery][WombAddToGenericReserve($slaves[" + _u + "], 'nursery', 9999)]]">>
<</if>>
- <<elseif (_reservedNursery == _WL) || ($reservedChildrenNursery == _freecribs) || (_reservedIncubator + _reservedNursery == _WL)>>
+ <<elseif (_reservedNursery == _WL) || (_reservedChildrenNursery == _freecribs) || (_reservedIncubator + _reservedNursery == _WL)>>
<br>
<<print "[[Keep one less child|Nursery][WombCleanGenericReserve($slaves[" + _u + "], 'nursery', 1)]]">>
<<if _reservedNursery > 1>>
| <<print "[[Keep none of " + $his + " children|Nursery][WombCleanGenericReserve($slaves[" + _u + "], 'nursery', 9999)]]">>
<</if>>
<</if>>
- <<elseif ($reservedChildrenNursery < _freecribs) && (_freecribs > _WL)>>
+ <<elseif (_reservedChildrenNursery < _freecribs) && (_freecribs > _WL)>>
<<if _WL - _reservedIncubator == 0>>
<span class="note">
$His children are already reserved for $incubatorName
@@ -269,11 +269,11 @@
You have <<if _freecribs == 1>>an<</if>> @@.lime;available room<<if _freecribs > 1>>s<</if>>.@@
<br>
<<print "[[Keep "+ ((_WL > 1) ? "a" : "the") +" child|Nursery][WombAddToGenericReserve($slaves[" + _u + "], 'nursery', 1)]]">>
- <<if (_WL > 1) && ($reservedChildrenNursery + _WL - _reservedNursery) <= _freecribs>>
+ <<if (_WL > 1) && (_reservedChildrenNursery + _WL - _reservedNursery) <= _freecribs>>
| <<print "[[Keep all of " + $his + " children|Nursery][WombAddToGenericReserve($slaves[" + _u + "], 'nursery', 9999)]]">>
<</if>>
<</if>>
- <<elseif $reservedChildrenNursery == _freecribs>>
+ <<elseif _reservedChildrenNursery == _freecribs>>
<br>
You have @@.red;no room for $his offspring.@@
<</if>>
@@ -319,7 +319,7 @@
</span>
<</if>>
- <<if $nursery > 1 && $reservedChildrenNursery < _freecribs>>
+ <<if $nursery > 1 && _reservedChildrenNursery < _freecribs>>
<div class="choices">
[[Remove a room|Nursery][cashX(forceNeg(Math.trunc(1000*$upgradeMultiplierArcology)), "nursery"), $nursery -= 5]]
<span class="note">
diff --git a/src/interaction/siPhysicalRegimen.js b/src/interaction/siPhysicalRegimen.js
index c9be27122eb1c20dfcc73095484db371c9711ae2..1a47b9f7133fb5edf1597d7d629ba9b184820476 100644
--- a/src/interaction/siPhysicalRegimen.js
+++ b/src/interaction/siPhysicalRegimen.js
@@ -539,7 +539,7 @@ App.UI.SlaveInteract.physicalRegimen = function(slave) {
}
function incubator() {
- V.reservedChildren = FetusGlobalReserveCount("incubator");
+ const reservedChildren = FetusGlobalReserveCount("incubator");
let _reservedIncubator = WombReserveCount(slave, "incubator");
let _reservedNursery = WombReserveCount(slave, "nursery");
let _WL = slave.womb.length;
@@ -565,7 +565,7 @@ App.UI.SlaveInteract.physicalRegimen = function(slave) {
} else {
title.textContent = `All ${_reservedIncubator} of ${his} children will be placed in ${V.incubatorName}. `;
}
- if ((_reservedIncubator + _reservedNursery < _WL) && (V.reservedChildren < freeTanks)) {
+ if ((_reservedIncubator + _reservedNursery < _WL) && (reservedChildren < freeTanks)) {
linkArray.push(
App.UI.DOM.link(`Keep another child`, () => wombUpdateIncubator(1, true))
);
@@ -579,12 +579,12 @@ App.UI.SlaveInteract.physicalRegimen = function(slave) {
App.UI.DOM.link(`Keep none of ${his} children`, () => wombUpdateIncubator(9999, false))
);
}
- if ((V.reservedChildren + _WL - _reservedIncubator) <= freeTanks) {
+ if ((reservedChildren + _WL - _reservedIncubator) <= freeTanks) {
linkArray.push(
App.UI.DOM.link(`Keep the rest of ${his} children`, () => wombUpdateIncubator(9999, true))
);
}
- } else if ((_reservedIncubator === _WL) || (V.reservedChildren === freeTanks) || (_reservedIncubator - _reservedNursery >= 0)) {
+ } else if ((_reservedIncubator === _WL) || (reservedChildren === freeTanks) || (_reservedIncubator - _reservedNursery >= 0)) {
linkArray.push(
App.UI.DOM.link(`Keep one less child`, () => wombUpdateIncubator(1, false))
);
@@ -594,7 +594,7 @@ App.UI.SlaveInteract.physicalRegimen = function(slave) {
);
}
}
- } else if (V.reservedChildren < freeTanks) {
+ } else if (reservedChildren < freeTanks) {
title.textContent = `${He} is pregnant and you have `;
if (freeTanks === 1) {
title.textContent += `an `;
@@ -611,12 +611,12 @@ App.UI.SlaveInteract.physicalRegimen = function(slave) {
App.UI.DOM.link(`Keep ${_cCount} child`, () => wombUpdateIncubator(1, true))
);
title.appendChild(tank);
- if ((_WL > 1) && (V.reservedChildren + _WL) <= freeTanks) {
+ if ((_WL > 1) && (reservedChildren + _WL) <= freeTanks) {
linkArray.push(
App.UI.DOM.link(`Keep all of ${his} children`, () => wombUpdateIncubator(9999, true))
);
}
- } else if (V.reservedChildren === freeTanks) {
+ } else if (reservedChildren === freeTanks) {
title.textContent = `You have no available tanks for ${his} children. `;
}
}
@@ -632,7 +632,6 @@ App.UI.SlaveInteract.physicalRegimen = function(slave) {
} else {
WombCleanGenericReserve(slave, "incubator", count);
}
- V.reservedChildren = FetusGlobalReserveCount("incubator");
refresh();
}
@@ -642,7 +641,7 @@ App.UI.SlaveInteract.physicalRegimen = function(slave) {
function nursery() {
let el = document.createElement('div');
if (V.nursery > 0) {
- V.reservedChildrenNursery = FetusGlobalReserveCount("nursery");
+ const reservedChildrenNursery = FetusGlobalReserveCount("nursery");
let reservedIncubator = WombReserveCount(slave, "incubator");
let reservedNursery = WombReserveCount(slave, "nursery");
let _WL = slave.womb.length;
@@ -651,7 +650,6 @@ App.UI.SlaveInteract.physicalRegimen = function(slave) {
let title = document.createElement('div');
const linkArray = [];
if (_WL - reservedIncubator === 0) {
- V.reservedChildren = 0;
title.textContent = `${His} children are already reserved for ${V.incubatorName}`;
title.style.fontStyle = "italic";
} else {
@@ -666,7 +664,7 @@ App.UI.SlaveInteract.physicalRegimen = function(slave) {
} else {
title.textContent = `All ${reservedNursery} of ${his} children will be placed in ${V.nurseryName}. `;
}
- if ((reservedIncubator + reservedNursery < _WL) && (V.reservedChildrenNursery < freeCribs)) {
+ if ((reservedIncubator + reservedNursery < _WL) && (reservedChildrenNursery < freeCribs)) {
linkArray.push(
App.UI.DOM.link(`Keep another child`, () => wombUpdateNursery(1, true))
);
@@ -681,12 +679,12 @@ App.UI.SlaveInteract.physicalRegimen = function(slave) {
App.UI.DOM.link(`Keep none of ${his} children`, () => wombUpdateNursery(9999, false))
);
}
- if ((V.reservedChildrenNursery + _WL - reservedNursery) <= freeCribs) {
+ if ((reservedChildrenNursery + _WL - reservedNursery) <= freeCribs) {
linkArray.push(
App.UI.DOM.link(`Keep the rest of ${his} children`, () => wombUpdateNursery(9999, true))
);
}
- } else if ((reservedNursery === _WL) || (V.reservedChildrenNursery === freeCribs) || (reservedNursery - reservedIncubator >= 0)) {
+ } else if ((reservedNursery === _WL) || (reservedChildrenNursery === freeCribs) || (reservedNursery - reservedIncubator >= 0)) {
linkArray.push(
App.UI.DOM.link(`Keep one less child`, () => wombUpdateNursery(1, false))
);
@@ -697,7 +695,7 @@ App.UI.SlaveInteract.physicalRegimen = function(slave) {
);
}
}
- } else if (V.reservedChildrenNursery < freeCribs) {
+ } else if (reservedChildrenNursery < freeCribs) {
title.textContent = `${He} is pregnant and you have `;
if (freeCribs === 1) {
title.textContent += `an `;
@@ -714,12 +712,12 @@ App.UI.SlaveInteract.physicalRegimen = function(slave) {
App.UI.DOM.link(`Keep ${_cCount} child`, () => wombUpdateNursery(1, true))
);
title.appendChild(crib);
- if ((_WL > 1) && (V.reservedChildrenNursery + _WL) <= freeCribs) {
+ if ((_WL > 1) && (reservedChildrenNursery + _WL) <= freeCribs) {
linkArray.push(
App.UI.DOM.link(`Keep all of ${his} children`, () => wombUpdateNursery(9999, true))
);
}
- } else if (V.reservedChildrenNursery === freeCribs) {
+ } else if (reservedChildrenNursery === freeCribs) {
title.textContent = `You have no available rooms for ${his} children. `;
}
}
@@ -734,7 +732,7 @@ App.UI.SlaveInteract.physicalRegimen = function(slave) {
WombAddToGenericReserve(slave, "nursery", count);
} else {
WombCleanGenericReserve(slave, "nursery", count);
- } V.reservedChildren = FetusGlobalReserveCount("nursery");
+ } reservedChildren = FetusGlobalReserveCount("nursery");
refresh();
}
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 7dfeae3a9ba6cf6ffbdde6e6f64fc1d8f73ca569..c576d479d20414a8e2b8b727addc89f4f579e891 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -1141,8 +1141,6 @@ globalThis.DefaultRules = (function() {
slave.abortionTat++;
cashX(forceNeg(V.modCost), "slaveMod", slave);
}
- V.reservedChildren = FetusGlobalReserveCount("incubator");
- V.reservedChildrenNursery = FetusGlobalReserveCount("nursery");
TerminatePregnancy(slave);
slave.counter.abortions++;
V.abortionsTotal++;
diff --git a/src/js/birth/birth.js b/src/js/birth/birth.js
index 6ef09937db749fc9affb62c1c3d599946dc1fb9a..59ca7fdfa4b27266aa77391ae15c4cb19e0baa81 100644
--- a/src/js/birth/birth.js
+++ b/src/js/birth/birth.js
@@ -6,8 +6,6 @@ globalThis.allBirths = function() {
el.append(sectionBreak());
}
}
- V.reservedChildren = FetusGlobalReserveCount("incubator");
- V.reservedChildrenNursery = FetusGlobalReserveCount("nursery");
V.birthee = 0;
V.birthIDs = [];
diff --git a/src/npc/agent/agentCompany.tw b/src/npc/agent/agentCompany.tw
index feaf9316e0fb318c791591fc3be1755bec6fd2d4..c8ea98825ad766a54c166e5918e623e39c211404 100644
--- a/src/npc/agent/agentCompany.tw
+++ b/src/npc/agent/agentCompany.tw
@@ -4,9 +4,6 @@
<<= assignJob(getSlave($AS), "live with your agent")>>
-<<set $reservedChildren = FetusGlobalReserveCount("incubator")>>
-<<set $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
-
<<if getSlave($AS).rivalry > 0>>
<<set _i = $slaveIndices[getSlave($AS).rivalryTarget]>>
<<if def _i>>
diff --git a/src/npc/agent/agentWorkaround.tw b/src/npc/agent/agentWorkaround.tw
index 9a0412913bca906d783ad0181089556796fd90ba..ef889c54f42cbb71329940ded6f9536ff0703436 100644
--- a/src/npc/agent/agentWorkaround.tw
+++ b/src/npc/agent/agentWorkaround.tw
@@ -4,9 +4,6 @@
<<= assignJob($slaves[$i], "be your agent")>>
-<<set $reservedChildren = FetusGlobalReserveCount("incubator")>>
-<<set $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
-
<<if $slaves[$i].rivalry > 0>>
<<set _i = $slaveIndices[$slaves[$i].rivalryTarget]>>
<<if def _i>>
diff --git a/src/npc/interaction/passage/abort.tw b/src/npc/interaction/passage/abort.tw
index e714f3aff7b8842f1e95adbdc0c1dc54e7d90017..a1a7a7b2d5b1c8d0a36ac8f719a5b8c324e8d636 100644
--- a/src/npc/interaction/passage/abort.tw
+++ b/src/npc/interaction/passage/abort.tw
@@ -43,9 +43,6 @@ The remote surgery makes aborting a pregnancy quick and efficient.
<<if lastPregRule(getSlave($AS),$defaultRules)>><<set getSlave($AS).preg = -1>><<else>><<set getSlave($AS).preg = 0>><</if>>
-<<set $reservedChildren = FetusGlobalReserveCount("incubator")>>
-<<set $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
-
<<run TerminatePregnancy(getSlave($AS))>>
<<set getSlave($AS).counter.abortions++>>
<<set $abortionsTotal++>>
diff --git a/src/pregmod/analyzePlayerPregnancy.tw b/src/pregmod/analyzePlayerPregnancy.tw
index fc97a1ffaecb155367b853a2ac8617a399a47252..299ed1daa31fa29881b7a8e99e36b86f8f6162c6 100644
--- a/src/pregmod/analyzePlayerPregnancy.tw
+++ b/src/pregmod/analyzePlayerPregnancy.tw
@@ -29,15 +29,15 @@
<<if _incubatorReservations > 0>>
<<link "Remove all of your children from $incubatorName" "Analyze PC Pregnancy">>
<<run WombChangeReserveType($PC, "incubator", "")>>
- <<set $reservedChildren -= _incubatorReservations>>
+ <<set _reservedChildren -= _incubatorReservations>>
<</link>> |
<</if>>
- <<if _incubatorReservations < _WL && ($reservedChildren + _WL - _incubatorReservations <= _freeTanks)>>
+ <<if _incubatorReservations < _WL && (_reservedChildren + _WL - _incubatorReservations <= _freeTanks)>>
<<link "Keep all of your children in $incubatorName" "Analyze PC Pregnancy">>
<<run WombChangeReserveType($PC, "nursery", "incubator")>>
<<run WombChangeReserveType($PC, "", "incubator")>>
- <<set $reservedChildrenNursery -= _nurseryReservations>>
- <<set $reservedChildren += _WL - _incubatorReservations>>
+ <<set _reservedChildrenNursery -= _nurseryReservations>>
+ <<set _reservedChildren += _WL - _incubatorReservations>>
<</link>>
<<elseif _incubatorReservations < _WL>>
There is not enough free space in $incubatorName for the rest of your children.
@@ -50,15 +50,15 @@
<<if _nurseryReservations > 0>>
<<link "Remove all of your children from $nurseryName" "Analyze PC Pregnancy">>
<<run WombChangeReserveType($PC, "nursery", "")>>
- <<set $reservedChildrenNursery -= _nurseryReservations>>
+ <<set _reservedChildrenNursery -= _nurseryReservations>>
<</link>> |
<</if>>
- <<if _nurseryReservations < _WL && ($reservedChildrenNursery + _WL - _nurseryReservations <= _freeCribs)>>
+ <<if _nurseryReservations < _WL && (_reservedChildrenNursery + _WL - _nurseryReservations <= _freeCribs)>>
<<link "Keep all of your children in $nurseryName" "Analyze PC Pregnancy">>
<<run WombChangeReserveType($PC, "incubator", "nursery")>>
<<run WombChangeReserveType($PC, "", "nursery")>>
- <<set $reservedChildren -= _incubatorReservations>>
- <<set $reservedChildrenNursery += _WL - _nurseryReservations>>
+ <<set _reservedChildren -= _incubatorReservations>>
+ <<set _reservedChildrenNursery += _WL - _nurseryReservations>>
<</link>>
<<elseif _nurseryReservations < _WL>>
There is not enough free space in $nurseryName for the rest of your children.
@@ -304,15 +304,15 @@
<<if $PC.womb[_ap].reserve === "incubator">>
<<link "Don't keep this child $incubatorName" "Analyze PC Pregnancy">>
<<set $PC.womb[_ap].reserve = "">>
- <<set $reservedChildren-->>
+ <<set _reservedChildren-->>
<</link>>
- <<elseif _freeTanks - $reservedChildren > 0>>
+ <<elseif _freeTanks - _reservedChildren > 0>>
<<link "Keep this child in $incubatorName" "Analyze PC Pregnancy">>
<<if $PC.womb[_ap].reserve === "nursery">>
- <<set $reservedChildrenNursery-->>
+ <<set _reservedChildrenNursery-->>
<</if>>
<<set $PC.womb[_ap].reserve = "incubator">>
- <<set $reservedChildren++>>
+ <<set _reservedChildren++>>
<</link>>
<<else>>
There is not enough free space to keep this child in $incubatorName.
@@ -324,15 +324,15 @@
<<if $PC.womb[_ap].reserve === "nursery">>
<<link "Don't keep this child in $nurseryName" "Analyze PC Pregnancy">>
<<set $PC.womb[_ap].reserve = "">>
- <<set $reservedChildrenNursery-->>
+ <<set _reservedChildrenNursery-->>
<</link>>
- <<elseif _freeCribs - $reservedChildrenNursery > 0>>
+ <<elseif _freeCribs - _reservedChildrenNursery > 0>>
<<link "Keep this child in $nurseryName" "Analyze PC Pregnancy">>
<<if $PC.womb[_ap].reserve === "incubator">>
- <<set $reservedChildren-->>
+ <<set _reservedChildren-->>
<</if>>
<<set $PC.womb[_ap].reserve = "nursery">>
- <<set $reservedChildrenNursery++>>
+ <<set _reservedChildrenNursery++>>
<</link>>
<<else>>
There is not enough free space to keep this child in $nurseryName.
diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw
index 10162e134dc49ff9d4508ccb3f72ff9d6d157b47..d2689d1e4b62bd3deb8122bb31cb61903e64d003 100644
--- a/src/pregmod/analyzePregnancy.tw
+++ b/src/pregmod/analyzePregnancy.tw
@@ -65,15 +65,15 @@
<<if _incubatorReservations > 0>>
<<link "Remove all of $his children from $incubatorName" "Analyze Pregnancy">>
<<run WombChangeReserveType(getSlave($AS), "incubator", "")>>
- <<set $reservedChildren -= _incubatorReservations>>
+ <<set _reservedChildren -= _incubatorReservations>>
<</link>> |
<</if>>
- <<if _incubatorReservations < _WL && ($reservedChildren + _WL - _incubatorReservations <= _freeTanks)>>
+ <<if _incubatorReservations < _WL && (_reservedChildren + _WL - _incubatorReservations <= _freeTanks)>>
<<link "Keep all of $his children in $incubatorName" "Analyze Pregnancy">>
<<run WombChangeReserveType(getSlave($AS), "nursery", "incubator")>>
<<run WombChangeReserveType(getSlave($AS), "", "incubator")>>
- <<set $reservedChildrenNursery -= _nurseryReservations>>
- <<set $reservedChildren += _WL - _incubatorReservations>>
+ <<set _reservedChildrenNursery -= _nurseryReservations>>
+ <<set _reservedChildren += _WL - _incubatorReservations>>
<</link>>
<<elseif _incubatorReservations < _WL>>
There is not enough free space in $incubatorName for the rest of $his children.
@@ -86,15 +86,15 @@
<<if _nurseryReservations > 0>>
<<link "Remove all of $his children from $nurseryName" "Analyze Pregnancy">>
<<run WombChangeReserveType(getSlave($AS), "nursery", "")>>
- <<set $reservedChildrenNursery -= _nurseryReservations>>
+ <<set _reservedChildrenNursery -= _nurseryReservations>>
<</link>> |
<</if>>
- <<if _nurseryReservations < _WL && ($reservedChildrenNursery + _WL - _nurseryReservations <= _freeCribs)>>
+ <<if _nurseryReservations < _WL && (_reservedChildrenNursery + _WL - _nurseryReservations <= _freeCribs)>>
<<link "Keep all of $his children in $nurseryName" "Analyze Pregnancy">>
<<run WombChangeReserveType(getSlave($AS), "incubator", "nursery")>>
<<run WombChangeReserveType(getSlave($AS), "", "nursery")>>
- <<set $reservedChildren -= _incubatorReservations>>
- <<set $reservedChildrenNursery += _WL - _nurseryReservations>>
+ <<set _reservedChildren -= _incubatorReservations>>
+ <<set _reservedChildrenNursery += _WL - _nurseryReservations>>
<</link>>
<<elseif _nurseryReservations < _WL>>
There is not enough free space in $nurseryName for the rest of $his children.
@@ -339,15 +339,15 @@
<<if getSlave($AS).womb[_ap].reserve === "incubator">>
<<link "Don't keep this child in $incubatorName" "Analyze Pregnancy">>
<<set getSlave($AS).womb[_ap].reserve = "">>
- <<set $reservedChildren-->>
+ <<set _reservedChildren-->>
<</link>>
- <<elseif _freeTanks - $reservedChildren > 0>>
+ <<elseif _freeTanks - _reservedChildren > 0>>
<<link "Keep this child in $incubatorName" "Analyze Pregnancy">>
<<if getSlave($AS).womb[_ap].reserve === "nursery">>
- <<set $reservedChildrenNursery-->>
+ <<set _reservedChildrenNursery-->>
<</if>>
<<set getSlave($AS).womb[_ap].reserve = "incubator">>
- <<set $reservedChildren++>>
+ <<set _reservedChildren++>>
<</link>>
<<else>>
There is not enough free space to keep this child in $incubatorName.
@@ -359,15 +359,15 @@
<<if getSlave($AS).womb[_ap].reserve === "nursery">>
<<link "Don't keep this child in $nurseryName" "Analyze Pregnancy">>
<<set getSlave($AS).womb[_ap].reserve = "">>
- <<set $reservedChildrenNursery-->>
+ <<set _reservedChildrenNursery-->>
<</link>>
- <<elseif _freeCribs - $reservedChildrenNursery > 0>>
+ <<elseif _freeCribs - _reservedChildrenNursery > 0>>
<<link "Keep this child in $nurseryName" "Analyze Pregnancy">>
<<if getSlave($AS).womb[_ap].reserve === "incubator">>
- <<set $reservedChildren-->>
+ <<set _reservedChildren-->>
<</if>>
<<set getSlave($AS).womb[_ap].reserve = "nursery">>
- <<set $reservedChildrenNursery++>>
+ <<set _reservedChildrenNursery++>>
<</link>>
<<else>>
There is not enough free space to keep this child in $nurseryName.
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index c9a587cbbe9219a7505e7dce49ff6bc22109a4f0..45546f8ccd127ff4f5eef5a412c3b1795fb33236 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -581,6 +581,4 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<<set $PC.pregWeek = -4>>
<</if>>
<<set $PC.belly = getPregBellySize($PC)>>
-<<set $reservedChildren = FetusGlobalReserveCount("incubator")>>
-<<set $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
<<run delete $PC.curBabies>>