Fixes, vanilla cleanup and RESS work.

slave variables documentation - Pregmod.txt

@@ -345,11 +345,10 @@ slave's assignment
 "work a glory hole"
 "work in the dairy"
 "get milked"
-"guard you"
 "please you"
 "stay confined"
-"guard you"
-"recruit girls"
+"guard you" - obsolete?
+"recruit girls" - obsolete?
 "be your Head Girl"
 "work as a servant"
 "serve in the master suite"
@@ -372,7 +371,6 @@ slave's assignment
 "work in the brothel"
 "be confined in the cellblock"
 "be your Recruiter"
-"stay confined"
 
 assignmentVisable:
 

src/npc/uploadSlave.tw

-:: Upload Slave
+:: Upload Slave [nobr]
 
-<<nobr>>
+<<set $nextButton = "Continue", $nextLink = "Slave Interact">>
 
-<<set $nextButton = "Continue">>
-<<set $nextLink = "Slave Interact">>
+//Copy and paste this block of stats to submit a slave for hardcoded inclusion. Unsupported in Pregmod - Use export slave instead//
 
-<</nobr>>\
-\
-//Copy and paste this block of stats to submit a slave for hardcoded inclusion.//
+<br><br>
 
-<<nobr>>
+VERSION $ver BUILD $releaseID<br><br>
+slaveName: "$activeSlave.slaveName",
+slaveSurname: "$activeSlave.slaveName",
+birthName: "$activeSlave.birthName",
+birthSurname: "$activeSlave.birthSurname",
+genes: "$activeSlave.genes",
+weekAcquired: 1,
+origin: <<if $activeSlave.origin == 0>>0<<else>>"$activeSlave.origin"<</if>>,
+career: <<if $activeSlave.career == 0>>0<<else>>"$activeSlave.career"<</if>>,
+ID: $activeSlave.ID,
+pornFame: $activeSlave.pornFame,
+pornFameSpending: $activeSlave.pornFameSpending,
+prestige: $activeSlave.prestige,
+prestigeDesc: "$activeSlave.prestigeDesc",
+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: $activeSlave.age,
+ageImplant: $activeSlave.ageImplant,
+health: $activeSlave.health,
+minorInjury: 0,
+trust: $activeSlave.trust,
+oldTrust: $activeSlave.trust,
+devotion: $activeSlave.devotion,
+oldDevotion: $activeSlave.devotion,
+weight: $activeSlave.weight,
+muscles: $activeSlave.muscles,
+height: $activeSlave.height,
+heightImplant: $activeSlave.heightImplant,
+nationality: "$activeSlave.nationality",
+race: "$activeSlave.race",
+markings: "none",
+eyes: "$activeSlave.eyes",
+eyeColor: "$activeSlave.eyeColor",
+eyewear: "none",
+hColor: "$activeSlave.hColor",
+pubicHColor: "$activeSlave.pubicHColor",
+skin: "$activeSlave.skin",
+hLength: $activeSlave.hLength,
+hStyle: "$activeSlave.hStyle",
+pubicHStyle: "$activeSlave.pubicHStyle",
+waist: $activeSlave.waist,
+corsetPiercing: 0,
+amp: $activeSlave.amp,
+heels: $activeSlave.heels,
+voice: $activeSlave.voice,
+voiceImplant: $activeSlave.voiceImplant,
+accent: $activeSlave.accent,
+shoulders: $activeSlave.shoulders,
+shouldersImplant: $activeSlave.shouldersImplant,
+boobs: $activeSlave.boobs,
+boobsImplant: $activeSlave.boobsImplant,
+boobsImplantType: $activeSlave.boobsImplantType,
+boobShape: "normal",
+nipples: "$activeSlave.nipples",
+nipplesPiercing: $activeSlave.nipplesPiercing,
+areolae: $activeSlave.areolae,
+areolaePiercing: $activeSlave.areolaePiercing,
+boobsTat: "$activeSlave.boobsTat",
+lactation: $activeSlave.lactation,
+lactationAdaptation: 0,
+milk: 0,
+cum: 0,
+hips: $activeSlave.hips,
+hipsImplant: $activeSlave.hipsImplant,
+butt: $activeSlave.butt,
+buttImplant: $activeSlave.buttImplant,
+buttImplantType: $activeSlave.buttImplantType,
+buttTat: "$activeSlave.buttTat",
+face: $activeSlave.face,
+faceImplant: $activeSlave.faceImplant,
+faceShape: "normal",
+lips: $activeSlave.lips,
+lipsImplant: $activeSlave.lipsImplant,
+lipsPiercing: $activeSlave.lipsPiercing,
+lipsTat: "$activeSlave.lipsTat",
+teeth: "$activeSlave.teeth",
+tonguePiercing: $activeSlave.tonguePiercing,
+vagina: $activeSlave.vagina,
+vaginaLube: $activeSlave.vaginaLube,
+vaginaPiercing: $activeSlave.vaginaPiercing,
+vaginaTat: "$activeSlave.vaginaTat",
+preg: $activeSlave.preg,
+pregSource: 0,
+pregType: 0,
+labor: 0,
+births: $activeSlave.births,
+cSec: 0,
+bellyAccessory: "none",
+labia: $activeSlave.labia,
+clit: $activeSlave.clit,
+clitPiercing: $activeSlave.clitPiercing,
+clitSetting: "$activeSlave.clitSetting",
+foreskin: 0,
+anus: $activeSlave.anus,
+dick: $activeSlave.dick,
+analArea: 1,
+dickPiercing: $activeSlave.dickPiercing,
+dickTat: "$activeSlave.dickTat",
+balls: $activeSlave.balls,
+scrotum: 0,
+ovaries: $activeSlave.ovaries,
+anusPiercing: $activeSlave.anusPiercing,
+anusTat: "$activeSlave.anusTat",
+makeup: $activeSlave.makeup,
+nails: $activeSlave.nails,
+brand: <<if $activeSlave.brand == 0>>0<<else>>"$activeSlave.brand "<</if>>,
+brandLocation: <<if $activeSlave.brandLocation == 0>>0<<else>>"$activeSlave.brandLocation"<</if>>,
+earPiercing: $activeSlave.earPiercing,
+nosePiercing: $activeSlave.nosePiercing,
+eyebrowPiercing: $activeSlave.eyebrowPiercing,
+navelPiercing: $activeSlave.navelPiercing,
+shouldersTat: "$activeSlave.shouldersTat",
+armsTat: "$activeSlave.armsTat",
+legsTat: "$activeSlave.legsTat",
+backTat: "$activeSlave.backTat",
+stampTat: "$activeSlave.stampTat",
+vaginalSkill: $activeSlave.vaginalSkill,
+oralSkill: $activeSlave.oralSkill,
+analSkill: $activeSlave.analSkill,
+whoreSkill: $activeSlave.whoreSkill,
+entertainSkill: $activeSlave.entertainSkill,
+combatSkill: $activeSlave.combatSkill,
+livingRules: "$activeSlave.livingRules",
+speechRules: "$activeSlave.speechRules",
+releaseRules: "$activeSlave.releaseRules",
+relationshipRules: "$activeSlave.relationshipRules",
+standardPunishment: "situational",
+standardReward: "situational",
+useRulesAssistant: 1,
+diet: "$activeSlave.diet",
+dietCum: $activeSlave.dietCum,
+dietMilk: $activeSlave.dietMilk,
+tired: 0,
+hormones: 0,
+drugs: "$activeSlave.drugs",
+curatives: 0,
+chem: 0,
+aphrodisiacs: 0,
+addict: $activeSlave.addict,
+fuckdoll: 0,
+choosesOwnClothes: 0,
+clothes: "$activeSlave.clothes",
+collar: "$activeSlave.collar",
+shoes: "$activeSlave.shoes",
+vaginalAccessory: "none",
+dickAccessory: "none",
+buttplug: "none",
+intelligence: $activeSlave.intelligence,
+intelligenceImplant: $activeSlave.intelligenceImplant,
+energy: $activeSlave.energy,
+need: 0,
+attrXX: $activeSlave.attrXX,
+attrXY: $activeSlave.attrXY,
+attrKnown: $activeSlave.attrKnown,
+fetish: "$activeSlave.fetish",
+fetishStrength: $activeSlave.fetishStrength,
+fetishKnown: $activeSlave.fetishKnown,
+behavioralFlaw: "$activeSlave.behavioralFlaw",
+behavioralQuirk: "none",
+sexualFlaw: "$activeSlave.sexualFlaw",
+sexualQuirk: "none",
+oralCount: 0,
+vaginalCount: 0,
+analCount: 0,
+mammaryCount: 0,
+penetrativeCount: 0,
+pitKills: 0,
+customTat: "$activeSlave.customTat",
+customLabel: "",
+customDesc: "$activeSlave.customDesc",
+customImage: 0,
+currentRules: $activeSlave.currentRules
 
