diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js index c486f3f079ca88d7e9aaa76836456deebb6daf82..9df9ad1a7a17bd82e1b0e9fcde1225c842661442 100644 --- a/src/endWeek/saWorkTheFarm.js +++ b/src/endWeek/saWorkTheFarm.js @@ -30,6 +30,7 @@ window.saWorkTheFarm = function(slave) { if (V.Farmer) { return `${V.Farmer.slaveName} watches over ${him}, making sure that ${he} doesn't slack off and works as hard as ${he} should. `; } + return ``; }; const foodDevotion = slave => { @@ -38,13 +39,12 @@ window.saWorkTheFarm = function(slave) { } else if (slave.devotion < -50) { return `${He}'s so resistant that ${he} doesn't work as hard, and thus produces less food. `; } else { - // TODO: third case for neutral? + return ``; // TODO: third case for neutral? } }; const foodHealth = slave => { - foodHealthCondition(slave); - foodHealthIllness(slave); + return foodHealthCondition(slave) + foodHealthIllness(slave); }; const foodHealthCondition = slave => { @@ -53,13 +53,14 @@ window.saWorkTheFarm = function(slave) { } else if (slave.health.condition < -50) { return `${His} poor health impedes ${his} ability to work efficiently. `; } else { - // TODO: third case? + return ``; // TODO: third case? } }; const foodHealthIllness = slave => { + let t = ``; if (slave.health.illness > 0 || slave.health.tired > 60) { - let t = ` ${He} performed worse this week due to<span class="red">`; + t += ` ${He} performed worse this week due to<span class="red">`; if (slave.health.illness === 1) { t += ` feeling under the weather`; } else if (slave.health.illness === 2) { @@ -78,9 +79,8 @@ window.saWorkTheFarm = function(slave) { t += `.</span> `; t += foodTired(slave); - - return t; } + return t; }; const foodHealthTired = slave => { @@ -89,9 +89,11 @@ window.saWorkTheFarm = function(slave) { } else if (slave.health.tired > 60) { return ` being tired`; } + return ``; }; - + const foodTired = slave => { + let t = ``; if (!slave.fuckdoll) { if (slaveResting(slave)) { t = ` ${He} spends reduced hours working the soil in order to <span class="green">offset ${his} lack of rest.</span>`; @@ -114,21 +116,21 @@ window.saWorkTheFarm = function(slave) { } else if (slave.muscles < -50) { return `${He} is so weak that ${he} is not able to work effectively. `; } else { - // TODO: third case? + return ``; // TODO: third case? } }; const foodWeight = slave => { - return slave.weight > 95 ? `${He} is so overweight that ${he} has to stop every few minutes to catch ${his} breath, and so ${his} productivity suffers. ` : null; + return slave.weight > 95 ? `${He} is so overweight that ${he} has to stop every few minutes to catch ${his} breath, and so ${his} productivity suffers. ` : ``; }; const foodSight = slave => { if (!canSee(slave)) { - t += `${His} blindness makes it extremely difficult for ${him} to work, severely limiting ${his} production. `; + return `${His} blindness makes it extremely difficult for ${him} to work, severely limiting ${his} production. `; } else if (!canSeePerfectly(slave)) { - t += `${His} nearsightedness makes it harder for ${him} to work as hard as ${he} otherwise would. `; + return `${His} nearsightedness makes it harder for ${him} to work as hard as ${he} otherwise would. `; } else { - // TODO: third case? + return ``; // TODO: third case? } }; @@ -138,7 +140,7 @@ window.saWorkTheFarm = function(slave) { } else if (slave.hears < -1) { return `${He} is deaf, which gets in the way of ${his} work whenever ${he} misses directions${V.Farmer ? ` from ${V.Farmer.slaveName}` : ``}. `; } else { - // TODO: third case? + return ``; // TODO: third case? } };