From daf50f516135430522200debd2f65f604c31d25f Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 21 Apr 2017 22:49:56 -0400
Subject: [PATCH] Extended family tracking swapped to using .genes opposed to
 .dick and .vagina.

---
 src/pregmod/widgets/extendedFamilyWidgets.tw | 178 ++++++++++++++-----
 1 file changed, 129 insertions(+), 49 deletions(-)

diff --git a/src/pregmod/widgets/extendedFamilyWidgets.tw b/src/pregmod/widgets/extendedFamilyWidgets.tw
index ebab25cde32..9ddd517d6a5 100644
--- a/src/pregmod/widgets/extendedFamilyWidgets.tw
+++ b/src/pregmod/widgets/extendedFamilyWidgets.tw
@@ -193,7 +193,7 @@
 	<<if $slaves[$i].ID == $PC.mother || $slaves[$i].ID == $PC.father>>
 		<<for $j to 0; $j < $slaves.length; $j++>>
 			<<if $slaves[$i].ID != $slaves[$j].ID >>
-			<<if $slaves[$j].vagina > -1>>
+			<<if $slaves[$j].genes == "XX">>
 			<<if areSisters($slaves[$j], $activeSlave) == 1 ||  areSisters($slaves[$j], $activeSlave) == 2>>
 				<<set $children.push($slaves[$j])>>
 			<</if>>
@@ -204,7 +204,7 @@
 	<</if>>
 	<</if>>
 <</for>>
-<<if $activeSlave.vagina > -1 && $children.length > 0>>
+<<if $activeSlave.genes == "XX" && $children.length > 0>>
 	$pronounCap 
 	<<if $children.length > 2>>
 		is @@color:lightgreen;your aunt along with 
@@ -219,7 +219,7 @@
 		is @@color:lightgreen;your aunt along with $children[0].slaveName.@@
 	<<elseif $children.length > 0>>
 		<<for $i = 0; $i < $slaves.length; $i++>>
-			<<if $slaves[$i].ID != $activeSlave.ID && $activeSlave.vagina > -1>>
+			<<if $slaves[$i].ID != $activeSlave.ID && $activeSlave.genes == "XX">>
 			<<if areSisters($slaves[$i], $activeSlave) == 1 ||  areSisters($slaves[$i], $activeSlave) == 2>> 
 			<<if $slaves[$i].ID == $PC.mother || $slaves[$i].ID == $PC.father>>
 				$pronounCap is @@color:lightgreen;your aunt.@@
@@ -237,7 +237,7 @@
 	<<if areSisters($slaves[$i], $activeSlave) == 1 ||  areSisters($slaves[$i], $activeSlave) == 2>> 
 	<<if $slaves[$i].ID == $PC.mother || $slaves[$i].ID == $PC.father>>
 		<<for $j to 0; $j < $slaves.length; $j++>>
-			<<if $slaves[$i].ID != $slaves[$j].ID && $slaves[$j].dick > 0 && $slaves[$j].vagina == -1>>
+			<<if $slaves[$i].ID != $slaves[$j].ID && $slaves[$j].dick > 0 && $slaves[$j].genes == "XY">>
 			<<if areSisters($slaves[$j], $activeSlave) == 1 ||  areSisters($slaves[$j], $activeSlave) == 2>>
 				<<set $children.push($slaves[$j])>>
 			<</if>>
@@ -247,7 +247,7 @@
 	<</if>>
 	<</if>>
 <</for>>
-<<if $activeSlave.dick > 0 && $activeSlave.vagina == -1 && $children.length > 0>>
+<<if $activeSlave.genes == "XY" && $children.length > 0>>
 	$pronounCap 
 	<<if $children.length > 2>>
 		is @@color:lightgreen;your uncle along with 
@@ -262,7 +262,7 @@
 		is @@color:lightgreen;your uncle along with $children[0].slaveName.@@
 	<<elseif $children.length > 0>>
 		<<for $i = 0; $i < $slaves.length; $i++>>
