From 55e7dcaf5fe44e4e0d29632f784fd816a48679f6 Mon Sep 17 00:00:00 2001
From: ezsh <ezsh.junk@gmail.com>
Date: Thu, 31 Jan 2019 01:17:55 +0100
Subject: [PATCH] De-duplicate data in generateGenetics()
---
src/js/generateGenetics.js | 32 +++++++-------------------------
1 file changed, 7 insertions(+), 25 deletions(-)
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 76ac32a5af6..98ab81f15c7 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -225,31 +225,13 @@ window.generateGenetics = (function() {
let momSkinIndex = mother ? (skinToMelanin[mother.origSkin] || 11) : 8;
let dadSkinIndex = father !== 0 ? (skinToMelanin[father.origSkin] || 11) : 8;
let skinIndex = Math.round(Math.random() * (dadSkinIndex - momSkinIndex) + momSkinIndex);
- return [
- 'pure white',
- 'pure white',
- 'extremely pale',
- 'pale',
- 'extremely fair',
- 'very fair',
- 'fair',
- 'white',
- 'light',
- 'light olive',
- 'olive',
- 'natural',
- 'tan',
- 'tan',
- 'bronze',
- 'dark olive',
- 'dark',
- 'light brown',
- 'brown',
- 'dark brown',
- 'ebony',
- 'black',
- 'pure black'
- ][skinIndex];
+
+ var prop = '';
+ for (prop in skinToMelanin) {
+ if (!skinToMelanin.hasOwnProperty(prop)) continue;
+ if (skinIndex >= skinToMelanin[prop]) return prop;
+ }
+ return prop; // skinIndex can be zero
}
// eyeColor
--
GitLab