From a8ef1b974f2f47cee18e89bc411d4a6d70715d58 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 5 Feb 2017 23:37:37 -0500
Subject: [PATCH] More recruiting work.
---
src/uncategorized/reRelativeRecruiter.tw | 28 +++++++++++++++---------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index f26e8e6f299..c815d08b7ad 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -8,46 +8,54 @@
<<if $seeImages == 1>><<SlaveImage $eventSlave 2 1>><</if>>
+<<if ndef $newRelativeRecruitID>>
+ <<set $newRelativeRecruitID = 2000000>>
+<</if>>
<<for $i to 0; $i < $slaves.length; $i++>>
+ <<if $slaves[$i].canRecruit == 1>>
+ <<if ($slaves[$i].devotion > 50)>>
+ <<if canWalk($slaves[$i])>>
<<for $j to 0; $j < $recruiters.length; $j++>>
<<if $slaves[$i].ID is $recruiters[$j].ID>>
<<set $eventSlave to $slaves[$i]>>
<<set $activeSlave to $recruiters[$j]>>
<</if>>
<</for>>
+ <</if>>
+ <</if>>
+ <</if>>
<</for>>
-
<<set $recruitedType = []>>
-<<if $eventSlave.mother == 0 && $eventSlave.actualAge < 24>>
+<<if $activeSlave.mother == 0 && $activeSlave.actualAge < 24>>
<<set $recruitedType.push("mother")>>
<<set $recruitedType.push("mother")>>
<<set $recruitedType.push("mother")>>
<</if>>
-<<if $eventSlave.father == 0 && $eventSlave.actualAge < 24>>
+<<if $activeSlave.father == 0 && $activeSlave.actualAge < 24>>
<<set $recruitedType.push("father")>>
<</if>>
-<<if $eventSlave.daughters < 3 && $eventSlave.actualAge > ($minimumSlaveAge+$fertilityAge) && isFertile($activeSlave)>>
+<<if $activeSlave.daughters < 3 && $activeSlave.actualAge > ($minimumSlaveAge+$fertilityAge) && isFertile($activeSlave)>>
<<set $recruitedType.push("daughter")>>
<<set $recruitedType.push("daughter")>>
<<set $recruitedType.push("son")>>
<<set $tempMF = "mother">>
<</if>>
-<<if $eventSlave.daughters < 3 && $eventSlave.actualAge > ($minimumSlaveAge+$potencyAge) && $eventSlave.balls > 0>>
+<<if $activeSlave.daughters < 3 && $activeSlave.actualAge > ($minimumSlaveAge+$potencyAge) && $activeSlave.balls > 0>>
<<set $recruitedType.push("daughter")>>
<<set $recruitedType.push("daughter")>>
<<set $recruitedType.push("son")>>
<<set $tempMF = "father">>
<</if>>
-<<if $eventSlave.sisters < 3>>
- <<if $eventSlave.actualAge <= ($retirementAge-5)>>
+<<if $activeSlave.sisters < 3>>
+ <<if $activeSlave.actualAge <= ($retirementAge-5)>>
<<set $recruitedType.push("older sister")>>
<<set $recruitedType.push("older sister")>>
<<set $recruitedType.push("older brother")>>
<<set $recruitedType.push("older brother")>>
<</if>>
- <<if $eventSlave.actualAge >= ($minimumSlaveAge+5)>>
+ <<if $activeSlave.actualAge >= ($minimumSlaveAge+5)>>
<<set $recruitedType.push("younger sister")>>
<<set $recruitedType.push("younger sister")>>
<<set $recruitedType.push("younger brother")>>
@@ -477,7 +485,8 @@ She waits anxiously for your decision.
<</if>>
<<set $activeSlave.slaveName = $activeSlave.birthName>>
-<<set $activeSlave.ID += 1000>>
+<<set $activeSlave.ID = $newRelativeRecruitID>>
+<<set $newRelativeRecruitID++>>
<br><br>
You look up the $activeSlave.relation. She costs ¤$slaveCost, a bargain, but you won't be able to inspect her beyond her likely resemblance to her
@@ -494,7 +503,6 @@ You look up the $activeSlave.relation. She costs ¤$slaveCost, a bargain, but yo
twin sister.
<</switch>>
-
<br><br>
<span id="result">
<<click "Buy her">>
--
GitLab