-			<<if $slaves[$i].ID != $activeSlave.ID && $activeSlave.dick > 0 && $activeSlave.vagina == -1>>
+			<<if $slaves[$i].ID != $activeSlave.ID && $activeSlave.genes == "XY">>
 			<<if areSisters($slaves[$i], $activeSlave) == 1 ||  areSisters($slaves[$i], $activeSlave) == 2>> 
 			<<if $slaves[$i].ID == $PC.mother || $slaves[$i].ID == $PC.father>>
 				$pronounCap is @@color:lightgreen;your uncle.@@
@@ -279,7 +279,7 @@
 	<<if $slaves[$i].ID != $activeSlave.ID>>
 	<<if $slaves[$i].ID == $activeSlave.mother || $slaves[$i].ID == $activeSlave.father>>
 		<<for $j to 0; $j < $slaves.length; $j++>>
-			<<if $slaves[$j].vagina > -1>>
+			<<if $slaves[$j].genes == "XX">>
 			<<if areSisters($slaves[$j], $slaves[$i]) == 1 || areSisters($slaves[$j], $slaves[$i]) == 2>> 
 				<<set $children.push($slaves[$j])>>
 			<</if>>
@@ -312,7 +312,7 @@
 	<<if $slaves[$i].ID != $activeSlave.ID>>
 	<<if $slaves[$i].ID == $activeSlave.mother || $slaves[$i].ID == $activeSlave.father>>
 		<<for $j to 0; $j < $slaves.length; $j++>>
-			<<if $slaves[$j].dick > 0 && $slaves[$j].vagina == -1>>
+			<<if $slaves[$j].genes == "XY">>
 			<<if areSisters($slaves[$j], $slaves[$i]) == 1 || areSisters($slaves[$j], $slaves[$i]) == 2>> 
 				<<set $children.push($slaves[$j])>>
 			<</if>>
@@ -321,7 +321,7 @@
 	<</if>>
 	<</if>>
 <</for>>
-<<if $activeSlave.vagina > -1 && $children.length > 0>>
+<<if $children.length > 0>>
 	$pronounCap 
 <<if $children.length > 2>>
 	has @@color:lightgreen;many aunts,
@@ -346,7 +346,7 @@
 	<<if areSisters($slaves[$i], $PC) == 1 || areSisters($slaves[$i], $PC) == 2>>
 	<<if $slaves[$i].ID == $activeSlave.mother || $slaves[$i].ID == $activeSlave.father>>
 		<<for $j to 0; $j < $slaves.length; $j++>>
-			<<if $slaves[$i].ID != $slaves[$j].ID && $slaves[$j].ID != $activeSlave.ID && $slaves[$j].vagina > -1>>
+			<<if $slaves[$i].ID != $slaves[$j].ID && $slaves[$j].ID != $activeSlave.ID && $slaves[$j].genes == "XX">>
 			<<if $slaves[$i].ID == $slaves[$j].mother || $slaves[$i].ID == $slaves[$j].father>>
 				<<set $children.push($slaves[$j])>>
 			<</if>>
@@ -356,7 +356,7 @@
 	<</if>>
 	<</if>>
 <</for>>
-<<if $activeSlave.vagina > -1 && $children.length > 0>>
+<<if $activeSlave.genes == "XX" && $children.length > 0>>
 	$pronounCap
 <<if $children.length > 2>>
 	is @@color:lightgreen;your niece along with 
@@ -371,7 +371,7 @@
 	is @@color:lightgreen;your niece along with $children[0].slaveName.@@ 
 <<elseif $children.length > 0>>
 <<for $i = 0; $i < $slaves.length; $i++>>
-	<<if $slaves[$i].ID != $activeSlave.ID && $activeSlave.vagina > -1>>
+	<<if $slaves[$i].ID != $activeSlave.ID && $activeSlave.genes == "XX">>
 	<<if areSisters($slaves[$i], $PC) == 1 || areSisters($slaves[$i], $PC) == 2>>
 	<<if $slaves[$i].ID == $activeSlave.mother || $slaves[$i].ID == $activeSlave.father>>
 		$pronounCap is @@color:lightgreen;your niece.@@
