From 5e8f1d4f8ea3b3d409e63e2bc711ddb31a7ceef7 Mon Sep 17 00:00:00 2001
From: Anu <8636-Anu@users.noreply.gitgud.io>
Date: Fri, 11 Feb 2022 23:34:26 +0000
Subject: [PATCH] Fix error, use miscData
---
js/003-data/miscData.js | 2 ++
src/js/slaveCostJS.js | 2 +-
src/npc/descriptions/longSlave.js | 2 +-
src/npc/descriptions/skin.js | 4 ++--
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js
index b60032e47e7..d0a8c4e390c 100644
--- a/js/003-data/miscData.js
+++ b/js/003-data/miscData.js
@@ -1746,6 +1746,8 @@ App.Data.misc = {
},
},
+ redheadColors: ["auburn", "blazing red", "copper", "chestnut", "deep red", "ginger", "red", "strawberry-blonde"],
+
badWords: ["anus", "ass", "bitch", "boob", "butt", "cock", "crap", "cum", "cunny", "cunt", "dick", "fuck", "jizz", "junk", "piss", "prick", "pussy", "shit", "slave", "slut", "tit", "trash", "whore"],
badNames: ["Ass Kisser", "Ass Licker", "Ass", "Assfucker", "Asshole", "Ballsack", "Bastard", "Beta", "Bitch", "Cock", "Cocksucker", "Coward", "Creep", "Cum Rag", "Cunt", "Degenerate", "Despoiler", "Dick", "Dickhead", "Dicksucker", "Dickweed", "Dipshit", "Douchebag", "Dumbass", "DumbFuck", "Dunderfuck", "Dyke", "Faggot", "Fucker", "Fuckface", "Fuckhead", "Fucko", "Fucktard", "Fuckwit", "Idiot", "Inbred", "Jackass", "Jerk", "Jizz Stain", "Loser", "Moron", "Motherfucker", "Nutsack", "Pissbaby", "Prick", "Pussy", "Rapist", "Ratfuck", "Retard", "Ruiner", "Schmuck", "Scumbag", "Shitbird", "Shithead", "Slave", "Slaver", "Sleazeball", "Slut", "Sodomite", "Thundercunt", "Traitor", "Trash", "Whore", "Wimp"],
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index afbbf2030ba..75f2ca91e0f 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -385,7 +385,7 @@ globalThis.BeautyArray = (function() {
case "heavily freckled":
if ((skinToneLevel(slave.skin) > 5) && (skinToneLevel(slave.skin) < 10)) {
adjustBeauty("Freckles", 2);
- if (["auburn", "blazing red", "copper", "chestnut", "deep red", "ginger", "red", "strawberry-blonde"].includes(slave.hColor)) {
+ if (App.Data.misc.redheadColors.includes(slave.hColor)) {
adjustBeauty("Freckles: Redhead", 2);
}
}
diff --git a/src/npc/descriptions/longSlave.js b/src/npc/descriptions/longSlave.js
index 0b3ca5ddabe..53e92b005b4 100644
--- a/src/npc/descriptions/longSlave.js
+++ b/src/npc/descriptions/longSlave.js
@@ -419,7 +419,7 @@ App.Desc.longSlave = function(slave, {descType, market = 0, prisonCrime, noArt}
}
if (slave.fuckdoll === 0) {
- if (["auburn", "blazing red", "copper", "chestnut", "deep red", "ginger", "red", "strawberry-blonde"].includes(slave.hColor)) {
+ if (App.Data.misc.redheadColors.includes(slave.hColor)) {
if (slave.hLength >= 10) {
if (slave.markings === "freckles" || slave.markings === "heavily freckled") {
if (skinToneLevel(slave.skin).isBetween(5, 10)) {
diff --git a/src/npc/descriptions/skin.js b/src/npc/descriptions/skin.js
index 85c24f5102b..a8eadc79375 100644
--- a/src/npc/descriptions/skin.js
+++ b/src/npc/descriptions/skin.js
@@ -77,7 +77,7 @@ App.Desc.skin = function(slave, descType) {
r.push(`${slave.skin} and lightly spotted.`);
} else if (slave.markings === "freckles") {
r.push(`${slave.skin} and lightly`);
- if ((skinToneLevel(slave.skin) > 5) && (skinToneLevel(slave.skin) < 10) && (["auburn", "blazing red", "copper", "chestnut", "deep red", "ginger", "red", "strawberry-blonde"].includes(slave.hColor))) {
+ if ((skinToneLevel(slave.skin) > 5) && (skinToneLevel(slave.skin) < 10) && (App.Data.misc.redheadColors.includes(slave.hColor))) {
r.push(`freckled, an attractive combination.`);
} else {
r.push(`freckled.`);
@@ -86,7 +86,7 @@ App.Desc.skin = function(slave, descType) {
r.push(`${slave.skin} and heavily spotted.`);
} else if (slave.markings === "heavily freckled") {
r.push(`${slave.skin} and heavily`);
- if ((skinToneLevel(slave.skin) > 5) && (skinToneLevel(slave.skin) < 10) && (["auburn", "blazing red", "copper", "chestnut", "deep red", "ginger", "red", "strawberry-blonde"].includes(slave.hColor === "red"))) {
+ if ((skinToneLevel(slave.skin) > 5) && (skinToneLevel(slave.skin) < 10) && (App.Data.misc.redheadColors.includes(slave.hColor))) {
r.push(`freckled, an attractive combination.`);
} else {
r.push(`freckled.`);
--
GitLab