diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index 410dc6479b32afa6e18641aa43a7f15ac9a5c1be..ccd73aa32084d1037dd896de5bf20d6f205af867 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -425,7 +425,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
-<<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 = -1, _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 = "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 = -1, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*Blind*/
@@ -439,11 +439,11 @@
/*huge nips*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Golden Cobra", _HS.birthName = "Auyala", _HS.origin = "She was captured from West Central Africa.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 30, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 190, _HS.nationality = "Central African", _HS.race = "black", _HS.eyes = 1, _HS.override_H_Color = 1, HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.eyeColor = "green", _HS.hColor = "golden blonde with copper streaks", _HS.eyebrowHColor = "blonde", _HS.pubicHColor = "blonde", _HS.underArmHColor = "blonde", _HS.skin = "brown", _HS.hLength = 35, _HS.hStyle = "shoulder-length, plaited in cornrow braids; a single thin braid adorned with several colorful feathers and fearsome fang of unknown origin is hanging aside her left eye", _HS.pubicHStyle = "in a strip", _HS.waist = -55, _HS.boobs = 1450, _HS.nipplesPiercing = 2, _HS.butt = 5, _HS.lips = 55, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clit = 2, _HS.clitPiercing = 2, _HS.clitSetting = "lesbian", _HS.anus = 2, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.earPiercing = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.combatSkill = 1, _HS.clothes = "slutty jewelry", _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = -1, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has tattoo of cobra wrapping around her neck, which head with wide open maw and inflated hood tattooed right at her throat.", _HS.customDesc = "She has a streak of ritual scars resembling some very complex snake skin pattern running down her spine from nape to tail-bone.">>
+<<set _HS.slaveName = "Golden Cobra", _HS.birthName = "Auyala", _HS.origin = "She was captured from West Central Africa.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 30, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 190, _HS.nationality = "Central African", _HS.race = "black", _HS.eyes = 1, _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.eyeColor = "green", _HS.hColor = "golden blonde with copper streaks", _HS.eyebrowHColor = "blonde", _HS.pubicHColor = "blonde", _HS.underArmHColor = "blonde", _HS.skin = "brown", _HS.hLength = 35, _HS.hStyle = "shoulder-length, plaited in cornrow braids; a single thin braid adorned with several colorful feathers and fearsome fang of unknown origin is hanging aside her left eye", _HS.pubicHStyle = "in a strip", _HS.waist = -55, _HS.boobs = 1450, _HS.nipplesPiercing = 2, _HS.butt = 5, _HS.lips = 55, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clit = 2, _HS.clitPiercing = 2, _HS.clitSetting = "lesbian", _HS.anus = 2, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.earPiercing = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.combatSkill = 1, _HS.clothes = "slutty jewelry", _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = -1, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has tattoo of cobra wrapping around her neck, which head with wide open maw and inflated hood tattooed right at her throat.", _HS.customDesc = "She has a streak of ritual scars resembling some very complex snake skin pattern running down her spine from nape to tail-bone.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
-<<set _HS.slaveName = "'Top' Lillium", _HS.birthName = "Sarah", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.health = 90, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.eyeColor = "green", _HS.origHColor = "red", _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 = "deep red", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "fair", _HS.hLength = 20, _HS.hStyle = "short and pleasantly frames her face", _HS.waist = -55, _HS.boobs = 900, _HS.butt = 4, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.combatSkill = 1, _HS.clothes = "nice business attire", _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a small, grinning harlequin tattoo on her inner thigh.", _HS.customDesc = "In place of her left hand's pinkie finger is a large pink scar that crosses the entire back of her hand.">>
+<<set _HS.slaveName = "'Top' Lillium", _HS.birthName = "Sarah", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.health = 90, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.eyeColor = "green", _HS.origHColor = "red", _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 = "deep red", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "fair", _HS.hLength = 20, _HS.hStyle = "short and pleasantly frames her face", _HS.waist = -55, _HS.boobs = 900, _HS.butt = 4, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.combatSkill = 1, _HS.clothes = "nice business attire", _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has a small, grinning harlequin tattoo on her inner thigh.", _HS.customDesc = "In place of her left hand's pinkie finger is a large pink scar that crosses the entire back of her hand.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
@@ -451,7 +451,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
-<<set _HS.slaveName = "Sheena", _HS.birthName = "Penelope", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 80, _HS.devotion = 90, _HS.height = 155, _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 = "black with deep red highlights", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "pale", _HS.hStyle = "long and disheveled", _HS.waist = -55, _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lipsPiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.clitSetting = "anal", _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.makeup = 2, _HS.nails = 2, _HS.earPiercing = 2, _HS.nosePiercing = 1, _HS.navelPiercing = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 35, _HS.whoreSkill = 15, _HS.entertainSkill = 15, _HS.clothes = "a slutty outfit", _HS.intelligence = -1, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "She has been heavily tattooed, with her chest, thighs and both arms covered in various punk-style pieces. The biggest and most impressive piece is the large logo of a legendary late 20th century punk band.">>
+<<set _HS.slaveName = "Sheena", _HS.birthName = "Penelope", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = 80, _HS.devotion = 90, _HS.height = 155, _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 = "black with deep red highlights", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "pale", _HS.hStyle = "long and disheveled", _HS.waist = -55, _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lipsPiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clitPiercing = 1, _HS.clitSetting = "anal", _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.makeup = 2, _HS.nails = 2, _HS.earPiercing = 2, _HS.nosePiercing = 1, _HS.navelPiercing = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 35, _HS.whoreSkill = 15, _HS.entertainSkill = 15, _HS.clothes = "a slutty outfit", _HS.intelligence = -1, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "She has been heavily tattooed, with her chest, thighs and both arms covered in various punk-style pieces. The biggest and most impressive piece is the large logo of a legendary late 20th century punk band.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
@@ -521,7 +521,7 @@
/*Increased nipples and areolae, changed eye color, added mute -BoneyM*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Box", _HS.birthName = "Box", _HS.origin = "When you took her from her previous owner, she was locked into a beautiful rosewood box lined with red velvet, crying.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.devotion = -75, _HS.weight = 20, _HS.eyes = -2, HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.eyebrowHColor = "blonde", _HS.pubicHColor = "blonde", _HS.underArmHColor = "blonde", _HS.skin = "pale", _HS.hColor = "golden blonde", _HS.hStyle = "long", _HS.amp = 1, _HS.boobs = 400, _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.intelligence = -1, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "Her amputation sites have titanium rings that go through to the bone. She has been chemically blinded.">>
+<<set _HS.slaveName = "Box", _HS.birthName = "Box", _HS.origin = "When you took her from her previous owner, she was locked into a beautiful rosewood box lined with red velvet, crying.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.devotion = -75, _HS.weight = 20, _HS.eyes = -2, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.eyebrowHColor = "blonde", _HS.pubicHColor = "blonde", _HS.underArmHColor = "blonde", _HS.skin = "pale", _HS.hColor = "golden blonde", _HS.hStyle = "long", _HS.amp = 1, _HS.boobs = 400, _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.intelligence = -1, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "Her amputation sites have titanium rings that go through to the bone. She has been chemically blinded.">>
<<set $heroSlaves.push(_HS)>>
/* put some of her custom description in her origin (box stuff), tagged as amp, lowered obedience, increased weight but lowered health, changed skin color from white to pale */
diff --git a/src/npc/databases/ddSlavesDatabase.tw b/src/npc/databases/ddSlavesDatabase.tw
index 3da4e83dc93472d1ab2e3999ec135faa53f353c5..4c22d7d4f9c0f87d0860ca88ff1042e563a305c8 100644
--- a/src/npc/databases/ddSlavesDatabase.tw
+++ b/src/npc/databases/ddSlavesDatabase.tw
@@ -112,7 +112,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
-<<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 = 1, _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 = "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 = 1, _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 = {}>>
@@ -125,7 +125,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
-<<set _HS.slaveName = "Aisha", _HS.birthName = "Aicha", _HS.genes = "XY", _HS.origin = "She sold herself into slavery to escape a life of boredom.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = -20, _HS.devotion = 45, _HS.height = 155, _HS.heightImplant = -1, _HS.race = "middle eastern", _HS.override_Eye_Color = 1, _HS.eyeColor = "blue", _HS.override_H_Color = 1, HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "peachy fading into a red ombre at the bottom", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "lightened", _HS.hLength = 30, _HS.hStyle = "shoulder-length in a hime cut", _HS.waist = -55, _HS.boobs = 250, _HS.butt = 3.5, _HS.face = 55, _HS.faceImplant = 65, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.anus = 1, _HS.dick = 5, _HS.dickTat = "flowers", _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.anusPiercing = 1, _HS.anusTat = "flowers", _HS.brand = "your initials", _HS.brandLocation = "back", _HS.earPiercing = 1, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.entertainSkill = 15, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -1, _HS.attrXX = 40, _HS.attrXY = 40, _HS.customTat = "She has tattooed petals trailing from the nape of her neck down her back, ending between her butt cheeks.", _HS.customDesc = "Her red pubic hair is waxed into the shape of a heart. She has bright blue eyeshadow on her bottom lids.", _HS.pubicHStyle = "waxed">>
+<<set _HS.slaveName = "Aisha", _HS.birthName = "Aicha", _HS.genes = "XY", _HS.origin = "She sold herself into slavery to escape a life of boredom.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = -20, _HS.devotion = 45, _HS.height = 155, _HS.heightImplant = -1, _HS.race = "middle eastern", _HS.override_Eye_Color = 1, _HS.eyeColor = "blue", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "peachy fading into a red ombre at the bottom", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "lightened", _HS.hLength = 30, _HS.hStyle = "shoulder-length in a hime cut", _HS.waist = -55, _HS.boobs = 250, _HS.butt = 3.5, _HS.face = 55, _HS.faceImplant = 65, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.anus = 1, _HS.dick = 5, _HS.dickTat = "flowers", _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.anusPiercing = 1, _HS.anusTat = "flowers", _HS.brand = "your initials", _HS.brandLocation = "back", _HS.earPiercing = 1, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.entertainSkill = 15, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -1, _HS.attrXX = 40, _HS.attrXY = 40, _HS.customTat = "She has tattooed petals trailing from the nape of her neck down her back, ending between her butt cheeks.", _HS.customDesc = "Her red pubic hair is waxed into the shape of a heart. She has bright blue eyeshadow on her bottom lids.", _HS.pubicHStyle = "waxed">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
@@ -133,7 +133,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
-<<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 = -1, _HS.intelligenceImplant = 1, _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 = "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 = -1, _HS.intelligenceImplant = 1, _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 = {}>>
@@ -141,7 +141,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
-<<set _HS.slaveName = "'Mistress' Ingrid", _HS.birthName = "Ingrid", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "white", _HS.nationality = "Norwegian", _HS.eyeColor = "blue", _HS.override_H_Color = 1, HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "onyx black", _HS.eyebrowHColor = "black", _HS.pubicHColor = "black", _HS.underArmHColor = "black", _HS.skin = "pale", _HS.hLength = 90, _HS.hStyle = "ass-length with Nordic braids throughout", _HS.waist = -55, _HS.boobs = 800, _HS.butt = 5, _HS.face = 55, _HS.lips = 35, _HS.preg = -2, _HS.clitPiercing = 3, _HS.dick = 4, _HS.prostate = 1, _HS.balls = 4, _HS.scrotum = 4, _HS.ovaries = 1, _HS.makeup = 2, _HS.nails = 2, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 15, _HS.whoreSkill = 35, _HS.entertainSkill = 35, _HS.combatSkill = 1, _HS.clothes = "a slave gown", _HS.collar = "pretty jewelry", _HS.shoes = "boots", _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has the style of Gothic royalty, and the demeanor to match.">>
+<<set _HS.slaveName = "'Mistress' Ingrid", _HS.birthName = "Ingrid", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "white", _HS.nationality = "Norwegian", _HS.eyeColor = "blue", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.origHColor = "black", _HS.hColor = "onyx black", _HS.eyebrowHColor = "black", _HS.pubicHColor = "black", _HS.underArmHColor = "black", _HS.skin = "pale", _HS.hLength = 90, _HS.hStyle = "ass-length with Nordic braids throughout", _HS.waist = -55, _HS.boobs = 800, _HS.butt = 5, _HS.face = 55, _HS.lips = 35, _HS.preg = -2, _HS.clitPiercing = 3, _HS.dick = 4, _HS.prostate = 1, _HS.balls = 4, _HS.scrotum = 4, _HS.ovaries = 1, _HS.makeup = 2, _HS.nails = 2, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 15, _HS.whoreSkill = 35, _HS.entertainSkill = 35, _HS.combatSkill = 1, _HS.clothes = "a slave gown", _HS.collar = "pretty jewelry", _HS.shoes = "boots", _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has the style of Gothic royalty, and the demeanor to match.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw
index 8af7f83d74de89692e618cd7d485d7100d014bf8..229922695c056ca5267c961a92cb6e57487bd312 100644
--- a/src/uncategorized/generateXXSlave.tw
+++ b/src/uncategorized/generateXXSlave.tw
@@ -21,18 +21,18 @@
<<set $activeSlave.ID = $IDNumber++>>
<<set $activeSlave.weekAcquired = $week>>
-<<set _maleIntGen = random(1,100)>>
-<<if _maleIntGen > 98>>
+<<set _femaleIntGen = random(1,100)>>
+<<if _femaleIntGen > 98>>
<<set $activeSlave.intelligence = 3>>
-<<elseif _maleIntGen > 85>>
+<<elseif _femaleIntGen > 85>>
<<set $activeSlave.intelligence = 2>>
-<<elseif _maleIntGen > 65>>
+<<elseif _femaleIntGen > 65>>
<<set $activeSlave.intelligence = 1>>
-<<elseif _maleIntGen > 35>>
+<<elseif _femaleIntGen > 35>>
<<set $activeSlave.intelligence = 0>>
-<<elseif _maleIntGen > 15>>
+<<elseif _femaleIntGen > 15>>
<<set $activeSlave.intelligence = -1>>
-<<elseif _maleIntGen > 5>>
+<<elseif _femaleIntGen > 5>>
<<set $activeSlave.intelligence = -2>>
<<else>>
<<set $activeSlave.intelligence = -3>>
@@ -196,14 +196,14 @@
<<set $activeSlave.accent -= 1>>
<</if>>
-<<set _maleCrookedTeethGen = 4+$activeSlave.intelligence+$activeSlave.intelligenceImplant>>
+<<set _femaleCrookedTeethGen = 4+$activeSlave.intelligence+$activeSlave.intelligenceImplant>>
<<if "American" == $activeSlave.nationality>>
- <<set _maleCrookedTeethGen += 2>>
+ <<set _femaleCrookedTeethGen += 2>>
<<elseif ["Andorran", "Antiguan", "Argentinian", "Aruban", "Australian", "Austrian", "Bahamian", "Bahraini", "Barbadian", "Belarusian", "Belgian", "Bermudian", "Brazilian", "British", "Bruneian", "Bulgarian", "Canadian", "Catalan", "Chilean", "a Cook Islander", "Croatian", "Czech", "Cypriot", "Danish", "Dutch", "Emirati", "Estonian", "Finnish", "French", "German", "Greek", "Greenlandic", "Guamanian", "Hungarian", "Icelandic", "Irish", "Israeli", "Italian", "Japanese", "Kazakh", "Korean", "Kuwaiti", "Latvian", "a Liechtensteiner", "Lithuanian", "Luxembourgian", "Malaysian", "Maltese", "Mauritian", "Monégasque", "Montenegrin", "New Caledonian", "a New Zealander", "Niuean", "Norwegian", "Omani", "Palauan", "Panamanian", "Polish", "Portuguese", "Puerto Rican", "Qatari", "Romanian", "Russian", "Sammarinese", "Saudi", "Seychellois", "Singaporean", "Slovak", "Slovene", "Spanish", "Swedish", "Swiss", "Taiwanese", "Trinidadian", "Uruguayan", "Vatican"].includes($activeSlave.nationality)>>
<<else>>
- <<set _maleCrookedTeethGen -= 2>>
+ <<set _femaleCrookedTeethGen -= 2>>
<</if>>
-<<if random(1,_maleCrookedTeethGen) == 1>>
+<<if random(1,_femaleCrookedTeethGen) == 1>>
<<set $activeSlave.teeth = "crooked">>
<</if>>
@@ -357,25 +357,25 @@
<</if>>
<</if>>
-<<set _maleBoobShapeGen = []>>
+<<set _femaleBoobShapeGen = []>>
<<if $activeSlave.boobs > 250 && $activeSlave.boobs < 800>>
- <<set _maleBoobShapeGen.push("perky")>>
- <<set _maleBoobShapeGen.push("downward-facing")>>
+ <<set _femaleBoobShapeGen.push("perky")>>
+ <<set _femaleBoobShapeGen.push("downward-facing")>>
<</if>>
<<if $activeSlave.boobs > 400 && $activeSlave.boobs < 1200>>
- <<set _maleBoobShapeGen.push("torpedo-shaped")>>
- <<set _maleBoobShapeGen.push("wide-set")>>
+ <<set _femaleBoobShapeGen.push("torpedo-shaped")>>
+ <<set _femaleBoobShapeGen.push("wide-set")>>
<</if>>
<<if $activeSlave.boobs > 800 && $activeSlave.physicalAge > random(10,50)>>
- <<set _maleBoobShapeGen.push("saggy")>>
+ <<set _femaleBoobShapeGen.push("saggy")>>
<</if>>
-<<if _maleBoobShapeGen.length == 1>>
+<<if _femaleBoobShapeGen.length == 1>>
<<if random(1,2) != 1>>
- <<set $activeSlave.boobShape = _maleBoobShapeGen.random()>>
+ <<set $activeSlave.boobShape = _femaleBoobShapeGen.random()>>
<</if>>
-<<elseif _maleBoobShapeGen.length > 1>>
+<<elseif _femaleBoobShapeGen.length > 1>>
<<if random(1,3) != 1>>
- <<set $activeSlave.boobShape = _maleBoobShapeGen.random()>>
+ <<set $activeSlave.boobShape = _femaleBoobShapeGen.random()>>
<</if>>
<</if>>
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index b9d8e185961fe373dbf265abd34397469863d0f9..ed559056d88d9ff817309478016f93527be7cb5f 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -20,18 +20,18 @@
<<set $activeSlave.ID = $IDNumber++>>
<<set $activeSlave.weekAcquired = $week>>
-<<set _femaleIntGene = random(1,100)>>
-<<if _femaleIntGene > 98>>
+<<set _maleIntGene = random(1,100)>>
+<<if _maleIntGene > 98>>
<<set $activeSlave.intelligence = 3>>
-<<elseif _femaleIntGene > 85>>
+<<elseif _maleIntGene > 85>>
<<set $activeSlave.intelligence = 2>>
-<<elseif _femaleIntGene > 65>>
+<<elseif _maleIntGene > 65>>
<<set $activeSlave.intelligence = 1>>
-<<elseif _femaleIntGene > 35>>
+<<elseif _maleIntGene > 35>>
<<set $activeSlave.intelligence = 0>>
-<<elseif _femaleIntGene > 15>>
+<<elseif _maleIntGene > 15>>
<<set $activeSlave.intelligence = -1>>
-<<elseif _femaleIntGene > 5>>
+<<elseif _maleIntGene > 5>>
<<set $activeSlave.intelligence = -2>>
<<else>>
<<set $activeSlave.intelligence = -3>>
@@ -204,14 +204,14 @@
<<set $activeSlave.accent -= 1>>
<</if>>
-<<set _femaleCrookedTeethGen = 4+$activeSlave.intelligence+$activeSlave.intelligenceImplant>>
+<<set _maleCrookedTeethGen = 4+$activeSlave.intelligence+$activeSlave.intelligenceImplant>>
<<if "American" == $activeSlave.nationality>>
- <<set _femaleCrookedTeethGen += 2>>
+ <<set _maleCrookedTeethGen += 2>>
<<elseif ["Andorran", "Antiguan", "Argentinian", "Aruban", "Australian", "Austrian", "Bahamian", "Bahraini", "Barbadian", "Belarusian", "Belgian", "Bermudian", "Brazilian", "British", "Bruneian", "Bulgarian", "Canadian", "Catalan", "Chilean", "a Cook Islander", "Croatian", "Czech", "Cypriot", "Danish", "Dutch", "Emirati", "Estonian", "Finnish", "French", "German", "Greek", "Greenlandic", "Guamanian", "Hungarian", "Icelandic", "Irish", "Israeli", "Italian", "Japanese", "Kazakh", "Korean", "Kuwaiti", "Latvian", "a Liechtensteiner", "Lithuanian", "Luxembourgian", "Malaysian", "Maltese", "Mauritian", "Monégasque", "Montenegrin", "New Caledonian", "a New Zealander", "Niuean", "Norwegian", "Omani", "Palauan", "Panamanian", "Polish", "Portuguese", "Puerto Rican", "Qatari", "Romanian", "Russian", "Sammarinese", "Saudi", "Seychellois", "Singaporean", "Slovak", "Slovene", "Spanish", "Swedish", "Swiss", "Taiwanese", "Trinidadian", "Uruguayan", "Vatican"].includes($activeSlave.nationality)>>
<<else>>
- <<set _femaleCrookedTeethGen -= 2>>
+ <<set _maleCrookedTeethGen -= 2>>
<</if>>
-<<if random(1,_femaleCrookedTeethGen) == 1>>
+<<if random(1,_maleCrookedTeethGen) == 1>>
<<set $activeSlave.teeth = "crooked">>
<</if>>
@@ -343,25 +343,25 @@
<</if>>
<</if>>
-<<set _femaleBoobShapeGen = []>>
+<<set _maleBoobShapeGen = []>>
<<if $activeSlave.boobs > 250 && $activeSlave.boobs < 800>>
- <<set _femaleBoobShapeGen.push("perky")>>
- <<set _femaleBoobShapeGen.push("downward-facing")>>
+ <<set _maleBoobShapeGen.push("perky")>>
+ <<set _maleBoobShapeGen.push("downward-facing")>>
<</if>>
<<if $activeSlave.boobs > 400 && $activeSlave.boobs < 1200>>
- <<set _femaleBoobShapeGen.push("torpedo-shaped")>>
- <<set _femaleBoobShapeGen.push("wide-set")>>
+ <<set _maleBoobShapeGen.push("torpedo-shaped")>>
+ <<set _maleBoobShapeGen.push("wide-set")>>
<</if>>
<<if $activeSlave.boobs > 800 && $activeSlave.physicalAge > random(10,50)>>
- <<set _femaleBoobShapeGen.push("saggy")>>
+ <<set _maleBoobShapeGen.push("saggy")>>
<</if>>
-<<if _femaleBoobShapeGen.length == 1>>
+<<if _maleBoobShapeGen.length == 1>>
<<if random(1,2) != 1>>
- <<set $activeSlave.boobShape = _femaleBoobShapeGen.random()>>
+ <<set $activeSlave.boobShape = _maleBoobShapeGen.random()>>
<</if>>
-<<elseif _femaleBoobShapeGen.length > 1>>
+<<elseif _maleBoobShapeGen.length > 1>>
<<if random(1,3) != 1>>
- <<set $activeSlave.boobShape = _femaleBoobShapeGen.random()>>
+ <<set $activeSlave.boobShape = _maleBoobShapeGen.random()>>
<</if>>
<</if>>