From b5b49553dc45bdff104ce1a49128b98d5573896c Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Tue, 23 Apr 2019 00:15:59 -0400
Subject: [PATCH] Add transfer to schoolroom as well
---
src/js/slaveSummaryWidgets.js | 6 ++++--
src/uncategorized/schoolroom.tw | 17 ++++++++++++++++-
src/uncategorized/spa.tw | 1 -
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 9eb388d893e..8a3a619f689 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -4879,10 +4879,12 @@ App.UI.PassageSlaveFilers = {
"Nurse Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canSee(s)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
(State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.clinic.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.clinic.manager.careers.includes(s.career))))),
- "Schoolroom": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
+ "Schoolroom": s => ((s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
(State.variables.SlaveSummaryFiler === "assignable" && s.fetish !== "mindbroken" && s.assignment !== "learn in the schoolroom") ||
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "learn in the schoolroom") ||
- (State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Schoolteacher.ID))),
+ (State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Schoolteacher.ID))) ||
+ (s.assignmentVisible === 0 && s.fuckdoll <= 0 && (
+ (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "learn in the schoolroom")))),
"Schoolteacher Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canTalk(s) && canHear(s) && canSee(s)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
(State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.schoolroom.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.schoolroom.manager.careers.includes(s.career))))),
diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw
index a51a5cbb835..a1b75e32d5e 100644
--- a/src/uncategorized/schoolroom.tw
+++ b/src/uncategorized/schoolroom.tw
@@ -129,6 +129,7 @@ $schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These
<div class="tab">
<button class="tablinks" onclick="opentab(event, 'assign')" id="tab assign">Assign a slave</button>
<button class="tablinks" onclick="opentab(event, 'remove')" id="tab remove">Remove a slave</button>
+ <button class="tablinks" onclick="opentab(event, 'transfer')" id="tab transfer">Transfer from Facility</button>
</div>
<div id="remove" class="tabcontent">
@@ -156,10 +157,24 @@ $schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These
</div>
</div>
+<div id="transfer" class="tabcontent">
+ <div class="content">
+ <<if ($schoolroom <= $schoolroomSlaves)>>
+ ''$schoolroomNameCaps is full and cannot hold any more slaves''
+ <<elseif ($slaves.length > $schoolroomSlaves)>>
+ <<resetAssignmentFilter>>
+ <<set $SlaveSummaryFiler = "transferable">>
+ <<include "Slave Summary">>
+ <</if>>
+ </div>
+</div>
+
<<if ($tabChoice.Schoolroom == "assign")>>
<script>document.getElementById("tab assign").click();</script>
-<<else>>
+<<elseif ($tabChoice.Schoolroom == "remove")>>
<script>document.getElementById("tab remove").click();</script>
+<<elseif ($tabChoice.Schoolroom == "transfer")>>
+ <script>document.getElementById("tab transfer").click();</script>
<</if>>
</body>
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index 9ccff6fc6f0..1c7e28ba559 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -179,7 +179,6 @@ $spaNameCaps
<script>document.getElementById("tab remove").click();</script>
<<elseif ($tabChoice.Spa == "transfer")>>
<script>document.getElementById("tab transfer").click();</script>
-
<</if>>
</body>
--
GitLab