Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into dabranch

src/facilities/farmyard/farmyardReport.tw

@@ -330,8 +330,6 @@
 	<<if $dairyPregSetting > 0>>
 		<<set $reservedChildren = FetusGlobalReserveCount("incubator")>>
 		<<set $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
-		<<set $slaves[$i].reservedChildren = 0>>
-		<<set $slaves[$i].reservedChildrenNursery = 0>>
 	<</if>>
 
 	/* General End of Week effects */

src/facilities/nursery/nursery.tw

@@ -74,7 +74,7 @@ $nurseryNameCaps
 	$Matron.slaveName is alone in $nurseryName, and has nothing to do but keep the place clean and look after the children.
 	<<set $MatronInfluence = 1>>
 <<elseif ($nurserySlaves <= 0) && ($nurseryBabies <= 0)>>
-	$nurseryNameCaps is empty and quiet. <<link "Decommission the Nursery" "Main">><<set $nursery = 0, $nurseryNannies = 0, $nannyInfluence = 0, $nurseryDecoration = "standard", $cribs = [], $reservedChildrenNursery = 0>><<for _i = 0; _i < $slaves.length; _i++>><<set $slaves[_i].reservedChildrenNursery = 0>><</for>><</link>>
+	$nurseryNameCaps is empty and quiet. <<link "Decommission the Nursery" "Main">><<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>><</link>>
 <</if>>
 
 <<if $nurserySlaves > 0>>
@@ -216,13 +216,12 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
 	<<if $slaves[_u].assignment == "work in the dairy" && $dairyPregSetting > 0>>
 	<<else>>
 		<<set _slaveId = "slave-" + $slaves[_u].ID>>
-		<<set _pregCount = $slaves[_u].pregType>>
 		<<set _WL = $slaves[_u].womb.length>>
 		<<set _reservedNursery = WombReserveCount($slaves[_u], "nursery")>>
 		<<set _reservedIncubator = WombReserveCount($slaves[_u], "incubator")>>
 		<<set _pregWeek = $slaves[_u].pregWeek>>
 		<<set _slaveName = SlaveFullName($slaves[_u])>>
-		<div class="possible" @id="_slaveId" @data-preg-count="_pregCount" @data-reserved-spots="_reservedNursery" @data-preg-week="_pregWeek" @data-name="_slaveName">
+		<div class="possible" @id="_slaveId" @data-preg-count="_WL" @data-reserved-spots="_reservedNursery" @data-preg-week="_pregWeek" @data-name="_slaveName">
 		<<print "[[_slaveName|Long Slave Description][$activeSlave = $slaves[" + _u + "], $nextLink = passage()]]">> is $slaves[_u].pregWeek weeks pregnant with
 		<<if $slaves[_u].pregSource == 0 || $slaves[_u].preg <= 5>>someone's<<if $slaves[_u].preg <= 5>>, though it is too early to tell whose,<</if>>
 		<<elseif $slaves[_u].pregSource == -1>>your
@@ -295,8 +294,11 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
 	//You have no pregnant slaves bearing eligible children.//
 <</if>>
 <<if $PC.pregKnown == 1 && $PC.pregSource != -6>>
+	<<set _WL = $PC.womb.length>>
+	<<set _reservedIncubator = WombReserveCount($PC, "incubator")>>
+	<<set _reservedNursery = WombReserveCount($PC, "nursery")>>
 	<br>''@@.pink;You're pregnant@@'' and going to have
-		<<switch $PC.pregType>>
+		<<switch _WL>>
 		<<case 1>>
 			a baby.
 		<<case 2>>
@@ -314,9 +316,6 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
 		<<case 8>>
 			octuplets.
 		<</switch>>
-	<<set _WL = $PC.womb.length>>
-	<<set _reservedIncubator = WombReserveCount($PC, "incubator")>>
-	<<set _reservedNursery = WombReserveCount($PC, "nursery")>>
 	<<if _reservedNursery > 0>>
 		<<set _childrenReservedNursery = 1>>
 		<<if _WL == 1>>
@@ -368,12 +367,9 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
 	<br>
 	 <<link "Clear all reserved children">>
 		<<for _u = 0; _u < _SL; _u++>>