@@ -388,7 +388,7 @@
 	<<if $slaves[$i].ID != $activeSlave.ID>>
 	<<if areSisters($slaves[$i], $activeSlave) == 1 || areSisters($slaves[$i], $activeSlave) == 2>> 
 		<<for $j = 0; $j < $slaves.length; $j++>>
-			<<if $slaves[$i].ID != $slaves[$j].ID && $slaves[$j].ID != $activeSlave.ID && $slaves[$j].vagina > -1>>
+			<<if $slaves[$i].ID != $slaves[$j].ID && $slaves[$j].ID != $activeSlave.ID && $slaves[$j].genes == "XX">>
 			<<if $slaves[$i].ID == $slaves[$j].mother || $slaves[$i].ID == $slaves[$j].father>>
 				<<set $children.push($slaves[$j])>>
 			<</if>>
@@ -397,7 +397,7 @@
 	<</if>>
 	<</if>>
 <</for>>
-<<if $activeSlave.vagina > -1 && $children.length > 0>>
+<<if $children.length > 0>>
 	$pronounCap
 <<if $children.length > 2>>
 	has @@color:lightgreen;many nieces,
@@ -422,7 +422,7 @@
 	<<if areSisters($slaves[$i], $PC) == 1 || areSisters($slaves[$i], $PC) == 2>>
 	<<if $slaves[$i].ID == $activeSlave.mother || $slaves[$i].ID == $activeSlave.father>>
 		<<for $j = 0; $j < $slaves.length; $j++>>
-			<<if $slaves[$i].ID != $slaves[$j].ID && $slaves[$j].ID != $activeSlave.ID && $slaves[$i].dick > 0 && $slaves[$i].vagina == -1>>
+			<<if $slaves[$i].ID != $slaves[$j].ID && $slaves[$j].ID != $activeSlave.ID && $slaves[$i].genes == "XY">>
 			<<if $slaves[$i].ID == $slaves[$j].mother || $slaves[$i].ID == $slaves[$j].father>>
 				<<set $children.push($slaves[$j])>>
 			<</if>>
@@ -432,7 +432,7 @@
 	<</if>>
 	<</if>>
 <</for>>
-<<if $activeSlave.dick > 0 && $activeSlave.vagina == -1 && $children.length > 0>>
+<<if $activeSlave.genes == "XY" && $children.length > 0>>
 	$pronounCap
 <<if $children.length > 2>>
 	is @@color:lightgreen;your nephew along with 
@@ -447,7 +447,7 @@
 	is @@color:lightgreen;your nephew along with $children[0].slaveName.@@ 
 <<elseif $children.length > 0>>
 <<for $i = 0; $i < $slaves.length; $i++>>
-	<<if $slaves[$i].ID != $activeSlave.ID && $activeSlave.dick > 0 && $activeSlave.vagina == -1>>
+	<<if $slaves[$i].ID != $activeSlave.ID && $activeSlave.genes == "XY">>
 	<<if areSisters($slaves[$i], $PC) == 1 || areSisters($slaves[$i], $PC) == 2>>
 	<<if $slaves[$i].ID == $activeSlave.mother || $slaves[$i].ID == $activeSlave.father>>
 		$pronounCap is @@color:lightgreen;your nephew.@@
@@ -464,7 +464,7 @@
 	<<if $slaves[$i].ID != $activeSlave.ID>>
 	<<if areSisters($slaves[$i], $activeSlave) == 1 || areSisters($slaves[$i], $activeSlave) == 2>> 
 		<<for $j = 0; $j < $slaves.length; $j++>>
-			<<if $slaves[$i].ID != $slaves[$j].ID && $slaves[$j].ID != $activeSlave.ID && $slaves[$j].dick > 0 && $slaves[$j].vagina == -1>>
+			<<if $slaves[$i].ID != $slaves[$j].ID && $slaves[$j].ID != $activeSlave.ID && $slaves[$j].genes == "XY">>
 			<<if $slaves[$i].ID == $slaves[$j].mother || $slaves[$i].ID == $slaves[$j].father>>
 				<<set $children.push($slaves[$j])>>
 			<</if>>
