From 739dd914046d23d4efb01f4035eac1e0a105d59b Mon Sep 17 00:00:00 2001 From: klorpa <klorpa@yahoo.com> Date: Sun, 2 Sep 2018 19:36:50 -0700 Subject: [PATCH] Update extendedFamilyWidgets.tw --- src/utility/extendedFamilyWidgets.tw | 78 ++++++++++++++-------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw index 32e00e221eb..5555c84e79a 100644 --- a/src/utility/extendedFamilyWidgets.tw +++ b/src/utility/extendedFamilyWidgets.tw @@ -66,70 +66,70 @@ /*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]>> +<<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]>> + <<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]>> +<<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]>> + <<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>> +<<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>> + <<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>> + <<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>> + <<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>> + <<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>> + <<elseif $PC.ID == $slaves[_mi].mother>> $He is @@.lightgreen;your grandchild.@@ You gave birth to $his mother. - <<elseif $PC.ID == $slaves[$mi].father>> + <<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>> + <<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>> + <<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.@@ + <<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.@@ + <<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 def _mmi>> + $His maternal @@.lightgreen;grandmother is $slaves[_mmi].slaveName.@@ <</if>> - <<if def $mfi>> - $His paternal @@.lightgreen;grandmother is $slaves[$mfi].slaveName.@@ + <<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.@@ + <<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 def _fmi>> + $His maternal @@.lightgreen;grandfather is $slaves[_fmi].slaveName.@@ <</if>> - <<if $ffi>> - $His paternal @@.lightgreen;grandfather is $slaves[$ffi].slaveName.@@ + <<if _ffi>> + $His paternal @@.lightgreen;grandfather is $slaves[_ffi].slaveName.@@ <</if>> <</if>> <</if>> -- GitLab