diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index f4f8bcbf001d403021f50e653c458aec2a6b5c0c..5e7fecdc487267f82a75376c2d97fb18d4153d7e 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -541,7 +541,6 @@ You should have received a copy of the GNU General Public License along with thi
<<set $servantsQuarters = 0>>
<<set $servantsQuartersName = "the Servants' Quarters">>
<<set $servantsQuartersNameCaps = "The Servants' Quarters">>
-<<set $schoolroomSlaves = 0>>
<<set $schoolroomDecoration = "standard">>
<<set $schoolroomUpgradeSkills = 0>>
<<set $schoolroomUpgradeLanguage = 0>>
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 3cdb0a1514de660f33c04887b9ea11e3b92cb45c..f132273ed7805f573b05e827f185a66fdcd7f0ab 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -230,7 +230,7 @@ window.DefaultRules = (function() {
break;
case "learn in the schoolroom":
- if ((V.schoolroomSlaves < V.schoolroom && slave.fetish !== "mindbroken" && (slave.devotion >= -20 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)))) {
+ if ((V.SchlRiIDs.length < V.schoolroom && slave.fetish !== "mindbroken" && (slave.devotion >= -20 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)))) {
if ((slave.intelligenceImplant < 30) || (slave.voice !== 0 && slave.accent + V.schoolroomUpgradeLanguage > 2) || (slave.skill.oral <= 10 + V.schoolroomUpgradeSkills * 20) || (slave.skill.whoring <= 10 + V.schoolroomUpgradeSkills * 20) || (slave.skill.entertainment <= 10 + V.schoolroomUpgradeSkills * 20) || (slave.skill.anal < 10 + V.schoolroomUpgradeSkills * 20) || ((slave.vagina >= 0) && (slave.skill.vaginal < 10 + V.schoolroomUpgradeSkills * 20))) {
break;
} else {
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 52199feee1dba63d8d9c98f38336804937a59c5f..22ce39cd842cacfece79961953915594e10d724a 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -175,7 +175,6 @@ window.assignJob = function assignJob(slave, job) {
case "schoolroom":
slave.assignment = "learn in the schoolroom";
slave.assignmentVisible = 0;
- V.schoolroomSlaves++;
V.SchlRiIDs.push(slave.ID);
slave.livingRules = "normal";
break;
@@ -440,7 +439,6 @@ window.removeJob = function removeJob(slave, assignment) {
case "schoolroom":
slave.assignment = "rest";
V.SchlRiIDs.delete(slave.ID);
- V.schoolroomSlaves--;
break;
case "rest in the spa":
diff --git a/src/js/playerJS.js b/src/js/playerJS.js
index 0f465e7ccb80a3ce679e917a44261d38c5764017..8bb37dc6990b2b9ce1168714be923bc5ee6635d3 100644
--- a/src/js/playerJS.js
+++ b/src/js/playerJS.js
@@ -484,7 +484,7 @@ window.PCTitle = function PCTitle() {
titles.push("Directrix of the Servants");
}
}
- if (V.schoolroomSlaves >= 10) {
+ if (V.SchlRiIDs.length >= 10) {
if (V.PC.title === 1) {
titles.push("Educator of the Slaves");
} else {
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index 6160c7c107fd4dd5d5ad5488b6d893db87a64e1b..d99dbb50ffcc18fdac8732ae7790ca6d1581a71f 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -296,7 +296,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
s.counter.oral += 1;
};
})>>
- <<set $oralTotal += $schoolroomSlaves>>
+ <<set $oralTotal += $SchlRiIDs.length>>
<</replace>>
<</link>>
<br><<link "Take the delinquent student in hand">>
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index b1dc99d3d4848d6c8e5e1a397a9121f3ae01cf5e..d1d4ce7eb8fad5b1af006e8a1a9030f5e2e7c2b9 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -150,7 +150,7 @@ if(!Macro.has('sectorblock')) {
<<if $spa>> <<print SpaUIName()>> ($spaSlaves/$spa<<if $Attendant>>, L<</if>>)<</if>>
<<if $nursery>> <<print NurseryUIName()>> (<<if $nursery-$nurseryBabies == 0>>No empty rooms<<elseif $nursery-$nurseryBabies == 1>>1 empty room<<else>><<print $nursery-$nurseryBabies>> empty rooms<</if>>, $nurserySlaves/$nurseryNannies<<if $Matron>>, L<</if>>) <<if $readyChildren > 0>>@@.yellow;[!]@@<</if>> <</if>>
<<if $clinic>> <<print ClinicUIName()>> ($CliniciIDs.length/$clinic<<if $Nurse>>, L<</if>>)<</if>>
- <<if $schoolroom>> <<print SchoolRoomUIName()>> ($schoolroomSlaves/$schoolroom<<if $Schoolteacher>>, L<</if>>)<</if>>
+ <<if $schoolroom>> <<print SchoolRoomUIName()>> ($SchlRiIDs.length/$schoolroom<<if $Schoolteacher>>, L<</if>>)<</if>>
<<if $cellblock>> <<print CellblockUIName()>> ($CellBiIDs.length/$cellblock<<if $Wardeness>>, L<</if>>)<</if>>
<<if $incubator>> <<print IncubatorUIName()>> (<<if $incubator-$incubatorSlaves == 0>>No empty tanks<<elseif $incubator-$incubatorSlaves == 1>>1 empty tank<<else>><<print $incubator-$incubatorSlaves>> empty tanks<</if>>) <<if $readySlaves > 0>>@@.yellow;[!]@@<</if>> <</if>>
<<if $researchLab.level > 0>>[[Prosthetic Lab]]<</if>>
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index 62010c74a4fac9f5c9906737ed8a97e7f510858a..18f53d8a2a0d6274ab096188544d8f963261103d 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -161,7 +161,7 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<print budgetLine("masterSuite", "<<if $masterSuite>>[[Master Suite][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>Master Suite<</if>> ($MastSiIDs.length slaves)")>>
- <<print budgetLine("school", "<<if $schoolroom>>[[$schoolroomNameCaps|Schoolroom][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$schoolroomNameCaps<</if>> ($schoolroomSlaves slaves)")>>
+ <<print budgetLine("school", "<<if $schoolroom>>[[$schoolroomNameCaps|Schoolroom][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$schoolroomNameCaps<</if>> ($SchlRiIDs.length slaves)")>>
<<print budgetLine("spa", "<<if $spa>>[[$spaNameCaps|Spa][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$spaNameCaps<</if>> ($spaSlaves slaves)")>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 7b8d6bfdd0b81b957a181e9a4facb4298bd68477..f926947cb9ab5a1bc037ee9321e455daee71e2dd 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -491,7 +491,7 @@
<<set $PESSevent.push("DJ publicity")>>
<</if>>
- <<if ($Schoolteacher != 0) && ($schoolroomSlaves > 0) && ($Schoolteacher.intelligence+$Schoolteacher.intelligenceImplant > 15) && ($Schoolteacher.actualAge >= 35)>>
+ <<if ($Schoolteacher != 0) && ($SchlRiIDs.length > 0) && ($Schoolteacher.intelligence+$Schoolteacher.intelligenceImplant > 15) && ($Schoolteacher.actualAge >= 35)>>
<<set $PETSevent.push("aggressive schoolteacher")>>
<</if>>
diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw
index 2a0ce13cf9bd9c7690d630c4560a745245662d42..68b724e3e80518ed77cf2f9b3f6c124001d2583f 100644
--- a/src/uncategorized/saChoosesOwnJob.tw
+++ b/src/uncategorized/saChoosesOwnJob.tw
@@ -33,7 +33,7 @@
<<= assignJob($slaves[$i], "get milked")>>
<<elseif ($slaves[$i].intelligenceImplant < 15)>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($schoolroom > $schoolroomSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($schoolroom > $SchlRiIDs.length)>>
<<set $slaves[$i].choosesOwnAssignmentText += " is uneducated, so $he sits $himself down in $schoolroomName.">>
<<= assignJob($slaves[$i], "learn in the schoolroom")>>
<<else>>
diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw
index daa85c6167ed1bba34a187a31cd0ed78cba3c4bc..27b84cab8970bc32583f9ee0b4c3141dcb6c30ae 100644
--- a/src/uncategorized/schoolroom.tw
+++ b/src/uncategorized/schoolroom.tw
@@ -1,6 +1,6 @@
:: Schoolroom [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Schoolroom", $showEncyclopedia = 1, $encyclopedia = "Schoolroom", $schoolroomSlaves = $SchlRiIDs.length>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Schoolroom", $showEncyclopedia = 1, $encyclopedia = "Schoolroom">>
<<if $schoolroomName != "the Schoolroom">>
<<set $schoolroomNameCaps = $schoolroomName.replace("the ", "The ")>>
@@ -67,9 +67,9 @@ $schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These
reviewing the often complex subject of how to address citizens other that one's owner.
<</switch>>
-<<if $schoolroomSlaves > 2>>
+<<if $SchlRiIDs.length > 2>>
$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 $schoolroomSlaves > 0>>
+<<elseif $SchlRiIDs.length > 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>>
@@ -79,14 +79,14 @@ $schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These
[[Decommission the schoolroom|Main][$schoolroom = 0, $schoolroomUpgradeSkills = 0, $schoolroomUpgradeLanguage = 0, $schoolroomUpgradeRemedial = 0, $schoolroomDecoration = "standard"]]
<</if>>
-<<if $schoolroomSlaves > 0>>
+<<if $SchlRiIDs.length > 0>>
<<if $Schoolteacher != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
- <<set _NewPop = $schoolroomSlaves+$dormitoryPopulation+_X>>
+ <<set _NewPop = $SchlRiIDs.length+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Schoolroom">>
<<if $Schoolteacher != 0>>
<<= assignJob($Schoolteacher, "rest")>>
<</if>>
- <<for $schoolroomSlaves > 0>>
+ <<for $SchlRiIDs.length > 0>>
<<= assignJob($slaves[$slaveIndices[$SchlRiIDs[0]]], "take classes")>>
<</for>>
<</link>>
@@ -96,7 +96,7 @@ $schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These
<</if>>
<<set _Tmult0 = Math.trunc($schoolroom*1000*$upgradeMultiplierArcology)>>
-<br>$schoolroomNameCaps has room to house $schoolroom slaves while they learn. There <<if $schoolroomSlaves == 1>>is<<else>>are<</if>> currently $schoolroomSlaves slave<<if $schoolroomSlaves != 1>>s<</if>> learning in $schoolroomName.
+<br>$schoolroomNameCaps has room to house $schoolroom slaves while they learn. There <<if $SchlRiIDs.length == 1>>is<<else>>are<</if>> currently $SchlRiIDs.length slave<<if $SchlRiIDs.length != 1>>s<</if>> learning in $schoolroomName.
[[Expand the schoolroom|Schoolroom][cashX(forceNeg(_Tmult0), "capEx"), $schoolroom += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
<br>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index f10b10637c4204f75fa84cbd14fe9e267484f775..75db2e70068710ab89e90d91b9308d51e11a40d8 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -1,7 +1,7 @@
:: Schoolroom Report [nobr]
<<SlaveIDSort $SchlRiIDs>>
-<<set _DL = $SchlRiIDs.length, $schoolroomSlaves = _DL, _SL = $slaves.length, _idleBonus = 0, _FLsFetish = 0>>
+<<set _DL = $SchlRiIDs.length, _SL = $slaves.length, _idleBonus = 0, _FLsFetish = 0>>
<<if $schoolroomDecoration != "standard">>
<<set _devBonus = 1>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 18a6cd4a3301d677caa10081dc593ba999a10ef8..39edd8888156243b7985374cb18ce1c59a64903e 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -733,7 +733,7 @@ $NPCMarketShareLC = Math.trunc(($NPCSexSupply.lowerClass * 1000) / ($NPCSexSuppl
["Club Report", $clubNameCaps, $club, $ClubiIDs.length, $DJ, "DJ"],
["Dairy Report", $dairyNameCaps, $dairy, $DairyiIDs.length, $Milkmaid, "Milkmaid"],
["Farmyard Report", $farmyardNameCaps, $farmyard, $FarmyardiIDs.length, $Farmer, "Farmer"],
- ["Schoolroom Report", $schoolroomNameCaps, $schoolroom, $schoolroomSlaves, $Schoolteacher, "Schoolteacher"],
+ ["Schoolroom Report", $schoolroomNameCaps, $schoolroom, $SchlRiIDs.length, $Schoolteacher, "Schoolteacher"],
["Spa Report", $spaNameCaps, $spa, $spaSlaves, $Attendant, "Attendant"],
["Nursery Report", $nurseryNameCaps, $nurseryNannies, $nurserySlaves, $Matron, "Matron"],
["Servants' Quarters Report", $servantsQuartersNameCaps, $servantsQuarters, $servantsQuartersSlaves, $Stewardess, "Stewardess"],
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 0d3cd1590db7614544620db614c7ca2308c3944b..d0d6f884e3194031416d7b15ed39c68a2868844d 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -633,9 +633,9 @@
<<if ($schoolroom)>>
<br> <<link "$schoolroomNameCaps""Schoolroom">><</link>>
<<if $abbreviateSidebar == 2>>
- ($schoolroomSlaves/$schoolroom <<if $schoolroomSlaves != 1>>students<<else>>student<</if>><<if $Schoolteacher>>, schoolteacher<</if>>)
+ ($SchlRiIDs.length/$schoolroom <<if $SchlRiIDs.length != 1>>students<<else>>student<</if>><<if $Schoolteacher>>, schoolteacher<</if>>)
<<else>>
- ($schoolroomSlaves/$schoolroom<<if $Schoolteacher>>, L<</if>>)
+ ($SchlRiIDs.length/$schoolroom<<if $Schoolteacher>>, L<</if>>)
<</if>>
<</if>>