@@ -473,10 +473,10 @@
 	<</if>>
 	<</if>>
 <</for>>
-<<if $activeSlave.vagina > -1 && $children.length > 0>>
+<<if $children.length > 0>>
 	$pronounCap
 <<if $children.length > 2>>
-	has @@color:lightgreen;many nieces,
+	has @@color:lightgreen;many nephews,
 	<<for $j = 0; $j < $children.length; $j++>>
 		<<if $j < $children.length-1>>
 			$children[$j].slaveName,
@@ -485,18 +485,18 @@
 		<</if>>
 	<</for>>
 <<elseif $children.length > 1>>
-	has @@color:lightgreen;two nieces, $children[0].slaveName, and $children[1].slaveName, who are your slaves.@@ 
+	has @@color:lightgreen;two nephews, $children[0].slaveName, and $children[1].slaveName, who are your slaves.@@ 
 <<elseif $children.length > 0>>
-	has @@color:lightgreen;a niece, $children[0].slaveName, who is your slave.@@
+	has @@color:lightgreen;a nephew, $children[0].slaveName, who is your slave.@@
 <</if>>
 <</if>>
 <<set $children = []>>
 
-/*testtest PC sibling passages - determines how many siblings you have*/
+/*testtest PC sibling passages - determines how many siblings you have
 <<set $children = []>>
 <<set _rel_num = areSisters($activeSlave, $PC)>>
 <<if(_rel_num > 0)>>
-	<<if ($activeSlave.vagina > -1)>>
+	<<if ($activeSlave.genes == "XX")>>
 		<<set _rel_type = "sister">>
 	<<else>>
 		<<set _rel_type = "brother">>
@@ -533,8 +533,9 @@
 <</if>>
 <</if>>
 <<set $children = []>> 
+*/
 
-/*testtest PC twin passages - determines how many twins you have but not implemented yet
+/*testtest PC twin passages - determines how many twins you have but not implemented yet*/
 <<for $i = 0; $i < $slaves.length; $i++>>
 	<<if $slaves[$i].ID != $activeSlave.ID>>
 	<<if areSisters($activeSlave, $PC) == 1 && areSisters($slaves[$i], $activeSlave) == 1>>
@@ -554,19 +555,19 @@
 <<elseif $children.length > 1>>
 	$pronounCap is @@color:lightgreen;your twin along with $children[0].slaveName.@@
 <<elseif $children.length > 0>>
-	$pronounCap is @@color:lightgreen;your twin sister.@@
+	$pronounCap is @@color:lightgreen;your twin <<if $activeSlave.genes == "XX">>sister<<else>>brother<</if>>.@@
 <</if>>
 <<set $children = []>>
 
-testtest PC sister passages - determines how many sisters you have
+/*testtest PC sister passages - determines how many sisters you have*/
 <<for $i = 0; $i < $slaves.length; $i++>>
 	<<if $slaves[$i].ID != $activeSlave.ID>>
-	<<if areSisters($activeSlave, $PC) == 2 && areSisters($slaves[$i], $activeSlave) < 3 && areSisters($slaves[$i], $activeSlave) > 0 && $slaves[$i].vagina > -1>>
+	<<if areSisters($activeSlave, $PC) == 2 && areSisters($slaves[$i], $activeSlave) < 3 && areSisters($slaves[$i], $activeSlave) > 0 && $slaves[$i].genes == "XX">>
 		<<set $children.push($slaves[$i])>>
 	<</if>>
 	<</if>>
 <</for>>
-<<if $activeSlave.vagina > -1 && $children.length > 0>>
+<<if $activeSlave.genes == "XX" && $children.length > 0>>
 	$pronounCap 
 <<if $children.length > 2>>
 	@@color:lightgreen;is your sister along with
@@ -585,15 +586,15 @@ testtest PC sister passages - determines how many sisters you have
 <</if>>
 <<set $children = []>>
 
