diff --git a/src/endWeek/saRest.js b/src/endWeek/saRest.js index d8b2a69684b42e0ccbaeb2204644949d68345d72..48a00a37b19e453013d511fbca7e0fe5e2ef3288 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 67cf06914040383f68673afbe6e8c937c0ba7bf1..9561306dc93c58eb47f6064003414ef69aec3314 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 73e03974ccf74809f8767a079ad4407d17187241..ca16b012b8400ffe6204b3ffe1ba2307fb0f2c9c 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 5b297f939546b5b1638bbe4c002332d99265eccd..855345accdb4b7b9334443f1c755e8dcd339f3c2 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 += `.`; }