From 2c13bf8f877956a4ecf85e5631dc18874bdcd034 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Wed, 1 Jan 2020 21:10:27 -0800
Subject: [PATCH] Fix "tired" being appended to some health descriptions when
it shouldn't be
---
src/endWeek/saRest.js | 6 +++---
src/endWeek/saStayConfined.js | 8 ++++----
src/endWeek/saWorkAGloryHole.js | 6 +++---
src/js/descriptionWidgets.js | 6 +++---
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/endWeek/saRest.js b/src/endWeek/saRest.js
index d8b2a69684b..48a00a37b19 100644
--- a/src/endWeek/saRest.js
+++ b/src/endWeek/saRest.js
@@ -72,10 +72,10 @@ window.saRest = function saRest(slave) {
if (slave.health.illness > 0 && slave.health.tired > 50) {
t += ` and`;
}
- if (slave.health.tired < 80) {
- t += ` tired`;
- } else {
+ if (slave.health.tired >= 80) {
t += ` exhausted`;
+ } else if (slave.health.tired >= 50) {
+ t += ` tired`;
}
t += `,</span> ${he} greatly appreciates being allowed to rest.`;
}
diff --git a/src/endWeek/saStayConfined.js b/src/endWeek/saStayConfined.js
index 67cf0691404..9561306dc93 100644
--- a/src/endWeek/saStayConfined.js
+++ b/src/endWeek/saStayConfined.js
@@ -64,12 +64,12 @@ window.saStayConfined = function saStayConfined(slave) {
if (slave.health.illness > 0 && slave.health.tired > 50) {
t += ` and`;
}
- if (slave.health.tired < 80) {
- t += ` tired`;
- } else {
+ if (slave.health.tired >= 80) {
t += ` exhausted`;
+ } else if (slave.health.tired >= 50) {
+ t += ` tired`;
}
- t += `,</span> ${his} misery only grows.`;
+ t += `,</span> so ${his} misery only grows.`;
}
} else {
t += `is oblivious to ${his} confinement.`;
diff --git a/src/endWeek/saWorkAGloryHole.js b/src/endWeek/saWorkAGloryHole.js
index 73e03974ccf..ca16b012b84 100644
--- a/src/endWeek/saWorkAGloryHole.js
+++ b/src/endWeek/saWorkAGloryHole.js
@@ -144,10 +144,10 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
if (slave.health.illness > 0 && slave.health.tired > 50) {
r += ` and`;
}
- if (slave.health.tired < 80) {
- r += ` tired`;
- } else {
+ if (slave.health.tired >= 80) {
r += ` exhausted`;
+ } else if (slave.health.tired >= 50) {
+ r += ` tired`;
}
r += `,</span> but no one cared.`;
}
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index 5b297f93954..855345accdb 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -401,10 +401,10 @@ App.Desc.ageAndHealth = function(slave) {
if (slave.health.illness > 0 && slave.health.tired > 50) {
r += ` and`;
}
- if (slave.health.tired < 80) {
- r += ` tired`;
- } else {
+ if (slave.health.tired >= 80) {
r += ` exhausted`;
+ } else if (slave.health.tired >= 50) {
+ r += ` tired`;
}
r += `.`;
}
--
GitLab