From 9f6c41b40b67e6f2946b51958a4cb57de35540f3 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Wed, 26 Sep 2018 00:09:18 -0400 Subject: [PATCH] fixes --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 3 +++ src/uncategorized/slaveSummary.tw | 2 +- src/utility/assayWidgets.tw | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index de6f23be570..15191464b41 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,9 @@ 9/25/2018 + 1 + -fixes + 0 -nursery facility added (beta) diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw index 1ba4e6976b0..bf5cae18ef0 100644 --- a/src/uncategorized/slaveSummary.tw +++ b/src/uncategorized/slaveSummary.tw @@ -16,7 +16,7 @@ || ($Flag == 1 && s.assignment == "rest in the spa") || ($Flag != 0 && $Flag != 1 && s.ID == $Attendant.ID))), "Attendant Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s)), - "Nursery": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && s.devotion > 20 || slave.trust > 20 && ( + "Nursery": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && s.devotion > 20 || s.trust > 20 && ( ($Flag == 0 && s.assignment != "work as a nanny") || ($Flag == 1 && s.assignment == "work as a nanny") || ($Flag != 0 && $Flag != 1 && s.ID == $Attendant.ID))), diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw index 8e80fc8ca53..42c6ce4a841 100644 --- a/src/utility/assayWidgets.tw +++ b/src/utility/assayWidgets.tw @@ -1461,7 +1461,7 @@ <<set _slaveMultiplier += 0.1>> <<elseif setup.attendantCareers.includes($args[0].career)>> <<set _slaveMultiplier += 0.1>> - <<elseif setup.matronCareers.include($args[0].career)>> + <<elseif setup.matronCareers.includes($args[0].career)>> <<set _slaveMultiplier += 0.1>> <<elseif setup.schoolteacherCareers.includes($args[0].career)>> <<set _slaveMultiplier += 0.1>> -- GitLab