From 82a9b5e321bbce9f06ea600f8de82b477e26b1c7 Mon Sep 17 00:00:00 2001 From: wkwk <12408-wkwk@users.norepy.gitgud.io> Date: Mon, 14 Oct 2019 08:14:49 -0500 Subject: [PATCH] Fix for same age twins during slaveIncestSex event There was no condition taking care of this event when _one and _other where both "twin sister" and their actualAge was the same. --- src/npc/newSlaveIncestSex.tw | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/npc/newSlaveIncestSex.tw b/src/npc/newSlaveIncestSex.tw index ac87a2082af..9c44977e0b5 100644 --- a/src/npc/newSlaveIncestSex.tw +++ b/src/npc/newSlaveIncestSex.tw @@ -49,8 +49,16 @@ <</if>> <<if _one == _other >> -/* two sisters / brothers: identify by age */ - <<if $relative.actualAge > $relative2.actualAge>> +/* two sisters / brothers: identify by age, in the case of same age twins check their birthWeek */ + <<if $relative.actualAge == $relative2.actualAge>> + <<if $relative.birthWeek >= $relative2.birthWeek>> + <<set _onelong = "older "+_one >> + <<set _otherlong = "younger "+_other >> + <<elseif $relative.birthWeek < $relative2.birthWeek>> + <<set _onelong = "younger "+_one >> + <<set _otherlong = "older "+_other >> + <</if>> + <<elseif $relative.actualAge > $relative2.actualAge>> <<set _onelong = "older "+_one >> <<set _otherlong = "younger "+_other >> <<elseif $relative.actualAge < $relative2.actualAge>> -- GitLab