From 1718ee367c2583436d645343106a395660423bce Mon Sep 17 00:00:00 2001
From: Anu <8636-Anu@users.noreply.gitgud.io>
Date: Fri, 11 Feb 2022 06:14:23 +0000
Subject: [PATCH] Expand hair colors valid for redhead bonus
---
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 b3209b0d96c..afbbf2030ba 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 (slave.hColor === "red") {
+ if (["auburn", "blazing red", "copper", "chestnut", "deep red", "ginger", "red", "strawberry-blonde"].includes(slave.hColor)) {
adjustBeauty("Freckles: Redhead", 2);
}
}
diff --git a/src/npc/descriptions/longSlave.js b/src/npc/descriptions/longSlave.js
index bbcfac57233..0b3ca5ddabe 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 (slave.hColor === "red") {
+ if (["auburn", "blazing red", "copper", "chestnut", "deep red", "ginger", "red", "strawberry-blonde"].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 0d77ff53d2d..85c24f5102b 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) && (slave.hColor === "red")) {
+ if ((skinToneLevel(slave.skin) > 5) && (skinToneLevel(slave.skin) < 10) && (["auburn", "blazing red", "copper", "chestnut", "deep red", "ginger", "red", "strawberry-blonde"].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) && (slave.hColor === "red")) {
+ if ((skinToneLevel(slave.skin) > 5) && (skinToneLevel(slave.skin) < 10) && (["auburn", "blazing red", "copper", "chestnut", "deep red", "ginger", "red", "strawberry-blonde"].includes(slave.hColor === "red"))) {
r.push(`freckled, an attractive combination.`);
} else {
r.push(`freckled.`);
--
GitLab