From 26ea59a48b9d1bcb110a8099c5e949014912a30d Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Mon, 27 Aug 2018 23:54:46 -0500
Subject: [PATCH] Name Fixing
---
src/npc/databases/dSlavesDatabase.tw | 8 ++++----
src/pregmod/widgets/pregmodWidgets.tw | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index 4db70c44831..1a27ee325a7 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -46,7 +46,7 @@
/*Corrected eyes, added combat skill, bisexual and odd, tweaked face -BoneyM*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Cuntbitch", _HS.origin = "She was a slave trader until she was betrayed by ambitious underlings and sold into enslavement.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 31, _HS.physicalAge = 31, _HS.visualAge = 31, _HS.ovaryAge = 31, _HS.health = 40, _HS.devotion = -100, _HS.muscles = 20, _HS.height = 183, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "black", _HS.hStyle = "long and curly", _HS.boobs = 1400, _HS.boobsImplant = 800, _HS.nipplesPiercing = 2, _HS.boobsTat = "degradation", _HS.butt = 6, _HS.buttImplant = 3, _HS.buttTat = "degradation", _HS.lips = 35, _HS.lipsPiercing = 2, _HS.lipsTat = "degradation", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.vaginaTat = "degradation", _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "degradation", _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.combatSkill = 1, _HS.clothes = "restrictive latex", _HS.shoes = "heels", _HS.intelligence = -1, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has several 'tribal' style tattoos on her arms from before her enslavement.", _HS.career = "a slaver">>
+<<set _HS.slaveName = "Cuntbitch", _HS.birthName = "", _HS.birthSurname = "", _HS.origin = "She was a slave trader until she was betrayed by ambitious underlings and sold into enslavement.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 31, _HS.physicalAge = 31, _HS.visualAge = 31, _HS.ovaryAge = 31, _HS.health = 40, _HS.devotion = -100, _HS.muscles = 20, _HS.height = 183, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "black", _HS.hStyle = "long and curly", _HS.boobs = 1400, _HS.boobsImplant = 800, _HS.nipplesPiercing = 2, _HS.boobsTat = "degradation", _HS.butt = 6, _HS.buttImplant = 3, _HS.buttTat = "degradation", _HS.lips = 35, _HS.lipsPiercing = 2, _HS.lipsTat = "degradation", _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.vaginaTat = "degradation", _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "degradation", _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.combatSkill = 1, _HS.clothes = "restrictive latex", _HS.shoes = "heels", _HS.intelligence = -1, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has several 'tribal' style tattoos on her arms from before her enslavement.", _HS.career = "a slaver">>
<<set $heroSlaves.push(_HS)>>
/*Set birth name to 'unknown', tweaked obedience downwards, corrected tattoo's, added combat skill, clothes and shoes, arrogant -BoneyM*/
@@ -467,7 +467,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
-<<set _HS.slaveName = "Caroline", _HS.birthName = "Carl", _HS.ID = _i++, _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 = -2, _HS.intelligenceImplant = 1, _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 = "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 = -2, _HS.intelligenceImplant = 1, _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>>
@@ -489,7 +489,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
-<<set _HS.slaveName = "'Virago' Kissa", _HS.birthName = "not known", _HS.origin = "In spite of the great demand for her kind, she has apparently eluded enslavement until recently.", _HS.career = "a wanderer", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She is a natural albino.", _HS.birthWeek = random(0,51), _HS.health = 100, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 190, _HS.nationality = "Ugandan", _HS.race = "black", _HS.eyeColor = "pale grey", _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "extremely pale", _HS.hLength = 100, _HS.hStyle = "extremely long and bushy", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 600, _HS.face = 55, _HS.lips = 35, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "oral", _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.oralSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.combatSkill = 3, _HS.livingRules = "luxurious", _HS.speechRules = "permissive", _HS.releaseRules = "permissive", _HS.collar = "pretty jewelry", _HS.shoes = "flats", _HS.intelligence = 3, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.customTat = "Her entire body is tattooed with a detailed map of her arteries which, combined with her albinism, gives her a quasi-translucent quality.", _HS.customDesc = "Her eyes are unsettling; though her irises are a pale grey color, in some lights the whole eye takes on a red cast.">>
+<<set _HS.slaveName = "'Virago' Kissa", _HS.birthName = "", _HS.birthSurname = "", _HS.origin = "In spite of the great demand for her kind, she has apparently eluded enslavement until recently.", _HS.career = "a wanderer", _HS.ID = _i++, _HS.prestige = 1, _HS.prestigeDesc = "She is a natural albino.", _HS.birthWeek = random(0,51), _HS.health = 100, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 190, _HS.nationality = "Ugandan", _HS.race = "black", _HS.eyeColor = "pale grey", _HS.hColor = "white", _HS.pubicHColor = "white", _HS.skin = "extremely pale", _HS.hLength = 100, _HS.hStyle = "extremely long and bushy", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 600, _HS.face = 55, _HS.lips = 35, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "oral", _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.oralSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.combatSkill = 3, _HS.livingRules = "luxurious", _HS.speechRules = "permissive", _HS.releaseRules = "permissive", _HS.collar = "pretty jewelry", _HS.shoes = "flats", _HS.intelligence = 3, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.customTat = "Her entire body is tattooed with a detailed map of her arteries which, combined with her albinism, gives her a quasi-translucent quality.", _HS.customDesc = "Her eyes are unsettling; though her irises are a pale grey color, in some lights the whole eye takes on a red cast.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
@@ -545,7 +545,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
-<<set _HS.slaveName = "'Quiet' Fay", _HS.birthName = "unknown", _HS.origin = "Having always been a mute with no desire to communicate her origin, you aren't sure where she's from or how she ended up here.", _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.height = 145, _HS.hColor = "brown", _HS.pubicHColor = "brown", _HS.skin = "white", _HS.hStyle = "long and disheveled", _HS.boobs = 400, _HS.butt = 2, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.oralSkill = 15, _HS.clothes = "a nice maid outfit", _HS.attrXY = 40, _HS.fetish = "submissive", _HS.customTat = "There's an X imprinted on her throat where her larynx would be.", _HS.customDesc = "She earned her name from her permanent silence and fae physique.", _HS.voice = 0>>
+<<set _HS.slaveName = "'Quiet' Fay", _HS.birthName = "", _HS.birthSurname = "", _HS.origin = "Having always been a mute with no desire to communicate her origin, you aren't sure where she's from or how she ended up here.", _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.height = 145, _HS.hColor = "brown", _HS.pubicHColor = "brown", _HS.skin = "white", _HS.hStyle = "long and disheveled", _HS.boobs = 400, _HS.butt = 2, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.oralSkill = 15, _HS.clothes = "a nice maid outfit", _HS.attrXY = 40, _HS.fetish = "submissive", _HS.customTat = "There's an X imprinted on her throat where her larynx would be.", _HS.customDesc = "She earned her name from her permanent silence and fae physique.", _HS.voice = 0>>
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 417607488af..7f06c7a11ac 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1377,12 +1377,12 @@ extremely pale -5
if(!s.race || !validRaces.includes(s.race)) {
s.race = hashChoice(setup.raceSelector[s.nationality] || setup.raceSelector[""]);
}
- if(!s.birthSurname || s.birthSurname != "") {
+ if(!s.birthSurname && s.birthSurname !== "") {
s.birthSurname = (setup.surnamePoolSelector[s.nationality + "." + s.race]
|| setup.surnamePoolSelector[s.nationality]
|| setup.whiteAmericanSlaveSurnames).random();
}
- if(!s.birthName || s.birthName != "") {
+ if(!s.birthName && s.birthName !== "") {
s.birthName = (setup.namePoolSelector[s.nationality + "." + s.race]
|| setup.namePoolSelector[s.nationality]
|| setup.whiteAmericanSlaveNames).random();
--
GitLab