diff --git a/src/pregmod/analyzePlayerPregnancy.tw b/src/pregmod/analyzePlayerPregnancy.tw index ccb6a29700cbe4644aa2a9a7f7b7e6fd5d6c29c5..5fe117839806a79222848748dfac99d369624b65 100644 --- a/src/pregmod/analyzePlayerPregnancy.tw +++ b/src/pregmod/analyzePlayerPregnancy.tw @@ -1,6 +1,11 @@ :: Analyze PC Pregnancy [nobr] -<<set $nextButton = "Continue", $nextLink = "Manage Personal Affairs">> +<<if lastVisited("Incubator") === 1>> + <<set $storedLink = "Incubator">> +<<elseif lastVisited("Manage Personal Affairs") === 1>> + <<set $storedLink = "Manage Personal Affairs">> +<</if>> +<<set $nextButton = "Continue", $nextLink = $storedLink>> <<set _WL = $PC.womb.length, _incubatorReservations = WombReserveCount($PC, "incubator"), _nurseryReservations = WombReserveCount($PC, "nursery")>> diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw index 4b1ce967d7bc5cf3d39b3568df02e05628c7a167..133b7ad07bf4704b09da1e5bce2e92544985ab68 100644 --- a/src/pregmod/analyzePregnancy.tw +++ b/src/pregmod/analyzePregnancy.tw @@ -1,6 +1,12 @@ :: Analyze Pregnancy [nobr] -<<set $nextButton = "Continue", $nextLink = "Slave Interact">> +<<if lastVisited("Incubator") === 1>> + <<set $storedLink = "AS Dump">> +<<elseif lastVisited("Slave Interact") === 1>> + <<set $storedLink = "Slave Interact">> +<</if>> +<<set $nextButton = "Continue", $nextLink = $storedLink>> +<<setLocalPronouns $activeSlave>> <<set _WL = $activeSlave.womb.length, _incubatorReservations = WombReserveCount($activeSlave, "incubator"), _nurseryReservations = WombReserveCount($activeSlave, "nursery")>> diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw index 6a54bce844fc3678589cdbd2100792a8b6a9c0dd..1734d8746103ee7102709e538e58623f3af9d41f 100644 --- a/src/pregmod/incubator.tw +++ b/src/pregmod/incubator.tw @@ -111,6 +111,9 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <</if>> <<if (_reservedIncubator + _reservedNursery < _WL) && ($reservedChildren < $freeTanks)>> <br> + <<if $pregnancyMonitoringUpgrade == 1>> + <<print "[[Inspect pregnancy|Analyze Pregnancy][$i = " + _u + "; $activeSlave = $slaves[$i]]] | ">> + <</if>> <<print "[[Keep another child|Incubator][WombAddToGenericReserve($slaves[" + _u + "], 'incubator', 1)]]">> <<if _reservedIncubator > 0>> | <<print "[[Keep one less child|Incubator][WombCleanGenericReserve($slaves[" + _u + "], 'incubator', 1)]]">> @@ -123,6 +126,9 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <</if>> <<elseif (_reservedIncubator == _WL) || ($reservedChildren == $freeTanks) || (_reservedIncubator + _reservedNursery == _WL)>> <br> + <<if $pregnancyMonitoringUpgrade == 1>> + <<print "[[Inspect pregnancy|Analyze Pregnancy][$i = " + _u + "; $activeSlave = $slaves[$i]]] | ">> + <</if>> <<print "[[Keep one less child|Incubator][WombCleanGenericReserve($slaves[" + _u + "], 'incubator', 1)]]">> <<if _reservedIncubator > 1>> | <<print "[[Keep none of " + $his + " children|Incubator][WombCleanGenericReserve($slaves[" + _u + "], 'incubator', 9999)]]">> @@ -132,10 +138,16 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <<if _WL - _reservedNursery == 0>> //$His children are already reserved for $nurseryName// <br> + <<if $pregnancyMonitoringUpgrade == 1>> + <<print "[[Inspect pregnancy|Analyze Pregnancy][$i = " + _u + "; $activeSlave = $slaves[$i]]] | ">> + <</if>> <<print "[[Keep " + $his + " " + ((_WL > 1) ? "children" : "child") + " here instead|Incubator][WombChangeReserveType($slaves[" + _u + "], 'nursery', 'incubator')]]">> <<else>> You have <<if $freeTanks == 1>>an<</if>> @@.lime;available aging tank<<if $freeTanks > 1>>s<</if>>.@@ <br> + <<if $pregnancyMonitoringUpgrade == 1>> + <<print "[[Inspect pregnancy|Analyze Pregnancy][$i = " + _u + "; $activeSlave = $slaves[$i]]] | ">> + <</if>> <<print "[[Keep "+ ((_WL > 1) ? "a" : "the") +" child|Incubator][WombAddToGenericReserve($slaves[" + _u + "], 'incubator', 1)]]">> <<if (_WL > 1) && ($reservedChildren + _WL - _reservedIncubator) <= $freeTanks>> | <<print "[[Keep all of " + $his + " children|Incubator][WombAddToGenericReserve($slaves[" + _u + "], 'incubator', 9999)]]">> @@ -143,6 +155,9 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <</if>> <<elseif $reservedChildren == $freeTanks>> <br> + <<if $pregnancyMonitoringUpgrade == 1>> + <<print "[[Inspect pregnancy|Analyze Pregnancy][$i = " + _u + "; $activeSlave = $slaves[$i]]] | ">> + <</if>> You have @@.red;no room for $his offspring.@@ <</if>> <<set _eligibility = 1>> @@ -181,6 +196,9 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <</if>> <<if (_reservedIncubator < _WL) && ($reservedChildren < $freeTanks) && (_reservedIncubator - _reservedNursery > 0)>> <br> + <<if $pregnancyMonitoringUpgrade == 1>> + <<print "[[Inspect pregnancy|Analyze PC Pregnancy]] | ">> + <</if>> <<print "[[Keep another child|Incubator][WombAddToGenericReserve($PC, 'incubator', 1)]]">> <<if _reservedIncubator > 0>> | <<print "[[Keep one less child|Incubator][WombCleanGenericReserve($PC, 'incubator', 1)]]">> @@ -193,6 +211,9 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <</if>> <<elseif (_reservedIncubator == _WL) || ($reservedChildren == $freeTanks) || (_reservedIncubator - _reservedNursery >= 0)>> <br> + <<if $pregnancyMonitoringUpgrade == 1>> + <<print "[[Inspect pregnancy|Analyze PC Pregnancy]] | ">> + <</if>> <<print "[[Keep one less child|Incubator][_reservedIncubator -= 1, $reservedChildren -= 1]]">> <<if _reservedIncubator > 1>> | <<print "[[Keep none of your children|Incubator][WombCleanGenericReserve($PC, 'incubator', 9999)]]">> @@ -205,6 +226,9 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <<else>> You have <<if $freeTanks == 1>>an<</if>> @@.lime;available aging tank<<if $freeTanks > 1>>s<</if>>.@@ <br> + <<if $pregnancyMonitoringUpgrade == 1>> + <<print "[[Inspect pregnancy|Analyze PC Pregnancy]] | ">> + <</if>> <<print "[[Keep " + ((_WL > 1) ? "a" : "your") +" child|Incubator][WombAddToGenericReserve($PC, 'incubator', 1)]]">> <<if (_WL > 1) && ($reservedChildren + _WL - _reservedIncubator) <= $freeTanks>> | [[Keep all of your children|Incubator][WombAddToGenericReserve($PC, 'incubator', 9999)]] @@ -212,6 +236,9 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <</if>> <<elseif $reservedChildren == $freeTanks>> <br> + <<if $pregnancyMonitoringUpgrade == 1>> + <<print "[[Inspect pregnancy|Analyze PC Pregnancy]] | ">> + <</if>> You have @@.red;no room for your offspring.@@ <</if>> <</if>>