Skip to content
Snippets Groups Projects
Commit b34ebd0e authored by Pregmodder's avatar Pregmodder
Browse files

quick fix that manually merges !1554

parent 5cce7d87
No related branches found
No related tags found
No related merge requests found
......@@ -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>>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment