From 7d3b68e1b0aa80d1ada36f73aee7bfd38246e7e9 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Tue, 10 Nov 2020 03:00:22 -0500
Subject: [PATCH] use data for sexual flaws
---
src/endWeek/reports/personalAttention.js | 6 +++---
src/endWeek/saRecruitGirls.js | 4 ++--
src/endWeek/saServeThePublic.js | 2 +-
src/endWeek/saWhore.js | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/endWeek/reports/personalAttention.js b/src/endWeek/reports/personalAttention.js
index bbe8dcb0aae..a6c75987743 100644
--- a/src/endWeek/reports/personalAttention.js
+++ b/src/endWeek/reports/personalAttention.js
@@ -62,7 +62,7 @@ globalThis.personalAttention = (function() {
el.append(`Since ${he}'s obedient, `);
App.UI.DOM.appendNewElement("span", el, `${his} training assignment has defaulted to softening ${his} behavioral flaw. `, "yellow");
pa.trainingRegimen = "soften her behavioral flaw";
- } else if ((slave.devotion > 20) && (slave.sexualQuirk === "none") && !["abusive", "anal addict", "attention whore", "breast growth", "breeder", "cum addict", "malicious", "neglectful", "none", "self hating"].includes(slave.sexualFlaw)) {
+ } else if ((slave.devotion > 20) && (slave.sexualQuirk === "none") && !App.Data.misc.paraphiliaList.includes(slave.sexualFlaw) && slave.sexualFlaw !== "none") {
el.append(`Since ${he}'s obedient, `);
App.UI.DOM.appendNewElement("span", el, `${his} training assignment has defaulted to softening ${his} sexual flaw. `, "yellow");
pa.trainingRegimen = "soften her sexual flaw";
@@ -70,7 +70,7 @@ globalThis.personalAttention = (function() {
el.append(`Since ${he}'s obedient and already has a behavioral quirk, `);
App.UI.DOM.appendNewElement("span", el, `${his} training assignment has defaulted to removing ${his} behavioral flaw. `, "yellow");
pa.trainingRegimen = "fix her behavioral flaw";
- } else if ((slave.devotion > 20) && !["abusive", "anal addict", "attention whore", "breast growth", "breeder", "cum addict", "malicious", "neglectful", "none", "self hating"].includes(slave.sexualFlaw)) {
+ } else if ((slave.devotion > 20) && !App.Data.misc.paraphiliaList.includes(slave.sexualFlaw)&& slave.sexualFlaw !== "none") {
el.append(`Since ${he}'s obedient and already has a sexual quirk, `);
App.UI.DOM.appendNewElement("span", el, `${his} training assignment has defaulted to removing ${his} sexual flaw. `, "yellow");
pa.trainingRegimen = "fix her sexual flaw";
@@ -326,7 +326,7 @@ globalThis.personalAttention = (function() {
r.push(`${slave.slaveName} got over ${his} behavioral flaw without you;`);
coloredText = [];
coloredText.push(`${his} training assignment has defaulted to`);
- if (["abusive", "anal addict", "attention whore", "breast growth", "breeder", "cum addict", "malicious", "neglectful", "none", "self hating"].includes(slave.sexualFlaw)) {
+ if (App.Data.misc.paraphiliaList.includes(slave.sexualFlaw) && slave.sexualFlaw !== "none") {
if ((slave.devotion <= 20) && (slave.trust >= -20)) {
coloredText.push(`breaking ${his} will.`);
pa.trainingRegimen = "break her will";
diff --git a/src/endWeek/saRecruitGirls.js b/src/endWeek/saRecruitGirls.js
index 2815560f3a7..db0ef59f980 100644
--- a/src/endWeek/saRecruitGirls.js
+++ b/src/endWeek/saRecruitGirls.js
@@ -597,14 +597,14 @@ App.SlaveAssignment.recruitGirls = (function() {
} else if (arcology.FSHedonisticDecadence !== "unset") {
if (targetArcology.FSHedonisticDecadence !== "unset") {
r.push(`${He} advances Hedonistic Decadence there by stuffing ${his} face at all times, having one hand down ${his} pants, and inviting anyone near ${him} for a quick fuck whenever the mood strikes ${him}.`);
- if (["abusive", "anal addict", "attention whore", "breast growth", "breeder", "cum addict", "malicious", "neglectful", "self hating"].includes(slave.sexualFlaw)) {
+ if (App.Data.misc.paraphiliaList.includes(slave.sexualFlaw)) {
r.push(`${He} wears ${his} sexual paraphilia proudly and makes sure everyone knows what ${he} likes and how ${he} likes it.`);
targetArcology.FSHedonisticDecadence++;
}
targetArcology.FSHedonisticDecadence += influence;
} else if (targetArcology.FSPhysicalIdealist !== "unset") {
r.push(`${He} challenges Physical Idealism there by stuffing ${his} face at all times, having one hand down ${his} pants, and inviting anyone near ${him} for a quick fuck whenever the mood strikes ${him}.`);
- if (["abusive", "anal addict", "attention whore", "breast growth", "breeder", "cum addict", "malicious", "neglectful", "self hating"].includes(slave.sexualFlaw)) {
+ if (App.Data.misc.paraphiliaList.includes(slave.sexualFlaw)) {
r.push(`${He} wears ${his} sexual paraphilia proudly and make sure everyone knows what ${he} likes and how ${he} likes it.`);
targetArcology.FSPhysicalIdealist--;
}
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 261705930f3..56735a0988f 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -167,7 +167,7 @@ App.SlaveAssignment.serveThePublic = (function() {
}
}
if (V.DJignoresFlaws !== 1) {
- if (!["abusive", "anal addict", "attention whore", "breast growth", "breeder", "cum addict", "malicious", "neglectful", "none", "self hating"].includes(slave.sexualFlaw) && jsRandom(1, 100) > 90) {
+ if (!App.Data.misc.paraphiliaList.includes(slave.sexualFlaw) && slave.sexualFlaw !== "none" && jsRandom(1, 100) > 90) {
r += ` ${SlaveFullName(S.DJ)} manages to <span class="flaw break">break</span> ${slave.slaveName} of ${his} sexual flaws.`;
slave.sexualFlaw = "none";
} else if (slave.behavioralFlaw !== "none" && jsRandom(1, 100) > 90) {
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index 67f32fa4e96..dcc918d5b55 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -206,7 +206,7 @@ App.SlaveAssignment.whore = (function() {
r += ` Unfortunately, ${his} inability to hear wastes most of ${madam.slaveName}'s advice.`;
}
if (V.MadamIgnoresFlaws !== 1) {
- if (!["abusive", "anal addict", "attention whore", "breast growth", "breeder", "cum addict", "malicious", "neglectful", "none", "self hating"].includes(slave.sexualFlaw) && jsRandom(1, 100) > 90) {
+ if (!App.Data.misc.paraphiliaList.includes(slave.sexualFlaw) && slave.sexualFlaw !== "none" && jsRandom(1, 100) > 90) {
r += ` ${SlaveFullName(madam)} manages to <span class="flaw break">break</span> ${slave.slaveName} of ${his} sexual flaws.`;
slave.sexualFlaw = "none";
} else if (slave.behavioralFlaw !== "none" && jsRandom(1, 100) > 90) {
--
GitLab