-testtest PC brother passages - determines how many brothers you have
+/*testtest PC brother passages - determines how many brothers you have*/
 <<for $i = 0; $i < $slaves.length; $i++>>
 	<<if $slaves[$i].ID != $activeSlave.ID>>
-	<<if areSisters($activeSlave, $PC) == 2 && areSisters($slaves[$i], $activeSlave) < 2 && areSisters($slaves[$i], $activeSlave) > 0 && $slaves[$i].dick > 0 && $slaves[$i].vagina == -1>>
+	<<if areSisters($activeSlave, $PC) == 2 && areSisters($slaves[$i], $activeSlave) < 2 && areSisters($slaves[$i], $activeSlave) > 0 && $slaves[$i].genes == "XY">>
 		<<set $children.push($slaves[$i])>>
 	<</if>>
 	<</if>>
 <</for>>
-<<if $activeSlave.dick > 0 && $activeSlave.vagina == -1 && $children.length > 0>>
+<<if $activeSlave.genes == "XY" && $children.length > 0>>
 	$pronounCap 
 <<if $children.length > 2>>
 	@@color:lightgreen;is your brother along with
@@ -612,15 +613,15 @@ testtest PC brother passages - determines how many brothers you have
 <</if>>
 <<set $children = []>>
 
-testtest PC half-sister passages - determines how many half-sisters you have
+/*testtest PC half-sister passages - determines how many half-sisters you have*/
 <<for $i = 0; $i < $slaves.length; $i++>>
 	<<if $slaves[$i].ID != $activeSlave.ID>>
-	<<if areSisters($activeSlave, $PC) == 3 && areSisters($slaves[$i], $PC) == 3 && $slaves[$i].vagina > -1>>
+	<<if areSisters($activeSlave, $PC) == 3 && areSisters($slaves[$i], $PC) == 3 && $slaves[$i].genes == "XX">>
 		<<set $children.push($slaves[$i])>>
 	<</if>>
 	<</if>>
 <</for>>
-<<if $activeSlave.vagina > -1 && $children.length > 0>>
+<<if $activeSlave.genes == "XX" && $children.length > 0>>
 	$pronounCap 
 <<if $children.length > 2>>
 	is @@color:lightgreen;your half-sister along with
@@ -639,15 +640,15 @@ testtest PC half-sister passages - determines how many half-sisters you have
 <</if>>
 <<set $children = []>>
 
-testtest PC half-brother passages - determines how many half-brothers you have
+/*testtest PC half-brother passages - determines how many half-brothers you have*/
 <<for $i = 0; $i < $slaves.length; $i++>>
 	<<if $slaves[$i].ID != $activeSlave.ID>>
-	<<if areSisters($activeSlave, $PC) == 3 && areSisters($slaves[$i], $PC) == 3 && $slaves[$i].dick > 0 && $slaves[$i].vagina == -1>>
+	<<if areSisters($activeSlave, $PC) == 3 && areSisters($slaves[$i], $PC) == 3 && $slaves[$i].genes == "XY">>
 		<<set $children.push($slaves[$i])>>
 	<</if>>
 	<</if>>
 <</for>>
-<<if $activeSlave.dick > 0 && $activeSlave.vagina == -1 && $children.length > 0>>
+<<if $activeSlave.genes == "XY" && $children.length > 0>>
 	$pronounCap 
 <<if $children.length > 2>>
 	is @@color:lightgreen;your half-brother along with
@@ -665,7 +666,6 @@ testtest PC half-brother passages - determines how many half-brothers you have
 <</if>>
 <</if>>
 <<set $children = []>>
-*/
 
 /*testtest twins? - determines how many twins a slave has*/
 <<for $i = 0; $i < $slaves.length; $i++>>
@@ -694,7 +694,7 @@ testtest PC half-brother passages - determines how many half-brothers you have
 /*testtest sister - determines how many sisters a slave has*/
 <<for $i = 0; $i < $slaves.length; $i++>>
 	<<if $slaves[$i].ID != $activeSlave.ID>>