-			<<if $slaves[_u].reservedChildrenNursery != 0>>
-				<<set $slaves[_u].reservedChildrenNursery = 0>>
-			<</if>>
+			<<run WombCleanGenericReserve($slaves[_u], "nursery", 9999)>>
 		<</for>>
-		<<set $PC.reservedChildrenNursery = 0>>
-		<<set $reservedChildrenNursery = 0>>
+		<<run WombCleanGenericReserve($PC, "nursery", 9999)>>
 		<<goto "Nursery">>
 	 <</link>>
 <</if>>

src/init/storyInit.tw

@@ -48,8 +48,6 @@ You should have received a copy of the GNU General Public License along with thi
 			<<set $slaves[_i].sisters = 0>>
 			<<set $slaves[_i].canRecruit = 0>>
 			<<set $slaves[_i].breedingMark = 0>>
-			<<set $slaves[_i].reservedChildren = 0>>
-			<<set $slaves[_i].reservedChildrenNursery = 0>>
 			<<if $arcologies[0].FSRomanRevivalist > 90>>
 				<<set $slaves[_i].nationality = "Roman Revivalist">>
 			<<elseif $arcologies[0].FSAztecRevivalist > 90>>
@@ -174,8 +172,6 @@ You should have received a copy of the GNU General Public License along with thi
 	<<if ndef $PC.markings>>
 		<<set $PC.markings = "none">>
 	<</if>>
-	<<set $PC.reservedChildren = 0>>
-	<<set $PC.reservedChildrenNursery = 0>>
 <<else>>
 	<<set $slaves = []>>
 	<<set $slavesOriginal = []>> /* not used by pregmod */

src/js/datatypeCleanupJS.tw

@@ -197,8 +197,6 @@ window.slavePregnancyDatatypeCleanup = function slavePregnancyDatatypeCleanup(sl
 	slave.ovaries = Math.clamp(+slave.ovaries, 0, 1) || 0;
 	slave.vasectomy = Math.clamp(+slave.vasectomy, 0, 1) || 0;
 	slave.mpreg = Math.clamp(+slave.mpreg, 0, 1) || 0;
-	slave.reservedChildren = WombReserveCount(slave, "incubator") || 0;
-	slave.reservedChildrenNursery = WombReserveCount(slave, "nursery") || 0;
 	if (slave.pregAdaptation !== 0) {
 		slave.pregAdaptation = Math.max(+slave.pregAdaptation, 0) || 50;
 	}
@@ -769,8 +767,6 @@ window.childPregnancyDatatypeCleanup = function childPregnancyDatatypeCleanup(ch
 	child.ovaries = Math.clamp(+child.ovaries, 0, 1) || 0;
 	child.vasectomy = Math.clamp(+child.vasectomy, 0, 1) || 0;
 	child.mpreg = Math.clamp(+child.mpreg, 0, 1) || 0;
-	child.reservedChildren = WombReserveCount(child, "incubator") || 0;
-	child.reservedChildrenNursery = WombReserveCount(child, "nursery") || 0;
 	if (child.pregAdaptation !== 0) {
 		child.pregAdaptation = Math.max(+child.pregAdaptation, 0) || 50;
 	}
@@ -1170,8 +1166,6 @@ window.PCDatatypeCleanup = function PCDatatypeCleanup() {
 		V.playerAging = Math.clamp(+V.playerAging, 0, 2) || 2;
 	}
 	PC.newVag = Math.clamp(+PC.newVag, 0, 1) || 0;
-	PC.reservedChildren = WombReserveCount(PC, "incubator") || 0;
-	PC.reservedChildrenNursery = WombReserveCount(PC, "nursery") || 0;
 	PC.fertDrugs = Math.clamp(+PC.fertDrugs, 0, 1) || 0;
 	PC.forcedFertDrugs = Math.max(+PC.forcedFertDrugs, 0) || 0;
 	PC.staminaPills = Math.clamp(+PC.staminaPills, 0, 1) || 0;

src/js/wombJS.tw

@@ -698,7 +698,7 @@ window.WombReserveCount = function(actor, type)
 
 	actor.womb.forEach(function(ft){
 
-		if (ft.reserve == type)
+		if (ft.reserve == type) /* the lazy equality will catch "" case */
 		{
 			cnt++;
 		}
@@ -772,17 +772,6 @@ window.BCReserveInit = function()
 				if (ft.ID == undefined)
 					ft.ID = generateNewID();
 
-			try {
-					if (slave.reservedChildren > 0)
-						WombSetGenericReserve(slave, "incubator", reservedChildren);
-
-					if (slave.reservedChildrenNursery > 0)
-						WombSetGenericReserve(slave, "nursery", reservedChildren);
-					} catch (err) {
-
-					console.log (err + " slave ID: " + slave.ID + " slave name: " + slave.slaveName + " " + slave.slaveSurname);
-					slave.reservedChildren = 0;
-				}
 		});
 	});
 

