diff --git a/src/endWeek/saGetMilked.js b/src/endWeek/saGetMilked.js index 6c7251d651ded37ff47c2887cb04adb2412bbae4..452972b8a0d4fbfc0a17b8bdcf71d7244ac41648 100644 --- a/src/endWeek/saGetMilked.js +++ b/src/endWeek/saGetMilked.js @@ -575,10 +575,10 @@ window.saGetMilked = (function saGetMilked() { if (slave.health.illness > 0 && slave.health.tired > 50) { r += ` and`; } - if (slave.health.tired < 80) { - r += ` being tired`; - } else { + if (slave.health.tired >= 80) { r += ` exhaustion`; + } else if (slave.health.tired >= 50) { + r += ` being tired`; } r += `.</span>`; } diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js index 3c56cf89b7c49b8f1a12fdeeb5a30846e5a0fee0..4b0b2d02fa41bea69a6b5e319ec459df5ff91f2b 100644 --- a/src/endWeek/saServant.js +++ b/src/endWeek/saServant.js @@ -64,27 +64,27 @@ window.saServant = function saServant(slave) { } if (slave.health.illness > 0 || slave.health.tired > 50) { - t += ` ${He} performed worse this week due to<span class="red">`; + r += ` ${He} performed worse this week due to<span class="red">`; if (slave.health.illness === 1) { - t += ` feeling under the weather`; + r += ` feeling under the weather`; } else if (slave.health.illness === 2) { - t += ` a minor illness`; + r += ` a minor illness`; } else if (slave.health.illness === 3) { - t += ` being sick`; + r += ` being sick`; } else if (slave.health.illness === 4) { - t += ` being very sick`; + r += ` being very sick`; } else if (slave.health.illness === 5) { - t += ` a terrible illness`; + r += ` a terrible illness`; } if (slave.health.illness > 0 && slave.health.tired > 50) { - t += ` and`; + r += ` and`; } - if (slave.health.tired < 80) { - t += ` being tired`; - } else { - t += ` exhaustion`; + if (slave.health.tired >= 80) { + r += ` exhaustion`; + } else if (slave.health.tired >= 50) { + r += ` being tired`; } - t += `.</span>`; + r += `.</span>`; } // TODO: this flat unchecked oral sex is a bit problematic diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js index 32e25d8ef2f9e31595c241eaddbc4af1139d0b9d..9e539fcd286accbf9588e808984fe666f5d72cad 100644 --- a/src/endWeek/saServeThePublic.js +++ b/src/endWeek/saServeThePublic.js @@ -380,10 +380,10 @@ window.saServeThePublic = (function saServeThePublic() { if (slave.health.illness > 0 && slave.health.tired > 50) { r += ` and`; } - if (slave.health.tired < 80) { - r += ` being tired`; - } else { + if (slave.health.tired >= 80) { r += ` exhaustion`; + } else if (slave.health.tired >= 50) { + r += ` being tired`; } r += `.</span>`; } diff --git a/src/endWeek/saTakeClasses.js b/src/endWeek/saTakeClasses.js index 032e367c5896e36d5ad9fb31ea88326ecba3f89b..2f8cc4ee4639146273c1ef192e202f46a337e67d 100644 --- a/src/endWeek/saTakeClasses.js +++ b/src/endWeek/saTakeClasses.js @@ -112,10 +112,10 @@ window.saTakeClasses = (function saServeThePublic() { if (slave.health.illness > 0 && slave.health.tired > 50) { r += ` and`; } - if (slave.health.tired < 80) { - r += ` being tired`; - } else { + if (slave.health.tired >= 80) { r += ` exhaustion`; + } else if (slave.health.tired >= 50) { + r += ` being tired`; } r += `.</span>`; } diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js index e4bd144f6998bc8eda25c0d1f25e679c377eb949..be4d010d4d16aab441046389553d41a5663c2cb9 100644 --- a/src/endWeek/saWhore.js +++ b/src/endWeek/saWhore.js @@ -442,10 +442,10 @@ window.saWhore = (function saWhore() { if (slave.health.illness > 0 && slave.health.tired > 50) { r += ` and`; } - if (slave.health.tired < 80) { - r += ` being tired`; - } else { + if (slave.health.tired >= 80) { r += ` exhaustion`; + } else if (slave.health.tired >= 50) { + r += ` being tired`; } r += `.</span>`; }