From d39a08fcb68269935ea9b4832203d4910abd76e0 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sat, 14 Oct 2023 15:27:40 -0400
Subject: [PATCH] Fix & simplify relationships responses in fFeelings.
---
src/npc/interaction/fFeelings.js | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/npc/interaction/fFeelings.js b/src/npc/interaction/fFeelings.js
index 3f0b86f4e1a..259aac28548 100644
--- a/src/npc/interaction/fFeelings.js
+++ b/src/npc/interaction/fFeelings.js
@@ -1850,13 +1850,13 @@ App.Interact.fFeelings = function(slave) {
}
function relationships() {
- const text = [];
+ const text = [];
if (slave.relationship > 0) {
const partner = getSlave(slave.relationshipTarget);
const {
He: He2, His: His2,
- he: he2, his: his2, him: him2, daughter: daughter2, sister: sister2, mother: mother2,
+ he: he2, his: his2, him: him2, daughter: daughter2, mother: mother2,
} = getPronouns(partner);
const milf2 = ((V.diversePronouns === 1) && (partner.pronoun === App.Data.Pronouns.Kind.male)) ? `DILF` : `MILF`;
@@ -1905,21 +1905,17 @@ App.Interact.fFeelings = function(slave) {
text.push(`${Spoken(slave, `I — I'm fucking my ${daughter2},"`)} ${he} bursts out, blushing even harder. ${Spoken(slave, `"It's so fucking wrong, but ${he2} has such a hot little body, I can't stop.`)}`);
} else if (partner.father === slave.ID) {
text.push(`${Spoken(slave, `I — I'm fucking my ${daughter2},"`)} ${he} bursts out, blushing even harder. ${Spoken(slave, `"It's so fucking wrong, but ${he2} has such a hot little body. ${He2} looks so much like ${his2} mother, I can't stop.`)}`);
- } else if (areSisters(slave, partner) === 1) {
- text.push(`${Spoken(slave, `I — I'm fucking my twin ${sister2},"`)} ${he} bursts out, blushing even harder. ${Spoken(slave, `"It's so fucking wrong, but ${he2}'s so hot, I can't stop.`)}`);
- } else if (areSisters(slave, partner) === 2) {
- text.push(`${Spoken(slave, `I — I'm fucking my ${sister2},"`)} ${he} bursts out, blushing even harder. ${Spoken(slave, `"It's so fucking wrong, but ${he2}'s so hot, I can't stop.`)}`);
- } else if (areSisters(slave, partner) === 3) {
- text.push(`${Spoken(slave, `I — I'm fucking my half-${sister2},"`)} ${he} bursts out, blushing even harder. ${Spoken(slave, `"It's so fucking wrong, but ${he2}'s so hot, I can't stop.`)}`);
+ } else if (areSisters(slave, partner) > 0) {
+ const sibling = siblingTerm(slave, partner);
+ text.push(`${Spoken(slave, `I — I'm fucking my ${sibling},"`)} ${he} bursts out, blushing even harder. ${Spoken(slave, `"It's so fucking wrong, but ${he2}'s so hot, I can't stop.`)}`);
} else if (areCousins(slave, partner)) {
text.push(`${Spoken(slave, `I — I'm fucking my cousin,"`)} ${he} bursts out, blushing even harder. ${Spoken(slave, `"It's so fucking wrong, but ${he2}'s so hot, I can't stop.`)}`);
} else if (isAunt(slave, partner)) {
- const aunt = (partner.genes === "XY" && useMaleTerms)? `uncle`: `aunt`;
+ const aunt = relativeTerm(slave, partner);
text.push(`${Spoken(slave, `I — I'm fucking my ${aunt},"`)} ${he} bursts out, blushing even harder. ${Spoken(slave, `"It's so fucking wrong, but ${he2}'s so hot, I can't stop.`)}`);
} else if (isAunt(partner, slave)) {
- const niece = (partner.genes === "XY" && useMaleTerms)? `nephew`: `niece`;
+ const niece = relativeTerm(slave, partner);
text.push(`${Spoken(slave, `I — I'm fucking my ${niece},"`)} ${he} bursts out, blushing even harder. ${Spoken(slave, `"It's so fucking wrong, but ${he2} has such a hot little body, I can't stop.`)}`);
-
} else if ((slave.actualAge + 14) < partner.actualAge) {
text.push(`${Spoken(slave, `${He2}'s old enough to be my ${mother2}."`)} ${He} looks down, blushing a little harder. ${Spoken(slave, `"But I'm lucky, ${he2}'s such a hot ${milf2}.`)}`);
} else if ((slave.actualAge - 14) > partner.actualAge) {
--
GitLab