diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 2736bc182739b5f9d7e97ae030037beba7a838e0..d2d7ed9cefffaa3fa4a3dada2615a27fb5cb1aae 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -333,7 +333,7 @@
<<set setup.blackNationalities = {"American": 1, "Angolan": 1, "Antiguan": 1, "Aruban": 1, "Australian": 1, "Bahamian": 1, "Barbadian": 1, "Belizean": 1, "Beninese": 1, "Bermudian": 1, "Bissau-Guinean": 1, "Brazilian": 1, "British": 1, "Burkinabé": 1, "Burundian": 1, "Cameroonian": 1, "Canadian": 1, "Cape Verdean": 1, "Central African": 1, "Chadian": 1, "Colombian": 1, "Comorian": 1, "Congolese": 1, "Costa Rican": 1, "Cuban": 1, "Djiboutian": 1, "Dominican": 1, "Dominiquais": 1, "Ecuadorian": 1, "Egyptian": 1, "Emirati": 1, "Equatoguinean": 1, "Eritrean": 1, "Ethiopian": 1, "French": 1, "French Guianan": 1, "Gabonese": 1, "Gambian": 1, "German": 1, "Ghanan": 1, "Grenadian": 1, "Guinean": 1, "Guyanese": 1, "Haitian": 1, "Honduran": 1, "Iraqi": 1, "Israeli": 1, "Ivorian": 1, "Jamaican": 1, "Kenyan": 1, "Kittitian": 1, "Kuwaiti": 1, "Liberian": 1, "Libyan": 1, "Malagasy": 1, "Malawian": 1, "Malian": 1, "Mauritanian": 1, "Mauritian": 1, "Mexican": 1, "Moroccan": 1, "Mosotho": 1, "Motswana": 1, "Mozambican": 1, "Namibian": 1, "Nicaraguan": 1, "Nigerian": 1, "Nigerien": 1, "Norwegian": 1, "Omani": 1, "Panamanian": 1, "Paraguayan": 1, "Portuguese": 1, "Puerto Rican": 1, "Rwandan": 1, "Sahrawi": 1, "Saint Lucian": 1, "São Toméan": 1, "Saudi": 1, "Scottish": 1, "Senegalese": 1, "Seychellois": 1, "Sierra Leonean": 1, "Somali": 1, "South African": 1, "South Sudanese": 1, "Sudanese": 1, "Surinamese": 1, "Swazi": 1, "Tanzanian": 1, "Togolese": 1, "Trinidadian": 1, "Ugandan": 1, "Uruguayan": 1, "Venezuelan": 1, "Vincentian": 1, "Yemeni": 1, "Zairian": 1, "Zambian": 1, "Zimbabwean": 1}>>
-<<set setup.indoaryanNationalities = {"Afghan": 1, "Albanian": 1, "American": 1, "Antiguan": 1, "Armenian": 1, "Australian": 1, "Austrian": 1, "Azerbaijani": 1, "Bahraini": 1, "Bangladeshi": 1, "Barbadian": 1, "Belarusian": 1, "Belizean": 1, "Beninese": 1, "Bhutanese": 1, "Bosnian": 1, "British": 1, "Bruneian": 1, "Bulgarian": 1, "Burmese": 1, "Canadian": 1, "Chinese": 1, "Croatian": 1, "Cypriot": 1, "Czech": 1, "Danish": 1, "Dutch": 1, "Egyptian": 1, "Emirati": 1, "Fijian": 1, "Finnish": 1, "French": 1, "Georgian": 1, "German": 1, "Ghanan": 1, "Greek": 1, "Grenadian": 1, "Guyanese": 1, "Hungarian": 1, "Indian": 1, "Indonesian": 1, "Iranian": 1, "Iraqi": 1, "Irish": 1, "Israeli": 1, "Italian": 1, "Jamaican": 1, "Jordanian": 1, "Kazakh": 1, "Kenyan": 1, "Kittitian": 1, "Korean": 1, "Kosovan": 1, "Kurdish": 1, "Kuwaiti": 1, "Kyrgyz": 1, "Latvian": 1, "Lebanese": 1, "a Liechtensteiner": 1, "Lithuanian": 1, "Macedonian": 1, "Malagasy": 1, "Malawian": 1, "Malaysian": 1, "Maldivian": 1, "Mauritian": 1, "Moldovan": 1, "Mongolian": 1, "Montenegrin": 1, "Mozambican": 1, "Nepalese": 1, "Norwegian": 1, "Omani": 1, "Pakistani": 1, "Palestinian": 1, "Portuguese": 1, "Qatari": 1, "Romanian": 1, "Russian": 1, "Saint Lucian": 1, "Saudi": 1, "Scottish": 1, "Serbian": 1, "Seychellois": 1, "Singaporean": 1, "Slovak": 1, "Slovene": 1, "Somali": 1, "South African": 1, "Spanish": 1, "Sri Lankan": 1, "Surinamese": 1, "Swazi": 1, "Swedish": 1, "Swiss": 1, "Syrian": 1, "Tajik": 1, "Thai": 1, "Tibetan": 1, "Trinidadian": 1, "Turkish": 1, "Turkmen": 1, "Ugandan": 1, "Ukrainian": 1, "Uzbek": 1, "Vincentian": 1, "Yemeni": 1, "Zambian"}>>
+<<set setup.indoaryanNationalities = {"Afghan": 1, "Albanian": 1, "American": 1, "Antiguan": 1, "Armenian": 1, "Australian": 1, "Austrian": 1, "Azerbaijani": 1, "Bahraini": 1, "Bangladeshi": 1, "Barbadian": 1, "Belarusian": 1, "Belizean": 1, "Beninese": 1, "Bhutanese": 1, "Bosnian": 1, "British": 1, "Bruneian": 1, "Bulgarian": 1, "Burmese": 1, "Canadian": 1, "Chinese": 1, "Croatian": 1, "Cypriot": 1, "Czech": 1, "Danish": 1, "Dutch": 1, "Egyptian": 1, "Emirati": 1, "Fijian": 1, "Finnish": 1, "French": 1, "Georgian": 1, "German": 1, "Ghanan": 1, "Greek": 1, "Grenadian": 1, "Guyanese": 1, "Hungarian": 1, "Indian": 1, "Indonesian": 1, "Iranian": 1, "Iraqi": 1, "Irish": 1, "Israeli": 1, "Italian": 1, "Jamaican": 1, "Jordanian": 1, "Kazakh": 1, "Kenyan": 1, "Kittitian": 1, "Korean": 1, "Kosovan": 1, "Kurdish": 1, "Kuwaiti": 1, "Kyrgyz": 1, "Latvian": 1, "Lebanese": 1, "a Liechtensteiner": 1, "Lithuanian": 1, "Macedonian": 1, "Malagasy": 1, "Malawian": 1, "Malaysian": 1, "Maldivian": 1, "Mauritian": 1, "Moldovan": 1, "Mongolian": 1, "Montenegrin": 1, "Mozambican": 1, "Nepalese": 1, "Norwegian": 1, "Omani": 1, "Pakistani": 1, "Palestinian": 1, "Portuguese": 1, "Qatari": 1, "Romanian": 1, "Russian": 1, "Saint Lucian": 1, "Saudi": 1, "Scottish": 1, "Serbian": 1, "Seychellois": 1, "Singaporean": 1, "Slovak": 1, "Slovene": 1, "Somali": 1, "South African": 1, "Spanish": 1, "Sri Lankan": 1, "Surinamese": 1, "Swazi": 1, "Swedish": 1, "Swiss": 1, "Syrian": 1, "Tajik": 1, "Thai": 1, "Tibetan": 1, "Trinidadian": 1, "Turkish": 1, "Turkmen": 1, "Ugandan": 1, "Ukrainian": 1, "Uzbek": 1, "Vincentian": 1, "Yemeni": 1, "Zambian": 1}>>
<<set setup.pacificislanderNationalities = {"American": 1, "Australian": 1, "a Cook Islander": 1, "East Timorese": 1, "Fijian": 1, "Filipina": 1, "French Polynesian": 1, "Guamanian": 1, "I-Kiribati": 1, "Indonesian": 1, "Japanese": 1, "Marshallese": 1, "Micronesian": 1, "Nauruan": 1, "New Caledonian": 1, "a New Zealander": 1, "Ni-Vanuatu": 1, "Niuean": 1, "Palauan": 1, "Papua New Guinean": 1, "Samoan": 1, "a Solomon Islander": 1, "Tongan": 1, "Tuvaluan": 1}>>
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index 1a27ee325a7cc3e3d700fe660a6727083329e578..825887e1c8a607db1ddb216e773a4222e35e1095 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -71,7 +71,7 @@
/*Added origin, tweaked skills, added smart piercing set to submissive, removed buttslut -BoneyM*/
<<set _HS = {}>>
-<<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.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 = 1, _HS.intelligenceImplant = 1, _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 = "tanned", _HS.hStyle = "long", _HS.boobs = 500, _HS.butt = 2, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.combatSkill = 1, _HS.intelligence = 1, _HS.intelligenceImplant = 1, _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 = {}>>
-<<set _HS.slaveName = "Fio", _HS.birthName = "Fio", _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.hColor = "blonde", _HS.hLength = 15, _HS.pubicHColor = "blonde", _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 = "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 $heroSlaves.push(_HS)>>
/*Corrected tattoo syntax, added nympho and arrogant -BoneyM*/
@@ -139,13 +139,13 @@
/*Changed eye color, added odd, tweaked vaginalSkill, added origin -BoneyM*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Joan", _HS.birthName = "Joan", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.health = 6, _HS.devotion = 12, _HS.height = 175, _HS.nationality = "American", _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.butt = 4, _HS.face = 15, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.anusTat = "tribal patterns", _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.intelligence = 1, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Joan", _HS.birthName = "Joan", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.health = 20, _HS.devotion = 15, _HS.height = 175, _HS.eyeColor = "blue", _HS.hColor = "brown", _HS.pubicHColor = "brown", _HS.hStyle = "long", _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.butt = 4, _HS.face = 15, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.anusTat = "tribal patterns", _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.intelligence = 1, _HS.attrXX = 80, _HS.attrXY = 80, _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*heterochromia*/
/*Tweaked face upwards, changed eye color, changed health from 20 to 6 -BoneyM*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Belle", _HS.birthName = "Belle", _HS.origin = "Formerly used solely for titfucking, she quickly became a nymphomaniac after experiencing 'proper' sex.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 20, _HS.devotion = -75, _HS.height = 155, _HS.race = "white", _HS.pubicHColor = "black", _HS.skin = "white", _HS.eyeColor = "blue", _HS.hColor = "black", _HS.hStyle = "long", _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.butt = 4, _HS.buttImplant = 3, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.anusTat = "tribal patterns", _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.intelligence = -1, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.customTat = "Her breasts are tattooed with her implant history, showing repeated additions.", _HS.sexualFlaw = "crude">
+<<set _HS.slaveName = "Belle", _HS.birthName = "Belle", _HS.origin = "Formerly used solely for titfucking, she quickly became a nymphomaniac after experiencing 'proper' sex.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 20, _HS.devotion = -75, _HS.height = 155, _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.butt = 4, _HS.buttImplant = 3, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.intelligence = -1, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.customTat = "Her breasts are tattooed with her implant history, showing repeated additions.", _HS.sexualFlaw = "crude">
<<set $heroSlaves.push(_HS)>>
/*rapey implant addict*/
/*Is 'rapey' a quirk? Guess so. Added odd. Changed eye color, added nympho, added origin. -BoneyM*/
@@ -219,7 +219,7 @@
/*Added customdesc, fixed tattoo syntax, added combat skill, eye color and origin -BoneyM*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Lexi", _HS.birthName = "Lexi", _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 = 25, _HS.weight = -20, _HS.height = 157, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 400, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.oralSkill = 35, _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Lexi", _HS.birthName = "Lexi", _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 = 25, _HS.weight = -20, _HS.height = 157, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "bleached blonde", _HS.pubicHColor = "bleached blonde", _HS.hStyle = "long", _HS.boobs = 400, _HS.butt = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.oralSkill = 35, _HS.attrXY = 40, _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*Changed eyes to blue -BoneyM*/
@@ -257,7 +257,7 @@
/*Corrected customdesc syntax -BoneyM*/
<<set _HS = {}>>
-<<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.race = "white", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _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 = -1, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "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 = "tanned", _HS.hLength = 25, _HS.hStyle = "in a bob", _HS.boobs = 400, _HS.butt = 3, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.intelligence = -1, _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*/
@@ -268,7 +268,7 @@
/*Increased weight, added entertain and whore skill, added ear piercing, changed eyes -BoneyM*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Twenty", _HS.birthName = "Twenty", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 20, _HS.devotion = 40, _HS.weight = 20, _HS.race = "white", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 800, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.intelligence = -1, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a paw print tattoo on her left buttock.", _HS.customDesc = "She constantly uses 'pussy' and 'kitty' puns when permitted.">>
+<<set _HS.slaveName = "Twenty", _HS.birthName = "Twenty", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 20, _HS.devotion = 40, _HS.weight = 20, _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "light", _HS.hStyle = "long", _HS.boobs = 800, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.intelligence = -1, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a paw print tattoo on her left buttock.", _HS.customDesc = "She constantly uses 'pussy' and 'kitty' puns when permitted.", _HS.clothes = "kitty lingerie">>
<<set $heroSlaves.push(_HS)>>
/*Fixed tattoo and customdesc syntax -BoneyM*/
@@ -278,12 +278,12 @@
/*Increased health, added origin, fixed customdesc syntax -BoneyM*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Kinsey", _HS.birthName = "Kinsey", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, _HS.health = 20, _HS.devotion = 10, _HS.height = 145, _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "white", _HS.hLength = 15, _HS.hStyle = "short, with the left side shaved", _HS.boobs = 500, _HS.butt = 4, _HS.buttImplant = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 2, _HS.nosePiercing = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 100, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Kinsey", _HS.birthName = "Kinsey", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 27, _HS.physicalAge = 27, _HS.visualAge = 27, _HS.ovaryAge = 27, _HS.health = 20, _HS.devotion = 10, _HS.height = 145, _HS.hColor = "black", _HS.pubicHColor = "black", _HS.hLength = 15, _HS.hStyle = "short, with the left side shaved", _HS.boobs = 500, _HS.butt = 4, _HS.buttImplant = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 2, _HS.nosePiercing = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 100, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*Added nose piercing, reduced height, changed fetish to bisexual -BoneyM*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Sammy", _HS.birthName = "Sammy", _HS.origin = "She chose to be a slave because the romanticized view of it she had turns her on.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 20, _HS.devotion = 25, _HS.weight = 20, _HS.height = 155, _HS.race = "white", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "pale", _HS.hLength = 80, _HS.hStyle = "ass-length", _HS.boobs = 300, _HS.butt = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 100, _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customDesc = "She has fetishes for wedgies, spanking and herms.">>
+<<set _HS.slaveName = "Sammy", _HS.birthName = "Sammy", _HS.origin = "She chose to be a slave because the romanticized view of it she had turns her on.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 20, _HS.devotion = 25, _HS.weight = 20, _HS.height = 155, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "pale", _HS.hLength = 80, _HS.hStyle = "ass-length", _HS.boobs = 300, _HS.butt = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 100, _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customDesc = "She has fetishes for wedgies, spanking and herms.">>
<<set $heroSlaves.push(_HS)>>
/*laid back*/
/*Added origin, increased weight, pierced ears, added customdesc -BoneyM*/
@@ -294,13 +294,13 @@
/*Fixed typo in customdesc, increased whore and entertainskill, changed eye color -BoneyM*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Lucy", _HS.birthName = "Lucy", _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 = 40, _HS.race = "white", _HS.skin = "white", _HS.eyeColor = "blue", _HS.override_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "brown", _HS.hColor = "pale blonde", _HS.pubicHColor = "brown", _HS.underArmHColor = "brown", _HS.hLength = 95, _HS.hStyle = "ass length", _HS.boobs = 300, _HS.butt = 3, _HS.buttTat = "degradation", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaTat = "degradation", _HS.ovaries = 1, _HS.intelligence = -1, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.height = 165>>
+<<set _HS.slaveName = "Lucy", _HS.birthName = "Lucy", _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 = 40, _HS.race = "white", _HS.eyeColor = "light blue", _HS.hColor = "pale blonde", _HS.hLength = 95, _HS.hStyle = "ass length", _HS.boobs = 300, _HS.butt = 3, _HS.buttTat = "degradation", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaTat = "degradation", _HS.ovaries = 1, _HS.intelligence = -1, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.height = 165, _HS.>>
<<set $heroSlaves.push(_HS)>>
/*innuendo*/
/*Added odd, changed eye color -BoneyM*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Mandy", _HS.birthName = "Mandy", _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.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "white", _HS.hStyle = "long", _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.clothes = "attractive lingerie", _HS.attrXY = 40, _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Mandy", _HS.birthName = "Mandy", _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.hStyle = "long", _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.clothes = "attractive lingerie", _HS.attrXY = 40, _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*Couldn't find this slave in the thread or the submission page on the blog -BoneyM*/
@@ -343,12 +343,12 @@
/*Added origin, reduced age, fetish was 'arrogant', changed it to quirk, fixed customdesc syntax. -BoneyM*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Bitch", _HS.birthName = "Bitch", _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 = -75, _HS.height = 155, _HS.race = "asian", _HS.eyeColor = "almond", _HS.override_H_Color = 1, _HS.hColor = "blonde", _HS.skin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 300, _HS.butt = 5, _HS.lips = 35, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.eyebrowPiercing = 1, _HS.oralSkill = 35, _HS.intelligence = -2, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has a heart shaped face and many scars.", _HS.faceShape = "cute">>
+<<set _HS.slaveName = "Bitch", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = -20, _HS.devotion = -75, _HS.height = 155, _HS.eyeColor = "dark", _HS.pupil = "almond-shaped", _HS.hColor = "dark", _HS.skin = "pale", _HS.waist = -55, _HS.boobs = 300, _HS.butt = 5, _HS.lips = 35, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.eyebrowPiercing = 1, _HS.oralSkill = 35, _HS.intelligence = -2, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has a heart shaped face and many scars.", _HS.faceShape = "cute", _HS.hips = 3, _HS.markings = "beauty">>
<<set $heroSlaves.push(_HS)>>
/*Fixed customdesc syntax, changed eye color, added piercings, increased waist -BoneyM*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Nala", _HS.birthName = "Nala", _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 = 10, _HS.muscles = 20, _HS.height = 180, _HS.hColor = "black", _HS.skin = "white", _HS.hStyle = "long and in a ponytail", _HS.boobs = 500, _HS.butt = 3, _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.fetishKnown = 1>>
+<<set _HS.slaveName = "Nala", _HS.birthName = "Nala", _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 = 10, _HS.muscles = 20, _HS.height = 180, _HS.hColor = "black", _HS.hStyle = "long and in a ponytail", _HS.boobs = 500, _HS.butt = 3, _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.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*First slave that didn't need fixing -BoneyM*/
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index c8e9a25b1c7e2790e605131dc1f540e43385bf7f..9a14a13c3493bab0d45c57c6ab8e5c27d5ab6e00 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1289,7 +1289,7 @@ extremely pale -5
/* we ran out of names ... How? */
<<set _maxTries = 10>>
<<for _maxTries > 0 && !$args[1].slaveName>>
- <<set _continentNationality = setup.nationalityPoolSelector[$continent].random()>>
+ <<set _continentNationality = hashChoice($nationalities)>>
<<set $args[1].slaveName =
generateName(_continentNationality, $args[1].race, $args[1].genes === "XY", sn => !_currentSlaveNames.includes(sn))>>
<</for>>
@@ -1366,11 +1366,11 @@ extremely pale -5
const validRaces = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"];
/* Nationalities, races, surnames random fill */
if(!s.nationality) {
- s.nationality = setup.nationalityPoolSelector[Object.keys(setup.nationalityPoolSelector).random()].random();
+ s.nationality = hashChoice($nationalities);
/* Check for a pre-set race and if the nationality fits, else regenerate */
if(s.race && validRaces.includes(s.race)) {
while(setup.raceSelector[s.nationality] && !(s.race in setup.raceSelector[s.nationality])) {
- s.nationality = setup.nationalityPoolSelector[Object.keys(setup.nationalityPoolSelector).random()].random();
+ s.nationality = hashChoice($nationalities);
}
}
}
diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw
index 7d46ddaeecca09d85ee7e63fb25fff8eb6688868..5a1cf5df9a49128da401dbb69ae70370f7923462 100644
--- a/src/uncategorized/generateXXSlave.tw
+++ b/src/uncategorized/generateXXSlave.tw
@@ -129,27 +129,27 @@
<<else>>
<<switch $fixedRace>>
<<case "white">>
- <<set $activeSlave.nationality = setup.whiteNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.whiteNationalities)>>
<<case "asian">>
- <<set $activeSlave.nationality = setup.asianNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.asianNationalities)>>
<<case "latina">>
- <<set $activeSlave.nationality = setup.latinaNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.latinaNationalities)>>
<<case "black">>
- <<set $activeSlave.nationality = setup.blackNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.blackNationalities)>>
<<case "pacific islander">>
- <<set $activeSlave.nationality = setup.pacificislanderNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.pacificislanderNationalities)>>
<<case "southern european">>
- <<set $activeSlave.nationality = setup.southerneuropeanNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.southerneuropeanNationalities)>>
<<case "amerindian">>
- <<set $activeSlave.nationality = setup.amerindianNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.amerindianNationalities)>>
<<case "semitic">>
- <<set $activeSlave.nationality = setup.semiticNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.semiticNationalities)>>
<<case "middle eastern">>
- <<set $activeSlave.nationality = setup.middleeasternNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.middleeasternNationalities)>>
<<case "indo-aryan">>
- <<set $activeSlave.nationality = setup.indoaryanNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.indoaryanNationalities)>>
<<case "malay">>
- <<set $activeSlave.nationality = setup.malayNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.malayNationalities)>>
<<default>>
<<set $activeSlave.nationality = hashChoice($nationalities)>>
<</switch>>
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index 2d1cb77846fec8231fe97ef41704f35433293499..66a2d88fb092c4525f979f04bb23fcd6537f2e5d 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -136,27 +136,27 @@
<<else>>
<<switch $fixedRace>>
<<case "white">>
- <<set $activeSlave.nationality = setup.whiteNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.whiteNationalities)>>
<<case "asian">>
- <<set $activeSlave.nationality = setup.asianNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.asianNationalities)>>
<<case "latina">>
- <<set $activeSlave.nationality = setup.latinaNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.latinaNationalities)>>
<<case "black">>
- <<set $activeSlave.nationality = setup.blackNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.blackNationalities)>>
<<case "pacific islander">>
- <<set $activeSlave.nationality = setup.pacificislanderNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.pacificislanderNationalities)>>
<<case "southern european">>
- <<set $activeSlave.nationality = setup.southerneuropeanNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.southerneuropeanNationalities)>>
<<case "amerindian">>
- <<set $activeSlave.nationality = setup.amerindianNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.amerindianNationalities)>>
<<case "semitic">>
- <<set $activeSlave.nationality = setup.semiticNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.semiticNationalities)>>
<<case "middle eastern">>
- <<set $activeSlave.nationality = setup.middleeasternNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.middleeasternNationalities)>>
<<case "indo-aryan">>
- <<set $activeSlave.nationality = setup.indoaryanNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.indoaryanNationalities)>>
<<case "malay">>
- <<set $activeSlave.nationality = setup.malayNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.malayNationalities)>>
<<default>>
<<set $activeSlave.nationality = hashChoice($nationalities)>>
<</switch>>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index f85d3f509285f00a9e56b1e055bb8fb9548c8a38..23a44aec0b00fff2d3b49556baebfde17d80cbd3 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -188,27 +188,27 @@
<<elseif $activeSlave.nationality == "Nationality is unimportant">>
<<switch $activeSlave.race>>
<<case "white">>
- <<set $activeSlave.nationality = setup.whiteNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.whiteNationalities)>>
<<case "asian">>
- <<set $activeSlave.nationality = setup.asianNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.asianNationalities)>>
<<case "latina">>
- <<set $activeSlave.nationality = setup.latinaNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.latinaNationalities)>>
<<case "black">>
- <<set $activeSlave.nationality = setup.blackNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.blackNationalities)>>
<<case "pacific islander">>
- <<set $activeSlave.nationality = setup.pacificislanderNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.pacificislanderNationalities)>>
<<case "southern european">>
- <<set $activeSlave.nationality = setup.southerneuropeanNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.southerneuropeanNationalities)>>
<<case "amerindian">>
- <<set $activeSlave.nationality = setup.amerindianNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.amerindianNationalities)>>
<<case "semitic">>
- <<set $activeSlave.nationality = setup.semiticNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.semiticNationalities)>>
<<case "middle eastern">>
- <<set $activeSlave.nationality = setup.middleeasternNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.middleeasternNationalities)>>
<<case "indo-aryan">>
- <<set $activeSlave.nationality = setup.indoaryanNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.indoaryanNationalities)>>
<<case "malay">>
- <<set $activeSlave.nationality = setup.malayNationalities.random()>>
+ <<set $activeSlave.nationality = hashChoice(setup.malayNationalities)>>
<<default>>
<<set $activeSlave.nationality = hashChoice($nationalities)>>
<</switch>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 5d674d98bf8e2c8a48f4a619e9c43a3f9245aa33..03f4916b3707b3b01587f761ab99b7c681ad4abb 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -4208,16 +4208,16 @@ $He's got a
<</if>>
<<if ($seeRace == 1)>>
- <<if $activeSlave.origRace == "white">>
+ <<if $activeSlave.race == "white">>
pink pussylips.
- <<elseif $activeSlave.origRace == "asian">>
- dark $activeSlave.origRace pussylips.
- <<elseif $activeSlave.origRace == "middle eastern">>
- dark $activeSlave.origRace pussylips.
- <<elseif $activeSlave.origRace == "latina">>
- dark $activeSlave.origRace pussylips.
- <<elseif $activeSlave.origRace == "black">>
- dark $activeSlave.origRace pussylips.
+ <<elseif $activeSlave.race == "asian">>
+ dark $activeSlave.race pussylips.
+ <<elseif $activeSlave.race == "middle eastern">>
+ dark $activeSlave.race pussylips.
+ <<elseif $activeSlave.race == "latina">>
+ dark $activeSlave.race pussylips.
+ <<elseif $activeSlave.race == "black">>
+ dark $activeSlave.race pussylips.
<<else>>
$activeSlave.skin pussylips.
<</if>>