From a7b9059bfa1aba9db6888cf746e65ac73d092f2e Mon Sep 17 00:00:00 2001
From: deepmurk <axiao@protonmail.com>
Date: Sun, 15 Apr 2018 18:57:17 -0400
Subject: [PATCH] Revamp revert fix
fixes problems with revamped
---
src/art/vector/Set_Colour_Skin.tw | 24 ++++++++++++++++--------
src/js/vectorRevampedArtControlJS.tw | 7 +++----
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/art/vector/Set_Colour_Skin.tw b/src/art/vector/Set_Colour_Skin.tw
index e3ea14553f4..67eb8b67629 100644
--- a/src/art/vector/Set_Colour_Skin.tw
+++ b/src/art/vector/Set_Colour_Skin.tw
@@ -18,11 +18,11 @@
<<set _areolaStyle = "fill:#FCCADB;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "pale">>
- <<set _skinColour = "#F5DFDC">> /* #f9ebf0 */
+ <<set _skinColour = "#F5DFDC">>
<<set _areolaStyle = "fill:#EFBDC9;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "fair" "extremely fair" "very fair">>
- <<set _skinColour = "#F5D4C7">> /* #F6E0E8 */
+ <<set _skinColour = "#F5D4C7">>
<<set _areolaStyle = "fill:#E1B0B6;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "white" "light" "lightened">>
@@ -34,27 +34,35 @@
<<set _areolaStyle = "fill:#C69691;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "natural" "tanned">>
- <<set _skinColour = "#C37C4D">> /* #F4C7A5 */ /* #BCA480 */
+ <<set _skinColour = "#C37C4D">>
+ <<set _areolaStyle = "fill:#A67A6F;" >>
+ <<set _labiaStyle = "fill:#F977A3;" >>
+<<case "bronzed">>
+ <<set _skinColour = "#F4CB94">>
<<set _areolaStyle = "fill:#A67A6F;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "dark olive">>
- <<set _skinColour = "#9A7A58">> /* #9E7D4A */
+ <<set _skinColour = "#9A7A58">>
<<set _areolaStyle = "fill:#855E4E;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "dark">>
- <<set _skinColour = "#784F2F">> /* #8A5B31 */
+ <<set _skinColour = "#784F2F">>
<<set _areolaStyle = "fill:#65422C;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "brown" "light brown">>
- <<set _skinColour = "#65422C">> /* #C97631 */
+ <<set _skinColour = "#65422C">>
<<set _areolaStyle = "fill:#583E2F;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "dark brown">>
- <<set _skinColour = "#583E2F">> /* #763818 */
+ <<set _skinColour = "#583E2F">>
<<set _areolaStyle = "fill:#4A3A33;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
+<<case "ebony">>
+ <<set _skinColour = "#583D3D">>
+ <<set _areolaStyle = "fill:#524E4D;" >>
+ <<set _labiaStyle = "fill:#F977A3;" >>
<<case "black">>
- <<set _skinColour = "#4A3A33">> /* #3f3b3a */ /* 5b3a29 */
+ <<set _skinColour = "#4A3A33">>
<<set _areolaStyle = "fill:#524E4D;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "camouflage patterned">>
diff --git a/src/js/vectorRevampedArtControlJS.tw b/src/js/vectorRevampedArtControlJS.tw
index e2bc8597216..2017d7345d2 100644
--- a/src/js/vectorRevampedArtControlJS.tw
+++ b/src/js/vectorRevampedArtControlJS.tw
@@ -234,10 +234,10 @@ class ArtStyleControl {
["pale", "#f9ebf0"],
["tanned", "#e8b693"],
["natural", "#e8b693"],
- ["light olive", "#d4c6bb"],
- ["dark", "#a46237"],
+ ["olive", "#d4c6bb"],
+ ["light brown", "#a46237"],
+ ["dark", "#845c44"],
["brown", "#845c44"],
- ["dark brown", "#845c44"],
["black", "#463a3a"],
["camouflage patterned", "#78875a"],
["red dyed", "#bc4949"],
@@ -247,7 +247,6 @@ class ArtStyleControl {
["blue dyed", "#5b8eb7"],
["dyed blue", "#5b8eb7"],
["tiger striped", "#e2d75d"]
- ["olive", "#a46237"],
];
var skinPaletteMap = new Map(skinPalette);
--
GitLab