From 7261ce49d7c3a45ae8b458543be75dc7c3381f73 Mon Sep 17 00:00:00 2001
From: Yunfan Bai <bcy603@gmail.com>
Date: Wed, 23 Aug 2023 19:22:37 -0700
Subject: [PATCH] Fixing a bug in assigning old job
Fixes a bug in reassigning old job for slaves leaving the SPA. !11469
only fixed the display.
---
src/endWeek/reports/spaReport.js | 2 +-
src/js/slaveListing.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/endWeek/reports/spaReport.js b/src/endWeek/reports/spaReport.js
index 89d0ce00b63..ed3ef08da25 100644
--- a/src/endWeek/reports/spaReport.js
+++ b/src/endWeek/reports/spaReport.js
@@ -378,7 +378,7 @@ App.EndWeek.spaReport = function() {
default:
slave.rules.living = "luxurious";
}
- if (slave.health.condition >= 20 && slave.health.tired <= 30 && slave.trust > 60 && slave.devotion > 60 && slave.fetish !== Fetish.MINDBROKEN && slave.sexualFlaw === "none" && slave.behavioralFlaw === "none") {
+ if (slave.health.condition >= 20 && slave.health.tired <= 30 && slave.trust > 60 && slave.devotion > 60 && slave.fetish !== Fetish.MINDBROKEN && (V.spaFix === 2 || (slave.sexualFlaw === "none" && slave.behavioralFlaw === "none"))) {
const slaveFixed = App.UI.DOM.makeElement("p");
App.Events.addNode(
slaveFixed,
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 01d993221b3..c72083e8a51 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -194,7 +194,7 @@ App.UI.SlaveList.render = function(IDs, rejectedSlaves, interactionLink, postNot
if (slave.fetish === Fetish.MINDBROKEN) {
assignment.innerText += `, mindbroken`;
} else {
- if ((V.spaFix !== 2) && (slave.sexualFlaw !== "none") || (slave.behavioralFlaw !== "none")) {
+ if (V.spaFix !== 2 && ((slave.sexualFlaw !== "none") || (slave.behavioralFlaw !== "none"))) {
list.push(`overcoming flaws`);
}
if ((slave.trust < 60) || (slave.devotion < 60)) {
--
GitLab