From ef616f1b2b8e0e89b8c8d5d0da1007ece158697f Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Wed, 27 Feb 2019 23:29:39 -0600
Subject: [PATCH] WidgFix
---
src/utility/extendedFamilyWidgets.tw | 473 ---------------------------
1 file changed, 473 deletions(-)
diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw
index 52f496e8732..61552059b70 100644
--- a/src/utility/extendedFamilyWidgets.tw
+++ b/src/utility/extendedFamilyWidgets.tw
@@ -77,446 +77,6 @@
<</if>>
<<if def $showDistantRelatives && $showDistantRelatives == 1>>
-<<<<<<< HEAD
- /*testtest maternal grandma passage - determines if the current slave has a maternal grandmother*/
- <<set _mi = $slaveIndices[$activeSlave.mother]>>
- <<set _fi = $slaveIndices[$activeSlave.father]>>
- <<if def _mi>>
- <<set _mmi = $slaveIndices[$slaves[_mi].mother]>>
- <<set _fmi = $slaveIndices[$slaves[_mi].father]>>
- <<elseif $PC.ID == $activeSlave.mother>>
- <<set _mmi = $slaveIndices[$PC.mother]>>
- <<set _fmi = $slaveIndices[$PC.father]>>
- <</if>>
- <<if def _fi>>
- <<set _mfi = $slaveIndices[$slaves[_fi].mother]>>
- <<set _ffi = $slaveIndices[$slaves[_fi].father]>>
- <<elseif $PC.ID == $activeSlave.father>>
- <<set _mfi = $slaveIndices[$PC.mother]>>
- <<set _ffi = $slaveIndices[$PC.father]>>
- <</if>>
- <<if (def _mi || def _fi) && ndef _mmi && ndef _fmi && ndef _mfi && ndef _ffi>>
- <<if def _mi>>
- <<if def _fi && _mi == _fi>>
- <<if $PC.ID == $slaves[_mi].mother && $PC.ID == $slaves[_fi].father>>
- $He is @@.lightgreen;your grandchild.@@ You impregnated yourself with $his sole biological parent.
- <<elseif $PC.ID == $slaves[_mi].mother>>
- $He is @@.lightgreen;your grandchild.@@ You gave birth to $his sole biological parent.
- <<elseif $PC.ID == $slaves[_fi].father>>
- $He is @@.lightgreen;your grandchild.@@ You fathered $his sole biological parent.
- <</if>>
- <<elseif def _fi && $PC.ID == $slaves[_mi].mother && $PC.ID == $slaves[_fi].mother>>
- $He is @@.lightgreen;your grandchild.@@ You gave birth to both of $his parents.
- <<elseif def _fi && $PC.ID == $slaves[_mi].father && $PC.ID == $slaves[_fi].father>>
- $He is @@.lightgreen;your grandchild.@@ You fathered both of $his parents.
- <<elseif $PC.ID == $slaves[_mi].mother>>
- $He is @@.lightgreen;your grandchild.@@ You gave birth to $his mother.
- <<elseif $PC.ID == $slaves[_mi].father>>
- $He is @@.lightgreen;your grandchild.@@ You fathered $his mother.
- <</if>>
- <<elseif def _fi>>
- <<if $PC.ID == $slaves[_fi].mother>>
- $He is @@.lightgreen;your grandchild.@@ You gave birth to $his father.
- <<elseif $PC.ID == $slaves[_fi].father>>
- $He is @@.lightgreen;your grandchild.@@ You fathered $his father.
- <</if>>
- <</if>>
- <<else>>
- <<if def _mmi && def _ffi && _mmi == _ffi>>
- $His sole @@.lightgreen;grandparent is $slaves[_mmi].slaveName.@@
- <<else>>
- <<if def _mmi && def _mfi && _mmi == _mfi>>
- $His sole @@.lightgreen;grandmother is $slaves[_mmi].slaveName.@@
- <<else>>
- <<if def _mmi>>
- $His maternal @@.lightgreen;grandmother is $slaves[_mmi].slaveName.@@
- <</if>>
- <<if def _mfi>>
- $His paternal @@.lightgreen;grandmother is $slaves[_mfi].slaveName.@@
- <</if>>
- <</if>>
- <<if def _fmi && def _ffi && _fmi == _ffi>>
- $His sole @@.lightgreen;grandfather is $slaves[_ffi].slaveName.@@
- <<else>>
- <<if def _fmi>>
- $His maternal @@.lightgreen;grandfather is $slaves[_fmi].slaveName.@@
- <</if>>
- <<if _ffi>>
- $His paternal @@.lightgreen;grandfather is $slaves[_ffi].slaveName.@@
- <</if>>
- <</if>>
- <</if>>
- <</if>>
-
-
- /*testtest PC grandparents passage - determines if the current slave is your grandparent*/
- <<set _pcMother = $slaveIndices[$PC.mother]>>
- <<set _pcFather = $slaveIndices[$PC.father]>>
- <<if def _pcMother>>
- <<if def _pcFather && _pcMother == _pcFather>>
- <<if $activeSlave.ID == $slaves[_pcMother].mother && $activeSlave.ID == $slaves[_pcFather].father>>
- $He is @@.lightgreen;your sole grandparent.@@ $He impregnated $himself with your mother/father who in turn impregnated themselves with you.
- <<elseif $activeSlave.ID == $slaves[_pcMother].mother>>
- $He is @@.lightgreen;your sole grandmother.@@ $He gave birth to $slaves[_pcMother].slaveName who in turn impregnated themselves with you.
- <<elseif $activeSlave.ID == $slaves[_pcFather].father>>
- $He is @@.lightgreen;your sole grandfather.@@ $He fathered $slaves[_pcFather].slaveName who in turn impregnated themselves with you.
- <</if>>
- <<elseif def _pcFather && $activeSlave.ID == $slaves[_pcMother].mother && $activeSlave.ID == $slaves[_pcFather].mother>>
- $He is @@.lightgreen;your sole grandmother.@@ $He gave birth to both of your parents, $slaves[_pcMother].slaveName and $slaves[_pcFather].slaveName.
- <<elseif def _pcFather && $activeSlave.ID == $slaves[_pcMother].father && $activeSlave.ID == $slaves[_pcFather].father>>
- $He is @@.lightgreen;your sole grandfather.@@ $He fathered both of your parents, $slaves[_pcFather].slaveName and $slaves[_pcMother].slaveName.
- <<elseif $activeSlave.ID == $slaves[_pcMother].mother>>
- $He is @@.lightgreen;your maternal grandmother.@@
- <<elseif $activeSlave.ID == $slaves[_pcMother].father>>
- $He is @@.lightgreen;your maternal grandfather.@@
- <</if>>
- <<elseif def _pcFather>>
- <<if $activeSlave.ID == $slaves[_pcFather].mother>>
- $He is @@.lightgreen;your paternal grandmother.@@
- <<elseif $activeSlave.ID == $slaves[_pcFather].father>>
- $He is @@.lightgreen;your paternal grandfather.@@
- <</if>>
- <</if>>
-
- /*testtest grandchild passage - determines how many grandchildren the current slave has*/
- <<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].ID != $activeSlave.ID>>
- <<if $activeSlave.ID == $slaves[$i].mother || $activeSlave.ID == $slaves[$i].father>>
- <<for $j = 0; $j < $slaves.length; $j++>>
- <<if $slaves[$i].ID != $slaves[$j].ID>>
- <<if $slaves[$i].ID == $slaves[$j].mother || $slaves[$i].ID == $slaves[$j].father>>
- <<set $children.push($slaves[$j])>>
- <</if>>
- <</if>>
- <</for>>
- <</if>>
- <</if>>
- <</for>>
- <<if $children.length > 0>>
- $He
- <<if $children.length > 2>>
- has @@.lightgreen;many grandchildren,
- <<for $j = 0; $j < $children.length; $j++>>
- <<if $j < $children.length-1>>
- $children[$j].slaveName,
- <<else>>
- and $children[$j].slaveName amongst your slaves.@@
- <</if>>
- <</for>>
- <<elseif $children.length > 1>>
- has @@.lightgreen;two grandchildren, $children[0].slaveName, and $children[1].slaveName as your slaves.@@
- <<elseif $children.length > 0>>
- has a @@.lightgreen;grandchild, $children[0].slaveName as your slave.@@
- <</if>>
- <</if>>
- <<set $children = []>>
-
- /*testtest PC aunt passage - determines how many aunts you have*/
- <<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].ID != $activeSlave.ID>>
- <<if areSisters($slaves[$i], $activeSlave) == 1 || areSisters($slaves[$i], $activeSlave) == 2>>
- <<if $slaves[$i].ID == $PC.mother || $slaves[$i].ID == $PC.father>>
- <<for $j = 0; $j < $slaves.length; $j++>>
- <<if $slaves[$i].ID != $slaves[$j].ID>>
- <<if $slaves[$j].genes == "XX">>
- <<if areSisters($slaves[$j], $activeSlave) == 1 || areSisters($slaves[$j], $activeSlave) == 2>>
- <<set $children.push($slaves[$j])>>
- <</if>>
- <</if>>
- <</if>>
- <</for>>
- <</if>>
- <</if>>
- <</if>>
- <</for>>
- <<if $activeSlave.genes == "XX" && $children.length > 0>>
- $He
- <<if $children.length > 2>>
- is @@.lightgreen;your aunt along 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>>
- is @@.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.genes == "XX">>
- <<if areSisters($slaves[$i], $activeSlave) == 1 || areSisters($slaves[$i], $activeSlave) == 2>>
- <<if $slaves[$i].ID == $PC.mother || $slaves[$i].ID == $PC.father>>
- $He is @@.lightgreen;your aunt.@@
- <</if>>
- <</if>>
- <</if>>
- <</for>>
- <</if>>
- <</if>>
- <<set $children = []>>
-
- /*testtest PC uncle passage - determines how many uncles you have*/
- <<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].ID != $activeSlave.ID>>
- <<if areSisters($slaves[$i], $activeSlave) == 1 || areSisters($slaves[$i], $activeSlave) == 2>>
- <<if $slaves[$i].ID == $PC.mother || $slaves[$i].ID == $PC.father>>
- <<for $j = 0; $j < $slaves.length; $j++>>
- <<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>>
- <</if>>
- <</for>>
- <</if>>
- <</if>>
- <</if>>
- <</for>>
- <<if $activeSlave.genes == "XY" && $children.length > 0>>
- $He
- <<if $children.length > 2>>
- is @@.lightgreen;your uncle along 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>>
- is @@.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.genes == "XY">>
- <<if areSisters($slaves[$i], $activeSlave) == 1 || areSisters($slaves[$i], $activeSlave) == 2>>
- <<if $slaves[$i].ID == $PC.mother || $slaves[$i].ID == $PC.father>>
- $He is @@.lightgreen;your uncle.@@
- <</if>>
- <</if>>
- <</if>>
- <</for>>
- <</if>>
- <</if>>
- <<set $children = []>>
-
- /*testtest aunt passage - determines how many aunts a slave has*/
- <<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].ID != $activeSlave.ID>>
- <<if $slaves[$i].ID == $activeSlave.mother || $slaves[$i].ID == $activeSlave.father>>
- <<for $j = 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].genes == "XX">>
- <<if areSisters($slaves[$j], $slaves[$i]) == 1 || areSisters($slaves[$j], $slaves[$i]) == 2>>
- <<set $children.push($slaves[$j])>>
- <</if>>
- <</if>>
- <</for>>
- <</if>>
- <</if>>
- <</for>>
- <<if $children.length > 0>>
- $He
- <<if $children.length > 2>>
- has @@.lightgreen;many aunts,
- <<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>>
- has @@.lightgreen;two aunts, $children[0].slaveName, and $children[1].slaveName.@@
- <<elseif $children.length > 0>>
- has @@.lightgreen;an aunt, $children[0].slaveName.@@
- <</if>>
- <</if>>
- <<set $children = []>>
-
- /*testtest uncle passage - determines how many uncles a slave has*/
- <<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].ID != $activeSlave.ID>>
- <<if $slaves[$i].ID == $activeSlave.mother || $slaves[$i].ID == $activeSlave.father>>
- <<for $j = 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].genes == "XY">>
- <<if areSisters($slaves[$j], $slaves[$i]) == 1 || areSisters($slaves[$j], $slaves[$i]) == 2>>
- <<set $children.push($slaves[$j])>>
- <</if>>
- <</if>>
- <</for>>
- <</if>>
- <</if>>
- <</for>>
- <<if $children.length > 0>>
- $He
- <<if $children.length > 2>>
- has @@.lightgreen;many uncles,
- <<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>>
- has @@.lightgreen;two uncles, $children[0].slaveName, and $children[1].slaveName.@@
- <<elseif $children.length > 0>>
- has @@.lightgreen;an uncle, $children[0].slaveName.@@
- <</if>>
- <</if>>
- <<set $children = []>>
-
- /*testtest PC niece passage - determines how many nieces you have*/
- <<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].ID != $activeSlave.ID>>
- <<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[$j].genes == "XX">>
- <<if $slaves[$i].ID == $slaves[$j].mother || $slaves[$i].ID == $slaves[$j].father>>
- <<set $children.push($slaves[$j])>>
- <</if>>
- <</if>>
- <</for>>
- <</if>>
- <</if>>
- <</if>>
- <</for>>
- <<if $activeSlave.genes == "XX" && $children.length > 0>>
- $He
- <<if $children.length > 2>>
- is @@.lightgreen;your niece along 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>>
- is @@.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.genes == "XX">>
- <<if areSisters($slaves[$i], $PC) == 1 || areSisters($slaves[$i], $PC) == 2>>
- <<if $slaves[$i].ID == $activeSlave.mother || $slaves[$i].ID == $activeSlave.father>>
- is @@.lightgreen;your niece.@@
- <</if>>
- <</if>>
- <</if>>
- <</for>>
- <</if>>
- <</if>>
- <<set $children = []>>
-
- /* testtest niece passage - determines how many nieces a slave has*/
- <<for $i = 0; $i < $slaves.length; $i++>>
- <<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].genes == "XX">>
- <<if $slaves[$i].ID == $slaves[$j].mother || $slaves[$i].ID == $slaves[$j].father>>
- <<set $children.push($slaves[$j])>>
- <</if>>
- <</if>>
- <</for>>
- <</if>>
- <</if>>
- <</for>>
- <<if $children.length > 0>>
- $He
- <<if $children.length > 2>>
- has @@.lightgreen;many nieces,
- <<for $j = 0; $j < $children.length; $j++>>
- <<if $j < $children.length-1>>
- $children[$j].slaveName,
- <<else>>
- and $children[$j].slaveName, who are your slaves.@@
- <</if>>
- <</for>>
- <<elseif $children.length > 1>>
- has @@.lightgreen;two nieces, $children[0].slaveName, and $children[1].slaveName, who are your slaves.@@
- <<elseif $children.length > 0>>
- has @@.lightgreen;a niece, $children[0].slaveName, who is your slave.@@
- <</if>>
- <</if>>
- <<set $children = []>>
-
- /*testtest PC nephew passage - determines how many nephews you have*/
- <<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].ID != $activeSlave.ID>>
- <<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].genes == "XY">>
- <<if $slaves[$i].ID == $slaves[$j].mother || $slaves[$i].ID == $slaves[$j].father>>
- <<set $children.push($slaves[$j])>>
- <</if>>
- <</if>>
- <</for>>
- <</if>>
- <</if>>
- <</if>>
- <</for>>
- <<if $activeSlave.genes == "XY" && $children.length > 0>>
- $He
- <<if $children.length > 2>>
- is @@.lightgreen;your nephew along 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>>
- is @@.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.genes == "XY">>
- <<if areSisters($slaves[$i], $PC) == 1 || areSisters($slaves[$i], $PC) == 2>>
- <<if $slaves[$i].ID == $activeSlave.mother || $slaves[$i].ID == $activeSlave.father>>
- is @@.lightgreen;your nephew.@@
- <</if>>
- <</if>>
- <</if>>
- <</for>>
- <</if>>
- <</if>>
- <<set $children = []>>
-
- /* testtest nephew passage - determines how many nephews a slave has*/
- <<for $i = 0; $i < $slaves.length; $i++>>
- <<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].genes == "XY">>
- <<if $slaves[$i].ID == $slaves[$j].mother || $slaves[$i].ID == $slaves[$j].father>>
- <<set $children.push($slaves[$j])>>
- <</if>>
- <</if>>
- <</for>>
- <</if>>
- <</if>>
- <</for>>
- <<if $children.length > 0>>
- $He
- <<if $children.length > 2>>
- has @@.lightgreen;many nephews,
- <<for $j = 0; $j < $children.length; $j++>>
- <<if $j < $children.length-1>>
- $children[$j].slaveName,
- <<else>>
- and $children[$j].slaveName, who are your slaves.@@
- <</if>>
- <</for>>
- <<elseif $children.length > 1>>
- has @@.lightgreen;two nephews, $children[0].slaveName, and $children[1].slaveName, who are your slaves.@@
- <<elseif $children.length > 0>>
- has @@.lightgreen;a nephew, $children[0].slaveName, who is your slave.@@
- <</if>>
- <</if>>
- <<set $children = []>>
-=======
/*testtest maternal grandma passage - determines if the current slave has a maternal grandmother*/
<<set _mi = $slaveIndices[$activeSlave.mother]>>
<<set _fi = $slaveIndices[$activeSlave.father]>>
@@ -955,7 +515,6 @@
<</if>>
<</if>>
<<set $children = []>>
->>>>>>> 14b240a283262b8791485ed8f234dfbe31a62dc7
<</if>> /* end distant relatives toggle check */
/*testtest PC sibling passages - determines how many siblings you have
@@ -1148,37 +707,6 @@
<</if>>
<<if def $showDistantRelatives && $showDistantRelatives == 1>>
-<<<<<<< HEAD
- /*testtest PC cousin passage - determines how many cousins you have*/
- <<if areCousins($activeSlave, $PC)>>
- $He
- <<if _cousins.length > 1>>
- @@.lightgreen;is your cousin along with <<print _cousins.reduce(function(res, ch, i, arr) { return (res.slaveName || res) + (i == arr.length - 1 ? ' and ' : ', ') + ch.slaveName; })>>.@@
- <<elseif _cousins.length > 0>>
- is @@.lightgreen;your cousin along with _sisters[0].slaveName.@@
- <<else>>
- is @@.lightgreen;your cousin.@@
- <</if>>
- <</if>>
-
- /*testtest cousin - determines how many cousins a slave has*/
- <<set _children = $slaves.filter(function(s) { return s.ID != $activeSlave.ID && areCousins($activeSlave, s)})>>
- <<if _children.length > 2>>
- @@.lightgreen;
- <<for _efw = 0; _efw < _children.length; _efw++>>
- <<if _efw < _children.length-1>>
- _children[_efw].slaveName,
- <<else>>
- and _children[_efw].slaveName
- <</if>>
- <</for>>
- are cousins to $him.@@
- <<elseif _children.length > 1>>
- @@.lightgreen;_children[0].slaveName and _children[1].slaveName are cousins to $him.@@
- <<elseif _children.length > 0>>
- @@.lightgreen;_children[0].slaveName is a cousin to $him.@@
- <</if>>
-=======
/*testtest PC cousin passage - determines how many cousins you have*/
<<if areCousins($activeSlave, $PC)>>
$He
@@ -1208,7 +736,6 @@
<<elseif _children.length > 0>>
@@.lightgreen;_children[0].slaveName is a cousin to $him.@@
<</if>>
->>>>>>> 14b240a283262b8791485ed8f234dfbe31a62dc7
<</if>> /* end distant relatives toggle check */
<<if $activeSlave.clone != 0>>
--
GitLab