diff --git a/src/endWeek/saGetMilked.js b/src/endWeek/saGetMilked.js index 7c39a5350ab681a7f9e6777fc49ab70d8cdfda63..452972b8a0d4fbfc0a17b8bdcf71d7244ac41648 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 15a8066a29270355c33194a45f25b7caeadbd098..48a00a37b19e453013d511fbca7e0fe5e2ef3288 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 e78fd73f4d123a6430869e4593a150ff9b49bb20..62da70c088d5b58e126df8afb1860053f302cc44 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 40870d8afcfe47ae984a43154bb0482352e63671..9e539fcd286accbf9588e808984fe666f5d72cad 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 ac5e7ef92978e2f2e9df61dd048cb35bbbfb8583..9561306dc93c58eb47f6064003414ef69aec3314 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 77a9c4080d389a48405e73537066de2dac73e64d..2f8cc4ee4639146273c1ef192e202f46a337e67d 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 86f2552a27e44e3543e7d02c95b9c3c398aa4138..a5d60017db9af40261a9e39796535cf56c013d0f 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 7b1c8c8f51265ab3834f8eaa84232bbf35058602..ca16b012b8400ffe6204b3ffe1ba2307fb0f2c9c 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 7c48f7cab7d8b44f8b61db49c869e928ae5d57e1..2cb5e4221676dd0e06238e21c922d8fe3dbce480 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 9f777d660f6dc7290472a5dbd3f2c0bfd58bf2df..62592fd5dc04d7e42ed06ec68b568d45eaf8ca8e 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>`; } }