diff --git a/src/art/artJS.tw b/src/art/artJS.tw
index d437da4f74aaf0cffdbe8954cd87c4f6969113d0..b6cfd135bb547b88b10b62a0d409b48e211fdbe2 100644
--- a/src/art/artJS.tw
+++ b/src/art/artJS.tw
@@ -347,15 +347,19 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#65422C";
colorSlave.areolaColor = "#4A3A33";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "ebony") {
+ } else if (artSlave.skin == "black") {
colorSlave.skinColor = "#65422C";
colorSlave.areolaColor = "#4A3A33";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "black") {
+ } else if (artSlave.skin == "ebony") {
colorSlave.skinColor = "#583E2F";
colorSlave.areolaColor = "#3F3A38";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
}
} else if (artSlave.race == "black" || artSlave.race == "surgically altered to look black") {
@@ -447,15 +451,19 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#583E2F";
colorSlave.areolaColor = "#46362C";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "ebony") {
+ } else if (artSlave.skin == "black") {
colorSlave.skinColor = "#583D3D";
colorSlave.areolaColor = "#3B3028";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "black") {
+ } else if (artSlave.skin == "ebony") {
colorSlave.skinColor = "#4A3A33";
colorSlave.areolaColor = "#332B27";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#4A3A33";
+ colorSlave.areolaColor = "#332B27";
+ colorSlave.labiaColor = "#F977A3";
}
} else if (artSlave.race == "latina" || artSlave.race == "surgically altered to look latina") {
@@ -547,15 +555,19 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#74523E";
colorSlave.areolaColor = "#573F30";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "ebony") {
+ } else if (artSlave.skin == "black") {
colorSlave.skinColor = "#6B4B4B";
colorSlave.areolaColor = "#473426";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "black") {
+ } else if (artSlave.skin == "ebony") {
colorSlave.skinColor = "#634F45";
colorSlave.areolaColor = "#4D3A2E";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#634F45";
+ colorSlave.areolaColor = "#4D3A2E";
+ colorSlave.labiaColor = "#F977A3";
}
} else if (artSlave.race == "asian" || artSlave.race == "surgically altered to look asian") {
@@ -647,15 +659,19 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#724826";
colorSlave.areolaColor = "#5C3D26";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "ebony") {
+ } else if (artSlave.skin == "black") {
colorSlave.skinColor = "#724826";
colorSlave.areolaColor = "#5C3D26";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "black") {
+ } else if (artSlave.skin == "ebony") {
colorSlave.skinColor = "#583E2F";
colorSlave.areolaColor = "#3F3A38";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
}
} else if (artSlave.race == "middle eastern" || artSlave.race == "surgically altered to look middle eastern") {
@@ -747,15 +763,19 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#604534";
colorSlave.areolaColor = "#514039";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "ebony") {
+ } else if (artSlave.skin == "black") {
colorSlave.skinColor = "#604534 ";
colorSlave.areolaColor = "#514039";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "black") {
+ } else if (artSlave.skin == "ebony") {
colorSlave.skinColor = "#583E2F";
colorSlave.areolaColor = "#3F3A38";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
}
} else if (artSlave.race == "amerindian" || artSlave.race == "surgically altered to look amerindian") {
@@ -847,15 +867,19 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#724826";
colorSlave.areolaColor = "#5C3D26";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "ebony") {
+ } else if (artSlave.skin == "black") {
colorSlave.skinColor = "#724826";
colorSlave.areolaColor = "#5C3D26";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "black") {
+ } else if (artSlave.skin == "ebony") {
colorSlave.skinColor = "#583E2F";
colorSlave.areolaColor = "#3F3A38";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
}
} else if (artSlave.race == "southern european" || artSlave.race == "surgically altered to look southern european") {
@@ -947,15 +971,19 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#65422C";
colorSlave.areolaColor = "#4A3A33";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "ebony") {
+ } else if (artSlave.skin == "black") {
colorSlave.skinColor = "#65422C";
colorSlave.areolaColor = "#4A3A33";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "black") {
+ } else if (artSlave.skin == "ebony") {
colorSlave.skinColor = "#583E2F";
colorSlave.areolaColor = "#3F3A38";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
}
} else if (artSlave.race == "semitic" || artSlave.race == "surgically altered to look semitic") {
@@ -1047,15 +1075,19 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#604534";
colorSlave.areolaColor = "#514039";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "ebony") {
+ } else if (artSlave.skin == "black") {
colorSlave.skinColor = "#604534 ";
colorSlave.areolaColor = "#514039";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "black") {
+ } else if (artSlave.skin == "ebony") {
colorSlave.skinColor = "#583E2F";
colorSlave.areolaColor = "#3F3A38";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
}
} else if (artSlave.race == "malay" || artSlave.race == "surgically altered to look malay") {
@@ -1147,15 +1179,19 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#6F3E27";
colorSlave.areolaColor = "#553823";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "ebony") {
+ } else if (artSlave.skin == "black") {
colorSlave.skinColor = "#6F3E27";
colorSlave.areolaColor = "#553823";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "black") {
+ } else if (artSlave.skin == "ebony") {
colorSlave.skinColor = "#583E2F";
colorSlave.areolaColor = "#3F3A38";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
}
} else if (artSlave.race == "indo-aryan" || artSlave.race == "surgically altered to look indo-aryan") {
@@ -1247,15 +1283,19 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#7C5842";
colorSlave.areolaColor = "#5F4538";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "ebony") {
+ } else if (artSlave.skin == "black") {
colorSlave.skinColor = "#7C5842";
colorSlave.areolaColor = "#5F4538";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "black") {
+ } else if (artSlave.skin == "ebony") {
colorSlave.skinColor = "#6B5449";
colorSlave.areolaColor = "#473C37";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#6B5449";
+ colorSlave.areolaColor = "#473C37";
+ colorSlave.labiaColor = "#F977A3";
}
} else if (artSlave.race == "pacific islander" || artSlave.race == "surgically altered to look pacific islander") {
@@ -1347,15 +1387,19 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#6F3E27";
colorSlave.areolaColor = "#553823";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "ebony") {
+ } else if (artSlave.skin == "black") {
colorSlave.skinColor = "#6F3E27";
colorSlave.areolaColor = "#553823";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "black") {
+ } else if (artSlave.skin == "ebony") {
colorSlave.skinColor = "#583E2F";
colorSlave.areolaColor = "#3F3A38";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#583E2F";
+ colorSlave.areolaColor = "#3F3A38";
+ colorSlave.labiaColor = "#F977A3";
}
} else if (artSlave.race == "mixed race" || artSlave.race == "surgically altered to look mixed race") {
@@ -1447,15 +1491,19 @@ if (artSlave.skin == "camouflage patterned") {
colorSlave.skinColor = "#74523E";
colorSlave.areolaColor = "#574135";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "ebony") {
+ } else if (artSlave.skin == "black") {
colorSlave.skinColor = "#6B4B4B";
colorSlave.areolaColor = "#413228";
colorSlave.labiaColor = "#F977A3";
- } else if (artSlave.skin == "black") {
+ } else if (artSlave.skin == "ebony") {
colorSlave.skinColor = "#634F45";
colorSlave.areolaColor = "#4E3C32";
colorSlave.labiaColor = "#F977A3";
colorSlave.lipsColor = "#403030";
+ } else if (artSlave.skin == "pure black") {
+ colorSlave.skinColor = "#634F45";
+ colorSlave.areolaColor = "#4E3C32";
+ colorSlave.labiaColor = "#F977A3";
}
}
return colorSlave;
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index d7d144ced0ec3f30c003f5099ff698eea6ce400b..20541a917531f38f1c0aa6084ef07cccc7bd0088 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -101,11 +101,11 @@
<<radiobutton "$activeSlave.race" "white">> White
<<radiobutton "$activeSlave.race" "asian">> Asian
<<radiobutton "$activeSlave.race" "latina">> Latina
-<<radiobutton "$activeSlave.race" "middle eastern">> Middle eastern
+<<radiobutton "$activeSlave.race" "middle eastern">> Middle Eastern
<<radiobutton "$activeSlave.race" "black">> Black
<<radiobutton "$activeSlave.race" "semitic">> Semitic
<<radiobutton "$activeSlave.race" "southern european">> Southern European
-<<radiobutton "$activeSlave.race" "indo-aryan">> Indo-aryan
+<<radiobutton "$activeSlave.race" "indo-aryan">> Indo-Aryan
<<radiobutton "$activeSlave.race" "amerindian">> Amerindian
<<radiobutton "$activeSlave.race" "pacific islander">> Pacific Islander
<<radiobutton "$activeSlave.race" "malay">> Malay
@@ -116,17 +116,28 @@
''Skin color: ($activeSlave.skin)''
<<textbox "$activeSlave.skin" $activeSlave.skin>>
<br>
+<<radiobutton "$activeSlave.skin" "pure white">> Pure White
<<radiobutton "$activeSlave.skin" "extremely pale">> Extremely Pale
<<radiobutton "$activeSlave.skin" "pale">> Pale
+<<radiobutton "$activeSlave.skin" "extremely fair">> Extremely Fair
+<<radiobutton "$activeSlave.skin" "very fair">> Very Fair
<<radiobutton "$activeSlave.skin" "fair">> Fair
+<<radiobutton "$activeSlave.skin" "white">> White
<<radiobutton "$activeSlave.skin" "light">> Light
+<<radiobutton "$activeSlave.skin" "lightened">> Lightened
<<radiobutton "$activeSlave.skin" "light olive">> Light Olive
+<<radiobutton "$activeSlave.skin" "olive">> Olive
+<<radiobutton "$activeSlave.skin" "natural">> Natural
<<radiobutton "$activeSlave.skin" "tanned">> Tanned
+<<radiobutton "$activeSlave.skin" "bronzed">> Bronzed
<<radiobutton "$activeSlave.skin" "dark olive">> Dark Olive
<<radiobutton "$activeSlave.skin" "dark">> Dark
+<<radiobutton "$activeSlave.skin" "light brown">> Light Brown
<<radiobutton "$activeSlave.skin" "brown">> Brown
<<radiobutton "$activeSlave.skin" "dark brown">> Dark Brown
<<radiobutton "$activeSlave.skin" "black">> Black
+<<radiobutton "$activeSlave.skin" "ebony">> Ebony
+<<radiobutton "$activeSlave.skin" "pure black">> Pure Black
<br>
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 6c2ee4d2a754c390ab0a7d7d2aaef5f8b049a29c..16932939b332460bc0267e395f2085f017eb6da0 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -1199,17 +1199,28 @@
''Skin color: (@@.yellow;$tempSlave.skin@@)''
<<textbox "$tempSlave.skin" $tempSlave.skin>>
<br>
- <<radiobutton "$tempSlave.skin" "white">> White
+ <<radiobutton "$tempSlave.skin" "pure white">> Pure White
+ <<radiobutton "$tempSlave.skin" "extremely pale">> Extremely Pale
<<radiobutton "$tempSlave.skin" "pale">> Pale
+ <<radiobutton "$tempSlave.skin" "extremely fair">> Extremely Fair
+ <<radiobutton "$tempSlave.skin" "very fair">> Very Fair
<<radiobutton "$tempSlave.skin" "fair">> Fair
+ <<radiobutton "$tempSlave.skin" "white">> White
<<radiobutton "$tempSlave.skin" "light">> Light
+ <<radiobutton "$tempSlave.skin" "lightened">> Lightened
<<radiobutton "$tempSlave.skin" "light olive">> Light Olive
+ <<radiobutton "$tempSlave.skin" "olive">> Olive
+ <<radiobutton "$tempSlave.skin" "natural">> Natural
<<radiobutton "$tempSlave.skin" "tanned">> Tanned
+ <<radiobutton "$tempSlave.skin" "bronzed">> Bronzed
<<radiobutton "$tempSlave.skin" "dark olive">> Dark Olive
<<radiobutton "$tempSlave.skin" "dark">> Dark
+ <<radiobutton "$tempSlave.skin" "light brown">> Light Brown
<<radiobutton "$tempSlave.skin" "brown">> Brown
<<radiobutton "$tempSlave.skin" "dark brown">> Dark Brown
<<radiobutton "$tempSlave.skin" "black">> Black
+ <<radiobutton "$tempSlave.skin" "ebony">> Ebony
+ <<radiobutton "$tempSlave.skin" "pure black">> Pure Black
<br>
<</widget>>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 7b18ef63fde7b037b6b782c052b18e4624aebfd4..6a84efcf7d0db84fb3e2d10abeadaf32d6b92fcf 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -545,18 +545,28 @@ __''Player Character''__
[[Mixed Race|Intro Summary][$PC.race = "mixed race"]]
<br>__Skin tone:__
+ [[Pure White|Intro Summary][$PC.skin = "pure white"]] |
[[Extremely Pale|Intro Summary][$PC.skin = "extremely pale"]] |
[[Pale|Intro Summary][$PC.skin = "pale"]] |
+ [[Extremely Fair|Intro Summary][$PC.skin = "extremely fair"]] |
+ [[Very Fair|Intro Summary][$PC.skin = "very fair"]] |
[[Fair|Intro Summary][$PC.skin = "fair"]] |
[[White|Intro Summary][$PC.skin = "white"]] |
[[Light|Intro Summary][$PC.skin = "light"]] |
+ [[Lightened|Intro Summary][$PC.skin = "lightened"]] |
[[Light Olive|Intro Summary][$PC.skin = "light olive"]] |
+ [[Olive|Intro Summary][$PC.skin = "olive"]] |
+ [[Natural|Intro Summary][$PC.skin = "natural"]] |
[[Tanned|Intro Summary][$PC.skin = "tanned"]] |
+ [[Bronzed|Intro Summary][$PC.skin = "bronzed"]] |
[[Dark Olive|Intro Summary][$PC.skin = "dark olive"]] |
[[Dark|Intro Summary][$PC.skin = "dark"]] |
+ [[Light Brown|Intro Summary][$PC.skin = "light brown"]] |
[[Brown|Intro Summary][$PC.skin = "brown"]] |
[[Dark Brown|Intro Summary][$PC.skin = "dark brown"]] |
- [[Black|Intro Summary][$PC.skin = "black"]]
+ [[Black|Intro Summary][$PC.skin = "black"]] |
+ [[Ebony|Intro Summary][$PC.skin = "ebony"]] |
+ [[Pure Black|Intro Summary][$PC.skin = "pure black"]]
<<switch $PC.markings>>
<<case "freckles">>
diff --git a/src/js/slaveSummaryWidgets.tw b/src/js/slaveSummaryWidgets.tw
index af2bb48c758c373609872370fd9774c5a8757a5a..5d674c3320b34b63fa1fd0d79d78666f52830e8a 100644
--- a/src/js/slaveSummaryWidgets.tw
+++ b/src/js/slaveSummaryWidgets.tw
@@ -1731,6 +1731,18 @@ window.SlaveSummaryUncached = (function(){
function short_skin(slave) {
r += `<span class="pink">`;
switch (slave.skin) {
+ case "pure white":
+ r += `P. Whi`;
+ break;
+ case "extremely fair":
+ r += `E. Fai`;
+ break;
+ case "very fair":
+ r += `V. Fai`;
+ break;
+ case "extremely pale":
+ r += `E. Pal`;
+ break;
case "light brown":
r += `L. Br`;
break;
@@ -1743,15 +1755,27 @@ window.SlaveSummaryUncached = (function(){
case "dark olive":
r += `D. Oli`;
break;
- case "extremely pale":
- r += `Ex. Pa`;
- break;
case "pure white":
r += `P. Whi`;
break;
+ case "lightened":
+ r += `Ltnd`;
+ break;
case "tanned":
r += `Tan`;
break;
+ case "natural":
+ r += `Nat`;
+ break;
+ case "bronzed":
+ r += `Bron`;
+ break;
+ case "ebony":
+ r += `Ebon`;
+ break;
+ case "pure black":
+ r += `P. Bla`;
+ break;
case "dark":
case "fair":
case "pale":
diff --git a/src/npc/fSlaveImpregConsummate.tw b/src/npc/fSlaveImpregConsummate.tw
index c7999ee6f1b122e18b42cb7271de686d1b596be6..6690ab090b55a70a559f9b7e09d46fa4b0cfa32c 100644
--- a/src/npc/fSlaveImpregConsummate.tw
+++ b/src/npc/fSlaveImpregConsummate.tw
@@ -301,13 +301,15 @@ $activeSlave.slaveName and $impregnatrix.slaveName are likely to produce
<<if ($activeSlave.race == "white") && ($impregnatrix.race == "white")>>
a pure white,
<<elseif ($activeSlave.race == "asian") && ($impregnatrix.race == "asian")>>
- an asian,
+ a pure Asian,
<<elseif ($activeSlave.race == "latina") && ($impregnatrix.race == "latina")>>
- a latina,
+ a pure latina,
<<elseif ($activeSlave.race == "black") && ($impregnatrix.race == "black")>>
- a black,
-<<elseif ($activeSlave.race == "arab") && ($impregnatrix.race == "arab")>>
+ a pure black,
+<<elseif ($activeSlave.race == "middle eastern") && ($impregnatrix.race == "middle eastern")>>
a pure Middle Eastern,
+<<elseif ($activeSlave.race == "malay") && ($impregnatrix.race == "malay")>>
+ a pure malay,
<<elseif ($activeSlave.race == "white") && ($impregnatrix.race == "black")>>
a mulatto,
<<elseif ($activeSlave.race == "black") && ($impregnatrix.race == "white")>>
@@ -317,19 +319,25 @@ $activeSlave.slaveName and $impregnatrix.slaveName are likely to produce
<<elseif ($activeSlave.race == "latina") && ($impregnatrix.race == "white")>>
a mestizo,
<<elseif ($activeSlave.race == "asian") && ($impregnatrix.race == "black")>>
- an afro-asian,
+ an Afro-Asian,
<<elseif ($activeSlave.race == "black") && ($impregnatrix.race == "asian")>>
- an afro-asian,
-<<elseif ($activeSlave.race == "arab") && ($impregnatrix.race == "black")>>
- an afro-arab,
-<<elseif ($activeSlave.race == "black") && ($impregnatrix.race == "arab")>>
- an afro-arab,
+ an Afro-Asian,
+<<elseif ($activeSlave.race == "middle eastern") && ($impregnatrix.race == "black")>>
+ an Afro-Arab,
+<<elseif ($activeSlave.race == "black") && ($impregnatrix.race == "middle eastern")>>
+ an Afro-Arab,
+<<elseif ($activeSlave.race == "indo-aryan") && ($impregnatrix.race == "black")>>
+ an Afro-Indian,
+<<elseif ($activeSlave.race == "black") && ($impregnatrix.race == "indo-aryan")>>
+ an Afro-Indian,
<<elseif ($activeSlave.race == "amerindian") && ($impregnatrix.race == "white")>>
a mestizo,
<<elseif ($activeSlave.race == "white") && ($impregnatrix.race == "amerindian")>>
a mestizo,
-<<elseif ($activeSlave.race == $impregnatrix.race)>>
+<<elseif ($activeSlave.race == $impregnatrix.race) && ($activeSlave.race !== "mixed race") && ($impregnatrix.race !== "mixed race")>>
an ethnically pure,
+<<elseif ($activeSlave.race !== $impregnatrix.race) && ($activeSlave.race !== "mixed race") && ($impregnatrix.race !== "mixed race")>>
+ a biracial,
<<else>>
mixed ethnicity,
<</if>>
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 3c2359eb6bea4d22101c8222be5511ce6ea4f378..a89322ead770f947d95d65e18e3a79a9e034e09f 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -682,17 +682,28 @@ Her nationality is $activeSlave.nationality.
<br>''Skin color:'' <span id="skin"><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">></span>
<br>
+<<link "Pure White">><<set $activeSlave.skin = "pure white">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Extremely Pale">><<set $activeSlave.skin = "extremely pale">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Pale">><<set $activeSlave.skin = "pale">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Extremely Fair">><<set $activeSlave.skin = "extremely fair">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Very Fair">><<set $activeSlave.skin = "very fair">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Fair">><<set $activeSlave.skin = "fair">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "White">><<set $activeSlave.skin = "white">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Light">><<set $activeSlave.skin = "light">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Lightened">><<set $activeSlave.skin = "lightened">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Light Olive">><<set $activeSlave.skin = "light olive">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Olive">><<set $activeSlave.skin = "olive">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Natural">><<set $activeSlave.skin = "natural">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Tanned">><<set $activeSlave.skin = "tanned">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Bronzed">><<set $activeSlave.skin = "bronzed">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Dark Olive">><<set $activeSlave.skin = "dark olive">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Dark">><<set $activeSlave.skin = "dark">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Light Brown">><<set $activeSlave.skin = "light brown">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Brown">><<set $activeSlave.skin = "brown">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Dark Brown">><<set $activeSlave.skin = "dark brown">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
-<<link "Black">><<set $activeSlave.skin = "black">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>>
+<<link "Black">><<set $activeSlave.skin = "black">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Ebony">><<set $activeSlave.skin = "ebony">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Pure Black">><<set $activeSlave.skin = "pure black">><<replace "#skin">><<textbox "$activeSlave.skin" $activeSlave.skin "Starting Girls">><</replace>><<StartingGirlsCost>><</link>>
<br>''Facial appearance:'' <span id="faceShape">$activeSlave.faceShape</span>.
<<link "Normal">><<set $activeSlave.faceShape = "normal">><<replace "#faceShape">>$activeSlave.faceShape<</replace>><<StartingGirlsCost>><</link>> |
diff --git a/src/pregmod/electiveSurgery.tw b/src/pregmod/electiveSurgery.tw
index 56c51f955a390339896c45008e8985f7e89290ac..c7f14234cbc5aa3ff797aec2567c31aa74a16bcc 100644
--- a/src/pregmod/electiveSurgery.tw
+++ b/src/pregmod/electiveSurgery.tw
@@ -60,41 +60,68 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
<<if $PC.skin != $PC.origSkin>>
[[Restore natural color|PC Surgery Degradation][$PC.skin = $PC.origSkin, $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
+<<if $PC.skin != "pure white">>
+ [[Pure White|PC Surgery Degradation][$PC.skin = "pure white", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
<<if $PC.skin != "extremely pale">>
[[Extremely Pale|PC Surgery Degradation][$PC.skin = "extremely pale", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
-<<if $PC.skin != "white">>
- [[White|PC Surgery Degradation][$PC.skin = "white", $cash -= 2000, $surgeryType = "skinTone"]] |
-<</if>>
<<if $PC.skin != "pale">>
[[Pale|PC Surgery Degradation][$PC.skin = "pale", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
+<<if $PC.skin != "extremely fair">>
+ [[Extremely Fair|PC Surgery Degradation][$PC.skin = "extremely fair", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
+<<if $PC.skin != "very fair">>
+ [[Very Fair|PC Surgery Degradation][$PC.skin = "very fair", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
<<if $PC.skin != "fair">>
[[Fair|PC Surgery Degradation][$PC.skin = "fair", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
+<<if $PC.skin != "white">>
+ [[White|PC Surgery Degradation][$PC.skin = "white", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
<<if $PC.skin != "light">>
[[Light|PC Surgery Degradation][$PC.skin = "light", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
+<<if $PC.skin != "lightened">>
+ [[Lightened|PC Surgery Degradation][$PC.skin = "lightened", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
<<if $PC.skin != "light olive">>
[[Light Olive|PC Surgery Degradation][$PC.skin = "light olive", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
+<<if $PC.skin != "olive">>
+ [[Olive|PC Surgery Degradation][$PC.skin = "olive", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
+<<if $PC.skin != "natural">>
+ [[Natural|PC Surgery Degradation][$PC.skin = "natural", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
<<if $PC.skin != "tanned">>
[[Tanned|PC Surgery Degradation][$PC.skin = "tanned", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
+<<if $PC.skin != "bronzed">>
+ [[Bronzed|PC Surgery Degradation][$PC.skin = "bronzed", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
<<if $PC.skin != "dark olive">>
[[Dark Olive|PC Surgery Degradation][$PC.skin = "dark olive", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "dark">>
[[Dark|PC Surgery Degradation][$PC.skin = "dark", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
+<<if $PC.skin != "light brown">>
+ [[Light Brown|PC Surgery Degradation][$PC.skin = "light brown", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
<<if $PC.skin != "brown">>
[[Brown|PC Surgery Degradation][$PC.skin = "brown", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
<<if $PC.skin != "dark brown">>
[[Dark Brown|PC Surgery Degradation][$PC.skin = "dark brown", $cash -= 2000, $surgeryType = "skinTone"]] |
<</if>>
+<<if $PC.skin != "ebony">>
+ [[Ebony|PC Surgery Degradation][$PC.skin = "ebony", $cash -= 2000, $surgeryType = "skinTone"]] |
+<</if>>
<<if $PC.skin != "black">>
- [[Black|PC Surgery Degradation][$PC.skin = "black", $cash -= 2000, $surgeryType = "skinTone"]] |
+ [[Black|PC Surgery Degradation][$PC.skin = "black", $cash -= 2000, $surgeryType = "skinTone"]]
<</if>>
[[Custom Color|PC Skin Workaround][$cash -= 2000, $surgeryType = "skinTone"]]
diff --git a/src/pregmod/pcAppearanceIntro.tw b/src/pregmod/pcAppearanceIntro.tw
index 670323807598a5d8997a1295d25d0de619e90622..ab442ae0fe2e6865fbb59bf5989d94cbc9d58a73 100644
--- a/src/pregmod/pcAppearanceIntro.tw
+++ b/src/pregmod/pcAppearanceIntro.tw
@@ -86,8 +86,8 @@ You're $PC.race.
You have $PC.skin skin.
</span>
<br>
-<<link "White">>
- <<set $PC.skin = "white">>
+<<link "Pure White">>
+ <<set $PC.skin = "pure white">>
<<PlayerSkin>>
<</link>>
|
@@ -101,26 +101,61 @@ You have $PC.skin skin.
<<PlayerSkin>>
<</link>>
|
+<<link "Extremely Fair">>
+ <<set $PC.skin = "extremely fair">>
+ <<PlayerSkin>>
+<</link>>
+|
+<<link "Very Fair">>
+ <<set $PC.skin = "very fair">>
+ <<PlayerSkin>>
+<</link>>
+|
<<link "Fair">>
<<set $PC.skin = "fair">>
<<PlayerSkin>>
<</link>>
|
+<<link "White">>
+ <<set $PC.skin = "white">>
+ <<PlayerSkin>>
+<</link>>
+|
<<link "Light">>
<<set $PC.skin = "light">>
<<PlayerSkin>>
<</link>>
|
+<<link "Lightened">>
+ <<set $PC.skin = "lightened">>
+ <<PlayerSkin>>
+<</link>>
+|
<<link "Light Olive">>
<<set $PC.skin = "light olive">>
<<PlayerSkin>>
<</link>>
|
+<<link "Olive">>
+ <<set $PC.skin = "olive">>
+ <<PlayerSkin>>
+<</link>>
+|
+<<link "Natural">>
+ <<set $PC.skin = "natural">>
+ <<PlayerSkin>>
+<</link>>
+|
<<link "Tanned">>
<<set $PC.skin = "tanned">>
<<PlayerSkin>>
<</link>>
|
+<<link "Bronzed">>
+ <<set $PC.skin = "bronzed">>
+ <<PlayerSkin>>
+<</link>>
+|
<<link "Dark Olive">>
<<set $PC.skin = "dark olive">>
<<PlayerSkin>>
@@ -131,6 +166,11 @@ You have $PC.skin skin.
<<PlayerSkin>>
<</link>>
|
+<<link "Light Brown">>
+ <<set $PC.skin = "light brown">>
+ <<PlayerSkin>>
+<</link>>
+|
<<link "Brown">>
<<set $PC.skin = "brown">>
<<PlayerSkin>>
@@ -141,6 +181,11 @@ You have $PC.skin skin.
<<PlayerSkin>>
<</link>>
|
+<<link "Ebony">>
+ <<set $PC.skin = "ebony">>
+ <<PlayerSkin>>
+<</link>>
+|
<<link "Black">>
<<set $PC.skin = "black">>
<<PlayerSkin>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 5b9fb013fb077bf2ef7651ad508959ddefb7bbca..657240a6e4bd95973c116bf780423e1421d975db 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1172,7 +1172,7 @@ brown 4
dark 3
olive 2
light brown 1
-null 0
+natural 0
light -1
white -2
fair -3
@@ -1195,6 +1195,8 @@ extremely pale -5
<<set _skin0 = 7>>
<<case "light brown">>
<<set _skin0 = 6>>
+<<case "natural">>
+ <<set _skin1 = 5>>
<<case "light">>
<<set _skin0 = 4>>
<<case "white">>
@@ -1220,6 +1222,8 @@ extremely pale -5
<<set _skin1 = 7>>
<<case "light brown">>
<<set _skin1 = 6>>
+<<case "natural">>
+ <<set _skin1 = 5>>
<<case "light">>
<<set _skin1 = 4>>
<<case "white">>
@@ -1247,6 +1251,8 @@ extremely pale -5
<<set $activeSlave.skin = "olive">>
<<case 6>>
<<set $activeSlave.skin = "light brown">>
+<<case 5>>
+ <<set $activeSlave.skin = "natural">>
<<case 4>>
<<set $activeSlave.skin = "light">>
<<case 3>>
@@ -1267,12 +1273,12 @@ extremely pale -5
<<widget "GenSkinTone">>
<<script>>
(function() {
- var skinToMelanin = {black: 10, ebony: 9.5, 'dark brown': 9, brown: 8, 'light brown': 7.5, dark: 7, 'dark olive': 6, bronzed: 5.5, tanned: 5, olive: 4.5, 'light olive': 4, lightened: 3.5, light: 3, white: 2.5, fair: 2, 'very fair': 1.5, 'extremely fair': 1.25, pale: 1, 'extremely pale': 0.5, 'pure white': 0.001};
+ var skinToMelanin = {'pure black': 10, ebony: 9.5, black: 9, 'dark brown': 8.5, brown: 8, 'light brown': 7.5, dark: 7, 'dark olive': 6.5, bronzed: 6, tanned: 5.5, natural: 5, olive: 4.5, 'light olive': 4, lightened: 3.5, light: 3, white: 2.5, fair: 2, 'very fair': 1.5, 'extremely fair': 1.25, pale: 1, 'extremely pale': 0.5, 'pure white': 0.001};
var parents = State.variables.args;
var skin0 = parents[0] ? (skinToMelanin[parents[0].skin] || 5) : 3;
var skin1 = parents[1] ? (skinToMelanin[parents[1].skin] || 5) : 3;
var skin = Math.round(Math.random() * (skin1 - skin0) + skin0);
- State.variables.activeSlave.skin = ['pure white', 'extremely pale', 'pale', 'fair', 'light', 'light olive', 'olive', 'tanned', 'dark olive', 'dark', 'light brown', 'brown', 'dark brown', 'black'][skin];
+ State.variables.activeSlave.skin = ['pure white', 'extremely pale', 'pale', 'extremely fair', 'very fair', 'fair', 'white', 'light', 'lightened', 'light olive', 'olive', 'natural', 'tanned', 'bronzed', 'dark olive', 'dark', 'light brown', 'brown', 'dark brown', 'ebony', 'black', 'pure black'][skin];
})();
<</script>>
<</widget>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 3dff6c00365f1e758587e86bb4f6f8cd9a235744..83aa76874f760f704b5280042431a352cdf913d9 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1062,7 +1062,7 @@ Alter her Race:
<<if $toSearch.indexOf("surgically") == -1>>
<<if $activeSlave.indentureRestrictions < 1>>
$He is $activeSlave.race. Surgically alter $him to look more:
- [[Caucasian|Surgery Degradation][$activeSlave.race = "surgically altered to look white",$activeSlave.skin = either("pale", "light", "fair"),$activeSlave.eyeColor = either("blue", "brown", "green"),$activeSlave.hColor = either("black", "blonde", "red", "brown"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
+ [[White|Surgery Degradation][$activeSlave.race = "surgically altered to look white",$activeSlave.skin = either("pale", "light", "fair"),$activeSlave.eyeColor = either("blue", "brown", "green"),$activeSlave.hColor = either("black", "blonde", "red", "brown"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
[[Latina|Surgery Degradation][$activeSlave.race = "surgically altered to look latina",$activeSlave.skin = either("light olive", "brown", "dark brown", "tanned", "dark olive"),$activeSlave.hColor = either("black", "black", "brown", "brown"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
[[Black|Surgery Degradation][$activeSlave.race = "surgically altered to look black",$activeSlave.skin = either("black", "brown", "dark brown"),$activeSlave.hColor = either("black", "black", "black", "brown"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
[[Asian|Surgery Degradation][$activeSlave.race = "surgically altered to look asian",$activeSlave.skin = either("light olive", "dark olive", "light"),$activeSlave.hColor = either("black"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index af4da62b42c68214d4db901b86616bc18f29e1ea..9e454d426929ba60e1cb0c2574ad002bf90071bf 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -26,108 +26,72 @@
<<elseif $customSlave.age == 19>>
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 19>>
-<<elseif $customSlave.age == 20 && $retirementAge == 20>>
- <<set $activeSlaveOneTimeMinAge = 20>>
- <<set $activeSlaveOneTimeMaxAge = 20>>
<<elseif $customSlave.age == 20>>
<<set $activeSlaveOneTimeMinAge = 20>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
<<elseif $customSlave.age == 24>>
<<set $activeSlaveOneTimeMinAge = 20>>
<<set $activeSlaveOneTimeMaxAge = 24>>
-<<elseif $customSlave.age == 25 && $retirementAge == 25>>
- <<set $activeSlaveOneTimeMinAge = 25>>
- <<set $activeSlaveOneTimeMaxAge = 25>>
<<elseif $customSlave.age == 25>>
<<set $activeSlaveOneTimeMinAge = 25>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
<<elseif $customSlave.age == 29>>
<<set $activeSlaveOneTimeMinAge = 25>>
<<set $activeSlaveOneTimeMaxAge = 29>>
-<<elseif $customSlave.age == 30 && $retirementAge == 30>>
- <<set $activeSlaveOneTimeMinAge = 30>>
- <<set $activeSlaveOneTimeMaxAge = 30>>
<<elseif $customSlave.age == 30>>
<<set $activeSlaveOneTimeMinAge = 30>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
<<elseif $customSlave.age == 39>>
<<set $activeSlaveOneTimeMinAge = 30>>
<<set $activeSlaveOneTimeMaxAge = 39>>
-<<elseif $customSlave.age == 40 && $retirementAge == 40>>
- <<set $activeSlaveOneTimeMinAge = 40>>
- <<set $activeSlaveOneTimeMaxAge = 40>>
<<elseif $customSlave.age == 40>>
<<set $activeSlaveOneTimeMinAge = 40>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
<<elseif $customSlave.age == 49>>
<<set $activeSlaveOneTimeMinAge = 40>>
<<set $activeSlaveOneTimeMaxAge = 49>>
-<<elseif $customSlave.age == 50 && $retirementAge == 50>>
- <<set $activeSlaveOneTimeMinAge = 50>>
- <<set $activeSlaveOneTimeMaxAge = 50>>
<<elseif $customSlave.age == 50>>
<<set $activeSlaveOneTimeMinAge = 50>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
<<elseif $customSlave.age == 59>>
<<set $activeSlaveOneTimeMinAge = 50>>
<<set $activeSlaveOneTimeMaxAge = 59>>
-<<elseif $customSlave.age == 60 && $retirementAge == 60>>
- <<set $activeSlaveOneTimeMinAge = 60>>
- <<set $activeSlaveOneTimeMaxAge = 60>>
<<elseif $customSlave.age == 60>>
<<set $activeSlaveOneTimeMinAge = 60>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
<<elseif $customSlave.age == 69>>
<<set $activeSlaveOneTimeMinAge = 60>>
<<set $activeSlaveOneTimeMaxAge = 69>>
-<<elseif $customSlave.age == 70 && $retirementAge == 70>>
- <<set $activeSlaveOneTimeMinAge = 70>>
- <<set $activeSlaveOneTimeMaxAge = 70>>
<<elseif $customSlave.age == 70>>
<<set $activeSlaveOneTimeMinAge = 70>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
<<elseif $customSlave.age == 79>>
<<set $activeSlaveOneTimeMinAge = 70>>
<<set $activeSlaveOneTimeMaxAge = 79>>
-<<elseif $customSlave.age == 80 && $retirementAge == 80>>
- <<set $activeSlaveOneTimeMinAge = 80>>
- <<set $activeSlaveOneTimeMaxAge = 80>>
<<elseif $customSlave.age == 80>>
<<set $activeSlaveOneTimeMinAge = 80>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
-<<elseif $customSlave.age == 79>>
+<<elseif $customSlave.age == 89>>
<<set $activeSlaveOneTimeMinAge = 80>>
<<set $activeSlaveOneTimeMaxAge = 89>>
-<<elseif $customSlave.age == 90 && $retirementAge == 90>>
- <<set $activeSlaveOneTimeMinAge = 90>>
- <<set $activeSlaveOneTimeMaxAge = 90>>
<<elseif $customSlave.age == 90>>
<<set $activeSlaveOneTimeMinAge = 90>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
-<<elseif $customSlave.age == 79>>
+<<elseif $customSlave.age == 99>>
<<set $activeSlaveOneTimeMinAge = 90>>
<<set $activeSlaveOneTimeMaxAge = 99>>
-<<elseif $customSlave.age == 100 && $retirementAge == 100>>
- <<set $activeSlaveOneTimeMinAge = 100>>
- <<set $activeSlaveOneTimeMaxAge = 100>>
<<elseif $customSlave.age == 100>>
<<set $activeSlaveOneTimeMinAge = 100>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
<<elseif $customSlave.age == 109>>
<<set $activeSlaveOneTimeMinAge = 100>>
<<set $activeSlaveOneTimeMaxAge = 109>>
-<<elseif $customSlave.age == 110 && $retirementAge == 110>>
- <<set $activeSlaveOneTimeMinAge = 110>>
- <<set $activeSlaveOneTimeMaxAge = 110>>
<<elseif $customSlave.age == 110>>
<<set $activeSlaveOneTimeMinAge = 110>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
<<elseif $customSlave.age == 119>>
<<set $activeSlaveOneTimeMinAge = 110>>
<<set $activeSlaveOneTimeMaxAge = 119>>
-<<elseif $customSlave.age == 120 && $retirementAge == 120>>
- <<set $activeSlaveOneTimeMinAge = 120>>
- <<set $activeSlaveOneTimeMaxAge = 120>>
<<elseif $customSlave.age == 120>>
<<set $activeSlaveOneTimeMinAge = 120>>
<<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>