From 55e497ff8b94959fe7b4d4031367041044733e93 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Fri, 17 Feb 2017 17:43:54 -0500 Subject: [PATCH] Huge bugfix. --- src/uncategorized/saRecruitGirls.tw | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw index 6211bb29fb4..904d987fe05 100644 --- a/src/uncategorized/saRecruitGirls.tw +++ b/src/uncategorized/saRecruitGirls.tw @@ -356,7 +356,7 @@ She uses her extra time and @@color:yellowgreen;recruitment allowance@@ this wee <</if>> <</if>> <<if $familyTesting == 1>> <<if $arcologies[0].FSEgyptianRevivalist != "unset">> - <<if $slaves[$i].mother > 0 || $slaves[$i].father > 0 ||$slaves[$i].daughters > 0 || $slaves[$i].sisters > 0>> + <<if totalRelatives($slaves[$i]) > 0>> <<set $relation = $slaves>> <<set $relation = $relation.shuffle()>> <<set _recruiterRelation = 0>> @@ -674,13 +674,13 @@ She is able to smartly <<if $arcologies[0].FSPaternalist != "unset">>answer<<els <</if>> <</if>> <<if $familyTesting == 1>> <<if $arcologies[0].FSEgyptianRevivalist != "unset">> - <<if $slaves[$i].mother > 0 || $slaves[$i].father > 0 ||$slaves[$i].daughters > 0 || $slaves[$i].sisters > 0>> + <<if totalRelatives($slaves[$i]) > 0>> <<if _recruiterRelation != 0>> - <<if $relation.mother == $slaves[$i].ID || $relation.father == $slaves[$i].ID>> + <<if _recruiterRelation.mother == $slaves[$i].ID || _recruiterRelation.father == $slaves[$i].ID>> <<set $relationType = "daughter">> - <<elseif $slaves[$i].mother == $relation.ID>> + <<elseif $slaves[$i].mother == _recruiterRelation.ID>> <<set $relationType = "mother">> - <<elseif $slaves[$i].father == $relation.ID>> + <<elseif $slaves[$i].father == _recruiterRelation.ID>> <<set $relationType = "father">> <<elseif areSisters($slaves[$i], _recruiterRelation) == 1>> <<set $relationType = "twin">> @@ -703,11 +703,11 @@ She is able to smartly <<if $arcologies[0].FSPaternalist != "unset">>answer<<els The Ancient Egyptian sensibility of your arcology features slave incest, but she's too shy even to play-act with her $relationType for publicity. <</if>> <<else>> - <<if $relation.mother == $slaves[$i].ID || $relation.father == $slaves[$i].ID>> + <<if _recruiterRelation.mother == $slaves[$i].ID || _recruiterRelation.father == $slaves[$i].ID>> <<set $relationType = "daughter">> - <<elseif $slaves[$i].mother == $relation.ID>> + <<elseif $slaves[$i].mother == _recruiterRelation.ID>> <<set $relationType = "mother">> - <<elseif $slaves[$i].father == $relation.ID>> + <<elseif $slaves[$i].father == _recruiterRelation.ID>> <<set $relationType = "father">> <<elseif areSisters($slaves[$i], _recruiterRelation) == 1>> <<set $relationType = "twin">> -- GitLab