diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 09baa867ade363e11ad7926d754f6be43868372e..f3f78ef6e1a13c2379fd8d4eeec36f104b9371e0 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -10291,14 +10291,13 @@ window.generateGenetics = (function() { olive: 10, 'light olive': 9, light: 8, - light: 7, - white: 6, - fair: 5, - 'very fair': 4, - 'extremely fair': 3, - pale: 2, - 'extremely pale': 1, - 'pure white': 0 + white: 7, + fair: 6, + 'very fair': 5, + 'extremely fair': 4, + pale: 3, + 'extremely pale': 2, + 'pure white': 1 }; let momSkinIndex = mother ? (skinToMelanin[mother.origSkin] || 11) : 7; let dadSkinIndex = father !== 0 ? (skinToMelanin[father.origSkin] || 11) : 7; @@ -10312,7 +10311,6 @@ window.generateGenetics = (function() { 'fair', 'white', 'light', - 'light', 'light olive', 'olive', 'natural', @@ -10360,6 +10358,16 @@ window.generateGenetics = (function() { } else { eyeColor = mother.origEye; } + //just in case something wrong gets through + switch (eyeColor) { + case "blind blue": + eyeColor = "deep blue"; + break; + case "milky white": + case "implant": + eyeColor = jsEither(["blue", "green", "brown", "hazel", "light blue", "light green", "dark green", "dark blue"]); + break; + } return eyeColor; } diff --git a/src/js/generateGenetics.tw b/src/js/generateGenetics.tw index 049d3c07a025d4097d5072b3b63013372a65add0..1758c66ba845b8d382f0a74d4b3fd4da1d999f15 100644 --- a/src/js/generateGenetics.tw +++ b/src/js/generateGenetics.tw @@ -214,14 +214,13 @@ window.generateGenetics = (function() { olive: 10, 'light olive': 9, light: 8, - light: 7, - white: 6, - fair: 5, - 'very fair': 4, - 'extremely fair': 3, - pale: 2, - 'extremely pale': 1, - 'pure white': 0 + white: 7, + fair: 6, + 'very fair': 5, + 'extremely fair': 4, + pale: 3, + 'extremely pale': 2, + 'pure white': 1 }; let momSkinIndex = mother ? (skinToMelanin[mother.origSkin] || 11) : 7; let dadSkinIndex = father !== 0 ? (skinToMelanin[father.origSkin] || 11) : 7; @@ -235,7 +234,6 @@ window.generateGenetics = (function() { 'fair', 'white', 'light', - 'light', 'light olive', 'olive', 'natural', @@ -283,6 +281,16 @@ window.generateGenetics = (function() { } else { eyeColor = mother.origEye; } + //just in case something wrong gets through + switch (eyeColor) { + case "blind blue": + eyeColor = "deep blue"; + break; + case "milky white": + case "implant": + eyeColor = jsEither(["blue", "green", "brown", "hazel", "light blue", "light green", "dark green", "dark blue"]); + break; + } return eyeColor; }