From 0ac8d0d48935dc1ef7dfb284869ad5ce27f1983c Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Mon, 25 Mar 2019 23:45:40 -0500
Subject: [PATCH] Skins
---
slave variables documentation - Pregmod.txt | 12 ++-
src/cheats/mod_EditSlaveCheat.tw | 13 ++--
src/cheats/mod_editSlaveCheatNew.tw | 13 ++--
.../nursery/longChildDescription.tw | 2 +-
src/js/generateNewSlaveJS.js | 10 +--
src/js/utilJS.js | 46 +++++++++++-
src/npc/databases/dSlavesDatabase.tw | 24 +++---
src/npc/databases/ddSlavesDatabase.tw | 12 +--
src/npc/databases/dfSlavesDatabase.tw | 6 +-
src/npc/startingGirls/startingGirls.tw | 2 +-
src/pregmod/electiveSurgery.tw | 74 ++++++++++---------
src/pregmod/pcAppearanceIntro.tw | 53 ++++++++-----
src/pregmod/pcSurgeryDegredation.tw | 2 +-
src/uncategorized/PESS.tw | 12 +--
src/uncategorized/RECI.tw | 2 +-
src/uncategorized/RESS.tw | 12 +--
src/uncategorized/customSlave.tw | 53 ++++++++-----
src/uncategorized/longSlaveDescription.tw | 2 +-
.../personalAssistantAppearance.tw | 4 +-
src/uncategorized/remoteSurgery.tw | 8 +-
src/uncategorized/resFailure.tw | 2 +-
src/uncategorized/salon.tw | 17 ++---
src/utility/descriptionWidgetsFlesh.tw | 2 +-
src/utility/slaveCreationWidgets.tw | 2 +-
24 files changed, 234 insertions(+), 151 deletions(-)
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 5217f55ce2f..d704e84abb6 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -1098,20 +1098,24 @@ skin color
accepts string
"pure white"
+"ivory"
+"white"
"extremely pale"
+"very pale"
"pale"
"extremely fair"
"very fair"
"fair"
-"white"
"light"
"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/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index 70fca74cc2d..830eb8644b3 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -168,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 76f931109f0..ff8b3f533c4 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -1316,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
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 1c7eb0f0ffc..05e679819e6 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -1272,7 +1272,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 == "tan") && ($activeChild.origSkin != "tan")>>
<<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
diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js
index bc583592e40..1c901d3acca 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) {
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index 94932dfa7c5..60efaf964aa 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1548,22 +1548,22 @@ window.randomRaceSkin = function(raceName)
skin = jsEither(["dark", "light"]);
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 "malay":
skin = jsEither(["dark", "light"]);
break;
case "middle eastern":
- skin = jsEither(["fair", "light olive", "light", "tanned"]);
+ skin = jsEither(["fair", "light olive", "light", "tan"]);
break;
case "pacific islander":
skin = jsEither(["dark", "light"]);
break;
case "semitic":
- skin = jsEither(["fair", "light olive", "light", "tanned"]);
+ skin = jsEither(["fair", "light olive", "light", "tan"]);
break;
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"]);
@@ -1661,4 +1661,42 @@ window.randomRaceHair = function(raceName)
break;
}
return hair;
+};
+
+window.changeSkinTone = function(skin, value)
+{
+ 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);
+ 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 101891bd958..f8f1fc44b34 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.vaginalSkill = 15, _HS.oralSkill = 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.skin = "tan", _HS.boobs = 500, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "submissive", _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 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.combatSkill = 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.skin = "tan", _HS.hStyle = "long", _HS.boobs = 500, _HS.butt = 2, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.combatSkill = 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.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 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.skin = "tan", _HS.boobs = 500, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 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.oralSkill = 15, _HS.analSkill = 35, _HS.combatSkill = 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.skin = "tan", _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.oralSkill = 15, _HS.analSkill = 35, _HS.combatSkill = 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.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.combatSkill = 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.skin = "tan", _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.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.combatSkill = 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.skin = "tan", _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.*/
@@ -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.whoreSkill = 15, _HS.entertainSkill = 15, _HS.combatSkill = 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.skin = "tan", _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.whoreSkill = 15, _HS.entertainSkill = 15, _HS.combatSkill = 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,7 +467,7 @@
<<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.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 15, _HS.entertainSkill = 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.skin = "tan", _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.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 15, _HS.entertainSkill = 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>>
@@ -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.oralSkill = 15, _HS.analSkill = 15, _HS.whoreSkill = 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.skin = "tan", _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.oralSkill = 15, _HS.analSkill = 15, _HS.whoreSkill = 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.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 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 = "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 = "tan", _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.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 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.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 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.skin = "tan", _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.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 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 ad3a6c75621..d64032a2b7e 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.oralSkill = 100, _HS.analSkill = 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.skin = "tan", _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.oralSkill = 100, _HS.analSkill = 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.oralSkill = 100, _HS.entertainSkill = 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.skin = "tan", _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.oralSkill = 100, _HS.entertainSkill = 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.vaginalSkill = 35, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 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.skin = "tan", _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.vaginalSkill = 35, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 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. */
@@ -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.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 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.skin = "tan", _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.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 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.combatSkill = 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.skin = "tan", _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.combatSkill = 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.oralSkill = 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.skin = "tan", _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.oralSkill = 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 62e84706a51..e9b59660867 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.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 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.skin = "tan", _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.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 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.vaginalSkill = 15, _HS.oralSkill = 100, _HS.analSkill = 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.skin = "tan", _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.vaginalSkill = 15, _HS.oralSkill = 100, _HS.analSkill = 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.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 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.skin = "tan", _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.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 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 195a618f2f8..16a9cf27ab5 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -1599,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 = "tan", $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 e3638da4bb3..12ceb387b20 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/pcAppearanceIntro.tw b/src/pregmod/pcAppearanceIntro.tw
index d7a0618c5d0..b1d17bf3dd1 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 84717c7cf5a..6210a3b954b 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/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 7bfe1e20f93..1ece432cf49 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 e13c3b862a9..4e13cfd9a3a 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -75,7 +75,7 @@
<</if>>
<</for>>
-<<if ($activeSlave.skin == "tanned") || ($activeSlave.skin == "fair")>>
+<<if ($activeSlave.skin == "tan") || ($activeSlave.skin == "fair")>>
<<set $skinDesc = "pink">>
<<elseif ($activeSlave.skin == "pale") || ($activeSlave.race == "white")>>
<<set $skinDesc = "pink">>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 4a38d5ae893..fda22f8e501 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -426,7 +426,7 @@ clings to you in $his sleep as the warmth of your body begins to move away from
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)>>
$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 == "tan")>>
$His tanned skin shines with 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.
@@ -10050,7 +10050,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>>
@@ -17693,7 +17693,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 +17705,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 +17713,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 +17729,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 08c6f865eca..0da5dc7a6d0 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 9e6e99ab430..7313750827e 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 == "tan") && ($activeSlave.origSkin != "tan")>>
<<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
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 605a154263c..e6d1e57057d 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 10c396c0a0e..4dfed2d26ba 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1459,7 +1459,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"]] |
@@ -1468,7 +1468,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"]] |
@@ -1483,10 +1483,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 30c82df63bb..e4979439f15 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 = "tan">>
<<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 84b316bf113..f82ac56e430 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -607,11 +607,10 @@ 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 $tannableSkin = ["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"]>>
+<<set $lightenableSkin = ["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"]>>
+<<set $bleachableSkin = ["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"]>>
+<<set $darkenableSkin = ["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"]>>
<<set $dyedSkin = ["dyed red", "dyed green", "dyed blue", "dyed pink", "dyed gray", "tiger striped", "camouflage patterned"]>>
<br><br>
@@ -627,22 +626,22 @@ $His skin is $activeSlave.skin.
<<set _needsSpacers = 0>>
<<if ($bleachableSkin.indexOf($activeSlave.skin) != -1)>>
<<if _needsSpacers == 1>> | <</if>>
- [[Bleach|Salon][$activeSlave.skin = "pale",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ [[Bleach|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, -2),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)]]
+ [[Lighten|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, -1),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<<set _needsSpacers = 1>>
<</if>>
<<if ($tannableSkin.indexOf($activeSlave.skin) != -1)>>
<<if _needsSpacers == 1>> | <</if>>
- [[Tan|Salon][$activeSlave.skin = "tanned",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ [[Tan|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, 1),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<<set _needsSpacers = 1>>
<</if>>
<<if ($darkenableSkin.indexOf($activeSlave.skin) != -1)>>
<<if _needsSpacers == 1>> | <</if>>
- [[Darken|Salon][$activeSlave.skin = "dark",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ [[Darken|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, 2),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<<set _needsSpacers = 1>>
<</if>>
<</if>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 2ccde923919..a2171983d99 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -2572,7 +2572,7 @@ $He's got a
<<widget "AnusDescription">>
-<<if ($activeSlave.skin == "tanned") || ($activeSlave.skin == "fair") || ($activeSlave.skin == "pale") || ($activeSlave.race == "white")>>
+<<if ($activeSlave.skin == "tan") || ($activeSlave.skin == "fair") || ($activeSlave.skin == "pale") || ($activeSlave.race == "white")>>
<<set $skinDesc = "pink">>
<<elseif ($activeSlave.anusTat == "bleached")>>
<<set $skinDesc = $activeSlave.skin>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 8c744cb4dac..901a9ad8be4 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 = "tan">>
<<set $activeSlave.override_H_Color = 1>>
<<set $activeSlave.override_Arm_H_Color = 1>>
<<set $activeSlave.override_Pubic_H_Color = 1>>
--
GitLab