From 72cee44f7c9abc6580e4644fa9e545662bb63470 Mon Sep 17 00:00:00 2001
From: corncobman21 <corncobman21@hotmail.com>
Date: Thu, 19 Apr 2018 22:34:09 -0400
Subject: [PATCH] Use slaveIndices and code simplification for lispReplace()
---
src/pregmod/fMarry.tw | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw
index 13ca05ec09e..a38da075db1 100644
--- a/src/pregmod/fMarry.tw
+++ b/src/pregmod/fMarry.tw
@@ -6,18 +6,20 @@
<<ClearSummaryCache $activeSlave>>
<<if $activeSlave.relationship > 0>>
- <<set _m = $slaves.findIndex(function(s) { return s.ID == $activeSlave.relationshipTarget; })>>
- <<if _m != -1>>
+ <<set _m = slaveIndices[$activeSlave.relationshipTarget]>>
+ <<if def _m>>
<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
- <<set _name = $slaves[_m].slaveName, _name = nameReplace(_name)>>
+ <<set _name = lispReplace($slaves[_m].slaveName)>>
<<else>>
<<set _name = $slaves[_m].slaveName>>
<</if>>
+ <<else>>
+ @@.red;Error, relationshipTarget not found.@@
<</if>>
<</if>>
<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
- <<set _myName = $activeSlave.slaveName, _myName = nameReplace(_myName)>>
- <<set _playerSurname = $PC.surname, _playerSurname = nameReplace(_playerSurname)>>
+ <<set _myName = lispReplace($activeSlave.slaveName)>>
+ <<set _playerSurname = lispReplace($PC.surname)>>
<<else>>
<<set _myName = $activeSlave.slaveName>>
<<set _playerSurname = $PC.surname>>
--
GitLab