From 0962e6ada6f2a6b1c587a65f8030f5a0b00707a3 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 18 Jul 2019 16:51:23 -0400
Subject: [PATCH] reverted specificX() extended family usage
---
src/js/extendedFamilyModeJS.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js
index 58869f087f0..a0544f3791d 100644
--- a/src/js/extendedFamilyModeJS.js
+++ b/src/js/extendedFamilyModeJS.js
@@ -35,14 +35,14 @@ window.isGrandparentP = function isGrandparentP(granddaughter, grandparent) {
};
window.sameDad = function(slave1, slave2) {
- if ((slave1.father === slave2.father) && (specificDad(slave1))) {
+ if ((slave1.father === slave2.father) && (slave1.father !== 0 && slave1.father !== -2)) {
return true;
}
return false;
};
window.sameMom = function(slave1, slave2) {
- if ((slave1.mother === slave2.mother) && (specificMom(slave1))) {
+ if ((slave1.mother === slave2.mother) && (slave1.mother !== 0 && slave1.mother !== -2)) {
return true;
}
return false;
@@ -84,9 +84,9 @@ window.isAunt = function(niece, aunt) {
window.sameTParent = function(slave1, slave2) {
if (slave1.mother === -1 && slave1.father === -1 && slave2.mother === -1 && slave2.father === -1) {
return 1;
- } else if (slave1.mother === slave2.father && slave1.father === slave2.mother && specificMom(slave1) && specificDad(slave1)) {
+ } else if (slave1.mother === slave2.father && slave1.father === slave2.mother && slave1.mother !== 0 && slave1.mother !== -2 && slave1.father !== 0 && slave1.father !== -2 && slave1.mother !== slave1.father) {
return 2;
- } else if ((slave1.mother === slave2.father || slave1.father === slave2.mother) && specificMom(slave1) && specificMom(slave2) && slave1.mother !== slave1.father) {
+ } else if ((slave1.mother === slave2.father || slave1.father === slave2.mother) && slave1.mother !== 0 && slave1.mother !== -2 && slave2.mother !== 0 && slave2.mother !== -2 && slave1.mother !== slave1.father) {
return 3;
}
return 0;
@@ -121,7 +121,7 @@ window.areTwins = function(slave1, slave2) {
window.areSisters = function(slave1, slave2) {
if (slave1.ID === slave2.ID) {
return 0; // you are not your own sister
- } else if (!specificDad(slave1) && !specificMom(slave1)) {
+ } else if (((slave1.father === 0) || (slave1.father === -2)) && ((slave1.mother === 0) || (slave1.mother === -2))) {
return 0; // not related
} else {
if (!sameDad(slave1, slave2) && sameMom(slave1, slave2)) {
--
GitLab