diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js index 01bf345a7416adef644a3699fd9d91f20c9e98b0..fa68975f0b9038b52116dc1bf2cb3bb2a7b4f4cf 100644 --- a/src/endWeek/healthFunctions.js +++ b/src/endWeek/healthFunctions.js @@ -646,11 +646,10 @@ window.restEffects = function restEffects(slave, exhaustion) { return .25; } else if (slave.tired + exhaustion >= 90 && !willWorkToDeath(slave)) { return .10; - } else if (slave.tired > 60 && slave.assignment !== "work a glory hole") { + } else { return healthPenalty(slave); } } - return 1; }; /** diff --git a/src/js/food.js b/src/js/food.js index 1f13eabcad8e8aacbe5ffd921ba38f9bdf68851c..34c908b82fd8199f0c0e9e9c88d5ccbb9ce9bad6 100644 --- a/src/js/food.js +++ b/src/js/food.js @@ -57,7 +57,7 @@ App.Facilities.Farmyard.foodAmount = function(slave) { } else if (slave.hears < -1) { // slave is deaf food *= 0.6; } - food *= restEffects(slave); + food *= restEffects(slave, 20); food = Math.trunc(food); food = Math.clamp(food, 1, 1000000000000000000); return food; diff --git a/src/js/health.js b/src/js/health.js index 4bd57827f098b893388c33bded891c3293bd1d8e..ea5b6404a16abefea725506ae759445aa3134617 100644 --- a/src/js/health.js +++ b/src/js/health.js @@ -21,10 +21,12 @@ window.healthPenalty = function healthPenalty(slave) { penalty *= 0.95; } } - if (H.tired > 90) { - penalty *= 0.75; - } else if (H.tired > 60) { - penalty *= 0.90; + if (slave.assignment !== "work a glory hole") { + if (H.tired > 90) { + penalty *= 0.75; + } else if (H.tired > 60) { + penalty *= 0.90; + } } penalty = Math.trunc(penalty) / 100; return penalty;