diff --git a/devNotes/twine CSS b/devNotes/twine CSS
index ddf1b25561a2705ef105aa96a5e21e63d645e6e6..441e5eb416c3b1c1ea56acdec8cd068c75e032a9 100644
--- a/devNotes/twine CSS
+++ b/devNotes/twine CSS
@@ -18,7 +18,6 @@ hr {
opacity: 1 !important;
}
-
/* default is 54em */
#passages {
max-width: 100%;
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 170aa548ebc8cb70dd8d23a1b3996c5723b51c05..3d7aa55b0e077d5ba2fa79ff22549f56d61c92cc 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -1098,21 +1098,24 @@ skin color
accepts string
"pure white"
+"ivory"
+"white"
"extremely pale"
+"very pale"
"pale"
"extremely fair"
"very fair"
"fair"
-"white"
"light"
-"lightened"
"light olive"
+"tan"
"olive"
-"natural"
-"tanned"
-"bronzed"
+"bronze"
"dark olive"
"dark"
+"light beige"
+"beige"
+"dark beige"
"light brown"
"brown"
"dark brown"
diff --git a/src/art/artJS.js b/src/art/artJS.js
index 830f4cb7811159459d6417c621c4cba68a3c98a8..596837587b905b7fa576dbddd8e21bc9f30522ba 100644
--- a/src/art/artJS.js
+++ b/src/art/artJS.js
@@ -272,11 +272,14 @@ window.skinColorCatcher = function (artSlave) {
case "white":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#F4EAF0";
colorSlave.areolaColor = "#FCCCDC";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#F4EAF0";
colorSlave.areolaColor = "#FCCCDC";
colorSlave.labiaColor = "#F977A3";
@@ -304,9 +307,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#F4C9AA";
colorSlave.areolaColor = "#F19795";
colorSlave.labiaColor = "#F977A3";
@@ -317,20 +318,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#C39696";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#E1B585";
colorSlave.areolaColor = "#C39696";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#D58E5F";
colorSlave.areolaColor = "#B17777";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#D58E5F";
colorSlave.areolaColor = "#B17777";
colorSlave.labiaColor = "#F977A3";
@@ -341,11 +341,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#825633";
colorSlave.areolaColor = "#734B2F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#784F2F";
colorSlave.areolaColor = "#583E2F";
@@ -386,11 +389,14 @@ window.skinColorCatcher = function (artSlave) {
case "black":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#FEE4CA";
colorSlave.areolaColor = "#E0B3A2";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#FEE4CA";
colorSlave.areolaColor = "#E0B3A2";
colorSlave.labiaColor = "#F977A3";
@@ -418,9 +424,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#D59D73";
colorSlave.areolaColor = "#8D6859";
colorSlave.labiaColor = "#F977A3";
@@ -431,20 +435,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#7C594B";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#AC7C4A";
colorSlave.areolaColor = "#7C594B";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#985C34";
colorSlave.areolaColor = "#764B3A";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#985C34";
colorSlave.areolaColor = "#764B3A";
colorSlave.labiaColor = "#F977A3";
@@ -455,11 +458,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#65422C";
colorSlave.areolaColor = "#4B3121";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#5A3C24";
colorSlave.areolaColor = "#493326";
@@ -504,11 +510,14 @@ window.skinColorCatcher = function (artSlave) {
case "latina":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#FEDECE";
colorSlave.areolaColor = "#E3BBAB";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#FEDECE";
colorSlave.areolaColor = "#E3BBAB";
colorSlave.labiaColor = "#F977A3";
@@ -536,9 +545,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#DAA782";
colorSlave.areolaColor = "#9E7666";
colorSlave.labiaColor = "#F977A3";
@@ -549,20 +556,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#92684C";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#B27554";
colorSlave.areolaColor = "#92684C";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#B6784E";
colorSlave.areolaColor = "#8F5A45";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#B6784E";
colorSlave.areolaColor = "#8F5A45";
colorSlave.labiaColor = "#F977A3";
@@ -573,11 +579,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#775031";
colorSlave.areolaColor = "#69452F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#774A31";
colorSlave.areolaColor = "#614330";
@@ -622,11 +631,14 @@ window.skinColorCatcher = function (artSlave) {
case "asian":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#FFF8EE";
colorSlave.areolaColor = "#F7DBD0";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#FFF8EE";
colorSlave.areolaColor = "#F7DBD0";
colorSlave.labiaColor = "#F977A3";
@@ -654,9 +666,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#F4D1A3";
colorSlave.areolaColor = "#BA8E83";
colorSlave.labiaColor = "#F977A3";
@@ -667,20 +677,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#AC8074";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#CFB48D";
colorSlave.areolaColor = "#AC8074";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#C38C4D";
colorSlave.areolaColor = "#A67A6F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#C38C4D";
colorSlave.areolaColor = "#A67A6F";
colorSlave.labiaColor = "#F977A3";
@@ -691,11 +700,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#855834";
colorSlave.areolaColor = "#734B2F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#83522B";
colorSlave.areolaColor = "#68442A";
@@ -736,11 +748,14 @@ window.skinColorCatcher = function (artSlave) {
case "middle eastern":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#E8CFCF";
colorSlave.areolaColor = "#DCADBC";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#E8CFCF";
colorSlave.areolaColor = "#DCADBC";
colorSlave.labiaColor = "#F977A3";
@@ -768,9 +783,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#EDA571";
colorSlave.areolaColor = "#B16854";
colorSlave.labiaColor = "#F977A3";
@@ -781,20 +794,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#A7624F";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#CC8D53";
colorSlave.areolaColor = "#A7624F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#CA7136";
colorSlave.areolaColor = "#9B5959";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#CA7136";
colorSlave.areolaColor = "#9B5959";
colorSlave.labiaColor = "#F977A3";
@@ -805,11 +817,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#684528";
colorSlave.areolaColor = "#563826";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#6E4730";
colorSlave.areolaColor = "#604534";
@@ -850,11 +865,14 @@ window.skinColorCatcher = function (artSlave) {
case "amerindian":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#FDE4BF";
colorSlave.areolaColor = "#F0BEAA";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#FDE4BF";
colorSlave.areolaColor = "#F0BEAA";
colorSlave.labiaColor = "#F977A3";
@@ -882,9 +900,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#F4D1A3";
colorSlave.areolaColor = "#BA8E83";
colorSlave.labiaColor = "#F977A3";
@@ -895,20 +911,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#AC8074";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#CFB48D";
colorSlave.areolaColor = "#AC8074";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#C38C4D";
colorSlave.areolaColor = "#A67A6F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#C38C4D";
colorSlave.areolaColor = "#A67A6F";
colorSlave.labiaColor = "#F977A3";
@@ -919,11 +934,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#855834";
colorSlave.areolaColor = "#734B2F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#83522B";
colorSlave.areolaColor = "#68442A";
@@ -964,11 +982,14 @@ window.skinColorCatcher = function (artSlave) {
case "southern european":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#EBDBE4";
colorSlave.areolaColor = "#FFE4E0";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#EBDBE4";
colorSlave.areolaColor = "#FFE4E0";
colorSlave.labiaColor = "#F977A3";
@@ -996,9 +1017,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#F2BC94";
colorSlave.areolaColor = "#EE8280";
colorSlave.labiaColor = "#F977A3";
@@ -1009,20 +1028,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#BF7577";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#DCA972";
colorSlave.areolaColor = "#BF7577";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#D0814C";
colorSlave.areolaColor = "#A96767";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#D0814C";
colorSlave.areolaColor = "#A96767";
colorSlave.labiaColor = "#F977A3";
@@ -1033,11 +1051,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#7F5431";
colorSlave.areolaColor = "#734B2F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#784F2F";
colorSlave.areolaColor = "#583E2F";
@@ -1078,11 +1099,14 @@ window.skinColorCatcher = function (artSlave) {
case "semitic":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#E8CFCF";
colorSlave.areolaColor = "#DCADBC";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#E8CFCF";
colorSlave.areolaColor = "#DCADBC";
colorSlave.labiaColor = "#F977A3";
@@ -1110,9 +1134,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#EDA571";
colorSlave.areolaColor = "#B16854";
colorSlave.labiaColor = "#F977A3";
@@ -1123,20 +1145,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#A7624F";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#CC8D53";
colorSlave.areolaColor = "#A7624F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#CA7136";
colorSlave.areolaColor = "#9B5959";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#CA7136";
colorSlave.areolaColor = "#9B5959";
colorSlave.labiaColor = "#F977A3";
@@ -1147,11 +1168,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#684528";
colorSlave.areolaColor = "#563826";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#6E4730";
colorSlave.areolaColor = "#604534";
@@ -1192,11 +1216,14 @@ window.skinColorCatcher = function (artSlave) {
case "malay":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#FBD1B2";
colorSlave.areolaColor = "#F39E7D";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#FBD1B2";
colorSlave.areolaColor = "#F39E7D";
colorSlave.labiaColor = "#F977A3";
@@ -1224,9 +1251,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#EA9760";
colorSlave.areolaColor = "#AB6755";
colorSlave.labiaColor = "#F977A3";
@@ -1237,20 +1262,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#976051";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#BA855E";
colorSlave.areolaColor = "#976051";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#A46138";
colorSlave.areolaColor = "#8F5E51";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#A46138";
colorSlave.areolaColor = "#8F5E51";
colorSlave.labiaColor = "#F977A3";
@@ -1261,11 +1285,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#804A28";
colorSlave.areolaColor = "#5F3F27";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#6F4523";
colorSlave.areolaColor = "#623C20";
@@ -1306,11 +1333,14 @@ window.skinColorCatcher = function (artSlave) {
case "indo-aryan":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#F8D4BE";
colorSlave.areolaColor = "#F8B6A4";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#F8D4BE";
colorSlave.areolaColor = "#F8B6A4";
colorSlave.labiaColor = "#F977A3";
@@ -1338,9 +1368,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#E8B68E";
colorSlave.areolaColor = "#D08661";
colorSlave.labiaColor = "#F977A3";
@@ -1351,20 +1379,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#C36E45";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#C17848";
colorSlave.areolaColor = "#C36E45";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#C17848";
colorSlave.areolaColor = "#A75A34";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#C17848";
colorSlave.areolaColor = "#A75A34";
colorSlave.labiaColor = "#F977A3";
@@ -1375,11 +1402,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#8A593C";
colorSlave.areolaColor = "#714931";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#845834";
colorSlave.areolaColor = "#614635";
@@ -1420,11 +1450,14 @@ window.skinColorCatcher = function (artSlave) {
case "pacific islander":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#FBD1B2";
colorSlave.areolaColor = "#F39E7D";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#FBD1B2";
colorSlave.areolaColor = "#F39E7D";
colorSlave.labiaColor = "#F977A3";
@@ -1452,9 +1485,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#EA9760";
colorSlave.areolaColor = "#AB6755";
colorSlave.labiaColor = "#F977A3";
@@ -1465,20 +1496,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#976051";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#BA855E";
colorSlave.areolaColor = "#976051";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#A46138";
colorSlave.areolaColor = "#8F5E51";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#A46138";
colorSlave.areolaColor = "#8F5E51";
colorSlave.labiaColor = "#F977A3";
@@ -1489,11 +1519,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#804A28";
colorSlave.areolaColor = "#5F3F27";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#6F4523";
colorSlave.areolaColor = "#623C20";
@@ -1534,11 +1567,14 @@ window.skinColorCatcher = function (artSlave) {
case "mixed race":
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#FEE5CC";
colorSlave.areolaColor = "#E3BBAB";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#FEE5CC";
colorSlave.areolaColor = "#E3BBAB";
colorSlave.labiaColor = "#F977A3";
@@ -1566,9 +1602,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#DAA782";
colorSlave.areolaColor = "#9E7666";
colorSlave.labiaColor = "#F977A3";
@@ -1579,20 +1613,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#92684C";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#B27554";
colorSlave.areolaColor = "#92684C";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#B6784E";
colorSlave.areolaColor = "#8F5A45";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#B6784E";
colorSlave.areolaColor = "#8F5A45";
colorSlave.labiaColor = "#F977A3";
@@ -1603,11 +1636,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#775031";
colorSlave.areolaColor = "#69452F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#774A31";
colorSlave.areolaColor = "#5E4434";
@@ -1652,11 +1688,14 @@ window.skinColorCatcher = function (artSlave) {
default:
switch (artSlave.skin) {
case "pure white":
+ case "ivory":
+ case "white":
colorSlave.skinColor = "#FEE5CC";
colorSlave.areolaColor = "#E3BBAB";
colorSlave.labiaColor = "#F977A3";
break;
case "extremely pale":
+ case "very pale":
colorSlave.skinColor = "#FEE5CC";
colorSlave.areolaColor = "#E3BBAB";
colorSlave.labiaColor = "#F977A3";
@@ -1684,9 +1723,7 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#ce6876";
break;
- case "white":
case "light":
- case "lightened":
colorSlave.skinColor = "#DAA782";
colorSlave.areolaColor = "#9E7666";
colorSlave.labiaColor = "#F977A3";
@@ -1697,20 +1734,19 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.areolaColor = "#92684C";
colorSlave.labiaColor = "#F977A3";
break;
- case "olive":
+ case "tan":
colorSlave.skinColor = "#B27554";
colorSlave.areolaColor = "#92684C";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#c1a785";
break;
- case "natural":
- case "tanned":
+ case "olive":
colorSlave.skinColor = "#B6784E";
colorSlave.areolaColor = "#8F5A45";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#9e4c44";
break;
- case "bronzed":
+ case "bronze":
colorSlave.skinColor = "#B6784E";
colorSlave.areolaColor = "#8F5A45";
colorSlave.labiaColor = "#F977A3";
@@ -1721,11 +1757,14 @@ window.skinColorCatcher = function (artSlave) {
colorSlave.labiaColor = "#F977A3";
break;
case "dark":
+ case "light beige":
colorSlave.skinColor = "#775031";
colorSlave.areolaColor = "#69452F";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#714536";
break;
+ case "beige":
+ case "dark beige":
case "light brown":
colorSlave.skinColor = "#774A31";
colorSlave.areolaColor = "#5E4434";
diff --git a/src/cheats/mod_EditChildCheatNew.tw b/src/cheats/mod_EditChildCheatNew.tw
index b27d66826b906fbb12b981f5932386f35b0401cb..e5639559c9744983e4fcb349f24d8b9540b798df 100644
--- a/src/cheats/mod_EditChildCheatNew.tw
+++ b/src/cheats/mod_EditChildCheatNew.tw
@@ -702,21 +702,24 @@
<<textbox "$tempSlave.skin" $tempSlave.skin>>
<br>
<<radiobutton "$tempSlave.skin" "pure white">> Pure White
+ <<radiobutton "$tempSlave.skin" "ivory">> Ivory
+ <<radiobutton "$tempSlave.skin" "white">> White
<<radiobutton "$tempSlave.skin" "extremely pale">> Extremely Pale
+ <<radiobutton "$tempSlave.skin" "very pale">> Very 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" "tan">> Tan
<<radiobutton "$tempSlave.skin" "olive">> Olive
- <<radiobutton "$tempSlave.skin" "natural">> Natural
- <<radiobutton "$tempSlave.skin" "tanned">> Tanned
- <<radiobutton "$tempSlave.skin" "bronzed">> Bronzed
+ <<radiobutton "$tempSlave.skin" "bronze">> Bronze
<<radiobutton "$tempSlave.skin" "dark olive">> Dark Olive
<<radiobutton "$tempSlave.skin" "dark">> Dark
+ <<radiobutton "$tempSlave.skin" "light beige">> Light Beige
+ <<radiobutton "$tempSlave.skin" "beige">> Beige
+ <<radiobutton "$tempSlave.skin" "dark beige">> Dark Beige
<<radiobutton "$tempSlave.skin" "light brown">> Light Brown
<<radiobutton "$tempSlave.skin" "brown">> Brown
<<radiobutton "$tempSlave.skin" "dark brown">> Dark Brown
@@ -729,21 +732,24 @@
<<textbox "$tempSlave.origSkin" $tempSlave.origSkin>>
<br>
<<radiobutton "$tempSlave.origSkin" "pure white">> Pure White
+ <<radiobutton "$tempSlave.origSkin" "ivory">> Ivory
+ <<radiobutton "$tempSlave.origSkin" "white">> White
<<radiobutton "$tempSlave.origSkin" "extremely pale">> Extremely Pale
+ <<radiobutton "$tempSlave.origSkin" "very pale">> Very Pale
<<radiobutton "$tempSlave.origSkin" "pale">> Pale
<<radiobutton "$tempSlave.origSkin" "extremely fair">> Extremely Fair
<<radiobutton "$tempSlave.origSkin" "very fair">> Very Fair
<<radiobutton "$tempSlave.origSkin" "fair">> Fair
- <<radiobutton "$tempSlave.origSkin" "white">> White
<<radiobutton "$tempSlave.origSkin" "light">> Light
- <<radiobutton "$tempSlave.origSkin" "lightened">> Lightened
<<radiobutton "$tempSlave.origSkin" "light olive">> Light Olive
+ <<radiobutton "$tempSlave.origSkin" "tan">> Tan
<<radiobutton "$tempSlave.origSkin" "olive">> Olive
- <<radiobutton "$tempSlave.origSkin" "natural">> Natural
- <<radiobutton "$tempSlave.origSkin" "tanned">> Tanned
- <<radiobutton "$tempSlave.origSkin" "bronzed">> Bronzed
+ <<radiobutton "$tempSlave.origSkin" "bronze">> Bronze
<<radiobutton "$tempSlave.origSkin" "dark olive">> Dark Olive
<<radiobutton "$tempSlave.origSkin" "dark">> Dark
+ <<radiobutton "$tempSlave.origSkin" "light beige">> Light Beige
+ <<radiobutton "$tempSlave.origSkin" "beige">> Beige
+ <<radiobutton "$tempSlave.origSkin" "dark beige">> Dark Beige
<<radiobutton "$tempSlave.origSkin" "light brown">> Light Brown
<<radiobutton "$tempSlave.origSkin" "brown">> Brown
<<radiobutton "$tempSlave.origSkin" "dark brown">> Dark Brown
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index b40ecbd297d7da61cbfa95db39902462abe04b02..4eba97996242a5fe7fbbec99455c1939006964ad 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -137,21 +137,24 @@
<<textbox "$tempSlave.skin" $tempSlave.skin>>
<br>
<<radiobutton "$tempSlave.skin" "pure white">> Pure White
+<<radiobutton "$tempSlave.skin" "ivory">> Ivory
+<<radiobutton "$tempSlave.skin" "white">> White
<<radiobutton "$tempSlave.skin" "extremely pale">> Extremely Pale
+<<radiobutton "$tempSlave.skin" "very pale">> Very 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" "tan">> Tan
<<radiobutton "$tempSlave.skin" "olive">> Olive
-<<radiobutton "$tempSlave.skin" "natural">> Natural
-<<radiobutton "$tempSlave.skin" "tanned">> Tanned
-<<radiobutton "$tempSlave.skin" "bronzed">> Bronzed
+<<radiobutton "$tempSlave.skin" "bronze">> Bronze
<<radiobutton "$tempSlave.skin" "dark olive">> Dark Olive
<<radiobutton "$tempSlave.skin" "dark">> Dark
+<<radiobutton "$tempSlave.skin" "light beige">> Light Beige
+<<radiobutton "$tempSlave.skin" "beige">> Beige
+<<radiobutton "$tempSlave.skin" "dark beige">> Dark Beige
<<radiobutton "$tempSlave.skin" "light brown">> Light Brown
<<radiobutton "$tempSlave.skin" "brown">> Brown
<<radiobutton "$tempSlave.skin" "dark brown">> Dark Brown
@@ -165,21 +168,24 @@
<<textbox "$tempSlave.origSkin" $tempSlave.origSkin>>
<br>
<<radiobutton "$tempSlave.origSkin" "pure white">> Pure White
+<<radiobutton "$tempSlave.origSkin" "ivory">> Ivory
+<<radiobutton "$tempSlave.origSkin" "white">> White
<<radiobutton "$tempSlave.origSkin" "extremely pale">> Extremely Pale
+<<radiobutton "$tempSlave.origSkin" "very pale">> Very Pale
<<radiobutton "$tempSlave.origSkin" "pale">> Pale
<<radiobutton "$tempSlave.origSkin" "extremely fair">> Extremely Fair
<<radiobutton "$tempSlave.origSkin" "very fair">> Very Fair
<<radiobutton "$tempSlave.origSkin" "fair">> Fair
-<<radiobutton "$tempSlave.origSkin" "white">> White
<<radiobutton "$tempSlave.origSkin" "light">> Light
-<<radiobutton "$tempSlave.origSkin" "lightened">> Lightened
<<radiobutton "$tempSlave.origSkin" "light olive">> Light Olive
+<<radiobutton "$tempSlave.origSkin" "tan">> Tan
<<radiobutton "$tempSlave.origSkin" "olive">> Olive
-<<radiobutton "$tempSlave.origSkin" "natural">> Natural
-<<radiobutton "$tempSlave.origSkin" "tanned">> Tanned
-<<radiobutton "$tempSlave.origSkin" "bronzed">> Bronzed
+<<radiobutton "$tempSlave.origSkin" "bronze">> Bronze
<<radiobutton "$tempSlave.origSkin" "dark olive">> Dark Olive
<<radiobutton "$tempSlave.origSkin" "dark">> Dark
+<<radiobutton "$tempSlave.origSkin" "light beige">> Light Beige
+<<radiobutton "$tempSlave.origSkin" "beige">> Beige
+<<radiobutton "$tempSlave.origSkin" "dark beige">> Dark Beige
<<radiobutton "$tempSlave.origSkin" "light brown">> Light Brown
<<radiobutton "$tempSlave.origSkin" "brown">> Brown
<<radiobutton "$tempSlave.origSkin" "dark brown">> Dark Brown
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 0afe5c873c5854526cf0e03c8aac1884946fd3a8..fd627ac6ba68694ffb52b8eb68c1e563e57aa6cf 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -1286,21 +1286,24 @@
<<textbox "$tempSlave.skin" $tempSlave.skin>>
<br>
<<radiobutton "$tempSlave.skin" "pure white">> Pure White
+ <<radiobutton "$tempSlave.skin" "ivory">> Ivory
+ <<radiobutton "$tempSlave.skin" "white">> White
<<radiobutton "$tempSlave.skin" "extremely pale">> Extremely Pale
+ <<radiobutton "$tempSlave.skin" "very pale">> Very 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" "tan">> Tan
<<radiobutton "$tempSlave.skin" "olive">> Olive
- <<radiobutton "$tempSlave.skin" "natural">> Natural
- <<radiobutton "$tempSlave.skin" "tanned">> Tanned
- <<radiobutton "$tempSlave.skin" "bronzed">> Bronzed
+ <<radiobutton "$tempSlave.skin" "bronze">> Bronze
<<radiobutton "$tempSlave.skin" "dark olive">> Dark Olive
<<radiobutton "$tempSlave.skin" "dark">> Dark
+ <<radiobutton "$tempSlave.skin" "light beige">> Light Beige
+ <<radiobutton "$tempSlave.skin" "beige">> Beige
+ <<radiobutton "$tempSlave.skin" "dark beige">> Dark Beige
<<radiobutton "$tempSlave.skin" "light brown">> Light Brown
<<radiobutton "$tempSlave.skin" "brown">> Brown
<<radiobutton "$tempSlave.skin" "dark brown">> Dark Brown
@@ -1313,21 +1316,24 @@
<<textbox "$tempSlave.origSkin" $tempSlave.origSkin>>
<br>
<<radiobutton "$tempSlave.origSkin" "pure white">> Pure White
+ <<radiobutton "$tempSlave.origSkin" "ivory">> Ivory
+ <<radiobutton "$tempSlave.origSkin" "white">> White
<<radiobutton "$tempSlave.origSkin" "extremely pale">> Extremely Pale
+ <<radiobutton "$tempSlave.origSkin" "very pale">> Very Pale
<<radiobutton "$tempSlave.origSkin" "pale">> Pale
<<radiobutton "$tempSlave.origSkin" "extremely fair">> Extremely Fair
<<radiobutton "$tempSlave.origSkin" "very fair">> Very Fair
<<radiobutton "$tempSlave.origSkin" "fair">> Fair
- <<radiobutton "$tempSlave.origSkin" "white">> White
<<radiobutton "$tempSlave.origSkin" "light">> Light
- <<radiobutton "$tempSlave.origSkin" "lightened">> Lightened
<<radiobutton "$tempSlave.origSkin" "light olive">> Light Olive
+ <<radiobutton "$tempSlave.origSkin" "tan">> Tan
<<radiobutton "$tempSlave.origSkin" "olive">> Olive
- <<radiobutton "$tempSlave.origSkin" "natural">> Natural
- <<radiobutton "$tempSlave.origSkin" "tanned">> Tanned
- <<radiobutton "$tempSlave.origSkin" "bronzed">> Bronzed
+ <<radiobutton "$tempSlave.origSkin" "bronze">> Bronze
<<radiobutton "$tempSlave.origSkin" "dark olive">> Dark Olive
<<radiobutton "$tempSlave.origSkin" "dark">> Dark
+ <<radiobutton "$tempSlave.origSkin" "light beige">> Light Beige
+ <<radiobutton "$tempSlave.origSkin" "beige">> Beige
+ <<radiobutton "$tempSlave.origSkin" "dark beige">> Dark Beige
<<radiobutton "$tempSlave.origSkin" "light brown">> Light Brown
<<radiobutton "$tempSlave.origSkin" "brown">> Brown
<<radiobutton "$tempSlave.origSkin" "dark brown">> Dark Brown
@@ -1490,7 +1496,7 @@
<<radiobutton "$tempSlave.earT" "neko">> Cat
<<radiobutton "$tempSlave.earT" "inu">> Dog
<<radiobutton "$tempSlave.earT" "kit">> Fox
- <<radiobutton "$tempSlave.earT" "tanuki">> TANUKI
+ <<radiobutton "$tempSlave.earT" "tanuki">> Tanuki
<br><br>
''Sense of Smell:''
@@ -2137,7 +2143,7 @@
<<radiobutton "$tempSlave.tailShape" "inu">> Dog
<<radiobutton "$tempSlave.tailShape" "kit">> Fox
<<radiobutton "$tempSlave.tailShape" "kitsune">> 3 Fox Tails
- <<radiobutton "$tempSlave.tailShape" "tanuki">> TANUKI
+ <<radiobutton "$tempSlave.tailShape" "tanuki">> Tanuki
<<radiobutton "$tempSlave.tailShape" "ushi">> Bovine
<br><br>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index d94cb4ca98e62d305942b710fd522ba44c5419ef..2508553d8b50acc3534c62cc2970162c6968000e 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -708,21 +708,24 @@ __''Player Character''__
<<options $PC.skin>>
Your skin tone is:
<<option "pure white" "Pure White" >>
+ <<option "ivory" "Ivory" >>
+ <<option "white" "White" >>
<<option "extremely pale" "Extremely Pale" >>
+ <<option "very pale" "Very Pale" >>
<<option "pale" "Pale" >>
<<option "extremely fair" "Extremely Fair" >>
<<option "very fair" "Very Fair" >>
<<option "fair" "Fair" >>
- <<option "white" "White" >>
<<option "light" "Light" >>
- <<option "lightened" "Lightened" >>
<<option "light olive" "Light Olive" >>
+ <<option "tan" "Tan" >>
<<option "olive" "Olive" >>
- <<option "natural" "Natural" >>
- <<option "tanned" "Tanned" >>
- <<option "bronzed" "Bronzed" >>
+ <<option "bronze" "Bronze" >>
<<option "dark olive" "Dark Olive" >>
<<option "dark" "Dark" >>
+ <<option "light beige" "Light Beige" >>
+ <<option "beige" "Beige" >>
+ <<option "dark beige" "Dark Beige" >>
<<option "light brown" "Light Brown" >>
<<option "brown" "Brown" >>
<<option "dark brown" "Dark Brown" >>
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 3344fd88ec1e03552f433a60c914f5a345c8a6c8..22c06a20d683fc445791605aa76b805b1b2cc512 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -1176,7 +1176,7 @@ $He is
<<if $activeChild.markings == "birthmark" && $activeChild.prestige == 0 && $activeChild.pornPrestige < 2>>
$He has a large, liver-colored birthmark, detracting from $his beauty.
<</if>>
- <<if ($activeChild.skin == "tanned") && ($activeChild.origSkin != "tanned")>>
+ <<if ($activeChild.skin == "sun tanned")>>
<<if ($activeChild.releaseRules != "restrictive" && $activeChild.releaseRules != "masturbation" && $activeChild.releaseRules != "chastity")>>
<<if ($activeChild.fetishStrength > 60) && ($activeChild.fetishKnown == 1)>>
$His tan is slightly uneven, since $he enjoys
@@ -1218,7 +1218,7 @@ $He is
<<if ($activeChild.hColor == "red")>>
<<if ($activeChild.hLength >= 10)>>
<<if ($activeChild.markings == "freckles") || ($activeChild.markings == "heavily freckled")>>
- <<if ($activeChild.skin == "pale") || ($activeChild.skin == "fair")>>
+ <<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10)>>
It goes perfectly with $his $activeChild.skin skin and freckles.
<</if>>
<</if>>
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index d4fc0bab886973ca288559240644826786db39aa..eda7434c3afe442db4f201c72d9d9bf3d4277eed 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -33,6 +33,7 @@ equine: {type: "equine", normalOvaMin:1, normalOvaMax: 1, normalBirth: 48, minLi
<<set setup.filterRaces = ["Amerindian", "Asian", "Black", "Indo-Aryan", "Latina", "Malay", "Middle Eastern", "Mixed Race", "Pacific Islander", "Semitic", "Southern European", "White"]>>
<<set setup.filterRacesLowercase = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
<<set setup.filterRegions = ["Africa", "Asia", "Australia", "Europe", "Middle East", "North America", "South America"]>>
+<<set setup.naturalSkins = ["pure white", "ivory", "white", "extremely pale", "very pale", "pale", "extremely fair", "very fair", "fair", "light", "light olive", "tan", "olive", "bronze", "dark olive", "dark", "light beige", "beige", "dark beige", "light brown", "brown", "dark brown", "black", "ebony", "pure black"]>>
/* START Custom Nationalities region filter */
/* Not currently weighted, but will accept weights */
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 76cde94601cb3d3085e7ea958dd9e59f3bcce471..8fc1d6f6ee9bd8d9f2a35d6ec5f068209612565e 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -137,7 +137,11 @@ window.newSlave = /** @param {App.Entity.SlaveState} slave */ function newSlave(
slave.eyebrowHColor = slave.hColor;
}
if (slave.override_Skin !== 1) {
- slave.origSkin = slave.skin;
+ if ((slave.skin === "sun tanned") || (slave.skin === "spray tanned")) {
+ slave.origSkin = randomRaceSkin(slave.origRace);
+ } else {
+ slave.origSkin = slave.skin;
+ }
}
slave.override_Race = 0;
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 472b07088390bd8618d90d759422a6ab461e44b2..547c0c0b16a62c871134dafc19a89408c8990e3e 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -224,25 +224,30 @@ window.generateGenetics = (function() {
let fatherSkin = 0;
let dadSkinIndex;
const skinToMelanin = {
- "pure black": 21,
- "ebony": 20,
- "black": 19,
- "dark brown": 18,
- "brown": 17,
- "light brown": 16,
- "dark": 15,
- "dark olive": 14,
- "bronze": 13,
- "tan": 11,
- "olive": 10,
- "light olive": 9,
- "light": 8,
- "white": 7,
- "fair": 6,
- "very fair": 5,
- "extremely fair": 4,
- "pale": 3,
- "extremely pale": 2,
+ "pure black": 25,
+ "ebony": 24,
+ "black": 23,
+ "dark brown": 22,
+ "brown": 21,
+ "light brown": 20,
+ "dark beige": 19,
+ "beige": 18,
+ "light beige": 17,
+ "dark": 16,
+ "dark olive": 15,
+ "bronze": 14,
+ "olive": 13,
+ "tan": 12,
+ "light olive": 11,
+ "light": 10,
+ "fair": 9,
+ "very fair": 8,
+ "extremely fair": 7,
+ "pale": 6,
+ "very pale": 5,
+ "extremely pale": 4,
+ "white": 3,
+ "ivory": 2,
"pure white": 1
};
const momSkinIndex = mother ? (skinToMelanin[mother.origSkin] || 13) : 8;
@@ -855,14 +860,14 @@ window.generateChild = function (mother, ova, destination) {
if (!pregUpgrade) {
if (genes.mother === -1) {
if (genes.father <= 0) {
- child.slaveName = "Your daughter";
+ child.slaveName = `Your daughter`;
} else {
child.slaveName = `Your and ${genes.fatherName}'s daughter`;
}
child.slaveSurname = V.PC.surname;
} else {
if (genes.father === -1) {
- child.slaveName = `${genes.motherName} and your daughter`;
+ child.slaveName = `${genes.motherName}'s and your daughter`;
child.slaveSurname = V.PC.surname;
} else if (genes.father > 0) {
child.slaveName = `${genes.motherName} and ${genes.fatherName}'s daughter`;
@@ -900,7 +905,7 @@ window.generateChild = function (mother, ova, destination) {
}
} else {
if (genes.father === -1) {
- child.slaveName = `${genes.motherName} and your son`;
+ child.slaveName = `${genes.motherName}'s and your son`;
} else if (genes.father > 0) {
child.slaveName = `${genes.motherName} and ${genes.fatherName}'s son`;
} else {
@@ -952,7 +957,7 @@ window.generateChild = function (mother, ova, destination) {
child.slaveSurname = V.PC.surname;
} else {
if (genes.father === -1) {
- child.slaveName = `${genes.motherName} and your son`;
+ child.slaveName = `${genes.motherName}'s and your son`;
child.slaveSurname = V.PC.surname;
} else if (genes.father > 0) {
child.slaveName = `${genes.motherName} and ${genes.fatherName}'s son`;
@@ -990,7 +995,7 @@ window.generateChild = function (mother, ova, destination) {
}
} else {
if (genes.father === -1) {
- child.slaveName = `${genes.motherName} and your son`;
+ child.slaveName = `${genes.motherName}'s and your son`;
} else if (genes.father > 0) {
child.slaveName = `${genes.motherName} and ${genes.fatherName}'s son`;
} else {
@@ -1121,14 +1126,14 @@ window.generateChild = function (mother, ova, destination) {
if (!pregUpgrade) {
if (genes.mother === -1) {
if (genes.father <= 0) {
- child.slaveName = "Your daughter";
+ child.slaveName = `Your daughter`;
} else {
- child.slaveName = `Your and ${genes.fatherName}'s daughter`;
+ child.slaveName = `Yours and ${genes.fatherName}'s daughter`;
}
child.slaveSurname = V.PC.surname;
} else {
if (genes.father === -1) {
- child.slaveName = `${genes.motherName} and your daughter`;
+ child.slaveName = `Yours and ${genes.motherName}'s daughter`;
child.slaveSurname = V.PC.surname;
} else if (genes.father > 0) {
child.slaveName = `${genes.motherName} and ${genes.fatherName}'s daughter`;
@@ -1160,13 +1165,13 @@ window.generateChild = function (mother, ova, destination) {
if (childName.indexOf("ovum") === 0) {
if (genes.mother === -1) {
if (genes.father <= 0) {
- child.slaveName = "Your daughter";
+ child.slaveName = `Your daughter`;
} else {
- child.slaveName = `Your and ${genes.fatherName}'s daughter`;
+ child.slaveName = `Yours and ${genes.fatherName}'s daughter`;
}
} else {
if (genes.father === -1) {
- child.slaveName = `${genes.motherName} and your daughter`;
+ child.slaveName = `Yours and ${genes.motherName}'s daughter`;
} else if (genes.father > 0) {
child.slaveName = `${genes.motherName} and ${genes.fatherName}'s daughter`;
} else {
diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js
index 3cfe0bfbe99e197505ec4243f2461ef1b725d5c9..819e7e455d154063e48f2a9062582b79b0ebab0d 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -1240,16 +1240,14 @@ window.GenerateNewSlave = (function() {
}
nationalityToRace(slave);
} else {
+ slave.race = V.fixedRace;
if (V.fixedNationality === 0) {
- slave.race = V.fixedRace;
- V.fixedRace = 0;
raceToNationality(slave);
} else {
- slave.race = V.fixedRace;
slave.nationality = V.fixedNationality;
V.fixedNationality = 0;
- V.fixedRace = 0;
}
+ V.fixedRace = 0;
}
}
@@ -1313,7 +1311,7 @@ window.GenerateNewSlave = (function() {
break;
case "latina":
slave.lips = jsRandom(5, 25);
- slave.skin = jsEither(["brown", "dark brown", "dark olive", "light olive", "tanned"]);
+ slave.skin = jsEither(["brown", "dark brown", "dark olive", "light olive", "tan"]);
slave.hColor = jsEither(["black", "brown"]);
if (slave.geneticQuirks.heterochromia === 2) {
slave.geneticQuirks.heterochromia = jsEither(["blue", "brown", "green"]);
@@ -1345,7 +1343,7 @@ window.GenerateNewSlave = (function() {
case "semitic":
case "southern european":
slave.lips = jsRandom(5, 25);
- slave.skin = jsEither(["fair", "light olive", "light", "tanned"]);
+ slave.skin = jsEither(["fair", "light olive", "light", "tan"]);
slave.hColor = "black";
slave.hStyle = "neat";
if (slave.geneticQuirks.heterochromia === 2) {
@@ -1361,7 +1359,7 @@ window.GenerateNewSlave = (function() {
slave.geneticQuirks.heterochromia = jsEither(["blue", "brown", "green"]);
}
}
- if (slave.skin === "pale" || slave.skin === "fair") {
+ if ((skinToneLevel(slave.skin) > 5) && (skinToneLevel(slave.skin) < 10)) {
if (jsRandom(1, 4) === 1) {
slave.markings = jsEither(["beauty mark", "beauty mark", "birthmark", "birthmark", "freckles", "freckles", "freckles", "heavily freckled"]);
}
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 141711a3a67e1826294bfb2c274d3348d1b7fbf7..3dfc35e75707f5144ac42b17ba4672c0b701a4ae 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -3643,10 +3643,33 @@ window.rulesAssistantOptions = (function() {
const items = [
["no default setting"],
["natural"],
+ ["pure white"],
+ ["ivory"],
+ ["white"],
+ ["extremely pale"],
+ ["very pale"],
["pale"],
- ["lightened"],
- ["tanned"],
+ ["extremely fair"],
+ ["very fair"],
+ ["fair"],
+ ["light"],
+ ["light olive"],
+ ["tan"],
+ ["olive"],
+ ["bronze"],
+ ["dark olive"],
["dark"],
+ ["light beige"],
+ ["beige"],
+ ["dark beige"],
+ ["light brown"],
+ ["brown"],
+ ["dark brown"],
+ ["black"],
+ ["ebony"],
+ ["pure black"],
+ ["sun tanned"],
+ ["spray tanned"],
["dyed red"],
["dyed green"],
["dyed blue"],
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 0b118dd295aaf85c07aa0bee8c963727fca41a7c..65c36860e91c80c56b5f0b828539ef608787d956 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -218,7 +218,7 @@ window.Beauty = (function() {
break;
case "freckles":
case "heavily freckled":
- if (slave.skin === "pale" || slave.skin === "fair") {
+ if ((skinToneLevel(slave.skin) > 5) && (skinToneLevel(slave.skin) < 10)) {
beauty += 2;
if (slave.hColor === "red") {
beauty += 2;
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index e4c0de4ec64032a55b3d63ccb216355e00ea03a8..e16f4a4ff9cd0b162959febfe05720ee6175a1c7 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -1881,6 +1881,9 @@ window.SlaveSummaryUncached = (function() {
case "extremely pale":
r += `E. Pal`;
break;
+ case "very pale":
+ r += `V. Pal`;
+ break;
case "light brown":
r += `L. Br`;
break;
@@ -1893,16 +1896,16 @@ window.SlaveSummaryUncached = (function() {
case "dark olive":
r += `D. Oli`;
break;
- case "lightened":
- r += `Ltnd`;
+ case "light beige":
+ r += `L. Bei`;
break;
- case "tanned":
- r += `Tan`;
+ case "dark beige":
+ r += `D. Bei`;
break;
- case "natural":
- r += `Nat`;
+ case "tan":
+ r += `Tan`;
break;
- case "bronzed":
+ case "bronze":
r += `Bron`;
break;
case "ebony":
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index 2029edfaff07e91525ee414a1a1fa8a1aa515128..2064a2eca9e7a3c43f76c6b2bf7ce89400da5701 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -364,19 +364,19 @@ window.toJson = function(obj) {
window.nippleColor = /** @param {App.Entity.SlaveState} slave */ function (slave) {
slave = slave || State.variables.activeSlave;
- if (slave.skin === "tanned" || slave.skin === "fair") {
+ if (skinToneLevel(slave.skin) < 8) {
if (slave.preg > slave.pregData.normalBirth/4 || (slave.birthsTotal > 0 && slave.lactation > 0)) {
- return "dark brown";
+ return "brown";
} else {
return "pink";
}
- } else if ((slave.skin === "pale" || slave.race === "white")) {
+ } else if (skinToneLevel(slave.skin) < 14) {
if (slave.preg > slave.pregData.normalBirth/4 || (slave.birthsTotal > 0 && slave.lactation > 0)) {
- return "brown";
+ return "dark brown";
} else {
return "pink";
}
- } else if ((slave.skin === "brown" || slave.race === "black")) {
+ } else if (skinToneLevel(slave.skin) > 20) {
if (slave.preg > slave.pregData.normalBirth/4 || (slave.birthsTotal > 0 && slave.lactation > 0)) {
return "black";
} else {
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index f5966f08639a16495d499b82cc1a5233bf0d3f00..930d58a6c240c6efb6c62249b1437e1afce93dd6 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1545,12 +1545,12 @@ window.randomRaceSkin = function(raceName) {
skin = jsEither(["black", "brown", "dark brown"]);
break;
case "latina":
- skin = jsEither(["brown", "dark brown", "dark olive", "light olive", "tanned"]);
+ skin = jsEither(["brown", "dark brown", "dark olive", "light olive", "tan"]);
break;
case "middle eastern":
case "semitic":
case "southern european":
- skin = jsEither(["fair", "light olive", "light", "tanned"]);
+ skin = jsEither(["fair", "light olive", "light", "tan"]);
break;
case "white":
skin = jsEither(["fair", "light", "pale"]);
@@ -1570,20 +1570,22 @@ window.randomRaceEye = function(raceName) {
case "indo-aryan":
case "middle eastern":
case "pacific islander":
- eye = jsEither(["brown"]);
+ eye = jsEither(["brown", "brown", "brown", "brown", "green"]);
break;
case "amerindian":
case "latina":
- case "semitic":
- case "southern european":
- eye = jsEither(["brown", "green"]);
+ eye = jsEither(["brown", "brown", "brown", "green"]);
break;
case "malay":
+ case "southern european":
+ eye = jsEither(["blue", "brown", "brown", "brown", "brown", "brown", "brown", "green"]);
+ break;
+ case "semitic":
case "white":
- eye = jsEither(["blue", "brown", "green"]);
+ eye = jsEither(["blue", "brown", "brown", "brown", "green", "green"]);
break;
default:
- eye = jsEither(["brown", "green"]);
+ eye = jsEither(["blue", "brown", "green"]);
break;
}
return eye;
@@ -1598,16 +1600,16 @@ window.randomRaceHair = function(raceName) {
case "malay":
case "middle eastern":
case "pacific islander":
- case "semitic":
- case "southern european":
- hair = jsEither(["black"]);
+ hair = jsEither(["black", "black", "black", "black", "black", "brown"]);
break;
case "black":
case "latina":
+ case "semitic":
+ case "southern european":
hair = jsEither(["black", "black", "brown", "brown"]);
break;
case "white":
- hair = jsEither(["black", "blonde", "brown", "red"]);
+ hair = jsEither(["black", "black", "blonde", "brown", "brown", "red"]);
break;
default:
hair = jsEither(["black", "black", "black", "black", "blonde", "brown", "brown", "red"]);
@@ -1615,3 +1617,86 @@ window.randomRaceHair = function(raceName) {
}
return hair;
};
+
+window.skinToneLevel = function(skinTone) {
+ if (!setup.naturalSkins.includes(skinTone)) {
+ return undefined;
+ } else {
+ let skinNumber;
+ let skinToMelanin = {
+ "pure black": 25,
+ "ebony": 24,
+ "black": 23,
+ "dark brown": 22,
+ "brown": 21,
+ "light brown": 20,
+ "dark beige": 19,
+ "beige": 18,
+ "light beige": 17,
+ "dark": 16,
+ "dark olive": 15,
+ "bronze": 14,
+ "olive": 13,
+ "tan": 12,
+ "light olive": 11,
+ "light": 10,
+ "fair": 9,
+ "very fair": 8,
+ "extremely fair": 7,
+ "pale": 6,
+ "very pale": 5,
+ "extremely pale": 4,
+ "white": 3,
+ "ivory": 2,
+ "pure white": 1
+ };
+ skinNumber = skinToMelanin[skinTone];
+ return skinNumber;
+ }
+};
+
+window.changeSkinTone = function(skin, value) {
+ if (!setup.naturalSkins.includes(skin)) {
+ return skin;
+ } else {
+ let skinToMelanin = {
+ "pure black": 25,
+ "ebony": 24,
+ "black": 23,
+ "dark brown": 22,
+ "brown": 21,
+ "light brown": 20,
+ "dark beige": 19,
+ "beige": 18,
+ "light beige": 17,
+ "dark": 16,
+ "dark olive": 15,
+ "bronze": 14,
+ "olive": 13,
+ "tan": 12,
+ "light olive": 11,
+ "light": 10,
+ "fair": 9,
+ "very fair": 8,
+ "extremely fair": 7,
+ "pale": 6,
+ "very pale": 5,
+ "extremely pale": 4,
+ "white": 3,
+ "ivory": 2,
+ "pure white": 1
+ };
+ let newSkin = (skinToMelanin[skin] + value);
+ if (newSkin > 25) {
+ newSkin = 25;
+ } else if (newSkin < 1) {
+ newSkin = 1;
+ }
+ let prop = "";
+ for (prop in skinToMelanin) {
+ if (!skinToMelanin.hasOwnProperty(prop)) continue;
+ if (newSkin >= skinToMelanin[prop]) return prop;
+ }
+ return prop;
+ }
+};
\ No newline at end of file
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index e285912f701aeddd8bf09963a707f288ed6af721..f1e71c000e59e1b991ca490e969dffee3023e9f2 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -66,12 +66,12 @@
/% corrected skin to fair?, changed markings to 'freckled' Bane70 %/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Sylvia", _HS.birthName = "Sylvia", _HS.origin = "She was born a slave and knows no other life.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 26, _HS.physicalAge = 26, _HS.visualAge = 26, _HS.ovaryAge = 26, _HS.nationality = "Stateless", _HS.health = -10, _HS.devotion = 10, _HS.hColor = "black", _HS.hLength = 10, _HS.pubicHColor = "black", _HS.skin = "tanned", _HS.boobs = 500, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "submissive", _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 35, _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Sylvia", _HS.birthName = "Sylvia", _HS.origin = "She was born a slave and knows no other life.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 26, _HS.physicalAge = 26, _HS.visualAge = 26, _HS.ovaryAge = 26, _HS.nationality = "Stateless", _HS.health = -10, _HS.devotion = 10, _HS.hColor = "black", _HS.hLength = 10, _HS.pubicHColor = "black", _HS.override_Skin = 1, _HS.skin = "spray tanned", _HS.boobs = 500, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "submissive", _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 35, _HS.attrXY = 40, _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*Added origin, tweaked skills, added smart piercing set to submissive, removed buttslut -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Eryma", _HS.birthName = "Eryma", _HS.origin = "She is a former gladiator that wagered her freedom and lost.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, _HS.health = 100, _HS.devotion = -30, _HS.height = 175, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "tanned", _HS.hStyle = "long", _HS.boobs = 500, _HS.butt = 2, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.skill.combat = 1, _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.behavioralFlaw = "arrogant">>
+<<set _HS.slaveName = "Eryma", _HS.birthName = "Eryma", _HS.origin = "She is a former gladiator that wagered her freedom and lost.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, _HS.health = 100, _HS.devotion = -30, _HS.height = 175, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hStyle = "long", _HS.boobs = 500, _HS.butt = 2, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.skill.combat = 1, _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.behavioralFlaw = "arrogant">>
<<set $heroSlaves.push(_HS)>>
/*fighter*/
/*Added combat skill, changed eye color and rules, added origin, added arrogant -BoneyM*/
@@ -83,7 +83,7 @@
/*Tweaked obedience downwards, increased weight and face, added origin, changed eye color, changed fetish to bisexual and added 'hates men' flaw -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Fio", _HS.birthName = "Fio", _HS.slaveSurname = "Rodan", _HS.birthSurname = "Rodan", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 20, _HS.devotion = -100, _HS.weight = -20, _HS.height = 175, _HS.hLength = 15, _HS.skin = "tanned", _HS.boobs = 500, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.energy = 100, _HS.attrXY = 40, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has a tribal tattoo from her right elbow up the shoulder and across her back.">>
+<<set _HS.slaveName = "Fio", _HS.birthName = "Fio", _HS.slaveSurname = "Rodan", _HS.birthSurname = "Rodan", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 20, _HS.devotion = -100, _HS.weight = -20, _HS.height = 175, _HS.hLength = 15, _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.boobs = 500, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.energy = 100, _HS.attrXY = 40, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has a tribal tattoo from her right elbow up the shoulder and across her back.">>
<<set $heroSlaves.push(_HS)>>
/*Corrected tattoo syntax, added nympho and arrogant -BoneyM*/
@@ -112,7 +112,7 @@
/*Added 'submissive' and 'bitchy' -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Valentina", _HS.birthName = "Valentina", _HS.origin = "She was once the bodyguard to a Russian drug lord, and was sold into slavery after his death by cocaine overdose.", _HS.ID = _i++, _HS.nationality = "Russian", _HS.birthWeek = random(0,51), _HS.actualAge = 29, _HS.physicalAge = 29, _HS.visualAge = 29, _HS.ovaryAge = 29, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 100, _HS.height = 175, _HS.eyeColor = "green", _HS.skin = "tanned", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.boobs = 650, _HS.boobsImplant = 600, _HS.butt = 2, _HS.lips = 25, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.intelligence = 30, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "She has a red star tattoo on her back, and a hammer and sickle on her right buttock.", _HS.customDesc = "She has a Slavic face with high cheekbones and a strong, pointed jaw. She is a skilled martial artist.", _HS.faceShape = "masculine", _HS.career = "a bodyguard">>
+<<set _HS.slaveName = "Valentina", _HS.birthName = "Valentina", _HS.origin = "She was once the bodyguard to a Russian drug lord, and was sold into slavery after his death by cocaine overdose.", _HS.ID = _i++, _HS.nationality = "Russian", _HS.birthWeek = random(0,51), _HS.actualAge = 29, _HS.physicalAge = 29, _HS.visualAge = 29, _HS.ovaryAge = 29, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 100, _HS.height = 175, _HS.eyeColor = "green", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.boobs = 650, _HS.boobsImplant = 600, _HS.butt = 2, _HS.lips = 25, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.intelligence = 30, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "She has a red star tattoo on her back, and a hammer and sickle on her right buttock.", _HS.customDesc = "She has a Slavic face with high cheekbones and a strong, pointed jaw. She is a skilled martial artist.", _HS.faceShape = "masculine", _HS.career = "a bodyguard">>
<<set $heroSlaves.push(_HS)>>
/*Tweaked devotion up, changed eyes to green, corrected tattoo syntax, added combat skill -BoneyM*/
@@ -208,7 +208,7 @@
/*Reduced weight, changed eyes, added nail polish -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Kino", _HS.birthName = "Kino", _HS.origin = "She was formerly owned by someone who fancied themselves a geneticist, where she acquired permanently discolored hair and odd fetishes.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 40, _HS.devotion = -75, _HS.height = 155, _HS.race = "white", _HS.eyeColor = "blue-green", _HS.override_H_Color = 1, _HS.hColor = "blue", _HS.pubicHColor = "blue", _HS.skin = "tanned", _HS.hLength = 30, _HS.hStyle = "short, spiky, with a long shoulder-length lock leading from her temples down, one on each side", _HS.boobs = 650, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has a vertical scar through her right eye, is a dabbling artist, and is an oviposition fetishist.">>
+<<set _HS.slaveName = "Kino", _HS.birthName = "Kino", _HS.origin = "She was formerly owned by someone who fancied themselves a geneticist, where she acquired permanently discolored hair and odd fetishes.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 40, _HS.devotion = -75, _HS.height = 155, _HS.race = "white", _HS.eyeColor = "blue-green", _HS.override_H_Color = 1, _HS.hColor = "blue", _HS.pubicHColor = "blue", _HS.override_Skin = 1, _HS.skin = "spray tanned", _HS.hLength = 30, _HS.hStyle = "short, spiky, with a long shoulder-length lock leading from her temples down, one on each side", _HS.boobs = 650, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has a vertical scar through her right eye, is a dabbling artist, and is an oviposition fetishist.">>
<<set $heroSlaves.push(_HS)>>
/*Added combat skill, increased health, added origin -BoneyM*/
@@ -257,7 +257,7 @@
/*Corrected customdesc syntax -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Aveline", _HS.birthName = "Aveline", _HS.origin = "She was sold into slavery from a remote, primitive village.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 34, _HS.physicalAge = 34, _HS.visualAge = 34, _HS.ovaryAge = 34, _HS.health = 20, _HS.devotion = -75, _HS.skin = "tanned", _HS.hLength = 25, _HS.hStyle = "in a bob", _HS.boobs = 400, _HS.butt = 3, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.stampTat = "She has a barcode tattooed above her butt.">>
+<<set _HS.slaveName = "Aveline", _HS.birthName = "Aveline", _HS.origin = "She was sold into slavery from a remote, primitive village.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 34, _HS.physicalAge = 34, _HS.visualAge = 34, _HS.ovaryAge = 34, _HS.health = 20, _HS.devotion = -75, _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 25, _HS.hStyle = "in a bob", _HS.boobs = 400, _HS.butt = 3, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.stampTat = "She has a barcode tattooed above her butt.">>
<<set $heroSlaves.push(_HS)>>
/*Added barcode tattoo and origin -BoneyM*/
@@ -353,7 +353,7 @@
/*First slave that didn't need fixing -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Ervona", _HS.birthName = "Ervona", _HS.origin = "She was groomed just for you and believes herself to be madly in love with you.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 40, _HS.devotion = 100, _HS.height = 178, _HS.override_H_Color = 1, _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "bronzed", _HS.hLength = 25, _HS.hStyle = "chin length", _HS.boobs = 500, _HS.nipples = "inverted", _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.clitPiercing = 1, _HS.ovaries = 1, _HS.clothes = "attractive lingerie", _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXY = 40>>
+<<set _HS.slaveName = "Ervona", _HS.birthName = "Ervona", _HS.origin = "She was groomed just for you and believes herself to be madly in love with you.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 40, _HS.devotion = 100, _HS.height = 178, _HS.override_H_Color = 1, _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "bronze", _HS.hLength = 25, _HS.hStyle = "chin length", _HS.boobs = 500, _HS.nipples = "inverted", _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.clitPiercing = 1, _HS.ovaries = 1, _HS.clothes = "attractive lingerie", _HS.intelligence = 30, _HS.intelligenceImplant = 30, _HS.attrXY = 40>>
<<set $heroSlaves.push(_HS)>>
/*love*/
/*Added origin, removed it from customdesc. Increased health.*/
@@ -417,7 +417,7 @@
/*martin's sibling*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Yvonne", _HS.birthName = "Yvonne", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, _HS.health = 20, _HS.devotion = 100, _HS.height = 190, _HS.eyeColor = "hazel", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "lightened", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 700, _HS.nipplesPiercing = 1, _HS.butt = 2, _HS.face = 55, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.attrXY = 40, _HS.fetish = "pregnancy">>
+<<set _HS.slaveName = "Yvonne", _HS.birthName = "Yvonne", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, _HS.health = 20, _HS.devotion = 100, _HS.height = 190, _HS.eyeColor = "hazel", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "light", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 700, _HS.nipplesPiercing = 1, _HS.butt = 2, _HS.face = 55, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.attrXY = 40, _HS.fetish = "pregnancy">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
@@ -425,7 +425,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Lilliana", _HS.birthName = "Zuzanna", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.ovaryAge = 25, _HS.health = 13, _HS.devotion = 100, _HS.muscles = 100, _HS.height = 190, _HS.eyeColor = "white", _HS.eyes = -2, _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "white with red stripes", _HS.eyebrowHColor = "white", _HS.pubicHColor = "white", _HS.underArmHColor = "white", _HS.skin = "tanned", _HS.hLength = 100, _HS.hStyle = "back in a large ass length braid", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 400, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.face = 15, _HS.faceImplant = 65, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.makeup = 2, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.eyebrowPiercing = 1, _HS.skill.whore = 15, _HS.skill.entertainment = 15, _HS.skill.combat = 1, _HS.clothes = "nice business attire", _HS.collar = "leather with cowbell", _HS.shoes = "heels", _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Lilliana", _HS.birthName = "Zuzanna", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.ovaryAge = 25, _HS.health = 13, _HS.devotion = 100, _HS.muscles = 100, _HS.height = 190, _HS.eyeColor = "white", _HS.eyes = -2, _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "white with red stripes", _HS.eyebrowHColor = "white", _HS.pubicHColor = "white", _HS.underArmHColor = "white", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 100, _HS.hStyle = "back in a large ass length braid", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 400, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.face = 15, _HS.faceImplant = 65, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.makeup = 2, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.eyebrowPiercing = 1, _HS.skill.whore = 15, _HS.skill.entertainment = 15, _HS.skill.combat = 1, _HS.clothes = "nice business attire", _HS.collar = "leather with cowbell", _HS.shoes = "heels", _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*Blind*/
@@ -467,12 +467,12 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Caroline", _HS.birthName = "Carl", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She was once a rising free cities politician who argued for compulsory female enslavement, but she became an addict, fell into debt, and was subsequently enslaved.", _HS.birthWeek = random(0,51), _HS.genes = "XY", _HS.actualAge = 44, _HS.physicalAge = 44, _HS.visualAge = 44, _HS.ovaryAge = 44, _HS.health = 60, _HS.devotion = 90, _HS.height = 145, _HS.heightImplant = -1, _HS.race = "white", _HS.nationality = "French", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "tanned", _HS.hLength = 70, _HS.hStyle = "ass-length", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 1100, _HS.boobsImplant = 400, _HS.nipplesPiercing = 1, _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 55, _HS.lipsImplant = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.preg = -2, _HS.anus = 2, _HS.anusTat = "bleached", _HS.makeup = 3, _HS.nails = 1, _HS.earPiercing = 1, _HS.navelPiercing = 1, _HS.legsTat = "degradation", _HS.stampTat = "degradation", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 15, _HS.skill.entertainment = 35, _HS.drugs = "breast injections", _HS.addict = 1, _HS.clothes = "slutty jewelry", _HS.collar = "tight steel", _HS.intelligence = -90, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has a tattoo down her left arm, which reads 'Once a tall, muscular, handsome man with a big dick and big balls.'", _HS.customDesc = "Since becoming a slave she has been turned into a little bimbo.">>
+<<set _HS.slaveName = "Caroline", _HS.birthName = "Carl", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She was once a rising free cities politician who argued for compulsory female enslavement, but she became an addict, fell into debt, and was subsequently enslaved.", _HS.birthWeek = random(0,51), _HS.genes = "XY", _HS.actualAge = 44, _HS.physicalAge = 44, _HS.visualAge = 44, _HS.ovaryAge = 44, _HS.health = 60, _HS.devotion = 90, _HS.height = 145, _HS.heightImplant = -1, _HS.race = "white", _HS.nationality = "French", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "spray tanned", _HS.hLength = 70, _HS.hStyle = "ass-length", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 1100, _HS.boobsImplant = 400, _HS.nipplesPiercing = 1, _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 55, _HS.lipsImplant = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.preg = -2, _HS.anus = 2, _HS.anusTat = "bleached", _HS.makeup = 3, _HS.nails = 1, _HS.earPiercing = 1, _HS.navelPiercing = 1, _HS.legsTat = "degradation", _HS.stampTat = "degradation", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 15, _HS.skill.entertainment = 35, _HS.drugs = "breast injections", _HS.addict = 1, _HS.clothes = "slutty jewelry", _HS.collar = "tight steel", _HS.intelligence = -90, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has a tattoo down her left arm, which reads 'Once a tall, muscular, handsome man with a big dick and big balls.'", _HS.customDesc = "Since becoming a slave she has been turned into a little bimbo.">>
<<set $heroSlaves.push(_HS)>>
<<if $seePreg != 0>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Milkmaid' Megan", _HS.birthName = "Megan", _HS.origin = "She was sold to you from the public slave market, and was probably kidnapped or otherwise forced into slavery.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 34, _HS.physicalAge = 34, _HS.visualAge = 34, _HS.ovaryAge = 34, _HS.health = 100, _HS.devotion = 100, _HS.nationality = "American", _HS.skin = "lightened", _HS.hStyle = "long", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 1350, _HS.lactation = 1, _HS.lactationDuration = 4, _HS.butt = 3, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.preg = 27, _HS.pregType = 1, _HS.pregWeek = 27, _HS.pregKnown = 1, _HS.belly = 5000, _HS.bellyPreg = 5000, _HS.births = 1, _HS.birthsTotal = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.brand = "SLAVE", _HS.brandLocation = "buttocks", _HS.earPiercing = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 35, _HS.skill.combat = 0, _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.face = 0, _HS.intelligence = 0>>
+<<set _HS.slaveName = "'Milkmaid' Megan", _HS.birthName = "Megan", _HS.origin = "She was sold to you from the public slave market, and was probably kidnapped or otherwise forced into slavery.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 34, _HS.physicalAge = 34, _HS.visualAge = 34, _HS.ovaryAge = 34, _HS.health = 100, _HS.devotion = 100, _HS.nationality = "American", _HS.skin = "light", _HS.hStyle = "long", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 1350, _HS.lactation = 1, _HS.lactationDuration = 4, _HS.butt = 3, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.preg = 27, _HS.pregType = 1, _HS.pregWeek = 27, _HS.pregKnown = 1, _HS.belly = 5000, _HS.bellyPreg = 5000, _HS.births = 1, _HS.birthsTotal = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.brand = "SLAVE", _HS.brandLocation = "buttocks", _HS.earPiercing = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 35, _HS.skill.combat = 0, _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.face = 0, _HS.intelligence = 0>>
<<set $heroSlaves.push(_HS)>>
<</if>>
@@ -493,11 +493,11 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Annabelle", _HS.birthName = "Annabelle", _HS.origin = "She came to be a slave not long after fleeing farm life for the Free Cities.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = -65, _HS.height = 155, _HS.nationality = "American", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "tanned", _HS.hStyle = "braided into pigtails", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 500, _HS.butt = 4, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.skill.whore = 15, _HS.attrXY = 40, _HS.behavioralFlaw = "hates women", _HS.customDesc = "The pale skin within her tan lines is lightly freckled.", _HS.markings = "freckles">>
+<<set _HS.slaveName = "Annabelle", _HS.birthName = "Annabelle", _HS.origin = "She came to be a slave not long after fleeing farm life for the Free Cities.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = -65, _HS.height = 155, _HS.nationality = "American", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hStyle = "braided into pigtails", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 500, _HS.butt = 4, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.skill.whore = 15, _HS.attrXY = 40, _HS.behavioralFlaw = "hates women", _HS.customDesc = "The pale skin within her tan lines is lightly freckled.", _HS.markings = "freckles">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Vampire' Elvira", _HS.birthName = "Elvira", _HS.career = "service worker", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 20, _HS.physicalAge = 20, _HS.visualAge = 20, _HS.ovaryAge = 20, _HS.health = 90, _HS.devotion = 100, _HS.height = 145, _HS.nationality = "Swedish", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "tanned", _HS.hLength = 85, _HS.hStyle = "ass-length", _HS.waist = -55, _HS.boobs = 650, _HS.boobsImplant = 200, _HS.nipplesPiercing = 2, _HS.butt = 3, _HS.buttImplant = 1, _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 35, _HS.tonguePiercing = 1, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.brand = "your initials", _HS.brandLocation = "buttocks", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 15, _HS.livingRules = "luxurious", _HS.clothes = "choosing her own clothes", _HS.collar = "heavy gold", _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "'Vampire' Elvira", _HS.birthName = "Elvira", _HS.career = "a service worker", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 20, _HS.physicalAge = 20, _HS.visualAge = 20, _HS.ovaryAge = 20, _HS.health = 90, _HS.devotion = 100, _HS.height = 145, _HS.nationality = "Swedish", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 85, _HS.hStyle = "ass-length", _HS.waist = -55, _HS.boobs = 650, _HS.boobsImplant = 200, _HS.nipplesPiercing = 2, _HS.butt = 3, _HS.buttImplant = 1, _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 35, _HS.tonguePiercing = 1, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.brand = "your initials", _HS.brandLocation = "buttocks", _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 15, _HS.livingRules = "luxurious", _HS.clothes = "choosing her own clothes", _HS.collar = "heavy gold", _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
@@ -561,7 +561,7 @@
/*Tweaked smart piercing setting, corrected piercings -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Fleshlight", _HS.birthName = "Fleshlight", _HS.origin = "Nothing remains of the person she originally was, either mentally or physically.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 20, _HS.devotion = 60, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "tanned", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 800, _HS.boobsImplant = 600, _HS.butt = 5, _HS.buttImplant = 2, _HS.lips = 55, _HS.lipsImplant = 2, _HS.lipsTat = "permanent makeup", _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.makeup = 3, _HS.nails = 3, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "mindbroken", _HS.fetishKnown = 1, _HS.customDesc = "She has many surgical scars and something seems off about her.", _HS.scars = 2>>
+<<set _HS.slaveName = "Fleshlight", _HS.birthName = "Fleshlight", _HS.origin = "Nothing remains of the person she originally was, either mentally or physically.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 20, _HS.devotion = 60, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "spray tanned", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 800, _HS.boobsImplant = 600, _HS.butt = 5, _HS.buttImplant = 2, _HS.lips = 55, _HS.lipsImplant = 2, _HS.lipsTat = "permanent makeup", _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.makeup = 3, _HS.nails = 3, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "mindbroken", _HS.fetishKnown = 1, _HS.customDesc = "She has many surgical scars and something seems off about her.", _HS.scars = 2>>
<<set $heroSlaves.push(_HS)>>
/*heels*/
/*Added origin, makeup and nails, changed eyes -BoneyM*/
diff --git a/src/npc/databases/ddSlavesDatabase.tw b/src/npc/databases/ddSlavesDatabase.tw
index 2ca849d5dba0406443655d75f282352ec8f429b2..c5fcce7085c2d426a291e5421fceaa40d6e31e43 100644
--- a/src/npc/databases/ddSlavesDatabase.tw
+++ b/src/npc/databases/ddSlavesDatabase.tw
@@ -28,7 +28,7 @@
/*Added origin, removed anal virginity -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Mrs.' Maria", _HS.birthName = "Maria", _HS.genes = "XY", _HS.origin = "She was once a successful drug lord, but was turned into her current self after making too many enemies.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = 100, _HS.devotion = 75, _HS.muscles = 20, _HS.height = 175, _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "tanned", _HS.hLength = 10, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.nipplesPiercing = 1, _HS.lips = 55, _HS.lipsImplant = 10, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.clitSetting = "anal", _HS.dick = 5, _HS.anus = 2, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a brand of a former master on her left testicle.", _HS.brand = "a brand of a former master", _HS.stampTat = "She has a fairly generic tramp stamp.", _HS.career = "a gang leader">>
+<<set _HS.slaveName = "'Mrs.' Maria", _HS.birthName = "Maria", _HS.genes = "XY", _HS.origin = "She was once a successful drug lord, but was turned into her current self after making too many enemies.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = 100, _HS.devotion = 75, _HS.muscles = 20, _HS.height = 175, _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "spray tanned", _HS.hLength = 10, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.nipplesPiercing = 1, _HS.lips = 55, _HS.lipsImplant = 10, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.clitSetting = "anal", _HS.dick = 5, _HS.anus = 2, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a brand of a former master on her left testicle.", _HS.brand = "a brand of a former master", _HS.stampTat = "She has a fairly generic tramp stamp.", _HS.career = "a gang leader">>
<<set $heroSlaves.push(_HS)>>
/*branded nut*/
/*Added brand to customtat, added origin -BoneyM*/
@@ -112,11 +112,11 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Buns' Jones", _HS.birthName = "Jones", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.devotion = 31, _HS.nationality = "Chinese", _HS.race = "asian", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "dark brown with bleached highlights", _HS.eyebrowHColor = "black", _HS.pubicHColor = "black", _HS.underArmHColor = "black", _HS.skin = "tanned", _HS.hLength = 60, _HS.hStyle = "long and braided into a ponytail", _HS.waist = -55, _HS.boobs = 200, _HS.butt = 8, _HS.lips = 35, _HS.vagina = -1, _HS.vaginaTat = "rude words", _HS.preg = -2, _HS.dick = 3, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.anusTat = "flowers", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.shouldersTat = "tribal patterns", _HS.armsTat = "rude words", _HS.stampTat = "rude words", _HS.skill.oral = 100, _HS.skill.entertainment = 15, _HS.clothes = "a slutty outfit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customDesc = "A palm sized ring adorns the end of her braid, perfect for grabbing and pulling during any occasion.">>
+<<set _HS.slaveName = "'Buns' Jones", _HS.birthName = "Jones", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.devotion = 31, _HS.nationality = "Chinese", _HS.race = "asian", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "dark brown with bleached highlights", _HS.eyebrowHColor = "black", _HS.pubicHColor = "black", _HS.underArmHColor = "black", _HS.override_Skin = 1, _HS.skin = "spray tanned", _HS.hLength = 60, _HS.hStyle = "long and braided into a ponytail", _HS.waist = -55, _HS.boobs = 200, _HS.butt = 8, _HS.lips = 35, _HS.vagina = -1, _HS.vaginaTat = "rude words", _HS.preg = -2, _HS.dick = 3, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.anusTat = "flowers", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.shouldersTat = "tribal patterns", _HS.armsTat = "rude words", _HS.stampTat = "rude words", _HS.skill.oral = 100, _HS.skill.entertainment = 15, _HS.clothes = "a slutty outfit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customDesc = "A palm sized ring adorns the end of her braid, perfect for grabbing and pulling during any occasion.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Mistress Izzy", _HS.birthName = "Isabella", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 70, _HS.devotion = 100, _HS.eyeColor = "black", _HS.hColor = "sparkling and shiny golden red", _HS.pubicHColor = "blonde", _HS.skin = "tanned", _HS.hLength = 60, _HS.hStyle = "in thick long heavy braids", _HS.waist = -100, _HS.boobs = 9200, _HS.boobsImplant = 6000, _HS.nipplesPiercing = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.milk = 3010, _HS.butt = 8, _HS.buttImplant = 1, _HS.buttTat = "bovine patterns", _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 55, _HS.lipsImplant = 2, _HS.lipsPiercing = 2, _HS.lipsTat = "bovine patterns", _HS.tonguePiercing = 2, _HS.vagina = 2, _HS.vaginaPiercing = 2, _HS.vaginaTat = "bovine patterns", _HS.preg = -2, _HS.clitPiercing = 3, _HS.anus = 2, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 3, _HS.scrotum = 2, _HS.anusPiercing = 2, _HS.anusTat = "bovine patterns", _HS.makeup = 2, _HS.nails = 2, _HS.brand = "SLUT", _HS.brandLocation = "buttocks", _HS.earPiercing = 2, _HS.nosePiercing = 2, _HS.eyebrowPiercing = 2, _HS.navelPiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.vaginal = 35, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 35, _HS.collar = "leather with cowbell", _HS.shoes = "heels", _HS.intelligence = 20, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has tattoos of teasing, enticing messages begging others to come taste her addictive milk.", _HS.customDesc = "Her musky milky aura drives men and women around her giggly and dumb with lust.">>
+<<set _HS.slaveName = "Mistress Izzy", _HS.birthName = "Isabella", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 70, _HS.devotion = 100, _HS.eyeColor = "black", _HS.hColor = "sparkling and shiny golden red", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 60, _HS.hStyle = "in thick long heavy braids", _HS.waist = -100, _HS.boobs = 9200, _HS.boobsImplant = 6000, _HS.nipplesPiercing = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.milk = 3010, _HS.butt = 8, _HS.buttImplant = 1, _HS.buttTat = "bovine patterns", _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 55, _HS.lipsImplant = 2, _HS.lipsPiercing = 2, _HS.lipsTat = "bovine patterns", _HS.tonguePiercing = 2, _HS.vagina = 2, _HS.vaginaPiercing = 2, _HS.vaginaTat = "bovine patterns", _HS.preg = -2, _HS.clitPiercing = 3, _HS.anus = 2, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 3, _HS.scrotum = 2, _HS.anusPiercing = 2, _HS.anusTat = "bovine patterns", _HS.makeup = 2, _HS.nails = 2, _HS.brand = "SLUT", _HS.brandLocation = "buttocks", _HS.earPiercing = 2, _HS.nosePiercing = 2, _HS.eyebrowPiercing = 2, _HS.navelPiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.vaginal = 35, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.skill.entertainment = 35, _HS.collar = "leather with cowbell", _HS.shoes = "heels", _HS.intelligence = 20, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has tattoos of teasing, enticing messages begging others to come taste her addictive milk.", _HS.customDesc = "Her musky milky aura drives men and women around her giggly and dumb with lust.">>
<<set $heroSlaves.push(_HS)>>
/*Dropped desc = She has two cute horns protruding from her forehead. A few addicted milkslaves of her own tag along behind her. */
@@ -125,7 +125,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Aisha", _HS.birthName = "Aicha", _HS.genes = "XY", _HS.origin = "She sold herself into slavery to escape a life of boredom.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = -20, _HS.devotion = 45, _HS.height = 155, _HS.heightImplant = -1, _HS.race = "middle eastern", _HS.override_Eye_Color = 1, _HS.eyeColor = "blue", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "peachy fading into a red ombre at the bottom", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "lightened", _HS.hLength = 30, _HS.hStyle = "shoulder-length in a hime cut", _HS.waist = -55, _HS.boobs = 250, _HS.butt = 3.5, _HS.face = 55, _HS.faceImplant = 65, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.anus = 1, _HS.dick = 5, _HS.dickTat = "flowers", _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.anusPiercing = 1, _HS.anusTat = "flowers", _HS.brand = "your initials", _HS.brandLocation = "back", _HS.earPiercing = 1, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.skill.entertainment = 15, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.customTat = "She has tattooed petals trailing from the nape of her neck down her back, ending between her butt cheeks.", _HS.customDesc = "Her red pubic hair is waxed into the shape of a heart. She has bright blue eyeshadow on her bottom lids.", _HS.pubicHStyle = "waxed">>
+<<set _HS.slaveName = "Aisha", _HS.birthName = "Aicha", _HS.genes = "XY", _HS.origin = "She sold herself into slavery to escape a life of boredom.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = -20, _HS.devotion = 45, _HS.height = 155, _HS.heightImplant = -1, _HS.race = "middle eastern", _HS.override_Eye_Color = 1, _HS.eyeColor = "blue", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "peachy fading into a red ombre at the bottom", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "light", _HS.hLength = 30, _HS.hStyle = "shoulder-length in a hime cut", _HS.waist = -55, _HS.boobs = 250, _HS.butt = 3.5, _HS.face = 55, _HS.faceImplant = 65, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.anus = 1, _HS.dick = 5, _HS.dickTat = "flowers", _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.anusPiercing = 1, _HS.anusTat = "flowers", _HS.brand = "your initials", _HS.brandLocation = "back", _HS.earPiercing = 1, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.skill.entertainment = 15, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.customTat = "She has tattooed petals trailing from the nape of her neck down her back, ending between her butt cheeks.", _HS.customDesc = "Her red pubic hair is waxed into the shape of a heart. She has bright blue eyeshadow on her bottom lids.", _HS.pubicHStyle = "waxed">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
@@ -133,7 +133,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Dragon Goddess' Chae-won", _HS.genes = "XY", _HS.birthName = "Chae-won", _HS.origin = "She is a former Kkangpae gang member who was sold into slavery by her former boss as a punishment.", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She is a famed Free Cities whore, and commands top prices.", _HS.birthWeek = random(0,51), _HS.actualAge = 26, _HS.physicalAge = 26, _HS.visualAge = 26, _HS.ovaryAge = 26, _HS.health = 50, _HS.devotion = 31, _HS.muscles = 50, _HS.height = 155, _HS.nationality = "Korean", _HS.race = "asian", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "onyx black and rainbow-streaked", _HS.eyebrowHColor = "black", _HS.pubicHColor = "black", _HS.underArmHColor = "black", _HS.skin = "tanned", _HS.hLength = 60, _HS.hStyle = "styled in high chignon resembling a traditional Japanese geisha's Shimada hairstyle, with plenty of decorated hairpins", _HS.waist = -55, _HS.boobs = 6000, _HS.boobsImplant = 3000, _HS.nipples = "huge", _HS.butt = 4.5, _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 35, _HS.lipsTat = "permanent makeup", _HS.tonguePiercing = 1, _HS.vagina = -1, _HS.preg = -2, _HS.anus = 1, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 4, _HS.scrotum = 4, _HS.anusTat = "bleached", _HS.nails = 3, _HS.earPiercing = 1, _HS.legsTat = "flowers", _HS.stampTat = "flowers", _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.clothes = "a slave gown", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -3, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has two neon-blue butterflies tattooed on her right temple and one more right above right eyebrow; a bright blue, luminescent tattoo of an oriental dragon is intertwining with floral tattoos on her right leg.", _HS.customDesc = "She is almost never seen without her long, thin, lavishly decorated smoking pipe, either holding it in hand, or carrying it tucked in her chignon.", _HS.career = "a gang member">>
+<<set _HS.slaveName = "'Dragon Goddess' Chae-won", _HS.genes = "XY", _HS.birthName = "Chae-won", _HS.origin = "She is a former Kkangpae gang member who was sold into slavery by her former boss as a punishment.", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She is a famed Free Cities whore, and commands top prices.", _HS.birthWeek = random(0,51), _HS.actualAge = 26, _HS.physicalAge = 26, _HS.visualAge = 26, _HS.ovaryAge = 26, _HS.health = 50, _HS.devotion = 31, _HS.muscles = 50, _HS.height = 155, _HS.nationality = "Korean", _HS.race = "asian", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "onyx black and rainbow-streaked", _HS.eyebrowHColor = "black", _HS.pubicHColor = "black", _HS.underArmHColor = "black", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 60, _HS.hStyle = "styled in high chignon resembling a traditional Japanese geisha's Shimada hairstyle, with plenty of decorated hairpins", _HS.waist = -55, _HS.boobs = 6000, _HS.boobsImplant = 3000, _HS.nipples = "huge", _HS.butt = 4.5, _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 35, _HS.lipsTat = "permanent makeup", _HS.tonguePiercing = 1, _HS.vagina = -1, _HS.preg = -2, _HS.anus = 1, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 4, _HS.scrotum = 4, _HS.anusTat = "bleached", _HS.nails = 3, _HS.earPiercing = 1, _HS.legsTat = "flowers", _HS.stampTat = "flowers", _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whore = 100, _HS.clothes = "a slave gown", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -3, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has two neon-blue butterflies tattooed on her right temple and one more right above right eyebrow; a bright blue, luminescent tattoo of an oriental dragon is intertwining with floral tattoos on her right leg.", _HS.customDesc = "She is almost never seen without her long, thin, lavishly decorated smoking pipe, either holding it in hand, or carrying it tucked in her chignon.", _HS.career = "a gang member">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
@@ -171,7 +171,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Buck", _HS.birthName = "Buck", _HS.genes = "XY", _HS.origin = "She was a soldier before being enslaved.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 90, _HS.devotion = -100, _HS.muscles = 50, _HS.height = 190, _HS.eyeColor = "blue", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "tanned", _HS.hLength = 0, _HS.prostate = 1, _HS.hStyle = "shaved", _HS.waist = -55, _HS.boobs = 100, _HS.nipplesPiercing = 1, _HS.butt = 1, _HS.face = 15, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 5, _HS.analArea = 1, _HS.prostate = 1, _HS.balls = 3, _HS.scrotum = 3, _HS.anusTat = "bleached", _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.navelPiercing = 1, _HS.skill.combat = 1, _HS.intelligence = -40, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.behavioralFlaw = "bitchy">>
+<<set _HS.slaveName = "Buck", _HS.birthName = "Buck", _HS.genes = "XY", _HS.origin = "She was a soldier before being enslaved.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 90, _HS.devotion = -100, _HS.muscles = 50, _HS.height = 190, _HS.eyeColor = "blue", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.override_Skin = 1, _HS.skin = "spray tanned", _HS.hLength = 0, _HS.prostate = 1, _HS.hStyle = "shaved", _HS.waist = -55, _HS.boobs = 100, _HS.nipplesPiercing = 1, _HS.butt = 1, _HS.face = 15, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 5, _HS.analArea = 1, _HS.prostate = 1, _HS.balls = 3, _HS.scrotum = 3, _HS.anusTat = "bleached", _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.navelPiercing = 1, _HS.skill.combat = 1, _HS.intelligence = -40, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.behavioralFlaw = "bitchy">>
<<set $heroSlaves.push(_HS)>>
/*dickskilled*/
@@ -180,7 +180,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Danny 'The D'", _HS.slaveSurname = "Ildoe", _HS.birthName = "Danny 'The D'", _HS.birthSurname = "Ildoe", _HS.origin = "Born without limbs and abandoned by her parents, she was taken in by a posh family, given a massive cock and trained to be the wealthy lady's perfect living sex toy.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.visualAge = 28, _HS.physicalAge = 28, _HS.ovaryAge = 28, _HS.health = 100, _HS.amp = 1, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 94, _HS.eyeColor = "blue", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "tanned", _HS.hLength = 10, _HS.hStyle = "short", _HS.waist = 55, _HS.boobs = 50, _HS.hips = -1, _HS.butt = 0, _HS.face = 45, _HS.vagina = -1, _HS.preg = 0, _HS.dick = 6, _HS.balls = 10, _HS.scrotum = 7, _HS.prostate = 2, _HS.anusTat = "bleached", _HS.energy = 95, _HS.intelligenceImplant = 30, _HS.attrXX = 100, _HS.attrXY = 0, _HS.skill.oral = 95, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.behavioralQuirk = "advocate">>
+<<set _HS.slaveName = "Danny 'The D'", _HS.slaveSurname = "Ildoe", _HS.birthName = "Danny 'The D'", _HS.birthSurname = "Ildoe", _HS.origin = "Born without limbs and abandoned by her parents, she was taken in by a posh family, given a massive cock and trained to be the wealthy lady's perfect living sex toy.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.visualAge = 28, _HS.physicalAge = 28, _HS.ovaryAge = 28, _HS.health = 100, _HS.amp = 1, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 94, _HS.eyeColor = "blue", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.override_Skin = 1, _HS.skin = "spray tanned", _HS.hLength = 10, _HS.hStyle = "short", _HS.waist = 55, _HS.boobs = 50, _HS.hips = -1, _HS.butt = 0, _HS.face = 45, _HS.vagina = -1, _HS.preg = 0, _HS.dick = 6, _HS.balls = 10, _HS.scrotum = 7, _HS.prostate = 2, _HS.anusTat = "bleached", _HS.energy = 95, _HS.intelligenceImplant = 30, _HS.attrXX = 100, _HS.attrXY = 0, _HS.skill.oral = 95, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.behavioralQuirk = "advocate">>
<<set $heroSlaves.push(_HS)>>
/* needed an amputated slave for debug reasons -prndev */
diff --git a/src/npc/databases/dfSlavesDatabase.tw b/src/npc/databases/dfSlavesDatabase.tw
index 91490615c5925716753acb78d342cd2c125174f7..1ca124f0c95cbb1c2218d9502f03bbee5cbbe675 100644
--- a/src/npc/databases/dfSlavesDatabase.tw
+++ b/src/npc/databases/dfSlavesDatabase.tw
@@ -7,17 +7,17 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Strawberry", _HS.birthName = "Strawberry", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 30, _HS.physicalAge = 30, _HS.visualAge = 30, _HS.ovaryAge = 30, _HS.health = 20, _HS.devotion = 40, _HS.height = 175, _HS.eyeColor = "dark brown", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "tanned", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1000, _HS.boobsImplant = 400, _HS.nipplesPiercing = 1, _HS.butt = 5, _HS.buttImplant = 2, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.customTat = "Strawberries are tattooed on her right buttock and on her left cheek.", _HS.clitPiercing = 2, _HS.birthsTotal = 2>>
+<<set _HS.slaveName = "Strawberry", _HS.birthName = "Strawberry", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 30, _HS.physicalAge = 30, _HS.visualAge = 30, _HS.ovaryAge = 30, _HS.health = 20, _HS.devotion = 40, _HS.height = 175, _HS.eyeColor = "dark brown", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1000, _HS.boobsImplant = 400, _HS.nipplesPiercing = 1, _HS.butt = 5, _HS.buttImplant = 2, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.customTat = "Strawberries are tattooed on her right buttock and on her left cheek.", _HS.clitPiercing = 2, _HS.birthsTotal = 2>>
/*vibe nips, muscles*/
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Melon", _HS.birthName = "Melon", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 20, _HS.devotion = 50, _HS.height = 175, _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "tanned", _HS.hLength = 10, _HS.hStyle = "short", _HS.pubicHStyle = "waxed", _HS.boobs = 1800, _HS.boobsImplant = 800, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 100, _HS.skill.anal = 15, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Watermelons are tattooed on her buttocks and on her face.", _HS.teeth = "removable", _HS.clitPiercing = 2, _HS.lipsPiercing = 2, _HS.birthsTotal = 1>>
+<<set _HS.slaveName = "Melon", _HS.birthName = "Melon", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 20, _HS.devotion = 50, _HS.height = 175, _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 10, _HS.hStyle = "short", _HS.pubicHStyle = "waxed", _HS.boobs = 1800, _HS.boobsImplant = 800, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 100, _HS.skill.anal = 15, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Watermelons are tattooed on her buttocks and on her face.", _HS.teeth = "removable", _HS.clitPiercing = 2, _HS.lipsPiercing = 2, _HS.birthsTotal = 1>>
/*vibe nips, saliva implant*/
<<set $heroSlaves.push(_HS)>>
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Carambola", _HS.birthName = "Carambola", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.ovaryAge = 25, _HS.health = 20, _HS.devotion = 90, _HS.height = 175, _HS.eyeColor = "light green", _HS.hColor = "dark blonde", _HS.pubicHColor = "dark blonde", _HS.skin = "tanned", _HS.hLength = 60, _HS.hStyle = "curly and long, and in pigtails", _HS.pubicHStyle = "waxed", _HS.boobs = 650, _HS.nipplesPiercing = 1, _HS.butt = 8, _HS.buttImplant = 4, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 3, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 100, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "Carambolas — starfruits — are tattooed on her buttocks and on her face.", _HS.clitPiercing = 2, _HS.tonguePiercing = 1, _HS.clothes = "no clothing", _HS.collar = "bell collar", _HS.heels = 1>>
+<<set _HS.slaveName = "Carambola", _HS.birthName = "Carambola", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.ovaryAge = 25, _HS.health = 20, _HS.devotion = 90, _HS.height = 175, _HS.eyeColor = "light green", _HS.hColor = "dark blonde", _HS.pubicHColor = "dark blonde", _HS.override_Skin = 1, _HS.skin = "sun tanned", _HS.hLength = 60, _HS.hStyle = "curly and long, and in pigtails", _HS.pubicHStyle = "waxed", _HS.boobs = 650, _HS.nipplesPiercing = 1, _HS.butt = 8, _HS.buttImplant = 4, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 3, _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 100, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "Carambolas — starfruits — are tattooed on her buttocks and on her face.", _HS.clitPiercing = 2, _HS.tonguePiercing = 1, _HS.clothes = "no clothing", _HS.collar = "bell collar", _HS.heels = 1>>
/*vibe nips, saliva implant lube*/
<<set $heroSlaves.push(_HS)>>
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index ed47234ff3fcefe2fdcf1117f867068a526b18be..874da2f5020545c23cc2a58b9def08af8a5325ed 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -736,28 +736,31 @@ __You are customizing this slave:__
<br>
<<options $activeSlave.skin>>
''Skin color:'' $activeSlave.skin
- <<option "pure white" "Pure White">>
- <<option "extremely pale" "Extremely Pale">>
- <<option "pale" "Pale">>
- <<option "extremely fair" "Extremely Fair">>
- <<option "very fair" "Very Fair">>
- <<option "fair" "Fair">>
- <<option "white" "White">>
- <<option "light" "Light">>
- <<option "lightened" "Lightened">>
- <<option "light olive" "Light Olive">>
- <<option "olive" "Olive">>
- <<option "natural" "Natural">>
- <<option "tanned" "Tanned">>
- <<option "bronzed" "Bronzed">>
- <<option "dark olive" "Dark Olive">>
- <<option "dark" "Dark">>
- <<option "light brown" "Light Brown">>
- <<option "brown" "Brown">>
- <<option "dark brown" "Dark Brown">>
- <<option "black" "Black">>
- <<option "ebony" "Ebony">>
- <<option "pure black" "Pure Black">>
+ <<option "pure white" "Pure White">>
+ <<option "ivory" "Ivory">>
+ <<option "white" "White">>
+ <<option "extremely pale" "Extremely Pale">>
+ <<option "very pale" "Very Pale">>
+ <<option "pale" "Pale">>
+ <<option "extremely fair" "Extremely Fair">>
+ <<option "very fair" "Very Fair">>
+ <<option "fair" "Fair">>
+ <<option "light" "Light">>
+ <<option "light olive" "Light Olive">>
+ <<option "tan" "Tan">>
+ <<option "olive" "Olive">>
+ <<option "bronze" "Bronze">>
+ <<option "dark olive" "Dark Olive">>
+ <<option "dark" "Dark">>
+ <<option "light beige" "Light Beige">>
+ <<option "beige" "Beige" >>
+ <<option "dark beige" "Dark Beige">>
+ <<option "light brown" "Light Brown">>
+ <<option "brown" "Brown">>
+ <<option "dark brown" "Dark Brown">>
+ <<option "black" "Black">>
+ <<option "ebony" "Ebony">>
+ <<option "pure black" "Pure Black">>
<<option>>
<<textbox2 "$activeSlave.skin" $activeSlave.skin "Starting Girls">>
<</options>>
@@ -1596,7 +1599,7 @@ __You are customizing this slave:__
<<link "Cali Girl">>
<<set $archetyped = 1, $activeSlave.nationality = "American", $fixedNationality = "American">>
<<StartingGirlsWorkaround>>
- <<set $activeSlave.eyeColor = "blue", $activeSlave.skin = "tanned", $activeSlave.hColor = "blonde", $activeSlave.pubicHColor = "blonde", $activeSlave.markings = "none", $activeSlave.face = 95, $activeSlave.muscles = 20, $activeSlave.weight = -20, $activeSlave.height = Math.round(Height.forAge(190, $activeSlave))>>
+ <<set $activeSlave.eyeColor = "blue", $activeSlave.skin = "sun tanned", $activeSlave.override_Skin = 1, $activeSlave.hColor = "blonde", $activeSlave.pubicHColor = "blonde", $activeSlave.markings = "none", $activeSlave.face = 95, $activeSlave.muscles = 20, $activeSlave.weight = -20, $activeSlave.height = Math.round(Height.forAge(190, $activeSlave))>>
<<goto "Starting Girls">>
<</link>>
//Tall, taut, and tan//
diff --git a/src/pregmod/electiveSurgery.tw b/src/pregmod/electiveSurgery.tw
index e3638da4bb35d81235c1b3756a5491762eb7323f..12ceb387b20e5449ed1507ffbffcba3548766e77 100644
--- a/src/pregmod/electiveSurgery.tw
+++ b/src/pregmod/electiveSurgery.tw
@@ -58,75 +58,83 @@ You're @@.orange;$PC.actualAge years old.@@
You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original skin tone was $PC.origSkin.<</if>>
<br>
<<if $PC.skin != $PC.origSkin>>
- [[Restore natural color|PC Surgery Degradation][$PC.skin = $PC.origSkin, cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Restore natural color|PC Surgery Degradation][$PC.skin = $PC.origSkin, cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "pure white">>
- [[Pure White|PC Surgery Degradation][$PC.skin = "pure white", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Pure White|PC Surgery Degradation][$PC.skin = "pure white", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
+<<if $PC.skin != "ivory">>
+ [[Ivory|PC Surgery Degradation][$PC.skin = "ivory", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
+<</if>>
+<<if $PC.skin != "white">>
+ [[White|PC Surgery Degradation][$PC.skin = "white", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "extremely pale">>
- [[Extremely Pale|PC Surgery Degradation][$PC.skin = "extremely pale", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Extremely Pale|PC Surgery Degradation][$PC.skin = "extremely pale", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
+<</if>>
+<<if $PC.skin != "very pale">>
+ [[Very Pale|PC Surgery Degradation][$PC.skin = "very pale", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "pale">>
- [[Pale|PC Surgery Degradation][$PC.skin = "pale", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Pale|PC Surgery Degradation][$PC.skin = "pale", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "extremely fair">>
- [[Extremely Fair|PC Surgery Degradation][$PC.skin = "extremely fair", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Extremely Fair|PC Surgery Degradation][$PC.skin = "extremely fair", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "very fair">>
- [[Very Fair|PC Surgery Degradation][$PC.skin = "very fair", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Very Fair|PC Surgery Degradation][$PC.skin = "very fair", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "fair">>
- [[Fair|PC Surgery Degradation][$PC.skin = "fair", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
-<</if>>
-<<if $PC.skin != "white">>
- [[White|PC Surgery Degradation][$PC.skin = "white", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Fair|PC Surgery Degradation][$PC.skin = "fair", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "light">>
- [[Light|PC Surgery Degradation][$PC.skin = "light", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
-<</if>>
-<<if $PC.skin != "lightened">>
- [[Lightened|PC Surgery Degradation][$PC.skin = "lightened", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Light|PC Surgery Degradation][$PC.skin = "light", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "light olive">>
- [[Light Olive|PC Surgery Degradation][$PC.skin = "light olive", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Light Olive|PC Surgery Degradation][$PC.skin = "light olive", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
-<<if $PC.skin != "olive">>
- [[Olive|PC Surgery Degradation][$PC.skin = "olive", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
-<</if>>
-<<if $PC.skin != "natural">>
- [[Natural|PC Surgery Degradation][$PC.skin = "natural", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+<<if $PC.skin != "tan">>
+ [[Tan|PC Surgery Degradation][$PC.skin = "tan", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
-<<if $PC.skin != "tanned">>
- [[Tanned|PC Surgery Degradation][$PC.skin = "tanned", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+<<if $PC.skin != "olive">>
+ [[Olive|PC Surgery Degradation][$PC.skin = "olive", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
-<<if $PC.skin != "bronzed">>
- [[Bronzed|PC Surgery Degradation][$PC.skin = "bronzed", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+<<if $PC.skin != "bronze">>
+ [[Bronze|PC Surgery Degradation][$PC.skin = "bronze", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "dark olive">>
- [[Dark Olive|PC Surgery Degradation][$PC.skin = "dark olive", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Dark Olive|PC Surgery Degradation][$PC.skin = "dark olive", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "dark">>
- [[Dark|PC Surgery Degradation][$PC.skin = "dark", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Dark|PC Surgery Degradation][$PC.skin = "dark", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
+<</if>>
+<<if $PC.skin != "light beige">>
+ [[Light Beige|PC Surgery Degradation][$PC.skin = "light beige", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
+<</if>>
+<<if $PC.skin != "beige">>
+ [[Beige|PC Surgery Degradation][$PC.skin = "beige", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
+<</if>>
+<<if $PC.skin != "dark beige">>
+ [[Dark Beige|PC Surgery Degradation][$PC.skin = "dark beige", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "light brown">>
- [[Light Brown|PC Surgery Degradation][$PC.skin = "light brown", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Light Brown|PC Surgery Degradation][$PC.skin = "light brown", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "brown">>
- [[Brown|PC Surgery Degradation][$PC.skin = "brown", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Brown|PC Surgery Degradation][$PC.skin = "brown", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "dark brown">>
- [[Dark Brown|PC Surgery Degradation][$PC.skin = "dark brown", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Dark Brown|PC Surgery Degradation][$PC.skin = "dark brown", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "black">>
- [[Black|PC Surgery Degradation][$PC.skin = "black", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Black|PC Surgery Degradation][$PC.skin = "black", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "ebony">>
- [[Ebony|PC Surgery Degradation][$PC.skin = "ebony", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Ebony|PC Surgery Degradation][$PC.skin = "ebony", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "pure black">>
- [[Pure Black|PC Surgery Degradation][$PC.skin = "pure black", cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]] |
+ [[Pure Black|PC Surgery Degradation][$PC.skin = "pure black", cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]]
<</if>>
-[[Custom Color|PC Skin Workaround][cashX(-2000, "PCmedical"), $surgeryType = "skinTone"]]
+[[Custom Color|PC Skin Workaround][cashX(forceNeg(Math.trunc(2000 * $upgradeMultiplierMedicine)), "PCmedical"), $surgeryType = "skinTone"]]
<br><br>"Maybe some breast work? I assure you they are lovely." She says as she brushes the back of your head with her own pair. "@@.yellowgreen;<<print cashFormat(5000)>>@@ for a reduction, @@.yellowgreen;<<print cashFormat(10000)>>@@ for implants, that includes size ups, and @@.yellowgreen;<<print cashFormat(15000)>>@@ for additional breast tissue. That last one might as well be real!<<if $PC.boobsBonus <= 0>> With a little work, we can even remove a small amount of fat from your breasts to bring your cup size down without damaging their inner workings. Though we'll have to build them up some before we can stick reasonable implants into you.<</if>>"<br>
diff --git a/src/pregmod/fFeet.tw b/src/pregmod/fFeet.tw
index 0c80bc675a7cc29232df385faf2fbabe6c4bda62..2264e05cbce0a89e33381bb46d715897d4341ecb 100644
--- a/src/pregmod/fFeet.tw
+++ b/src/pregmod/fFeet.tw
@@ -6,40 +6,40 @@
<<set _footSeed = random(1,100)>>
<<if $activeSlave.weight > 190>>
- <<set _thighs = 'massive flabby'>>
+ <<set _thighs = "massive flabby">>
<<elseif $activeSlave.weight > 160>>
- <<set _thighs = 'thick flabby'>>
+ <<set _thighs = "thick flabby">>
<<elseif $activeSlave.weight > 130>>
- <<set _thighs = 'flabby'>>
+ <<set _thighs = "flabby">>
<<elseif $activeSlave.weight > 95>>
- <<set _thighs = 'fat'>>
+ <<set _thighs = "fat">>
<<elseif $activeSlave.weight > 30>>
<<if $activeSlave.muscles > 75>>
- <<set _thighs = 'toned fat'>>
+ <<set _thighs = "toned fat">>
<<elseif $activeSlave.muscles < 15>>
- <<set _thighs = 'fat'>>
+ <<set _thighs = "fat">>
<<else>>
- <<set _thighs = 'plush'>>
+ <<set _thighs = "plush">>
<</if>>
<<elseif $activeSlave.weight > 10>>
<<if $activeSlave.muscles > 70>>
- <<set _thighs = 'thick muscular'>>
+ <<set _thighs = "thick muscular">>
<<elseif $activeSlave.muscles > 20>>
- <<set _thighs = 'soft toned'>>
+ <<set _thighs = "soft toned">>
<<else>>
- <<set _thighs = 'soft'>>
+ <<set _thighs = "soft">>
<</if>>
<<elseif $activeSlave.weight >= -10>>
<<if $activeSlave.muscles > 70>>
- <<set _thighs = 'muscular'>>
+ <<set _thighs = "muscular">>
<<elseif $activeSlave.muscles > 20>>
- <<set _thighs = 'toned'>>
+ <<set _thighs = "toned">>
<<else>>
- <<set _thighs = 'average'>>
+ <<set _thighs = "average">>
<</if>>
<<elseif $activeSlave.weight >= -30>>
<<if $activeSlave.muscles > 40>>
- <<set _thighs = 'thin muscular'>>
+ <<set _thighs = "thin muscular">>
<<elseif $activeSlave.muscles > 20>>
<<set _thighs = "toned model's">>
<<else>>
@@ -47,9 +47,9 @@
<</if>>
<<else>>
<<if $activeSlave.muscles > 5>>
- <<set _thighs = 'emaciated toned'>>
+ <<set _thighs = "emaciated toned">>
<<else>>
- <<set _thighs = 'emaciated'>>
+ <<set _thighs = "emaciated">>
<</if>>
<</if>>
@@ -60,163 +60,163 @@
<</if>>
<<if $activeSlave.height >= 185>>
- <<set _legs = 'wonderfully long'>>
+ <<set _legs = "wonderfully long">>
<<elseif $activeSlave.height >= 170>>
- <<set _legs = 'long'>>
+ <<set _legs = "long">>
<<elseif $activeSlave.height >= 160>>
- <<set _legs = 'nice'>>
+ <<set _legs = "nice">>
<<elseif $activeSlave.height >= 150>>
- <<set _legs = 'short'>>
+ <<set _legs = "short">>
<<else>>
- <<set _legs = 'short little'>>
+ <<set _legs = "short little">>
<</if>>
<<if $activeSlave.boobs >= 30000>>
- <<set _boobsa = 'skip'>>
- <<set _boobs = 'room filling'>>
+ <<set _boobsa = "skip">>
+ <<set _boobs = "room filling">>
<<elseif $activeSlave.boobs >= 20000>>
- <<set _boobsa = 'beanbag sized'>>
+ <<set _boobsa = "beanbag sized">>
<<elseif $activeSlave.boobs >= 8500>>
- <<set _boobsa = 'obscenely massive'>>
+ <<set _boobsa = "obscenely massive">>
<<elseif $activeSlave.boobs >= 8000>>
- <<set _boobsa = 'Z-cup'>>
+ <<set _boobsa = "Z-cup">>
<<elseif $activeSlave.boobs >= 7500>>
- <<set _boobsa = 'Y-cup'>>
+ <<set _boobsa = "Y-cup">>
<<elseif $activeSlave.boobs >= 7000>>
- <<set _boobsa = 'X-cup'>>
+ <<set _boobsa = "X-cup">>
<<elseif $activeSlave.boobs >= 6500>>
- <<set _boobsa = 'V-cup'>>
+ <<set _boobsa = "V-cup">>
<<elseif $activeSlave.boobs >= 5500>>
- <<set _boobsa = 'U-cup'>>
+ <<set _boobsa = "U-cup">>
<<elseif $activeSlave.boobs >= 5100>>
- <<set _boobsa = 'T-cup'>>
+ <<set _boobsa = "T-cup">>
<<elseif $activeSlave.boobs >= 4700>>
- <<set _boobsa = 'S-cup'>>
+ <<set _boobsa = "S-cup">>
<<elseif $activeSlave.boobs >= 4300>>
- <<set _boobsa = 'R-cup'>>
+ <<set _boobsa = "R-cup">>
<<elseif $activeSlave.boobs >= 3950>>
- <<set _boobsa = 'Q-cup'>>
+ <<set _boobsa = "Q-cup">>
<<elseif $activeSlave.boobs >= 3600>>
- <<set _boobsa = 'P-cup'>>
+ <<set _boobsa = "P-cup">>
<<elseif $activeSlave.boobs >= 3250>>
- <<set _boobsa = 'O-cup'>>
+ <<set _boobsa = "O-cup">>
<<elseif $activeSlave.boobs >= 2900>>
- <<set _boobsa = 'N-cup'>>
+ <<set _boobsa = "N-cup">>
<<elseif $activeSlave.boobs >= 2600>>
- <<set _boobsa = 'M-cup'>>
+ <<set _boobsa = "M-cup">>
<<elseif $activeSlave.boobs >= 2300>>
- <<set _boobsa = 'L-cup'>>
+ <<set _boobsa = "L-cup">>
<<elseif $activeSlave.boobs >= 2050>>
- <<set _boobsa = 'K-cup'>>
+ <<set _boobsa = "K-cup">>
<<elseif $activeSlave.boobs >= 1800>>
- <<set _boobsa = 'J-cup'>>
+ <<set _boobsa = "J-cup">>
<<elseif $activeSlave.boobs >= 1600>>
- <<set _boobsa = 'I-cup'>>
+ <<set _boobsa = "I-cup">>
<<elseif $activeSlave.boobs >= 1400>>
- <<set _boobsa = 'H-cup'>>
+ <<set _boobsa = "H-cup">>
<<elseif $activeSlave.boobs >= 1200>>
- <<set _boobsa = 'G-cup'>>
+ <<set _boobsa = "G-cup">>
<<elseif $activeSlave.boobs >= 1000>>
- <<set _boobsa = 'F-cup'>>
+ <<set _boobsa = "F-cup">>
<<elseif $activeSlave.boobs >= 800>>
- <<set _boobsa = 'DD-cup'>>
+ <<set _boobsa = "DD-cup">>
<<elseif $activeSlave.boobs >= 650>>
- <<set _boobsa = 'D-cup'>>
+ <<set _boobsa = "D-cup">>
<<elseif $activeSlave.boobs >= 400>>
- <<set _boobsa = 'C-cup'>>
+ <<set _boobsa = "C-cup">>
<<elseif $activeSlave.boobs >= 300>>
- <<set _boobsa = 'B-cup'>>
+ <<set _boobsa = "B-cup">>
<<else>>
- <<set _boobsa = 'skip'>>
- <<set _boobs = 'flat'>>
+ <<set _boobsa = "skip">>
+ <<set _boobs = "flat">>
<</if>>
<<if _boobsa != "skip">>
<<set _boobs = "_boobsa $activeSlave.boobShape">>
<</if>>
<<if $activeSlave.balls == 1>>
- <<set _balls = 'vestigial'>>
+ <<set _balls = "vestigial">>
<<elseif $activeSlave.balls == 2>>
- <<set _balls = 'small'>>
+ <<set _balls = "small">>
<<elseif $activeSlave.balls == 3>>
- <<set _balls = 'average'>>
+ <<set _balls = "average">>
<<elseif $activeSlave.balls == 4>>
- <<set _balls = 'large'>>
+ <<set _balls = "large">>
<<elseif $activeSlave.balls == 5>>
- <<set _balls = 'massive'>>
+ <<set _balls = "massive">>
<<elseif $activeSlave.balls == 6>>
- <<set _balls = 'huge'>>
+ <<set _balls = "huge">>
<<elseif $activeSlave.balls == 7>>
- <<set _balls = 'giant'>>
+ <<set _balls = "giant">>
<<elseif $activeSlave.balls == 8>>
- <<set _balls = 'enormous'>>
+ <<set _balls = "enormous">>
<<elseif $activeSlave.balls == 9>>
- <<set _balls = 'monstrous'>>
+ <<set _balls = "monstrous">>
<<else>>
- <<set _balls = 'overly massive'>>
+ <<set _balls = "overly massive">>
<</if>>
<<if $activeSlave.dick == 1>>
- <<set _dick = 'tiny'>>
+ <<set _dick = "tiny">>
<<elseif $activeSlave.dick == 2>>
- <<set _dick = 'little'>>
+ <<set _dick = "little">>
<<elseif $activeSlave.dick == 3>>
- <<set _dick = 'average'>>
+ <<set _dick = "average">>
<<elseif $activeSlave.dick == 4>>
- <<set _dick = 'big'>>
+ <<set _dick = "big">>
<<elseif $activeSlave.dick == 5>>
- <<set _dick = 'huge'>>
+ <<set _dick = "huge">>
<<elseif $activeSlave.dick == 6>>
- <<set _dick = 'gigantic'>>
+ <<set _dick = "gigantic">>
<<elseif $activeSlave.dick == 7>>
- <<set _dick = 'massive'>>
+ <<set _dick = "massive">>
<<elseif $activeSlave.dick == 8>>
- <<set _dick = 'horse-sized'>>
+ <<set _dick = "horse-sized">>
<<elseif $activeSlave.dick == 9>>
- <<set _dick = 'monstrous'>>
+ <<set _dick = "monstrous">>
<<elseif $activeSlave.dick == 10>>
- <<set _dick = 'inhuman'>>
+ <<set _dick = "inhuman">>
<<else>>
- <<set _dick = 'hypertrophied'>>
+ <<set _dick = "hypertrophied">>
<</if>>
<<if $activeSlave.butt < 1>>
- <<set _butt = 'flat'>>
+ <<set _butt = "flat">>
<<elseif $activeSlave.butt < 2>>
- <<set _butt = 'small'>>
+ <<set _butt = "small">>
<<elseif $activeSlave.butt < 3>>
- <<set _butt = 'plump'>>
+ <<set _butt = "plump">>
<<elseif $activeSlave.butt < 4>>
- <<set _butt = 'big bubble'>>
+ <<set _butt = "big bubble">>
<<elseif $activeSlave.butt < 5>>
- <<set _butt = 'huge'>>
+ <<set _butt = "huge">>
<<elseif $activeSlave.butt < 6>>
- <<set _butt = 'enormous'>>
+ <<set _butt = "enormous">>
<<elseif $activeSlave.butt < 7>>
- <<set _butt = 'gigantic'>>
+ <<set _butt = "gigantic">>
<<elseif $activeSlave.butt < 8>>
- <<set _butt = 'ridiculous'>>
+ <<set _butt = "ridiculous">>
<<elseif $activeSlave.butt < 10>>
- <<set _butt = 'immense'>>
+ <<set _butt = "immense">>
<<else>>
- <<set _butt = 'inhuman'>>
+ <<set _butt = "inhuman">>
<</if>>
<<if $activeSlave.hips > 2>>
- <<set _hips = 'inhumanly wide'>>
+ <<set _hips = "inhumanly wide">>
<<elseif $activeSlave.hips > 1>>
- <<set _hips = 'very wide'>>
+ <<set _hips = "very wide">>
<<elseif $activeSlave.hips > 0>>
- <<set _hips = 'wide'>>
+ <<set _hips = "wide">>
<<elseif $activeSlave.hips > -1>>
- <<set _hips = 'ample'>>
+ <<set _hips = "ample">>
<<elseif $activeSlave.hips > -2>>
- <<set _hips = 'narrow'>>
+ <<set _hips = "narrow">>
<<else>>
- <<set _hips = 'very narrow'>>
+ <<set _hips = "very narrow">>
<</if>>
-<<if ($activeSlave.skin == $activeSlave.race) || $activeSlave.race == 'white' || $activeSlave.race == 'black'>>
+<<if ($activeSlave.skin == $activeSlave.race) || ($activeSlave.race == "white") || ($activeSlave.race == "black") || ($seeRace == 1)>>
<<set _skin = "$activeSlave.skin">>
<<else>>
<<set _skin = "$activeSlave.skin $activeSlave.race">>
@@ -372,7 +372,7 @@ You call $activeSlave.slaveName to your office, telling $him to use $his feet to
<<elseif $activeSlave.fetish == "cumslut" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
As a devoted cumslut, $activeSlave.slaveName eagerly strokes your cock with $his feet, delightedly smearing your precum on $his soles. $He <<if canSee($activeSlave)>>stares at your <<if $PC.balls >=2>>massive balls with a ravenous gaze, <<elseif $PC.balls >=1>>large balls with a hungry gaze, <<else>>balls with a steady gaze, <</if>><<else>>gingerly feels the weight of your <<if $PC.balls >=2>>massive balls <<elseif $PC.balls >=1>>large balls <<else>>balls <</if>>with $his feet, <</if>>shivering in anticipation.
<<elseif $activeSlave.fetish == "humiliation" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
- $activeSlave.slaveName slowly strokes your cock with $his feet, getting off on the degrading use of $his feet and avoiding your gaze. $He is showing an embarrassed smile<<if $activeSlave.skin == 'black'>>, and if $his skin was any lighter you would see $his<<else>> and<</if>> bright blushing cheeks.
+ $activeSlave.slaveName slowly strokes your cock with $his feet, getting off on the degrading use of $his feet and avoiding your gaze. $He is showing an embarrassed smile<<if (skinToneLevel($activeSlave.skin) > 22)>>, and if $his skin was any lighter you would see $his<<else>> and<</if>> bright blushing cheeks.
<<elseif $activeSlave.fetish == "boobs" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
As $activeSlave.slaveName deftly strokes your cock with $his feet, $his hands plays with $his <<if $activeSlave.boobs < 300>>erect nipples. <<elseif $activeSlave.boobs < 500>>small chest. <<elseif $activeSlave.boobs >= 18000>>_boobs breasts, though $he can't reach $his nipples. <<else>>_boobs breasts and erect nipples. <</if>> $He is certainly giving you plenty of sexy options for you to watch.
<<elseif $activeSlave.fetish == "sadist" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
diff --git a/src/pregmod/pcAppearanceIntro.tw b/src/pregmod/pcAppearanceIntro.tw
index d7a0618c5d046761af878b92585647ae751f5d57..b1d17bf3dd1111ed95419ec47efc953a15568f18 100644
--- a/src/pregmod/pcAppearanceIntro.tw
+++ b/src/pregmod/pcAppearanceIntro.tw
@@ -91,11 +91,26 @@ You have $PC.skin skin.
<<PlayerSkin>>
<</link>>
|
+<<link "Ivory">>
+ <<set $PC.skin = "ivory">>
+ <<PlayerSkin>>
+<</link>>
+|
+<<link "White">>
+ <<set $PC.skin = "white">>
+ <<PlayerSkin>>
+<</link>>
+|
<<link "Extremely Pale">>
<<set $PC.skin = "extremely pale">>
<<PlayerSkin>>
<</link>>
|
+<<link "Very Pale">>
+ <<set $PC.skin = "very pale">>
+ <<PlayerSkin>>
+<</link>>
+|
<<link "Pale">>
<<set $PC.skin = "pale">>
<<PlayerSkin>>
@@ -116,23 +131,18 @@ You have $PC.skin skin.
<<PlayerSkin>>
<</link>>
|
-<<link "White">>
- <<set $PC.skin = "white">>
- <<PlayerSkin>>
-<</link>>
-|
<<link "Light">>
<<set $PC.skin = "light">>
<<PlayerSkin>>
<</link>>
|
-<<link "Lightened">>
- <<set $PC.skin = "lightened">>
+<<link "Light Olive">>
+ <<set $PC.skin = "light olive">>
<<PlayerSkin>>
<</link>>
|
-<<link "Light Olive">>
- <<set $PC.skin = "light olive">>
+<<link "Tan">>
+ <<set $PC.skin = "tan">>
<<PlayerSkin>>
<</link>>
|
@@ -141,28 +151,33 @@ You have $PC.skin skin.
<<PlayerSkin>>
<</link>>
|
-<<link "Natural">>
- <<set $PC.skin = "natural">>
+<<link "Bronze">>
+ <<set $PC.skin = "bronze">>
<<PlayerSkin>>
<</link>>
|
-<<link "Tanned">>
- <<set $PC.skin = "tanned">>
+<<link "Dark Olive">>
+ <<set $PC.skin = "dark olive">>
<<PlayerSkin>>
<</link>>
|
-<<link "Bronzed">>
- <<set $PC.skin = "bronzed">>
+<<link "Dark">>
+ <<set $PC.skin = "dark">>
<<PlayerSkin>>
<</link>>
|
-<<link "Dark Olive">>
- <<set $PC.skin = "dark olive">>
+<<link "Light Beige">>
+ <<set $PC.skin = "light beige">>
<<PlayerSkin>>
<</link>>
|
-<<link "Dark">>
- <<set $PC.skin = "dark">>
+<<link "Beige">>
+ <<set $PC.skin = "beige">>
+ <<PlayerSkin>>
+<</link>>
+|
+<<link "Dark Beige">>
+ <<set $PC.skin = "dark beige">>
<<PlayerSkin>>
<</link>>
|
diff --git a/src/pregmod/pcSurgeryDegredation.tw b/src/pregmod/pcSurgeryDegredation.tw
index 84717c7cf5a31f1aa928999e422008a8fac86eb4..6210a3b954b599dc73ea7fcdff9fb0c05127269f 100644
--- a/src/pregmod/pcSurgeryDegredation.tw
+++ b/src/pregmod/pcSurgeryDegredation.tw
@@ -5,7 +5,7 @@
<<switch $surgeryType>>
<<case "skinTone">>
- After a few hours, you awaken in the recovery wing to find every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of your body burning; though from what you did manage to see, you are, in fact, $PC.skin now. <<if !["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", "black", "ebony", "pure black"].includes($PC.skin)>>The surgeon's assistant immediately covers her mouth to hide her giggle a the sight of you<<else>>The surgeon's assistant carefully seats herself besides you with a large drum of cream<</if>>. "This stuff is specially formulated to soothe burns like this and should have you feeling much better after a few applications.<<if $PC.dick == 1>> Now please, try not to get hard while I apply this. It will hurt like hell.<</if>>" She spends the next half hour gingerly applying the cream across every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of your body. Her touch is so soft, it is hard to not get aroused, and as your body tenses, a wave of pain washes over you. "Calm down, and take a few applications first. Though I forgot to tell you, your erogenous zones were especially affected and will need plenty of extra attention." She winks at you. You doubt the validity of that claim but understand exactly what she means by it. The next few days will be very enjoyable, but for now, you opt to stay perfectly still and will the cream to work faster.
+ After a few hours, you awaken in the recovery wing to find every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of your body burning; though from what you did manage to see, you are, in fact, $PC.skin now. <<if !["pure white", "ivory", "white", "extremely pale", "very pale", "pale", "extremely fair", "very fair", "fair", "light", "light olive", "tan", "olive", "bronze", "dark olive", "dark", "light beige", "beige", "dark beige", "light brown", "brown", "dark brown", "black", "ebony", "pure black"].includes($PC.skin)>>The surgeon's assistant immediately covers her mouth to hide her giggle a the sight of you<<else>>The surgeon's assistant carefully seats herself besides you with a large drum of cream<</if>>. "This stuff is specially formulated to soothe burns like this and should have you feeling much better after a few applications.<<if $PC.dick == 1>> Now please, try not to get hard while I apply this. It will hurt like hell.<</if>>" She spends the next half hour gingerly applying the cream across every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of your body. Her touch is so soft, it is hard to not get aroused, and as your body tenses, a wave of pain washes over you. "Calm down, and take a few applications first. Though I forgot to tell you, your erogenous zones were especially affected and will need plenty of extra attention." She winks at you. You doubt the validity of that claim but understand exactly what she means by it. The next few days will be very enjoyable, but for now, you opt to stay perfectly still and will the cream to work faster.
<<case "restoreFace">>
After a few hours, you awaken in the recovery wing with a face both sore and somewhat numb. <<if $PC.belly >= 10000 || $PC.boobsBonus == 3>>Struggling to sit<<else>>Sitting<</if>> up, you catch sight of yourself in the mirror-covered wall across from your bed. Your face is back to the way it was before you had it altered (not counting any additional years added to it) and looking just as good as you remember. You attempt to smile at yourself, only to find your face doesn't want to comply; guess the drugs haven't completely worn off yet. You lie back down to sleep off the rest of the anesthesia before returning to your arcology.
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index c5700cdcf5a57a0bdebee5006a2793c571f011fb..d12af5397e4a43a8225371f936854623d32ac659 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -122,7 +122,7 @@ While sitting at your desk planning your day, @@.lime;your water breaks,@@ thoro
<</if>>
<<else>>
<<if $Concubine != 0>><<setLocalPronouns $Concubine 2>><<if !canWalk($Concubine)>><<set _concubinePresent = 2>><<else>><<set _concubinePresent = 1>><</if>><</if>>
- You barely make it half-way down the hall before you feel the first of your many children drop into position at the entrance to your birth canal. You try to keep going, but as it forces its way through your pelvis, spreading it wider, you're forced to the ground. Fortunately the penthouse is littered with supply rooms and closets, so you drag your laboring body into the nearest one instead. $assistantName discretely directs
+ You barely make it half-way down the hall before you feel the first of your many children drop into position at the entrance to your birth canal. You try to keep going, but as it forces its way through your pelvis, spreading it wider, you're forced to the ground. Fortunately the penthouse is littered with supply rooms and closets, so you drag your laboring body into the nearest one instead. Fortunately, $assistantName discretely directs
<<if $Nurse != 0>>
<<setLocalPronouns $Nurse>>
@@.pink;$Nurse.slaveName@@ to you with everything $he'll need to deliver your children.<<if _concubinePresent == 1>> @@.pink;$Concubine.slaveName@@ bursts in after $him and circles around behind you before wrapping _his2 arms around your contraction wracked middle. _He2'll be here to comfort you while you labor.<</if>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index a5718596d962567d98e420e71b9bd5a75cd30aae..b9dbc8de88ce4974a3b612daaf8f54d78556fb9d 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2800,15 +2800,41 @@ Setting missing slave variables:
<<set _Slave.override_Arm_H_Color = 0>>
<</if>>
-<<if _Slave.skin == "red dyed">>
+<<switch _Slave.skin>>
+<<case "red dyed">>
<<set _Slave.skin = "dyed red">>
-<</if>>
-<<if _Slave.skin == "green dyed">>
+<<case "green dyed">>
<<set _Slave.skin = "dyed green">>
-<</if>>
-<<if _Slave.skin == "blue dyed">>
+<<case "blue dyed">>
<<set _Slave.skin = "dyed blue">>
-<</if>>
+<<case "tanned">>
+ <<set _Slave.skin = "tan">>
+<<case "lightened">>
+ <<set _Slave.skin = "light">>
+<<case "bronzed">>
+ <<set _Slave.skin = "bronze">>
+<<case "darkened">>
+ <<set _Slave.skin = "dark">>
+<<case "natural">>
+<</switch>>
+
+<<switch _Slave.origSkin>>
+<<case "red dyed">>
+ <<set _Slave.origSkin = "dyed red">>
+<<case "green dyed">>
+ <<set _Slave.origSkin = "dyed green">>
+<<case "blue dyed">>
+ <<set _Slave.origSkin = "dyed blue">>
+<<case "tanned">>
+ <<set _Slave.origSkin = randomRaceSkin(_Slave.origRace)>>
+<<case "lightened">>
+ <<set _Slave.origSkin = "light">>
+<<case "bronzed">>
+ <<set _Slave.origSkin = "bronze">>
+<<case "darkened">>
+ <<set _Slave.origSkin = "dark">>
+<<case "natural">>
+<</switch>>
<<if _Slave.markings == "heavily">>
<<set _Slave.markings = "heavily freckled">>
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index a3415083dc58ff4f7b14a414e98f7219ce257659..bca9da1815c74ed666d29999e0b78fbda6c8d4e6 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -271,26 +271,26 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
<<if $slaves[$i].boobs < 400>>
<<set $slaves[$i].boobs += 200>>
<<set $slaves[$i].boobsImplant += 200>>
- <<run cashX(-200, "slaveSurgery", $activeSlave)>>
+ <<run cashX(forceNeg(Math.trunc(200*$upgradeMultiplierMedicine)), "slaveSurgery", $activeSlave)>>
<<elseif $slaves[$i].butt < 3>>
<<set $slaves[$i].butt += 1>>
<<set $slaves[$i].buttImplant += 1>>
- <<run cashX(-200, "slaveSurgery", $activeSlave)>>
+ <<run cashX(forceNeg(Math.trunc(200*$upgradeMultiplierMedicine)), "slaveSurgery", $activeSlave)>>
<<elseif $slaves[$i].face < 95 && $slaves[$i].faceImplant <= 10>>
<<set $slaves[$i].face = Math.clamp($slaves[$i].face+20,-100,100)>>
<<set $slaves[$i].faceImplant += 25-5*Math.trunc($PC.medicine/100)-5*$surgeryUpgrade>>
- <<run cashX(-200, "slaveSurgery", $activeSlave)>>
+ <<run cashX(forceNeg(Math.trunc(200*$upgradeMultiplierMedicine)), "slaveSurgery", $activeSlave)>>
<<elseif ($slaves[$i].waist > -10)>>
<<set $slaves[$i].waist -= 20>>
- <<run cashX(-200, "slaveSurgery", $activeSlave)>>
+ <<run cashX(forceNeg(Math.trunc(200*$upgradeMultiplierMedicine)), "slaveSurgery", $activeSlave)>>
<<elseif $slaves[$i].visualAge > 35 && $slaves[$i].ageImplant == 0 && $slaves[$i].faceImplant <= 10>>
<<set $slaves[$i].ageImplant = 1>><<AgeImplantAdjustment $slaves[$i]>>
<<set $slaves[$i].faceImplant += 25-5*Math.trunc($PC.medicine/100)-5*$surgeryUpgrade>>
- <<run cashX(-200, "slaveSurgery", $activeSlave)>>
+ <<run cashX(forceNeg(Math.trunc(200*$upgradeMultiplierMedicine)), "slaveSurgery", $activeSlave)>>
<<elseif $slaves[$i].lips <= 40>>
<<set $slaves[$i].lips += 10>>
<<set $slaves[$i].lipsImplant += 10>>
- <<run cashX(-200, "slaveSurgery", $activeSlave)>>
+ <<run cashX(forceNeg(Math.trunc(200*$upgradeMultiplierMedicine)), "slaveSurgery", $activeSlave)>>
<</if>>
<</if>>
<</for>>
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index 77688338a7a1f53ef1236e4149579ef70c485bc8..e8bccfeb47989aee4b5f00051cd3019f81e178c4 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -75,11 +75,9 @@
<</if>>
<</for>>
-<<if ($activeSlave.skin == "tanned") || ($activeSlave.skin == "fair")>>
+<<if (skinToneLevel($activeSlave.skin) < 10)>>
<<set $skinDesc = "pink">>
-<<elseif ($activeSlave.skin == "pale") || ($activeSlave.race == "white")>>
- <<set $skinDesc = "pink">>
-<<elseif ($activeSlave.skin == "brown") || ($activeSlave.race == "black")>>
+<<elseif (skinToneLevel($activeSlave.skin) > 20)>>
<<set $skinDesc = "dark brown">>
<<else>>
<<set $skinDesc = "brown">>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 31e98d05167def5d6c2d578d830b27fe2bbc40f4..2aeb27d1a3f6b959810d2fdc30d5ef4a12222bc2 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -424,10 +424,12 @@ clings to you in $his sleep as the warmth of your body begins to move away from
<<case "confident tanning">>
It's an unusually nice day, with mild sunshine, light breezes, and nothing offensive or dangerous in the atmosphere. In the middle of the afternoon, you take a break from your busy schedule of sex and business and stroll out onto one of your penthouse balconies. It seems <<EventNameLink>> was struck by a similar impulse. <<if $activeSlave.assignment == "rest">>$He's assigned to do little but rest<<else>>This is one of $his rest periods<</if>>, so $he's come out here to lay naked on a towel and enjoy the sun.
-<<if ["black", "brown", "dark brown", "dark olive", "dark", "ebony", "pure black"].includes($activeSlave.skin)>>
+<<if (skinToneLevel($activeSlave.skin) > 20)>>
$His $activeSlave.skin doesn't tan much, so $he's just out here to bask in its warmth. $His body shines with lotion from a bottle lying next to $him, but it's just general-purpose stuff.
-<<elseif ($activeSlave.skin == "tanned")>>
+<<elseif ($activeSlave.skin == "sun tanned")>>
$His tanned skin shines with lotion from a bottle lying next to $him.
+<<elseif ($activeSlave.skin == "spray tanned")>>
+ Since $his fake tan would otherwise be (rather ironically) ruined by the sun, $his skin shines with sunblock lotion from a bottle lying next to $him.
<<else>>
$His skin shines with sunblock lotion from a bottle lying next to $him. It would be foolish of $him to let the sun ruin $his $activeSlave.skin skin.
<</if>>
@@ -744,7 +746,7 @@ You pass one of the penthouse's several supply closets by chance, and are surpri
<</if>>
in the middle of the room with the machines all around $him. $He has <<if canDoVaginal($activeSlave)>><<if $activeSlave.vagina > 2>>two large dildos working $his gaping cunt, <<elseif $activeSlave.vagina > 1>>a large dildo working $his cunt, <<elseif $activeSlave.vagina > 0>>a dildo working $his tight pussy, <</if>><</if>><<if canDoAnal($activeSlave)>><<if $activeSlave.anus > 2>>two large dildos fucking $his enormous butthole, <<elseif $activeSlave.anus > 1>>a large dildo fucking $his butthole, <<elseif $activeSlave.anus > 0>>a dildo fucking $his tight butt, <</if>><</if>><<if $activeSlave.boobs > 1200>>has lubricated $his cavernous cleavage to titfuck another, <<elseif $activeSlave.boobs > 400>>has lubricated $his cleavage to titfuck another, <</if>><<if $activeSlave.nipples == "fuckable">>has a pair pistoning in and out of $his nipples, <</if>><<if $activeSlave.amp != 1>>is performing two handjobs at once, to either side, <</if>><<if $activeSlave.belly >= 5000>>has lubricated the sides of $his _belly <<if $activeSlave.bellyPreg >= 3000>> pregnancy<</if>>, along with $his inner thighs, to create a sort of belly job, <</if>><<if $activeSlave.skill.oral >= 60>>and is making use of $his outstanding oral skills to suck off two more.<<elseif $activeSlave.skill.oral > 30>>and is taking a throatfuck from one more.<<else>>and is giving the final one a blowjob.<</if>> When $he <<if canSee($activeSlave)>>sees that you've entered — which takes a while, since $he's distracted<<elseif canHear($activeSlave)>>hears that you've entered — which takes a while, given the amount of noise<<else>>realizes that you've entered — which takes a while, considering $his state<</if>> — $he tries to smile<<if $activeSlave.amp != 1>> and wave<</if>>.
<br><br>
-The source of the many-voiced personal assistant becomes clear: probably on the incorrigible $activeSlave.slaveName's request, your sultry personal assistant is voicing each and every one of the machines. When the nymphomaniac masturbator tries to smile <<if $activeSlave.amp != 1>> and wave<</if>>, there's an absolute chorus of "Back to work, slut," "Smile less, suck more," "Take it, bitch," et cetera. Yet another instance of $assistantName chuckles in your ear. "Care to join in, <<= properTitle()>>? I'm sure we can find room somewhere."
+The source of the many-voiced personal assistant becomes clear: probably on the incorrigible $activeSlave.slaveName's request, your sultry personal assistant is voicing each and every one of the machines. When the nymphomaniac masturbator tries to smile <<if $activeSlave.amp != 1>> and wave<</if>>, there's an absolute chorus of "Back to work, slut", "Smile less, suck more", "Take it, bitch", et cetera. Yet another instance of $assistantName chuckles in your ear. "Care to join in, <<= properTitle()>>? I'm sure we can find room somewhere."
<<case "sore ass">>
@@ -10050,7 +10052,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<EventNameDelink $activeSlave>>
<<replace "#result">>
As the sterile doors of the surgical equipment hiss closed over $him, you whisper in $his ear that $he's about to be cut up. $He looks at you with a mix of fear and wild excitement. After nearly a whole week of constant surgery and expensive drug-induced recovery, <<if canSee($activeSlave)>>$he finally gets to see $his new body in the mirror<<elseif $activeSlave.amp == 1>>you finally describe all the new implants in $his body and how they make $him look<<else>>you finally let $him feel $his new body, even helping $his hands to the less obvious changes<</if>>. $He has cartoonishly huge lips, boobs, and buttocks; $he looks like a caricature of a bimbo. $He cries with gratitude <<if canSee($activeSlave)>>to see $himself<<elseif $activeSlave.amp == 1>>to hear how $he looks<<else>>as $he feels $his new body<</if>>, and can scarcely wait to recover enough to get fucked. @@.hotpink;$He has become extremely devoted to you.@@
- <<run cashX(-125, "slaveSurgery", $activeSlave)>>
+ <<run cashX(forceNeg(Math.trunc(125*$upgradeMultiplierMedicine)), "slaveSurgery", $activeSlave)>>
<<set $activeSlave.devotion += 10>>
<<set _surgeryAddict = Math.clamp(20000-$activeSlave.boobs, 0, 2000)>>
<<set $activeSlave.boobsImplant += _surgeryAddict, $activeSlave.boobs += _surgeryAddict>>
@@ -14580,18 +14582,18 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<</if>>
slave's shoulders possessively, and name them. "<<Sh>>oulder<<s>>."
<br><br>
- You continue from there. "Neck," "Chin," "Lip<<s>>," "Che<<s>>t," "Boob<<s>>," "N-nipple<<if $activeSlave.nipples == "fuckable">>cunt<</if>><<s>>," "Belly," "Hip<<s>>,"
+ You continue from there. "Neck. Chin. Lip<<s>>. Che<<s>>t. Boob<<s>>. N-nipple<<if $activeSlave.nipples == "fuckable">>cunt<</if>><<s>>. Belly. Hip<<s>>,
<<if ($activeSlave.dick > 0)>>
<<if ($activeSlave.balls > 0)>>
- "C-cock, oh <<Master>>, p-plea<<s>>e, augh, ball<<s>>,"
+ c-cock, oh <<Master>>, p-plea<<s>>e, augh, ball<<s>>,
<<else>>
- "B-bitchclit, oh <<Master>>, p-plea<<s>>e,"
+ b-bitchclit, oh <<Master>>, p-plea<<s>>e,
<</if>>
<</if>>
<<if ($activeSlave.vagina > -1)>>
- "Pu<<ss>>y," "Cliiiiiit, oh <<Master>> n-nuh,"
+ pu<<ss>>y. Cliiiiiit, oh <<Master>> n-nuh,
<</if>>
- "Butt," and finally, "B-butt, um, butthole."
+ Butt," and finally, "B-butt, um, butthole."
<br><br><span id="result2">
<<link "Now let $him review">>
<<replace "#result2">>
@@ -17693,7 +17695,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.hColor = either("black", "blonde", "brown", "red")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "latina")>>
<<set $activeSlave.race = "latina">>
- <<set $activeSlave.skin = either("brown", "dark brown", "dark olive", "light olive", "tanned")>>
+ <<set $activeSlave.skin = either("brown", "dark brown", "dark olive", "light olive", "tan")>>
<<set $activeSlave.hColor = either("black", "black", "brown", "brown")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "black")>>
<<set $activeSlave.race = "black">>
@@ -17705,7 +17707,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.hColor = either("black")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "middle eastern")>>
<<set $activeSlave.race = "middle eastern">>
- <<set $activeSlave.skin = either("dark olive", "light olive", "tanned")>>
+ <<set $activeSlave.skin = either("dark olive", "light olive", "tan")>>
<<set $activeSlave.hColor = "black">>
<<elseif ($arcologies[0].FSSubjugationistRace == "indo-aryan")>>
<<set $activeSlave.race = "indo-aryan">>
@@ -17713,7 +17715,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.hColor = "black">>
<<elseif ($arcologies[0].FSSubjugationistRace == "amerindian")>>
<<set $activeSlave.race = "amerindian">>
- <<set $activeSlave.skin = either("dark", "light", "tanned")>>
+ <<set $activeSlave.skin = either("dark", "light", "tan")>>
<<set $activeSlave.hColor = either("black")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "pacific islander")>>
<<set $activeSlave.race = "pacific islander">>
@@ -17729,7 +17731,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.hColor = either("black")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "semitic")>>
<<set $activeSlave.race = "semitic">>
- <<set $activeSlave.skin = either("dark olive", "light olive", "tanned")>>
+ <<set $activeSlave.skin = either("dark olive", "light olive", "tan")>>
<<set $activeSlave.hColor = either("black")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "mixed race")>>
<<set $activeSlave.race = "mixed race">>
diff --git a/src/uncategorized/customSlave.tw b/src/uncategorized/customSlave.tw
index 27618357c8450dc6400df64204e7e1558d6f47ab..282907037a1444bdb79104034ac5d262e823ee09 100644
--- a/src/uncategorized/customSlave.tw
+++ b/src/uncategorized/customSlave.tw
@@ -620,11 +620,26 @@ Skin tone: <span id = "skin">
<<CustomSlaveSkin>>
<</link>>
|
+<<link "Ivory">>
+ <<set $customSlave.skin = "ivory">>
+ <<CustomSlaveSkin>>
+<</link>>
+|
+<<link "White">>
+ <<set $customSlave.skin = "white">>
+ <<CustomSlaveSkin>>
+<</link>>
+|
<<link "Extremely Pale">>
<<set $customSlave.skin = "extremely pale">>
<<CustomSlaveSkin>>
<</link>>
|
+<<link "Very Pale">>
+ <<set $customSlave.skin = "very pale">>
+ <<CustomSlaveSkin>>
+<</link>>
+|
<<link "Pale">>
<<set $customSlave.skin = "pale">>
<<CustomSlaveSkin>>
@@ -645,23 +660,18 @@ Skin tone: <span id = "skin">
<<CustomSlaveSkin>>
<</link>>
|
-<<link "White">>
- <<set $customSlave.skin = "white">>
- <<CustomSlaveSkin>>
-<</link>>
-|
<<link "Light">>
<<set $customSlave.skin = "light">>
<<CustomSlaveSkin>>
<</link>>
|
-<<link "Lightened">>
- <<set $customSlave.skin = "lightened">>
+<<link "Light Olive">>
+ <<set $customSlave.skin = "light olive">>
<<CustomSlaveSkin>>
<</link>>
|
-<<link "Light Olive">>
- <<set $customSlave.skin = "light olive">>
+<<link "Tan">>
+ <<set $customSlave.skin = "tan">>
<<CustomSlaveSkin>>
<</link>>
|
@@ -670,28 +680,33 @@ Skin tone: <span id = "skin">
<<CustomSlaveSkin>>
<</link>>
|
-<<link "Natural">>
- <<set $customSlave.skin = "natural">>
+<<link "Bronze">>
+ <<set $customSlave.skin = "bronze">>
<<CustomSlaveSkin>>
<</link>>
|
-<<link "Tanned">>
- <<set $customSlave.skin = "tanned">>
+<<link "Dark Olive">>
+ <<set $customSlave.skin = "dark olive">>
<<CustomSlaveSkin>>
<</link>>
|
-<<link "Bronzed">>
- <<set $customSlave.skin = "bronzed">>
+<<link "Dark">>
+ <<set $customSlave.skin = "dark">>
<<CustomSlaveSkin>>
<</link>>
|
-<<link "Dark Olive">>
- <<set $customSlave.skin = "dark olive">>
+<<link "Light Beige">>
+ <<set $customSlave.skin = "light beige">>
<<CustomSlaveSkin>>
<</link>>
|
-<<link "Dark">>
- <<set $customSlave.skin = "dark">>
+<<link "Beige">>
+ <<set $customSlave.skin = "beige">>
+ <<CustomSlaveSkin>>
+<</link>>
+|
+<<link "Dark Beige">>
+ <<set $customSlave.skin = "dark beige">>
<<CustomSlaveSkin>>
<</link>>
|
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 5bce7a753228d4898f6c64b28fed714d598c57b3..c9c0d80109e20c8233e21098ef3dc45f3dc36549 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -2040,7 +2040,7 @@ $He is
<<if $activeSlave.markings == "birthmark" && $activeSlave.prestige == 0 && $activeSlave.pornPrestige < 2>>
$He has a large, liver-colored birthmark, detracting from $his beauty.
<</if>>
- <<if ($activeSlave.skin == "tanned") && ($activeSlave.origSkin != "tanned")>>
+ <<if ($activeSlave.skin == "sun tanned")>>
<<if ($activeSlave.releaseRules != "restrictive" && $activeSlave.releaseRules != "masturbation" && $activeSlave.releaseRules != "chastity")>>
<<if ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
$His tan is slightly uneven, since $he enjoys
@@ -2082,7 +2082,7 @@ $He is
<<if ($activeSlave.hColor == "red")>>
<<if ($activeSlave.hLength >= 10)>>
<<if ($activeSlave.markings == "freckles") || ($activeSlave.markings == "heavily freckled")>>
- <<if ($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")>>
+ <<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10)>>
It goes perfectly with $his $activeSlave.skin skin and freckles.
<</if>>
<</if>>
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index 8a44a769948b53540f29139ae1aed3b82d148a35..1fdd3d83fd0df7df66e79640553f7a6b87c6fccc 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -129,49 +129,49 @@ __''MAIN MENU''__ //[[Summary Options]]//
<<if $JobIDArray['take classes'].length > 0>>
<button class="tablinks" onclick="opentab(event, 'take classes')" id="tab take classes">
Students
- ($JobIDArray['take classes'].length)
+ ($JobIDArray['take classes'].length)
</button>
<</if>>
<<if $JobIDArray['please you'].length > 0>>
<button class="tablinks" onclick="opentab(event, 'please you')" id="tab please you">
Fucktoys
- ($JobIDArray['please you'].length)
+ ($JobIDArray['please you'].length)
</button>
<</if>>
<<if $JobIDArray['whore'].length > 0>>
<button class="tablinks" onclick="opentab(event, 'whore')" id="tab whore">
Whores
- ($JobIDArray['whore'].length)
+ ($JobIDArray['whore'].length)
</button>
<</if>>
<<if $JobIDArray['serve the public'].length > 0>>
<button class="tablinks" onclick="opentab(event, 'serve the public')" id="tab serve the public">
- Public Servants
- ($JobIDArray['serve the public'].length)
+ Public Servants
+ ($JobIDArray['serve the public'].length)
</button>
<</if>>
<<if $JobIDArray['be a servant'].length > 0>>
<button class="tablinks" onclick="opentab(event, 'be a servant')" id="tab be a servant">
- Servants
- ($JobIDArray['be a servant'].length)
+ Servants
+ ($JobIDArray['be a servant'].length)
</button>
<</if>>
<<if $JobIDArray['get milked'].length > 0>>
<button class="tablinks" onclick="opentab(event, 'get milked')" id="tab milked">
- Cows
- ($JobIDArray['get milked'].length)
+ Cows
+ ($JobIDArray['get milked'].length)
</button>
<</if>>
<<if $JobIDArray['work a glory hole'].length > 0>>
<button class="tablinks" onclick="opentab(event, 'work a glory hole')" id="tab work a glory hole">
- Gloryhole
- ($JobIDArray['work a glory hole'].length)
+ Gloryhole
+ ($JobIDArray['work a glory hole'].length)
</button>
<</if>>
<<if $JobIDArray['be a subordinate slave'].length > 0>>
<button class="tablinks" onclick="opentab(event, 'be a subordinate slave')" id="tab be a subordinate slave">
Subordinate slaves
- ($JobIDArray['be a subordinate slave'].length)
+ ($JobIDArray['be a subordinate slave'].length)
</button>
<</if>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index a2276f9350ce858d5ed29521a14a46db4ea0f2e9..b8e478894852e8ced12bcc4e56cb425ada6afa3c 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -93,7 +93,9 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<set $activeSlave.origSkin = $activeSlave.skin>>
<</if>>
<<if $activeSlave.skin != $activeSlave.origSkin>>
- An epidermis scan reveals that $his skin was originally $activeSlave.origSkin, not $activeSlave.skin<<if $PC.medicine >= 75 || $PC.slaving >= 75>>, just as you suspected<</if>>.
+ <<if ($activeSlave.skin != "sun tanned") || ($activeSlave.skin != "spray tanned")>>
+ An epidermis scan reveals that $his skin was originally $activeSlave.origSkin, not $activeSlave.skin<<if $PC.medicine >= 75 || $PC.slaving >= 75>>, just as you suspected<</if>>.
+ <</if>>
<</if>>
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 605a154263cdc67c0cbd31f40a74b531911030f5..e6d1e57057d0110770944a39ab6bbed633abfa2a 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -5,7 +5,7 @@
<<set _paSeed = random(1,8)>>
<<switch $assistantAppearance>>
<<case "monstergirl">>
-_HeA's a cute little <<if $assistantFSAppearance == "supremacist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>monstergirl with <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">><<if $arcologies[0].FSSupremacistRace == "black">><<print either("black", "brown", "dark brown")>><<elseif $arcologies[0].FSSupremacistRace == "white">><<print either("fair", "light", "pale")>><<elseif $arcologies[0].FSSupremacistRace == "latina">><<print either("brown", "dark brown", "dark olive")>><<elseif ["amerindian", "indo-aryan", "malay", "pacific islander"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark", "light")>><<elseif $arcologies[0].FSSupremacistRace == "asian">><<print either("dark olive", "light olive", "light")>><<elseif ["middle eastern", "semitic", "southern european"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark olive", "light olive", "tanned")>><<else>>pale<</if>><<elseif $assistantFSAppearance == "subjugationist">><<if $arcologies[0].FSSubjugationistRace == "black">><<print either("black", "brown", "dark brown")>><<elseif $arcologies[0].FSSubjugationistRace == "white">><<print either("fair", "light", "pale")>><<elseif $arcologies[0].FSSubjugationistRace == "latina">><<print either("brown", "dark brown", "dark olive")>><<elseif ["amerindian", "indo-aryan", "malay", "pacific islander"].includes($arcologies[0].FSSubjugationistRace)>><<print either("dark", "light")>><<elseif $arcologies[0].FSSubjugationistRace == "asian">><<print either("dark olive", "light olive", "light")>><<elseif ["middle eastern", "semitic", "southern european"].includes($arcologies[0].FSSubjugationistRace)>><<print either("dark olive", "light olive", "tanned")>><<else>>pale<</if>><<else>>pale<</if>> skin, perky breasts, green tentacles instead of hair, and two dicks. _HisA eyes are large, expressive, and surprisingly innocent.
+_HeA's a cute little <<if $assistantFSAppearance == "supremacist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>monstergirl with <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">><<if $arcologies[0].FSSupremacistRace == "black">><<print either("black", "brown", "dark brown")>><<elseif $arcologies[0].FSSupremacistRace == "white">><<print either("fair", "light", "pale")>><<elseif $arcologies[0].FSSupremacistRace == "latina">><<print either("brown", "dark brown", "dark olive")>><<elseif ["amerindian", "indo-aryan", "malay", "pacific islander"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark", "light")>><<elseif $arcologies[0].FSSupremacistRace == "asian">><<print either("dark olive", "light olive", "light")>><<elseif ["middle eastern", "semitic", "southern european"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark olive", "light olive", "tan")>><<else>>pale<</if>><<elseif $assistantFSAppearance == "subjugationist">><<if $arcologies[0].FSSubjugationistRace == "black">><<print either("black", "brown", "dark brown")>><<elseif $arcologies[0].FSSubjugationistRace == "white">><<print either("fair", "light", "pale")>><<elseif $arcologies[0].FSSubjugationistRace == "latina">><<print either("brown", "dark brown", "dark olive")>><<elseif ["amerindian", "indo-aryan", "malay", "pacific islander"].includes($arcologies[0].FSSubjugationistRace)>><<print either("dark", "light")>><<elseif $arcologies[0].FSSubjugationistRace == "asian">><<print either("dark olive", "light olive", "light")>><<elseif ["middle eastern", "semitic", "southern european"].includes($arcologies[0].FSSubjugationistRace)>><<print either("dark olive", "light olive", "tan")>><<else>>pale<</if>><<else>>pale<</if>> skin, perky breasts, green tentacles instead of hair, and two dicks. _HisA eyes are large, expressive, and surprisingly innocent.
<<if $assistantFSOptions>>
<<switch $assistantFSAppearance>>
<<case "paternalist">>
@@ -87,7 +87,7 @@ _HeA's a cute little <<if $assistantFSAppearance == "supremacist">>$arcologies[0
<<case "shemale">>
-_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>bimbo shemale with bleached blonde hair, <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">><<if $arcologies[0].FSSupremacistRace == "black">><<print either("black", "brown", "dark brown")>><<elseif $arcologies[0].FSSupremacistRace == "white">><<print either("fair", "pale")>><<elseif $arcologies[0].FSSupremacistRace == "latina">><<print either("brown", "dark brown", "dark olive")>><<elseif ["amerindian", "indo-aryan", "malay", "pacific islander"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark", "light")>><<elseif $arcologies[0].FSSupremacistRace == "asian">><<print either("dark olive", "light olive")>><<elseif ["middle eastern", "semitic", "southern european"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark olive", "tanned")>><<else>>tanned<</if>><<elseif $assistantFSAppearance == "subjugationist">><<if $arcologies[0].FSSubjugationistRace == "black">><<print either("black", "brown", "dark brown")>><<elseif $arcologies[0].FSSubjugationistRace == "white">><<print either("fair", "pale")>><<elseif $arcologies[0].FSSubjugationistRace == "latina">><<print either("brown", "dark brown", "dark olive")>><<elseif ["amerindian", "indo-aryan", "malay", "pacific islander"].includes($arcologies[0].FSSubjugationistRace)>><<print either("dark", "light")>><<elseif $arcologies[0].FSSubjugationistRace == "asian">><<print either("dark olive", "light olive")>><<elseif ["middle eastern", "semitic", "southern european"].includes($arcologies[0].FSSubjugationistRace)>><<print either("dark olive", "tanned")>><<else>>tanned<</if>><<else>>tanned<</if>> skin, huge lips, and ridiculous tits. _HisA cock hangs past _hisA knees when limp.
+_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>bimbo shemale with bleached blonde hair, <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">><<if $arcologies[0].FSSupremacistRace == "black">><<print either("black", "brown", "dark brown")>><<elseif $arcologies[0].FSSupremacistRace == "white">><<print either("fair", "pale")>><<elseif $arcologies[0].FSSupremacistRace == "latina">><<print either("brown", "dark brown", "dark olive")>><<elseif ["amerindian", "indo-aryan", "malay", "pacific islander"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark", "light")>><<elseif $arcologies[0].FSSupremacistRace == "asian">><<print either("dark olive", "light olive")>><<elseif ["middle eastern", "semitic", "southern european"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark olive", "tan")>><<else>>tanned<</if>><<elseif $assistantFSAppearance == "subjugationist">><<if $arcologies[0].FSSubjugationistRace == "black">><<print either("black", "brown", "dark brown")>><<elseif $arcologies[0].FSSubjugationistRace == "white">><<print either("fair", "pale")>><<elseif $arcologies[0].FSSubjugationistRace == "latina">><<print either("brown", "dark brown", "dark olive")>><<elseif ["amerindian", "indo-aryan", "malay", "pacific islander"].includes($arcologies[0].FSSubjugationistRace)>><<print either("dark", "light")>><<elseif $arcologies[0].FSSubjugationistRace == "asian">><<print either("dark olive", "light olive")>><<elseif ["middle eastern", "semitic", "southern european"].includes($arcologies[0].FSSubjugationistRace)>><<print either("dark olive", "tan")>><<else>>tanned<</if>><<else>>tanned<</if>> skin, huge lips, and ridiculous tits. _HisA cock hangs past _hisA knees when limp.
<<if $assistantFSOptions>>
<<switch $assistantFSAppearance>>
<<case "paternalist">>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 7344c2dcd6fbd9b8c3081caf18d102ea14c09aaa..81bb13dbda4049188f272578d2acb9c4fdf67b2e 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1472,7 +1472,7 @@ Alter $his race:
[[White|Surgery Degradation][$activeSlave.race = "white",$activeSlave.skin = either("fair", "light", "pale"),$activeSlave.eyeColor = either("blue", "brown", "green"),$activeSlave.hColor = either("black", "blonde", "brown", "red"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "latina">>
- [[Latina|Surgery Degradation][$activeSlave.race = "latina",$activeSlave.skin = either("brown", "dark brown", "dark olive", "light olive", "tanned"),$activeSlave.hColor = either("black", "black", "brown", "brown"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Latina|Surgery Degradation][$activeSlave.race = "latina",$activeSlave.skin = either("brown", "dark brown", "dark olive", "light olive", "tan"),$activeSlave.hColor = either("black", "black", "brown", "brown"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "black">>
[[Black|Surgery Degradation][$activeSlave.race = "black",$activeSlave.skin = either("black", "brown", "dark brown"),$activeSlave.hColor = either("black", "black", "black", "brown"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
@@ -1481,7 +1481,7 @@ Alter $his race:
[[Asian|Surgery Degradation][$activeSlave.race = "asian",$activeSlave.skin = either("dark olive", "light olive", "light"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "middle eastern">>
- [[Middle Eastern|Surgery Degradation][$activeSlave.race = "middle eastern",$activeSlave.skin = either("fair", "light olive", "light", "tanned"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Middle Eastern|Surgery Degradation][$activeSlave.race = "middle eastern",$activeSlave.skin = either("fair", "light olive", "light", "tan"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "indo-aryan">>
[[Indo-Aryan|Surgery Degradation][$activeSlave.race = "indo-aryan",$activeSlave.skin = either("dark", "light"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
@@ -1496,10 +1496,10 @@ Alter $his race:
[[Amerindian|Surgery Degradation][$activeSlave.race = "amerindian",$activeSlave.skin = either("dark", "light"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "southern european">>
- [[Southern European|Surgery Degradation][$activeSlave.race = "southern european",$activeSlave.skin = either("fair", "light olive", "light", "tanned"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Southern European|Surgery Degradation][$activeSlave.race = "southern european",$activeSlave.skin = either("fair", "light olive", "light", "tan"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "semitic">>
- [[Semitic|Surgery Degradation][$activeSlave.race = "semitic",$activeSlave.skin = either("fair", "light olive", "light", "tanned"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[Semitic|Surgery Degradation][$activeSlave.race = "semitic",$activeSlave.skin = either("fair", "light olive", "light", "tan"),$activeSlave.hColor = either("black"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]] |
<</if>>
<<if $activeSlave.race != "mixed race">>
[[Mixed Race|Surgery Degradation][$activeSlave.race = "mixed race",$activeSlave.skin = either("dark", "light", "pale"),$activeSlave.hColor = either("black", "black", "black", "black", "blonde", "brown", "brown", "red"),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "race"]]
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index c59480cb68a9e69214727528d61ed4491bb109cc..b9480ddec488426fd97dff3a3c3deb5ebe871166 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -276,7 +276,7 @@
<<set $activeSlave.pubicHColor = "blonde">>
<<set $activeSlave.underArmHColor = "blonde">>
<<set $activeSlave.race = "white">>
- <<set $activeSlave.skin = "tanned">>
+ <<set $activeSlave.skin = "sun tanned">>
<<set $activeSlave.override_H_Color = 1>>
<<set $activeSlave.override_Arm_H_Color = 1>>
<<set $activeSlave.override_Brow_H_Color = 1>>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index 84b316bf113b3b8843395c58901f96dbd22964cd..5cb722470de838864a2baeec7cca8ab9760a95f2 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -607,11 +607,6 @@ Treat nails:
<</if>>
/* SKIN */
-
-<<set $tannableSkin = ["natural", "lightened", "white", "fair", "pale", "light", "extremely pale"]>>
-<<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", "dyed pink", "dyed gray", "tiger striped", "camouflage patterned"]>>
<br><br>
@@ -619,31 +614,53 @@ $His skin is $activeSlave.skin.
<<if ($dyedSkin.indexOf($activeSlave.skin) != -1)>>
[[Remove coloring|Salon][$activeSlave.skin = $activeSlave.origSkin,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+<<elseif (($activeSlave.skin == "sun tanned") || ($activeSlave.skin == "spray tanned"))>>
+ [[Remove tanning|Salon][$activeSlave.skin = $activeSlave.origSkin,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<</if>>
<<if ($dyedSkin.indexOf($activeSlave.skin) == -1)>>
<br>
- Change skin tone:
- <<set _needsSpacers = 0>>
- <<if ($bleachableSkin.indexOf($activeSlave.skin) != -1)>>
- <<if _needsSpacers == 1>> | <</if>>
- [[Bleach|Salon][$activeSlave.skin = "pale",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- <<set _needsSpacers = 1>>
- <</if>>
- <<if ($lightenableSkin.indexOf($activeSlave.skin) != -1)>>
- <<if _needsSpacers == 1>> | <</if>>
- [[Lighten|Salon][$activeSlave.skin = "lightened",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- <<set _needsSpacers = 1>>
+ <<if ($activeSlave.skin == "sun tanned" || $activeSlave.skin == "spray tanned")>>
+ $His skin tanning must be removed before any advanced procedure to change $his skin color.
+ <<else>>
+ Change skin tone:
+ <<set _needsSpacers = 0>>
+ <<if (skinToneLevel($activeSlave.skin) > 1)>>
+ <<if _needsSpacers == 1>> | <</if>>
+ [[Bleach|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, -2),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ <<set _needsSpacers = 1>>
+ <</if>>
+ <<if (skinToneLevel($activeSlave.skin) > 8)>>
+ <<if _needsSpacers == 1>> | <</if>>
+ [[Lighten|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, -1),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ <<set _needsSpacers = 1>>
+ <</if>>
+ <<if (skinToneLevel($activeSlave.skin) < 18)>>
+ <<if _needsSpacers == 1>> | <</if>>
+ [[Darken|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, 1),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ <<set _needsSpacers = 1>>
+ <</if>>
+ <<if (skinToneLevel($activeSlave.skin) < 25)>>
+ <<if _needsSpacers == 1>> | <</if>>
+ [[Blacken|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, 2),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ <<set _needsSpacers = 1>>
+ <</if>>
<</if>>
- <<if ($tannableSkin.indexOf($activeSlave.skin) != -1)>>
- <<if _needsSpacers == 1>> | <</if>>
- [[Tan|Salon][$activeSlave.skin = "tanned",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- <<set _needsSpacers = 1>>
+ <br>
+ <<set _needsSpacers = 0>>
+ <<if ($activeSlave.skin != "sun tanned")>>
+ <<if (skinToneLevel($activeSlave.skin) < 6)>>
+ $His skin is so light in color that any attempt at natural tanning is more likely to damage $his skin.
+ <<elseif (skinToneLevel($activeSlave.skin) > 20)>>
+ $His skin is so dark in color that any attempt at natural tanning is not likely to appear on $his skin.
+ <<else>>
+ [["Sun tan " + $his + " skin"|Salon][$activeSlave.skin = "sun tanned",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ <<set _needsSpacers = 1>>
+ <</if>>
<</if>>
- <<if ($darkenableSkin.indexOf($activeSlave.skin) != -1)>>
+ <<if ($activeSlave.skin != "spray tanned")>>
<<if _needsSpacers == 1>> | <</if>>
- [[Darken|Salon][$activeSlave.skin = "dark",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
- <<set _needsSpacers = 1>>
+ [["Spray tan " + $his + " skin"|Salon][$activeSlave.skin = "spray tanned",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<</if>>
<</if>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 14b7b490c910d33f821d9ad78854aa268662f9e4..310d359912f6cec77c03a666d8189fe388bfd3d8 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -2572,11 +2572,11 @@ $He's got a
<<widget "AnusDescription">>
-<<if ($activeSlave.skin == "tanned") || ($activeSlave.skin == "fair") || ($activeSlave.skin == "pale") || ($activeSlave.race == "white")>>
+<<if (skinToneLevel($activeSlave.skin) < 13)>>
<<set $skinDesc = "pink">>
<<elseif ($activeSlave.anusTat == "bleached")>>
<<set $skinDesc = $activeSlave.skin>>
-<<elseif ($activeSlave.skin == "brown") || ($activeSlave.race == "black")>>
+<<elseif (skinToneLevel($activeSlave.skin) > 19)>>
<<set $skinDesc = "dark">>
<<else>>
<<set $skinDesc = "darker">>
@@ -17348,7 +17348,8 @@ $He has
<<widget "skinDescription">>
<<if $activeSlave.fuckdoll > 0>>
- The small areas of visible skin are <<print $activeSlave.skin>><<if $activeSlave.markings == "freckles">> and lightly freckled<<if (($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")) && ($activeSlave.hColor != "red")>>, an attractive combination<</if>><<elseif $activeSlave.markings == "heavily freckled">> and heavily freckled<<if (($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")) && ($activeSlave.hColor != "red")>>, an attractive combination<</if>><</if>>.
+ The small areas of visible skin are <<print $activeSlave.skin>><<if $activeSlave.markings == "freckles">> and lightly freckled<<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10) && ($activeSlave.hColor == "red")>>, an attractive combination<</if>><<elseif $activeSlave.markings == "heavily freckled">> and heavily freckled<<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10) && ($activeSlave.hColor == "red")>>, an attractive combination<</if>><</if>>.
+ <<if ($activeSlave.skin == "sun tanned" || $activeSlave.skin == "spray tanned")>>$His skin has been tanned <<if $activeSlave.skin == "sun tanned">>to a natural, healthy-looking tone<<elseif $activeSlave.skin == "spray tanned">>with obvious, garish-looking makeup<</if>>.<</if>>
<<elseif ($seeNationality == 1)>>
<<if $activeSlave.nationality == 0>>
Ethnically, $he's
@@ -17363,7 +17364,8 @@ $He has
<<else>>
$He's originally @@.tan;<<print $activeSlave.nationality>>;@@ ethnically, $he's
<</if>>
- @@.tan;<<print $activeSlave.race>>,@@ and $his skin is <<print $activeSlave.skin>><<if $activeSlave.markings == "freckles">> and lightly freckled<<if (($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")) && ($activeSlave.hColor != "red")>>, an attractive combination<</if>><<elseif $activeSlave.markings == "heavily freckled">> and heavily freckled<<if (($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")) && ($activeSlave.hColor != "red")>>, an attractive combination<</if>><</if>>.
+ @@.tan;<<print $activeSlave.race>>,@@ and $his skin is <<print $activeSlave.skin>><<if $activeSlave.markings == "freckles">> and lightly freckled<<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10) && ($activeSlave.hColor == "red")>>, an attractive combination<</if>><<elseif $activeSlave.markings == "heavily freckled">> and heavily freckled<<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10) && ($activeSlave.hColor == "red")>>, an attractive combination<</if>><</if>>.
+ <<if ($activeSlave.skin == "sun tanned" || $activeSlave.skin == "spray tanned")>>$His skin has been tanned <<if $activeSlave.skin == "sun tanned">>to a natural, healthy-looking tone<<elseif $activeSlave.skin == "spray tanned">>with obvious, garish-looking makeup<</if>>.<</if>>
<<if $activeSlave.race != $activeSlave.origRace && $saleDescription != 1>>
$He has received plastic surgery to appear <<print $activeSlave.race>>; $he is originally <<print $activeSlave.origRace>>.
<<elseif $activeSlave.race != $activeSlave.origRace && $saleDescription == 1>>
@@ -17378,7 +17380,8 @@ $He has
<</if>>
<</if>>
<<elseif ($seeRace == 1)>>
- Ethnically, $he's @@.tan;<<print $activeSlave.race>>,@@ and $his skin is <<print $activeSlave.skin>><<if $activeSlave.markings == "freckles">> and lightly freckled<<if (($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")) && ($activeSlave.hColor != "red")>>, an attractive combination<</if>><<elseif $activeSlave.markings == "heavily freckled">> and heavily freckled<<if (($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")) && ($activeSlave.hColor != "red")>>, an attractive combination<</if>><</if>>.
+ Ethnically, $he's @@.tan;<<print $activeSlave.race>>,@@ and $his skin is <<print $activeSlave.skin>><<if $activeSlave.markings == "freckles">> and lightly freckled<<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10) && ($activeSlave.hColor == "red")>>, an attractive combination<</if>><<elseif $activeSlave.markings == "heavily freckled">> and heavily freckled<<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10) && ($activeSlave.hColor == "red")>>, an attractive combination<</if>><</if>>.
+ <<if ($activeSlave.skin == "sun tanned" || $activeSlave.skin == "spray tanned")>>$His skin has been tanned <<if $activeSlave.skin == "sun tanned">>to a natural, healthy-looking tone<<elseif $activeSlave.skin == "spray tanned">>with obvious, garish-looking makeup<</if>>.<</if>>
<<if $activeSlave.race != $activeSlave.origRace && $saleDescription != 1>>
$He has received plastic surgery to appear <<print $activeSlave.race>>; $he is originally <<print $activeSlave.origRace>>.
<<elseif $activeSlave.race != $activeSlave.origRace && $saleDescription == 1>>
@@ -17393,7 +17396,8 @@ $He has
<</if>>
<</if>>
<<else>>
- $His skin is <<print $activeSlave.skin>><<if $activeSlave.markings == "freckles">> and lightly freckled<<if (($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")) && ($activeSlave.hColor != "red")>>, an attractive combination<</if>><<elseif $activeSlave.markings == "heavily freckled">> and heavily freckled<<if (($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")) && ($activeSlave.hColor != "red")>>, an attractive combination<</if>><</if>>.
+ $His skin is <<print $activeSlave.skin>><<if $activeSlave.markings == "freckles">> and lightly freckled<<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10) && ($activeSlave.hColor == "red")>>, an attractive combination<</if>><<elseif $activeSlave.markings == "heavily freckled">> and heavily freckled<<if (skinToneLevel($activeSlave.skin) > 5) && (skinToneLevel($activeSlave.skin) < 10) && ($activeSlave.hColor == "red")>>, an attractive combination<</if>><</if>>.
+ <<if ($activeSlave.skin == "sun tanned" || $activeSlave.skin == "spray tanned")>>$His skin has been tanned <<if $activeSlave.skin == "sun tanned">>to a natural, healthy-looking tone<<elseif $activeSlave.skin == "spray tanned">>with obvious, garish-looking makeup<</if>>.<</if>>
<</if>>
<</widget>>
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index a8518c8666a2dc53f8c266bcd897b1d8fa794380..69d3db3d6eb18bba1d151794dd6dc6397a20a408 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -294,8 +294,8 @@ $activeSlave.slaveName is
which lacks arm or leg holes, so $his limbless torso is in a net.
<<else>>
<<if (($activeSlave.nails == 2) || ($activeSlave.nails == 7) || ($activeSlave.nails == 9)) && (($activeSlave.makeup == 3) || ($activeSlave.makeup == 6) || ($activeSlave.nails == 8))>>
- $activeSlave.hColor to match $his monocolor style,
- <<elseif ($activeSlave.skin == "dark") || ($activeSlave.skin == "black")>>
+ $activeSlave.hColor to match $his monochrome style,
+ <<elseif (skinToneLevel($activeSlave.skin) > 22)>>
in white to create a striking contrast with $his $activeSlave.skin skin,
<<elseif ($activeSlave.addict > 5)>>
in the electric blue color of aphrodisiacs to signal $he's down to fuck high,
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 2ba0228468d6c47b19c76b56bd4115fc0833dad8..293728f53f602f104a74f6b358d813b13c29cc04 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -2065,7 +2065,7 @@
<<set $activeSlave.underArmHColor = "blonde">>
<<set $activeSlave.eyebrowHColor = "blonde">>
<<set $activeSlave.race = "white">>
- <<set $activeSlave.skin = "tanned">>
+ <<set $activeSlave.skin = "sun tanned">>
<<set $activeSlave.override_H_Color = 1>>
<<set $activeSlave.override_Arm_H_Color = 1>>
<<set $activeSlave.override_Pubic_H_Color = 1>>