src/pregmod/huskSlaveSwapWorkaround.tw

@@ -14,8 +14,7 @@ __Select an eligible slave:__
 	<<if $slaves[_i].amp >= 0>>
 	<<if $slaves[_i].indenture == -1>>
 	<<if $slaves[_i].breedingMark == 0 || $propOutcome == 0>>
-	<<if $slaves[_i].reservedChildren == 0>>
-	<<if $slaves[_i].reservedChildrenNursery ==0>>
+	<<if WombReserveCount($slaves[_i]) == 0>>
 	<<if $slaves[_i].ID != $activeSlave.ID>>
 		<<set _name = SlaveFullName($slaves[_i])>>
 		<br><<print "[[_name|Husk Slave Swap][$swappingSlave = $slaves[" + _i + "], $cash -= 10000]]">>
@@ -26,5 +25,4 @@ __Select an eligible slave:__
 	<</if>>
 	<</if>>
 	<</if>>
-	<</if>>
 <</for>>

src/pregmod/incubator.tw

@@ -153,8 +153,11 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $
 	//You have no pregnant slaves bearing eligible children.//
 <</if>>
 <<if $PC.pregKnown == 1 && $PC.pregSource != -6>>
+	<<set _WL = $PC.womb.length>>
+	<<set _reservedIncubator = WombReserveCount($PC, "incubator")>>
+	<<set _reservedNursery = WombReserveCount($PC, "nursery")>>
 	<br>''@@.pink;You're pregnant@@'' and going to have
-		<<switch $PC.pregType>>
+		<<switch _WL>>
 		<<case 1>>
 			a baby.
 		<<case 2>>
@@ -172,9 +175,6 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $
 		<<case 8>>
 			octuplets.
 		<</switch>>
-	<<set _WL = $PC.womb.length>>
-	<<set _reservedIncubator = WombReserveCount($PC, "incubator")>>
-	<<set _reservedNursery = WombReserveCount($PC, "nursery")>>
 	<<if (_reservedIncubator > 0)>>
 		<<set _childrenReserved = 1>>
 		<<if _WL == 1>>
@@ -226,7 +226,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $
 	<br>
 	 <<link "Clear all reserved children">>
 		<<for _u = 0; _u < _SL; _u++>>
-			<<if $slaves[_u].reservedChildren != 0>>
+			<<if WombReserveCount($slaves[_u], "incubator") != 0>>
 				<<set WombCleanGenericReserve($slaves[_u], 'incubator', 9999)>>
 			<</if>>
 		<</for>>

src/pregmod/sePlayerBirth.tw

@@ -2,7 +2,7 @@
 
 <<set $nextButton = "Continue", $nextLink = "Scheduled Event">>
 
