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

Merge branch 'pregmod-master' into 'pregmod-master'

Fix confusion between uncles and nephews, and between aunts and nieces.

Closes #1794

See merge request !6801
parents f4caa9cc ed91200c
No related branches found
No related tags found
1 merge request!6801Fix confusion between uncles and nephews, and between aunts and nieces.
...@@ -456,15 +456,15 @@ globalThis.relativeTerm = function(slave1, slave2) { ...@@ -456,15 +456,15 @@ globalThis.relativeTerm = function(slave1, slave2) {
} }
} else if (isAunt(slave1, slave2)) { } else if (isAunt(slave1, slave2)) {
if (slave2.genes === "XY" && useMaleTerms) { if (slave2.genes === "XY" && useMaleTerms) {
return "nephew"; return "uncle";
} else { } else {
return "niece"; return "aunt";
} }
} else if (isAunt(slave2, slave1)) { } else if (isAunt(slave2, slave1)) {
if (slave2.genes === "XY" && useMaleTerms) { if (slave2.genes === "XY" && useMaleTerms) {
return "uncle"; return "nephew";
} else { } else {
return "aunt"; return "niece";
} }
} else if (areCousins(slave2, slave1)) { } else if (areCousins(slave2, slave1)) {
return "cousin"; return "cousin";
......
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