diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 702d1d9322e8ff4e6a91b13e02546e8f402e37da..45fa7048a683eb76a4ae9a0946f43df7bc75459e 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -1050,8 +1050,7 @@ App.Data.resetOnNGPlus = {
Farmer: 0,
StewardessID: 0,
stewardessImpregnates: 0,
- /** @type {FC.SlaveStateOrZero} */
- Schoolteacher: 0,
+ SchoolteacherID: 0,
AttendantID: 0,
/** @type {FC.SlaveStateOrZero} */
Matron: 0,
diff --git a/src/004-base/specialSlavesProxy.js b/src/004-base/specialSlavesProxy.js
index 07e27ee0402c44331dcb78e62ec9f5e5a8860bf1..66590bac3c99d032c44f63f35da26f9fe4d5f457 100644
--- a/src/004-base/specialSlavesProxy.js
+++ b/src/004-base/specialSlavesProxy.js
@@ -39,7 +39,7 @@ App.SpecialSlavesProxy = class SpecialSlavesProxy {
return V.Recruiter;
}
get Schoolteacher() {
- return V.Schoolteacher;
+ return slaveStateById(V.SchoolteacherID);
}
get Stewardess() {
return slaveStateById(V.StewardessID);
diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index dc624ea183f2e307e7e86eadab8890c6924a7cfc..399e8cf103de77ebcbf4ef025ee9159599f7f744 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -1679,7 +1679,7 @@ globalThis.FacilityDatatypeCleanup = (function() {
V.schoolroomUpgradeLanguage = Math.clamp(+V.schoolroomUpgradeLanguage, 0, 1) || 0;
V.schoolroomUpgradeRemedial = Math.clamp(+V.schoolroomUpgradeRemedial, 0, 1) || 0;
/* schoolteacher */
- V.Schoolteacher = V.slaves.find(s => s.assignment === Job.TEACHER) || 0;
+ V.SchoolteacherID = findSlaveId(s => s.assignment === Job.TEACHER);
}
function SpaDatatypeCleanup() {
diff --git a/src/endWeek/endWeek.js b/src/endWeek/endWeek.js
index acc627aa47c6c993795822c93ea7a86df736ef95..947c7653719c91a36cb958f8906a0cb67a4b6334 100644
--- a/src/endWeek/endWeek.js
+++ b/src/endWeek/endWeek.js
@@ -297,7 +297,6 @@ globalThis.endWeek = (function() {
V.DJRepBonus = 0;
V.Milkmaid = 0;
V.Farmer = 0;
- V.Schoolteacher = 0;
V.Wardeness = 0;
V.Concubine = 0;
V.Matron = 0;
diff --git a/src/endWeek/saTakeClasses.js b/src/endWeek/saTakeClasses.js
index 8bb6fd4d6f84ee6d1eb2ccb3adb5241971029a32..c4a0a172f42e98a1de149b6e10a7bbc995b03cc4 100644
--- a/src/endWeek/saTakeClasses.js
+++ b/src/endWeek/saTakeClasses.js
@@ -57,24 +57,24 @@ App.SlaveAssignment.takeClasses = (function() {
if (V.schoolroomUpgradeSkills + V.schoolroomUpgradeRemedial + V.schoolroomUpgradeLanguage !== 0) {
r += `, using ${V.schoolroomName}'s improved educational materials,`;
}
- if (slave.assignment === Job.SCHOOL && V.Schoolteacher !== 0) {
- const schoolteacherPronouns = getPronouns(V.Schoolteacher);
- teaching = (V.Schoolteacher.intelligence + V.Schoolteacher.intelligenceImplant);
- if (V.Schoolteacher.visualAge > 35) {
+ if (slave.assignment === Job.SCHOOL && S.Schoolteacher) {
+ const schoolteacherPronouns = getPronouns(S.Schoolteacher);
+ teaching = (S.Schoolteacher.intelligence + S.Schoolteacher.intelligenceImplant);
+ if (S.Schoolteacher.visualAge > 35) {
teaching += 10;
}
- if (setup.schoolteacherCareers.includes(V.Schoolteacher.career)) {
+ if (setup.schoolteacherCareers.includes(S.Schoolteacher.career)) {
teaching += 10;
- } else if (V.Schoolteacher.skill.teacher >= V.masteredXP) {
+ } else if (S.Schoolteacher.skill.teacher >= V.masteredXP) {
teaching += 10;
}
- if (V.Schoolteacher.face > 40) {
+ if (S.Schoolteacher.face > 40) {
teaching += 10;
}
if (jsRandom(1, 150) < teaching) {
learning += 1;
}
- r += ` under ${V.Schoolteacher.slaveName}'s supervision;`;
+ r += ` under ${S.Schoolteacher.slaveName}'s supervision;`;
if (slave.devotion > 20) {
r += ` ${he} is such an obedient slave that ${schoolteacherPronouns.pronoun} <span class="devotion inc">encourages ${him}</span> to be the best slave ${he} can.`;
slave.devotion += 2;
@@ -280,8 +280,8 @@ App.SlaveAssignment.takeClasses = (function() {
*/
function lactationBreak(slave) {
// room for growth — do so during lactation rules expansion
- if (slave.lactation === 1 && slave.assignment === Job.SCHOOL && V.Schoolteacher !== 0 && hasAnyArms(V.Schoolteacher)) {
- r += ` With ${his} natural lactation, ${he} often finds ${himself} milked before the class by ${V.Schoolteacher.slaveName} both to serve as a lesson and to keep ${him} from becoming a milky mess.`;
+ if (slave.lactation === 1 && slave.assignment === Job.SCHOOL && S.Schoolteacher && hasAnyArms(S.Schoolteacher)) {
+ r += ` With ${his} natural lactation, ${he} often finds ${himself} milked before the class by ${S.Schoolteacher.slaveName} both to serve as a lesson and to keep ${him} from becoming a milky mess.`;
slave.lactationDuration = 2;
slave.boobs -= slave.boobsMilk;
slave.boobsMilk = 0;
diff --git a/src/endWeek/schoolroomReport.js b/src/endWeek/schoolroomReport.js
index 1e4b402559506993dad246ce91474e4024242eaa..ad41afec2a148e17717aa28fea97a1a19b4da29d 100644
--- a/src/endWeek/schoolroomReport.js
+++ b/src/endWeek/schoolroomReport.js
@@ -108,7 +108,7 @@ App.EndWeek.schoolroomReport = function() {
if (slaves.length < V.schoolroom) {
const _idlePay = jsRandom(1, 10) + ((V.schoolroom - slaves.length) * (jsRandom(150, 170) + (idleBonus * 10)));
- cashX(_idlePay, "school", V.Schoolteacher);
+ cashX(_idlePay, "school", S.Schoolteacher);
r.push(`<div class="indent">Since ${he} doesn't have enough students to occupy all of ${his} time, ${V.schoolroomName} takes in citizens' slaves on a contract basis and ${he} teaches them too, earning <span class="yellowgreen">${cashFormat(_idlePay)}.</span></div>`);
}
diff --git a/src/endWeek/slaveAssignmentReport.js b/src/endWeek/slaveAssignmentReport.js
index b52d665be47b6e49382c7b4bff7513f48ab93a1d..eadc1d9ecc9f8d2c97c2fb02b6cc6dddca3676bb 100644
--- a/src/endWeek/slaveAssignmentReport.js
+++ b/src/endWeek/slaveAssignmentReport.js
@@ -597,24 +597,23 @@ App.EndWeek.slaveAssignmentReport = function() {
}
break;
case Job.TEACHER:
- V.Schoolteacher = slave;
if (!canTalk(slave)) {
_printSlaveUnassignedNote(slave, "can't give verbal instruction");
- V.Schoolteacher = 0;
+ V.SchoolteacherID = 0;
} else if (slave.preg > 37 && slave.broodmother === 2) {
_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your Schoolteacher any longer`);
- V.Schoolteacher = 0;
+ V.SchoolteacherID = 0;
} else if (slave.fetish === "mindbroken") {
_printSlaveUnassignedNote(slave, "is mindbroken");
- V.Schoolteacher = 0;
+ V.SchoolteacherID = 0;
} else if (!canSee(slave)) {
_printSlaveUnassignedNote(slave, "can no longer see");
- V.Schoolteacher = 0;
+ V.SchoolteacherID = 0;
} else if (!canHear(slave)) {
_printSlaveUnassignedNote(slave, "can no longer hear");
- V.Schoolteacher = 0;
+ V.SchoolteacherID = 0;
}
- if (V.Schoolteacher === 0) {
+ if (V.SchoolteacherID === 0) {
removeJob(slave, Job.TEACHER);
}
break;
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 9c07ebfdeda557f3c78123bd360830774027fe4c..9c54ceed3223a36d03b5f3a9bbe9e8bee3fd9861 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -78,7 +78,7 @@ globalThis.inferiorRaceP = function(slave) {
*/
globalThis.isLeaderP = function(slave) {
/** @type {FC.SlaveStateOrZero[]} */
- const leaders = [V.HeadGirl, V.Bodyguard, V.Recruiter, V.Concubine, V.Nurse, S.Attendant, V.Matron, V.Madam, V.DJ, V.Milkmaid, V.Farmer, S.Stewardess, V.Schoolteacher, V.Wardeness];
+ const leaders = [V.HeadGirl, V.Bodyguard, V.Recruiter, V.Concubine, V.Nurse, S.Attendant, V.Matron, V.Madam, V.DJ, V.Milkmaid, V.Farmer, S.Stewardess, S.Schoolteacher, V.Wardeness];
return leaders.some(leader => leader && leader.ID && leader.ID === slave.ID);
};
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 3cbfd18eee4d090bb4030a7032ae7381ba85a752..00b6676067bdaf336dbcf511de15688d83869bc5 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -514,8 +514,8 @@ globalThis.removeJob = function(slave, assignment, saveRecord = false) {
V.Milkmaid = 0;
} else if (V.Farmer !== 0 && slave.ID === V.Farmer.ID) {
V.Farmer = 0;
- } else if (V.Schoolteacher !== 0 && slave.ID === V.Schoolteacher.ID) {
- V.Schoolteacher = 0;
+ } else if (V.SchoolteacherID === slave.ID) {
+ V.SchoolteacherID = 0;
} else if (V.AttendantID === slave.ID) {
V.AttendantID = 0;
} else if (V.Matron !== 0 && slave.ID === V.Matron.ID) {
diff --git a/src/npc/descriptions/style/clothing.js b/src/npc/descriptions/style/clothing.js
index cc06e8a744402863393be324b97ddd0d484e4ff4..efa5f2a91fe4eaab80fe70f4998e5c11fec4401f 100644
--- a/src/npc/descriptions/style/clothing.js
+++ b/src/npc/descriptions/style/clothing.js
@@ -787,7 +787,7 @@ App.Desc.clothing = function(slave, {market, eventDescription} = {}) {
r.push(`${His} uniform is pinned with the`);
if (slave.ID === V.Bodyguard.ID || slave.ID === V.HeadGirl.ID || slave.ID === V.Recruiter.ID || slave.ID === V.Concubine.ID) {
r.push(`golden whip and manacles insignia of a senior slave officer,`);
- } else if ((slave.ID === V.Madam.ID) || (slave.ID === V.Nurse.ID) || (slave.ID === V.AttendantID) || (slave.ID === V.Matron.ID) || (slave.ID === V.DJ.ID) || (slave.ID === V.Milkmaid.ID) || (slave.ID === V.Farmer.ID) || (slave.ID === V.StewardessID) || (slave.ID === V.Schoolteacher.ID) || (slave.ID === V.Wardeness.ID)) {
+ } else if ((slave.ID === V.Madam.ID) || (slave.ID === V.Nurse.ID) || (slave.ID === V.AttendantID) || (slave.ID === V.Matron.ID) || (slave.ID === V.DJ.ID) || (slave.ID === V.Milkmaid.ID) || (slave.ID === V.Farmer.ID) || (slave.ID === V.StewardessID) || (slave.ID === V.SchoolteacherID) || (slave.ID === V.Wardeness.ID)) {
r.push(`golden manacles insignia of a junior slave officer,`);
} else if ((slave.skill.combat > 0) && getLimbCount(slave, 105) > 0) {
r.push(`silver spear and manacles insignia of an augmented slave soldier,`);
@@ -809,7 +809,7 @@ App.Desc.clothing = function(slave, {market, eventDescription} = {}) {
r.push(`${His} uniform is pinned with the`);
if (slave.ID === V.Bodyguard.ID || slave.ID === V.HeadGirl.ID || slave.ID === V.Recruiter.ID || slave.ID === V.Concubine.ID) {
r.push(`golden whip and manacles insignia of a senior slave officer,`);
- } else if ((slave.ID === V.Madam.ID) || (slave.ID === V.Nurse.ID) || (slave.ID === V.AttendantID) || (slave.ID === V.Matron.ID) || (slave.ID === V.DJ.ID) || (slave.ID === V.Milkmaid.ID) || (slave.ID === V.Farmer.ID) || (slave.ID === V.StewardessID) || (slave.ID === V.Schoolteacher.ID) || (slave.ID === V.Wardeness.ID)) {
+ } else if ((slave.ID === V.Madam.ID) || (slave.ID === V.Nurse.ID) || (slave.ID === V.AttendantID) || (slave.ID === V.Matron.ID) || (slave.ID === V.DJ.ID) || (slave.ID === V.Milkmaid.ID) || (slave.ID === V.Farmer.ID) || (slave.ID === V.StewardessID) || (slave.ID === V.SchoolteacherID) || (slave.ID === V.Wardeness.ID)) {
r.push(`golden manacles insignia of a junior slave officer,`);
} else if ((slave.skill.combat > 0) && getLimbCount(slave, 105)) {
r.push(`silver spear and manacles insignia of an augmented slave soldier,`);
@@ -831,7 +831,7 @@ App.Desc.clothing = function(slave, {market, eventDescription} = {}) {
r.push(`${His} uniform is pinned with the`);
if ((slave.ID === V.Bodyguard.ID) || (slave.ID === V.HeadGirl.ID) || (slave.ID === V.Recruiter.ID) || (slave.ID === V.Concubine.ID)) {
r.push(`golden whip and manacles insignia of a senior slave officer,`);
- } else if ((slave.ID === V.Madam.ID) || (slave.ID === V.Nurse.ID) || (slave.ID === V.AttendantID) || (slave.ID === V.Matron.ID) || (slave.ID === V.DJ.ID) || (slave.ID === V.Milkmaid.ID) || (slave.ID === V.Farmer.ID) || (slave.ID === V.StewardessID) || (slave.ID === V.Schoolteacher.ID) || (slave.ID === V.Wardeness.ID)) {
+ } else if ((slave.ID === V.Madam.ID) || (slave.ID === V.Nurse.ID) || (slave.ID === V.AttendantID) || (slave.ID === V.Matron.ID) || (slave.ID === V.DJ.ID) || (slave.ID === V.Milkmaid.ID) || (slave.ID === V.Farmer.ID) || (slave.ID === V.StewardessID) || (slave.ID === V.SchoolteacherID) || (slave.ID === V.Wardeness.ID)) {
r.push(`golden manacles insignia of a junior slave officer,`);
} else if ((slave.skill.combat > 0) && getLimbCount(slave, 105)) {
r.push(`silver spear and manacles insignia of an augmented slave soldier,`);
@@ -853,7 +853,7 @@ App.Desc.clothing = function(slave, {market, eventDescription} = {}) {
r.push(`${His} uniform is pinned with the`);
if ((slave.ID === V.Bodyguard.ID) || (slave.ID === V.HeadGirl.ID) || (slave.ID === V.Recruiter.ID) || (slave.ID === V.Concubine.ID)) {
r.push(`golden whip and manacles insignia of a senior slave officer,`);
- } else if ((slave.ID === V.Madam.ID) || (slave.ID === V.Nurse.ID) || (slave.ID === V.AttendantID) || (slave.ID === V.Matron.ID) || (slave.ID === V.DJ.ID) || (slave.ID === V.Milkmaid.ID) || (slave.ID === V.Farmer.ID) || (slave.ID === V.StewardessID) || (slave.ID === V.Schoolteacher.ID) || (slave.ID === V.Wardeness.ID)) {
+ } else if ((slave.ID === V.Madam.ID) || (slave.ID === V.Nurse.ID) || (slave.ID === V.AttendantID) || (slave.ID === V.Matron.ID) || (slave.ID === V.DJ.ID) || (slave.ID === V.Milkmaid.ID) || (slave.ID === V.Farmer.ID) || (slave.ID === V.StewardessID) || (slave.ID === V.SchoolteacherID) || (slave.ID === V.Wardeness.ID)) {
r.push(`golden manacles insignia of a junior slave officer,`);
} else if ((slave.skill.combat > 0) && getLimbCount(slave, 105)) {
r.push(`silver spear and manacles insignia of an augmented slave soldier,`);
diff --git a/src/pregmod/widgets/pregmodBirthWidgets.tw b/src/pregmod/widgets/pregmodBirthWidgets.tw
index 18aff11313145b072cc8c5aded79d6a495159241..967124d88d01167081b2d69e3d09e28a55806caa 100644
--- a/src/pregmod/widgets/pregmodBirthWidgets.tw
+++ b/src/pregmod/widgets/pregmodBirthWidgets.tw
@@ -646,8 +646,8 @@
<</if>>
<<case "learn in the schoolroom">>
- <<if ($Schoolteacher != 0)>>
- <<setLocalPronouns $Schoolteacher 2>>
+ <<if (_S.Schoolteacher != 0)>>
+ <<setLocalPronouns _S.Schoolteacher 2>>
<</if>>
<<if !canWalk($slaves[$i])>>
<<if (random(1,20) > $suddenBirth)>>
@@ -657,7 +657,7 @@
During a lesson in $schoolroomName, $slaves[$i].slaveName's water breaks. Since $he can't leave the lesson, $he tries $his best to hold back the upcoming birth of <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby. $He fails to manage and a particularly strong contraction elicits a moan noticeable enough to draw all the students' attention.
<<set $humiliation = 1>>
<<ClothingBirth>>
- <<if $Schoolteacher != 0>>$Schoolteacher.slaveName, furious that _his2 lesson was interrupted, drags $his still very pregnant ass from the class along with $his newborn child<<else>>$He gathers $his newborn child up and is quickly helped from the class<</if>>. $He can feel all the eyes watching $him leave.
+ <<if _S.Schoolteacher>>_S.Schoolteacher.slaveName, furious that _his2 lesson was interrupted, drags $his still very pregnant ass from the class along with $his newborn child<<else>>$He gathers $his newborn child up and is quickly helped from the class<</if>>. $He can feel all the eyes watching $him leave.
<</if>>
<<else>>
<<if (random(1,20) > $suddenBirth)>>
@@ -667,7 +667,7 @@
During a lesson in $schoolroomName, $slaves[$i].slaveName's water breaks. Since $he can't leave the lesson, $he tries $his best to hold back the upcoming birth of <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby. $He fails to manage and a particularly strong contraction elicits a moan noticeable enough to draw all the students' attention.
<<set $humiliation = 1>>
<<ClothingBirth>>
- <<if $Schoolteacher != 0>>$Schoolteacher.slaveName, furious that _his2 lesson was interrupted, dismisses $him from the class along with $his newborn child<<else>>$He gathers $his newborn child up and quickly excuses $himself from the class<</if>>. $He can feel all the eyes staring at $his still very gravid middle.
+ <<if _S.Schoolteacher != 0>>_S.Schoolteacher.slaveName, furious that _his2 lesson was interrupted, dismisses $him from the class along with $his newborn child<<else>>$He gathers $his newborn child up and quickly excuses $himself from the class<</if>>. $He can feel all the eyes staring at $his still very gravid middle.
<</if>>
<</if>>
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index b66d64bbf2551d8f212448c3484a843015c52c1b..68adec6f5e86ee141fa846f997b1d4dd671e9a8c 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -47,7 +47,7 @@
<<case "stewardess beating">>
<<set $activeSlave = _S.Stewardess, $subSlave = $slaves.find(function(s) { return s.assignment == "work as a servant"; })>>
<<case "aggressive schoolteacher">>
- <<set $activeSlave = $Schoolteacher, $subSlave = $slaves.find(function(s) { return s.assignment == "learn in the schoolroom"; })>>
+ <<set $activeSlave = _S.Schoolteacher, $subSlave = $slaves.find(function(s) { return s.assignment == "learn in the schoolroom"; })>>
<<case "abusive wardeness">>
<<set $activeSlave = $Wardeness, $subSlave = $slaves.find(function(s) { return s.assignment == "be confined in the cellblock"; })>>
<<case "comforting attendant">>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 24abf725ceeb0aaf86e753276edcb44241b8e4f3..8fbf633a0ab32f3558182ea6adb586f62a6e19a2 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -427,7 +427,7 @@
<<set $PESSevent.push("DJ publicity")>>
<</if>>
- <<if ($Schoolteacher != 0) && (_L.schoolroom > 0) && ($Schoolteacher.intelligence+$Schoolteacher.intelligenceImplant > 15) && ($Schoolteacher.actualAge >= 35)>>
+ <<if (_S.Schoolteacher) && (_L.schoolroom > 0) && (_S.Schoolteacher.intelligence+_S.Schoolteacher.intelligenceImplant > 15) && (_S.Schoolteacher.actualAge >= 35)>>
<<set $PETSevent.push("aggressive schoolteacher")>>
<</if>>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index dc47c42182ac2d0c87c47a5ee99763c232d6f900..0ef60533fb0cde157cb9a62cdcb02753116f15a6 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -143,7 +143,7 @@
<<if ($activeSlave.ID == $StewardessID)>>
<<set _qualifiedNicknames.push("Stewardess")>>
<</if>>
-<<if ($activeSlave.ID == $Schoolteacher.ID)>>
+<<if ($activeSlave.ID == $SchoolteacherID)>>
<<set _qualifiedNicknames.push("Schoolteacher")>>
<</if>>
<<if ($activeSlave.ID == $Nurse.ID)>>
diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw
index 74330ad71a1f22b9f27fb20ae828770a2ccecdfd..0184c02cd4c6e0771fb97fef0ff87efdc055b761 100644
--- a/src/uncategorized/saRelationships.tw
+++ b/src/uncategorized/saRelationships.tw
@@ -119,7 +119,7 @@
<<set _SlaveI.trust -= 4>>
<</if>>
<</if>>
- <<elseif (_SlaveJ.ID == $Schoolteacher.ID) && (_SlaveI.assignment == "learn in the schoolroom")>>
+ <<elseif (_SlaveJ.ID == $SchoolteacherID) && (_SlaveI.assignment == "learn in the schoolroom")>>
<<if _SlaveJ.rules.relationship != "restrictive">>
_SlaveI.slaveName manages to ingratiate $himself with the Schoolteacher, _SlaveJ.slaveName. The two slaves have @@.lightgreen;struck up a friendship.@@
<<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw
index e55b592a89ce9d967c42d5f6cee9595a3f0e21ae..57698e3065dce302a8342418f14361a2199b0866 100644
--- a/src/uncategorized/schoolroom.tw
+++ b/src/uncategorized/schoolroom.tw
@@ -72,9 +72,9 @@
$schoolroomNameCaps is busy with slaves, repeating their lessons out loud to drill the instruction home. A few students are maintaining uncomfortable positions in the corner as punishment for poor work.
<<elseif _DL > 0>>
$schoolroomNameCaps is sparsely populated, the few students repeating their lessons out loud to drill the instruction home. One slave is maintaining an uncomfortable position in the corner as punishment for poor work.
- <<elseif $Schoolteacher != 0>>
- <<setLocalPronouns $Schoolteacher>>
- $Schoolteacher.slaveName is alone in $schoolroomName, and has nothing to do but work on $his lesson plans.
+ <<elseif _S.Schoolteacher>>
+ <<setLocalPronouns _S.Schoolteacher>>
+ _S.Schoolteacher.slaveName is alone in $schoolroomName, and has nothing to do but work on $his lesson plans.
<<else>>
None of your slaves are learning in $schoolroomName.
<div class="choices" style="font-style:normal">
diff --git a/src/uncategorized/schoolteacherSelect.tw b/src/uncategorized/schoolteacherSelect.tw
index 745cc48ed9e1419e2824e3a71ed20b91b9299069..e7fa4148322b5e9f61491f256f1a425bf1eb9781 100644
--- a/src/uncategorized/schoolteacherSelect.tw
+++ b/src/uncategorized/schoolteacherSelect.tw
@@ -1,15 +1,14 @@
:: Schoolteacher Select [nobr jump-to-safe jump-hidden jump-from-safe]
<<set $nextButton = "Back", $nextLink = "Schoolroom", $encyclopedia = "Schoolteacher">>
-<<if ($Schoolteacher != 0)>>
- <<set $Schoolteacher = getSlave($Schoolteacher.ID)>>
- <<setLocalPronouns $Schoolteacher>>
- <span class='slave-name'><<= SlaveFullName($Schoolteacher)>></span> is serving as your Schoolteacher.<br><br>$He will help teach your slaves.
+<<if _S.Schoolteacher>>
+ <<setLocalPronouns _S.Schoolteacher>>
+ <span class='slave-name'><<= SlaveFullName(_S.Schoolteacher)>></span> is serving as your Schoolteacher.<br><br>$He will help teach your slaves.
<<else>>
You have not selected a Schoolteacher.
<</if>>
<br><br>''Appoint a Schoolteacher from your devoted slaves:''
-<br><br>[[None|Schoolroom][removeJob($Schoolteacher, "be the Schoolteacher")]]
+<br><br>[[None|Schoolroom][removeJob(_S.Schoolteacher, "be the Schoolteacher")]]
<br><br>
<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.schoolroom, "Schoolroom")>>
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index 19e793893c4b8655480fd61621f6381b909d27ba..b22157da317529bee6f22168902c440349478569 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -1023,19 +1023,19 @@
Several of the other slaves present help $him with $his newborn<<if $slaves[$i].pregType > 1>>s<</if>>. <<if _S.Matron>>_S.Matron.slaveName, lured in by the commotion, shoos the other slaves out and helps the new mother to a private room to unwind<<else>>Soon a servant arrives to take $his child<<if $slaves[$i].pregType > 1>>ren<</if>> away, and $he is ushered into a shower to clean up and relax<</if>>.
<<case "learn in the schoolroom">>
- <<if ($Schoolteacher != 0)>>
- <<setLocalPronouns $Schoolteacher 2>>
+ <<if _S.Schoolteacher>>
+ <<setLocalPronouns _S.Schoolteacher 2>>
<</if>>
<<if !canWalk($slaves[$i])>>
During a lesson in $schoolroomName, $slaves[$i].slaveName's water breaks. Since $he can't leave the lesson, $he tries $his best to hold back the upcoming birth. $He fails to do so and a particularly strong contraction elicits a moan noticeable enough to draw all the students' attention.
<<set $humiliation = 1>>
<<ClothingBirth>>
- <<if $Schoolteacher != 0>>$Schoolteacher.slaveName, furious that _his2 lesson was interrupted, drags $him from the class along with $his newborn child<<if $slaves[$i].pregType > 1>>ren<</if>><<else>>$He gathers $his newborn child<<if $slaves[$i].pregType > 1>>ren<</if>> up and is quickly helped from the class<</if>>. $He can feel all eyes watching $him leave.
+ <<if _S.Schoolteacher != 0>>_S.Schoolteacher.slaveName, furious that _his2 lesson was interrupted, drags $him from the class along with $his newborn child<<if $slaves[$i].pregType > 1>>ren<</if>><<else>>$He gathers $his newborn child<<if $slaves[$i].pregType > 1>>ren<</if>> up and is quickly helped from the class<</if>>. $He can feel all eyes watching $him leave.
<<else>>
During a lesson in $schoolroomName, $slaves[$i].slaveName's water breaks. Since $he can't leave the lesson, $he tries $his best to hold back the upcoming birth. $He fails to do so and a particularly strong contraction elicits a moan noticeable enough to draw all the students' attention.
<<set $humiliation = 1>>
<<ClothingBirth>>
- <<if $Schoolteacher != 0>>$Schoolteacher.slaveName, furious that _his2 lesson was interrupted, dismisses $him from the class along with $his newborn child<<if $slaves[$i].pregType > 1>>ren<</if>><<else>>$He gathers $his newborn child<<if $slaves[$i].pregType > 1>>ren<</if>> up and quickly excuses $himself from the class<</if>>. $He can feel all eyes watching $him leave.
+ <<if _S.Schoolteacher != 0>>_S.Schoolteacher.slaveName, furious that _his2 lesson was interrupted, dismisses $him from the class along with $his newborn child<<if $slaves[$i].pregType > 1>>ren<</if>><<else>>$He gathers $his newborn child<<if $slaves[$i].pregType > 1>>ren<</if>> up and quickly excuses $himself from the class<</if>>. $He can feel all eyes watching $him leave.
<</if>>
<<case "take classes">>