diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 7bceba2263b5b497328181f53b5d80bb2dee5bd3..16c1a6117644222c102fc0b8036cf8ede27af151 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -2142,8 +2142,37 @@ Can the slave recruit. Non-random slaves should be left off.
publicCount:
How many times the slave has had public sex in your arcology. Used to determine if she is your private toy or a lusted after slut.
-accpets int
+accepts int
+
+HGExclude:
+
+Is the head girl permitted to fuck this slave pregnant.
+0 - no
+1 - yes
+
+ballType:
+
+What species of sperm she produces.
+"human"
+"dog"
+"pig"
+eggType:
+
+What species of ovum she produces.
+"human"
+"dog"
+"pig"
+
+reservedChildren:
+
+How many of her children are tagged to be incubated. Carefully balanced, do not manually touch.
+
+choosesOwnChastity:
+
+Eugenics variable. Is the slave allowed to choose to wear chastity.
+0 - no
+1 - yes
@@ -2151,7 +2180,7 @@ How to set up your own hero slave.
-The default slave template used:
-<<set $activeSlave to {slaveName: "blank", birthName: "blank", weekAcquired: 1, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactaionAdaption: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, cosmeticPiercings: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules:"restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietMilk: 0, dietCum: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: 0, inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, mother: 0, father: 0, canRecruit: 0}>>
+<<set $activeSlave to {slaveName: "blank", birthName: "blank", weekAcquired: 1, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules:"restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: 0, inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnClothes: 0}>>
Making your slave; add their name to the following, then go down the documentation adding in your changes.
-each variable must be seperated from the last by a comma followed by a space
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index 77a2944c646949c29128d3f96f06d45c5e84c785..59b96dcaf75447c0c1a25aae3b5622f3f9c5cc97 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -44,7 +44,7 @@
<br><br>
''Career ($activeSlave.career)''
-<<textbox "$activeSlave.career" $activeSlave.career>>
+<<textbox "$activeSlave.career" $activeSlave.career>> //Slave variables documentation is your friend. Will tell you exactly what to put here//
<br>
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index bae413208949c03a4743760a78df962f39e6bbdf..bd1ab50a8fc00b62441b6a132400bc4e06b626d7 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -65,7 +65,7 @@
/* SET HEROES */
<<set $heroSlaves = []>>
-<<set $activeSlave to {slaveName: "blank", birthName: "blank", weekAcquired: 1, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules:"restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: 0, inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0}>>
+<<set $activeSlave to {slaveName: "blank", birthName: "blank", weekAcquired: 1, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules:"restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: 0, inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnClothes: 0}>>
<<if ($seeDicks > 0) && ($seeDicks < 100)>>
<<display "D Slaves Database">>
<<display "DD Slaves Database">>
@@ -82,7 +82,7 @@
/*Nationalities Setup*/
<<set $basenationalities = ["American", "Afghan", "Algerian","Argentinian", "Armenian", "Australian", "Austrian", "Bangladeshi", "Belarusian", "Belgian", "Bolivian", "Brazilian", "British", "Burmese", "Canadian", "Chilean", "Chinese", "Czech", "Colombian", "Congolese", "Cuban", "Danish", "Dominican", "Dutch", "Egyptian", "Emirati", "Estonian", "Ethiopian", "Filipina", "Finnish", "French", "German", "Ghanan", "Greek", "Guatemalan", "Haitian", "Hungarian", "Icelandic", "Indonesian", "Indian", "Iranian", "Iraqi", "Italian", "Irish", "Israeli", "Jamaican", "Japanese", "Jordanian", "Kazakh", "Kenyan", "Korean", "Lebanese", "Libyan", "Lithuanian", "Malaysian", "Malian", "Mexican", "Moroccan", "Nepalese", "a New Zealander", "Nigerian", "Norwegian", "Omani", "Pakistani", "Peruvian", "Polish", "Portuguese", "Puerto Rican", "Romanian", "Russian", "Saudi", "Scottish", "Serbian", "Slovak", "South African", "Spanish", "Sudanese", "Swedish", "Swiss", "Tanzanian", "Thai", "Tunisian", "Turkish", "Ugandan", "Ukrainian", "Uzbek", "Venezuelan", "Vietnamese", "Yemeni", "Zimbabwean"]>>
-<<set $nationalities = $basenationalities>>
+<<set $nationalities = clone($basenationalities)>>
<<if $internationalTrade != 0>>
<<if $internationalVariety == 0>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 60c41e5b2a83f67d2537816754b73ed17533483f..f17a3df7635f0213b767bc81269d74d211a84285 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -35,19 +35,29 @@
<<set $slaves[$i].nationality to "Ancient Chinese Revivalist">>
<</if>>
<<if $slaves[$i].relationTarget != 0>>
- <<set $slaves[$i].relationTarget += 50000>>
+ <<set $slaves[$i].relationTarget += 1200000>>
<</if>>
<<if $slaves[$i].relationshipTarget != 0>>
- <<set $slaves[$i].relationshipTarget += 50000>>
+ <<set $slaves[$i].relationshipTarget += 1200000>>
<</if>>
<<else>>
<<set $dump to $slaves.pluck([$i], [$i])>><<set $i-->>
<</if>>
<</for>>
- <<set $genePool = []>>
- <<for $i to 0; $i < $slaves.length; $i++>>
- <<set $genePool.push(slaves[$i])>>
+ <<set $genePool = ngUpdateGenePool($genePool)>>
+ /*
+ <<for $i to 0; $i < $genePool.length; $i++>>
+ <<for $k to 0; $k < $slaves.length; $k++>>
+ <<if $genePool[$i].ID+1200000 == $slaves[$k].ID>>
+ <<set $genePool[$i].ID += 1200000>>
+ <<break>>
+ <</if>>
+ <</for>>
+ <<if $k == $slaves.length>>
+ <<set $dump to $genePool.pluck([$i], [$i])>><<set $i-->>
+ <</if>>
<</for>>
+ */
<<for $i to 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].relation != 0>>
<<set $seed to 0>>
@@ -1335,7 +1345,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $nextLink to "EW Slaves">>
<<set $customSlaveOrdered to 0>>
-<<set $customSlave to {slaveName: "custom", birthName: "custom", weekAcquired: 1, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race:"white", markings: "none", eyes: 1, eyeColor: "brown", hColor: "brown", pubicHColor: "brown", skin: 0, hLength: 60, hStyle: 0, pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 500, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 2, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "no default setting", tonguePiercing: 0, vagina: 1, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 1, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, balls: 0, scrotum: 0, ovaries: 1, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules:"restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, actualAge: 18, visualAge: 18, physicalAge: 18, mother: 0, father: 0, sisters: 0, daughters: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0}>>
+<<set $customSlave to {slaveName: "custom", birthName: "custom", weekAcquired: 1, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race:"white", markings: "none", eyes: 1, eyeColor: "brown", hColor: "brown", pubicHColor: "brown", skin: 0, hLength: 60, hStyle: 0, pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 500, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 2, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "no default setting", tonguePiercing: 0, vagina: 1, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 1, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, balls: 0, scrotum: 0, ovaries: 1, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules:"restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, actualAge: 18, visualAge: 18, physicalAge: 18, mother: 0, father: 0, sisters: 0, daughters: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0}>>
<<set $huskSlaveOrdered to 0>>
<<set $huskSlave to {age: 18, nationality: "slave", race: "white", sex: 1, virgin: 0}>>
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index 1a06947903848996de83ec154d6786cf4a6fede2..4b1049f533d6706faf8bec8af2440bf0e4f1bc51 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -1954,4 +1954,17 @@ window.totalPlayerRelatives = function(pc) {
relatives += pc.sisters
}
return relatives
-};
\ No newline at end of file
+};
+
+window.ngUpdateGenePool = function(genePool) {
+ var transferredSlaveIds = (SugarCube.State.variables.slaves || [])
+ .filter(function(s) { return s.ID >= 1200000; })
+ .map(function(s) { return s.ID - 1200000; });
+ return (genePool || [])
+ .filter(function(s) { return transferredSlaveIds.indexOf(s.ID) >= 0; })
+ .map(function(s) {
+ var result = jQuery.extend(true, {}, s);
+ result.ID += 1200000;
+ return result;
+ });
+}
\ No newline at end of file
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 570304314819fcd6a9083b003192eb8617a540a2..b9e72ae010daf53b8a422874a1d0a1848ee0d7e5 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -132,7 +132,7 @@ The previous owner seems to have left in something of a hurry.
<<case "Supremacist">>
<<set $arcologies[0].FSSupremacistLawME = 1>><<display "Generate New Slave">><<set $arcologies[0].FSSupremacistLawME = 0>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-25,-45), $activeSlave.health = random(0,15)>>
- <<set $activeSlave.beauty = random(1,3)>>
+ <<set $activeSlave.face = random(1,3)>>
<<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35)>>
<<if $activeSlave.vagina > -1>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
@@ -144,7 +144,7 @@ The previous owner seems to have left in something of a hurry.
<<case "Subjugationist">>
<<set $fixedRace = $activeArcology.FSSubjugationistRace>><<display "Generate New Slave">><<set $fixedRace = 0>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-25,-45), $activeSlave.health = random(0,15)>>
- <<set $activeSlave.beauty = random(1,3)>>
+ <<set $activeSlave.face = random(1,3)>>
<<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35)>>
<<if $activeSlave.vagina > -1>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
@@ -157,7 +157,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlaveOneTimeMaxAge to 25>>
<<display "Generate XY Slave">>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(15,-15), $activeSlave.health = 100>>
- <<set $activeSlave.beauty = random(0,2)>>
+ <<set $activeSlave.face = random(0,2)>>
<<set $activeSlave.boobs += 100*random(2,4)>>
<<set $activeSlave.butt += random(1,2)>>
<<set $activeSlave.attrXY = random(70,90), $activeSlave.attrXX = 0>>
@@ -170,7 +170,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlaveOneTimeMaxAge to 25>>
<<display "Generate XX Slave">>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-25,-45), $activeSlave.health = random(55,65)>>
- <<set $activeSlave.beauty = random(1,3)>>
+ <<set $activeSlave.face = random(1,3)>>
<<set $activeSlave.preg = random(1,35), $activeSlave.lactation = 1>>
<<if $activeSlave.vagina > -1>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
@@ -181,7 +181,7 @@ The previous owner seems to have left in something of a hurry.
<<case "Paternalist">>
<<display "Generate New Slave">>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(55,65), $activeSlave.health = random(55,65)>>
- <<set $activeSlave.beauty = random(1,3)>>
+ <<set $activeSlave.face = random(1,3)>>
<<set $activeSlave.intelligence = random(1,3), $activeSlave.intelligenceImplant = 1>>
<<set $activeSlave.entertainSkill = random(15,35)>>
<<set $activeSlave.clothes = "conservative clothing", $activeSlave.collar = "none", $activeSlave.shoes = "flats">>
@@ -204,7 +204,7 @@ The previous owner seems to have left in something of a hurry.
<<display "Generate New Slave">>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-15,15), $activeSlave.health = random(25,45)>>
<<set $activeSlave.chem = 50>>
- <<set $activeSlave.beauty = random(1,3)>>
+ <<set $activeSlave.face = random(1,3)>>
<<set $activeSlave.boobs += 100*random(10,20)>>
<<set $activeSlave.butt += random(2,3)>>
<<set $activeSlave.lips += random(0,1)>>
@@ -222,7 +222,7 @@ The previous owner seems to have left in something of a hurry.
<<case "SlimnessEnthusiast">>
<<display "Generate New Slave">>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(55,65), $activeSlave.health = random(55,65)>>
- <<set $activeSlave.beauty = random(1,3)>>
+ <<set $activeSlave.face = random(1,3)>>
<<set $activeSlave.boobs = 100*random(1,4)>>
<<set $activeSlave.butt = random(1,2)>>
<<set $activeSlave.weight = random(-25,-15)>>
@@ -238,7 +238,7 @@ The previous owner seems to have left in something of a hurry.
<<display "Generate New Slave">>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-15,15), $activeSlave.health = random(-15,0)>>
<<set $activeSlave.faceImplant = random(1,2)>>
- <<set $activeSlave.beauty = Math.trunc($activeSlave.beauty+$activeSlave.faceImplant,-3,3)>>
+ <<set $activeSlave.face = Math.trunc($activeSlave.face+$activeSlave.faceImplant,-3,3)>>
<<set $activeSlave.boobsImplant = 200*random(4,8)>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
<<set $activeSlave.buttImplant = random(2,4)>>
@@ -256,7 +256,7 @@ The previous owner seems to have left in something of a hurry.
<<case "BodyPurist">>
<<display "Generate New Slave">>
<<set $activeSlave.devotion = random(55,65), $activeSlave.trust = random(25,45), $activeSlave.health = 100>>
- <<set $activeSlave.beauty = random(1,3)>>
+ <<set $activeSlave.face = random(1,3)>>
<<set $activeSlave.weight = random(-5,5)>>
<<set $activeSlave.muscle = random(10,25)>>
<<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35)>>
@@ -272,7 +272,7 @@ The previous owner seems to have left in something of a hurry.
<<set $one_time_age_overrides_pedo_mode to 1>>
<<display "Generate New Slave">>
<<set $activeSlave.devotion = random(55,65), $activeSlave.trust = random(-15,15), $activeSlave.health = random(25,45)>>
- <<set $activeSlave.beauty = random(1,3)>>
+ <<set $activeSlave.face = random(1,3)>>
<<set $activeSlave.boobs += 100*random(1,4)>>
<<set $activeSlave.butt += random(1,2)>>
<<set $activeSlave.weight = random(-5,90)>>
@@ -288,7 +288,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlaveOneTimeMaxAge to 19>>
<<display "Generate New Slave">>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(55,65), $activeSlave.health = random(25,45)>>
- <<set $activeSlave.beauty = random(1,3)>>
+ <<set $activeSlave.face = random(1,3)>>
<<set $activeSlave.boobs = 100*random(1,4)>>
<<set $activeSlave.butt = random(1,3)>>
<<set $activeSlave.weight = random(-25,25)>>
@@ -329,7 +329,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlaveOneTimeMaxAge to 19>>
<<display "Generate New Slave">>
<<set $activeSlave.devotion = 100, $activeSlave.trust = random(55,65), $activeSlave.health = 100>>
- <<set $activeSlave.beauty = random(0,2)>>
+ <<set $activeSlave.face = random(0,2)>>
<<set $activeSlave.muscles = random(25,50)>>
<<set $activeSlave.combatSkill = 1>>
<<set $activeSlave.behavioralFlaw = "none", $activeSlave.behavioralQuirk = "fitness">>
@@ -339,7 +339,7 @@ The previous owner seems to have left in something of a hurry.
<<case "EgyptianRevivalist">>
<<display "Generate New Slave">>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(25,45), $activeSlave.health = random(25,45)>>
- <<set $activeSlave.beauty = random(1,3)>>
+ <<set $activeSlave.face = random(1,3)>>
<<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35)>>
<<if $activeSlave.vagina > -1>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
@@ -355,7 +355,7 @@ The previous owner seems to have left in something of a hurry.
<<NationalityToName>>
<<set $activeSlave.accent = 0>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(25,45), $activeSlave.health = random(25,45)>>
- <<set $activeSlave.beauty = random(1,3)>>
+ <<set $activeSlave.face = random(1,3)>>
<<set $activeSlave.intelligence = random(1,3), $activeSlave.intelligenceImplant = 1>>
<<set $activeSlave.entertainSkill = 100>>
<<set $activeSlave.clothes = "a kimono", $activeSlave.collar = "satin choker", $activeSlave.shoes = "heels">>
@@ -363,7 +363,7 @@ The previous owner seems to have left in something of a hurry.
<<case "ArabianRevivalist">>
<<display "Generate New Slave">>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-15,15), $activeSlave.health = random(25,45)>>
- <<set $activeSlave.beauty = random(1,3)>>
+ <<set $activeSlave.face = random(1,3)>>
<<set $activeSlave.intelligence = random(0,2), $activeSlave.intelligenceImplant = 0>>
<<set $activeSlave.clothes = "harem gauze", $activeSlave.collar = "uncomfortable leather", $activeSlave.shoes = "flats">>
<<set $activeSlave.assignment = "take classes">>
@@ -376,7 +376,7 @@ The previous owner seems to have left in something of a hurry.
<<NationalityToName>>
<<NationalityToAccent>>
<<set $activeSlave.devotion = random(55,65), $activeSlave.trust = random(25,45), $activeSlave.health = random(25,45)>>
- <<set $activeSlave.beauty = random(0,2)>>
+ <<set $activeSlave.face = random(0,2)>>
<<set $activeSlave.accent = 0>>
<<set $activeSlave.intelligence = 3, $activeSlave.intelligenceImplant = 1>>
<<set $activeSlave.oralSkill = 100, $activeSlave.analSkill = 100>>
@@ -392,7 +392,6 @@ The previous owner seems to have left in something of a hurry.
<<case "Eugenics">>
<<display "Generate New Slave">>
<<set $activeSlave.devotion = -100, $activeSlave.trust = -100, $activeSlave.health = random(80,90)>>
- <<set $activeSlave.beauty = 6>>
<<set $activeSlave.intelligence = 3>>
<<set $activeSlave.intelligenceImplant = 1>>
<<set $activeSlave.face = 3>>
@@ -413,7 +412,7 @@ The previous owner seems to have left in something of a hurry.
<<set $one_time_age_overrides_pedo_mode to 1>>
<<display "Generate XX Slave">>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-25,-45), $activeSlave.health = random(55,65)>>
- <<set $activeSlave.beauty = random(1,3)>>
+ <<set $activeSlave.face = random(1,3)>>
<<set $activeSlave.preg = random(10,35),$activeSlave.pregType = random(3,5) , $activeSlave.lactation = 1>>
<<set $activeSlave.birthsTotal = 5>>
<<set $activeSlave.bellySag = 20>>
diff --git a/src/npc/databases/cheatmodeDatabase.tw b/src/npc/databases/cheatmodeDatabase.tw
index b9c3973559c262f1715ef48b408fd47c1323855b..713598356eb1804f999e61fb14a3761beefc0377 100644
--- a/src/npc/databases/cheatmodeDatabase.tw
+++ b/src/npc/databases/cheatmodeDatabase.tw
@@ -1,6 +1,6 @@
:: Cheatmode Database [nobr]
-<<set $activeSlave to {slaveName: "blank", birthName: "blank", weekAcquired: 1, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, physicalAge: 18, visualAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules:"restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], father: 0, mother: 0, sisters: 0, daughters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0}>>
+<<set $activeSlave to {slaveName: "blank", birthName: "blank", weekAcquired: 1, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, physicalAge: 18, visualAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules:"restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], father: 0, mother: 0, sisters: 0, daughters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0}>>
<<set _HS = clone($activeSlave)>>
<<set _HS.slaveName = "Miss Anne", _HS.birthName = "Lindy Anne", _HS.ID = 990000, _HS.relation = "mother", _HS.relationTarget = 990004, _HS.relationship = 4, _HS.relationshipTarget = 990001, _HS.rivalry = 1, _HS.rivalryTarget = 990002, _HS.assignment = "be your Head Girl", _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ageImplant = 1, _HS.health = 50, _HS.devotion = 100, _HS.height = 175, _HS.eyeColor = "green", _HS.hColor = "honey blonde", _HS.skin = "pale", _HS.hStyle = "long", _HS.waist = 1, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.face = 2, _HS.lips = 35, _HS.vagina = 2, _HS.anus = 1, _HS.ovaries = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.clothes = "a slave gown", _HS.intelligence = 3, _HS.energy = 65, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "'Miss Anne' is tattooed in lovely flowing script over her collarbone.", _HS.customDesc = "She speaks with the rich accent of the Old South.">>
diff --git a/src/npc/startingGirls/commitStartingGirl.tw b/src/npc/startingGirls/commitStartingGirl.tw
index 70f3d5b18fdb29afe725ddbabb498bee06812f98..a1e711ea33803f16f2cd1bc07da0c5bf59eb1c83 100644
--- a/src/npc/startingGirls/commitStartingGirl.tw
+++ b/src/npc/startingGirls/commitStartingGirl.tw
@@ -27,7 +27,7 @@
<</if>>
$activeSlave.slaveName has been added to your starting stable of slaves. You now have ¤$cash remaining.
-<br><br>
+<br>
<<if $cash >= $minimumSlaveCost>>
<br>
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 62c2ba60244d62beff571d1ab110e5585a01a710..1699e7e887568251d0f46f1358982e3df272cfb9 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -40,22 +40,24 @@
<</if>>
<<set $missingParentID -= 1>>
<<else>>
- <<if $activeSlave.relation != 0>>
- <<if $activeSlave.relation is "sister">>
- <<set $activeSlave.relation = "sister">>
- <<set $activeSlave.actualAge -= 5>>
- <<set $activeSlave.actualAge += random(0,10)>>
- <<set $activeSlave.birthWeek = 0>>
- <<elseif $activeSlave.relation is "mother">>
- <<set $activeSlave.relation = "daughter">>
- <<set $activeSlave.actualAge -= random(16,24)>>
- <<set $activeSlave.birthWeek = 0>>
- <<elseif $activeSlave.relation is "daughter">>
- <<set $activeSlave.relation = "mother">>
- <<set $activeSlave.actualAge += random(16,24)>>
- <<set $activeSlave.birthWeek = 0>>
- <</if>>
- <<set $activeSlave.relationTarget = $activeSlave.ID>>
+ <<set _tempSlave = clone($activeSlave)>>
+ <<set $activeSlave = $slaveWithoutBonuses>>
+ <<if _tempSlave.relation != 0>>
+ <<if _tempSlave.relation is "sister">>
+ <<set $activeSlave.relation = "sister">>
+ <<set $activeSlave.age -= 5>>
+ <<set $activeSlave.age += random(0,10)>>
+ <<set $activeSlave.birthWeek = 0>>
+ <<elseif _tempSlave.relation is "mother">>
+ <<set $activeSlave.relation = "daughter">>
+ <<set $activeSlave.age -= random(16,24)>>
+ <<set $activeSlave.birthWeek = 0>>
+ <<elseif _tempSlave.relation is "daughter">>
+ <<set $activeSlave.relation = "mother">>
+ <<set $activeSlave.age += random(16,24)>>
+ <<set $activeSlave.birthWeek = 0>>
+ <</if>>
+ <<set $activeSlave.relationTarget = _tempSlave.ID>>
<</if>>
<</if>>
<<set $activeSlave.visualAge = $activeSlave.actualAge>>
@@ -1361,7 +1363,7 @@ XY attraction:
<<click "Judgemental">><<set $activeSlave.sexualFlaw = "judgemental">><<replace "#sexualFlaw">>@@color:red;$activeSlave.sexualFlaw.@@<</replace>><<StartingGirlsCost>><</click>> |
<<click "Sexually idealistic">><<set $activeSlave.sexualFlaw = "idealistic">><<replace "#sexualFlaw">>@@color:red;$activeSlave.sexualFlaw.@@<</replace>><<StartingGirlsCost>><</click>>
-<br><br>
+<br>
<span id="finalize">
<<slaveCost $activeSlave>>
<<if $cash >= $slaveCost>>
@@ -1446,7 +1448,7 @@ XY attraction:
<br>
<</if>>
<<else>>
- //You lack the necessary funds to add this slave.//
+ <br>//You lack the necessary funds to add this slave.//
<</if>>
<br>
[[Discard this slave and continue|Acquisition]]
diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw
index a4898f530e6193f5a199f8d2e2dbe89c87bab3c6..b6e7409ee9a099a710b195f1e7ea5b0d6ccadda4 100644
--- a/src/pregmod/incubatorReport.tw
+++ b/src/pregmod/incubatorReport.tw
@@ -14,7 +14,7 @@
<<set $incubatorSlaves += 1>>
<<if $tanks[$i].growTime > 0>>
<<set $tanks[$i].growTime -= $incubatorUpgradeSpeed>>
- <br><<print $tanks[$i].slaveName>>'s growth is currently being accelerated. She <<if Math.round($tanks[$i].growTime/$incubatorUpgradeSpeed) == 0>>is @@color:lime;ready for release.@@ She will be ejected from her tank upon your approach<<else>>in about <<print Math.round($tanks[$i].growTime/$incubatorUpgradeSpeed)>>will be ready for release weeks<</if>>.
+ <br><<print $tanks[$i].slaveName>>'s growth is currently being accelerated. She <<if Math.round($tanks[$i].growTime/$incubatorUpgradeSpeed) == 0>>is @@color:lime;ready for release.@@ She will be ejected from her tank upon your approach<<else>>will be ready for release in about <<print Math.round($tanks[$i].growTime/$incubatorUpgradeSpeed)>> weeks<</if>>.
<<else>>
$tanks[$i].slaveName is @@color:lime;ready for release.@@ She will be ejected from her tank upon your approach.
<</if>>
diff --git a/src/pregmod/pregmodWidgets.tw b/src/pregmod/pregmodWidgets.tw
index a670918efd5a4800355e8a524ebfe22aee2373d5..f8e939baa2a0bebec3fda29d812ce3df861d7bb9 100644
--- a/src/pregmod/pregmodWidgets.tw
+++ b/src/pregmod/pregmodWidgets.tw
@@ -112,6 +112,9 @@
<<if ndef $args[0].reservedChildren>>
<<set $args[0].reservedChildren to 0>>
<</if>>
+<<if ndef $args[0].choosesOwnChastity>>
+ <<set $args[0].choosesOwnChastity = 0>>
+<</if>>
<<if ndef $args[0].pubertyXX>>
<<if $args[0].physicalAge >= $args[0].pubertyAgeXX>>
diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw
index 8094d1c491ed1f1a6eb437e1d421fc86ef295517..97d116433bbe77bc95a1c7fd807ae0de385abdd1 100644
--- a/src/uncategorized/generateXXSlave.tw
+++ b/src/uncategorized/generateXXSlave.tw
@@ -1,6 +1,6 @@
:: Generate XX Slave [nobr]
-<<set $activeSlave to {slaveName: "blank", birthName: "blank", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race:"white", markings: "none", eyes: 1, eyeColor: "brown", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 1, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, balls: 0, scrotum: 0, ovaries: 1, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules:"restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, underArmHStyle: "waxed", physicalAge: 18, actualAge: 18, visualAge: 18, father: 0, mother: 0, sisters: 0, daughters: 0, canRecruit: 1, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0}>>
+<<set $activeSlave to {slaveName: "blank", birthName: "blank", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race:"white", markings: "none", eyes: 1, eyeColor: "brown", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 1, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, balls: 0, scrotum: 0, ovaries: 1, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules:"restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, underArmHStyle: "waxed", physicalAge: 18, actualAge: 18, visualAge: 18, father: 0, mother: 0, sisters: 0, daughters: 0, canRecruit: 1, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0}>>
<<set $activeSlave.publicCount to 0>>
<<if $activeSlaveOneTimeMaxAge > 998>>
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index 1e59de5aef9aba60173b1cf0653c45df74408229..02e3e279b2d3a350ed7780b1f2731e3753be69d6 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -1,6 +1,6 @@
:: Generate XY Slave [nobr]
-<<set $activeSlave to {slaveName: "blank", birthName: "blank", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race:"white", markings: "none", eyes: 1, eyeColor: "brown", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 10, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules:"restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, underArmHStyle: "waxed", physicalAge: 18, actualAge: 18, visualAge: 18, father: 0, mother: 0, sisters: 0, daughters: 0, canRecruit: 1, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0}>>
+<<set $activeSlave to {slaveName: "blank", birthName: "blank", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race:"white", markings: "none", eyes: 1, eyeColor: "brown", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 10, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules:"restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, underArmHStyle: "waxed", physicalAge: 18, actualAge: 18, visualAge: 18, father: 0, mother: 0, sisters: 0, daughters: 0, canRecruit: 1, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0}>>
<<set $activeSlave.publicCount to 0>>
<<if $activeSlaveOneTimeMaxAge > 998>>
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 06beb39e131daef9bda82045fd78cc1272a5cac2..f278b6c13d638d19409b1c054a7f0da199e827e1 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -455,68 +455,6 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
She's watching you attentively, waiting for a chance to be helpful. When she sees your glance, she smiles hopefully, sticks out her chest a little, and turns from side to side to show off.
<</if>>
-<<elseif $assistantAppearance is "shemale">>
- She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>>bimbo shemale with blonde hair, <<if $arcologies[0].FSSupremacist != "unset">><<if $arcologies[0].FSSupremacistRace is "black">><<print either("black", "brown", "light brown")>><<elseif $arcologies[0].FSSupremacistRace is "white">><<print either("tanned", "fair")>><<elseif $arcologies[0].FSSupremacistRace is "latina">><<print either("olive", "brown", "light brown")>><<elseif $arcologies[0].FSSupremacistRace is "indo-aryan" or $arcologies[0].FSSupremacistRace is "malay" or $arcologies[0].FSSupremacistRace is "pacific islander" or $arcologies[0].FSSupremacistRace is "amerindian">><<print either("dark", "tanned")>><<elseif $arcologies[0].FSSupremacistRace is "asian">><<print either("dark", "tanned")>><<elseif $arcologies[0].FSSupremacistRace is "middle eastern" or $arcologies[0].FSSupremacistRace is "semitic" or $arcologies[0].FSSupremacistRace is "southern European">><<print either("dark", "tanned")>><</if>><<else>>tanned<</if>> skin, huge lips, and ridiculous tits. Her cock hangs past her knees when limp.
- <<if $assistantFSOptions>>
- <<switch $assistantFSAppearance>>
- <<case "paternalist">>
- She's made herself up to look a bit more classy recently: she has elegant fake nails, and has her hair piled up on her head.
- <<case "degradationist">>
- She's made herself up to look almost comically evil: she's wearing black lipstick, black eyeliner, and a black barbed cockring.
- <<case "roman revivalist">>
- She's taken to reclining on a traditional Roman couch and drinking wine out of a shallow dish.
- <<case "egyptian revivalist">>
- She's wearing an Egyptian melting perfume cake on her head.
- <<case "edo revivalist">>
- She's wearing a brief Japanese bathhouse robe.
- <<case "arabian revivalist">>
- She's dressed herself like an oil millionare, with aviator sunglasses and a headscarf.
- <<case "chinese revivalist">>
- She's added various tattoos of rude Chinese characters to her body recently.
- <<case "chattel religionist">>
- She's wearing the garb of a priestess of the new faith, which frames her cock prominently.
- <<case "physical idealist">>
- She's extremely muscular: she shines with body oil, and her abs have abs.
- <<case "repopulation focus">>
- She is incredably pregnant, her belly preventing her from playing with herself effectively.
- <<case "eugenics">>
- Her sizable dick is restrained in a complicated chastity device.
- <<case "gender radicalist">>
- She's rendered her cock in even more loving detail recently, adding a couple of veins and a bead of precum.
- <<case "gender fundamentalist">>
- She's taken to concealing her dick recently, and cheekily turns away from you to hide it as much as possible.
- <<case "asset expansionist">>
- She's increased the size of her assets recently: she's increased the girth of her dick until it's as thick as one of her arms, and her boobs are the size of beach balls.
- <<case "transformation fetishist">>
- Her tits, ass and lips are carefully rendered to make them look fake.
- <<case "pastoralist">>
- She's lactating, and her orgasms produce comically powerful jets of cum.
- <<case "maturity preferentialist">>
- She's quite mature, with a lean face that accentuates her cheekbones.
- <<case "youth preferentialist">>
- She's surprisingly young, and looks as innocent as a computer generated image of a girl with a pornstar dick possibly can.
- <<case "slimness enthusiast">>
- She's recently altered her appearance to be slimmer and more athletic.
- <<case "body purist">>
- She's recently improved her appearance to look more natural, with prettier boobs and softer hips.
- <</switch>>
- <</if>>
-<<if ($cockFeeder == 1) and ($seed == 1)>>
- A recognizable little representation of one of your slaves is down on its knees in front of her, gagging on her enormous dick. The slave must be down in the kitchen, getting a meal out of the phallic food dispensers. As you watch, the shemale orgasms; she notices you watching her, and blows you a wet kiss.
-<<elseif ($suppository == 1) and ($seed == 2)>>
- A recognizable little representation of one of your slaves is down on its knees in front of her, moaning as it takes her massive prick. The slave must be receiving her drugs from one of the dildo dispensers. As you watch, the shemale looks up at you, winks, and starts pulling out after each thrust, her cock making a popping noise each time it leaves the slave's butthole.
-<<elseif ($masturbationAllowed == 1) and ($seed is 3)>>
- She's giving a blowjob to a recognizable little representation of one of your slaves. The slave must be using one of the penthouse's many vibrators. The shemale is looking after herself, too, jerking herself off with one hand and playing with her asshole with the other.
-<<elseif ($seed is 4)>>
- A recognizable little representation of one of your slaves is lying with its head in her lap. The shemale is wearing a little stethoscope and is listening to the slave breathe; the slave must be getting a checkup. The shemale is restraining herself for once, patting the slave's head and cooing reassuringly.
-<<elseif ($seed is 5) and ($invasionVictory > 0)>>
- She's masturbating as she takes it up the ass from a representation of one of your security drones, which appears to have a little dildo mounted in place of one of its gun assemblies. When she sees you looking at her, she giggles and says, "What? I like him! He did really well during the invasion."
-<<elseif ($seed is 6) and ($studio == 1)>>
- The shemale is plowing a recognizable little representation of one of your slaves up the butt, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and $assistantName is clearly turning the feed of it into porn.
-<<else>>
- She's sitting crosslegged, bending down to suck herself off and looking up at you at the same time. When she sees your attention she lets her dick pop free of her mouth and waits for a moment to see if you have instructions for her, and then goes back to autofellatio.
-<</if>>
-
<<elseif $assistantAppearance is "hypergoddess">>
She's a cute "little" <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>>fertility goddess, with monstrously wide hips, enormous milky breasts and a room filling belly. Her overfull stomach bulges and squirms from her hundreds of occupants, as well as parts her milk swollen breasts to either side.
<<if $assistantFSOptions>>
@@ -835,7 +773,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
wearing a simple white linen dress and has eyeshadow poorly applied around her eyes.
<<case "edo revivalist">>
wearing a fine kimono and holding a little fan. She looks like a little Hina doll.
- <<elseif $assistantFSAppearance is "arabian revivalist">>
+ <<case "arabian revivalist">>
wearing a strip of silk as a dress.
<<case "chinese revivalist">>
wearing a silk cheongsam with a little green cap on her head. Her hair is braided on the sides. She looks like a figurine from some kind of game.
@@ -940,7 +878,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
slime. She is compacting her slime to make herself look thinner.
<<case "body purist">>
slime with the purest goo her body could be made of.
- <<else>>
+ <<default>>
slime with a pair of shorts and a shirt floating inside her.
<</switch>>
<<else>>
diff --git a/src/uncategorized/saChoosesOwnClothes.tw b/src/uncategorized/saChoosesOwnClothes.tw
index 112ad3945aa7ce25cee3efa6597a54bc700987ad..719b4a8e0d1e377339df92e67d33be18e0bc0451 100644
--- a/src/uncategorized/saChoosesOwnClothes.tw
+++ b/src/uncategorized/saChoosesOwnClothes.tw
@@ -202,6 +202,9 @@
<<elseif ($slaves[$i].assignment is "take classes") || ($slaves[$i].assignment is "learn in the schoolroom")>>
and wears a schoolgirl outfit, since it seems most appropriate.
<<set $slaves[$i].clothes to "a schoolgirl outfit">>
+<<elseif (($slaves[$i].assignment is "whore") || ($slaves[$i].assignment is "work in the brothel")) && ($clothesBoughtMaternityLingerie == 1 || $arcologies[0].FSRepopulationFocus != "unset")>>
+ and wears pretty lingerie to show off her merchandise and accentuate her pregnancy while still looking a little classy.
+ <<set $slaves[$i].clothes to "attractive lingerie for a pregnant woman">>
<<elseif ($slaves[$i].assignment is "whore") || ($slaves[$i].assignment is "work in the brothel")>>
and wears pretty lingerie to show off her merchandise and still look a little classy.
<<set $slaves[$i].clothes to "attractive lingerie">>
@@ -217,19 +220,44 @@
<<elseif ($slaves[$i].assignment is "be a servant") || ($slaves[$i].assignment is "work as a servant")>>
and wears a sturdy maid outfit, since anything else might be damaged by her hard work around the penthouse.
<<set $slaves[$i].clothes to "a nice maid outfit">>
+<<elseif bigBelly($slaves[$i])>>
+ <<if random(1,2) == 1>>
+ and wears pretty lingerie to show off her merchandise while giving her big belly plenty of room to hang free.
+ <<set $slaves[$i].clothes to "attractive lingerie">>
+ <<elseif ($clothesBoughtMaternityLingerie == 1 || $arcologies[0].FSRepopulationFocus != "unset") && $slaves[$i].energy > 90>>
+ and wears pretty lingerie to show off her merchandise and accentuate her pregnancy while giving it plenty of room to hang free.
+ <<set $slaves[$i].clothes to "attractive lingerie for a pregnant woman">>
+ <<elseif ($clothesBoughtMaternityDress == 1 || $arcologies[0].FSRepopulationFocus != "unset")>>
+ and wears a conservative dress with plenty of give for her belly to stretch it.
+ <<set $slaves[$i].clothes to "a maternity dress">>
+ <<else>>
+ and wears string lingerie to look fun and fuckable while giving her big belly plenty of room to hang free.
+ <<set $slaves[$i].clothes to "a string bikini">>
+ <</if>>
<<else>>
and wears string lingerie to show off her body.
<<set $slaves[$i].clothes to "a string bikini">>
<</if>>
<<if $arcologies[0].FSRestart != "unset">>
- <<if $slaves[$i].vagina > -1 && $slaves[$i].vaginalAccessory != "chastity belt">>
- She also affixes a chastity belt over her vagina to discourage use of her reproductive organ.
- <<set $slaves[$i].vaginalAccessory to "chastity belt">>
- <</if>>
- <<if $slaves[$i].dick > 0 && $slaves[$i].dickAccessory != "chastity">>
- She also affixes a chastity cage onto her dick to discourage use of her reproductive organ.
- <<set $slaves[$i].dickAccessory to "chastity">>
+ <<if $slaves[$i].choosesOwnChastity == 1>>
+ <<if $slaves[$i].vagina > -1 && $slaves[$i].breedingMark == 1 && ($slaves[$i].vaginalAccessory == "chastity belt" || $slaves[$i].vaginalAccessory == "combined chastity")>>
+ She unfastens her chastity belt knowing full well her role in life is to carry her <<if def $PC.customTitle>><<print $PC.customTitle>>'s<<elseif $PC.title != 0>>Master's<<else>>Mistress'<</if>> children.
+ <<set $slaves[$i].vaginalAccessory to "none">>
+ <<elseif $slaves[$i].vagina > -1 && $slaves[$i].ovaries == 1 && $slaves[$i].preg == 0 && $slaves[$i].vaginalAccessory != "chastity belt">>
+ She also affixes a chastity belt over her vagina to discourage use of her reproductive organ.
+ <<set $slaves[$i].vaginalAccessory to "chastity belt">>
+ <<elseif $slaves[$i].vagina > -1 && ($slaves[$i].ovaries == 0 || $slaves[$i].preg < -1) && $slaves[$i].vaginalAccessory == "chastity belt">>
+ She removes her chastity belt since no matter how hard someone tries, she can never become pregnant.
+ <<set $slaves[$i].vaginalAccessory to "none">>
+ <</if>>
+ <<if $slaves[$i].dick > 0 && $slaves[$i].balls > 0 && $slaves[$i].dickAccessory != "chastity">>
+ She also affixes a chastity cage onto her dick to discourage use of her reproductive organ.
+ <<set $slaves[$i].dickAccessory to "chastity">>
+ <<elseif $slaves[$i].dick > 0 && $slaves[$i].balls == 0 && $slaves[$i].dickAccessory == "chastity">>
+ She removes her chastity cage since even if she could get erect, she only shoots blanks.
+ <<set $slaves[$i].dickAccessory to "none">>
+ <</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 953d41f9e704a3c5827da4f3d4adff93cf73c8c5..b431bc8e559e3ad90f903515efabd3726fa08ac2 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -68,7 +68,7 @@
<</if>>
<<elseif $slaves[$i].fuckdoll <= 75>>
This week it @@color:green;begins to learn more advanced commands@@ from its suit. It is taught a command that instructs it to take a more active role in penetrative sex. When that command is given, it must fuck itself against any <<if $PC.dick == 1>>cocks<<else>>phalli<</if>> that are currently inside it, as hard as it possibly can.
- <<if $slaves[$i].fetish != "none">>
+ <<if $slaves[$i].fetish != "none" || $slaves[$i].fetish != "mindbroken">>
It @@color:pink;no longer retains any sexual preferences@@ at all. It just wants to be penetrated.
<<set $slaves[$i].fetish = "none", $slaves[$i].fetishStrength = 0>>
<</if>>
@@ -1379,10 +1379,12 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
<<if $slaves[$i].fetishKnown == 1>>
<<if ($slaves[$i].fetish != "none")>>
<<if $slaves[$i].fetishStrength <= 95>>
- <<if $slaves[$i].devotion+$slaves[$i].trust > 150>>
+ <<if $slaves[$i].devotion > 50>>
+ <<if $slaves[$i].trust > 50>>
She has the confidence to pursue what pleases her, @@color:lightcoral;increasing her kinkiness.@@
<<set $slaves[$i].fetishStrength += 4>>
<</if>>
+ <</if>>
<</if>>
<<if $slaves[$i].fetishStrength > 5>>
<<if $slaves[$i].trust < -20>>
diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw
index 2a83f5d8468fc7a476bd3134ab160501b4391285..36f5252d9e8e91246c84859e09b479a837188718 100644
--- a/src/uncategorized/saPleaseYou.tw
+++ b/src/uncategorized/saPleaseYou.tw
@@ -792,7 +792,7 @@ Keeping $object as nothing but your personal
<</if>>
<<if ($slaves[$i].behavioralQuirk is "adores men")>>
<<if ($PC.dick == 1)>>
- $slaves[$i].slaveName @@color:hotpink;adores your company,@@ and is happy to spend time with you, even when you don't have your cock in $Object.
+ $slaves[$i].slaveName @@color:hotpink;adores your company,@@ and is happy to spend time with you, even when you don't have your cock in $object.
<<set $slaves[$i].devotion += 1>>
<</if>>
<<elseif ($slaves[$i].behavioralQuirk is "adores women")>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index e048863855760d28a3b8893ca593916ef6a9c3dc..7972c7eefe76a0a4d72bd2a48c1e91eab25ce182 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1000,16 +1000,27 @@ __Buttplug__: ''<span id="buttplug">$activeSlave.buttplug</span>.''
<<if $activeSlave.vagina >= 2>>| <<click "Huge and long dildo">><<set $activeSlave.vaginalAccessory to "long, huge dildo">><<replace "#vaginalAccessory">><<print $activeSlave.vaginalAccessory>><</replace>><</click>><</if>>
<</if>>
<</if>>
-| <<click "Chastity belt">><<set $activeSlave.vaginalAccessory to "chastity belt">><<replace "#vaginalAccessory">><<print $activeSlave.vaginalAccessory>><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</click>>
-| <<click "Anal chastity belt">><<set $activeSlave.vaginalAccessory to "anal chastity">><<replace "#vaginalAccessory">><<print $activeSlave.vaginalAccessory>><</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</click>>
-| <<click "Combined chastity belt">><<set $activeSlave.vaginalAccessory to "combined chastity">><<replace "#vaginalAccessory">><<print $activeSlave.vaginalAccessory>><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>>g<</click>>
+| <<click "Chastity belt">><<set $activeSlave.vaginalAccessory to "chastity belt",$activeSlave.choosesOwnChastity to 0>><<replace "#vaginalAccessory">><<print $activeSlave.vaginalAccessory>><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</click>>
+| <<click "Anal chastity belt">><<set $activeSlave.vaginalAccessory to "anal chastity",$activeSlave.choosesOwnChastity to 0>><<replace "#vaginalAccessory">><<print $activeSlave.vaginalAccessory>><</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</click>>
+| <<click "Combined chastity belt">><<set $activeSlave.vaginalAccessory to "combined chastity",$activeSlave.choosesOwnChastity to 0>><<replace "#vaginalAccessory">><<print $activeSlave.vaginalAccessory>><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>>g<</click>>
<</if>>
<<if $activeSlave.dick > 0>>
<<if $activeSlave.vagina is -1>>__Accessory__<<else>>__Dick accessory__<</if>>: ''<span id="dickAccessory">$activeSlave.dickAccessory</span>.''
<<click "None">><<set $activeSlave.dickAccessory to "none">><<replace "#dickAccessory">><<print $activeSlave.dickAccessory>><</replace>><</click>>
-| <<click "Chastity cage">><<set $activeSlave.dickAccessory to "chastity">><<replace "#dickAccessory">><<print $activeSlave.dickAccessory>><</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</click>>
-| <<click "Anal chastity belt">><<set $activeSlave.dickAccessory to "anal chastity">><<replace "#dickAccessory">><<print $activeSlave.dickAccessory>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</replace>><</click>>
-| <<click "Combined chastity belt">><<set $activeSlave.dickAccessory to "combined chastity">><<replace "#dickAccessory">><<print $activeSlave.dickAccessory>><</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</click>>
+| <<click "Chastity cage">><<set $activeSlave.dickAccessory to "chastity",$activeSlave.choosesOwnChastity to 0>><<replace "#dickAccessory">><<print $activeSlave.dickAccessory>><</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</click>>
+| <<click "Anal chastity belt">><<set $activeSlave.dickAccessory to "anal chastity",$activeSlave.choosesOwnChastity to 0>><<replace "#dickAccessory">><<print $activeSlave.dickAccessory>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</replace>><</click>>
+| <<click "Combined chastity belt">><<set $activeSlave.dickAccessory to "combined chastity",$activeSlave.choosesOwnChastity to 0>><<replace "#dickAccessory">><<print $activeSlave.dickAccessory>><</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</click>>
+<</if>>
+
+<<if $arcologies[0].FSRestart != "unset" && $activeSlave.devotion > 20 && $activeSlave.trust > 0 && $activeSlave.choosesOwnClothes == 1>>
+<br>
+ <<if $activeSlave.choosesOwnChastity == 1>>
+ She is allowed the privelage of choosing to wear chastity devices.
+ [[Forbidden|Slave Interact][$activeSlave.choosesOwnChastity = 0]]
+ <<else>>
+ You choose if she may avoid wearing chastity devices.
+ [[Permitted|Slave Interact][$activeSlave.choosesOwnChastity = 1]]
+ <</if>>
<</if>>
<</if>> /* CLOSES FUCKDOLL CHECK */
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 7e6a6ec3c707b2275a778609253200be71782b96..de9e9e307b0829d7c1df5341402f63e5fd77cfaa 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -648,15 +648,17 @@
<<set $activeSlave.boobs = Number($activeSlave.boobs)>>
<<set $activeSlave.boobs = Math.trunc($activeSlave.boobs/50)*50>>
<<set $slaveWithoutBonuses = $activeSlave>>
+ <<slaveCost $activeSlave>>
+ <<set $cash -= $slaveCost>>
<<goto "RG AS Dump">>
<</click>>
//This will apply your @@color:springgreen;career bonus@@ to her:
<<if $PC.career is "capitalist">>
one free level of @@color:cyan;prostitution skill.@@
<<elseif $PC.career is "mercenary">>
- @@color:mediumaquamarine;+2 trust.@@
+ @@color:mediumaquamarine;+10 trust.@@
<<elseif $PC.career is "slaver">>
- @@color:hotpink;+2 devotion.@@
+ @@color:hotpink;+10 devotion.@@
<<elseif $PC.career is "medicine">>
free @@color:lime;basic implants.@@
<<elseif $PC.career is "celebrity">>
@@ -666,7 +668,7 @@
<<elseif $PC.career is "escort">>
two free levels of @@color:cyan;sex skills@@, one free level of @@color:cyan;prostitution skill@@, and one free level of @@color:cyan;entertainment skill.@@
<<elseif $PC.career is "servant">>
- @@color:mediumaquamarine;+1 trust@@ and @@color:hotpink;+1 devotion.@@
+ @@color:mediumaquamarine;+5 trust@@ and @@color:hotpink;+5 devotion.@@
<<elseif $PC.career is "wealth">>
two free levels of @@color:cyan;sex skills.@@
<<else>>
@@ -686,6 +688,8 @@
<<set $activeSlave.boobs = Number($activeSlave.boobs)>>
<<set $activeSlave.boobs = Math.trunc($activeSlave.boobs/50)*50>>
<<set $slaveWithoutBonuses = $activeSlave>>
+ <<slaveCost $activeSlave>>
+ <<set $cash -= $slaveCost>>
<<goto "RG AS Dump">>
<</click>>
<<else>>
@@ -703,14 +707,17 @@
<<set $activeSlave.boobs = Number($activeSlave.boobs)>>
<<set $activeSlave.boobs = Math.trunc($activeSlave.boobs/50)*50>>
<<set $slaveWithoutBonuses = $activeSlave>>
+ <<slaveCost $activeSlave>>
+ <<set $cash -= $slaveCost>>
<<goto "RG AS Dump">>
<</click>>
<br>
<</if>>
<<else>>
- //You lack the necessary funds to add this slave.//
+ <br>//You lack the necessary funds to add this slave.//
<</if>>
-<br> [[Discard this slave and continue|Acquisition]]
+<br>
+[[Discard this slave and continue|Acquisition]]
<</replace>>
<</widget>>