diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js index 03c73b2779f1c382c7a8fd2a6658f9b2f7430541..2b3f362a1d826577ba6fcd640d99c5583005c9d3 100644 --- a/src/js/extendedFamilyModeJS.js +++ b/src/js/extendedFamilyModeJS.js @@ -13,7 +13,7 @@ window.isParentP = function isParentP(daughter, parent) { return isMotherP(daughter, parent) || isFatherP(daughter, parent); }; -window.sameDad = function(slave1, slave2){ +window.sameDad = function(slave1, slave2) { if ((slave1.father === slave2.father) && (slave1.father !== 0 && slave1.father !== -2)) { return true; } else { @@ -21,7 +21,7 @@ window.sameDad = function(slave1, slave2){ } }; -window.sameMom = function(slave1, slave2){ +window.sameMom = function(slave1, slave2) { if ((slave1.mother === slave2.mother) && (slave1.mother !== 0 && slave1.mother !== -2)) { return true; } else { @@ -30,7 +30,6 @@ window.sameMom = function(slave1, slave2){ }; window.isAunt = /** @param {App.Entity.SlaveState} niece, @param {App.Entity.SlaveState} aunt */ function(niece, aunt) { - if (!State.variables.showDistantRelatives) { return false; } @@ -136,7 +135,6 @@ window.areSisters = function(c1, c2) { } */ window.areCousins = /** @param {App.Entity.SlaveState} slave1, @param {App.Entity.SlaveState} slave2 */ function(slave1, slave2) { - if (!State.variables.showDistantRelatives) { return false; } @@ -150,7 +148,7 @@ window.areCousins = /** @param {App.Entity.SlaveState} slave1, @param {App.Entit var slave2Mom; var slave2Dad; - if ((slave1Mom = getSlave(slave1.mother)) && (slave2Mom = getSlave(slave2.mother)) && !sameTParent(slave1Mom, slave2Mom) && sameMom(slave1Mom, slave2Mom) && sameDad(slave1Mom, slave2Mom)){ + if ((slave1Mom = getSlave(slave1.mother)) && (slave2Mom = getSlave(slave2.mother)) && !sameTParent(slave1Mom, slave2Mom) && sameMom(slave1Mom, slave2Mom) && sameDad(slave1Mom, slave2Mom)) { return true; } else if ((slave1Mom = getSlave(slave1.mother)) && (slave2Dad = getSlave(slave2.father)) && !sameTParent(slave1Mom, slave2Dad) && sameMom(slave1Mom, slave2Dad) && sameDad(slave1Mom, slave2Dad)) { return true; @@ -289,25 +287,25 @@ window.totalPlayerRelatives = function(pc) { window.relativeTerm = /** @param {App.Entity.SlaveState} slave1 @param {App.Entity.SlaveState} slave2 */ function (slave1, slave2) { - if (slave2.mother === slave1.ID || slave2.father === slave1.ID) { - return "daughter"; - } else if (slave1.mother === slave2.ID) { - return "mother"; - } else if (slave1.father === slave2.ID) { - return "father"; - } else if (areSisters(slave2, slave1) === 1) { - return "twin"; - } else if (areSisters(slave2, slave1) === 2) { - return "sister"; - } else if (areSisters(slave2, slave1) === 3) { - return "half-sister"; - } else if (isAunt(slave1, slave2)) { - return "niece"; - } else if (isAunt(slave2, slave1)) { - return "aunt"; - } else if (areCousins(slave2, slave1)) { - return "cousin"; - } else { - return "some unknown blood connection"; - } -}; + if (slave2.mother === slave1.ID || slave2.father === slave1.ID) { + return "daughter"; + } else if (slave1.mother === slave2.ID) { + return "mother"; + } else if (slave1.father === slave2.ID) { + return "father"; + } else if (areSisters(slave2, slave1) === 1) { + return "twin"; + } else if (areSisters(slave2, slave1) === 2) { + return "sister"; + } else if (areSisters(slave2, slave1) === 3) { + return "half-sister"; + } else if (isAunt(slave1, slave2)) { + return "niece"; + } else if (isAunt(slave2, slave1)) { + return "aunt"; + } else if (areCousins(slave2, slave1)) { + return "cousin"; + } else { + return "some unknown blood connection"; + } + };