diff --git a/src/art/artJS.tw b/src/art/artJS.tw
index 555ca1a08749bd2bbed47dcefe61f9c81510c1f4..1b8e3036e65e759642e5efed6209aefbd0607a1a 100644
--- a/src/art/artJS.tw
+++ b/src/art/artJS.tw
@@ -256,10 +256,12 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#F4EAF0";
colorSlave.areolaColor = "#FCCCDC";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "pale") {
colorSlave.skinColor = "#F5E1DF";
colorSlave.areolaColor = "#EFBFCA";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "extremely fair") {
colorSlave.skinColor = "#F5E1DF";
colorSlave.areolaColor = "#EFBFCA";
@@ -272,18 +274,22 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#F5D5C9";
colorSlave.areolaColor = "#E2B4B9";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "white") {
- colorSlave.skinColor = "#F4C9AA";
- colorSlave.areolaColor = "#F19795";
- colorSlave.labiaColor = "#F977A3";
+ colorSlave.skinColor = "#F4C9AA";
+ colorSlave.areolaColor = "#F19795";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light") {
- colorSlave.skinColor = "#F4C9AA";
- colorSlave.areolaColor = "#F19795";
- colorSlave.labiaColor = "#F977A3";
+ colorSlave.skinColor = "#F4C9AA";
+ colorSlave.areolaColor = "#F19795";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "lightened") {
colorSlave.skinColor = "#F4C9AA";
colorSlave.areolaColor = "#F19795";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light olive") {
colorSlave.skinColor = "#E1B585";
colorSlave.areolaColor = "#C39696";
@@ -292,14 +298,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#E1B585";
colorSlave.areolaColor = "#C39696";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#c1a785";
} else if (artSlave.skin == "natural") {
colorSlave.skinColor = "#D58E5F";
colorSlave.areolaColor = "#B17777";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "tanned") {
colorSlave.skinColor = "#D58E5F";
colorSlave.areolaColor = "#B17777";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "bronzed") {
colorSlave.skinColor = "#D58E5F";
colorSlave.areolaColor = "#B17777";
@@ -312,14 +321,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#825633";
colorSlave.areolaColor = "#734B2F";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "light brown") {
colorSlave.skinColor = "#784F2F";
colorSlave.areolaColor = "#583E2F";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#5d2f1b";
} else if (artSlave.skin == "brown") {
colorSlave.skinColor = "#784F2F";
colorSlave.areolaColor = "#583E2F";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "dark brown") {
colorSlave.skinColor = "#65422C";
colorSlave.areolaColor = "#4A3A33";
@@ -332,6 +344,7 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#583E2F";
colorSlave.areolaColor = "#3F3A38";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
}
} else if (artSlave.race == "black" || artSlave.race == "surgically altered to look black") {
@@ -343,10 +356,12 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#FEE4CA";
colorSlave.areolaColor = "#E0B3A2";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "pale") {
colorSlave.skinColor = "#E3C5A7";
colorSlave.areolaColor = "#EFBDC9";
colorSlave.labiaColor = "#CC9B88";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "extremely fair") {
colorSlave.skinColor = "#E3C5A7";
colorSlave.areolaColor = "#CC9B88";
@@ -359,18 +374,22 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#DEB892";
colorSlave.areolaColor = "#AB806F";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "white") {
colorSlave.skinColor = "#D59D73";
colorSlave.areolaColor = "#8D6859";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light") {
colorSlave.skinColor = "#D59D73";
colorSlave.areolaColor = "#8D6859";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "lightened") {
colorSlave.skinColor = "#D59D73";
colorSlave.areolaColor = "#8D6859";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light olive") {
colorSlave.skinColor = "#AC7C4A";
colorSlave.areolaColor = "#7C594B";
@@ -379,14 +398,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#AC7C4A";
colorSlave.areolaColor = "#7C594B";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#c1a785";
} else if (artSlave.skin == "natural") {
colorSlave.skinColor = "#985C34";
colorSlave.areolaColor = "#764B3A";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "tanned") {
colorSlave.skinColor = "#985C34";
colorSlave.areolaColor = "#764B3A";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "bronzed") {
colorSlave.skinColor = "#985C34";
colorSlave.areolaColor = "#764B3A";
@@ -399,14 +421,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#65422C";
colorSlave.areolaColor = "#4B3121";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "light brown") {
colorSlave.skinColor = "#5A3C24";
colorSlave.areolaColor = "#493326";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#5d2f1b";
} else if (artSlave.skin == "brown") {
colorSlave.skinColor = "#5A3C24";
colorSlave.areolaColor = "#493326";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "dark brown") {
colorSlave.skinColor = "#583E2F";
colorSlave.areolaColor = "#46362C";
@@ -419,6 +444,7 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#4A3A33";
colorSlave.areolaColor = "#332B27";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
}
} else if (artSlave.race == "latina" || artSlave.race == "surgically altered to look latina") {
@@ -430,10 +456,12 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#FEDECE";
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";
@@ -446,18 +474,22 @@ if (artSlave.skin == "camouflage patterned") {
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";
@@ -466,14 +498,17 @@ if (artSlave.skin == "camouflage patterned") {
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";
@@ -486,14 +521,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#775031";
colorSlave.areolaColor = "#69452F";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "light brown") {
colorSlave.skinColor = "#774A31";
colorSlave.areolaColor = "#614330";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#5d2f1b";
} else if (artSlave.skin == "brown") {
colorSlave.skinColor = "#774A31";
colorSlave.areolaColor = "#614330";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "dark brown") {
colorSlave.skinColor = "#74523E";
colorSlave.areolaColor = "#573F30";
@@ -506,6 +544,7 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#634F45";
colorSlave.areolaColor = "#4D3A2E";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
}
} else if (artSlave.race == "asian" || artSlave.race == "surgically altered to look asian") {
@@ -517,10 +556,12 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#FFF8EE";
colorSlave.areolaColor = "#F7DBD0";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "pale") {
colorSlave.skinColor = "#F5E7DC";
colorSlave.areolaColor = "#EABFB3";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "extremely fair") {
colorSlave.skinColor = "#F5E7DC";
colorSlave.areolaColor = "#EABFB3";
@@ -533,18 +574,22 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#F5D4B5";
colorSlave.areolaColor = "#CB988B";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "white") {
colorSlave.skinColor = "#F4D1A3";
colorSlave.areolaColor = "#BA8E83";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light") {
colorSlave.skinColor = "#F4D1A3";
colorSlave.areolaColor = "#BA8E83";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "lightened") {
colorSlave.skinColor = "#F4D1A3";
colorSlave.areolaColor = "#BA8E83";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light olive") {
colorSlave.skinColor = "#CFB48D";
colorSlave.areolaColor = "#AC8074";
@@ -553,14 +598,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#CFB48D";
colorSlave.areolaColor = "#AC8074";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#c1a785";
} else if (artSlave.skin == "natural") {
colorSlave.skinColor = "#C38C4D";
colorSlave.areolaColor = "#A67A6F";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "tanned") {
colorSlave.skinColor = "#C38C4D";
colorSlave.areolaColor = "#A67A6F";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "bronzed") {
colorSlave.skinColor = "#C38C4D";
colorSlave.areolaColor = "#A67A6F";
@@ -573,14 +621,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#855834";
colorSlave.areolaColor = "#734B2F";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "light brown") {
colorSlave.skinColor = "#83522B";
colorSlave.areolaColor = "#68442A";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#5d2f1b";
} else if (artSlave.skin == "brown") {
colorSlave.skinColor = "#83522B";
colorSlave.areolaColor = "#68442A";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "dark brown") {
colorSlave.skinColor = "#724826";
colorSlave.areolaColor = "#5C3D26";
@@ -593,6 +644,7 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#583E2F";
colorSlave.areolaColor = "#3F3A38";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
}
} else if (artSlave.race == "middle eastern" || artSlave.race == "surgically altered to look middle eastern") {
@@ -604,10 +656,12 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#E8CFCF";
colorSlave.areolaColor = "#DCADBC";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "pale") {
colorSlave.skinColor = "#FBCCC6";
colorSlave.areolaColor = "#E79E8B";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "extremely fair") {
colorSlave.skinColor = "#FBCCC6";
colorSlave.areolaColor = "#E79E8B";
@@ -620,18 +674,22 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#EAAB92";
colorSlave.areolaColor = "#D27B64";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "white") {
colorSlave.skinColor = "#EDA571";
colorSlave.areolaColor = "#B16854";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light") {
colorSlave.skinColor = "#EDA571";
colorSlave.areolaColor = "#B16854";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "lightened") {
colorSlave.skinColor = "#EDA571";
colorSlave.areolaColor = "#B16854";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light olive") {
colorSlave.skinColor = "#CC8D53";
colorSlave.areolaColor = "#A7624F";
@@ -640,14 +698,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#CC8D53";
colorSlave.areolaColor = "#A7624F";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#c1a785";
} else if (artSlave.skin == "natural") {
colorSlave.skinColor = "#CA7136";
colorSlave.areolaColor = "#9B5959";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "tanned") {
colorSlave.skinColor = "#CA7136";
colorSlave.areolaColor = "#9B5959";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "bronzed") {
colorSlave.skinColor = "#CA7136";
colorSlave.areolaColor = "#9B5959";
@@ -660,14 +721,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#684528";
colorSlave.areolaColor = "#563826";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "light brown") {
colorSlave.skinColor = "#6E4730";
colorSlave.areolaColor = "#604534";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#5d2f1b";
} else if (artSlave.skin == "brown") {
colorSlave.skinColor = "#6E4730";
colorSlave.areolaColor = "#604534";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "dark brown") {
colorSlave.skinColor = "#604534";
colorSlave.areolaColor = "#514039";
@@ -680,6 +744,7 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#583E2F";
colorSlave.areolaColor = "#3F3A38";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
}
} else if (artSlave.race == "amerindian" || artSlave.race == "surgically altered to look amerindian") {
@@ -691,10 +756,12 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#FDE4BF";
colorSlave.areolaColor = "#F0BEAA";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "pale") {
colorSlave.skinColor = "#F5E7DC";
colorSlave.areolaColor = "#CDA499";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "extremely fair") {
colorSlave.skinColor = "#F5E7DC";
colorSlave.areolaColor = "#CDA499";
@@ -707,18 +774,22 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#F5D4B5";
colorSlave.areolaColor = "#CB988B";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "white") {
colorSlave.skinColor = "#F4D1A3";
colorSlave.areolaColor = "#BA8E83";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light") {
colorSlave.skinColor = "#F4D1A3";
colorSlave.areolaColor = "#BA8E83";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "lightened") {
colorSlave.skinColor = "#F4D1A3";
colorSlave.areolaColor = "#BA8E83";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light olive") {
colorSlave.skinColor = "#CFB48D";
colorSlave.areolaColor = "#AC8074";
@@ -727,14 +798,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#CFB48D";
colorSlave.areolaColor = "#AC8074";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#c1a785";
} else if (artSlave.skin == "natural") {
colorSlave.skinColor = "#C38C4D";
colorSlave.areolaColor = "#A67A6F";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "tanned") {
colorSlave.skinColor = "#C38C4D";
colorSlave.areolaColor = "#A67A6F";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "bronzed") {
colorSlave.skinColor = "#C38C4D";
colorSlave.areolaColor = "#A67A6F";
@@ -747,14 +821,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#855834";
colorSlave.areolaColor = "#734B2F";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "light brown") {
colorSlave.skinColor = "#83522B";
colorSlave.areolaColor = "#68442A";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#5d2f1b";
} else if (artSlave.skin == "brown") {
colorSlave.skinColor = "#83522B";
colorSlave.areolaColor = "#68442A";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "dark brown") {
colorSlave.skinColor = "#724826";
colorSlave.areolaColor = "#5C3D26";
@@ -767,6 +844,7 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#583E2F";
colorSlave.areolaColor = "#3F3A38";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
}
} else if (artSlave.race == "southern european" || artSlave.race == "surgically altered to look southern european") {
@@ -778,10 +856,12 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#EBDBE4";
colorSlave.areolaColor = "#FFE4E0";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "pale") {
colorSlave.skinColor = "#F0D0CC";
colorSlave.areolaColor = "#EAACBA";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "extremely fair") {
colorSlave.skinColor = "#F0D0CC";
colorSlave.areolaColor = "#EAACBA";
@@ -794,18 +874,22 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#F1C6B5";
colorSlave.areolaColor = "#DCA2A9";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "white") {
colorSlave.skinColor = "#F2BC94";
colorSlave.areolaColor = "#EE8280";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light") {
colorSlave.skinColor = "#F2BC94";
colorSlave.areolaColor = "#EE8280";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "lightened") {
colorSlave.skinColor = "#F2BC94";
colorSlave.areolaColor = "#EE8280";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light olive") {
colorSlave.skinColor = "#DCA972";
colorSlave.areolaColor = "#BF7577";
@@ -814,14 +898,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#DCA972";
colorSlave.areolaColor = "#BF7577";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#c1a785";
} else if (artSlave.skin == "natural") {
colorSlave.skinColor = "#D0814C";
colorSlave.areolaColor = "#A96767";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "tanned") {
colorSlave.skinColor = "#D0814C";
colorSlave.areolaColor = "#A96767";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "bronzed") {
colorSlave.skinColor = "#D0814C";
colorSlave.areolaColor = "#A96767";
@@ -834,14 +921,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#7F5431";
colorSlave.areolaColor = "#734B2F";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "light brown") {
colorSlave.skinColor = "#784F2F";
colorSlave.areolaColor = "#583E2F";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#5d2f1b";
} else if (artSlave.skin == "brown") {
colorSlave.skinColor = "#784F2F";
colorSlave.areolaColor = "#583E2F";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "dark brown") {
colorSlave.skinColor = "#65422C";
colorSlave.areolaColor = "#4A3A33";
@@ -854,6 +944,7 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#583E2F";
colorSlave.areolaColor = "#3F3A38";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
}
} else if (artSlave.race == "semitic" || artSlave.race == "surgically altered to look semitic") {
@@ -865,10 +956,12 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#E8CFCF";
colorSlave.areolaColor = "#DCADBC";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "pale") {
colorSlave.skinColor = "#FBCCC6";
colorSlave.areolaColor = "#E79E8B";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "extremely fair") {
colorSlave.skinColor = "#FBCCC6";
colorSlave.areolaColor = "#E79E8B";
@@ -881,18 +974,22 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#EAAB92";
colorSlave.areolaColor = "#D27B64";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "white") {
colorSlave.skinColor = "#EDA571";
colorSlave.areolaColor = "#B16854";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light") {
colorSlave.skinColor = "#EDA571";
colorSlave.areolaColor = "#B16854";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "lightened") {
colorSlave.skinColor = "#EDA571";
colorSlave.areolaColor = "#B16854";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light olive") {
colorSlave.skinColor = "#CC8D53";
colorSlave.areolaColor = "#A7624F";
@@ -901,14 +998,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#CC8D53";
colorSlave.areolaColor = "#A7624F";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#c1a785";
} else if (artSlave.skin == "natural") {
colorSlave.skinColor = "#CA7136";
colorSlave.areolaColor = "#9B5959";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "tanned") {
colorSlave.skinColor = "#CA7136";
colorSlave.areolaColor = "#9B5959";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "bronzed") {
colorSlave.skinColor = "#CA7136";
colorSlave.areolaColor = "#9B5959";
@@ -921,14 +1021,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#684528";
colorSlave.areolaColor = "#563826";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "light brown") {
colorSlave.skinColor = "#6E4730";
colorSlave.areolaColor = "#604534";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#5d2f1b";
} else if (artSlave.skin == "brown") {
colorSlave.skinColor = "#6E4730";
colorSlave.areolaColor = "#604534";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "dark brown") {
colorSlave.skinColor = "#604534";
colorSlave.areolaColor = "#514039";
@@ -941,6 +1044,7 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#583E2F";
colorSlave.areolaColor = "#3F3A38";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
}
} else if (artSlave.race == "malay" || artSlave.race == "surgically altered to look malay") {
@@ -952,10 +1056,12 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#FBD1B2";
colorSlave.areolaColor = "#F39E7D";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "pale") {
colorSlave.skinColor = "#E8B892";
colorSlave.areolaColor = "#E2856C";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "extremely fair") {
colorSlave.skinColor = "#E8B892";
colorSlave.areolaColor = "#E2856C";
@@ -968,18 +1074,22 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#EA9870";
colorSlave.areolaColor = "#BE6C56";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "white") {
colorSlave.skinColor = "#EA9760";
colorSlave.areolaColor = "#AB6755";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light") {
colorSlave.skinColor = "#EA9760";
colorSlave.areolaColor = "#AB6755";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "lightened") {
colorSlave.skinColor = "#EA9760";
colorSlave.areolaColor = "#AB6755";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light olive") {
colorSlave.skinColor = "#BA855E";
colorSlave.areolaColor = "#976051";
@@ -988,14 +1098,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#BA855E";
colorSlave.areolaColor = "#976051";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#c1a785";
} else if (artSlave.skin == "natural") {
colorSlave.skinColor = "#A46138";
colorSlave.areolaColor = "#8F5E51";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "tanned") {
colorSlave.skinColor = "#A46138";
colorSlave.areolaColor = "#8F5E51";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "bronzed") {
colorSlave.skinColor = "#A46138";
colorSlave.areolaColor = "#8F5E51";
@@ -1008,14 +1121,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#804A28";
colorSlave.areolaColor = "#5F3F27";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "light brown") {
colorSlave.skinColor = "#6F4523";
colorSlave.areolaColor = "#623C20";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#5d2f1b";
} else if (artSlave.skin == "brown") {
colorSlave.skinColor = "#6F4523";
colorSlave.areolaColor = "#623C20";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "dark brown") {
colorSlave.skinColor = "#6F3E27";
colorSlave.areolaColor = "#553823";
@@ -1028,6 +1144,7 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#583E2F";
colorSlave.areolaColor = "#3F3A38";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
}
} else if (artSlave.race == "indo-aryan" || artSlave.race == "surgically altered to look indo-aryan") {
@@ -1039,10 +1156,12 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#F8D4BE";
colorSlave.areolaColor = "#F8B6A4";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "pale") {
colorSlave.skinColor = "#EFCCAF";
colorSlave.areolaColor = "#EA9B86";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "extremely fair") {
colorSlave.skinColor = "#EFCCAF";
colorSlave.areolaColor = "#EA9B86";
@@ -1055,18 +1174,22 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#FCC49A";
colorSlave.areolaColor = "#D29577";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "white") {
colorSlave.skinColor = "#E8B68E";
colorSlave.areolaColor = "#D08661";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light") {
colorSlave.skinColor = "#E8B68E";
colorSlave.areolaColor = "#D08661";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "lightened") {
colorSlave.skinColor = "#E8B68E";
colorSlave.areolaColor = "#D08661";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light olive") {
colorSlave.skinColor = "#C17848";
colorSlave.areolaColor = "#C36E45";
@@ -1075,14 +1198,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#C17848";
colorSlave.areolaColor = "#C36E45";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#c1a785";
} else if (artSlave.skin == "natural") {
colorSlave.skinColor = "#C17848";
colorSlave.areolaColor = "#A75A34";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "tanned") {
colorSlave.skinColor = "#C17848";
colorSlave.areolaColor = "#A75A34";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "bronzed") {
colorSlave.skinColor = "#C17848";
colorSlave.areolaColor = "#A75A34";
@@ -1095,14 +1221,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#8A593C";
colorSlave.areolaColor = "#714931";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "light brown") {
colorSlave.skinColor = "#845834";
colorSlave.areolaColor = "#614635";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#5d2f1b";
} else if (artSlave.skin == "brown") {
colorSlave.skinColor = "#845834";
colorSlave.areolaColor = "#614635";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "dark brown") {
colorSlave.skinColor = "#7C5842";
colorSlave.areolaColor = "#5F4538";
@@ -1115,6 +1244,7 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#6B5449";
colorSlave.areolaColor = "#473C37";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
}
} else if (artSlave.race == "pacific islander" || artSlave.race == "surgically altered to look pacific islander") {
@@ -1126,10 +1256,12 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#FBD1B2";
colorSlave.areolaColor = "#F39E7D";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "pale") {
colorSlave.skinColor = "#E8B892";
colorSlave.areolaColor = "#E2856C";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ffb9ca";
} else if (artSlave.skin == "extremely fair") {
colorSlave.skinColor = "#E8B892";
colorSlave.areolaColor = "#E2856C";
@@ -1142,18 +1274,22 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#EA9870";
colorSlave.areolaColor = "#BE6C56";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "white") {
colorSlave.skinColor = "#EA9760";
colorSlave.areolaColor = "#AB6755";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light") {
colorSlave.skinColor = "#EA9760";
colorSlave.areolaColor = "#AB6755";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "lightened") {
colorSlave.skinColor = "#EA9760";
colorSlave.areolaColor = "#AB6755";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#ce6876";
} else if (artSlave.skin == "light olive") {
colorSlave.skinColor = "#BA855E";
colorSlave.areolaColor = "#976051";
@@ -1162,14 +1298,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#BA855E";
colorSlave.areolaColor = "#976051";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#c1a785";
} else if (artSlave.skin == "natural") {
colorSlave.skinColor = "#A46138";
colorSlave.areolaColor = "#8F5E51";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "tanned") {
colorSlave.skinColor = "#A46138";
colorSlave.areolaColor = "#8F5E51";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#9e4c44";
} else if (artSlave.skin == "bronzed") {
colorSlave.skinColor = "#A46138";
colorSlave.areolaColor = "#8F5E51";
@@ -1182,14 +1321,17 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#804A28";
colorSlave.areolaColor = "#5F3F27";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "light brown") {
colorSlave.skinColor = "#6F4523";
colorSlave.areolaColor = "#623C20";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#5d2f1b";
} else if (artSlave.skin == "brown") {
colorSlave.skinColor = "#6F4523";
colorSlave.areolaColor = "#623C20";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#714536";
} else if (artSlave.skin == "dark brown") {
colorSlave.skinColor = "#6F3E27";
colorSlave.areolaColor = "#553823";
@@ -1202,6 +1344,7 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#583E2F";
colorSlave.areolaColor = "#3F3A38";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
}
} else if (artSlave.race == "mixed race" || artSlave.race == "surgically altered to look mixed race") {
@@ -1213,10 +1356,12 @@ if (artSlave.skin == "camouflage patterned") {
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";
@@ -1229,18 +1374,22 @@ if (artSlave.skin == "camouflage patterned") {
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";
@@ -1249,14 +1398,17 @@ if (artSlave.skin == "camouflage patterned") {
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";
@@ -1269,14 +1421,17 @@ if (artSlave.skin == "camouflage patterned") {
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";
@@ -1289,6 +1444,7 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#634F45";
colorSlave.areolaColor = "#4E3C32";
colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
}
}
return colorSlave;
diff --git a/src/art/vector/Hair_Back.tw b/src/art/vector/Hair_Back.tw
index 358565a37d095c7ff42cdb04f5b072f22a829f19..e8edf132a506244ab588ffedff61d7adb354bf44 100644
--- a/src/art/vector/Hair_Back.tw
+++ b/src/art/vector/Hair_Back.tw
@@ -5,7 +5,7 @@
<<else>>
<<if _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
<<switch _artSlave.hStyle>>
- <<case "shaved" "buzzcut">>
+ <<case "buzzcut" "shaved" "shaved bald">>
<<include Art_Vector_Hair_Back_NoHair>>
<<case "permed">>
<<if _artSlave.hLength >= 60>>
diff --git a/src/art/vector/Hair_Fore.tw b/src/art/vector/Hair_Fore.tw
index cde89211f8d47dffa8a8c8b4a426ec4cf3788cdd..f079c78726af2767a8e7b5da0becbb9c6c444467 100644
--- a/src/art/vector/Hair_Fore.tw
+++ b/src/art/vector/Hair_Fore.tw
@@ -6,7 +6,7 @@
<<else>>
<<if _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
<<switch _artSlave.hStyle>>
- <<case "shaved" "buzzcut">>
+ <<case "buzzcut" "shaved" "shaved bald">>
<<include Art_Vector_Hair_Fore_NoHair>>
<<case "permed">>
<<if _artSlave.hLength >= 60>>
diff --git a/src/art/vector_revamp/vectorRevampedArtControlJS.tw b/src/art/vector_revamp/vectorRevampedArtControlJS.tw
index 4995847bf5edd69e9ece5a71d69a88f7f6801c7c..c0d642425f9e46b49a6eec9b14a1fd1c83dec9c5 100644
--- a/src/art/vector_revamp/vectorRevampedArtControlJS.tw
+++ b/src/art/vector_revamp/vectorRevampedArtControlJS.tw
@@ -126,180 +126,7 @@ class ArtStyleControl {
}
}
- parseColorFromName(colorName) {
- if (colorName == null)
- return "#000000";
-
- var colorPalette = [
- ["auburn", "#7e543e"],
- ["black", "#3F4040"],
- ["blazing red", "#E00E2B"],
- ["blonde", "#F4F1A3"],
- ["blue-violet", "#8790B7"],
- ["blue", "#4685C5"],
- ["brown", "#8D4F21"],
- ["burgundy", "#5f3946"],
- ["chestnut", "#663622"],
- ["chocolate", "#6e4937"],
- ["copper", "#a16145"],
- ["dark brown", "#463325"],
- ["deep red", "#6D1318"],
- ["ginger", "#da822d"],
- ["golden", "#ffdf31"],
- ["green", "#5FBA46"],
- ["grey", "#9e9fa4"],
- ["hazel", "#8d6f1f"],
- ["light olive", "#d4c6bb"],
- ["neon blue", "#2284C3"],
- ["neon green", "#25d12b"],
- ["neon pink", "#cc26aa"],
- ["pink", "#D18CBC"],
- ["platinum blonde", "#fcf3c1"],
- ["red", "#BB2027"],
- ["silver", "#cdc9c6"],
- ["strawberry-blonde", "#e5a88c"],
- ["demonic", "#aa0000"],
- ["devilish", "#ffd42a"],
- ["hypnotic", "#ff5599"],
- ["catlike", "#555555"],
- ["serpent-like", "#555555"],
- ["heart-shaped", "#555555"],
- ["wide-eyed", "#555555"],
- ["almond-shaped", "#555555"],
- ["bright", "#555555"],
- ["teary", "#555555"],
- ["vacant", "#555555"],
- /* these are not actually FreeCities canon, but like to appear in custom descriptions */
- ["brunette", "#8D4F21"],
- ["dark", "#463325"]
- ];
-
- var colorPaletteMap = new Map(colorPalette);
- colorName = colorName.toLowerCase();
- var colorValue = colorPaletteMap.get(colorName);
- if (!colorValue) {
- if (extractHairColor !== undefined) {
- return extractHairColor(colorName)
- }
- else {
- return colorName;
- }
- }
-
- return colorValue;
- }
-
- getLipsColorBySkinColorName(colorName) {
- if (colorName == null)
- return "#000000";
-
- var lipsPalette = [
- ["light", "#ce6876"],
- ["white", "#ce6876"],
- ["fair", "#ce6876"],
- ["lightened", "#ce6876"],
- ["extremely pale", "#ffb9ca"],
- ["pale", "#ffb9ca"],
- ["tanned", "#9e4c44"],
- ["natural", "#9e4c44"],
- ["olive", "#c1a785"],
- ["light brown", "#5d2f1b"],
- ["dark", "#714536"],
- ["brown", "#714536"],
- ["black", "#403030"],
- ["camouflage patterned", "#708050"],
- ["dyed red", "#b04040"],
- ["dyed green", "#A0C070"],
- ["dyed blue", "#5080b0"],
- ["dyed pink", "#ff4291"],
- ["dyed gray", "#171717"],
- ["tiger striped", "#e0d050"]
- ];
-
- var lipsPaletteMap = new Map(lipsPalette);
- colorName = colorName.toLowerCase();
- var colorValue = lipsPaletteMap.get(colorName);
- if (!colorValue) {
- return this.parseColorFromName(colorName);
- }
-
- return colorValue;
- }
-
- getAreolaColorBySkinColorName(colorName) {
- if (colorName == null)
- return "#000000";
-
- var areolaPalette = [
- ["light", "#ce6876"],
- ["white", "#ce6876"],
- ["fair", "#ce6876"],
- ["lightened", "#ce6876"],
- ["extremely pale", "#ffb9ca"],
- ["pale", "#ffb9ca"],
- ["tanned", "#9e4c44"],
- ["natural", "#9e4c44"],
- ["olive", "#c1a785"],
- ["light brown", "#5d2f1b"],
- ["dark", "#714536"],
- ["brown", "#714536"],
- ["black", "#403030"],
- ["camouflage patterned", "#939F7A"],
- ["dyed red", "#C96D6D"],
- ["dyed green", "#B7CF8F"],
- ["dyed blue", "#7BA4C5"],
- ["dyed pink", "#fc45a1"],
- ["dyed gray", "#666666"],
- ["tiger striped", "#E7DF7D"]
- ];
-
- var areolaPaletteMap = new Map(areolaPalette);
- colorName = colorName.toLowerCase();
- var colorValue = areolaPaletteMap.get(colorName);
- if (!colorValue) {
- return this.parseColorFromName(colorName);
- }
-
- return colorValue;
- }
-
- getLabiaColorBySkinColorName(colorName) {
- if (colorName == null)
- return "#000000";
-
- var labiaPalette = [
- ["light", "#ce6876"],
- ["white", "#ce6876"],
- ["fair", "#ce6876"],
- ["lightened", "#ce6876"],
- ["extremely pale", "#ffb9ca"],
- ["pale", "#ffb9ca"],
- ["tanned", "#9e4c44"],
- ["natural", "#9e4c44"],
- ["olive", "#c1a785"],
- ["light brown", "#5d2f1b"],
- ["dark", "#714536"],
- ["brown", "#714536"],
- ["black", "#403030"],
- ["camouflage patterned", "#F977A3"],
- ["dyed red", "#F977A3"],
- ["dyed green", "#F977A3"],
- ["dyed blue", "#F977A3"],
- ["dyed pink", "#fba2c0"],
- ["dyed gray", "#8C8C8C"],
- ["tiger striped", "#F977A3"]
- ];
-
- var labiaPaletteMap = new Map(labiaPalette);
- colorName = colorName.toLowerCase();
- var colorValue = labiaPaletteMap.get(colorName);
- if (!colorValue) {
- return this.parseColorFromName(colorName);
- }
-
- return colorValue;
- }
-
+ /*currently unused, keeping for color reference - */
parseSkinColorFromName(colorName) {
if (colorName == null)
return "#000000";
@@ -337,6 +164,7 @@ class ArtStyleControl {
return colorValue;
}
+ /* - currently unused, keeping for color reference*/
initDefaultValues() {
var colorSlave = skinColorCatcher(this.artSlave);
@@ -345,7 +173,7 @@ class ArtStyleControl {
this.white.fill = "#FFFFFF";
this.skin = new ArtStyleEntry("skin");
- this.skin.fill = this.colorSlave.skinColor;
+ this.skin.fill = colorSlave.skinColor;
this.arm = new ArtStyleEntry("arm.skin");
this.arm.fill = this.skin.fill;
@@ -366,10 +194,10 @@ class ArtStyleControl {
this.scrotum.fill = this.skin.fill;
this.areola = new ArtStyleEntry("areola");
- this.areola.fill = this.colorSlave.areolaColor;
+ this.areola.fill = colorSlave.areolaColor;
this.labia = new ArtStyleEntry("labia");
- this.labia.fill = this.colorSlave.labiaColor;
+ this.labia.fill = colorSlave.labiaColor;
this.hair = new ArtStyleEntry("hair");
this.hair.fill = extractHairColor(this.artSlave.hColor);
@@ -403,7 +231,7 @@ class ArtStyleControl {
this.glasses.fill = "#010101";
this.lips = new ArtStyleEntry("lips");
- this.lips.fill = this.colorSlave.lipsColor;
+ this.lips.fill = colorSlave.lipsColor;
this.lips["fill-opacity"] = 0.6;
this.eyeball = new ArtStyleEntry("eyeball");