From 1382d8d53eac82ce620520d16e9760a68800dca2 Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Sat, 23 Feb 2019 00:34:41 -0500
Subject: [PATCH] simplify even more

---
 src/uncategorized/remoteSurgery.tw | 32 ++++++++++++------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index b64fff15d99..9561c215a99 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1059,28 +1059,22 @@ Work on $his sex:
 <<if ($activeSlave.dick == 0) && ($activeSlave.vagina == -1)>>
 	$He is a null, possessing neither penis nor vagina.
 <<elseif ($activeSlave.dick != 0)>>
+	$He has
 	<<if ($seeCircumcision == 1)>>
-		<<if ($activeSlave.vagina == -1) && ($activeSlave.foreskin == 0)>>
-			$He has a circumcised penis.
-		<<elseif ($activeSlave.vagina == -1) && ($activeSlave.foreskin >= 1)>>
-			$He has an uncircumcised penis.
-		<<elseif ($activeSlave.ovaries != 0) && ($activeSlave.foreskin == 0)>>
-			$He has a circumcised penis and a 
-		<<elseif ($activeSlave.ovaries != 0) && ($activeSlave.foreskin >= 1)>>
-			$He has an uncircumcised penis and a
-		<<elseif ($activeSlave.vagina != -1) && ($activeSlave.foreskin == 0)>>
-			$He has a circumcised penis and a<<if $activeSlave.genes == "XY">>n artificial<</if>>
-		<<elseif ($activeSlave.vagina != -1) && ($activeSlave.foreskin >= 1)>>
-			$He has an uncircumcised penis and a<<if $activeSlave.genes == "XY">>n artificial<</if>>
+		<<if ($activeSlave.foreskin == 0)>>
+			a circumcised
+		<<elseif ($activeSlave.foreskin >= 1)>>
+			an uncircumcised
 		<</if>>
 	<<else>>
-		<<if ($activeSlave.vagina == -1)>>
-			$He has a penis.
-		<<elseif ($activeSlave.ovaries != 0)>>
-			$He has a penis and a
-		<<elseif ($activeSlave.vagina != -1)>>
-			$He has a penis and a<<if $activeSlave.genes == "XY">>n artificial<</if>>
-		<</if>>
+		a
+	<</if>>
+	<<if ($activeSlave.vagina == -1)>>
+		penis.
+	<<elseif ($activeSlave.ovaries != 0)>>
+		penis and a
+	<<elseif ($activeSlave.vagina != -1)>>
+		penis and a<<if $activeSlave.genes == "XY">>n artificial<</if>>
 	<</if>>
 <<elseif ($activeSlave.dick == 0)>>
 	$He has a
-- 
GitLab