-VERSION $ver BUILD $releaseID<br>
-slaveName: "$activeSlave.slaveName", slaveSurname: "$activeSlave.slaveName", birthName: "$activeSlave.birthName", birthSurname: "$activeSlave.birthSurname", genes: "$activeSlave.genes", weekAcquired: 1, origin: <<if $activeSlave.origin == 0>>0<<else>>"$activeSlave.origin"<</if>>, career: <<if $activeSlave.career == 0>>0<<else>>"$activeSlave.career"<</if>>, ID: $activeSlave.ID, pornFame: $activeSlave.pornFame, pornFameSpending: $activeSlave.pornFameSpending, prestige: $activeSlave.prestige, prestigeDesc: "$activeSlave.prestigeDesc", 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: $activeSlave.age, ageImplant: $activeSlave.ageImplant, health: $activeSlave.health, minorInjury: 0, trust: $activeSlave.trust, oldTrust: $activeSlave.trust, devotion: $activeSlave.devotion, oldDevotion: $activeSlave.devotion, weight: $activeSlave.weight, muscles: $activeSlave.muscles, height: $activeSlave.height, heightImplant: $activeSlave.heightImplant, nationality: "$activeSlave.nationality", race: "$activeSlave.race", markings: "none", eyes: 1, eyeColor: "$activeSlave.eyeColor", eyewear: "none", hColor: "$activeSlave.hColor", pubicHColor: "$activeSlave.pubicHColor", skin: "$activeSlave.skin", hLength: $activeSlave.hLength, hStyle: "$activeSlave.hStyle", pubicHStyle: "$activeSlave.pubicHStyle", waist: $activeSlave.waist, corsetPiercing: 0, amp: $activeSlave.amp, heels: $activeSlave.heels, voice: $activeSlave.voice, voiceImplant: $activeSlave.voiceImplant, accent: $activeSlave.accent, shoulders: $activeSlave.shoulders, shouldersImplant: $activeSlave.shouldersImplant, boobs: $activeSlave.boobs, boobsImplant: $activeSlave.boobsImplant, boobsImplantType: $activeSlave.boobsImplantType, boobShape: "normal", nipples: "$activeSlave.nipples",  nipplesPiercing: $activeSlave.nipplesPiercing, areolae: $activeSlave.areolae, areolaePiercing: $activeSlave.areolaePiercing, boobsTat: "$activeSlave.boobsTat", lactation: $activeSlave.lactation, lactationAdaptation: 0, milk: 0, cum: 0, hips: $activeSlave.hips, hipsImplant: $activeSlave.hipsImplant, butt: $activeSlave.butt, buttImplant: $activeSlave.buttImplant, buttImplantType: $activeSlave.buttImplantType, buttTat: "$activeSlave.buttTat", face: $activeSlave.face, faceImplant: $activeSlave.faceImplant, faceShape: "normal", lips: $activeSlave.lips, lipsImplant: $activeSlave.lipsImplant, lipsPiercing: $activeSlave.lipsPiercing, lipsTat: "$activeSlave.lipsTat", teeth: "$activeSlave.teeth", tonguePiercing: $activeSlave.tonguePiercing, vagina: $activeSlave.vagina, vaginaLube: $activeSlave.vaginaLube, vaginaPiercing: $activeSlave.vaginaPiercing, vaginaTat: "$activeSlave.vaginaTat", preg: $activeSlave.preg, pregSource: 0, pregType: 0, labor: 0, births: $activeSlave.births, cSec: 0, bellyAccessory: "none", labia: $activeSlave.labia, clit: $activeSlave.clit, clitPiercing: $activeSlave.clitPiercing, clitSetting: "$activeSlave.clitSetting", foreskin: 0, anus: $activeSlave.anus, dick: $activeSlave.dick, analArea: 1, dickPiercing: $activeSlave.dickPiercing, dickTat: "$activeSlave.dickTat", balls: $activeSlave.balls, scrotum: 0, ovaries: $activeSlave.ovaries, anusPiercing: $activeSlave.anusPiercing, anusTat: "$activeSlave.anusTat", makeup: $activeSlave.makeup, nails: $activeSlave.nails, brand: <<if $activeSlave.brand == 0>>0<<else>>"$activeSlave.brand "<</if>>, brandLocation: <<if $activeSlave.brandLocation == 0>>0<<else>>"$activeSlave.brandLocation"<</if>>, earPiercing: $activeSlave.earPiercing, nosePiercing: $activeSlave.nosePiercing, eyebrowPiercing: $activeSlave.eyebrowPiercing, navelPiercing: $activeSlave.navelPiercing, shouldersTat: "$activeSlave.shouldersTat", armsTat: "$activeSlave.armsTat", legsTat: "$activeSlave.legsTat", backTat: "$activeSlave.backTat", stampTat: "$activeSlave.stampTat", vaginalSkill: $activeSlave.vaginalSkill, oralSkill: $activeSlave.oralSkill, analSkill: $activeSlave.analSkill, whoreSkill: $activeSlave.whoreSkill, entertainSkill: $activeSlave.entertainSkill, combatSkill: $activeSlave.combatSkill, livingRules: "$activeSlave.livingRules", speechRules: "$activeSlave.speechRules", releaseRules: "$activeSlave.releaseRules", relationshipRules: "$activeSlave.relationshipRules", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "$activeSlave.diet", dietCum: $activeSlave.dietCum, dietMilk: $activeSlave.dietMilk, tired: 0, hormones: 0, drugs: "$activeSlave.drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: $activeSlave.addict, fuckdoll: 0, choosesOwnClothes: 0, clothes: "$activeSlave.clothes", collar: "$activeSlave.collar", shoes: "$activeSlave.shoes", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: $activeSlave.intelligence,  intelligenceImplant: $activeSlave.intelligenceImplant, energy: $activeSlave.energy, need: 0, attrXX: $activeSlave.attrXX, attrXY: $activeSlave.attrXY, attrKnown: $activeSlave.attrKnown, fetish: "$activeSlave.fetish", fetishStrength: $activeSlave.fetishStrength, fetishKnown: $activeSlave.fetishKnown, behavioralFlaw: "$activeSlave.behavioralFlaw", behavioralQuirk: "none", sexualFlaw: "$activeSlave.sexualFlaw", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, pitKills: 0, customTat: "$activeSlave.customTat", customLabel: "", customDesc: "$activeSlave.customDesc", customImage: 0, currentRules: $activeSlave.currentRules
-
-<</nobr>>

