From f85339b3d831819b9823eb1c40e15f16c5dd554b Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Tue, 10 Nov 2020 21:13:11 -0800
Subject: [PATCH] Run tired() exactly once per applicable slave.
---
src/endWeek/brothelReport.js | 1 +
src/endWeek/clinicReport.js | 1 +
src/endWeek/masterSuiteReport.js | 1 +
src/endWeek/reports/cellblockReport.js | 1 +
src/endWeek/reports/clubReport.js | 1 +
src/endWeek/reports/spaReport.js | 1 +
src/endWeek/schoolroomReport.js | 1 +
src/endWeek/servantsQuartersReport.js | 2 +-
src/endWeek/standardSlaveReport.js | 3 ---
9 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/endWeek/brothelReport.js b/src/endWeek/brothelReport.js
index f7cc0d3b041..7cc803a01a6 100644
--- a/src/endWeek/brothelReport.js
+++ b/src/endWeek/brothelReport.js
@@ -256,6 +256,7 @@ App.EndWeek.brothelReport = function() {
if (S.Madam) {
const slave = S.Madam;
+ tired(slave);
if (V.showEWD !== 0) {
const madamEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report");
if (V.seeImages && V.seeReportImages) {
diff --git a/src/endWeek/clinicReport.js b/src/endWeek/clinicReport.js
index b741896901b..3fe91a528fc 100644
--- a/src/endWeek/clinicReport.js
+++ b/src/endWeek/clinicReport.js
@@ -240,6 +240,7 @@ App.EndWeek.clinicReport = function() {
if (S.Nurse) {
const slave = S.Nurse;
+ tired(slave);
/* apply following SA passages to facility leader */
if (V.showEWD !== 0) {
const nurseEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
diff --git a/src/endWeek/masterSuiteReport.js b/src/endWeek/masterSuiteReport.js
index e038db401dc..1e27e3ab63d 100644
--- a/src/endWeek/masterSuiteReport.js
+++ b/src/endWeek/masterSuiteReport.js
@@ -426,6 +426,7 @@ App.EndWeek.masterSuiteReport = function() {
}
if (S.Concubine) {
+ tired(S.Concubine);
const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
if (V.seeImages && V.seeReportImages) {
App.UI.DOM.appendNewElement("div", slaveEntry, App.Art.SlaveArtElement(S.Concubine, 0, 0), ["imageRef", "tinyImg"]);
diff --git a/src/endWeek/reports/cellblockReport.js b/src/endWeek/reports/cellblockReport.js
index 44116007738..1a271223b22 100644
--- a/src/endWeek/reports/cellblockReport.js
+++ b/src/endWeek/reports/cellblockReport.js
@@ -168,6 +168,7 @@ App.EndWeek.cellblockReport = function() {
if (S.Wardeness) {
const slave = S.Wardeness;
+ tired(slave);
/* apply following SA passages to facility leader */
if (V.showEWD !== 0) {
const wardenessEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report");
diff --git a/src/endWeek/reports/clubReport.js b/src/endWeek/reports/clubReport.js
index 9f43989a3e6..8a02eab58ae 100644
--- a/src/endWeek/reports/clubReport.js
+++ b/src/endWeek/reports/clubReport.js
@@ -138,6 +138,7 @@ App.EndWeek.clubReport = function() {
if (S.DJ) {
const slave = S.DJ;
+ tired(slave);
/* apply following SA passages to facility leader */
if (V.showEWD !== 0) {
const DJEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report");
diff --git a/src/endWeek/reports/spaReport.js b/src/endWeek/reports/spaReport.js
index b1cbd22ac63..69b44f7ee26 100644
--- a/src/endWeek/reports/spaReport.js
+++ b/src/endWeek/reports/spaReport.js
@@ -283,6 +283,7 @@ App.EndWeek.spaReport = function() {
if (S.Attendant) {
const slave = S.Attendant;
+ tired(slave);
/* apply following SA passages to facility leader */
if (V.showEWD !== 0) {
const attendantEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report");
diff --git a/src/endWeek/schoolroomReport.js b/src/endWeek/schoolroomReport.js
index 9e675864fcd..2fcb706c0e0 100644
--- a/src/endWeek/schoolroomReport.js
+++ b/src/endWeek/schoolroomReport.js
@@ -146,6 +146,7 @@ App.EndWeek.schoolroomReport = function() {
if (S.Schoolteacher) {
const slave = S.Schoolteacher;
+ tired(slave);
/* apply following SA passages to facility leader */
if (V.showEWD !== 0) {
const schoolteacherEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
diff --git a/src/endWeek/servantsQuartersReport.js b/src/endWeek/servantsQuartersReport.js
index 75a67b0b63e..2a31dba3895 100644
--- a/src/endWeek/servantsQuartersReport.js
+++ b/src/endWeek/servantsQuartersReport.js
@@ -204,8 +204,8 @@ App.EndWeek.servantsQuartersReport = function() {
}
if (S.Stewardess) {
- /** @type {App.Entity.SlaveState} */
const slave = S.Stewardess;
+ tired(slave);
/* apply following SA passages to facility leader */
if (V.showEWD !== 0) {
const stewardessEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
diff --git a/src/endWeek/standardSlaveReport.js b/src/endWeek/standardSlaveReport.js
index 5a090d67d9b..233c87928ff 100644
--- a/src/endWeek/standardSlaveReport.js
+++ b/src/endWeek/standardSlaveReport.js
@@ -7,9 +7,6 @@
*/
App.SlaveAssignment.standardSlaveReport = function(slave, silent=false) {
const clothes = App.SlaveAssignment.choosesOwnClothes(slave);
-
- tired(slave);
-
const individualReport = App.SlaveAssignment.individualSlaveReport(slave);
const devotion = App.SlaveAssignment.devotion(slave);
--
GitLab