-<<set _gaveBirth = 0, _PCDegree = 0, _pregTypeDecrecement = WombReserveCount($PC, "incubator"), _pregTypeDecrecementNursery = WombReserveCount($PC, "incubator"), $PC.reservedChildren = _pregTypeDecrecement, $PC.reservedChildrenNursery = _pregTypeDecrecementNursery>>
+<<set _gaveBirth = 0, _PCDegree = 0, _pregTypeDecrecement = WombReserveCount($PC, "incubator"), _pregTypeDecrecementNursery = WombReserveCount($PC, "incubator")>>
 
 /*
 PC.pregSource documentation
@@ -520,14 +520,12 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
 				<<include "Incubator Workaround">>
 				<<run $PC.curBabies.splice($PC.curBabies[_p], 1)>>
 				<<set _p--, _curBabies-->>
-				<<set $PC.reservedChildren-->>
 			<<elseif $PC.curBabies[_p].reserve == "nursery">>
 				@@.pink;You set <<if $PC.curBabies[_p].genetics.gender == "XX">>her<<else>>him<</if>> aside to be raised in the penthouse.@@
 				<<set $activeSlave = generateChild($PC, $PC.curBabies[_p])>>
 				<<include "Nursery Workaround">>
 				<<run $PC.curBabies.splice($PC.curBabies[_p], 1)>>
 				<<set _p--, _curBabies-->>
-				<<set $PC.reservedChildrenNursery-->>
 			<</if>>
 		<</for>>
 

src/pregmod/widgets/bodyswapWidgets.tw

@@ -209,8 +209,6 @@
 <<set $args[0].bellyPreg = $args[1].bellyPreg>>
 <<set $args[0].bellyFluid = $args[1].bellyFluid>>
 <<set $args[0].readyOva = $args[1].readyOva>>
-<<set $args[0].reservedChildren = $args[1].reservedChildren>>
-<<set $args[0].reservedChildrenNursery = $args[1].reservedChildrenNursery>>
 <<set $args[0].womb = $args[1].womb>> /* this is array assigned by reference, if slave body that is $args[1] will be stil used anywhere in code (not discarded) - it's WRONG (they now technically share one womb object). Please tell me about it then. But if old body $args[1] just discarded - it's no problem then.*/
 <<set $args[0].laborCount = $args[1].laborCount>>
 <<set $args[0].geneMods = $args[1].geneMods>>

src/pregmod/widgets/pregmodWidgets.tw

@@ -133,6 +133,12 @@
 <<if ndef $args[0].clone>>
 	<<set $args[0].clone = 0>>
 <</if>>
+<<if def $args[0].reservedChildren>>
+	<<run delete $args[0].reservedChildren>>
+<</if>>
+<<if def $args[0].reservedChildrenNursery>>
+	<<run delete $args[0].reservedChildrenNursery>>
+<</if>>
 
 <</widget>>
 

src/pregmod/widgets/seBirthWidgets.tw

@@ -857,8 +857,6 @@ All in all,
 /* ----------------------- incubator/nursery adding subsection. There is support for broodmothers too. */
 
 <<if (_cToIncub + _cToNursery > 0) && _curBabies > 0>> /*Do we need keep child checks?*/
-	<<set $slaves[$i].reservedChildren -= _cToIncub>>
-	<<set $slaves[$i].reservedChildrenNursery -= _cToNursery>>
 	<br><br>
 	Of $his _curBabies child<<if _curBabies > 1>>ren<</if>>, _cToIncub <<if _cToIncub === 1>>was<<else>>were<</if>> taken to $incubatorName<<if $nursery > 0>>, and _cToNursery <<if _cToNursery === 1>>was<<else>>were<</if>> taken to $nurseryName<</if>>.
 	<<if _cToIncub + _cToNursery > 0>>

src/uncategorized/BackwardsCompatibility.tw

@@ -3685,5 +3685,5 @@ Done!
 	<<set $releaseID = 1036>>
 <</if>>
 
-/* reset NaNArray afterward BC is run */
+/* reset NaNArray after BC is run */
 <<set $NaNArray = findNaN()>>

src/uncategorized/slaveInteract.tw

@@ -1348,8 +1348,6 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
 <<set _reservedIncubator = WombReserveCount($activeSlave, "incubator")>>
 <<set _reservedNursery = WombReserveCount($activeSlave, "nursery")>>
 <<set _WL = $activeSlave.womb.length>>
-<<set $activeSlave.reservedChildren = _reservedIncubator>> /* should be removed eventually, for now keep updated */
-<<set $activeSlave.reservedChildrenNursery = _reservedNursery>> /* should be removed eventually, for now keep updated */
 
 <<if $incubator > 0>>
 <<if $activeSlave.preg > 0 && $activeSlave.broodmother == 0 && $activeSlave.pregKnown == 1 && $activeSlave.eggType == "human">>