diff --git a/devNotes/Deepmurk_Vector_Art_Changelog.txt b/devNotes/Deepmurk_Vector_Art_Changelog.txt
index dd0fb7fa7550b2a6dce27f66294aee0dfb6e13bf..9bfe54930ba792c596915c4f2dc45be2a1f9c9fe 100644
--- a/devNotes/Deepmurk_Vector_Art_Changelog.txt
+++ b/devNotes/Deepmurk_Vector_Art_Changelog.txt
@@ -63,6 +63,7 @@ v1.7 (12/22/2018)
-added green-yellow hair color
-added dark blue hair color
-added missing AI avatars
+ -fixed faces & skintones not showing on custom ethnicities
v1.6 (11/18/2018)
-------------
diff --git a/src/art/artJS.tw b/src/art/artJS.tw
index 79d5226eb88d7281d19ebdf3136c4797247a7381..7d9a6067b93dc58f260b28c40cbf5421b0b6756f 100644
--- a/src/art/artJS.tw
+++ b/src/art/artJS.tw
@@ -1535,6 +1535,114 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
}
+ } else if (artSlave.race != "white", "southern european", "black", "mixed race", "latina", "semitic", "middle eastern", "amerindian", "asian", "pacific islander", "malay", "indo-aryan") {
+ if (artSlave.skin == "pure white") {
+ colorSlave.skinColor = "#FEE5CC";
+ colorSlave.areolaColor = "#E3BBAB";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "extremely pale") {
+ colorSlave.skinColor = "#FEE5CC";
+ colorSlave.areolaColor = "#E3BBAB";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
+ } else if (artSlave.skin == "pale") {
+ colorSlave.skinColor = "#E6C2B0";
+ colorSlave.areolaColor = "#D1A695";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
+ } else if (artSlave.skin == "extremely fair") {
+ colorSlave.skinColor = "#E6C2B0";
+ colorSlave.areolaColor = "#D1A695";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "very fair") {
+ colorSlave.skinColor = "#E1B59F";
+ colorSlave.areolaColor = "#B48D7E";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "fair") {
+ colorSlave.skinColor = "#E1B59F";
+ colorSlave.areolaColor = "#B48D7E";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
+ } else if (artSlave.skin == "white") {
+ colorSlave.skinColor = "#DAA782";
+ colorSlave.areolaColor = "#9E7666";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
+ } else if (artSlave.skin == "light") {
+ colorSlave.skinColor = "#DAA782";
+ colorSlave.areolaColor = "#9E7666";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
+ } else if (artSlave.skin == "lightened") {
+ colorSlave.skinColor = "#DAA782";
+ colorSlave.areolaColor = "#9E7666";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
+ } else if (artSlave.skin == "light olive") {
+ colorSlave.skinColor = "#B27554";
+ colorSlave.areolaColor = "#92684C";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "olive") {
+ colorSlave.skinColor = "#B27554";
+ colorSlave.areolaColor = "#92684C";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#c1a785";
+ } else if (artSlave.skin == "natural") {
+ colorSlave.skinColor = "#B6784E";
+ colorSlave.areolaColor = "#8F5A45";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
+ } else if (artSlave.skin == "tanned") {
+ colorSlave.skinColor = "#B6784E";
+ colorSlave.areolaColor = "#8F5A45";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
+ } else if (artSlave.skin == "bronzed") {
+ colorSlave.skinColor = "#B6784E";
+ colorSlave.areolaColor = "#8F5A45";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark olive") {
+ colorSlave.skinColor = "#8B644F";
+ colorSlave.areolaColor = "#7B5749";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark") {
+ colorSlave.skinColor = "#775031";
+ colorSlave.areolaColor = "#69452F";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
+ } else if (artSlave.skin == "light brown") {
+ colorSlave.skinColor = "#774A31";
+ colorSlave.areolaColor = "#5E4434";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#5d2f1b";
+ } else if (artSlave.skin == "brown") {
+ colorSlave.skinColor = "#774A31";
+ colorSlave.areolaColor = "#5E4434";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
+ } else if (artSlave.skin == "dark brown") {
+ colorSlave.skinColor = "#74523E";
+ colorSlave.areolaColor = "#574135";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "black") {
+ colorSlave.skinColor = "#6B4B4B";
+ colorSlave.areolaColor = "#413228";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "ebony") {
+ colorSlave.skinColor = "#634F45";
+ colorSlave.areolaColor = "#4E3C32";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#634F45";
+ colorSlave.areolaColor = "#4E3C32";
+ colorSlave.labiaColor = "#F977A3";
+ } else {
+ colorSlave.skinColor = "#B6784E";
+ colorSlave.areolaColor = "#8F5A45";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
+ }
}
return colorSlave;
};
diff --git a/src/art/vector/Head.tw b/src/art/vector/Head.tw
index 8ac6d48bb27370648f607586b1f7a370bb0730b4..77ecb89007ca40967ded72bce5b597006abb7502 100644
--- a/src/art/vector/Head.tw
+++ b/src/art/vector/Head.tw
@@ -1295,6 +1295,164 @@
<</if>>
<</if>>
<</if>>
+ <<if _artSlave.race != "white" || _artSlave.race != "southern european" || _artSlave.race != "black" || _artSlave.race != "mixed race" || _artSlave.race != "semitic" || _artSlave.race != "indo-aryan" || _artSlave.race != "latina" || _artSlave.race != "amerindian" || _artSlave.race != "middle eastern" || _artSlave.race != "asian" || _artSlave.race != "pacific islander" || _artSlave.race != "malay">>
+ <<if _artSlave.faceShape == "normal">>
+ <<include Art_Vector_Eyes_TypeB>>
+ <<include Art_Vector_Mouth_TypeA>>
+ <<include Art_Vector_Nose_TypeA>>
+ <<if _artSlave.eyebrowFullness == "pencil-thin">>
+ <<include Art_Vector_Eyebrow_TypeA_Pencilthin>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "thin">>
+ <<include Art_Vector_Eyebrow_TypeA_Thin>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "threaded">>
+ <<include Art_Vector_Eyebrow_TypeA_Threaded>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "natural">>
+ <<include Art_Vector_Eyebrow_TypeA_Natural>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "tapered">>
+ <<include Art_Vector_Eyebrow_TypeA_Tapered>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "thick">>
+ <<include Art_Vector_Eyebrow_TypeA_Thick>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "bushy">>
+ <<include Art_Vector_Eyebrow_TypeA_Bushy>>
+ <</if>>
+ <</if>>
+ <<if _artSlave.faceShape == "masculine">>
+ <<include Art_Vector_Eyes_TypeD>>
+ <<include Art_Vector_Mouth_TypeF>>
+ <<include Art_Vector_Nose_TypeF>>
+ <<if _artSlave.eyebrowFullness == "pencil-thin">>
+ <<include Art_Vector_Eyebrow_TypeE_Pencilthin>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "thin">>
+ <<include Art_Vector_Eyebrow_TypeE_Thin>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "threaded">>
+ <<include Art_Vector_Eyebrow_TypeE_Threaded>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "natural">>
+ <<include Art_Vector_Eyebrow_TypeE_Natural>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "tapered">>
+ <<include Art_Vector_Eyebrow_TypeE_Tapered>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "thick">>
+ <<include Art_Vector_Eyebrow_TypeE_Thick>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "bushy">>
+ <<include Art_Vector_Eyebrow_TypeE_Bushy>>
+ <</if>>
+ <</if>>
+ <<if _artSlave.faceShape == "androgynous">>
+ <<include Art_Vector_Eyes_TypeE>>
+ <<include Art_Vector_Mouth_TypeE>>
+ <<include Art_Vector_Nose_TypeE>>
+ <<if _artSlave.eyebrowFullness == "pencil-thin">>
+ <<include Art_Vector_Eyebrow_TypeF_Pencilthin>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "thin">>
+ <<include Art_Vector_Eyebrow_TypeF_Thin>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "threaded">>
+ <<include Art_Vector_Eyebrow_TypeF_Threaded>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "natural">>
+ <<include Art_Vector_Eyebrow_TypeF_Natural>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "tapered">>
+ <<include Art_Vector_Eyebrow_TypeF_Tapered>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "thick">>
+ <<include Art_Vector_Eyebrow_TypeF_Thick>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "bushy">>
+ <<include Art_Vector_Eyebrow_TypeF_Bushy>>
+ <</if>>
+ <</if>>
+ <<if _artSlave.faceShape == "cute">>
+ <<include Art_Vector_Eyes_TypeB>>
+ <<include Art_Vector_Mouth_TypeB>>
+ <<include Art_Vector_Nose_TypeD>>
+ <<if _artSlave.eyebrowFullness == "pencil-thin">>
+ <<include Art_Vector_Eyebrow_TypeA_Pencilthin>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "thin">>
+ <<include Art_Vector_Eyebrow_TypeA_Thin>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "threaded">>
+ <<include Art_Vector_Eyebrow_TypeA_Threaded>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "natural">>
+ <<include Art_Vector_Eyebrow_TypeA_Natural>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "tapered">>
+ <<include Art_Vector_Eyebrow_TypeA_Tapered>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "thick">>
+ <<include Art_Vector_Eyebrow_TypeA_Thick>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "bushy">>
+ <<include Art_Vector_Eyebrow_TypeA_Bushy>>
+ <</if>>
+ <</if>>
+ <<if _artSlave.faceShape == "sensual">>
+ <<include Art_Vector_Eyes_TypeC>>
+ <<include Art_Vector_Mouth_TypeC>>
+ <<include Art_Vector_Nose_TypeC>>
+ <<if _artSlave.eyebrowFullness == "pencil-thin">>
+ <<include Art_Vector_Eyebrow_TypeC_Pencilthin>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "thin">>
+ <<include Art_Vector_Eyebrow_TypeC_Thin>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "threaded">>
+ <<include Art_Vector_Eyebrow_TypeC_Threaded>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "natural">>
+ <<include Art_Vector_Eyebrow_TypeC_Natural>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "tapered">>
+ <<include Art_Vector_Eyebrow_TypeC_Tapered>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "thick">>
+ <<include Art_Vector_Eyebrow_TypeC_Thick>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "bushy">>
+ <<include Art_Vector_Eyebrow_TypeC_Bushy>>
+ <</if>>
+ <</if>>
+ <<if _artSlave.faceShape == "exotic">>
+ <<include Art_Vector_Eyes_TypeA>>
+ <<include Art_Vector_Mouth_TypeC>>
+ <<include Art_Vector_Nose_TypeC>>
+ <<if _artSlave.eyebrowFullness == "pencil-thin">>
+ <<include Art_Vector_Eyebrow_TypeC_Pencilthin>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "thin">>
+ <<include Art_Vector_Eyebrow_TypeC_Thin>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "threaded">>
+ <<include Art_Vector_Eyebrow_TypeC_Threaded>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "natural">>
+ <<include Art_Vector_Eyebrow_TypeC_Natural>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "tapered">>
+ <<include Art_Vector_Eyebrow_TypeC_Tapered>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "thick">>
+ <<include Art_Vector_Eyebrow_TypeC_Thick>>
+ <</if>>
+ <<if _artSlave.eyebrowFullness == "bushy">>
+ <<include Art_Vector_Eyebrow_TypeC_Bushy>>
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
<</if>>
<</if>>