@stackedapp/utils 2.61.1 → 2.62.1

package/dist/conditions/handlers.js

@@ -296,18 +296,22 @@ function evaluateAchievement(cond, ctx) {
     const playerAchData = ctx.snap.achievements?.[cond.id];
     const details = [];
     let isMet = true;
-    if (!playerAchData) {
-        isMet = false;
+    // Legacy "must have it" detail; minCount: 0 is treated as undefined for back-compat.
+    const hasPositiveMin = cond.minCount != null && cond.minCount > 0;
+    if (!hasPositiveMin && cond.maxCount == null) {
+        const met = !!playerAchData;
+        if (!met)
+            isMet = false;
         details.push({
-            isMet: false,
+            isMet: met,
             kind: 'achievement',
-            trackerAmount: 0,
+            trackerAmount: met ? 1 : 0,
             trackerGoal: 1,
-            percentCompleted: 0,
-            text: templateText(cond, { current: 0, goal: 1, name: cond.name }, `Have the achievement ${cond.name}`),
+            percentCompleted: met ? 100 : 0,
+            text: templateText(cond, { current: met ? 1 : 0, goal: 1, name: cond.name }, `Have the achievement ${cond.name}`),
         });
     }
-    if (cond.minCount) {
+    if (hasPositiveMin) {
         const trackerAmount = playerAchData?.count || 0;
         const trackerGoal = cond.minCount;
         const met = trackerAmount >= trackerGoal;
@@ -322,13 +326,29 @@ function evaluateAchievement(cond, ctx) {
             text: templateText(cond, { current: trackerAmount, goal: trackerGoal, name: cond.name }, `Have the achievement ${cond.name} more than ${trackerGoal} times`),
         });
     }
+    if (cond.maxCount != null) {
+        const trackerAmount = playerAchData?.count || 0;
+        const met = trackerAmount <= cond.maxCount;
+        if (!met)
+            isMet = false;
+        details.push({
+            isMet: met,
+            kind: 'achievement',
+            trackerAmount,
+            trackerGoal: cond.maxCount,
+            percentCompleted: met ? 100 : 0,
+            text: templateText(cond, { current: trackerAmount, goal: cond.maxCount, name: cond.name }, cond.maxCount === 0
+                ? `Do not have the achievement ${cond.name}`
+                : `Have the achievement ${cond.name} at most ${cond.maxCount} times`),
+        });
+    }
     return { isMet, details };
 }
 function evaluateMembership(cond, ctx) {
     const playerData = ctx.snap.memberships?.[cond.id];
     const details = [];
     let isMet = true;
-    if (cond.minCount) {
+    if (cond.minCount != null) {
         const trackerAmount = playerData?.count || 0;
         const trackerGoal = cond.minCount;
         const met = trackerAmount >= trackerGoal;
@@ -343,7 +363,7 @@ function evaluateMembership(cond, ctx) {
             text: templateText(cond, { current: trackerAmount, goal: trackerGoal, name: cond.name }, trackerGoal > 1 ? `Have at least ${trackerGoal} ${cond.name} memberships` : `Have a ${cond.name} membership`),
         });
     }
-    if (cond.maxCount) {
+    if (cond.maxCount != null) {
         const trackerAmount = playerData?.count || 0;
         const met = trackerAmount <= cond.maxCount;
         if (!met)
@@ -354,10 +374,13 @@ function evaluateMembership(cond, ctx) {
             trackerAmount,
             trackerGoal: cond.maxCount,
             percentCompleted: met ? 100 : 0,
-            text: templateText(cond, { current: trackerAmount, goal: cond.maxCount, name: cond.name }, `Have less than ${cond.maxCount} ${cond.name} memberships`),
+            text: templateText(cond, { current: trackerAmount, goal: cond.maxCount, name: cond.name }, cond.maxCount === 0
+                ? `Do not have a ${cond.name} membership`
+                : `Have at most ${cond.maxCount} ${cond.name} memberships`),
         });
     }
     const timeOwned = (playerData?.expiresAt || 0) - Date.now();
+    // Truthy check: timeOwned is hugely negative when no membership exists, so `!= null` would make minMs: 0 misfire.
     if (cond.minMs) {
         const trackerAmount = Number((timeOwned / (1000 * 60 * 60 * 24)).toFixed(1));
         const trackerGoal = Number((cond.minMs / (1000 * 60 * 60 * 24)).toFixed(1));
@@ -373,7 +396,7 @@ function evaluateMembership(cond, ctx) {
             text: templateText(cond, { current: trackerAmount, goal: trackerGoal, name: cond.name }, `Own ${cond.name} membership for at least ${trackerGoal} days`),
         });
     }
-    if (cond.maxMs) {
+    if (cond.maxMs != null) {
         const trackerAmount = Number((timeOwned / (1000 * 60 * 60 * 24)).toFixed(1));
         const met = timeOwned <= cond.maxMs;
         if (!met)
@@ -392,25 +415,55 @@ function evaluateMembership(cond, ctx) {
 function evaluateQuest(cond, ctx) {
     const playerQuestData = ctx.snap.quests?.[cond.id];
     const trackerAmount = playerQuestData?.completions || 0;
-    const trackerGoal = cond.completions || 1;
-    const isMet = playerQuestData ? trackerAmount >= (cond.completions || 0) : false;
-    return {
-        isMet,
-        details: [
-            {
-                isMet,
-                kind: 'quest',
-                trackerAmount,
-                trackerGoal,
-                percentCompleted: (0, helpers_1.calculatePercent)(trackerAmount, trackerGoal, isMet),
-                text: templateText(cond, { current: trackerAmount, goal: trackerGoal, name: cond.name }, cond.completions === 1
-                    ? `Complete the quest ${cond.name}`
-                    : (cond.completions || 0) < 1
-                        ? `Start the quest ${cond.name}`
-                        : `Complete the quest ${cond.name} ${cond.completions} times`),
-            },
-        ],
-    };
+    const details = [];
+    let isMet = true;
+    // Legacy "must have started" detail; completions: 0 is treated as undefined for back-compat.
+    const hasPositiveMin = cond.completions != null && cond.completions > 0;
+    if (!hasPositiveMin && cond.maxCompletions == null) {
+        const met = !!playerQuestData;
+        if (!met)
+            isMet = false;
+        details.push({
+            isMet: met,
+            kind: 'quest',
+            trackerAmount,
+            trackerGoal: 1,
+            percentCompleted: met ? 100 : 0,
+            text: templateText(cond, { current: trackerAmount, goal: 1, name: cond.name }, `Start the quest ${cond.name}`),
+        });
+    }
+    if (hasPositiveMin) {
+        const trackerGoal = cond.completions;
+        const met = trackerAmount >= trackerGoal;
+        if (!met)
+            isMet = false;
+        details.push({
+            isMet: met,
+            kind: 'quest',
+            trackerAmount,
+            trackerGoal,
+            percentCompleted: (0, helpers_1.calculatePercent)(trackerAmount, trackerGoal, met),
+            text: templateText(cond, { current: trackerAmount, goal: trackerGoal, name: cond.name }, trackerGoal === 1
+                ? `Complete the quest ${cond.name}`
+                : `Complete the quest ${cond.name} ${trackerGoal} times`),
+        });
+    }
+    if (cond.maxCompletions != null) {
+        const met = trackerAmount <= cond.maxCompletions;
+        if (!met)
+            isMet = false;
+        details.push({
+            isMet: met,
+            kind: 'quest',
+            trackerAmount,
+            trackerGoal: cond.maxCompletions,
+            percentCompleted: met ? 100 : 0,
+            text: templateText(cond, { current: trackerAmount, goal: cond.maxCompletions, name: cond.name }, cond.maxCompletions === 0
+                ? `Do not complete the quest ${cond.name}`
+                : `Complete the quest ${cond.name} at most ${cond.maxCompletions} times`),
+        });
+    }
+    return { isMet, details };
 }
 function evaluateEntityLink(cond, ctx) {
     const linkCount = ctx.snap.entityLinks?.filter((link) => (link.kind || types_1.DEFAULT_ENTITY_KIND) === cond.linkKind).length || 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stackedapp/utils",
-  "version": "2.61.1",
+  "version": "2.62.1",
   "description": "Public utilities for Stacked platform SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",