diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 2eb39ccd93200d2cfb7a55ad2c5481ab251d87ef..4841228205837417ec6111f586f2730f943f84e9 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4843,4 +4843,11 @@ Pregmod 0.10.3.0
191
-SFanon's fixes
- -Crimeanon's fixes
\ No newline at end of file
+ -Crimeanon's fixes
+
+ 12/08/17
+
+ 192
+ -anon's leadership slave skills
+ -fixes
+
\ No newline at end of file
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 5013a077ecc987098e76ec2d51da04a5ef4999ea..de9b0fc1e7a250b1822bbb3dee3a4661744f7e06 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -2547,11 +2547,76 @@ Used to tell if the slave is from this game or a previous.
0 - no
1 - yes
+skillHG:
+
+Her skill as a head girl
+accpts int
+default cap is 200
+
+skillRC:
+
+Her skill as a recruiter
+accpts int
+default cap is 200
+
+skillBG:
+
+Her skill as a bodyguard
+accpts int
+default cap is 200
+
+skillMD:
+
+Her skill as a brothel madam
+accpts int
+default cap is 200
+
+skillDJ:
+
+Her skill as a DJ
+accpts int
+default cap is 200
+
+skillNU:
+
+Her skill as a nurse
+accpts int
+default cap is 200
+
+skillTE:
+
+Her skill as a teacher
+accpts int
+default cap is 200
+skillAT:
+
+Her skill as an attendant
+accpts int
+default cap is 200
+
+skillST:
+
+Her skill as a stewardess
+accpts int
+default cap is 200
+
+skillMM:
+
+Her skill as a milk maid
+accpts int
+default cap is 200
+
+skillWA:
+Her skill as a wardeness
+accpts int
+default cap is 200
+
+
How to set up your own hero slave.
-The default slave template used:
- <<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", 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, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 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, ovaryAge: 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", origEye: "brown", eyewear: "none", origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 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, prostate: 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", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, 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: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, underArmHStyle: "waxed", bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0}>>
+<<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", 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, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 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, ovaryAge: 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", origEye: "brown", eyewear: "none", origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 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, prostate: 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", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, 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: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, underArmHStyle: "waxed", bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0, skillHG: 0, skillRC: 0, skillBG: 0, skillMD: 0, skillDJ: 0, skillNU: 0, skillTE: 0, skillAT: 0, skillST: 0, skillMM: 0, skillWA: 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/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index bbe5ae25bd58f0febb6e0803b756559951a10b65..f6b8f8f121966609df9860541538c5d2e589b8e8 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -78,12 +78,11 @@
<<if setup.madamCareers.includes($Madam.career)>>
She has experience from her life before she was a slave that helps her in the seedy business of selling other people's bodies for sex.
<<set $madamCashBonus += 0.05>>
+ <<elseif $Madam.skillMD >= $masteredXP>>
+ She has experience from working for you that helps her in the seedy business of selling other people's bodies for sex.
+ <<set $madamCashBonus += 0.05>>
<<else>>
- <<if $slaves[_FLs].skillMD >= $masteredXP>>
- She has experience from working for you that helps her in the seedy business of selling other people's bodies for sex.
- <<set $madamCashBonus += 0.05>>
- <</if>>
- <<set $slaves[_FLs].skillMD += random(1,($slaves[_FLs].intelligence+4)*2)>>
+ <<set $slaves[_FLs].skillMD += random(1,($Madam.intelligence+4)*2)>>
<</if>>
<<if ($Madam.intelligence > 0)>>
She is a clever manager.
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 15a633c96abf2cad4a81c885201f3aa8625d45d3..87e0d10f6928b7750b7716a332d021032f21a9c6 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -57,12 +57,11 @@
<<if setup.wardenessCareers.includes($Wardeness.career)>>
<<set _devBonus++, _trustMalus++, _idleBonus++>>
She has experience with detecting security issues and grinding down potential miscreants from her life before she was a slave, making her more effective.
+ <<elseif $Wardeness.skillWA >= $masteredXP>>
+ <<set _devBonus++, _trustMalus++, _idleBonus++>>
+ She has experience with detecting security issues and grinding down potential miscreants from working for you, making her more effective.
<<else>>
- <<if $slaves[_FLs].skillWA >= $masteredXP>>
- <<set _devBonus++, _trustMalus++, _idleBonus++>>
- She has experience with detecting security issues and grinding down potential miscreants from working for you, making her more effective.
- <</if>>
- <<set $slaves[_FLs].skillWA += random(1,($slaves[_FLs].intelligence+4)*2)>>
+ <<set $slaves[_FLs].skillWA += random(1,($Wardeness.intelligence+4)*2)>>
<</if>>
<<if $Wardeness.fetish == "sadist">>
She uses the prisoners to gratify her sadism, terrifying them and quickly breaking their resistance.
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index 69248ac7f45354e3b139720fcbddc282f002853d..f88449de2427a26af3f5560743bf28b272a97216 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -48,12 +48,11 @@
<<if setup.nurseCareers.includes($Nurse.career)>>
She has experience with medicine from her life before she was a slave, and can often recognize conditions before even the medical scanners can.
<<set _idleBonus++, _healthBonus++>>
+ <<elseif $Nurse.skillNU >= $masteredXP>>
+ She has experience with medicine from working for you, and can often recognize conditions before even the medical scanners can.
+ <<set _idleBonus++, _healthBonus++>>
<<else>>
- <<if $slaves[_FLs].skillNU >= $masteredXP>>
- She has experience with medicine from working for you, and can often recognize conditions before even the medical scanners can.
- <<set _idleBonus++, _healthBonus++>>
- <</if>>
- <<set $slaves[_FLs].skillNU += random(1,($slaves[_FLs].intelligence+4)*2)>>
+ <<set $slaves[_FLs].skillNU += random(1,($Nurse.intelligence+4)*2)>>
<</if>>
<<if ($Nurse.fetish == "dom")>>
She raps out commands with the confidence of long and partly sexual experience, so patients are inclined to follow even unpleasant medical instructions.
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 549f45b1d0e01c4d8ac3dcf25a33167c6ad88bcb..2276e6420353f93958ad2c699f2cca1138079177 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -87,12 +87,11 @@
<<if setup.DJCareers.includes($DJ.career)>>
She has musical experience from her life before she was a slave, a grounding that gives her tracks actual depth.
<<set $DJRepBonus += 0.05>>
+ <<elseif $DJ.skillDJ >= $masteredXP>>
+ She has musical experience from working for you, giving her tracks actual depth.
+ <<set $DJRepBonus += 0.05>>
<<else>>
- <<if $slaves[_FLs].skillDJ >= $masteredXP>>
- She has musical experience from working for you, giving her tracks actual depth.
- <<set $DJRepBonus += 0.05>>
- <</if>>
- <<set $slaves[_FLs].skillDJ += random(1,($slaves[_FLs].intelligence+4)*2)>>
+ <<set $slaves[_FLs].skillDJ += random(1,($DJ.intelligence+4)*2)>>
<</if>>
<<if (_DL < 10)>>
<<set $slavesGettingHelp = 0>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index db4925d04f4a6978960d2e4e07837d7981fa625f..4316cdacac2256715953f68082ea47bcff71f98d 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -154,12 +154,11 @@
<<if setup.milkmaidCareers.includes($Milkmaid.career)>>
<<set $milkmaidHealthBonus++>>
She has career experience dealing with milk animals.
+ <<elseif $Milkmaid.skillMM >= $masteredXP>>
+ <<set $milkmaidHealthBonus++>>
+ She has experience dealing with milk animals from working for you.
<<else>>
- <<if $slaves[_FLs].skillMM >= $masteredXP>>
- <<set $milkmaidHealthBonus++>>
- She has experience dealing with milk animals from working for you.
- <</if>>
- <<set $slaves[_FLs].skillMM += random(1,($slaves[_FLs].intelligence+4)*2)>>
+ <<set $slaves[_FLs].skillMM += random(1,($Milkmaid.intelligence+4)*2)>>
<</if>>
<<if ($dairyStimulatorsSetting < 2) && ($Milkmaid.dick > 4) && (canPenetrate($Milkmaid))>>
<<for _dI = 0; _dI < _DL; _dI++>>
diff --git a/src/uncategorized/hgApplication.tw b/src/uncategorized/hgApplication.tw
index 7ee2287916a1a240b2041d67e9a99efc831e7e07..e231437fa678622897805737877d741c2bca1bf8 100644
--- a/src/uncategorized/hgApplication.tw
+++ b/src/uncategorized/hgApplication.tw
@@ -49,11 +49,9 @@ She helps $activeSlave.slaveName however she can. The tender care has @@.green;i
<<elseif setup.HGCareers.includes($HeadGirl.career)>>
She was used to giving commands and being obeyed in her life before she was a slave, experience she can call on now.
<<set _effectiveness += 5>>
-<<else>>
- <<if $HeadGirl.skillHG >= $masteredXP>>
- She is used to giving commands and being obeyed because of her experience being your Head Girl, making her more effective.
- <<set _effectiveness += 5>>
- <</if>>
+<<elseif $HeadGirl.skillHG >= $masteredXP>>
+ She is used to giving commands and being obeyed because of her experience being your Head Girl, making her more effective.
+ <<set _effectiveness += 5>>
<</if>>
<<if $HeadGirl.actualAge > 30>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 56489da0e7ea14bb836f1b91ddfd399570165551..49df2be6b1a4d132dc08aaeb4eef479068d6228f 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1258,6 +1258,57 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower
<</if>>
<</if>>
+<<set _careers = []>>
+<<if ($activeSlave.skillHG >= $masteredXP)>>
+ <<set _careers.push("Head Girl")>>
+<</if>>
+<<if ($activeSlave.skillRC >= $masteredXP)>>
+ <<set _careers.push("Recruiter")>>
+<</if>>
+<<if ($activeSlave.skillBG >= $masteredXP)>>
+ <<set _careers.push("Bodyguard")>>
+<</if>>
+<<if ($activeSlave.skillMD >= $masteredXP)>>
+ <<set _careers.push("Madam")>>
+<</if>>
+<<if ($activeSlave.skillDJ >= $masteredXP)>>
+ <<set _careers.push("DJ")>>
+<</if>>
+<<if ($activeSlave.skillNU >= $masteredXP)>>
+ <<set _careers.push("Nurse")>>
+<</if>>
+<<if ($activeSlave.skillTE >= $masteredXP)>>
+ <<set _careers.push("Schoolteacher")>>
+<</if>>
+<<if ($activeSlave.skillAT >= $masteredXP)>>
+ <<set _careers.push("Attendant")>>
+<</if>>
+<<if ($activeSlave.skillST >= $masteredXP)>>
+ <<set _careers.push("Stewardess")>>
+<</if>>
+<<if ($activeSlave.skillMM >= $masteredXP)>>
+ <<set _careers.push("Milkmaid")>>
+<</if>>
+<<if ($activeSlave.skillWA >= $masteredXP)>>
+ <<set _careers.push("Wardeness")>>
+<</if>>
+<<if _careers.length > 0>>
+ She has working experience as a
+ <<if _careers.length > 2>>
+ <<for _j = 0; _j < _careers.length; _j++>>
+ <<if _j < _careers.length-1>>
+ <<print _careers[_j]>>,
+ <<else>>
+ and <<print _careers[_j]>>.
+ <</if>>
+ <</for>>
+ <<elseif _careers.length > 1>>
+ _careers[1] and <<print _careers[0]>>.
+ <<else>>
+ <<print _careers[0]>>.
+ <</if>>
+<</if>>
+/* old
<<set _numCareers = 0>>
<<if ($activeSlave.skillHG >= $masteredXP)>>
<<set _numCareers += 1>>
@@ -1396,6 +1447,7 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower
Wardeness.
<</if>>
<</if>>
+*/
<<if $activeSlave.prestige > 0>>
<<if $activeSlave.prestigeDesc>>$activeSlave.prestigeDesc<</if>>
diff --git a/src/uncategorized/saBeYourHeadGirl.tw b/src/uncategorized/saBeYourHeadGirl.tw
index 8aa7fd3d694589459b6ca41de96222c072f1d9a4..3d72a94e0321ff0d2fcd4f39352c8a50c324b0a6 100644
--- a/src/uncategorized/saBeYourHeadGirl.tw
+++ b/src/uncategorized/saBeYourHeadGirl.tw
@@ -170,6 +170,6 @@
<</if>>
<</if>>
-<<if !setup.HGCareers.includes($slaves[$i].career)>>
+<<if !setup.HGCareers.includes($slaves[$i].career) && $slaves[$i].skillWA < $masteredXP>>
<<set $slaves[$i].skillHG += random(1,($slaves[$i].intelligence+4)*2)>>
<</if>>
diff --git a/src/uncategorized/saGuardsYou.tw b/src/uncategorized/saGuardsYou.tw
index 8bafe6f726044443f15b41a48693c1f2b1bd6317..2192452015b9725395f7c7218c55407154b5fde3 100644
--- a/src/uncategorized/saGuardsYou.tw
+++ b/src/uncategorized/saGuardsYou.tw
@@ -8,12 +8,11 @@ carries arms in your defense.
Her combat skills greatly increase her deadliness.
<</if>>
-<<if setup.bodyguardCareers.includes($Bodyguard.career)>>
+<<if setup.bodyguardCareers.includes($slaves[$i].career)>>
She has experience in personal defense from before she was a slave.
+<<elseif $slaves[$i].skillBG >= $masteredXP>>
+ She has experience in personal defense from working for you.
<<else>>
- <<if $slaves[$i].skillBG >= $masteredXP>>
- She has experience in personal defense from working for you.
- <</if>>
<<set $slaves[$i].skillBG += random(1,($slaves[$i].intelligence+4)*2)>>
<</if>>
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index 613f2e0862be0e6519b949a1e1b70df48ca784f8..adbb86393f427921749c9f6d07ac64fb13b6b9ed 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -264,11 +264,10 @@ uses your online resources and some @@.yellowgreen;modest funds@@ to convince $r
<<if setup.recruiterCareers.includes($slaves[$i].career)>>
She has experience in recruitment from before she was a slave.
<<set $recruiterProgress += 2>>
+<<elseif $slaves[$i].skillRC >= $masteredXP>>
+ She has experience in recruitment from working for you.
+ <<set $recruiterProgress += 2>>
<<else>>
- <<if $slaves[$i].skillRC >= $masteredXP>>
- She has experience in recruitment from working for you.
- <<set $recruiterProgress += 2>>
- <</if>>
<<set $slaves[$i].skillRC += random(1,($slaves[$i].intelligence+4)*2)>>
<</if>>
diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw
index 7b0974296a22eb851e6c58abc0e6df3d86f27bc7..873217a9d97f8b31aed1d901959052556aaf3690 100644
--- a/src/uncategorized/scheduledEvent.tw
+++ b/src/uncategorized/scheduledEvent.tw
@@ -194,7 +194,7 @@
<<else>>
<<if $plot == 1>><<goto "Nonrandom Event">><<else>><<goto "Random Nonindividual Event">><</if>>
<</if>>
-<<elseif (Math.trunc($week/24) == ($week/24)) && $LieutenantColonel != 0 && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance >= 1>>>
+<<elseif (Math.trunc($week/24) == ($week/24)) && $LieutenantColonel != 0 && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance >= 1>>
<<goto "securityForceTradeShow">>
<<elseif $plot == 1>>
<<goto "Nonrandom Event">>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index 75b9dc59c136f8a32672d15503bbb2d24b62759e..175abab01b837aba98bf32483e20c331eff72a90 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -49,11 +49,10 @@
<</if>>
<<if setup.schoolteacherCareers.includes($Schoolteacher.career)>>
She has experience with students and learning from her life before she was a slave, making her more effective.
+ <<elseif $Schoolteacher.skillTE >= $masteredXP>>
+ She has experience with students and learning from working for you, making her more effective.
<<else>>
- <<if $slaves[_FLs].skillTE >= $masteredXP>>
- She has experience with students and learning from working for you, making her more effective.
- <</if>>
- <<set $slaves[_FLs].skillTE += random(1,($slaves[_FLs].intelligence+4)*2)>>
+ <<set $slaves[_FLs].skillTE += random(1,($Schoolteacher.intelligence+4)*2)>>
<</if>>
<<if ($Schoolteacher.visualAge > 35)>>
Her age earns her the respect of her students.
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index fd54d7809a8e7b75e29d4e3ea5c172911c1a40a5..ae593f21c1b292407a62760ba99729ceb102a41d 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -83,12 +83,11 @@
<<if setup.stewardessCareers.includes($Stewardess.career)>>
<<set $stewardessBonus += 25>>
She has applicable experience with daily sums and organizational trifles from her life before she was a slave.
+ <<elseif $Stewardess.skillST >= $masteredXP>>
+ <<set $stewardessBonus += 25>>
+ She has applicable experience with daily sums and organizational trifles from working for you.
<<else>>
- <<if $slaves[_FLs].skillST >= $masteredXP>>
- <<set $stewardessBonus += 25>>
- She has applicable experience with daily sums and organizational trifles from working for you.
- <</if>>
- <<set $slaves[_FLs].skillST += random(1,($slaves[_FLs].intelligence+4)*2)>>
+ <<set $slaves[_FLs].skillST += random(1,($Stewardess.intelligence+4)*2)>>
<</if>>
<<if ($Stewardess.actualAge > 35)>>
<<set $stewardessBonus += 25>>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 50c844255858831c647f44690e36cb72d91c0903..64f110739571ee2f55723bef10d725ec681e36d0 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -47,12 +47,11 @@
<<if setup.attendantCareers.includes($Attendant.career)>>
She has experience with counseling from her life before she was a slave, making her better at building a rapport with troubled slaves, and giving her a better chance of softening flaws into beneficial quirks.
<<set _bonusToggle = 1, _idleBonus++>>
+ <<elseif $Attendant.skillAT >= $masteredXP>>
+ She has experience with counseling from working for you, making her better at building a rapport with troubled slaves, and giving her a better chance of softening flaws into beneficial quirks.
+ <<set _bonusToggle = 1, _idleBonus++>>
<<else>>
- <<if $slaves[_FLs].skillAT >= $masteredXP>>
- She has experience with counseling from working for you, making her better at building a rapport with troubled slaves, and giving her a better chance of softening flaws into beneficial quirks.
- <<set _bonusToggle = 1, _idleBonus++>>
- <</if>>
- <<set $slaves[_FLs].skillAT += random(1,($slaves[_FLs].intelligence+4)*2)>>
+ <<set $slaves[_FLs].skillAT += random(1,($Attendant.intelligence+4)*2)>>
<</if>>
<<if ($Attendant.eyes == -2)>>
Her blindness allows her to deeply connect with her girls.
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index ccde97abca85e3f601134bdd362e246e9d653e8d..543c4f36db6d6f2fc245f857cb4fce1ca7aaaba5 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -1429,10 +1429,8 @@
<<if setup.bodyguardCareers.includes($Bodyguard.career)>>
<<set $deadliness += 1>>
-<<else>>
- <<if $Bodyguard.skillBG >= $masteredXP>>
- <<set $deadliness += 1>>
- <</if>>
+<<elseif $Bodyguard.skillBG >= $masteredXP>>
+ <<set $deadliness += 1>>
<</if>>
<<if ($args[0].muscles > 30) && ($args[0].muscles <= 95)>>