diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js index d67fde13d9778c3fcb08c680fdbbcf8730205157..db878594dd591a5eacc3cc460227c7e1bda9ba05 100644 --- a/src/endWeek/saServeThePublic.js +++ b/src/endWeek/saServeThePublic.js @@ -552,12 +552,7 @@ window.saServeThePublic = (function saServeThePublic() { // Someone double check this block if (V.familyTesting === 1) { if (totalRelatives(slave) > 0) { - let children = []; - children = V.slaves.filter( - function(s) { - return ((slave.ID === s.father || slave.ID === s.mother || s.ID === slave.father || s.ID === slave.mother || areSisters(slave, s) > 0) && (s.assignment === slave.assignment)); - } - ); + let children = V.slaves.filter((s) => areRelated(slave, s) && (s.assignment === slave.assignment)); if (children.length > 2) { r += ` Since ${his} relatives,`; sstp = 0; diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js index 008de40707c9a17c1ce3767313ba500eb88df3c5..2a087e5757fc33c19ebce60f8440aaf6b8830f2d 100644 --- a/src/endWeek/saWhore.js +++ b/src/endWeek/saWhore.js @@ -629,12 +629,7 @@ window.saWhore = (function saWhore() { if (V.familyTesting === 1) { if (totalRelatives(slave) > 0) { - let children = []; - children = V.slaves.filter( - function(s) { - return ((slave.ID === s.father || slave.ID === s.mother || s.ID === slave.father || s.ID === slave.mother || areSisters(slave, s) > 0) && (s.assignment === slave.assignment)); - } - ); + let children = V.slaves.filter((s) => areRelated(slave, s) && (s.assignment === slave.assignment)); if (children.length > 2) { r += ` Since ${his} relatives,`; SWi = 0;