From 1b9509df3caa4f9ba584baa7a5c72afecea56219 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Wed, 13 May 2020 18:10:05 -0700
Subject: [PATCH] Use male relative terms for the PC even if they're globally
disabled.
---
src/js/extendedFamilyModeJS.js | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js
index 94ebac59bb1..7477d6885a6 100644
--- a/src/js/extendedFamilyModeJS.js
+++ b/src/js/extendedFamilyModeJS.js
@@ -405,8 +405,9 @@ globalThis.totalPlayerRelatives = function(pc) {
* @returns {string|null} - returns null if the slaves are not related, even distantly.
*/
globalThis.relativeTerm = function(slave1, slave2) {
+ const useMaleTerms = (V.diversePronouns || slave2.ID === -1);
if (slave2.mother === slave1.ID || slave2.father === slave1.ID) {
- if (slave2.genes === "XY" && V.diversePronouns) {
+ if (slave2.genes === "XY" && useMaleTerms) {
return "son";
} else {
return "daughter";
@@ -418,31 +419,31 @@ globalThis.relativeTerm = function(slave1, slave2) {
} else if (slave1.father === slave2.ID) {
return "father";
} else if (areSisters(slave2, slave1) === 1) {
- if (slave2.genes === "XY" && V.diversePronouns) {
+ if (slave2.genes === "XY" && useMaleTerms) {
return "twin brother";
} else {
return "twin sister";
}
} else if (areSisters(slave2, slave1) === 2) {
- if (slave2.genes === "XY" && V.diversePronouns) {
+ if (slave2.genes === "XY" && useMaleTerms) {
return "brother";
} else {
return "sister";
}
} else if (areSisters(slave2, slave1) === 3) {
- if (slave2.genes === "XY" && V.diversePronouns) {
+ if (slave2.genes === "XY" && useMaleTerms) {
return "half-brother";
} else {
return "half-sister";
}
} else if (isAunt(slave1, slave2)) {
- if (slave2.genes === "XY" && V.diversePronouns) {
+ if (slave2.genes === "XY" && useMaleTerms) {
return "nephew";
} else {
return "niece";
}
} else if (isAunt(slave2, slave1)) {
- if (slave2.genes === "XY" && V.diversePronouns) {
+ if (slave2.genes === "XY" && useMaleTerms) {
return "uncle";
} else {
return "aunt";
@@ -454,7 +455,7 @@ globalThis.relativeTerm = function(slave1, slave2) {
} else if (isGrandmotherP(slave1, slave2)) {
return "grandmother";
} else if (isGrandparentP(slave2, slave1)) {
- if (slave2.genes === "XY" && V.diversePronouns) {
+ if (slave2.genes === "XY" && useMaleTerms) {
return "grandson";
} else {
return "granddaughter";
--
GitLab