From e096320c3b750a8e0f8b49f1c17cc4259a8e6e6e Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 19 Sep 2020 00:17:15 -0400
Subject: [PATCH] Fix some loose ands
---
src/endWeek/saPleaseYou.js | 11 +++++------
src/endWeek/saServant.js | 11 +++++------
src/endWeek/saServeYourOtherSlaves.js | 11 +++++------
3 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/src/endWeek/saPleaseYou.js b/src/endWeek/saPleaseYou.js
index 2499dbb513a..d206c252d0b 100644
--- a/src/endWeek/saPleaseYou.js
+++ b/src/endWeek/saPleaseYou.js
@@ -1456,17 +1456,16 @@ App.SlaveAssignment.pleaseYou = (function() {
r.push(`${He} is<span class="red">`);
if (slave.health.tired > 60) {
if (slave.health.illness === 1) {
- r.push(`feeling under the weather`);
+ r.push(`feeling under the weather and`);
} else if (slave.health.illness === 2) {
- r.push(`somewhat ill`);
+ r.push(`somewhat ill and`);
} else if (slave.health.illness === 3) {
- r.push(`sick`);
+ r.push(`sick and`);
} else if (slave.health.illness === 4) {
- r.push(`very sick`);
+ r.push(`very sick and`);
} else if (slave.health.illness === 5) {
- r.push(`terribly ill`);
+ r.push(`terribly ill and`);
}
- r.push(`and`);
} else {
if (slave.health.illness === 1) {
r.push(`feeling under the weather,`);
diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js
index 7aee822d5cb..ecfa750edb6 100644
--- a/src/endWeek/saServant.js
+++ b/src/endWeek/saServant.js
@@ -189,17 +189,16 @@ App.SlaveAssignment.servant = (function() {
r.push(`${He} is<span class="red">`);
if (slave.health.tired > 60) {
if (slave.health.illness === 1) {
- r.push(`feeling under the weather`);
+ r.push(`feeling under the weather and`);
} else if (slave.health.illness === 2) {
- r.push(`somewhat ill`);
+ r.push(`somewhat ill and`);
} else if (slave.health.illness === 3) {
- r.push(`sick`);
+ r.push(`sick and`);
} else if (slave.health.illness === 4) {
- r.push(`very sick`);
+ r.push(`very sick and`);
} else if (slave.health.illness === 5) {
- r.push(`terribly ill`);
+ r.push(`terribly ill and`);
}
- r.push(`and`);
} else {
if (slave.health.illness === 1) {
r.push(`feeling under the weather,`);
diff --git a/src/endWeek/saServeYourOtherSlaves.js b/src/endWeek/saServeYourOtherSlaves.js
index d37eb9a6a82..400bde9452b 100644
--- a/src/endWeek/saServeYourOtherSlaves.js
+++ b/src/endWeek/saServeYourOtherSlaves.js
@@ -1652,17 +1652,16 @@ App.SlaveAssignment.serveYourOtherSlaves = (function() {
r.push(`is<span class="red">`);
if (slave.health.tired > 60) {
if (slave.health.illness === 1) {
- r.push(`feeling under the weather`);
+ r.push(`feeling under the weather and`);
} else if (slave.health.illness === 2) {
- r.push(`somewhat ill`);
+ r.push(`somewhat ill and`);
} else if (slave.health.illness === 3) {
- r.push(`sick`);
+ r.push(`sick and`);
} else if (slave.health.illness === 4) {
- r.push(`very sick`);
+ r.push(`very sick and`);
} else if (slave.health.illness === 5) {
- r.push(`terribly ill`);
+ r.push(`terribly ill and`);
}
- r.push(`and`);
} else {
if (slave.health.illness === 1) {
r.push(`feeling under the weather,`);
--
GitLab