@rpg-engine/long-bow 0.6.74 → 0.6.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpg-engine/long-bow",
-  "version": "0.6.74",
+  "version": "0.6.76",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/components/QuestList.tsx

@@ -92,43 +92,65 @@ export const QuestList: React.FC<IQuestListProps> = ({ quests }) => {
 const formatObjectives = (
   objectives: (IQuestObjectiveKill | IQuestObjectiveInteraction)[]
 ) => {
-  return objectives
-    .map(objective => {
-      if ('killCountTarget' in objective) {
-        // This is an IQuestObjectiveKill
-        const killObjective = objective as IQuestObjectiveKill;
-        return `Kill ${formatText(killObjective.creatureKeys.join(', '))}: ${
-          killObjective.killCount
-        }/${killObjective.killCountTarget}`;
-      } else if ('targetNPCkey' in objective) {
-        // This is an IQuestObjectiveInteraction
-        const interactionObjective = objective as IQuestObjectiveInteraction;
-        return `Interact with NPC: ${formatText(
-          interactionObjective.targetNPCkey ?? 'Unknown'
-        )}`;
-      } else {
-        return 'Unknown objective';
-      }
-    })
-    .join('; ');
+  try {
+    if (!objectives || !Array.isArray(objectives)) return 'No objectives';
+    return objectives
+      .map(objective => {
+        if ('killCountTarget' in objective) {
+          const killObjective = objective as IQuestObjectiveKill;
+          return `Kill ${formatText(
+            killObjective.creatureKeys?.join(', ') ?? 'Unknown'
+          )}: ${killObjective.killCount ?? 0}/${killObjective.killCountTarget ??
+            0}`;
+        } else if ('targetNPCkey' in objective) {
+          const interactionObjective = objective as IQuestObjectiveInteraction;
+          return `Interact with NPC: ${formatText(
+            interactionObjective.targetNPCkey ?? 'Unknown'
+          )}`;
+        } else {
+          return 'Unknown objective';
+        }
+      })
+      .join('; ');
+  } catch (error) {
+    console.error('Error formatting objectives:', error);
+    return 'Error formatting objectives';
+  }
 };
 
 // Updated helper function to format rewards
 const formatRewards = (rewards: IQuest['rewards']) => {
   try {
     if (!rewards || !Array.isArray(rewards)) return 'No rewards';
+
     return rewards
       .map(reward => {
-        return `${formatText(
-          reward?.itemKeys
-            ?.map(itemKey => itemKey + ' x' + reward?.qty)
-            .join(', ')
-        )}${
-          reward?.spellKeys
-            ? `, Spells: ${formatText(reward.spellKeys.join(', '))}`
-            : ''
-        }`;
+        const itemKeysFormatted = reward?.itemKeys
+          ?.map(itemKey =>
+            itemKey && reward?.qty !== undefined
+              ? `${itemKey} x${reward.qty}`
+              : ''
+          )
+          .filter(Boolean)
+          .join(', ');
+
+        const spellKeysFormatted = reward?.spellKeys
+          ?.filter(Boolean)
+          .join(', ');
+
+        const formattedReward = itemKeysFormatted
+          ? `${formatText(itemKeysFormatted)}`
+          : '';
+
+        if (spellKeysFormatted) {
+          return formattedReward
+            ? `${formattedReward}, Spells: ${formatText(spellKeysFormatted)}`
+            : `Spells: ${formatText(spellKeysFormatted)}`;
+        }
+
+        return formattedReward || 'No rewards';
       })
+      .filter(Boolean)
       .join('; ');
   } catch (error) {
     console.error(
@@ -138,6 +160,7 @@ const formatRewards = (rewards: IQuest['rewards']) => {
     return 'Error on rewards';
   }
 };
+
 const formatText = (text: string) => {
   return text
     .split('-')