diff --git a/src/js/utilJS.js b/src/js/utilJS.js index 882eb2dc6b901908ab2a61af56168227dd3defa7..5da048fc6d9480dc3a1773732c246b715c119435 100644 --- a/src/js/utilJS.js +++ b/src/js/utilJS.js @@ -1620,82 +1620,77 @@ window.randomRaceHair = function(raceName) { window.skinToneLevel = function(skinTone) { if (!setup.naturalSkins.includes(skinTone)) { return undefined; - } else { - let skinNumber; - let skinToMelanin = { - "pure black": 25, - "ebony": 24, - "black": 23, - "dark brown": 22, - "brown": 21, - "light brown": 20, - "dark beige": 19, - "beige": 18, - "light beige": 17, - "dark": 16, - "dark olive": 15, - "bronze": 14, - "olive": 13, - "tan": 12, - "light olive": 11, - "light": 10, - "fair": 9, - "very fair": 8, - "extremely fair": 7, - "pale": 6, - "very pale": 5, - "extremely pale": 4, - "white": 3, - "ivory": 2, - "pure white": 1 - }; - skinNumber = skinToMelanin[skinTone]; - return skinNumber; } + const skinToMelanin = { + "pure black": 25, + "ebony": 24, + "black": 23, + "dark brown": 22, + "brown": 21, + "light brown": 20, + "dark beige": 19, + "beige": 18, + "light beige": 17, + "dark": 16, + "dark olive": 15, + "bronze": 14, + "olive": 13, + "tan": 12, + "light olive": 11, + "light": 10, + "fair": 9, + "very fair": 8, + "extremely fair": 7, + "pale": 6, + "very pale": 5, + "extremely pale": 4, + "white": 3, + "ivory": 2, + "pure white": 1 + }; + return skinToMelanin[skinTone]; }; window.changeSkinTone = function(skin, value) { if (!setup.naturalSkins.includes(skin)) { return skin; - } else { - let skinToMelanin = { - "pure black": 25, - "ebony": 24, - "black": 23, - "dark brown": 22, - "brown": 21, - "light brown": 20, - "dark beige": 19, - "beige": 18, - "light beige": 17, - "dark": 16, - "dark olive": 15, - "bronze": 14, - "olive": 13, - "tan": 12, - "light olive": 11, - "light": 10, - "fair": 9, - "very fair": 8, - "extremely fair": 7, - "pale": 6, - "very pale": 5, - "extremely pale": 4, - "white": 3, - "ivory": 2, - "pure white": 1 - }; - let newSkin = (skinToMelanin[skin] + value); - if (newSkin > 25) { - newSkin = 25; - } else if (newSkin < 1) { - newSkin = 1; - } - let prop = ""; - for (prop in skinToMelanin) { - if (!skinToMelanin.hasOwnProperty(prop)) continue; - if (newSkin >= skinToMelanin[prop]) return prop; - } - return prop; } -}; \ No newline at end of file + const skinToMelanin = { + "pure black": 25, + "ebony": 24, + "black": 23, + "dark brown": 22, + "brown": 21, + "light brown": 20, + "dark beige": 19, + "beige": 18, + "light beige": 17, + "dark": 16, + "dark olive": 15, + "bronze": 14, + "olive": 13, + "tan": 12, + "light olive": 11, + "light": 10, + "fair": 9, + "very fair": 8, + "extremely fair": 7, + "pale": 6, + "very pale": 5, + "extremely pale": 4, + "white": 3, + "ivory": 2, + "pure white": 1 + }; + let newSkin = (skinToMelanin[skin] + value); + if (newSkin > 25) { + newSkin = 25; + } else if (newSkin < 1) { + newSkin = 1; + } + for (prop in skinToMelanin) { + if (!skinToMelanin.hasOwnProperty(prop)) continue; + if (newSkin >= skinToMelanin[prop]) return prop; + } + return prop; +};