diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw index 71ab2e78e1885643da2a6543ad3368b59cf2962b..aba97642869a2ee91977942abed2efa683ed2016 100644 --- a/src/uncategorized/main.tw +++ b/src/uncategorized/main.tw @@ -36,7 +36,7 @@ .map((s, idx) => ({ID: s.ID, idx: idx, name: s.slaveName, assignment: s.assignment})) .filter(s => s.ID === _i).map(s => s.idx + ' - ' + s.name + ' (' + s.assignment + ')').join(', ')>>@@ <</foreach>> -<<set _visibleSlaves = $slaves.filter(s => (s.assignmentVisible == 1 && s.assignment != "be your Head Girl" && s.assignment != "guard you") || (s.assignment == "be your Head Girl" && $HGSuite != 1) || (s.assignment == "guard you" && $dojo <= 1)), +<<set _visibleSlaves = $slaves.filter(s => s.assignmentVisible == 1 && (s.assignment != "be your Head Girl" || $HGSuite != 1) && (s.assignment != "guard you" || $dojo <= 1)), $slavesVisible = _visibleSlaves.length, $dormitoryPopulation = _visibleSlaves.filter(s => s.livingRules != "luxurious").length, $roomsPopulation = $slavesVisible - $dormitoryPopulation - _visibleSlaves.filter(s => s.livingRules == "luxurious" && s.relationship >= 4).length * 0.5,