From 1c891e87ef0c679436eab93a876c6bded017d483 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 18 Jun 2020 20:59:42 -0400
Subject: [PATCH] fixes

---
 src/pregmod/analyzePregnancy.tw | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw
index c40623e29be..c10d1d8e84b 100644
--- a/src/pregmod/analyzePregnancy.tw
+++ b/src/pregmod/analyzePregnancy.tw
@@ -372,18 +372,16 @@
 			</p>
 		<</for>>
 	</p>
+<<elseif getSlave($activeSlave.ID).preg == -3>> /*special states*/
+	Failure to locate any ova. Subject is infertile.
+<<elseif getSlave($activeSlave.ID).ovaryAge >= 47 >>
+	$His infertility is due to menopausal ovaries.		
 <<elseif getSlave($activeSlave.ID).pregWeek < 0>> /*special states*/
 	Subject is in the postpartem period.
+<<elseif getSlave($activeSlave.ID).ovaries === 0 || getSlave($activeSlave.ID).mpreg < 0>>
+	$His infertility is due to missing ovaries.	
+<<elseif getSlave($activeSlave.ID).preg == -2>> /*special states*/
+	$His infertility is due to sterilization; $his ovaries could still work.	
 <<elseif getSlave($activeSlave.ID).preg == -1>> /*special states*/
 	Contreceptive agents detected in subject.
-<<elseif getSlave($activeSlave.ID).ovaryAge >= 47 >>
-	$His infertility is due to menopausal ovaries.	
-<<elseif getSlave($activeSlave.ID).mpreg < 0>>
-	$His infertility is due to defective anal ovaries.
-<<elseif getSlave($activeSlave.ID).ovaries === 0>>
-	$His infertility is due to missing ovaries.
-<<elseif getSlave($activeSlave.ID).preg == -2>> /*special states*/
-	$His infertility is due to sterilization; although $his tubes are tied $his ovaries could still work.
-<<elseif getSlave($activeSlave.ID).preg == -3>> /*special states*/
-	Failure to locate any ova. Subject is infertile.
 <</if>>
-- 
GitLab