From 406b6560d2b9277a89a2d5e99bd1710df6b0a7e7 Mon Sep 17 00:00:00 2001 From: DCoded <dcoded@live.com> Date: Wed, 17 Apr 2019 10:30:43 -0400 Subject: [PATCH] Fixed multi marriage bug --- src/uncategorized/slaveInteract.tw | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index cd313a237e6..8fd91a30c7a 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -349,11 +349,9 @@ <<set _ML = $marrying.length>> <<if (($MixedMarriage == 1 || $cheatMode == 1) && $activeSlave.relationship != 5 && $activeSlave.relationship != -3)>> <<set _eligible = 1>> - <<for _m = 0; _m < _ML; _m++>> - <<if $marrying[_m] == $activeSlave.ID>> - <<set _eligible = 0>> - <</if>> - <</for>> + <<if $marrying.includes($activeSlave.ID)>> + <<set _eligible = 0>> + <</if>> <<if _eligible != 0>> <<if (_ML < 2)>> <<if ($cheatMode == 1) || (_ML == 0)>> @@ -365,7 +363,6 @@ | //You can only marry up to two slaves per week// <</if>> <<else>> - /* FIXME: this message only displays for the last slave being married */ | //You are already marrying $him this weekend// <</if>> <</if>> -- GitLab