From 8fdd09b53206d4e9b113efbb6591b9d264f57bf6 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 24 Mar 2021 22:44:15 -0400
Subject: [PATCH] "chocolate" to "chocolate brown"
---
src/npc/generate/generateGenetics.js | 8 ++++----
src/npc/generate/generateNewSlaveJS.js | 16 ++++++++--------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/npc/generate/generateGenetics.js b/src/npc/generate/generateGenetics.js
index 505d260e2b2..98efa2912fe 100644
--- a/src/npc/generate/generateGenetics.js
+++ b/src/npc/generate/generateGenetics.js
@@ -453,9 +453,9 @@ globalThis.generateGenetics = (function() {
hairColor = jsEither([father.origHColor, mother.origHColor, mother.origHColor, mother.origHColor, mother.origHColor, mother.origHColor, mother.origHColor, mother.origHColor]);
} else if (["black", "jet black"].includes(father.origHColor)) {
hairColor = jsEither([father.origHColor, father.origHColor, father.origHColor, father.origHColor, father.origHColor, father.origHColor, father.origHColor, mother.origHColor]);
- } else if (["brown", "chestnut", "chocolate", "dark brown"].includes(mother.origHColor)) {
+ } else if (["brown", "chestnut", "chocolate brown", "dark brown"].includes(mother.origHColor)) {
hairColor = jsEither([father.origHColor, mother.origHColor, mother.origHColor, mother.origHColor]);
- } else if (["brown", "chestnut", "chocolate", "dark brown"].includes(father.origHColor)) {
+ } else if (["brown", "chestnut", "chocolate brown", "dark brown"].includes(father.origHColor)) {
hairColor = jsEither([father.origHColor, father.origHColor, father.origHColor, mother.origHColor]);
} else {
hairColor = jsEither([father.origHColor, mother.origHColor]);
@@ -471,9 +471,9 @@ globalThis.generateGenetics = (function() {
hairColor = jsEither([fatherHair, mother.origHColor, mother.origHColor, mother.origHColor, mother.origHColor, mother.origHColor, mother.origHColor, mother.origHColor]);
} else if (["black", "jet black"].includes(fatherHair)) {
hairColor = jsEither([fatherHair, fatherHair, fatherHair, fatherHair, fatherHair, fatherHair, fatherHair, mother.origHColor]);
- } else if (["brown", "chestnut", "chocolate", "dark brown"].includes(mother.origHColor)) {
+ } else if (["brown", "chestnut", "chocolate brown", "dark brown"].includes(mother.origHColor)) {
hairColor = jsEither([fatherHair, mother.origHColor, mother.origHColor, mother.origHColor]);
- } else if (["brown", "chestnut", "chocolate", "dark brown"].includes(fatherHair)) {
+ } else if (["brown", "chestnut", "chocolate brown", "dark brown"].includes(fatherHair)) {
hairColor = jsEither([fatherHair, fatherHair, fatherHair, mother.origHColor]);
} else {
hairColor = jsEither([fatherHair, mother.origHColor]);
diff --git a/src/npc/generate/generateNewSlaveJS.js b/src/npc/generate/generateNewSlaveJS.js
index 5883841ac84..4ecf18cb7ca 100644
--- a/src/npc/generate/generateNewSlaveJS.js
+++ b/src/npc/generate/generateNewSlaveJS.js
@@ -1482,23 +1482,23 @@ globalThis.GenerateNewSlave = (function() {
if (["German", "Polish", "Danish", "Estonian", "Latvian", "Lithuanian"].includes(slave.nationality)) {
slave.origSkin = jsEither(["tan", "light", "light", "light", "fair", "fair", "fair", "fair", "pale", "very pale"]);
eyeColor(["light grey", "blue", "blue", "blue", "blue", "blue", "blue", "brown", "brown", "green"]);
- slave.origHColor = jsEither(["jet black", "black", "black", "dark brown", "dark brown", "brown", "brown", "brown", "chestnut", "chocolate", "amber", "golden", "golden", "blonde", "blonde", "platinum blonde", "red"]);
+ slave.origHColor = jsEither(["jet black", "black", "black", "dark brown", "dark brown", "brown", "brown", "brown", "chestnut", "chocolate brown", "amber", "golden", "golden", "blonde", "blonde", "platinum blonde", "red"]);
} else if (["Icelandic", "Norwegian"].includes(slave.nationality)) {
slave.origSkin = jsEither(["tan", "light", "light", "light", "fair", "fair", "fair", "pale", "pale", "very pale", "very pale"]);
eyeColor(["light grey", "blue", "blue", "blue", "blue", "blue", "blue", "blue", "brown", "green"]);
- slave.origHColor = jsEither(["jet black", "black", "dark brown", "brown", "brown", "brown", "chestnut", "chocolate", "amber", "golden", "golden", "blonde", "blonde", "platinum blonde", "platinum blonde", "red"]);
+ slave.origHColor = jsEither(["jet black", "black", "dark brown", "brown", "brown", "brown", "chestnut", "chocolate brown", "amber", "golden", "golden", "blonde", "blonde", "platinum blonde", "platinum blonde", "red"]);
} else if (["Swedish", "Finnish"].includes(slave.nationality)) {
slave.origSkin = jsEither(["tan", "light", "light", "fair", "fair", "fair", "fair", "pale", "pale", "pale", "very pale", "very pale"]);
eyeColor(["light grey", "blue", "blue", "blue", "blue", "blue", "blue", "blue", "blue", "blue", "brown", "green"]);
- slave.origHColor = jsEither(["jet black", "black", "dark brown", "brown", "chestnut", "chocolate", "amber", "golden", "golden", "golden", "blonde", "blonde", "blonde", "platinum blonde", "platinum blonde", "platinum blonde", "red"]);
+ slave.origHColor = jsEither(["jet black", "black", "dark brown", "brown", "chestnut", "chocolate brown", "amber", "golden", "golden", "golden", "blonde", "blonde", "blonde", "platinum blonde", "platinum blonde", "platinum blonde", "red"]);
} else if (["Irish", "Scottish"].includes(slave.nationality)) {
slave.origSkin = jsEither(["light", "light", "fair", "fair", "fair", "pale", "pale", "pale", "very pale", "very pale", "very pale", "very pale"]);
eyeColor(["light grey", "blue", "blue", "blue", "brown", "brown", "green", "green", "green"]);
- slave.origHColor = jsEither(["jet black", "black", "dark brown", "brown", "brown", "chestnut", "chestnut", "chestnut", "chocolate", "amber", "golden", "golden", "blonde", "platinum blonde", "red", "red"]);
+ slave.origHColor = jsEither(["jet black", "black", "dark brown", "brown", "brown", "chestnut", "chestnut", "chestnut", "chocolate brown", "amber", "golden", "golden", "blonde", "platinum blonde", "red", "red"]);
} else {
slave.origSkin = jsEither(["tan", "light", "light", "light", "fair", "fair", "fair", "pale", "very pale"]);
eyeColor(["light grey", "blue", "blue", "blue", "blue", "blue", "blue", "brown", "brown", "brown", "green"]);
- slave.origHColor = jsEither(["jet black", "jet black", "black", "black", "black", "dark brown", "dark brown", "dark brown", "dark brown", "brown", "brown", "brown", "brown", "chestnut", "chocolate", "amber", "golden", "blonde", "platinum blonde", "red"]);
+ slave.origHColor = jsEither(["jet black", "jet black", "black", "black", "black", "dark brown", "dark brown", "dark brown", "dark brown", "brown", "brown", "brown", "brown", "chestnut", "chocolate brown", "amber", "golden", "blonde", "platinum blonde", "red"]);
}
slave.hStyle = "neat";
break;
@@ -1581,7 +1581,7 @@ globalThis.GenerateNewSlave = (function() {
case "southern european":
slave.lips = jsRandom(5, 25);
slave.origSkin = jsEither(["dark olive", "olive", "olive", "light olive", "light olive", "light olive", "bronze", "tan", "light", "fair"]);
- slave.origHColor = jsEither(["jet black", "black", "black", "dark brown", "dark brown", "brown", "chestnut", "chocolate"]);
+ slave.origHColor = jsEither(["jet black", "black", "black", "dark brown", "dark brown", "brown", "chestnut", "chocolate brown"]);
slave.hStyle = "neat";
eyeColor(["blue", "brown", "brown", "brown", "brown", "brown", "green"]);
break;
@@ -1840,8 +1840,8 @@ globalThis.GenerateNewSlave = (function() {
globalThis.generateSalonModifications = function(slave) {
/* hair dyes*/
if ((jsRandom(1, 50) === 1) || ((jsRandom(1, 20) === 1) && ["southern european", "white"].includes(slave.race))) {
- slave.hColor = jsEither(["jet black", "black", "black", "dark brown", "brown", "chestnut", "chocolate", "amber", "golden", "blonde", "blonde", "blonde", "platinum blonde", "platinum blonde", "auburn", "ginger", "copper"]);
- if (jsRandom(1, 10) === 1 || (["jet black", "black", "dark brown", "brown", "chestnut", "chocolate"].includes(slave.hColor) && jsRandom(1, 10) !== 1)) {
+ slave.hColor = jsEither(["jet black", "black", "black", "dark brown", "brown", "chestnut", "chocolate brown", "amber", "golden", "blonde", "blonde", "blonde", "platinum blonde", "platinum blonde", "auburn", "ginger", "copper"]);
+ if (jsRandom(1, 10) === 1 || (["jet black", "black", "dark brown", "brown", "chestnut", "chocolate brown"].includes(slave.hColor) && jsRandom(1, 10) !== 1)) {
slave.eyebrowHColor = slave.hColor;
}
slave.override_H_Color = 1;
--
GitLab