Merge branch 'pregmod-dev-preganalize-tweak' into 'pregmod-master'

Inspect Pregnancy tweak, and superfetation fix See merge request pregmodfan/fc-pregmod!4579

Merge branch 'pregmod-dev-preganalize-tweak' into 'pregmod-master'
9f2e0ee7 · Pregmodder · 50799668 · 0b9f4b66 · 9f2e0ee7 · 9f2e0ee7
Commit 9f2e0ee7 authored 5 years ago by Pregmodder
--- a/src/js/pregJS.js
+++ b/src/js/pregJS.js
@@ -121,7 +121,7 @@ window.setPregType = function(actor) {
 				}
 			}
 			ovum = Math.clamp(ovum, 0, 8);
-		} else if (actor.pregType === 0) {
+		} else if (actor.pregType === 0 || actor.geneticQuirks.superfetation > 1) {
 			if (actor.eggType === "horse" || actor.eggType === "cow") {
 				if (actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
 					ovum += jsEither([0, 0, 0, 0, 0, 0, 1]);

--- a/src/pregmod/analyzePlayerPregnancy.tw
+++ b/src/pregmod/analyzePlayerPregnancy.tw
@@ -66,54 +66,13 @@
 	<br>
 	<<for _ap = 0; _ap < _WL; _ap++>>
 	<<capture _ap>>
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;
+		<<if $PC.womb[_ap].age >=2 >>
-		Ova: $PC.womb[_ap].genetics.name
-		<<if $geneticMappingUpgrade >= 1>>
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Gender: $PC.womb[_ap].genetics.gender
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Father ID: $PC.womb[_ap].genetics.father
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Father Name: $PC.womb[_ap].genetics.fatherName
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Mother ID: $PC.womb[_ap].genetics.mother
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Mother Name: $PC.womb[_ap].genetics.motherName
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Nationality: $PC.womb[_ap].genetics.nationality
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Race: $PC.womb[_ap].genetics.race
+			Ova: $PC.womb[_ap].genetics.name
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Skin tone: $PC.womb[_ap].genetics.skin
+			<<if $geneticMappingUpgrade >= 1>>
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Intelligence index: $PC.womb[_ap].genetics.intelligence out of 100
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Face index: $PC.womb[_ap].genetics.face out of 100
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Eye Color: $PC.womb[_ap].genetics.eyeColor
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Hair Color: $PC.womb[_ap].genetics.hColor
-			<<if $PC.womb[_ap].genetics.underArmHStyle == "hairless" && $PC.womb[_ap].genetics.pubicHStyle == "hairless">>
-				<br>&nbsp;&nbsp;&nbsp;&nbsp;
-				Body hair: none
-			<<elseif $PC.womb[_ap].genetics.underArmHStyle == "hairless">>
-				<br>&nbsp;&nbsp;&nbsp;&nbsp;
-				Body hair: lacks underarm hair
-			<<elseif $PC.womb[_ap].genetics.pubicHStyle == "hairless">>
-				<br>&nbsp;&nbsp;&nbsp;&nbsp;
-				Body hair: lacks pubic hair
-			<</if>>
-			<<if $PC.womb[_ap].genetics.markings == "freckles" || $PC.womb[_ap].genetics.markings == "heavily freckled">>
-				<br>&nbsp;&nbsp;&nbsp;&nbsp;
-				Markings: $PC.womb[_ap].genetics.markings
-			<</if>>
-		<<else>>
-			<<if $PC.womb[_ap].age > 13>>
 				<br>&nbsp;&nbsp;&nbsp;&nbsp;
 				Gender: $PC.womb[_ap].genetics.gender
-			<</if>>
-			<<if $PC.womb[_ap].age > 5>>
 				<br>&nbsp;&nbsp;&nbsp;&nbsp;
 				Father ID: $PC.womb[_ap].genetics.father
 				<br>&nbsp;&nbsp;&nbsp;&nbsp;
@@ -122,59 +81,111 @@
 				Mother ID: $PC.womb[_ap].genetics.mother
 				<br>&nbsp;&nbsp;&nbsp;&nbsp;
 				Mother Name: $PC.womb[_ap].genetics.motherName
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				Nationality: $PC.womb[_ap].genetics.nationality
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				Race: $PC.womb[_ap].genetics.race
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				Skin tone: $PC.womb[_ap].genetics.skin
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				Intelligence index: $PC.womb[_ap].genetics.intelligence out of 100
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				Face index: $PC.womb[_ap].genetics.face out of 100
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				Eye Color: $PC.womb[_ap].genetics.eyeColor
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				Hair Color: $PC.womb[_ap].genetics.hColor
+				<<if $PC.womb[_ap].genetics.underArmHStyle == "hairless" && $PC.womb[_ap].genetics.pubicHStyle == "hairless">>
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					Body hair: none
+				<<elseif $PC.womb[_ap].genetics.underArmHStyle == "hairless">>
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					Body hair: lacks underarm hair
+				<<elseif $PC.womb[_ap].genetics.pubicHStyle == "hairless">>
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					Body hair: lacks pubic hair
+				<</if>>
+				<<if $PC.womb[_ap].genetics.markings == "freckles" || $PC.womb[_ap].genetics.markings == "heavily freckled">>
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					Markings: $PC.womb[_ap].genetics.markings
+				<</if>>
+			<<else>>
+				<<if $PC.womb[_ap].age > 13>>
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					Gender: $PC.womb[_ap].genetics.gender
+				<</if>>
+				<<if $PC.womb[_ap].age > 5>>
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					Father ID: $PC.womb[_ap].genetics.father
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					Father Name: $PC.womb[_ap].genetics.fatherName
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					Mother ID: $PC.womb[_ap].genetics.mother
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					Mother Name: $PC.womb[_ap].genetics.motherName
+				<</if>>
+			<</if>>
+			<<if $incubator > 0 || $nursery > 0>>
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				Reserved: $PC.womb[_ap].reserve
 			<</if>>
-		<</if>>
-		<<if $incubator > 0 || $nursery > 0>>
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Reserved: $PC.womb[_ap].reserve
-		<</if>>
-		<br><br>&nbsp;&nbsp;&nbsp;&nbsp;
+			<br><br>&nbsp;&nbsp;&nbsp;&nbsp;
-		Rename: <<textbox "_tempName" _tempName >> [[Apply | Analyze PC Pregnancy][$PC.womb[_ap].genetics.name = _tempName]]
+			Rename: <<textbox "_tempName" _tempName >> [[Apply | Analyze PC Pregnancy][$PC.womb[_ap].genetics.name = _tempName]]
-		<<if $PC.womb[_ap].age < 4 && $PC.womb[_ap].fatherID != -6>>
+			<<if $PC.womb[_ap].age < 4 && $PC.womb[_ap].fatherID != -6>>
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			<<link "Terminate ovum" "Analyze PC Pregnancy">><<run WombRemoveFetus($PC, _ap)>><</link>>
+				<<link "Terminate ovum" "Analyze PC Pregnancy">><<run WombRemoveFetus($PC, _ap)>><</link>>
-			<<if $surgeryUpgrade == 1>>
+				<<if $surgeryUpgrade == 1>>
-				| [[Transplant ovum|Ova Transplant Workaround][$donatrix = $PC, $wombIndex = _ap, $nextLink = "Analyze PC Pregnancy"]]
+					| [[Transplant ovum|Ova Transplant Workaround][$donatrix = $PC, $wombIndex = _ap, $nextLink = "Analyze PC Pregnancy"]]
+				<</if>>
 			<</if>>
-		<</if>>
+			<<if $incubator > 0>>
-		<<if $incubator > 0>>
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				<<if $PC.womb[_ap].reserve === "incubator">>
-			<<if $PC.womb[_ap].reserve === "incubator">>
+					<<link "Don't keep this child $incubatorName" "Analyze PC Pregnancy">>
-				<<link "Don't keep this child $incubatorName" "Analyze PC Pregnancy">>
+						<<set $PC.womb[_ap].reserve = "">>
-					<<set $PC.womb[_ap].reserve = "">>
+						<<set $reservedChildren-->>
-					<<set $reservedChildren-->>
+					<</link>>
-				<</link>>
+				<<elseif $freeTanks - $reservedChildren > 0>>
-			<<elseif $freeTanks - $reservedChildren > 0>>
+					<<link "Keep this child in $incubatorName" "Analyze PC Pregnancy">>
-				<<link "Keep this child in $incubatorName" "Analyze PC Pregnancy">>
+						<<if $PC.womb[_ap].reserve === "nursery">>
-					<<if $PC.womb[_ap].reserve === "nursery">>
+							<<set $reservedChildrenNursery-->>
+						<</if>>
+						<<set $PC.womb[_ap].reserve = "incubator">>
+						<<set $reservedChildren++>>
+					<</link>>
+				<<else>>
+					There is not enough free space to keep this child in $incubatorName.
+				<</if>>
+			<</if>>
+			<<if $nursery > 0>>
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				<<if $PC.womb[_ap].reserve === "nursery">>
+					<<link "Don't keep this child in $nurseryName" "Analyze PC Pregnancy">>
+						<<set $PC.womb[_ap].reserve = "">>
 						<<set $reservedChildrenNursery-->>
-					<</if>>
+					<</link>>
-					<<set $PC.womb[_ap].reserve = "incubator">>
+				<<elseif $freeCribs - $reservedChildrenNursery > 0>>
-					<<set $reservedChildren++>>
+					<<link "Keep this child in $nurseryName" "Analyze PC Pregnancy">>
-				<</link>>
+						<<if $PC.womb[_ap].reserve === "incubator">>
-			<<else>>
+							<<set $reservedChildren-->>
-				There is not enough free space to keep this child in $incubatorName.
+						<</if>>
+						<<set $PC.womb[_ap].reserve = "nursery">>
+						<<set $reservedChildrenNursery++>>
+					<</link>>
+				<<else>>
+					There is not enough free space to keep this child in $nurseryName.
+				<</if>>
 			<</if>>
-		<</if>>
+		<<else>>	
-		<<if $nursery > 0>>
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			<<if $PC.womb[_ap].reserve === "nursery">>
+			Unindefined ova found, no detailed data available.<br>&nbsp;&nbsp;&nbsp;&nbsp;
-				<<link "Don't keep this child in $nurseryName" "Analyze PC Pregnancy">>
+			Age: too early for scan.
-					<<set $PC.womb[_ap].reserve = "">>
+			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-					<<set $reservedChildrenNursery-->>
+			<<link "Terminate ovum" "Analyze PC Pregnancy">><<run WombRemoveFetus($PC, _ap)>><</link>>
-				<</link>>
+			<<if $surgeryUpgrade == 1>>
-			<<elseif $freeCribs - $reservedChildrenNursery > 0>>
+				| [[Transplant ovum|Ova Transplant Workaround][$donatrix = $PC, $wombIndex = _ap, $nextLink = "Analyze PC Pregnancy"]]
-				<<link "Keep this child in $nurseryName" "Analyze PC Pregnancy">>
-					<<if $PC.womb[_ap].reserve === "incubator">>
-						<<set $reservedChildren-->>
-					<</if>>
-					<<set $PC.womb[_ap].reserve = "nursery">>
-					<<set $reservedChildrenNursery++>>
-				<</link>>
-			<<else>>
-				There is not enough free space to keep this child in $nurseryName.
 			<</if>>
 		<</if>>
 		<br><br><hr style="margin:0"><br>

--- a/src/pregmod/analyzePregnancy.tw
+++ b/src/pregmod/analyzePregnancy.tw
@@ -16,9 +16,14 @@
 	<br><br>
 	Overall statistics:
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;Fetal count: $activeSlave.womb.length
+	<<set _cc = Math.round($activeSlave.bellyPreg)>>
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;Estimated womb volume: <<print num(Math.round($activeSlave.bellyPreg))>> cc
+	<<set _safecc = Math.round($activeSlave.pregAdaptation*2000)>>
+	<<if $geneticMappingUpgrade > 0>>
+		<br>&nbsp;&nbsp;&nbsp;&nbsp;Estimated pregnancy adaptation raiting: <<print num(Math.round($activeSlave.pregAdaptation))>>
+		<br>&nbsp;&nbsp;&nbsp;&nbsp;Estimated safe womb volume: <<= num(_safecc)>> cc
+	<</if>>
+	<br>&nbsp;&nbsp;&nbsp;&nbsp;Current fetal count: $activeSlave.womb.length
+	<br>&nbsp;&nbsp;&nbsp;&nbsp;Estimated womb volume: <<if _safecc < _cc && $geneticMappingUpgrade > 0>>@@.red;<<= num(_cc)>>@@<<else>><<= num(_cc)>><</if>> cc
 	<br><br>
 	Furthest developed pregnancy:
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;Fetal development week: $activeSlave.preg
@@ -70,56 +75,15 @@
 	<br>
 	<<for _ap = 0; _ap < _WL; _ap++>>
 	<<capture _ap>>
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;
+		<<if $activeSlave.womb[_ap].age >=2 >>
-		Ova: $activeSlave.womb[_ap].genetics.name
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;
-		Age: $activeSlave.womb[_ap].age
-		<<if $geneticMappingUpgrade >= 1>>
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Gender: $activeSlave.womb[_ap].genetics.gender
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Father ID: $activeSlave.womb[_ap].genetics.father
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Father Name: $activeSlave.womb[_ap].genetics.fatherName
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Mother ID: $activeSlave.womb[_ap].genetics.mother
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Mother Name: $activeSlave.womb[_ap].genetics.motherName
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Nationality: $activeSlave.womb[_ap].genetics.nationality
+			Ova: $activeSlave.womb[_ap].genetics.name
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Race: $activeSlave.womb[_ap].genetics.race
+			Age: $activeSlave.womb[_ap].age
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Skin tone: $activeSlave.womb[_ap].genetics.skin
+			<<if $geneticMappingUpgrade >= 1>>
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Intelligence index: $activeSlave.womb[_ap].genetics.intelligence out of 100
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Face index: $activeSlave.womb[_ap].genetics.face out of 100
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Eye Color: $activeSlave.womb[_ap].genetics.eyeColor
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Hair Color: $activeSlave.womb[_ap].genetics.hColor
-			<<if $activeSlave.womb[_ap].genetics.underArmHStyle == "hairless" && $activeSlave.womb[_ap].genetics.pubicHStyle == "hairless">>
-				<br>&nbsp;&nbsp;&nbsp;&nbsp;
-				Body hair: none
-			<<elseif $activeSlave.womb[_ap].genetics.underArmHStyle == "hairless">>
-				<br>&nbsp;&nbsp;&nbsp;&nbsp;
-				Body hair: lacks underarm hair
-			<<elseif $activeSlave.womb[_ap].genetics.pubicHStyle == "hairless">>
-				<br>&nbsp;&nbsp;&nbsp;&nbsp;
-				Body hair: lacks pubic hair
-			<</if>>
-			<<if $activeSlave.womb[_ap].genetics.markings == "freckles" || $activeSlave.womb[_ap].genetics.markings == "heavily freckled">>
-				<br>&nbsp;&nbsp;&nbsp;&nbsp;
-				Markings: $activeSlave.womb[_ap].genetics.markings
-			<</if>>
-		<<else>>
-			<<if $activeSlave.womb[_ap].age > 13>>
 				<br>&nbsp;&nbsp;&nbsp;&nbsp;
 				Gender: $activeSlave.womb[_ap].genetics.gender
-			<</if>>
-			<<if $activeSlave.womb[_ap].age > 5>>
 				<br>&nbsp;&nbsp;&nbsp;&nbsp;
 				Father ID: $activeSlave.womb[_ap].genetics.father
 				<br>&nbsp;&nbsp;&nbsp;&nbsp;
@@ -128,59 +92,111 @@
 				Mother ID: $activeSlave.womb[_ap].genetics.mother
 				<br>&nbsp;&nbsp;&nbsp;&nbsp;
 				Mother Name: $activeSlave.womb[_ap].genetics.motherName
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				Nationality: $activeSlave.womb[_ap].genetics.nationality
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				Race: $activeSlave.womb[_ap].genetics.race
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				Skin tone: $activeSlave.womb[_ap].genetics.skin
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				Intelligence index: $activeSlave.womb[_ap].genetics.intelligence out of 100
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				Face index: $activeSlave.womb[_ap].genetics.face out of 100
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				Eye Color: $activeSlave.womb[_ap].genetics.eyeColor
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				Hair Color: $activeSlave.womb[_ap].genetics.hColor
+				<<if $activeSlave.womb[_ap].genetics.underArmHStyle == "hairless" && $activeSlave.womb[_ap].genetics.pubicHStyle == "hairless">>
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					Body hair: none
+				<<elseif $activeSlave.womb[_ap].genetics.underArmHStyle == "hairless">>
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					Body hair: lacks underarm hair
+				<<elseif $activeSlave.womb[_ap].genetics.pubicHStyle == "hairless">>
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					Body hair: lacks pubic hair
+				<</if>>
+				<<if $activeSlave.womb[_ap].genetics.markings == "freckles" || $activeSlave.womb[_ap].genetics.markings == "heavily freckled">>
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					Markings: $activeSlave.womb[_ap].genetics.markings
+				<</if>>
+			<<else>>
+				<<if $activeSlave.womb[_ap].age > 13>>
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					Gender: $activeSlave.womb[_ap].genetics.gender
+				<</if>>
+				<<if $activeSlave.womb[_ap].age > 5>>
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					Father ID: $activeSlave.womb[_ap].genetics.father
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					Father Name: $activeSlave.womb[_ap].genetics.fatherName
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					Mother ID: $activeSlave.womb[_ap].genetics.mother
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					Mother Name: $activeSlave.womb[_ap].genetics.motherName
+				<</if>>
+			<</if>>
+			<<if $incubator > 0 || $nursery > 0>>
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				Reserved: $activeSlave.womb[_ap].reserve
 			<</if>>
-		<</if>>
-		<<if $incubator > 0 || $nursery > 0>>
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Reserved: $activeSlave.womb[_ap].reserve
-		<</if>>
-		<br><br>&nbsp;&nbsp;&nbsp;&nbsp;
+			<br><br>&nbsp;&nbsp;&nbsp;&nbsp;
-		Rename: <<textbox "_tempName" _tempName >> [[Apply | Analyze Pregnancy][$activeSlave.womb[_ap].genetics.name = _tempName]]
+			Rename: <<textbox "_tempName" _tempName >> [[Apply | Analyze Pregnancy][$activeSlave.womb[_ap].genetics.name = _tempName]]
-		<<if $activeSlave.womb[_ap].age < 4 && ($activeSlave.womb[_ap].fatherID != -1 || $activeSlave.breedingMark == 0)>>
+			<<if $activeSlave.womb[_ap].age < 4 && ($activeSlave.womb[_ap].fatherID != -1 || $activeSlave.breedingMark == 0)>>
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			<<link "Terminate ovum" "Analyze Pregnancy">><<run WombRemoveFetus($activeSlave, _ap)>><</link>>
+				<<link "Terminate ovum" "Analyze Pregnancy">><<run WombRemoveFetus($activeSlave, _ap)>><</link>>
-			<<if $surgeryUpgrade == 1>>
+				<<if $surgeryUpgrade == 1>>
-				| [[Transplant ovum|Ova Transplant Workaround][$donatrix = $activeSlave, $wombIndex = _ap, $nextLink = "Analyze Pregnancy"]]
+					| [[Transplant ovum|Ova Transplant Workaround][$donatrix = $activeSlave, $wombIndex = _ap, $nextLink = "Analyze Pregnancy"]]
+				<</if>>
 			<</if>>
-		<</if>>
+			<<if $incubator > 0>>
-		<<if $incubator > 0>>
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				<<if $activeSlave.womb[_ap].reserve === "incubator">>
-			<<if $activeSlave.womb[_ap].reserve === "incubator">>
+					<<link "Don't keep this child in $incubatorName" "Analyze Pregnancy">>
-				<<link "Don't keep this child in $incubatorName" "Analyze Pregnancy">>
+						<<set $activeSlave.womb[_ap].reserve = "">>
-					<<set $activeSlave.womb[_ap].reserve = "">>
+						<<set $reservedChildren-->>
-					<<set $reservedChildren-->>
+					<</link>>
-				<</link>>
+				<<elseif $freeTanks - $reservedChildren > 0>>
-			<<elseif $freeTanks - $reservedChildren > 0>>
+					<<link "Keep this child in $incubatorName" "Analyze Pregnancy">>
-				<<link "Keep this child in $incubatorName" "Analyze Pregnancy">>
+						<<if $activeSlave.womb[_ap].reserve === "nursery">>
-					<<if $activeSlave.womb[_ap].reserve === "nursery">>
+							<<set $reservedChildrenNursery-->>
+						<</if>>
+						<<set $activeSlave.womb[_ap].reserve = "incubator">>
+						<<set $reservedChildren++>>
+					<</link>>
+				<<else>>
+					There is not enough free space to keep this child in $incubatorName.
+				<</if>>
+			<</if>>
+			<<if $nursery > 0>>
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				<<if $activeSlave.womb[_ap].reserve === "nursery">>
+					<<link "Don't keep this child in $nurseryName" "Analyze Pregnancy">>
+						<<set $activeSlave.womb[_ap].reserve = "">>
 						<<set $reservedChildrenNursery-->>
-					<</if>>
+					<</link>>
-					<<set $activeSlave.womb[_ap].reserve = "incubator">>
+				<<elseif $freeCribs - $reservedChildrenNursery > 0>>
-					<<set $reservedChildren++>>
+					<<link "Keep this child in $nurseryName" "Analyze Pregnancy">>
-				<</link>>
+						<<if $activeSlave.womb[_ap].reserve === "incubator">>
-			<<else>>
+							<<set $reservedChildren-->>
-				There is not enough free space to keep this child in $incubatorName.
+						<</if>>
+						<<set $activeSlave.womb[_ap].reserve = "nursery">>
+						<<set $reservedChildrenNursery++>>
+					<</link>>
+				<<else>>
+					There is not enough free space to keep this child in $nurseryName.
+				<</if>>
 			<</if>>
-		<</if>>
+		<<else>>	
-		<<if $nursery > 0>>
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			<<if $activeSlave.womb[_ap].reserve === "nursery">>
+			Unindefined ova found, no detailed data available.<br>&nbsp;&nbsp;&nbsp;&nbsp;
-				<<link "Don't keep this child in $nurseryName" "Analyze Pregnancy">>
+			Age: too early for scan.
-					<<set $activeSlave.womb[_ap].reserve = "">>
+			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-					<<set $reservedChildrenNursery-->>
+			<<link "Terminate ovum" "Analyze Pregnancy">><<run WombRemoveFetus($activeSlave, _ap)>><</link>>
-				<</link>>
+			<<if $surgeryUpgrade == 1>>
-			<<elseif $freeCribs - $reservedChildrenNursery > 0>>
+				| [[Transplant ovum|Ova Transplant Workaround][$donatrix = $activeSlave, $wombIndex = _ap, $nextLink = "Analyze Pregnancy"]]
-				<<link "Keep this child in $nurseryName" "Analyze Pregnancy">>
-					<<if $activeSlave.womb[_ap].reserve === "incubator">>
-						<<set $reservedChildren-->>
-					<</if>>
-					<<set $activeSlave.womb[_ap].reserve = "nursery">>
-					<<set $reservedChildrenNursery++>>
-				<</link>>
-			<<else>>
-				There is not enough free space to keep this child in $nurseryName.
 			<</if>>
 		<</if>>
 		<br><br><hr style="margin:0"><br>

--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -484,7 +484,7 @@ In total, you have given birth to:
 		You are not on any fertility supplements<<if _fertRefresh == 1>>, other than the $PC.refreshment, of course.<<else>>.<<if $PC.forcedFertDrugs > 0>> You feel a strange eagerness whenever you think of bareback sex.<</if>><</if>> [[Start taking fertility drugs|Manage Personal Affairs][$PC.fertDrugs = 1]]
 	<</if>>
 <</if>>
-<<if ($PC.preg > 1 && $pregnancyMonitoringUpgrade == 1)>>
+<<if ($PC.preg > 0 && $pregnancyMonitoringUpgrade == 1)>>
 	<br>[[Inspect pregnancy|Analyze PC Pregnancy]]
 <</if>>
 <<if $PC.preg >= 0 && $PC.vagina == 1>>

--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1201,7 +1201,7 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
 		[[Turn on implant|Slave Interact][$activeSlave.broodmotherOnHold = 0, $activeSlave.broodmotherCountDown = 0]]
 	<<elseif $activeSlave.preg >= -1>>
 		Contraception: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.pregWeek < 0>><<print "postpartum">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>.
-		<<if ($activeSlave.preg > 1 && $activeSlave.broodmother == 0 && $pregnancyMonitoringUpgrade == 1)>>
+		<<if ($activeSlave.preg > 0 && $pregnancyMonitoringUpgrade == 1)>>
 			[[Inspect pregnancy|Analyze Pregnancy]] |
 		<</if>>
 		<<if ($activeSlave.preg == 0)>>

--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -313,6 +313,9 @@ Call as <<SlaveInteractFertility>>
 		[[Turn on implant|Slave Interact][$activeSlave.broodmotherOnHold = 0, $activeSlave.broodmotherCountDown = 0]]
 	<<elseif ($activeSlave.preg >= -1)>>
 		Contraception: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.pregWeek < 0>><<print "postpartum">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>.
+		<<if ($activeSlave.preg > 0 && $pregnancyMonitoringUpgrade == 1)>>
+			[[Inspect pregnancy|Analyze Pregnancy]] |
+		<</if>>
 		<<if ($activeSlave.preg == 0)>>
 			<<link "Use contraceptives">><<set $activeSlave.preg = -1>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
 		<<elseif ($activeSlave.preg == -1)>>