-		<<if areSisters($activeSlave, $slaves[$i]) == 2 && $slaves[$i].vagina > -1>>
+		<<if areSisters($activeSlave, $slaves[$i]) == 2 && $slaves[$i].genes == "XX">>
 			<<set $children.push($slaves[$i])>>
 		<</if>>
 	<</if>>
@@ -718,7 +718,7 @@ testtest PC half-brother passages - determines how many half-brothers you have
 /*testtest brother - determines how many brothers a slave has*/
 <<for $i = 0; $i < $slaves.length; $i++>>
 	<<if $slaves[$i].ID != $activeSlave.ID>>
-		<<if areSisters($activeSlave, $slaves[$i]) == 2 && $slaves[$i].dick > 0 && $slaves[$i].vagina == -1>>
+		<<if areSisters($activeSlave, $slaves[$i]) == 2 && $slaves[$i].genes == "XY">>
 			<<set $children.push($slaves[$i])>>
 		<</if>>
 	<</if>>
@@ -742,7 +742,7 @@ testtest PC half-brother passages - determines how many half-brothers you have
 /*testtest half-sister - determines how many half-sisters a slave has*/
 <<for $i = 0; $i < $slaves.length; $i++>>
 	<<if $slaves[$i].ID != $activeSlave.ID>>
-		<<if areSisters($activeSlave, $slaves[$i]) == 3 && $slaves[$i].vagina > -1>>
+		<<if areSisters($activeSlave, $slaves[$i]) == 3 && $slaves[$i].genes == "XX">>
 			<<set $children.push($slaves[$i])>>
 		<</if>>
 	<</if>>
@@ -766,7 +766,7 @@ testtest PC half-brother passages - determines how many half-brothers you have
 /*testtest half-brother - determines how many half-brothers a slave has*/
 <<for $i = 0; $i < $slaves.length; $i++>>
 	<<if $slaves[$i].ID != $activeSlave.ID>>
-		<<if areSisters($activeSlave, $slaves[$i]) == 3 && $slaves[$i].dick > 0 && $slaves[$i].vagina == -1>>
+		<<if areSisters($activeSlave, $slaves[$i]) == 3 && $slaves[$i].genes == "XY">>
 			<<set $children.push($slaves[$i])>>
 		<</if>>
 	<</if>>
@@ -799,18 +799,44 @@ testtest PC half-brother passages - determines how many half-brothers you have
 			<<set $children.push($slaves[$i])>>
 <</if>>
 <</for>>
-	<<if $children.length > 1>>
-		<br>Your parents are @@color:lightgreen;$children[0].slaveName and $children[1].slaveName@@.
-	<<elseif $children.length > 0>>
-		<br>You know one of your parents, @@color:lightgreen;$children[0].slaveName@@.
+<<if $children.length > 1>>
+	<br>Your parents are @@color:lightgreen;$children[0].slaveName and $children[1].slaveName@@.
+<<elseif $children.length > 0>>
+	<br>You know one of your parents, @@color:lightgreen;$children[0].slaveName@@.
+<</if>>
+<<set $children = []>>
+
+/*Twins Test with aresisters*/
+<<for $i = 0; $i < $slaves.length; $i++>>
+	<<if $slaves[$i].ID != $PC.ID>>
+		<<if areSisters($activeSlave, $PC) == 1 && areSisters($slaves[$i], $activeSlave) == 1>>
+			<<set $children.push($slaves[$i])>>
+		<</if>>
 	<</if>>
+<</for>>
+<<if $children.length > 2>>
+	<br>You are @@color:lightgreen;twins with
+	<<for $j = 0; $j < $children.length; $j++>>
+		<<if $j < $children.length-1>>
+			$children[$j].slaveName,
+		<<else>>
+			and $children[$j].slaveName.@@
+		<</if>>
+	<</for>>
+<<elseif $children.length > 1>>
+	<br>You are twins with @@color:lightgreen;$children[0].slaveName and $children[1].slaveName.@@
+<<elseif $children.length > 0>>
+	<br>Your twin is @@color:lightgreen;$children[0].slaveName.@@
+<</if>>
 <<set $children = []>>
 
 /*Sister Test with aresisters*/
 <<for $i = 0; $i < $slaves.length; $i++>>
 	<<if $slaves[$i].ID != $PC.ID>>
 		<<if areSisters($PC, $slaves[$i]) === 2 && areSisters($slaves[$i], $PC) === 2>>
