From 8f4a2c8a22ada691e89a540876b7b05d3d785eea Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Wed, 27 Apr 2022 16:17:28 +1200
Subject: [PATCH] Standardise skinToneLevel safety
---
src/js/slaveCostJS.js | 2 +-
src/npc/descriptions/longSlave.js | 2 +-
src/npc/descriptions/skin.js | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 5f4bee9f2ce..0553eceb285 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -382,7 +382,7 @@ globalThis.BeautyArray = (function() {
break;
case "freckles":
case "heavily freckled":
- if (typeof skinToneLevel(slave.skin) === "number"&& skinToneLevel(slave.skin).isBetween(5, 10)) {
+ if (App.Medicine.Modification.naturalSkins.includes(slave.skin) && skinToneLevel(slave.skin).isBetween(5, 10)) {
adjustBeauty("Freckles", 2);
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 78e61d06700..5d55dfc4c66 100644
--- a/src/npc/descriptions/longSlave.js
+++ b/src/npc/descriptions/longSlave.js
@@ -468,7 +468,7 @@ App.Desc.longSlave = function(slave, {descType, market = 0, prisonCrime, noArt}
if (App.Data.misc.redheadColors.includes(slave.hColor)) {
if (slave.hLength >= 10) {
if (slave.markings === "freckles" || slave.markings === "heavily freckled") {
- if (App.Medicine.Modification.naturalSkins.includes(slave.skin) && typeof skinToneLevel(slave.skin) === "number"&& skinToneLevel(slave.skin).isBetween(5, 10)) {
+ if (App.Medicine.Modification.naturalSkins.includes(slave.skin) && skinToneLevel(slave.skin).isBetween(5, 10)) {
r.push(`It goes perfectly with ${his} ${slave.skin} skin and freckles.`);
}
}
diff --git a/src/npc/descriptions/skin.js b/src/npc/descriptions/skin.js
index 9bd22a0fa62..2b18f0c3415 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 (typeof skinToneLevel(slave.skin) === "number"&& skinToneLevel(slave.skin).isBetween(5, 10) && (App.Data.misc.redheadColors.includes(slave.hColor))) {
+ if (App.Medicine.Modification.naturalSkins.includes(slave.skin) && skinToneLevel(slave.skin).isBetween(5, 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 (typeof skinToneLevel(slave.skin) === "number"&& skinToneLevel(slave.skin).isBetween(5, 10) && (App.Data.misc.redheadColors.includes(slave.hColor))) {
+ if (App.Medicine.Modification.naturalSkins.includes(slave.skin) && skinToneLevel(slave.skin).isBetween(5, 10) && (App.Data.misc.redheadColors.includes(slave.hColor))) {
r.push(`freckled, an attractive combination.`);
} else {
r.push(`freckled.`);
--
GitLab