src/uncategorized/randomIndividualEvent.tw

@@ -1344,7 +1344,7 @@
 
 <<if ($eventSlave.entertainSkill >= 100)>>
 <<if ($eventSlave.trust > 50)>>
-<<if ($eventSlave.assignment == "serve the public")>>
+<<if ["serve the public", "serve in the club"].includes($eventSlave.assignment)>>
 	<<set $RESSevent.push("masterful entertainer")>>
 <</if>>
 <</if>>

src/uncategorized/remoteSurgery.tw

@@ -169,7 +169,7 @@ $pronounCap has
 <</if>>
 <<if $activeSlave.lipsImplant == 0>>
 <<elseif $activeSlave.lipsImplant <= 10>>
-	$pronounCap has normal lip implants.
+	$pronounCap has moderate lip implants.
 <<elseif $activeSlave.lipsImplant <= 20>>
 	$pronounCap has large lip implants.
 <<else>>
@@ -304,7 +304,7 @@ Work on her chest:
 	<<elseif $activeSlave.boobsImplant > 400>>
 		$pronounCap has large, <<print $activeSlave.boobsImplant>>cc breast implants.
 	<<elseif $activeSlave.boobsImplant > 200>>
-		$pronounCap has normal, <<print $activeSlave.boobsImplant>>cc breast implants.
+		$pronounCap has moderate, <<print $activeSlave.boobsImplant>>cc breast implants.
 	<<elseif $activeSlave.boobsImplant > 0>>
 		$pronounCap has small, <<print $activeSlave.boobsImplant>>cc breast implants.
 	<</if>>
@@ -595,7 +595,7 @@ $pronounCap's got a
 
 <<if $activeSlave.buttImplant == 0>>
 <<elseif $activeSlave.buttImplant == 1>>
-	$pronounCap has normal butt implants.
+	$pronounCap has moderate butt implants.
 <<elseif $activeSlave.buttImplant > 1>>
 	$pronounCap has enormous butt implants.
 <</if>>