diff --git a/devNotes/skintonePalette.png b/devNotes/skintonePalette.png new file mode 100644 index 0000000000000000000000000000000000000000..ed7d5bd3d88546446c44d2e15ccbad357b213bb3 Binary files /dev/null and b/devNotes/skintonePalette.png differ diff --git a/src/art/vector/Set_Colour_Skin.tw b/src/art/vector/Set_Colour_Skin.tw index 5bbe5c2445b2c6e3484300a502d9e4ee65952cbd..923b71d616cbf2ea3679dd165f5914161091b87d 100644 --- a/src/art/vector/Set_Colour_Skin.tw +++ b/src/art/vector/Set_Colour_Skin.tw @@ -29,7 +29,7 @@ <<set _skinColour = "#F4C7A5">> <<set _areolaStyle = "fill:#F19290;" >> <<set _labiaStyle = "fill:#F977A3;" >> -<<case "light olive">> +<<case "light olive" "olive">> <<set _skinColour = "#D9CAB5">> <<set _areolaStyle = "fill:#C69691;" >> <<set _labiaStyle = "fill:#F977A3;" >> @@ -45,7 +45,7 @@ <<set _skinColour = "#784F2F">> /* #8A5B31 */ <<set _areolaStyle = "fill:#65422C;" >> <<set _labiaStyle = "fill:#F977A3;" >> -<<case "brown">> +<<case "brown" "light brown">> <<set _skinColour = "#65422C">> /* #C97631 */ <<set _areolaStyle = "fill:#583E2F;" >> <<set _labiaStyle = "fill:#F977A3;" >> diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw index 0c9ed5496ee371c5bd61c944a83329909c4ca590..691601ed07346e50b4a8b88c7148599042994d3a 100644 --- a/src/pregmod/widgets/pregmodWidgets.tw +++ b/src/pregmod/widgets/pregmodWidgets.tw @@ -1098,12 +1098,12 @@ extremely pale -5 <<widget "GenSkinTone">> <<script>> (function() { - var skinToMelanin = {black: 10, ebony: 9.5, 'dark brown': 9, brown: 8, dark: 7, 'dark olive': 6, bronzed: 5.5, tanned: 5, 'light olive': 4, lightened: 3.5, light: 3, fair: 2, 'very fair': 1.5, 'extremely fair': 1.5, pale: 1, 'extremely pale': 0.5, 'pure white': 0.001}; + var skinToMelanin = {black: 10, ebony: 9.5, 'dark brown': 9, brown: 8, 'light brown': 7.5, dark: 7, 'dark olive': 6, bronzed: 5.5, tanned: 5, olive: 4.5, 'light olive': 4, lightened: 3.5, light: 3, fair: 2, 'very fair': 1.5, 'extremely fair': 1.5, pale: 1, 'extremely pale': 0.5, 'pure white': 0.001}; var parents = State.variables.args; var skin0 = parents[0] ? (skinToMelanin[parents[0].skin] || 5) : 3; var skin1 = parents[1] ? (skinToMelanin[parents[1].skin] || 5) : 3; var skin = Math.round(Math.random() * (skin1 - skin0) + skin0); - State.variables.activeSlave.skin = ['white', 'extremely pale', 'pale', 'fair', 'light', 'light olive', 'tanned', 'dark olive', 'dark', 'brown', 'dark brown', 'black'][skin]; + State.variables.activeSlave.skin = ['white', 'extremely pale', 'pale', 'fair', 'light', 'light olive', 'olive', 'tanned', 'dark olive', 'dark', 'light brown', 'brown', 'dark brown', 'black'][skin]; })(); <</script>> <</widget>>