From b34ebd0ea9cdcf7fb52b830700541c0d94e7652c Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 8 Mar 2018 23:33:30 -0500
Subject: [PATCH] quick fix that manually merges !1554
---
src/uncategorized/saGuardsYou.tw | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/uncategorized/saGuardsYou.tw b/src/uncategorized/saGuardsYou.tw
index 7ffb74d06ff..94eb82c30a2 100644
--- a/src/uncategorized/saGuardsYou.tw
+++ b/src/uncategorized/saGuardsYou.tw
@@ -180,8 +180,8 @@ Being continually trusted with your life @@.hotpink;increases her devotion to yo
<<if $bodyguardTrains == 1 && $slaves[$i].devotion > 95 && $slaves[$i].trust > 50 && $slaves[$i].combatSkill > 0 && $slaves[$i].intelligence > 0>>
She's confident in her martial skills, but smart enough to know that she isn't immortal, and devoted enough to worry about who will protect you should she die.
- <<set _successorCandidates = $slaves.filter( function(s) { return (s.assignmentVisible == 1 || s.assignement == "be your Concubine" || s.assignement == "be the Wardeness" || s.assignement ==
-"be your Head Girl" || s.assignement == "work as a servant" || s.assignement == "serve in the master suite") && bodyguardSuccessorEligible(s); } )>>
+ <<set _successorCandidates = $slaves.filter( function(s) { return (s.assignmentVisible == 1 || s.assignment == "be your Concubine" || s.assignment == "be the Wardeness" || s.assignment ==
+"be your Head Girl" || s.assignment == "work as a servant" || s.assignment == "serve in the master suite") && bodyguardSuccessorEligible(s); } )>>
<<set _combatSkilled = _successorCandidates.filter( function(s) { return s.combatSkill > 0; })>>
<<if _combatSkilled.length < 2>>
<<unset $subSlave>>
--
GitLab