-			<<set $children.push($slaves[$i])>>
+			<<if $slaves[$i].genes == "XX">>
+				<<set $children.push($slaves[$i])>>
+			<</if>>
 		<</if>>
 	<</if>>
 <</for>>
@@ -830,11 +856,39 @@ testtest PC half-brother passages - determines how many half-brothers you have
 <</if>>
 <<set $children = []>>
 
+/*Brother Test with aresisters*/
+<<for $i = 0; $i < $slaves.length; $i++>>
+	<<if $slaves[$i].ID != $PC.ID>>
+		<<if areSisters($PC, $slaves[$i]) === 2 && areSisters($slaves[$i], $PC) === 2>>
+			<<if $slaves[$i].genes == "XY">>
+				<<set $children.push($slaves[$i])>>
+			<</if>>
+		<</if>>
+	<</if>>
+<</for>>
+<<if $children.length > 2>>
+	<br>You are @@color:lightgreen;brothers with
+	<<for $j = 0; $j < $children.length; $j++>>
+		<<if $j < $children.length-1>>
+			$children[$j].slaveName,
+		<<else>>
+			and $children[$j].slaveName.@@
+		<</if>>
+	<</for>>
+<<elseif $children.length > 1>>
+	<br>You are brothers with @@color:lightgreen;$children[0].slaveName and $children[1].slaveName.@@
+<<elseif $children.length > 0>>
+	<br>Your brother is @@color:lightgreen;$children[0].slaveName.@@
+<</if>>
+<<set $children = []>>
+
 /*Half-Sister Test with aresisters */
 <<for $i = 0; $i < $slaves.length; $i++>>
 	<<if $slaves[$i].ID != $PC.ID>>
 	<<if areSisters($slaves[$i], $PC) == 3 && areSisters($PC, $slaves[$i]) == 3>>
+		<<if $slaves[$i].genes == "XX">>
 			<<set $children.push($slaves[$i])>>
+		<</if>>
 	<</if>>
 <</if>>
 <</for>>
@@ -850,7 +904,33 @@ testtest PC half-brother passages - determines how many half-brothers you have
 <<elseif $children.length > 1>>
 	<br>You are half-sisters with @@color:lightgreen;$children[0].slaveName and $children[1].slaveName@@.
 <<elseif $children.length > 0>>
-	<br>You have one half-sisters, @@color:lightgreen;$children[0].slaveName@@.
+	<br>You have one half-sister, @@color:lightgreen;$children[0].slaveName@@.
+<</if>>
+<<set $children = []>>
+
+/*Half-Brother Test with aresisters */
+<<for $i = 0; $i < $slaves.length; $i++>>
+	<<if $slaves[$i].ID != $PC.ID>>
+	<<if areSisters($slaves[$i], $PC) == 3 && areSisters($PC, $slaves[$i]) == 3>>
+		<<if $slaves[$i].genes == "XY">>
+			<<set $children.push($slaves[$i])>>
+		<</if>>
+	<</if>>
+<</if>>
+<</for>>
+<<if $children.length > 2>>
+	<br>You are half-brothers with @@color:lightgreen;
+	<<for $j = 0; $j < $children.length; $j++>>
+		<<if $j < $children.length-1>>
+			$children[$j].slaveName,
+		<<else>>
+			and $children[$j].slaveName@@.
+		<</if>>
+	<</for>>
+<<elseif $children.length > 1>>
+	<br>You are half-brothers with @@color:lightgreen;$children[0].slaveName and $children[1].slaveName@@.
+<<elseif $children.length > 0>>
+	<br>You have one half-brother, @@color:lightgreen;$children[0].slaveName@@.
 <</if>>
 <<set $children = []>>
 
-- 
GitLab