diff --git a/devNotes/Deepmurk_Vector_Art_Changelog.txt b/devNotes/Deepmurk_Vector_Art_Changelog.txt
index 696a467ff014e538ccb5dad8bc062ccea8177df6..43835e3196ad90cffdd332d4e88a687360172ad5 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 f166e480a22938a02b23641f3abb270998adc2e9..477bc075c646c69992238c4f61883b7b9a05ad9c 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 7c3e9e151d9e92aced42c7e0394e80ad15d17ef9..6205a6d49446e52ba0ca465e3d64fa4d3b6a90d3 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>>
diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw
index 69f6e10f2a2e7b2a36e307a43bfd54891e5b8849..0c252f9029f2df739a61954d6e06305e378cb07f 100644
--- a/src/uncategorized/saChoosesOwnJob.tw
+++ b/src/uncategorized/saChoosesOwnJob.tw
@@ -50,7 +50,7 @@
<<= assignJob($slaves[$i], "be a servant")>>
<</if>>
- <<elseif $universalRulesAssignsSelfFacility == 1 && $slaves[$i].devotion > 50 && canWalk($slaves[$i]) && canSee($slaves[$i]) && && $slaves[$i].sexualQuirk == "caring" && $nurseryNannies > $nurserySlaves>>
+ <<elseif $universalRulesAssignsSelfFacility == 1 && $slaves[$i].devotion > 50 && canWalk($slaves[$i]) && canSee($slaves[$i]) && $slaves[$i].sexualQuirk == "caring" && $nurseryNannies > $nurserySlaves>>
<<set $slaves[$i].choosesOwnAssignmentText += " enjoys taking care of children, so $he decides to work in $nurseryName.">>
<<= assignJob($slaves[$i], "work as a nanny")>>