From da8375d379c19837a58e0e02a18c3eae27f66e2b Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 18 Jun 2020 16:05:06 -0400
Subject: [PATCH] denest

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

diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw
index 9608f471464..e4c4868afcf 100644
--- a/src/pregmod/analyzePregnancy.tw
+++ b/src/pregmod/analyzePregnancy.tw
@@ -374,21 +374,16 @@
 	</p>
 <<elseif getSlave($activeSlave.ID).pregWeek < 0>> /*special states*/
 	Subject is in the postpartem period.
-<<elseif getSlave($activeSlave.ID).preg == -1>> /*special states*/
+<<elseif getSlave($activeSlave.ID).preg == -1 ||  getSlave($activeSlave.ID).mpreg == -1>> /*special states*/
 	Contreceptive agents detected in subject.
+<<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).ovaryAge >= 47 >>
+	$His infertility is due to menopausal ovaries.
 <<elseif getSlave($activeSlave.ID).preg == -2>> /*special states*/
-	$His infertility is due to
-	<<if $activeSlave.mpreg === 0>>
-		<<if $activeSlave.ovaries === 0>>
-			missing ovaries.
-		<<elseif $activeSlave.ovaryAge >= 47 >>
-			menopausal ovaries.
-		<<else>>
-			sterilization; although $his tubes are tied $his ovaries could still work.
-		<</if>>	
-	<<else>>
-		defective anal ovaries.
-	<</if>>
+	$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