Give bonus hearts for chore completion

zaratanDotWorld · Jul 14, 2024 · 76c5102 · 76c5102
1 parent 42e48b2
commit 76c5102
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/bolt/chores.app.js b/src/bolt/chores.app.js
@@ -129,6 +129,10 @@ app.event('app_home_opened', async ({ body, event }) => {
         const text = 'You missed too many chores last month, ' +
           `and lost *${penaltyHeart.value.toFixed(1)}* hearts...`;
         await postEphemeral(penaltyHeart.residentId, text);
+      } else if (penaltyHeart.value > 0) {
+        const text = 'You did all your chores last month, ' +
+          `and earned *${penaltyHeart.value.toFixed(1)}* hearts!`;
+        await postEphemeral(penaltyHeart.residentId, text);
       }
     }
 

diff --git a/src/core/chores.js b/src/core/chores.js
@@ -487,9 +487,14 @@ exports.calculatePenalty = async function (residentId, penaltyTime) {
   const prevMonthStart = getMonthStart(prevMonthEnd);
   const choreStats = await exports.getChoreStats(residentId, prevMonthStart, prevMonthEnd);
 
-  const deficiency = Math.max(choreStats.pointsOwed - choreStats.pointsEarned, 0);
-  const truncatedDeficiency = Math.floor(deficiency / penaltyIncrement) * penaltyIncrement;
-  return truncatedDeficiency / (2 * penaltyIncrement);
+  const deficiency = choreStats.pointsOwed - choreStats.pointsEarned;
+
+  if (deficiency <= 0) {
+    return -0.5;
+  } else {
+    const truncatedDeficiency = Math.floor(deficiency / penaltyIncrement) * penaltyIncrement;
+    return truncatedDeficiency / (2 * penaltyIncrement);
+  }
 };
 
 // Chore Point Gifting

diff --git a/test/chores.test.js b/test/chores.test.js
@@ -752,9 +752,9 @@ describe('Chores', async () => {
       let penalty;
       const penaltyTime = new Date(getNextMonthStart(feb1).getTime() + penaltyDelay);
       penalty = await Chores.calculatePenalty(RESIDENT1, penaltyTime);
-      expect(penalty).to.equal(0);
+      expect(penalty).to.equal(-0.5);
       penalty = await Chores.calculatePenalty(RESIDENT2, penaltyTime);
-      expect(penalty).to.equal(0);
+      expect(penalty).to.equal(-0.5);
       penalty = await Chores.calculatePenalty(RESIDENT3, penaltyTime);
       expect(penalty).to.equal(0.5);
     });
@@ -794,7 +794,7 @@ describe('Chores', async () => {
       let penaltyHearts;
       penaltyHearts = await Chores.addChorePenalties(HOUSE, penaltyTime);
       expect(penaltyHearts.length).to.equal(3);
-      expect(penaltyHearts[0].value).to.equal(0);
+      expect(penaltyHearts[0].value).to.equal(0.5);
       expect(penaltyHearts[1].value).to.equal(-2.5);
       expect(penaltyHearts[2].value).to.equal(-5.0);