diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 43ae3cad3a637d5ded4ff6d79d4de808a9e296d0..f6a86b4021bee2144006bee80a587c2da7bbb22c 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -17102,7 +17102,9 @@ window.rulesAssistantOptions = (function() {
["dyed red"],
["dyed green"],
["dyed blue"],
- ["tiger triped"],
+ ["dyed pink"],
+ ["dyed gray"],
+ ["tiger striped"],
["camouflage patterned"],
]
super("Dye or tan skin", items);
@@ -23251,37 +23253,36 @@ window.extractHairColor = function(hColor) {
attributed color names are at the front of the array
*/
var FCname2HTMLarray = [
- ["blazing red", "#E00E2B"],
- ["neon green", "#25d12b"],
- ["neon blue", "#2284C3"],
- ["neon pink", "#cc26aa"],
- ["strawberry-blonde", "#e5a88c"],
- ["platinum blonde", "#fcf3c1"],
- ["dark brown", "#463325"],
- ["brown", "#8D4F21"],
["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"],
- ["deep red", "#6D1318"],
- ["blue-violet", "#8790B7"],
["silver", "#cdc9c6"],
- ["light olive", "#d4c6bb"],
- ["dark", "#a46237"],
+ ["strawberry-blonde", "#e5a88c"],
/* these are not actually FreeCities canon, but like to appear in custom descriptions */
- ["dark", "#463325"],
- ["brunette", "#8D4F21"]
+ ["brunette", "#8D4F21"],
+ ["dark", "#463325"]
];
/* these are HTML color names supported by most browsers */
diff --git a/src/art/artJS.tw b/src/art/artJS.tw
index 2f1daf9bf0a48c2ae804a37d9fa64091d0e99d58..e959f3161408ab7c66b7c0b72127dbbfc4a3d3b9 100644
--- a/src/art/artJS.tw
+++ b/src/art/artJS.tw
@@ -127,41 +127,51 @@ window.extractHairColor = function(hColor) {
attributed color names are at the front of the array
*/
var FCname2HTMLarray = [
- ["blazing red", "#E00E2B"],
- ["neon green", "#25d12b"],
- ["neon blue", "#2284C3"],
- ["neon pink", "#cc26aa"],
- ["strawberry-blonde", "#e5a88c"],
- ["platinum blonde", "#fcf3c1"],
- ["dark brown", "#463325"],
- ["brown", "#8D4F21"],
["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"],
- ["deep red", "#6D1318"],
- ["blue-violet", "#8790B7"],
["silver", "#cdc9c6"],
- ["light olive", "#d4c6bb"],
- ["dark", "#a46237"],
+ ["strawberry-blonde", "#e5a88c"],
+ /* eye shapes, future plans to convert them from eyecolor to new value system */
+ ["almond-shaped", "#555555"],
+ ["bright", "#555555"],
+ ["catlike", "#555555"],
+ ["devilish", "#ffd42a"],
+ ["heart-shaped", "#555555"],
+ ["hypnotic", "#ff5599"],
+ ["serpent-like", "#555555"],
+ ["teary", "#555555"],
+ ["vacant", "#555555"],
+ ["wide-eyed", "#555555"],
/* these are not actually FreeCities canon, but like to appear in custom descriptions */
- ["dark", "#463325"],
- ["brunette", "#8D4F21"]
+ ["brunette", "#8D4F21"],
+ ["dark", "#463325"]
];
/* these are HTML color names supported by most browsers */
- var HTMLstandardColors = ["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgrey","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkslategrey","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dimgrey","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred ","indigo ","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgrey","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightslategrey","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","slategrey","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"];
+ var HTMLstandardColors = ["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgrey","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkslategrey","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dimgrey","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgrey","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightslategrey","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","slategrey","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"];
var FCnames = new Map(FCname2HTMLarray);
hColor = hColor.toLowerCase(); /* normalization: lowercase color name */
@@ -205,3 +215,1296 @@ window.clothing2artSuffix = function(v) {
) /* CamelCase by whitespace */
.replace(/\W/g,""); /* remove remaining whitespace */
};
+
+window.skinColorCatcher = function(artSlave) {
+var colorSlave = {
+ skinColor: "#d76b93;",
+ areolaColor: "#d76b93;",
+ labiaColor: "#d76b93;",
+ lipsColor: "#d76b93;"
+ };
+if (artSlave.skin == "camouflage patterned") {
+ colorSlave.skinColor = "#78875a";
+ colorSlave.areolaColor = "#939F7A";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#708050";
+ } else if (artSlave.skin == "dyed red") {
+ colorSlave.skinColor = "#bc4949";
+ colorSlave.areolaColor = "#C96D6D";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#b04040";
+ } else if (artSlave.skin == "dyed green") {
+ colorSlave.skinColor = "#A6C373";
+ colorSlave.areolaColor = "#B7CF8F";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#A0C070";
+ } else if (artSlave.skin == "dyed blue") {
+ colorSlave.skinColor = "#5b8eb7";
+ colorSlave.areolaColor = "#7BA4C5";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#5080b0";
+ } else if (artSlave.skin == "dyed pink") {
+ colorSlave.skinColor = "#fe62b0";
+ colorSlave.areolaColor = "#fc45a1";
+ colorSlave.labiaColor = "#fba2c0";
+ colorSlave.lipsColor = "#ff4291";
+ } else if (artSlave.skin == "dyed gray") {
+ colorSlave.skinColor = "#bdbdbd";
+ colorSlave.areolaColor = "#666666";
+ colorSlave.labiaColor = "#8C8C8C";
+ colorSlave.lipsColor = "#171717";
+ } else if (artSlave.skin == "tiger striped") {
+ colorSlave.skinColor = "#e2d75d";
+ colorSlave.areolaColor = "#E7DF7D";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#e0d050";
+} else if (artSlave.race == "white" || artSlave.race == "surgically altered to look white") {
+ if (artSlave.skin == "pure white") {
+ colorSlave.skinColor = "#F4EAF0";
+ colorSlave.areolaColor = "#FCCCDC";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "extremely pale") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "very fair") {
+ colorSlave.skinColor = "#F5D5C9";
+ colorSlave.areolaColor = "#E2B4B9";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "fair") {
+ 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.lipsColor = "#ce6876";
+ } else if (artSlave.skin == "light") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "olive") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark olive") {
+ colorSlave.skinColor = "#A2805C";
+ colorSlave.areolaColor = "#8E6454";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "black") {
+ colorSlave.skinColor = "#65422C";
+ colorSlave.areolaColor = "#4A3A33";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "ebony") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
+ }
+
+} else if (artSlave.race == "black" || artSlave.race == "surgically altered to look black") {
+ if (artSlave.skin == "pure white") {
+ colorSlave.skinColor = "#FEE4CA";
+ colorSlave.areolaColor = "#E0B3A2";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "extremely pale") {
+ 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";
+ colorSlave.labiaColor = "#CC9B88";
+ } else if (artSlave.skin == "very fair") {
+ colorSlave.skinColor = "#DEB892";
+ colorSlave.areolaColor = "#AB806F";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "fair") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "olive") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark olive") {
+ colorSlave.skinColor = "#745C42";
+ colorSlave.areolaColor = "#63463B";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "black") {
+ colorSlave.skinColor = "#583D3D";
+ colorSlave.areolaColor = "#3B3028";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "ebony") {
+ colorSlave.skinColor = "#4A3A33";
+ colorSlave.areolaColor = "#332B27";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#312926";
+ colorSlave.areolaColor = "#181616";
+ colorSlave.labiaColor = "#F977A3";
+ }
+
+} else if (artSlave.race == "latina" || artSlave.race == "surgically altered to look latina") {
+ if (artSlave.skin == "pure white") {
+ colorSlave.skinColor = "#FEDECE";
+ colorSlave.areolaColor = "#E3BBAB";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "extremely pale") {
+ 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";
+ 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 = "#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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "black") {
+ colorSlave.skinColor = "#6B4B4B";
+ colorSlave.areolaColor = "#473426";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "ebony") {
+ colorSlave.skinColor = "#634F45";
+ colorSlave.areolaColor = "#4D3A2E";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#634F45";
+ colorSlave.areolaColor = "#4D3A2E";
+ colorSlave.labiaColor = "#F977A3";
+ }
+
+} else if (artSlave.race == "asian" || artSlave.race == "surgically altered to look asian") {
+ if (artSlave.skin == "pure white") {
+ colorSlave.skinColor = "#FFF8EE";
+ colorSlave.areolaColor = "#F7DBD0";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "extremely pale") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "very fair") {
+ colorSlave.skinColor = "#F5D4B5";
+ colorSlave.areolaColor = "#CB988B";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "fair") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "olive") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark olive") {
+ colorSlave.skinColor = "#9A774A";
+ colorSlave.areolaColor = "#855E4E";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "black") {
+ colorSlave.skinColor = "#724826";
+ colorSlave.areolaColor = "#5C3D26";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "ebony") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
+ }
+
+} else if (artSlave.race == "middle eastern" || artSlave.race == "surgically altered to look middle eastern") {
+ if (artSlave.skin == "pure white") {
+ colorSlave.skinColor = "#E8CFCF";
+ colorSlave.areolaColor = "#DCADBC";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "extremely pale") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "very fair") {
+ colorSlave.skinColor = "#EAAB92";
+ colorSlave.areolaColor = "#D27B64";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "fair") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "olive") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark olive") {
+ colorSlave.skinColor = "#84684A";
+ colorSlave.areolaColor = "#735143";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "black") {
+ colorSlave.skinColor = "#604534 ";
+ colorSlave.areolaColor = "#514039";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "ebony") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
+ }
+
+} else if (artSlave.race == "amerindian" || artSlave.race == "surgically altered to look amerindian") {
+ if (artSlave.skin == "pure white") {
+ colorSlave.skinColor = "#FDE4BF";
+ colorSlave.areolaColor = "#F0BEAA";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "extremely pale") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "very fair") {
+ colorSlave.skinColor = "#F5D4B5";
+ colorSlave.areolaColor = "#CB988B";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "fair") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "olive") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark olive") {
+ colorSlave.skinColor = "#9A774A";
+ colorSlave.areolaColor = "#855E4E";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "black") {
+ colorSlave.skinColor = "#724826";
+ colorSlave.areolaColor = "#5C3D26";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "ebony") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
+ }
+
+} else if (artSlave.race == "southern european" || artSlave.race == "surgically altered to look southern european") {
+ if (artSlave.skin == "pure white") {
+ colorSlave.skinColor = "#EBDBE4";
+ colorSlave.areolaColor = "#FFE4E0";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "extremely pale") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "very fair") {
+ colorSlave.skinColor = "#F1C6B5";
+ colorSlave.areolaColor = "#DCA2A9";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "fair") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "olive") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark olive") {
+ colorSlave.skinColor = "#937453";
+ colorSlave.areolaColor = "#7F5A4B";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "black") {
+ colorSlave.skinColor = "#65422C";
+ colorSlave.areolaColor = "#4A3A33";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "ebony") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
+ }
+
+} else if (artSlave.race == "semitic" || artSlave.race == "surgically altered to look semitic") {
+ if (artSlave.skin == "pure white") {
+ colorSlave.skinColor = "#E8CFCF";
+ colorSlave.areolaColor = "#DCADBC";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "extremely pale") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "very fair") {
+ colorSlave.skinColor = "#EAAB92";
+ colorSlave.areolaColor = "#D27B64";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "fair") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "olive") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark olive") {
+ colorSlave.skinColor = "#84684A";
+ colorSlave.areolaColor = "#735143";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "black") {
+ colorSlave.skinColor = "#604534 ";
+ colorSlave.areolaColor = "#514039";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "ebony") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
+ }
+
+} else if (artSlave.race == "malay" || artSlave.race == "surgically altered to look malay") {
+ if (artSlave.skin == "pure white") {
+ colorSlave.skinColor = "#FBD1B2";
+ colorSlave.areolaColor = "#F39E7D";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "extremely pale") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "very fair") {
+ colorSlave.skinColor = "#EA9870";
+ colorSlave.areolaColor = "#BE6C56";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "fair") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "olive") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark olive") {
+ colorSlave.skinColor = "#7C563C";
+ colorSlave.areolaColor = "#70493A";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "black") {
+ colorSlave.skinColor = "#6F3E27";
+ colorSlave.areolaColor = "#553823";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "ebony") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
+ }
+
+} else if (artSlave.race == "indo-aryan" || artSlave.race == "surgically altered to look indo-aryan") {
+ if (artSlave.skin == "pure white") {
+ colorSlave.skinColor = "#F8D4BE";
+ colorSlave.areolaColor = "#F8B6A4";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "extremely pale") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "very fair") {
+ colorSlave.skinColor = "#FCC49A";
+ colorSlave.areolaColor = "#D29577";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "fair") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "olive") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark olive") {
+ colorSlave.skinColor = "#83684B";
+ colorSlave.areolaColor = "#715043";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "black") {
+ colorSlave.skinColor = "#7C5842";
+ colorSlave.areolaColor = "#5F4538";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "ebony") {
+ colorSlave.skinColor = "#6B5449";
+ colorSlave.areolaColor = "#473C37";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#6B5449";
+ colorSlave.areolaColor = "#473C37";
+ colorSlave.labiaColor = "#F977A3";
+ }
+
+} else if (artSlave.race == "pacific islander" || artSlave.race == "surgically altered to look pacific islander") {
+ if (artSlave.skin == "pure white") {
+ colorSlave.skinColor = "#FBD1B2";
+ colorSlave.areolaColor = "#F39E7D";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "extremely pale") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "very fair") {
+ colorSlave.skinColor = "#EA9870";
+ colorSlave.areolaColor = "#BE6C56";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "fair") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "olive") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark olive") {
+ colorSlave.skinColor = "#7C563C";
+ colorSlave.areolaColor = "#70493A";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "dark") {
+ 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";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "black") {
+ colorSlave.skinColor = "#6F3E27";
+ colorSlave.areolaColor = "#553823";
+ colorSlave.labiaColor = "#F977A3";
+ } else if (artSlave.skin == "ebony") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
+ colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
+ }
+
+} else if (artSlave.race == "mixed race" || artSlave.race == "surgically altered to look mixed race") {
+ 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";
+ }
+}
+ return colorSlave;
+};
diff --git a/src/art/vector/Generate_Stylesheet.tw b/src/art/vector/Generate_Stylesheet.tw
index 6782bdd8c315f32fb98ae2eadf1d8d66260eb805..e5835205f51d76c0f559da5ff2e20c32fe81401f 100644
--- a/src/art/vector/Generate_Stylesheet.tw
+++ b/src/art/vector/Generate_Stylesheet.tw
@@ -24,8 +24,8 @@
."+_art_display_class+" .penis { "+_penisSkinStyle+"; }
."+_art_display_class+" .scrotum { "+_scrotumSkinStyle+"; }
."+_art_display_class+" .belly { "+_bellySkinStyle+"; }
-."+_art_display_class+" .areola { "+_areolaStyle+"; }
-."+_art_display_class+" .labia { "+_labiaStyle+"; }
+."+_art_display_class+" .areola { fill:"+_areolaStyle+"; }
+."+_art_display_class+" .labia { fill:"+_labiaStyle+"; }
."+_art_display_class+" .hair { fill:"+_hairColour+"; }
."+_art_display_class+" .pubic_hair { fill:"+_pubicHairColour+"; }
."+_art_display_class+" .underarm_hair { fill:"+_underarmHairColour+"; }
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/Set_Colour_Skin_JS.tw b/src/art/vector/Set_Colour_Skin_JS.tw
index d28a99f1975b21805757b433392296224ddcb828..99849dbec4115d55a1c9b076b752bfcb1ed1a671 100644
--- a/src/art/vector/Set_Colour_Skin_JS.tw
+++ b/src/art/vector/Set_Colour_Skin_JS.tw
@@ -4,8 +4,8 @@ window.Art_Vector_Set_Colour_Skin = function(artSlave, outfitBaseColour) {
/* create an aggregator object yielding all computed styles */
var s = {
- areolaStyle: "fill: #d76b93;", /* this is the default and can be customized later */
- labiaStyle: "fill: #d76b93;", /* this is the default and can be customized later */
+ areolaStyle: "#d76b93;", /* this is the default and can be customized later */
+ labiaStyle: "#d76b93;", /* this is the default and can be customized later */
/* todo: introduce fleshStyle */
/* these need to be declared so they can be set conditionally */
headSkinStyle: undefined,
@@ -15,1072 +15,12 @@ var s = {
scrotumSkinStyle: undefined,
bellySkinStyle: undefined,
skinColour: undefined
- };
-
-if (artSlave.skin == "camouflage patterned") {
- s.skinColour = "#78875a";
- s.areolaStyle = "fill:#939F7A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed red") {
- s.skinColour = "#bc4949";
- s.areolaStyle = "fill:#C96D6D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed green") {
- s.skinColour = "#A6C373";
- s.areolaStyle = "fill:#B7CF8F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dyed blue") {
- s.skinColour = "#5b8eb7";
- s.areolaStyle = "fill:#7BA4C5;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tiger striped") {
- s.skinColour = "#e2d75d";
- s.areolaStyle = "fill:#E7DF7D;";
- s.labiaStyle = "fill:#F977A3;";
-} else if (artSlave.race == "white" || artSlave.race == "surgically altered to look white") {
- if (artSlave.skin == "pure white") {
- s.skinColour = "#F4EAF0";
- s.areolaStyle = "fill:#FCCCDC;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely pale") {
- s.skinColour = "#F4EAF0";
- s.areolaStyle = "fill:#FCCCDC;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "pale") {
- s.skinColour = "#F5E1DF";
- s.areolaStyle = "fill:#EFBFCA;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely fair") {
- s.skinColour = "#F5E1DF";
- s.areolaStyle = "fill:#EFBFCA;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "very fair") {
- s.skinColour = "#F5D5C9";
- s.areolaStyle = "fill:#E2B4B9;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "fair") {
- s.skinColour = "#F5D5C9";
- s.areolaStyle = "fill:#E2B4B9;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "white") {
- s.skinColour = "#F4C9AA";
- s.areolaStyle = "fill:#F19795;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light") {
- s.skinColour = "#F4C9AA";
- s.areolaStyle = "fill:#F19795;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "lightened") {
- s.skinColour = "#F4C9AA";
- s.areolaStyle = "fill:#F19795;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light olive") {
- s.skinColour = "#E1B585";
- s.areolaStyle = "fill:#C39696;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "olive") {
- s.skinColour = "#E1B585";
- s.areolaStyle = "fill:#C39696;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "natural") {
- s.skinColour = "#D58E5F";
- s.areolaStyle = "fill:#B17777;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tanned") {
- s.skinColour = "#D58E5F";
- s.areolaStyle = "fill:#B17777;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "bronzed") {
- s.skinColour = "#D58E5F";
- s.areolaStyle = "fill:#B17777;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark olive") {
- s.skinColour = "#A2805C";
- s.areolaStyle = "fill:#8E6454;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark") {
- s.skinColour = "#825633";
- s.areolaStyle = "fill:#734B2F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light brown") {
- s.skinColour = "#784F2F";
- s.areolaStyle = "fill:#583E2F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "brown") {
- s.skinColour = "#784F2F";
- s.areolaStyle = "fill:#583E2F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark brown") {
- s.skinColour = "#65422C";
- s.areolaStyle = "fill:#4A3A33;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "ebony") {
- s.skinColour = "#65422C";
- s.areolaStyle = "fill:#4A3A33;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "black") {
- s.skinColour = "#583E2F";
- s.areolaStyle = "fill:#3F3A38;";
- s.labiaStyle = "fill:#F977A3;";
- }
-
-} else if (artSlave.race == "black" || artSlave.race == "surgically altered to look black") {
- if (artSlave.skin == "pure white") {
- s.skinColour = "#FEE4CA";
- s.areolaStyle = "fill:#E0B3A2;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely pale") {
- s.skinColour = "#FEE4CA";
- s.areolaStyle = "fill:#E0B3A2;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "pale") {
- s.skinColour = "#E3C5A7";
- s.areolaStyle = "fill:#EFBDC9;";
- s.labiaStyle = "fill:#CC9B88;";
- } else if (artSlave.skin == "extremely fair") {
- s.skinColour = "#E3C5A7";
- s.areolaStyle = "fill:#CC9B88;";
- s.labiaStyle = "fill:#CC9B88;";
- } else if (artSlave.skin == "very fair") {
- s.skinColour = "#DEB892";
- s.areolaStyle = "fill:#AB806F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "fair") {
- s.skinColour = "#DEB892";
- s.areolaStyle = "fill:#AB806F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "white") {
- s.skinColour = "#D59D73";
- s.areolaStyle = "fill:#8D6859;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light") {
- s.skinColour = "#D59D73";
- s.areolaStyle = "fill:#8D6859;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "lightened") {
- s.skinColour = "#D59D73";
- s.areolaStyle = "fill:#8D6859;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light olive") {
- s.skinColour = "#AC7C4A";
- s.areolaStyle = "fill:#7C594B;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "olive") {
- s.skinColour = "#AC7C4A";
- s.areolaStyle = "fill:#7C594B;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "natural") {
- s.skinColour = "#985C34";
- s.areolaStyle = "fill:#764B3A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tanned") {
- s.skinColour = "#985C34";
- s.areolaStyle = "fill:#764B3A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "bronzed") {
- s.skinColour = "#985C34";
- s.areolaStyle = "fill:#764B3A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark olive") {
- s.skinColour = "#745C42";
- s.areolaStyle = "fill:#63463B;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark") {
- s.skinColour = "#65422C";
- s.areolaStyle = "fill:#4B3121;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light brown") {
- s.skinColour = "#5A3C24";
- s.areolaStyle = "fill:#493326;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "brown") {
- s.skinColour = "#5A3C24";
- s.areolaStyle = "fill:#493326;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark brown") {
- s.skinColour = "#583E2F";
- s.areolaStyle = "fill:#46362C;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "ebony") {
- s.skinColour = "#583D3D";
- s.areolaStyle = "fill:#3B3028;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "black") {
- s.skinColour = "#4A3A33";
- s.areolaStyle = "fill:#332B27;";
- s.labiaStyle = "fill:#F977A3;";
- }
-
-} else if (artSlave.race == "latina" || artSlave.race == "surgically altered to look latina") {
- if (artSlave.skin == "pure white") {
- s.skinColour = "#FEDECE";
- s.areolaStyle = "fill:#E3BBAB;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely pale") {
- s.skinColour = "#FEDECE";
- s.areolaStyle = "fill:#E3BBAB;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "pale") {
- s.skinColour = "#E6C2B0";
- s.areolaStyle = "fill:#D1A695;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely fair") {
- s.skinColour = "#E6C2B0";
- s.areolaStyle = "fill:#D1A695;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "very fair") {
- s.skinColour = "#E1B59F";
- s.areolaStyle = "fill:#B48D7E;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "fair") {
- s.skinColour = "#E1B59F";
- s.areolaStyle = "fill:#B48D7E;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "white") {
- s.skinColour = "#DAA782";
- s.areolaStyle = "fill:#9E7666;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light") {
- s.skinColour = "#DAA782";
- s.areolaStyle = "fill:#9E7666;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "lightened") {
- s.skinColour = "#DAA782";
- s.areolaStyle = "fill:#9E7666;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light olive") {
- s.skinColour = "#B27554";
- s.areolaStyle = "fill:#92684C;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "olive") {
- s.skinColour = "#B27554";
- s.areolaStyle = "fill:#92684C;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "natural") {
- s.skinColour = "#B6784E";
- s.areolaStyle = "fill:#8F5A45;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tanned") {
- s.skinColour = "#B6784E";
- s.areolaStyle = "fill:#8F5A45;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "bronzed") {
- s.skinColour = "#B6784E";
- s.areolaStyle = "fill:#8F5A45;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark olive") {
- s.skinColour = "#8B644F";
- s.areolaStyle = "fill:#7B5749;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark") {
- s.skinColour = "#775031";
- s.areolaStyle = "fill:#69452F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light brown") {
- s.skinColour = "#774A31";
- s.areolaStyle = "fill:#614330;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "brown") {
- s.skinColour = "#774A31";
- s.areolaStyle = "fill:#614330;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark brown") {
- s.skinColour = "#74523E";
- s.areolaStyle = "fill:#573F30;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "ebony") {
- s.skinColour = "#6B4B4B";
- s.areolaStyle = "fill:#473426;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "black") {
- s.skinColour = "#634F45";
- s.areolaStyle = "fill:#4D3A2E;";
- s.labiaStyle = "fill:#F977A3;";
- }
-
-} else if (artSlave.race == "asian" || artSlave.race == "surgically altered to look asian") {
- if (artSlave.skin == "pure white") {
- s.skinColour = "#FFF8EE";
- s.areolaStyle = "fill:#F7DBD0;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely pale") {
- s.skinColour = "#FFF8EE";
- s.areolaStyle = "fill:#F7DBD0;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "pale") {
- s.skinColour = "#F5E7DC";
- s.areolaStyle = "fill:#EABFB3;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely fair") {
- s.skinColour = "#F5E7DC";
- s.areolaStyle = "fill:#EABFB3;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "very fair") {
- s.skinColour = "#F5D4B5";
- s.areolaStyle = "fill:#CB988B;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "fair") {
- s.skinColour = "#F5D4B5";
- s.areolaStyle = "fill:#CB988B;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "white") {
- s.skinColour = "#F4D1A3";
- s.areolaStyle = "fill:#BA8E83;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light") {
- s.skinColour = "#F4D1A3";
- s.areolaStyle = "fill:#BA8E83;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "lightened") {
- s.skinColour = "#F4D1A3";
- s.areolaStyle = "fill:#BA8E83;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light olive") {
- s.skinColour = "#CFB48D";
- s.areolaStyle = "fill:#AC8074;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "olive") {
- s.skinColour = "#CFB48D";
- s.areolaStyle = "fill:#AC8074;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "natural") {
- s.skinColour = "#C38C4D";
- s.areolaStyle = "fill:#A67A6F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tanned") {
- s.skinColour = "#C38C4D";
- s.areolaStyle = "fill:#A67A6F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "bronzed") {
- s.skinColour = "#C38C4D";
- s.areolaStyle = "fill:#A67A6F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark olive") {
- s.skinColour = "#9A774A";
- s.areolaStyle = "fill:#855E4E;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark") {
- s.skinColour = "#855834";
- s.areolaStyle = "fill:#734B2F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light brown") {
- s.skinColour = "#83522B";
- s.areolaStyle = "fill:#68442A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "brown") {
- s.skinColour = "#83522B";
- s.areolaStyle = "fill:#68442A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark brown") {
- s.skinColour = "#724826";
- s.areolaStyle = "fill:#5C3D26;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "ebony") {
- s.skinColour = "#724826";
- s.areolaStyle = "fill:#5C3D26;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "black") {
- s.skinColour = "#583E2F";
- s.areolaStyle = "fill:#3F3A38;";
- s.labiaStyle = "fill:#F977A3;";
- }
-
-} else if (artSlave.race == "middle eastern" || artSlave.race == "surgically altered to look middle eastern") {
- if (artSlave.skin == "pure white") {
- s.skinColour = "#E8CFCF";
- s.areolaStyle = "fill:#DCADBC;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely pale") {
- s.skinColour = "#E8CFCF";
- s.areolaStyle = "fill:#DCADBC;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "pale") {
- s.skinColour = "#FBCCC6";
- s.areolaStyle = "fill:#E79E8B;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely fair") {
- s.skinColour = "#FBCCC6";
- s.areolaStyle = "fill:#E79E8B;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "very fair") {
- s.skinColour = "#EAAB92";
- s.areolaStyle = "fill:#D27B64;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "fair") {
- s.skinColour = "#EAAB92";
- s.areolaStyle = "fill:#D27B64;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "white") {
- s.skinColour = "#EDA571";
- s.areolaStyle = "fill:#B16854;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light") {
- s.skinColour = "#EDA571";
- s.areolaStyle = "fill:#B16854;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "lightened") {
- s.skinColour = "#EDA571";
- s.areolaStyle = "fill:#B16854;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light olive") {
- s.skinColour = "#CC8D53";
- s.areolaStyle = "fill:#A7624F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "olive") {
- s.skinColour = "#CC8D53";
- s.areolaStyle = "fill:#A7624F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "natural") {
- s.skinColour = "#CA7136";
- s.areolaStyle = "fill:#9B5959;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tanned") {
- s.skinColour = "#CA7136";
- s.areolaStyle = "fill:#9B5959;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "bronzed") {
- s.skinColour = "#CA7136";
- s.areolaStyle = "fill:#9B5959;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark olive") {
- s.skinColour = "#84684A";
- s.areolaStyle = "fill:#735143;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark") {
- s.skinColour = "#684528";
- s.areolaStyle = "fill:#563826;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light brown") {
- s.skinColour = "#6E4730";
- s.areolaStyle = "fill:#604534;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "brown") {
- s.skinColour = "#6E4730";
- s.areolaStyle = "fill:#604534;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark brown") {
- s.skinColour = "#604534";
- s.areolaStyle = "fill:#514039;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "ebony") {
- s.skinColour = "#604534 ";
- s.areolaStyle = "fill:#514039;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "black") {
- s.skinColour = "#583E2F";
- s.areolaStyle = "fill:#3F3A38;";
- s.labiaStyle = "fill:#F977A3;";
}
-} else if (artSlave.race == "amerindian" || artSlave.race == "surgically altered to look amerindian") {
- if (artSlave.skin == "pure white") {
- s.skinColour = "#FDE4BF";
- s.areolaStyle = "fill:#F0BEAA;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely pale") {
- s.skinColour = "#FDE4BF";
- s.areolaStyle = "fill:#F0BEAA;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "pale") {
- s.skinColour = "#F5E7DC";
- s.areolaStyle = "fill:#CDA499;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely fair") {
- s.skinColour = "#F5E7DC";
- s.areolaStyle = "fill:#CDA499;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "very fair") {
- s.skinColour = "#F5D4B5";
- s.areolaStyle = "fill:#CB988B;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "fair") {
- s.skinColour = "#F5D4B5";
- s.areolaStyle = "fill:#CB988B;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "white") {
- s.skinColour = "#F4D1A3";
- s.areolaStyle = "fill:#BA8E83;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light") {
- s.skinColour = "#F4D1A3";
- s.areolaStyle = "fill:#BA8E83;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "lightened") {
- s.skinColour = "#F4D1A3";
- s.areolaStyle = "fill:#BA8E83;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light olive") {
- s.skinColour = "#CFB48D";
- s.areolaStyle = "fill:#AC8074;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "olive") {
- s.skinColour = "#CFB48D";
- s.areolaStyle = "fill:#AC8074;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "natural") {
- s.skinColour = "#C38C4D";
- s.areolaStyle = "fill:#A67A6F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tanned") {
- s.skinColour = "#C38C4D";
- s.areolaStyle = "fill:#A67A6F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "bronzed") {
- s.skinColour = "#C38C4D";
- s.areolaStyle = "fill:#A67A6F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark olive") {
- s.skinColour = "#9A774A";
- s.areolaStyle = "fill:#855E4E;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark") {
- s.skinColour = "#855834";
- s.areolaStyle = "fill:#734B2F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light brown") {
- s.skinColour = "#83522B";
- s.areolaStyle = "fill:#68442A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "brown") {
- s.skinColour = "#83522B";
- s.areolaStyle = "fill:#68442A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark brown") {
- s.skinColour = "#724826";
- s.areolaStyle = "fill:#5C3D26;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "ebony") {
- s.skinColour = "#724826";
- s.areolaStyle = "fill:#5C3D26;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "black") {
- s.skinColour = "#583E2F";
- s.areolaStyle = "fill:#3F3A38;";
- s.labiaStyle = "fill:#F977A3;";
- }
-
-} else if (artSlave.race == "southern european" || artSlave.race == "surgically altered to look southern european") {
- if (artSlave.skin == "pure white") {
- s.skinColour = "#EBDBE4";
- s.areolaStyle = "fill:#FFE4E0;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely pale") {
- s.skinColour = "#EBDBE4";
- s.areolaStyle = "fill:#FFE4E0;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "pale") {
- s.skinColour = "#F0D0CC";
- s.areolaStyle = "fill:#EAACBA;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely fair") {
- s.skinColour = "#F0D0CC";
- s.areolaStyle = "fill:#EAACBA;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "very fair") {
- s.skinColour = "#F1C6B5";
- s.areolaStyle = "fill:#DCA2A9;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "fair") {
- s.skinColour = "#F1C6B5";
- s.areolaStyle = "fill:#DCA2A9;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "white") {
- s.skinColour = "#F2BC94";
- s.areolaStyle = "fill:#EE8280;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light") {
- s.skinColour = "#F2BC94";
- s.areolaStyle = "fill:#EE8280;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "lightened") {
- s.skinColour = "#F2BC94";
- s.areolaStyle = "fill:#EE8280;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light olive") {
- s.skinColour = "#DCA972";
- s.areolaStyle = "fill:#BF7577;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "olive") {
- s.skinColour = "#DCA972";
- s.areolaStyle = "fill:#BF7577;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "natural") {
- s.skinColour = "#D0814C";
- s.areolaStyle = "fill:#A96767;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tanned") {
- s.skinColour = "#D0814C";
- s.areolaStyle = "fill:#A96767;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "bronzed") {
- s.skinColour = "#D0814C";
- s.areolaStyle = "fill:#A96767;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark olive") {
- s.skinColour = "#937453";
- s.areolaStyle = "fill:#7F5A4B;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark") {
- s.skinColour = "#7F5431";
- s.areolaStyle = "fill:#734B2F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light brown") {
- s.skinColour = "#784F2F";
- s.areolaStyle = "fill:#583E2F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "brown") {
- s.skinColour = "#784F2F";
- s.areolaStyle = "fill:#583E2F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark brown") {
- s.skinColour = "#65422C";
- s.areolaStyle = "fill:#4A3A33;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "ebony") {
- s.skinColour = "#65422C";
- s.areolaStyle = "fill:#4A3A33;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "black") {
- s.skinColour = "#583E2F";
- s.areolaStyle = "fill:#3F3A38;";
- s.labiaStyle = "fill:#F977A3;";
- }
-
-} else if (artSlave.race == "semitic" || artSlave.race == "surgically altered to look semitic") {
- if (artSlave.skin == "pure white") {
- s.skinColour = "#E8CFCF";
- s.areolaStyle = "fill:#DCADBC;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely pale") {
- s.skinColour = "#E8CFCF";
- s.areolaStyle = "fill:#DCADBC;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "pale") {
- s.skinColour = "#FBCCC6";
- s.areolaStyle = "fill:#E79E8B;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely fair") {
- s.skinColour = "#FBCCC6";
- s.areolaStyle = "fill:#E79E8B;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "very fair") {
- s.skinColour = "#EAAB92";
- s.areolaStyle = "fill:#D27B64;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "fair") {
- s.skinColour = "#EAAB92";
- s.areolaStyle = "fill:#D27B64;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "white") {
- s.skinColour = "#EDA571";
- s.areolaStyle = "fill:#B16854;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light") {
- s.skinColour = "#EDA571";
- s.areolaStyle = "fill:#B16854;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "lightened") {
- s.skinColour = "#EDA571";
- s.areolaStyle = "fill:#B16854;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light olive") {
- s.skinColour = "#CC8D53";
- s.areolaStyle = "fill:#A7624F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "olive") {
- s.skinColour = "#CC8D53";
- s.areolaStyle = "fill:#A7624F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "natural") {
- s.skinColour = "#CA7136";
- s.areolaStyle = "fill:#9B5959;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tanned") {
- s.skinColour = "#CA7136";
- s.areolaStyle = "fill:#9B5959;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "bronzed") {
- s.skinColour = "#CA7136";
- s.areolaStyle = "fill:#9B5959;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark olive") {
- s.skinColour = "#84684A";
- s.areolaStyle = "fill:#735143;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark") {
- s.skinColour = "#684528";
- s.areolaStyle = "fill:#563826;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light brown") {
- s.skinColour = "#6E4730";
- s.areolaStyle = "fill:#604534;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "brown") {
- s.skinColour = "#6E4730";
- s.areolaStyle = "fill:#604534;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark brown") {
- s.skinColour = "#604534";
- s.areolaStyle = "fill:#514039;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "ebony") {
- s.skinColour = "#604534 ";
- s.areolaStyle = "fill:#514039;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "black") {
- s.skinColour = "#583E2F";
- s.areolaStyle = "fill:#3F3A38;";
- s.labiaStyle = "fill:#F977A3;";
- }
-
-} else if (artSlave.race == "malay" || artSlave.race == "surgically altered to look malay") {
- if (artSlave.skin == "pure white") {
- s.skinColour = "#FBD1B2";
- s.areolaStyle = "fill:#F39E7D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely pale") {
- s.skinColour = "#FBD1B2";
- s.areolaStyle = "fill:#F39E7D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "pale") {
- s.skinColour = "#E8B892";
- s.areolaStyle = "fill:#E2856C;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely fair") {
- s.skinColour = "#E8B892";
- s.areolaStyle = "fill:#E2856C;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "very fair") {
- s.skinColour = "#EA9870";
- s.areolaStyle = "fill:#BE6C56;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "fair") {
- s.skinColour = "#EA9870";
- s.areolaStyle = "fill:#BE6C56;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "white") {
- s.skinColour = "#EA9760";
- s.areolaStyle = "fill:#AB6755;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light") {
- s.skinColour = "#EA9760";
- s.areolaStyle = "fill:#AB6755;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "lightened") {
- s.skinColour = "#EA9760";
- s.areolaStyle = "fill:#AB6755;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light olive") {
- s.skinColour = "#BA855E";
- s.areolaStyle = "fill:#976051;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "olive") {
- s.skinColour = "#BA855E";
- s.areolaStyle = "fill:#976051;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "natural") {
- s.skinColour = "#A46138";
- s.areolaStyle = "fill:#8F5E51;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tanned") {
- s.skinColour = "#A46138";
- s.areolaStyle = "fill:#8F5E51;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "bronzed") {
- s.skinColour = "#A46138";
- s.areolaStyle = "fill:#8F5E51;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark olive") {
- s.skinColour = "#7C563C";
- s.areolaStyle = "fill:#70493A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark") {
- s.skinColour = "#804A28";
- s.areolaStyle = "fill:#5F3F27;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light brown") {
- s.skinColour = "#6F4523";
- s.areolaStyle = "fill:#623C20;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "brown") {
- s.skinColour = "#6F4523";
- s.areolaStyle = "fill:#623C20;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark brown") {
- s.skinColour = "#6F3E27";
- s.areolaStyle = "fill:#553823;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "ebony") {
- s.skinColour = "#6F3E27";
- s.areolaStyle = "fill:#553823;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "black") {
- s.skinColour = "#583E2F";
- s.areolaStyle = "fill:#3F3A38;";
- s.labiaStyle = "fill:#F977A3;";
- }
-
-} else if (artSlave.race == "indo-aryan" || artSlave.race == "surgically altered to look indo-aryan") {
- if (artSlave.skin == "pure white") {
- s.skinColour = "#F8D4BE";
- s.areolaStyle = "fill:#F8B6A4;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely pale") {
- s.skinColour = "#F8D4BE";
- s.areolaStyle = "fill:#F8B6A4;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "pale") {
- s.skinColour = "#EFCCAF";
- s.areolaStyle = "fill:#EA9B86;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely fair") {
- s.skinColour = "#EFCCAF";
- s.areolaStyle = "fill:#EA9B86;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "very fair") {
- s.skinColour = "#FCC49A";
- s.areolaStyle = "fill:#D29577;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "fair") {
- s.skinColour = "#FCC49A";
- s.areolaStyle = "fill:#D29577;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "white") {
- s.skinColour = "#E8B68E";
- s.areolaStyle = "fill:#D08661;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light") {
- s.skinColour = "#E8B68E";
- s.areolaStyle = "fill:#D08661;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "lightened") {
- s.skinColour = "#E8B68E";
- s.areolaStyle = "fill:#D08661;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light olive") {
- s.skinColour = "#C17848";
- s.areolaStyle = "fill:#C36E45;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "olive") {
- s.skinColour = "#C17848";
- s.areolaStyle = "fill:#C36E45;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "natural") {
- s.skinColour = "#C17848";
- s.areolaStyle = "fill:#A75A34;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tanned") {
- s.skinColour = "#C17848";
- s.areolaStyle = "fill:#A75A34;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "bronzed") {
- s.skinColour = "#C17848";
- s.areolaStyle = "fill:#A75A34;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark olive") {
- s.skinColour = "#83684B";
- s.areolaStyle = "fill:#715043;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark") {
- s.skinColour = "#8A593C";
- s.areolaStyle = "fill:#714931;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light brown") {
- s.skinColour = "#845834";
- s.areolaStyle = "fill:#614635;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "brown") {
- s.skinColour = "#845834";
- s.areolaStyle = "fill:#614635;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark brown") {
- s.skinColour = "#7C5842";
- s.areolaStyle = "fill:#5F4538;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "ebony") {
- s.skinColour = "#7C5842";
- s.areolaStyle = "fill:#5F4538;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "black") {
- s.skinColour = "#6B5449";
- s.areolaStyle = "fill:#473C37;";
- s.labiaStyle = "fill:#F977A3;";
- }
-
-} else if (artSlave.race == "pacific islander" || artSlave.race == "surgically altered to look pacific islander") {
- if (artSlave.skin == "pure white") {
- s.skinColour = "#FBD1B2";
- s.areolaStyle = "fill:#F39E7D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely pale") {
- s.skinColour = "#FBD1B2";
- s.areolaStyle = "fill:#F39E7D;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "pale") {
- s.skinColour = "#E8B892";
- s.areolaStyle = "fill:#E2856C;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely fair") {
- s.skinColour = "#E8B892";
- s.areolaStyle = "fill:#E2856C;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "very fair") {
- s.skinColour = "#EA9870";
- s.areolaStyle = "fill:#BE6C56;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "fair") {
- s.skinColour = "#EA9870";
- s.areolaStyle = "fill:#BE6C56;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "white") {
- s.skinColour = "#EA9760";
- s.areolaStyle = "fill:#AB6755;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light") {
- s.skinColour = "#EA9760";
- s.areolaStyle = "fill:#AB6755;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "lightened") {
- s.skinColour = "#EA9760";
- s.areolaStyle = "fill:#AB6755;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light olive") {
- s.skinColour = "#BA855E";
- s.areolaStyle = "fill:#976051;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "olive") {
- s.skinColour = "#BA855E";
- s.areolaStyle = "fill:#976051;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "natural") {
- s.skinColour = "#A46138";
- s.areolaStyle = "fill:#8F5E51;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tanned") {
- s.skinColour = "#A46138";
- s.areolaStyle = "fill:#8F5E51;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "bronzed") {
- s.skinColour = "#A46138";
- s.areolaStyle = "fill:#8F5E51;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark olive") {
- s.skinColour = "#7C563C";
- s.areolaStyle = "fill:#70493A;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark") {
- s.skinColour = "#804A28";
- s.areolaStyle = "fill:#5F3F27;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light brown") {
- s.skinColour = "#6F4523";
- s.areolaStyle = "fill:#623C20;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "brown") {
- s.skinColour = "#6F4523";
- s.areolaStyle = "fill:#623C20;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark brown") {
- s.skinColour = "#6F3E27";
- s.areolaStyle = "fill:#553823;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "ebony") {
- s.skinColour = "#6F3E27";
- s.areolaStyle = "fill:#553823;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "black") {
- s.skinColour = "#583E2F";
- s.areolaStyle = "fill:#3F3A38;";
- s.labiaStyle = "fill:#F977A3;";
- }
-
-} else if (artSlave.race == "mixed race" || artSlave.race == "surgically altered to look mixed race") {
- if (artSlave.skin == "pure white") {
- s.skinColour = "#FEE5CC";
- s.areolaStyle = "fill:#E3BBAB;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely pale") {
- s.skinColour = "#FEE5CC";
- s.areolaStyle = "fill:#E3BBAB;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "pale") {
- s.skinColour = "#E6C2B0";
- s.areolaStyle = "fill:#D1A695;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "extremely fair") {
- s.skinColour = "#E6C2B0";
- s.areolaStyle = "fill:#D1A695;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "very fair") {
- s.skinColour = "#E1B59F";
- s.areolaStyle = "fill:#B48D7E;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "fair") {
- s.skinColour = "#E1B59F";
- s.areolaStyle = "fill:#B48D7E;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "white") {
- s.skinColour = "#DAA782";
- s.areolaStyle = "fill:#9E7666;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light") {
- s.skinColour = "#DAA782";
- s.areolaStyle = "fill:#9E7666;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "lightened") {
- s.skinColour = "#DAA782";
- s.areolaStyle = "fill:#9E7666;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light olive") {
- s.skinColour = "#B27554";
- s.areolaStyle = "fill:#92684C;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "olive") {
- s.skinColour = "#B27554";
- s.areolaStyle = "fill:#92684C;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "natural") {
- s.skinColour = "#B6784E";
- s.areolaStyle = "fill:#8F5A45;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "tanned") {
- s.skinColour = "#B6784E";
- s.areolaStyle = "fill:#8F5A45;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "bronzed") {
- s.skinColour = "#B6784E";
- s.areolaStyle = "fill:#8F5A45;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark olive") {
- s.skinColour = "#8B644F";
- s.areolaStyle = "fill:#7B5749;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark") {
- s.skinColour = "#775031";
- s.areolaStyle = "fill:#69452F;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "light brown") {
- s.skinColour = "#774A31";
- s.areolaStyle = "fill:#5E4434;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "brown") {
- s.skinColour = "#774A31";
- s.areolaStyle = "fill:#5E4434;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "dark brown") {
- s.skinColour = "#74523E";
- s.areolaStyle = "fill:#574135;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "ebony") {
- s.skinColour = "#6B4B4B";
- s.areolaStyle = "fill:#413228;";
- s.labiaStyle = "fill:#F977A3;";
- } else if (artSlave.skin == "black") {
- s.skinColour = "#634F45";
- s.areolaStyle = "fill:#4E3C32;";
- s.labiaStyle = "fill:#F977A3;";
- }
-}
+ var colorSlave = skinColorCatcher(artSlave);
+ s.areolaStyle = colorSlave.areolaColor;
+ s.labiaStyle = colorSlave.labiaColor;
+ s.skinColour = colorSlave.skinColor;
/* BEGIN SKIN COLOUR OVERRIDES FOR LATEX CLOTHING EMULATION */
diff --git a/src/art/vector_revamp/vectorRevampedArtControlJS.tw b/src/art/vector_revamp/vectorRevampedArtControlJS.tw
index 3923aa4f694330933d2c7ad024e9b8e6b1f00da6..c0d642425f9e46b49a6eec9b14a1fd1c83dec9c5 100644
--- a/src/art/vector_revamp/vectorRevampedArtControlJS.tw
+++ b/src/art/vector_revamp/vectorRevampedArtControlJS.tw
@@ -126,100 +126,7 @@ class ArtStyleControl {
}
}
- parseColorFromName(colorName) {
- if (colorName == null)
- return "#000000";
-
- var colorPalette = [
- ["auburn", "#7e543e"],
- ["black", "#3F4040"],
- ["blonde", "#F4F1A3"],
- ["blue", "#4685C5"],
- ["brown", "#8D4F21"],
- ["burgundy", "#5f3946"],
- ["chestnut", "#663622"],
- ["chocolate", "#6e4937"],
- ["copper", "#a16145"],
- ["dark brown", "#463325"],
- ["ginger", "#da822d"],
- ["golden", "#ffdf31"],
- ["green", "#5FBA46"],
- ["grey", "#9e9fa4"],
- ["hazel", "#8d6f1f"],
- ["pink", "#D18CBC"],
- ["platinum blonde", "#fcf3c1"],
- ["red", "#BB2027"],
- ["deep red", "#6D1318"],
- ["blue-violet", "#8790B7"],
- ["silver", "#cdc9c6"],
- ["strawberry-blonde", "#e5a88c"],
- ["blazing red", "#E00E2B"],
- ["neon green", "#25d12b"],
- ["neon blue", "#2284C3"],
- ["neon pink", "#cc26aa"],
- ["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"],
- ];
-
- 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"],
- ["tiger striped", "#e0d050"]
- ];
-
- var lipsPaletteMap = new Map(lipsPalette);
- colorName = colorName.toLowerCase();
- var colorValue = lipsPaletteMap.get(colorName);
- if (!colorValue) {
- return this.parseColorFromName(colorName);
- }
-
- return colorValue;
- }
-
+ /*currently unused, keeping for color reference - */
parseSkinColorFromName(colorName) {
if (colorName == null)
return "#000000";
@@ -243,6 +150,8 @@ class ArtStyleControl {
["dyed red", "#bc4949"],
["dyed green", "#A6C373"],
["dyed blue", "#5b8eb7"],
+ ["dyed pink", "#fe62b0"],
+ ["dyed gray", "#bdbdbd"],
["tiger striped", "#e2d75d"]
];
@@ -255,13 +164,16 @@ class ArtStyleControl {
return colorValue;
}
+ /* - currently unused, keeping for color reference*/
initDefaultValues() {
+ var colorSlave = skinColorCatcher(this.artSlave);
+
this.white = new ArtStyleEntry("white");
this.white.fill = "#FFFFFF";
this.skin = new ArtStyleEntry("skin");
- this.skin.fill = this.parseSkinColorFromName(this.artSlave.skin);
+ this.skin.fill = colorSlave.skinColor;
this.arm = new ArtStyleEntry("arm.skin");
this.arm.fill = this.skin.fill;
@@ -282,13 +194,13 @@ class ArtStyleControl {
this.scrotum.fill = this.skin.fill;
this.areola = new ArtStyleEntry("areola");
- this.areola.fill = this.getLipsColorBySkinColorName(this.artSlave.skin);
+ this.areola.fill = colorSlave.areolaColor;
this.labia = new ArtStyleEntry("labia");
- this.labia.fill = this.areola.fill;
+ this.labia.fill = colorSlave.labiaColor;
this.hair = new ArtStyleEntry("hair");
- this.hair.fill = this.parseColorFromName(this.artSlave.hColor);
+ this.hair.fill = extractHairColor(this.artSlave.hColor);
this.shoe = new ArtStyleEntry("shoe");
this.shoe.fill = "#3E65B0";
@@ -319,14 +231,14 @@ class ArtStyleControl {
this.glasses.fill = "#010101";
this.lips = new ArtStyleEntry("lips");
- this.lips.fill = this.getLipsColorBySkinColorName(this.artSlave.skin);
+ this.lips.fill = colorSlave.lipsColor;
this.lips["fill-opacity"] = 0.6;
this.eyeball = new ArtStyleEntry("eyeball");
this.eyeball.fill = "#dfdfdf";
this.iris = new ArtStyleEntry("iris");
- this.iris.fill = this.parseColorFromName(this.artSlave.eyeColor);
+ this.iris.fill = extractHairColor(this.artSlave.eyeColor);
this.highlight1 = new ArtStyleEntry("highlight1");
this.highlight1.fill = "#ffffff";
@@ -342,10 +254,10 @@ class ArtStyleControl {
this.highlightStrong.fill = "#ffffff";
this.armpitHair = new ArtStyleEntry("armpit_hair");
- this.armpitHair.fill = this.parseColorFromName(this.artSlave.underArmHColor);
+ this.armpitHair.fill = extractHairColor(this.artSlave.underArmHColor);
this.pubicHair = new ArtStyleEntry("pubic_hair");
- this.pubicHair.fill = this.parseColorFromName(this.artSlave.pubicHColor);
+ this.pubicHair.fill = extractHairColor(this.artSlave.pubicHColor);
this.bellyDetails = new ArtStyleEntry("belly_details");
this.bellyDetails["fill-opacity"] = 1;
@@ -1808,4 +1720,3 @@ class RevampedArtControl {
window.getVectorArtRevampedControl = function(artDisplayClass, artSlave, globalShowHighlights, globalShowBodyMods) {
return new RevampedArtControl(artDisplayClass, artSlave, globalShowHighlights, globalShowBodyMods);
};
-
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index d7d144ced0ec3f30c003f5099ff698eea6ce400b..20541a917531f38f1c0aa6084ef07cccc7bd0088 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -101,11 +101,11 @@
<<radiobutton "$activeSlave.race" "white">> White
<<radiobutton "$activeSlave.race" "asian">> Asian
<<radiobutton "$activeSlave.race" "latina">> Latina
-<<radiobutton "$activeSlave.race" "middle eastern">> Middle eastern
+<<radiobutton "$activeSlave.race" "middle eastern">> Middle Eastern
<<radiobutton "$activeSlave.race" "black">> Black
<<radiobutton "$activeSlave.race" "semitic">> Semitic
<<radiobutton "$activeSlave.race" "southern european">> Southern European
-<<radiobutton "$activeSlave.race" "indo-aryan">> Indo-aryan
+<<radiobutton "$activeSlave.race" "indo-aryan">> Indo-Aryan
<<radiobutton "$activeSlave.race" "amerindian">> Amerindian
<<radiobutton "$activeSlave.race" "pacific islander">> Pacific Islander
<<radiobutton "$activeSlave.race" "malay">> Malay
@@ -116,17 +116,28 @@
''Skin color: ($activeSlave.skin)''
<<textbox "$activeSlave.skin" $activeSlave.skin>>
<br>
+<<radiobutton "$activeSlave.skin" "pure white">> Pure White
<<radiobutton "$activeSlave.skin" "extremely pale">> Extremely Pale
<<radiobutton "$activeSlave.skin" "pale">> Pale
+<<radiobutton "$activeSlave.skin" "extremely fair">> Extremely Fair
+<<radiobutton "$activeSlave.skin" "very fair">> Very Fair
<<radiobutton "$activeSlave.skin" "fair">> Fair
+<<radiobutton "$activeSlave.skin" "white">> White
<<radiobutton "$activeSlave.skin" "light">> Light
+<<radiobutton "$activeSlave.skin" "lightened">> Lightened
<<radiobutton "$activeSlave.skin" "light olive">> Light Olive
+<<radiobutton "$activeSlave.skin" "olive">> Olive
+<<radiobutton "$activeSlave.skin" "natural">> Natural
<<radiobutton "$activeSlave.skin" "tanned">> Tanned
+<<radiobutton "$activeSlave.skin" "bronzed">> Bronzed
<<radiobutton "$activeSlave.skin" "dark olive">> Dark Olive
<<radiobutton "$activeSlave.skin" "dark">> Dark
+<<radiobutton "$activeSlave.skin" "light brown">> Light Brown
<<radiobutton "$activeSlave.skin" "brown">> Brown
<<radiobutton "$activeSlave.skin" "dark brown">> Dark Brown
<<radiobutton "$activeSlave.skin" "black">> Black
+<<radiobutton "$activeSlave.skin" "ebony">> Ebony
+<<radiobutton "$activeSlave.skin" "pure black">> Pure Black
<br>
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 6c2ee4d2a754c390ab0a7d7d2aaef5f8b049a29c..16932939b332460bc0267e395f2085f017eb6da0 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -1199,17 +1199,28 @@
''Skin color: (@@.yellow;$tempSlave.skin@@)''
<<textbox "$tempSlave.skin" $tempSlave.skin>>
<br>
- <<radiobutton "$tempSlave.skin" "white">> White
+ <<radiobutton "$tempSlave.skin" "pure white">> Pure White
+ <<radiobutton "$tempSlave.skin" "extremely pale">> Extremely Pale
<<radiobutton "$tempSlave.skin" "pale">> Pale
+ <<radiobutton "$tempSlave.skin" "extremely fair">> Extremely Fair
+ <<radiobutton "$tempSlave.skin" "very fair">> Very Fair
<<radiobutton "$tempSlave.skin" "fair">> Fair
+ <<radiobutton "$tempSlave.skin" "white">> White
<<radiobutton "$tempSlave.skin" "light">> Light
+ <<radiobutton "$tempSlave.skin" "lightened">> Lightened
<<radiobutton "$tempSlave.skin" "light olive">> Light Olive
+ <<radiobutton "$tempSlave.skin" "olive">> Olive
+ <<radiobutton "$tempSlave.skin" "natural">> Natural
<<radiobutton "$tempSlave.skin" "tanned">> Tanned
+ <<radiobutton "$tempSlave.skin" "bronzed">> Bronzed
<<radiobutton "$tempSlave.skin" "dark olive">> Dark Olive
<<radiobutton "$tempSlave.skin" "dark">> Dark
+ <<radiobutton "$tempSlave.skin" "light brown">> Light Brown
<<radiobutton "$tempSlave.skin" "brown">> Brown
<<radiobutton "$tempSlave.skin" "dark brown">> Dark Brown
<<radiobutton "$tempSlave.skin" "black">> Black
+ <<radiobutton "$tempSlave.skin" "ebony">> Ebony
+ <<radiobutton "$tempSlave.skin" "pure black">> Pure Black
<br>
<</widget>>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 7b18ef63fde7b037b6b782c052b18e4624aebfd4..6a84efcf7d0db84fb3e2d10abeadaf32d6b92fcf 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -545,18 +545,28 @@ __''Player Character''__
[[Mixed Race|Intro Summary][$PC.race = "mixed race"]]
<br>__Skin tone:__
+ [[Pure White|Intro Summary][$PC.skin = "pure white"]] |
[[Extremely Pale|Intro Summary][$PC.skin = "extremely pale"]] |
[[Pale|Intro Summary][$PC.skin = "pale"]] |
+ [[Extremely Fair|Intro Summary][$PC.skin = "extremely fair"]] |
+ [[Very Fair|Intro Summary][$PC.skin = "very fair"]] |
[[Fair|Intro Summary][$PC.skin = "fair"]] |
[[White|Intro Summary][$PC.skin = "white"]] |
[[Light|Intro Summary][$PC.skin = "light"]] |
+ [[Lightened|Intro Summary][$PC.skin = "lightened"]] |
[[Light Olive|Intro Summary][$PC.skin = "light olive"]] |
+ [[Olive|Intro Summary][$PC.skin = "olive"]] |
+ [[Natural|Intro Summary][$PC.skin = "natural"]] |
[[Tanned|Intro Summary][$PC.skin = "tanned"]] |
+ [[Bronzed|Intro Summary][$PC.skin = "bronzed"]] |
[[Dark Olive|Intro Summary][$PC.skin = "dark olive"]] |
[[Dark|Intro Summary][$PC.skin = "dark"]] |
+ [[Light Brown|Intro Summary][$PC.skin = "light brown"]] |
[[Brown|Intro Summary][$PC.skin = "brown"]] |
[[Dark Brown|Intro Summary][$PC.skin = "dark brown"]] |
- [[Black|Intro Summary][$PC.skin = "black"]]
+ [[Black|Intro Summary][$PC.skin = "black"]] |
+ [[Ebony|Intro Summary][$PC.skin = "ebony"]] |
+ [[Pure Black|Intro Summary][$PC.skin = "pure black"]]
<<switch $PC.markings>>
<<case "freckles">>
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index d602be734fa92acfbf3b507f18a9595c1eb66171..066641375f56f33088b956ffb71a0777a7fc7599 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -267,7 +267,7 @@
<<set setup.pettyCriminalPool = ["robbery", "armed robbery", "murder", "arson", "burglary", "cat burglar", "petty theft", "theft", "pickpocketing", "manslaughter", "blackmail", "assault", "battery", "tax evasion", "rape", "child molestation", "child abuse", "domestic abuse", "illegal immigrant", "mule"]>>
-<<set setup.gangCriminalPool = ["mule", "arms smuggler", "drug smuggler", "smuggler", "fence", "gang murderer", "gang assulter", "gang bruiser", "gang theif", "drug peddler", "hitman", "assassin", "murder", "manslaughter", "attempted murder"]>>
+<<set setup.gangCriminalPool = ["mule", "arms smuggler", "drug smuggler", "smuggler", "fence", "gang murderer", "gang assulter", "gang bruiser", "gang thief", "drug peddler", "hitman", "assassin", "murder", "manslaughter", "attempted murder"]>>
<<set setup.whiteCollarCriminalPool = ["racketeering", "bribery", "blackmail", "embezzlement", "fraud", "tax evasion", "malpractice", "abuse of power"]>>
diff --git a/src/js/dTree.min.tw b/src/js/dTree.min.tw
index e423182a0cd91f4ceb75c13b748e267719531a9a..0338634d37402e3d1f61486acc658ac3725df6d4 100644
--- a/src/js/dTree.min.tw
+++ b/src/js/dTree.min.tw
@@ -150,4 +150,3 @@ this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this.
function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var _createClass=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}();!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.dTree=t()}(this,function(){"use strict";var e=function(){function e(t,n,r){_classCallCheck(this,e),e.DEBUG_LEVEL=r.debug?1:0,this.root=t,this.siblings=n,this.opts=r,this.allNodes=this._flatten(this.root);var a=_.filter(this.allNodes,function(e){return!e.hidden});this.nodeSize=r.callbacks.nodeSize(a,r.nodeWidth,r.callbacks.textRenderer)}return _createClass(e,[{key:"create",value:function(){var e=this.opts,t=(this.allNodes,this.nodeSize),n=e.width+e.margin.left+e.margin.right,r=e.height+e.margin.top+e.margin.bottom,a=d3.zoom().scaleExtent([.1,10]).on("zoom",function(){i.attr("transform",d3.event.transform.translate(n/2,0))}),i=this.svg=d3.select(e.target).append("svg").attr("width",n).attr("height",r).call(a).append("g").attr("transform","translate("+n/2+",0)");this.tree=d3.tree().nodeSize([2*t[0],2.5*t[1]]),this.tree.separation(function(e,t){return e.data.hidden||t.data.hidden?.3:.6}),this._update(this.root)}},{key:"_update",value:function(e){var t=this.opts,n=(this.allNodes,this.nodeSize),r=this.tree(e),a=r.links();this.svg.selectAll(".link").data(a).enter().filter(function(e){return!e.target.data.noParent}).append("path").attr("class",t.styles.linage).attr("d",this._elbow);var i=this.svg.selectAll(".node").data(r.descendants()).enter();this._linkSiblings(),this.svg.selectAll(".sibling").data(this.siblings).enter().append("path").attr("class",t.styles.marriage).attr("d",_.bind(this._siblingLine,this)),i.append("foreignObject").filter(function(e){return!e.data.hidden}).attr("x",function(e){return e.x-e.cWidth/2+"px"}).attr("y",function(e){return e.y-e.cHeight/2+"px"}).attr("width",function(e){return e.cWidth+"px"}).attr("height",function(e){return e.cHeight+"px"}).attr("id",function(e){return e.id}).html(function(e){return t.callbacks.nodeRenderer(e.data.name,e.x,e.y,n[0],n[1],e.data.extra,e.data.id,e.data["class"],e.data.textClass,t.callbacks.textRenderer)}).on("click",function(e){e.data.hidden||t.callbacks.nodeClick(e.data.name,e.data.extra,e.data.id)})}},{key:"_flatten",value:function(e){function t(e){e.children&&e.children.forEach(t),e.id||(e.id=++r),n.push(e)}var n=[],r=0;return t(e),n}},{key:"_elbow",value:function(e,t){if(e.target.data.noParent)return"M0,0L0,0";var n=e.target.y+.5*(e.source.y-e.target.y),r=[{x:e.target.x,y:e.target.y},{x:e.target.x,y:n},{x:e.source.x,y:e.source.y}],a=d3.line().curve(d3.curveStepAfter).x(function(e){return e.x}).y(function(e){return e.y});return a(r)}},{key:"_linkSiblings",value:function(){var e=this.allNodes;_.forEach(this.siblings,function(t){var n=e.filter(function(e){return t.source.id==e.data.id}),r=e.filter(function(e){return t.target.id==e.data.id});t.source.x=n[0].x,t.source.y=n[0].y,t.target.x=r[0].x,t.target.y=r[0].y})}},{key:"_siblingLine",value:function(e,t){var n=e.target.y+.5*(e.source.y-e.target.y),r=this.nodeSize[0],a=this.nodeSize[1];e.number>0&&(n-=8*a/10);var i=[{x:e.source.x,y:e.source.y},{x:e.source.x+6*r/10,y:e.source.y},{x:e.source.x+6*r/10,y:n},{x:e.target.x-6*r/10,y:n},{x:e.target.x-6*r/10,y:e.target.y},{x:e.target.x,y:e.target.y}],s=d3.line().curve(d3.curveStepAfter).x(function(e){return e.x}).y(function(e){return e.y});return s(i)}}],[{key:"_nodeSize",value:function(e,t,n){var r=0,a=document.createElement("svg");return document.body.appendChild(a),_.map(e,function(e){var i=document.createElement("div");i.setAttribute("class",e.data["class"]),i.style.visibility="hidden",i.style.maxWidth=t+"px";var s=n(e.data.name,e.data.extra,e.data.textClass);i.innerHTML=s,a.appendChild(i);var o=16;a.removeChild(i),r=Math.max(r,o),e.cHeight=o,e.cWidth=t}),document.body.removeChild(a),[t,r]}},{key:"_nodeRenderer",value:function(e,t,n,r,a,i,s,o,d,c){var l="";return l+="<div ",l+='style="height:100%;width:100%;" ',l+='class="'+o+'" ',l+='id="node'+s+'">\n',l+=c(e,i,d),l+="</div>"}},{key:"_textRenderer",value:function(e,t,n){var r="";return r+="<p ",r+='align="center" ',r+='class="'+n+'">\n',r+=e,r+="</p>\n"}},{key:"_debug",value:function(t){e.DEBUG_LEVEL>0&&console.log(t)}}]),e}(),t={VERSION:"2.0.1",init:function(t){var n=arguments.length<=1||void 0===arguments[1]?{}:arguments[1],r=_.defaultsDeep(n||{},{target:"#graph",debug:!1,width:600,height:600,callbacks:{nodeClick:function(e,t,n){},nodeRenderer:function(t,n,r,a,i,s,o,d,c,l){return e._nodeRenderer(t,n,r,a,i,s,o,d,c,l)},nodeSize:function(t,n,r){return e._nodeSize(t,n,r)},nodeSorter:function(e,t,n,r){return 0},textRenderer:function(t,n,r){return e._textRenderer(t,n,r)}},margin:{top:0,right:0,bottom:0,left:0},nodeWidth:100,styles:{node:"node",linage:"linage",marriage:"marriage",text:"nodeText"}}),t=this._preprocess(t,r),a=new e(t.root,t.siblings,r);a.create()},_preprocess:function(e,n){var r=[],a=0,i={name:"",id:a++,hidden:!0,children:[]},s=function o(e,s){var d={name:e.name,id:a++,hidden:!1,children:[],extra:e.extra,textClass:e.textClass?e.textClass:n.styles.text,"class":e["class"]?e["class"]:n.styles.node};s==i&&(d.noParent=!0);for(var c=0;c<e.depthOffset;c++){var l={name:"",id:a++,hidden:!0,children:[],noParent:d.noParent};s.children.push(l),s=l}t._sortPersons(e.children,n),_.forEach(e.children,function(e){o(e,d)}),s.children.push(d),t._sortMarriages(e.marriages,n),_.forEach(e.marriages,function(e,i){var c={name:"",id:a++,hidden:!0,noParent:!0,children:[],extra:e.extra},l=e.spouse,u={name:l.name,id:a++,hidden:!1,noParent:!0,children:[],textClass:l.textClass?l.textClass:n.styles.text,"class":l["class"]?l["class"]:n.styles.node,extra:l.extra};s.children.push(c,u),t._sortPersons(e.children,n),_.forEach(e.children,function(e){o(e,c)}),r.push({source:{id:d.id},target:{id:u.id},number:i})})};return _.forEach(e,function(e){s(e,i)}),{root:d3.hierarchy(i),siblings:r}},_sortPersons:function(e,t){return void 0!=e&&e.sort(function(e,n){return t.callbacks.nodeSorter(e.name,e.extra,n.name,n.extra)}),e},_sortMarriages:function(e,t){return void 0!=e&&Array.isArray(e)&&e.sort(function(e,n){var r=e.spouse,a=n.spouse;return t.callbacks.nodeSorter(r.name,r.extra,a.name,a.extra)}),e}};return t});
}).call(window,window)
-
diff --git a/src/js/hTagMacroJS.tw b/src/js/hTagMacroJS.tw
index 9a8f8cac6a40b72cdaff7712be0601065906e96f..4678c57730faaefc00683060b51fe5d9b94d9907 100644
--- a/src/js/hTagMacroJS.tw
+++ b/src/js/hTagMacroJS.tw
@@ -11,8 +11,8 @@
*
* Usage: <<htag id>>...<</htag>>
* Usage: <<htag id tag>>...<</htag>>
- * Usage: <<htag atributes>>...<</htag>>
- * Usage: <<htag atributes tag>>...<</htag>>
+ * Usage: <<htag attributes>>...<</htag>>
+ * Usage: <<htag attributes tag>>...<</htag>>
*/
Macro.add('htag', {
tags: null,
diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw
index 5d52879de2ae2c9f28a25e235987cc112cc749a6..20efeb2f4ce44e61478e92e5316272ab7b79de14 100644
--- a/src/js/rulesAssistantOptions.tw
+++ b/src/js/rulesAssistantOptions.tw
@@ -1,7 +1,7 @@
:: Rules Assistant Options [script]
// rewrite of the rules assistant options page in javascript
// uses an object-oriented widget pattern
-// wrapped in a closure so as not to polute the global namespace
+// wrapped in a closure so as not to pollute the global namespace
// the widgets are generic enough to be reusable; if similar user interfaces are ported to JS, we could move the classes to the global scope
window.rulesAssistantOptions = (function() {
@@ -3183,7 +3183,9 @@ window.rulesAssistantOptions = (function() {
["dyed red"],
["dyed green"],
["dyed blue"],
- ["tiger triped"],
+ ["dyed pink"],
+ ["dyed gray"],
+ ["tiger striped"],
["camouflage patterned"],
]
super("Dye or tan skin", items);
diff --git a/src/js/slaveSummaryWidgets.tw b/src/js/slaveSummaryWidgets.tw
index af2bb48c758c373609872370fd9774c5a8757a5a..5d674c3320b34b63fa1fd0d79d78666f52830e8a 100644
--- a/src/js/slaveSummaryWidgets.tw
+++ b/src/js/slaveSummaryWidgets.tw
@@ -1731,6 +1731,18 @@ window.SlaveSummaryUncached = (function(){
function short_skin(slave) {
r += `<span class="pink">`;
switch (slave.skin) {
+ case "pure white":
+ r += `P. Whi`;
+ break;
+ case "extremely fair":
+ r += `E. Fai`;
+ break;
+ case "very fair":
+ r += `V. Fai`;
+ break;
+ case "extremely pale":
+ r += `E. Pal`;
+ break;
case "light brown":
r += `L. Br`;
break;
@@ -1743,15 +1755,27 @@ window.SlaveSummaryUncached = (function(){
case "dark olive":
r += `D. Oli`;
break;
- case "extremely pale":
- r += `Ex. Pa`;
- break;
case "pure white":
r += `P. Whi`;
break;
+ case "lightened":
+ r += `Ltnd`;
+ break;
case "tanned":
r += `Tan`;
break;
+ case "natural":
+ r += `Nat`;
+ break;
+ case "bronzed":
+ r += `Bron`;
+ break;
+ case "ebony":
+ r += `Ebon`;
+ break;
+ case "pure black":
+ r += `P. Bla`;
+ break;
case "dark":
case "fair":
case "pale":
diff --git a/src/js/wombJS.tw b/src/js/wombJS.tw
index 134ddea6cfe46358bcbd805a4b6ca0fa9a6c4006..412282dc17cef3048cb9c6f86d8265db17338531 100644
--- a/src/js/wombJS.tw
+++ b/src/js/wombJS.tw
@@ -276,7 +276,7 @@ window.WombZeroID = function(actor, id) {
WombNormalizePreg(actor);
};
-/* Sorts the womb object by age with oldest and thus soonest to be born, first. This will be needed in the future once individual fertilization is a possiblity.*/
+/* Sorts the womb object by age with oldest and thus soonest to be born, first. This will be needed in the future once individual fertilization is a possibility.*/
window.WombSort = function(actor) {
actor.womb.sort((a, b) => { return b.age - a.age; });
};
diff --git a/src/npc/fSlaveImpregConsummate.tw b/src/npc/fSlaveImpregConsummate.tw
index c7999ee6f1b122e18b42cb7271de686d1b596be6..6690ab090b55a70a559f9b7e09d46fa4b0cfa32c 100644
--- a/src/npc/fSlaveImpregConsummate.tw
+++ b/src/npc/fSlaveImpregConsummate.tw
@@ -301,13 +301,15 @@ $activeSlave.slaveName and $impregnatrix.slaveName are likely to produce
<<if ($activeSlave.race == "white") && ($impregnatrix.race == "white")>>
a pure white,
<<elseif ($activeSlave.race == "asian") && ($impregnatrix.race == "asian")>>
- an asian,
+ a pure Asian,
<<elseif ($activeSlave.race == "latina") && ($impregnatrix.race == "latina")>>
- a latina,
+ a pure latina,
<<elseif ($activeSlave.race == "black") && ($impregnatrix.race == "black")>>
- a black,
-<<elseif ($activeSlave.race == "arab") && ($impregnatrix.race == "arab")>>
+ a pure black,
+<<elseif ($activeSlave.race == "middle eastern") && ($impregnatrix.race == "middle eastern")>>
a pure Middle Eastern,
+<<elseif ($activeSlave.race == "malay") && ($impregnatrix.race == "malay")>>
+ a pure malay,
<<elseif ($activeSlave.race == "white") && ($impregnatrix.race == "black")>>
a mulatto,
<<elseif ($activeSlave.race == "black") && ($impregnatrix.race == "white")>>
@@ -317,19 +319,25 @@ $activeSlave.slaveName and $impregnatrix.slaveName are likely to produce
<<elseif ($activeSlave.race == "latina") && ($impregnatrix.race == "white")>>
a mestizo,
<<elseif ($activeSlave.race == "asian") && ($impregnatrix.race == "black")>>
- an afro-asian,
+ an Afro-Asian,
<<elseif ($activeSlave.race == "black") && ($impregnatrix.race == "asian")>>
- an afro-asian,
-<<elseif ($activeSlave.race == "arab") && ($impregnatrix.race == "black")>>
- an afro-arab,
-<<elseif ($activeSlave.race == "black") && ($impregnatrix.race == "arab")>>
- an afro-arab,
+ an Afro-Asian,
+<<elseif ($activeSlave.race == "middle eastern") && ($impregnatrix.race == "black")>>
+ an Afro-Arab,
+<<elseif ($activeSlave.race == "black") && ($impregnatrix.race == "middle eastern")>>
+ an Afro-Arab,
+<<elseif ($activeSlave.race == "indo-aryan") && ($impregnatrix.race == "black")>>
+ an Afro-Indian,
+<<elseif ($activeSlave.race == "black") && ($impregnatrix.race == "indo-aryan")>>
+ an Afro-Indian,
<<elseif ($activeSlave.race == "amerindian") && ($impregnatrix.race == "white")>>
a mestizo,
<<elseif ($activeSlave.race == "white") && ($impregnatrix.race == "amerindian")>>
a mestizo,
-<<elseif ($activeSlave.race == $impregnatrix.race)>>
+<<elseif ($activeSlave.race == $impregnatrix.race) && ($activeSlave.race !== "mixed race") && ($impregnatrix.race !== "mixed race")>>
an ethnically pure,
+<<elseif ($activeSlave.race !== $impregnatrix.race) && ($activeSlave.race !== "mixed race") && ($impregnatrix.race !== "mixed race")>>
+ a biracial,
<<else>>
mixed ethnicity,
<</if>>
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 3c2359eb6bea4d22101c8222be5511ce6ea4f378..a89322ead770f947d95d65e18e3a79a9e034e09f 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -682,17 +682,28 @@ Her nationality is $activeSlave.nationality.
<br>''Skin color:'' <span id="skin"><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">></span>
<br>
+<<link "Pure White">><<set $activeSlave.skin = "pure white">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Extremely Pale">><<set $activeSlave.skin = "extremely pale">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Pale">><<set $activeSlave.skin = "pale">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Extremely Fair">><<set $activeSlave.skin = "extremely fair">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Very Fair">><<set $activeSlave.skin = "very fair">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Fair">><<set $activeSlave.skin = "fair">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "White">><<set $activeSlave.skin = "white">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Light">><<set $activeSlave.skin = "light">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Lightened">><<set $activeSlave.skin = "lightened">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Light Olive">><<set $activeSlave.skin = "light olive">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Olive">><<set $activeSlave.skin = "olive">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Natural">><<set $activeSlave.skin = "natural">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Tanned">><<set $activeSlave.skin = "tanned">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Bronzed">><<set $activeSlave.skin = "bronzed">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Dark Olive">><<set $activeSlave.skin = "dark olive">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Dark">><<set $activeSlave.skin = "dark">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Light Brown">><<set $activeSlave.skin = "light brown">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Brown">><<set $activeSlave.skin = "brown">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Dark Brown">><<set $activeSlave.skin = "dark brown">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
-<<link "Black">><<set $activeSlave.skin = "black">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>>
+<<link "Black">><<set $activeSlave.skin = "black">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Ebony">><<set $activeSlave.skin = "ebony">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Pure Black">><<set $activeSlave.skin = "pure black">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>>
<br>''Facial appearance:'' <span id="faceShape">$activeSlave.faceShape</span>.
<<link "Normal">><<set $activeSlave.faceShape = "normal">><<replace "#faceShape">>$activeSlave.faceShape<</replace>><<StartingGirlsCost>><</link>> |
diff --git a/src/pregmod/electiveSurgery.tw b/src/pregmod/electiveSurgery.tw
index 56c51f955a390339896c45008e8985f7e89290ac..7230ddeb9e314056363637b2e4e388912d8dc875 100644
--- a/src/pregmod/electiveSurgery.tw
+++ b/src/pregmod/electiveSurgery.tw
@@ -60,33 +60,57 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
<<if $PC.skin != $PC.origSkin>>
[[Restore natural color|PC Surgery Degradation][$PC.skin = $PC.origSkin, $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
+<<if $PC.skin != "pure white">>
+ [[Pure White|PC Surgery Degradation][$PC.skin = "pure white", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
<<if $PC.skin != "extremely pale">>
[[Extremely Pale|PC Surgery Degradation][$PC.skin = "extremely pale", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
-<<if $PC.skin != "white">>
- [[White|PC Surgery Degradation][$PC.skin = "white", $cash -= 2000, $surgeryType = "skinTone"]] |
-<</if>>
<<if $PC.skin != "pale">>
[[Pale|PC Surgery Degradation][$PC.skin = "pale", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
+<<if $PC.skin != "extremely fair">>
+ [[Extremely Fair|PC Surgery Degradation][$PC.skin = "extremely fair", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
+<<if $PC.skin != "very fair">>
+ [[Very Fair|PC Surgery Degradation][$PC.skin = "very fair", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
<<if $PC.skin != "fair">>
[[Fair|PC Surgery Degradation][$PC.skin = "fair", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
+<<if $PC.skin != "white">>
+ [[White|PC Surgery Degradation][$PC.skin = "white", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
<<if $PC.skin != "light">>
[[Light|PC Surgery Degradation][$PC.skin = "light", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
+<<if $PC.skin != "lightened">>
+ [[Lightened|PC Surgery Degradation][$PC.skin = "lightened", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
<<if $PC.skin != "light olive">>
[[Light Olive|PC Surgery Degradation][$PC.skin = "light olive", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
+<<if $PC.skin != "olive">>
+ [[Olive|PC Surgery Degradation][$PC.skin = "olive", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
+<<if $PC.skin != "natural">>
+ [[Natural|PC Surgery Degradation][$PC.skin = "natural", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
<<if $PC.skin != "tanned">>
[[Tanned|PC Surgery Degradation][$PC.skin = "tanned", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
+<<if $PC.skin != "bronzed">>
+ [[Bronzed|PC Surgery Degradation][$PC.skin = "bronzed", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
<<if $PC.skin != "dark olive">>
[[Dark Olive|PC Surgery Degradation][$PC.skin = "dark olive", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "dark">>
[[Dark|PC Surgery Degradation][$PC.skin = "dark", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
+<<if $PC.skin != "light brown">>
+ [[Light Brown|PC Surgery Degradation][$PC.skin = "light brown", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
<<if $PC.skin != "brown">>
[[Brown|PC Surgery Degradation][$PC.skin = "brown", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
@@ -96,6 +120,12 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
<<if $PC.skin != "black">>
[[Black|PC Surgery Degradation][$PC.skin = "black", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
+<<if $PC.skin != "ebony">>
+ [[Ebony|PC Surgery Degradation][$PC.skin = "ebony", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
+<<if $PC.skin != "pure black">>
+ [[Pure Black|PC Surgery Degradation][$PC.skin = "pure black", $cash -= 2000, $surgeryType = "skinTone"]]
+<</if>>
[[Custom Color|PC Skin Workaround][$cash -= 2000, $surgeryType = "skinTone"]]
diff --git a/src/pregmod/fPat.tw b/src/pregmod/fPat.tw
index a6097f4c02ea93285526e0ba3da104523aa2b75e..923773fb57ef8f1e5b58bad7e2318355648d2107 100644
--- a/src/pregmod/fPat.tw
+++ b/src/pregmod/fPat.tw
@@ -170,7 +170,7 @@ face and lightly touch $his
<</if>>
with your fingertips. You move your hand to the side of your slave's head, stroking $his temple gently.
<<if $activeSlave.fetish == "mindbroken">>
- This causes an unconcious shiver to travel down $his spine.
+ This causes an unconscious shiver to travel down $his spine.
<<elseif $activeSlave.devotion >= 50>>
This causes $him to shudder in delight and to move $his hand to your hip, squeezing it gently.
<<elseif $activeSlave.devotion >= 20>>
diff --git a/src/pregmod/pcAppearanceIntro.tw b/src/pregmod/pcAppearanceIntro.tw
index 670323807598a5d8997a1295d25d0de619e90622..190f52ec366f3ce1fe374805568a2650e9f493f5 100644
--- a/src/pregmod/pcAppearanceIntro.tw
+++ b/src/pregmod/pcAppearanceIntro.tw
@@ -86,8 +86,8 @@ You're $PC.race.
You have $PC.skin skin.
</span>
<br>
-<<link "White">>
- <<set $PC.skin = "white">>
+<<link "Pure White">>
+ <<set $PC.skin = "pure white">>
<<PlayerSkin>>
<</link>>
|
@@ -101,26 +101,61 @@ You have $PC.skin skin.
<<PlayerSkin>>
<</link>>
|
+<<link "Extremely Fair">>
+ <<set $PC.skin = "extremely fair">>
+ <<PlayerSkin>>
+<</link>>
+|
+<<link "Very Fair">>
+ <<set $PC.skin = "very fair">>
+ <<PlayerSkin>>
+<</link>>
+|
<<link "Fair">>
<<set $PC.skin = "fair">>
<<PlayerSkin>>
<</link>>
|
+<<link "White">>
+ <<set $PC.skin = "white">>
+ <<PlayerSkin>>
+<</link>>
+|
<<link "Light">>
<<set $PC.skin = "light">>
<<PlayerSkin>>
<</link>>
|
+<<link "Lightened">>
+ <<set $PC.skin = "lightened">>
+ <<PlayerSkin>>
+<</link>>
+|
<<link "Light Olive">>
<<set $PC.skin = "light olive">>
<<PlayerSkin>>
<</link>>
|
+<<link "Olive">>
+ <<set $PC.skin = "olive">>
+ <<PlayerSkin>>
+<</link>>
+|
+<<link "Natural">>
+ <<set $PC.skin = "natural">>
+ <<PlayerSkin>>
+<</link>>
+|
<<link "Tanned">>
<<set $PC.skin = "tanned">>
<<PlayerSkin>>
<</link>>
|
+<<link "Bronzed">>
+ <<set $PC.skin = "bronzed">>
+ <<PlayerSkin>>
+<</link>>
+|
<<link "Dark Olive">>
<<set $PC.skin = "dark olive">>
<<PlayerSkin>>
@@ -131,6 +166,11 @@ You have $PC.skin skin.
<<PlayerSkin>>
<</link>>
|
+<<link "Light Brown">>
+ <<set $PC.skin = "light brown">>
+ <<PlayerSkin>>
+<</link>>
+|
<<link "Brown">>
<<set $PC.skin = "brown">>
<<PlayerSkin>>
@@ -145,6 +185,16 @@ You have $PC.skin skin.
<<set $PC.skin = "black">>
<<PlayerSkin>>
<</link>>
+|
+<<link "Ebony">>
+ <<set $PC.skin = "ebony">>
+ <<PlayerSkin>>
+<</link>>
+|
+<<link "Pure Black">>
+ <<set $PC.skin = "pure black">>
+ <<PlayerSkin>>
+<</link>>
<br><br>
diff --git a/src/pregmod/saPorn.tw b/src/pregmod/saPorn.tw
index d4f51ffeffd8585f7288382aee435a1aaeb35a80..5627fcc1d0c3a83846633b288233ed709aa44fb1 100644
--- a/src/pregmod/saPorn.tw
+++ b/src/pregmod/saPorn.tw
@@ -1041,7 +1041,7 @@
$He @@.yellow;has accrued enough views to determine prospective porn genres.@@
<</if>>
<<elseif $slaves[$i].pornFame != 0>>
- Surprisingly, $his online fame @@.yellow;remained consistant@@ this week despite how fickle watchers can be.
+ Surprisingly, $his online fame @@.yellow;remained consistent@@ this week despite how fickle watchers can be.
<<else>>
$he cap went @@.red;completely overlooked@@ this week and failed to gain any hits at all.
<</if>>
@@ -2006,7 +2006,7 @@
<<set $slaves[$i].pornFame = $slaves[$i].pornTypeDom>>
<<set $slaves[$i].pornPrestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with her dominant streak.">>
@@.green;$He has become world famous for $his career in $slaves[$i].pornFameType pornography!@@ Millions are now intimately familiar with $his dominant streak, so it is now extremely prestigious to own $him.
- <<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her seated upon her obediant toy">>
+ <<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her seated upon her obedient toy">>
<<set $trinkets.push(_desc)>>
<<elseif $slaves[$i].pornTypeDom < 40000>>
<<set _failedStar = 1>>
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 4d3d6d10745110342abbd75492d24ef7c10e015a..7f3f7f9a0cec1e312f179b02a5436961dbde76bb 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -443,7 +443,7 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<<set _identicalChildGen = 0, _shiftDegree = 0>>
<<for _p = 0; _p < _curBabies; _p++>>
<<if _identicalChildGen == 0>>
- <<if _p == $PC.curBabies.length-1 && $PC.curBabies.length > 1 && $PC.curBabies[_p].identical == 1>> /* catch for improperly placed indentical twin flag to still generate*/
+ <<if _p == $PC.curBabies.length-1 && $PC.curBabies.length > 1 && $PC.curBabies[_p].identical == 1>> /* catch for improperly placed identical twin flag to still generate*/
<<set _twin = clone($activeSlave)>>
<<set _twin.ID = $IDNumber++>>
<<set $activeSlave = 0>>
diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
index e592ae23a431d0b7a681450c8482af1c4b164191..400fc12cc62dff459e0a25739679912da0268d08 100644
--- a/src/pregmod/theBlackMarket.tw
+++ b/src/pregmod/theBlackMarket.tw
@@ -169,7 +169,7 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<<if ($pedo_mode)>>
<<set _toydolls = "If you like sexy little toy dolls, I mean biological ''@@.coral;lolis@@'' or ''@@.coral;shotas@@'' for life, then this is the one for you. I picked it up from an exotics dealer, who picked it up from some old world government research center.", _norefunds = "Remember, though, no money back on this. Technology like this doesn't exist anywhere else, your younger slaves will stay that way forever, and your older ones will slowly begin to regress towards that nice mid-childhood state. If you want to build yourself a cadre of ''@@.coral;preteen@@'' delights for yourself or your customers, then buy now!">>
<<else>>
- <<set _toydolls = "This might be a little too shady or perverted for you. But, if you want your slaves to last longer, you know, look younger for longer, well this treatment can help. However it comes at a price, this treatment will eventually turn your slave girls younger and younger looking, until the point you might not want to use them as sex slaves because they'll appear as teenagers or even younger. I'm serious, your slaves treated with this treatment will eventually look like children! They won't be, really, but this is no fountain of perpetual youth, and to be fair, maybe none of this will be up your alley. If that's the case, I guess you could just sell them once they get too young looking, and possibly for a higher price than if they looked older. It's, at best, for possibly more discerning or eclectic tastes then you might have. I picked it up from an exotics dealer, who picked it up from some old world government research center.", _norefunds = "Remember, though, no money back on this. Technology like this doesn't exist anywhere else, your treated slaves will stay and become younger looking forever, and your older ones will slowly begin to regress towards a disturbingly young mid-childhood state. All those caveats asside, if this sounds like something you'd want, then buy now!">>
+ <<set _toydolls = "This might be a little too shady or perverted for you. But, if you want your slaves to last longer, you know, look younger for longer, well this treatment can help. However it comes at a price, this treatment will eventually turn your slave girls younger and younger looking, until the point you might not want to use them as sex slaves because they'll appear as teenagers or even younger. I'm serious, your slaves treated with this treatment will eventually look like children! They won't be, really, but this is no fountain of perpetual youth, and to be fair, maybe none of this will be up your alley. If that's the case, I guess you could just sell them once they get too young looking, and possibly for a higher price than if they looked older. It's, at best, for possibly more discerning or eclectic tastes then you might have. I picked it up from an exotics dealer, who picked it up from some old world government research center.", _norefunds = "Remember, though, no money back on this. Technology like this doesn't exist anywhere else, your treated slaves will stay and become younger looking forever, and your older ones will slowly begin to regress towards a disturbingly young mid-childhood state. All those caveats aside, if this sounds like something you'd want, then buy now!">>
<</if>>
<<if $arcologies[0].childhoodFertilityInducedNCSResearch == 0>>
<<if $cash >= 135000>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 5b9fb013fb077bf2ef7651ad508959ddefb7bbca..657240a6e4bd95973c116bf780423e1421d975db 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1172,7 +1172,7 @@ brown 4
dark 3
olive 2
light brown 1
-null 0
+natural 0
light -1
white -2
fair -3
@@ -1195,6 +1195,8 @@ extremely pale -5
<<set _skin0 = 7>>
<<case "light brown">>
<<set _skin0 = 6>>
+<<case "natural">>
+ <<set _skin1 = 5>>
<<case "light">>
<<set _skin0 = 4>>
<<case "white">>
@@ -1220,6 +1222,8 @@ extremely pale -5
<<set _skin1 = 7>>
<<case "light brown">>
<<set _skin1 = 6>>
+<<case "natural">>
+ <<set _skin1 = 5>>
<<case "light">>
<<set _skin1 = 4>>
<<case "white">>
@@ -1247,6 +1251,8 @@ extremely pale -5
<<set $activeSlave.skin = "olive">>
<<case 6>>
<<set $activeSlave.skin = "light brown">>
+<<case 5>>
+ <<set $activeSlave.skin = "natural">>
<<case 4>>
<<set $activeSlave.skin = "light">>
<<case 3>>
@@ -1267,12 +1273,12 @@ extremely pale -5
<<widget "GenSkinTone">>
<<script>>
(function() {
- 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, white: 2.5, fair: 2, 'very fair': 1.5, 'extremely fair': 1.25, pale: 1, 'extremely pale': 0.5, 'pure white': 0.001};
+ var skinToMelanin = {'pure black': 10, ebony: 9.5, black: 9, 'dark brown': 8.5, brown: 8, 'light brown': 7.5, dark: 7, 'dark olive': 6.5, bronzed: 6, tanned: 5.5, natural: 5, olive: 4.5, 'light olive': 4, lightened: 3.5, light: 3, white: 2.5, fair: 2, 'very fair': 1.5, 'extremely fair': 1.25, 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 = ['pure white', 'extremely pale', 'pale', 'fair', 'light', 'light olive', 'olive', 'tanned', 'dark olive', 'dark', 'light brown', 'brown', 'dark brown', 'black'][skin];
+ State.variables.activeSlave.skin = ['pure white', 'extremely pale', 'pale', 'extremely fair', 'very fair', 'fair', 'white', 'light', 'lightened', 'light olive', 'olive', 'natural', 'tanned', 'bronzed', 'dark olive', 'dark', 'light brown', 'brown', 'dark brown', 'ebony', 'black', 'pure black'][skin];
})();
<</script>>
<</widget>>
diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw
index 930dc798dfa0cae39a6c33a8ad204d5711d1f207..219ff1545bc2dc873b333336948436ad32efa4d8 100644
--- a/src/uncategorized/neighborInteract.tw
+++ b/src/uncategorized/neighborInteract.tw
@@ -335,7 +335,7 @@ A 1% interest in $activeArcology.name is worth <<print cashFormat($seed)>> and w
<</if>>
<br><br>
-If $activeArcology.name has developed enough to begin exporting worthwhile goods, it may be of interest to aquire some.
+If $activeArcology.name has developed enough to begin exporting worthwhile goods, it may be of interest to acquire some.
<<if ($activeArcology.government == "your trustees") || ($activeArcology.government == "your agent")>>
Since it is under your control, it is no problem at all to request the transfer of goods to $arcologies[0].name.
<<elseif $PC.hacking >= 50>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 3dff6c00365f1e758587e86bb4f6f8cd9a235744..83aa76874f760f704b5280042431a352cdf913d9 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1062,7 +1062,7 @@ Alter her Race:
<<if $toSearch.indexOf("surgically") == -1>>
<<if $activeSlave.indentureRestrictions < 1>>
$He is $activeSlave.race. Surgically alter $him to look more:
- [[Caucasian|Surgery Degradation][$activeSlave.race = "surgically altered to look white",$activeSlave.skin = either("pale", "light", "fair"),$activeSlave.eyeColor = either("blue", "brown", "green"),$activeSlave.hColor = either("black", "blonde", "red", "brown"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[White|Surgery Degradation][$activeSlave.race = "surgically altered to look white",$activeSlave.skin = either("pale", "light", "fair"),$activeSlave.eyeColor = either("blue", "brown", "green"),$activeSlave.hColor = either("black", "blonde", "red", "brown"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
[[Latina|Surgery Degradation][$activeSlave.race = "surgically altered to look latina",$activeSlave.skin = either("light olive", "brown", "dark brown", "tanned", "dark olive"),$activeSlave.hColor = either("black", "black", "brown", "brown"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
[[Black|Surgery Degradation][$activeSlave.race = "surgically altered to look black",$activeSlave.skin = either("black", "brown", "dark brown"),$activeSlave.hColor = either("black", "black", "black", "brown"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
[[Asian|Surgery Degradation][$activeSlave.race = "surgically altered to look asian",$activeSlave.skin = either("light olive", "dark olive", "light"),$activeSlave.hColor = either("black"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
diff --git a/src/uncategorized/resEndowment.tw b/src/uncategorized/resEndowment.tw
index a628557fc43869b4a94d2b60e16c2bd1ed1d86d4..69511bac14d2ab18fafe83dc7ebe437dcce46770 100644
--- a/src/uncategorized/resEndowment.tw
+++ b/src/uncategorized/resEndowment.tw
@@ -274,13 +274,13 @@
<br>
<<link "Propose a dynamic compromise that supports both visions">>
<<replace "#result">>
- You reconnect the call you had with the first matron, splitting your desktop's display to accomodate both video call windows so that you can address both at once. Then you begin to suggest a compromise that should gratify both parties:
+ You reconnect the call you had with the first matron, splitting your desktop's display to accommodate both video call windows so that you can address both at once. Then you begin to suggest a compromise that should gratify both parties:
<br><br>
With their not so feminine voices, conspicuous Adam's Apples, dry barren artificial pussies, and naturally masculine hormonal balances, it is more or less an open secret that futanari 'Sisters' are all biologically, well, men. It is considered poor taste to mention such a thing among polite company, however, as some men who own futas willfully try to ignore this fact or are otherwise are upset to be reminded of it. Your proposed remedy allows both sisters to have their way: With your extensive funding, those current Sisters who were biologically born male (all of them) will be endowed with bigger balls at the second matron's behest. Meanwhile, a new lineup of biologically female Futanari Sisters will be very rapidly inducted, transformed, cultured, trained, and readied for resale, under the expert leadership of the first matron. These new lady-futas will only have erect dicks to complement their natural fertile pussies, feminine hormones, and soft voices; nary a testicle in sight. Slaveowning society on the other hand will enjoy a wider variety of futanari slaves to choose from, opening up exciting new opportunities for owner to sate their personal preferences and perfect their harems. In 15 weeks, the absolute minimum time that all can be feasibly accomplished, everybody wins. Business will continue as usual in the Futanari Sisters until then, with no immediate change in merchandise.
<br><br>
"Well, you aren't the first one to think of that." the first matron reluctantly states. "You see, there's this outcast group of Sisters who would be perfect for this, it's just... We haven't seen eye to eye for a long time." The second chimes in: "You could talk her into it, she approves of your build far more than mine. Will probably take several months though, to move them all over and integrate all the new Sisters into our fold, and to enjoy the new pussies, of course." After a moment of consideration, the first agrees. You donate the funds to the Sisters with your compliments, ensuring that neither matron completely controls the vast sum. They both understand what they have to do now, starting immediately.
<br><br>
- Days later, the grateful institution begins a mass marketing campaign all accross the world's Free Cities, which includes adverts in FCNN, FCTV, and FC social media about the upcoming changes to their Sister inventory and their need for willing new blood and new specialists to help them bolster their ranks. You feature prominently in each and every promotional item as their foremost contributor. Thanks to this @@.green;you will be a household name in the Free Cities for some time.@@ Such a public flex of your financial muscles has also made your relative power very clear to some in the New World, attracting important players who @@.green;will start to show an interest@@ in doing business with you and your Free City.
+ Days later, the grateful institution begins a mass marketing campaign all across the world's Free Cities, which includes adverts in FCNN, FCTV, and FC social media about the upcoming changes to their Sister inventory and their need for willing new blood and new specialists to help them bolster their ranks. You feature prominently in each and every promotional item as their foremost contributor. Thanks to this @@.green;you will be a household name in the Free Cities for some time.@@ Such a public flex of your financial muscles has also made your relative power very clear to some in the New World, attracting important players who @@.green;will start to show an interest@@ in doing business with you and your Free City.
<<set $TFS.schoolUpgrade = 3>>
<<set $cash -= 250000>>
<<set $rep += 2000>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index eb05a60ef094f456b2f1e5b41e26becf91369ae3..0d6152ade467604638ff2a642378496698b3bc9f 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -3665,7 +3665,7 @@
<<set _precocious = 0>>
/* Just having NCS speeds precocious Puberty, but also hormonal puberty affects are
- * increased while secondary growth is supressed
+ * increased while secondary growth is suppressed
*/
<<if ($slaves[$i].inducedNCS == 1)>>
<<set _precocious -= 0.8>>
@@ -3768,7 +3768,7 @@
<<if ($slaves[$i].physicalAge < $slaves[$i].pubertyAgeXY) && $slaves[$i].balls >= 1 && $slaves[$i].pubertyXY == 0>> /* Male type */
<<set _precocious = 0>>
- /* Just having NCS speeds precocious Puberty, but also hormonal puberty affects are increased while secondary growth is supressed */
+ /* Just having NCS speeds precocious Puberty, but also hormonal puberty affects are increased while secondary growth is suppressed */
<<if ($slaves[$i].inducedNCS == 1)>>
<<set _precocious -= 0.8>>
<</if>>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index 985607397862065bb1e6980636d3632fa0a87a14..63522b63afc5117c4a0c7d0752ac00e5ff91e2a2 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -408,7 +408,7 @@ Treat nails:
<<set $lightenableSkin = ["natural", "dark", "dark olive", "black", "brown", "dark brown", "tanned"]>>
<<set $bleachableSkin = ["natural", "lightened", "pale", "fair", "light"]>>
<<set $darkenableSkin = ["natural", "lightened", "white", "fair", "pale", "light", "extremely pale", "light olive", "tanned", "brown", "dark brown"]>>
-<<set $dyedSkin = ["dyed red", "dyed green", "dyed blue", "tiger striped", "camouflage patterned"]>>
+<<set $dyedSkin = ["dyed red", "dyed green", "dyed blue", "dyed pink", "dyed gray", "tiger striped", "camouflage patterned"]>>
<br><br>
@@ -449,6 +449,8 @@ Dye or paint:
[[Red|Salon][$activeSlave.skin = "dyed red",$cash -= $modCost]]
| [[Green|Salon][$activeSlave.skin = "dyed green",$cash -= $modCost]]
| [[Blue|Salon][$activeSlave.skin = "dyed blue",$cash -= $modCost]]
+| [[Pink|Salon][$activeSlave.skin = "dyed pink",$cash -= $modCost]]
+| [[Gray|Salon][$activeSlave.skin = "dyed gray",$cash -= $modCost]]
| [[Tiger Stripes|Salon][$activeSlave.skin = "tiger striped",$cash -= $modCost]]
| [[Camouflage|Salon][$activeSlave.skin = "camouflage patterned",$cash -= $modCost]]
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index af4da62b42c68214d4db901b86616bc18f29e1ea..9e454d426929ba60e1cb0c2574ad002bf90071bf 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -26,108 +26,72 @@
<<elseif $customSlave.age == 19>>
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 19>>
-<<elseif $customSlave.age == 20 && $retirementAge == 20>>
- <<set $activeSlaveOneTimeMinAge = 20>>
- <<set $activeSlaveOneTimeMaxAge = 20>>
<<elseif $customSlave.age == 20>>
<<set $activeSlaveOneTimeMinAge = 20>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
<<elseif $customSlave.age == 24>>
<<set $activeSlaveOneTimeMinAge = 20>>
<<set $activeSlaveOneTimeMaxAge = 24>>
-<<elseif $customSlave.age == 25 && $retirementAge == 25>>
- <<set $activeSlaveOneTimeMinAge = 25>>
- <<set $activeSlaveOneTimeMaxAge = 25>>
<<elseif $customSlave.age == 25>>
<<set $activeSlaveOneTimeMinAge = 25>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
<<elseif $customSlave.age == 29>>
<<set $activeSlaveOneTimeMinAge = 25>>
<<set $activeSlaveOneTimeMaxAge = 29>>
-<<elseif $customSlave.age == 30 && $retirementAge == 30>>
- <<set $activeSlaveOneTimeMinAge = 30>>
- <<set $activeSlaveOneTimeMaxAge = 30>>
<<elseif $customSlave.age == 30>>
<<set $activeSlaveOneTimeMinAge = 30>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
<<elseif $customSlave.age == 39>>
<<set $activeSlaveOneTimeMinAge = 30>>
<<set $activeSlaveOneTimeMaxAge = 39>>
-<<elseif $customSlave.age == 40 && $retirementAge == 40>>
- <<set $activeSlaveOneTimeMinAge = 40>>
- <<set $activeSlaveOneTimeMaxAge = 40>>
<<elseif $customSlave.age == 40>>
<<set $activeSlaveOneTimeMinAge = 40>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
<<elseif $customSlave.age == 49>>
<<set $activeSlaveOneTimeMinAge = 40>>
<<set $activeSlaveOneTimeMaxAge = 49>>
-<<elseif $customSlave.age == 50 && $retirementAge == 50>>
- <<set $activeSlaveOneTimeMinAge = 50>>
- <<set $activeSlaveOneTimeMaxAge = 50>>
<<elseif $customSlave.age == 50>>
<<set $activeSlaveOneTimeMinAge = 50>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
<<elseif $customSlave.age == 59>>
<<set $activeSlaveOneTimeMinAge = 50>>
<<set $activeSlaveOneTimeMaxAge = 59>>
-<<elseif $customSlave.age == 60 && $retirementAge == 60>>
- <<set $activeSlaveOneTimeMinAge = 60>>
- <<set $activeSlaveOneTimeMaxAge = 60>>
<<elseif $customSlave.age == 60>>
<<set $activeSlaveOneTimeMinAge = 60>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
<<elseif $customSlave.age == 69>>
<<set $activeSlaveOneTimeMinAge = 60>>
<<set $activeSlaveOneTimeMaxAge = 69>>
-<<elseif $customSlave.age == 70 && $retirementAge == 70>>
- <<set $activeSlaveOneTimeMinAge = 70>>
- <<set $activeSlaveOneTimeMaxAge = 70>>
<<elseif $customSlave.age == 70>>
<<set $activeSlaveOneTimeMinAge = 70>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
<<elseif $customSlave.age == 79>>
<<set $activeSlaveOneTimeMinAge = 70>>
<<set $activeSlaveOneTimeMaxAge = 79>>
-<<elseif $customSlave.age == 80 && $retirementAge == 80>>
- <<set $activeSlaveOneTimeMinAge = 80>>
- <<set $activeSlaveOneTimeMaxAge = 80>>
<<elseif $customSlave.age == 80>>
<<set $activeSlaveOneTimeMinAge = 80>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
-<<elseif $customSlave.age == 79>>
+<<elseif $customSlave.age == 89>>
<<set $activeSlaveOneTimeMinAge = 80>>
<<set $activeSlaveOneTimeMaxAge = 89>>
-<<elseif $customSlave.age == 90 && $retirementAge == 90>>
- <<set $activeSlaveOneTimeMinAge = 90>>
- <<set $activeSlaveOneTimeMaxAge = 90>>
<<elseif $customSlave.age == 90>>
<<set $activeSlaveOneTimeMinAge = 90>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
-<<elseif $customSlave.age == 79>>
+<<elseif $customSlave.age == 99>>
<<set $activeSlaveOneTimeMinAge = 90>>
<<set $activeSlaveOneTimeMaxAge = 99>>
-<<elseif $customSlave.age == 100 && $retirementAge == 100>>
- <<set $activeSlaveOneTimeMinAge = 100>>
- <<set $activeSlaveOneTimeMaxAge = 100>>
<<elseif $customSlave.age == 100>>
<<set $activeSlaveOneTimeMinAge = 100>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
<<elseif $customSlave.age == 109>>
<<set $activeSlaveOneTimeMinAge = 100>>
<<set $activeSlaveOneTimeMaxAge = 109>>
-<<elseif $customSlave.age == 110 && $retirementAge == 110>>
- <<set $activeSlaveOneTimeMinAge = 110>>
- <<set $activeSlaveOneTimeMaxAge = 110>>
<<elseif $customSlave.age == 110>>
<<set $activeSlaveOneTimeMinAge = 110>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
<<elseif $customSlave.age == 119>>
<<set $activeSlaveOneTimeMinAge = 110>>
<<set $activeSlaveOneTimeMaxAge = 119>>
-<<elseif $customSlave.age == 120 && $retirementAge == 120>>
- <<set $activeSlaveOneTimeMinAge = 120>>
- <<set $activeSlaveOneTimeMaxAge = 120>>
<<elseif $customSlave.age == 120>>
<<set $activeSlaveOneTimeMinAge = 120>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw
index 8657b31b57969c9387ab3763022d08266cd390bf..ad7930827f665503aac1630884e5c2a8c1291f28 100644
--- a/src/uncategorized/slaveMarkets.tw
+++ b/src/uncategorized/slaveMarkets.tw
@@ -36,7 +36,7 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<<elseif $seed == 2>>
A scientist turns to you and remarks "I almost envy the hardware. They believe they're having a fulfilling career with a loving family and meaningful relationships for a lifetime. Honestly, if the mental imprinting process wasn't so destructive to the human body, I'd probably hop in myself!"
<<elseif $seed == 3>>
- Racks of ravaged bodies are layed across tables with plaques stating slave IQ, career, and sexual skill exam results.
+ Racks of ravaged bodies are laid across tables with plaques stating slave IQ, career, and sexual skill exam results.
<<else>>
Curious, you ask a technician why it's necessary for the merchandise to be so badly treated. He replies "Forcing stimulus on the hardware takes an enormous toll on their nervous and circulatory system. The nonfunctional components are disabled and removed as necessary to ensure optimal response to the imprinting process."
<</if>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index a1397e3d5b25e9be6bc6d6086650cd05e32b609c..e3640dbef017d56526e046b0738ed2b2129faa7e 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -11249,11 +11249,11 @@ $He has
<</if>>
<<elseif $activeSlave.belly >= 30000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
- $activeSlave.slaveName's skirt has retrofitted with a large elastic band to accomodate $his titanic <<print $activeSlave.inflationType>>-filled belly.
+ $activeSlave.slaveName's skirt has retrofitted with a large elastic band to accommodate $his titanic <<print $activeSlave.inflationType>>-filled belly.
<<elseif $activeSlave.bellyImplant > 0>>
- $activeSlave.slaveName's skirt has retrofitted with a large elastic band to accomodate $his titanic implant-filled belly.
+ $activeSlave.slaveName's skirt has retrofitted with a large elastic band to accommodate $his titanic implant-filled belly.
<<else>>
- $activeSlave.slaveName's skirt has retrofitted with a large elastic band to accomodate $his titanic pregnant belly.
+ $activeSlave.slaveName's skirt has retrofitted with a large elastic band to accommodate $his titanic pregnant belly.
<</if>>
<<elseif $activeSlave.weight > 190>>
$activeSlave.slaveName's massively fat belly spills over the sides of $his skirt.
@@ -14897,7 +14897,7 @@ $He has
<<case "a burkini">>
The bottom of $activeSlave.slaveName's burkini's tunic lies at crotch-level due to $his titanic implant-filled belly.
<<case "a hijab and blouse">>
- $activeSlave.slaveName's skirt has retrofitted with a large elastic band to accomodate $his titanic implant-filled belly.
+ $activeSlave.slaveName's skirt has retrofitted with a large elastic band to accommodate $his titanic implant-filled belly.
<<case "battledress">>
$activeSlave.slaveName's tank top rests atop $his titanic implant-filled belly leaving $him looking like someone who fucked half the country.
<<case "a halter top dress">>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index dd967b0463ec8229a28530f9ba7544003288ab89..90d1781da25d705d93a1e2162261cc2d92218a93 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -3789,7 +3789,7 @@
<<set $activeSlave.chem = 10 * random(1,3)>>
<<set $activeSlave.customTat = "The prominent emblem of a local gang spans the length of his shoulders.">>
<<set $activeSlave.combatSkill = 1>>
- <<case "gang theif">>
+ <<case "gang thief">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for gang related raiding of several local warehouses.">>
<<set $prisonCrime = "is incarcerated for gang related activities.">>
<<set $activeSlave.career = "a gang member">>