From 9a7b41b8c2cca6b449bb4aa83a6bd7941dc63d50 Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Sat, 16 Mar 2019 23:15:21 -0400
Subject: [PATCH] show sentence if confined
---
src/endWeek/saStayConfined.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/endWeek/saStayConfined.js b/src/endWeek/saStayConfined.js
index 4d494b2e836..fce52bdcf9e 100644
--- a/src/endWeek/saStayConfined.js
+++ b/src/endWeek/saStayConfined.js
@@ -57,11 +57,13 @@ window.saStayConfined = /** @param {App.Entity.SlaveState} slave */ function saS
}
}
- if (slave.sentence == 0 && (slave.devotion > 20 || (slave.devotion >= -20 && slave.trust < -20) || (slave.devotion >= -50 && slave.trust < -50) || slave.fetish == "mindbroken")) {
+ if (slave.sentence != 0) {
+ t += ` ${He} has ${slave.sentence} remaining.</span>`;
+ } else if (slave.devotion > 20 || (slave.devotion >= -20 && slave.trust < -20) || (slave.devotion >= -50 && slave.trust < -50) || slave.fetish == "mindbroken") {
if (slave.fetish == "mindbroken") {
t += ` ${His} broken mind hinges entirely on other's guidance,`;
} else {
- t += ` ${He} is now willing to <span class='hotpink'>do as ${he}'s told,</span>`;
+ t += ` ${He} is now willing to <span class='hotpink'>do as ${he}'s told,`;
}
t += ` so <span class='yellow'>${his} assignment has defaulted to rest.</span>`;
if (slave.assignment == "be confined in the cellblock") {
@@ -71,6 +73,6 @@ window.saStayConfined = /** @param {App.Entity.SlaveState} slave */ function saS
}
removeJob(slave, slave.assignment);
}
-
+
return t;
};
--
GitLab