From 97168d8b35ad59dda1671a56a279a3a7a1cad135 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 2 Jan 2020 13:53:01 -0800
Subject: [PATCH] Revert "Merge branch 'small-health-desc-fix' into
'pregmod-master'"
This reverts merge request !5713
---
src/endWeek/saGetMilked.js | 4 ++--
src/endWeek/saRest.js | 4 ++--
src/endWeek/saServant.js | 4 ++--
src/endWeek/saServeThePublic.js | 4 ++--
src/endWeek/saStayConfined.js | 4 ++--
src/endWeek/saTakeClasses.js | 4 ++--
src/endWeek/saWhore.js | 4 ++--
src/endWeek/saWorkAGloryHole.js | 4 ++--
src/endWeek/saWorkTheFarm.js | 4 ++--
src/js/descriptionWidgets.js | 4 ++--
10 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/endWeek/saGetMilked.js b/src/endWeek/saGetMilked.js
index 7c39a5350ab..452972b8a0d 100644
--- a/src/endWeek/saGetMilked.js
+++ b/src/endWeek/saGetMilked.js
@@ -575,9 +575,9 @@ window.saGetMilked = (function saGetMilked() {
if (slave.health.illness > 0 && slave.health.tired > 50) {
r += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired >= 80) {
r += ` exhaustion`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired >= 50) {
r += ` being tired`;
}
r += `.</span>`;
diff --git a/src/endWeek/saRest.js b/src/endWeek/saRest.js
index 15a8066a292..48a00a37b19 100644
--- a/src/endWeek/saRest.js
+++ b/src/endWeek/saRest.js
@@ -72,9 +72,9 @@ window.saRest = function saRest(slave) {
if (slave.health.illness > 0 && slave.health.tired > 50) {
t += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired >= 80) {
t += ` exhausted`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired >= 50) {
t += ` tired`;
}
t += `,</span> ${he} greatly appreciates being allowed to rest.`;
diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js
index e78fd73f4d1..62da70c088d 100644
--- a/src/endWeek/saServant.js
+++ b/src/endWeek/saServant.js
@@ -79,9 +79,9 @@ window.saServant = function saServant(slave) {
if (slave.health.illness > 0 && slave.health.tired > 50) {
t += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired >= 80) {
t += ` exhaustion`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired >= 50) {
t += ` being tired`;
}
t += `.</span>`;
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 40870d8afcf..9e539fcd286 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -380,9 +380,9 @@ window.saServeThePublic = (function saServeThePublic() {
if (slave.health.illness > 0 && slave.health.tired > 50) {
r += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired >= 80) {
r += ` exhaustion`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired >= 50) {
r += ` being tired`;
}
r += `.</span>`;
diff --git a/src/endWeek/saStayConfined.js b/src/endWeek/saStayConfined.js
index ac5e7ef9297..9561306dc93 100644
--- a/src/endWeek/saStayConfined.js
+++ b/src/endWeek/saStayConfined.js
@@ -64,9 +64,9 @@ window.saStayConfined = function saStayConfined(slave) {
if (slave.health.illness > 0 && slave.health.tired > 50) {
t += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired >= 80) {
t += ` exhausted`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired >= 50) {
t += ` tired`;
}
t += `,</span> so ${his} misery only grows.`;
diff --git a/src/endWeek/saTakeClasses.js b/src/endWeek/saTakeClasses.js
index 77a9c4080d3..2f8cc4ee463 100644
--- a/src/endWeek/saTakeClasses.js
+++ b/src/endWeek/saTakeClasses.js
@@ -112,9 +112,9 @@ window.saTakeClasses = (function saServeThePublic() {
if (slave.health.illness > 0 && slave.health.tired > 50) {
r += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired >= 80) {
r += ` exhaustion`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired >= 50) {
r += ` being tired`;
}
r += `.</span>`;
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index 86f2552a27e..a5d60017db9 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -442,9 +442,9 @@ window.saWhore = (function saWhore() {
if (slave.health.illness > 0 && slave.health.tired > 50) {
r += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired >= 80) {
r += ` exhaustion`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired >= 50) {
r += ` being tired`;
}
r += `.</span>`;
diff --git a/src/endWeek/saWorkAGloryHole.js b/src/endWeek/saWorkAGloryHole.js
index 7b1c8c8f512..ca16b012b84 100644
--- a/src/endWeek/saWorkAGloryHole.js
+++ b/src/endWeek/saWorkAGloryHole.js
@@ -144,9 +144,9 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
if (slave.health.illness > 0 && slave.health.tired > 50) {
r += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired >= 80) {
r += ` exhausted`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired >= 50) {
r += ` tired`;
}
r += `,</span> but no one cared.`;
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index 7c48f7cab7d..2cb5e422167 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -102,9 +102,9 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
if (slave.health.illness > 0 && slave.health.tired > 50) {
t += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired >= 80) {
t += ` exhaustion`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired >= 50) {
t += ` being tired`;
}
t += `.</span> `;
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index 9f777d660f6..62592fd5dc0 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -399,9 +399,9 @@ App.Desc.ageAndHealth = function(slave) {
if (slave.health.illness > 0 && slave.health.tired > 50) {
r += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired >= 80) {
r += ` <span class="red">exhausted.</span>`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired >= 50) {
r += ` <span class="yellow">tired.</span>`;
}
}
--
GitLab