From 7ced4111e9c9d0aff30a63295fb1554e27fea66d Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Mon, 22 Apr 2019 23:42:57 -0400
Subject: [PATCH] Experienced working for Nurse select
---
src/js/slaveSummaryWidgets.js | 6 ++++--
src/pregmod/widgets/assignmentFilterWidget.tw | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 5ff3bffd7df..e075a84aa86 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -4860,7 +4860,9 @@ App.UI.PassageSlaveFilers = {
(State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Nurse.ID))) ||
(s.assignmentVisible === 0 && s.fuckdoll <= 0 && (
(State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "get treatment in the clinic")))),
- "Nurse Select": s => (s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canSee(s)),
+ "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 && (
(State.variables.SlaveSummaryFiler === "assignable" && s.fetish !== "mindbroken" && s.assignment !== "learn in the schoolroom") ||
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "learn in the schoolroom") ||
@@ -5262,7 +5264,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
const _numFacilities = V.brothel + V.club + V.dairy + V.farmyard + V.servantsQuarters + V.masterSuite + V.spa + V.clinic + V.schoolroom + V.cellblock + V.arcade + V.HGSuite;
-
+
if (_numFacilities > 0) {
if (passageName === "Main" || passageName === "Head Girl Suite" || passageName === "Spa" || passageName === "Brothel" || passageName === "Club" || passageName === "Arcade" || passageName === "Clinic" || passageName === "Schoolroom" || passageName === "Dairy" || passageName === "Farmyard" || passageName === "Servants' Quarters" || passageName === "Master Suite" || passageName === "Cellblock") {
V.returnTo = passageName;
diff --git a/src/pregmod/widgets/assignmentFilterWidget.tw b/src/pregmod/widgets/assignmentFilterWidget.tw
index 9c40cb7b011..2c47355fb69 100644
--- a/src/pregmod/widgets/assignmentFilterWidget.tw
+++ b/src/pregmod/widgets/assignmentFilterWidget.tw
@@ -95,6 +95,7 @@
<<if passage() != "Nursery">><<print " | ">><<link Nursery>><<nurseryAssignmentFilter>><<replace #ComingGoing>><<set $SlaveSummaryFiler = "assignable">><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
<<if passage() != "Master Suite">><<print " | ">><<link Suite>><<suiteAssignmentFilter>><<replace #ComingGoing>><<set $SlaveSummaryFiler = "assignable">><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
<<if passage() != "Servants' Quarters">><<print " | ">><<link Quarters>><<quartersAssignmentFilter>><<set $SlaveSummaryFiler = "assignable">><<replace #ComingGoing>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
+ <<print " | ">><<link @@.lime;Experienced@@>><<showallAssignmentFilter>><<set $SlaveSummaryFiler = "experienced">><<replace #ComingGoing>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><<set $SlaveSummaryFiler = "">><</link>>
<</widget>>
/*
--
GitLab