@rpg-engine/long-bow 0.8.50 → 0.8.52

package/dist/components/DailyTasks/DailyTaskItem.d.ts

@@ -8,6 +8,7 @@ interface IDailyTaskItemProps {
     itemsAtlasIMG: string;
     iconAtlasJSON?: Record<string, any>;
     iconAtlasIMG?: string;
+    isRewardClaimed: boolean;
 }
 export declare const DailyTaskItem: React.FC<IDailyTaskItemProps>;
 export {};

package/dist/components/DailyTasks/GlobalDailyProgress.d.ts

@@ -3,6 +3,7 @@ import React from 'react';
 interface IGlobalTaskProgressProps {
     tasks: ICharacterDailyTask[];
     onClaimAllRewards: (tasks: ICollectGlobalRewardRequest) => void;
+    globalRewardClaimed: boolean;
 }
 export declare const GlobalDailyProgress: React.FC<IGlobalTaskProgressProps>;
 export {};

package/dist/hooks/useDailyTasksState.d.ts

@@ -0,0 +1,13 @@
+import { ICollectGlobalRewardRequest, ITaskIdentifier, TaskType } from '@rpg-engine/shared';
+interface IUseDailyTasksStateProps {
+    onClaimReward: (task: ITaskIdentifier) => void;
+    onClaimGlobalReward: (tasks: ICollectGlobalRewardRequest) => void;
+}
+export declare function useDailyTasksState({ onClaimReward, onClaimGlobalReward, }: IUseDailyTasksStateProps): {
+    globalRewardClaimed: boolean;
+    claimedTaskKeys: string[];
+    isTaskRewardClaimed: (taskKey: string) => boolean;
+    handleClaimReward: (taskKey: string, type: TaskType) => void;
+    handleClaimGlobalRewards: (tasks: ICollectGlobalRewardRequest) => void;
+};
+export {};

package/dist/long-bow.cjs.development.js

@@ -29313,6 +29313,40 @@ var EmptyState = /*#__PURE__*/styled__default.div.withConfig({
   componentId: "sc-19q95ue-15"
 })(["position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);display:flex;flex-direction:column;align-items:center;justify-content:center;text-align:center;color:", ";width:100%;padding:2rem;svg{font-size:3rem;margin-bottom:1rem;opacity:0.7;}p{font-family:'Press Start 2P',cursive;font-size:0.9rem;margin:0;}"], uiColors.lightGray);
 
+function useDailyTasksState(_ref) {
+  var onClaimReward = _ref.onClaimReward,
+    onClaimGlobalReward = _ref.onClaimGlobalReward;
+  var _useState = React.useState(false),
+    globalRewardClaimed = _useState[0],
+    setGlobalRewardClaimed = _useState[1];
+  var _useState2 = React.useState([]),
+    claimedTaskKeys = _useState2[0],
+    setClaimedTaskKeys = _useState2[1];
+  var handleClaimReward = function handleClaimReward(taskKey, type) {
+    onClaimReward({
+      type: type,
+      taskKey: taskKey
+    });
+    setClaimedTaskKeys(function (prev) {
+      return [].concat(prev, [taskKey]);
+    });
+  };
+  var handleClaimGlobalRewards = function handleClaimGlobalRewards(tasks) {
+    onClaimGlobalReward(tasks);
+    setGlobalRewardClaimed(true);
+  };
+  var isTaskRewardClaimed = function isTaskRewardClaimed(taskKey) {
+    return claimedTaskKeys.includes(taskKey);
+  };
+  return {
+    globalRewardClaimed: globalRewardClaimed,
+    claimedTaskKeys: claimedTaskKeys,
+    isTaskRewardClaimed: isTaskRewardClaimed,
+    handleClaimReward: handleClaimReward,
+    handleClaimGlobalRewards: handleClaimGlobalRewards
+  };
+}
+
 var formatTaskKey = function formatTaskKey(key) {
   var formatted = key.replace(/[-_]/g, ' ');
   formatted = formatted.replace(/([A-Z])/g, ' $1');
@@ -29415,13 +29449,13 @@ var DailyRewardsTooltip = function DailyRewardsTooltip(_ref) {
   return React__default.createElement(TooltipContainer$1, null, React__default.createElement(CollapsibleHeader, {
     onClick: toggleExpand
   }, React__default.createElement(HeaderText, null, "Rewards?"), React__default.createElement(ExpandIcon, null, isExpanded ? '▼' : '▶')), isExpanded && React__default.createElement(CollapsibleContent, null, React__default.createElement(RewardsList, null, sortedRewards.map(function (reward, index) {
-    var _reward$key;
+    var _reward$texturePath, _reward$key;
     return React__default.createElement(RewardItem, {
       key: index
     }, React__default.createElement(SpriteFromAtlas, {
       atlasJSON: itemsAtlasJSON,
       atlasIMG: itemsAtlasIMG,
-      spriteKey: reward.type === shared.RewardType.Gold ? 'others/gold-coin-qty-6.png' : reward.type === shared.RewardType.Experience ? 'others/royal-chalice.png' : reward.texturePath || 'others/no-image.png',
+      spriteKey: (_reward$texturePath = reward.texturePath) != null ? _reward$texturePath : 'check.png',
       width: 24,
       height: 24,
       imgScale: 1.75
@@ -29466,7 +29500,7 @@ var ItemContent = /*#__PURE__*/styled__default.div.withConfig({
 var RewardLabel = /*#__PURE__*/styled__default.span.withConfig({
   displayName: "DailyRewardsTooltip__RewardLabel",
   componentId: "sc-wxzcu4-8"
-})(["color:", ";font-size:0.9rem;line-height:1.2;display:inline-flex;align-items:center;"], uiColors.yellow);
+})(["color:", ";font-size:0.9rem;line-height:1.2;padding-top:15px;display:inline-flex;align-items:center;"], uiColors.yellow);
 var RewardValue = /*#__PURE__*/styled__default.span.withConfig({
   displayName: "DailyRewardsTooltip__RewardValue",
   componentId: "sc-wxzcu4-9"
@@ -29632,10 +29666,11 @@ var DailyTaskItem = function DailyTaskItem(_ref) {
     itemsAtlasJSON = _ref.itemsAtlasJSON,
     itemsAtlasIMG = _ref.itemsAtlasIMG,
     iconAtlasJSON = _ref.iconAtlasJSON,
-    iconAtlasIMG = _ref.iconAtlasIMG;
+    iconAtlasIMG = _ref.iconAtlasIMG,
+    isRewardClaimed = _ref.isRewardClaimed;
   var isMobile = shared.isMobileOrTablet();
   var isCompleted = task.status === shared.TaskStatus.Completed;
-  var isClaimed = task.claimed;
+  var isClaimed = task.claimed || isRewardClaimed;
   var handleClaimReward = function handleClaimReward() {
     onClaimReward(task.key, task.type);
   };
@@ -29696,29 +29731,36 @@ var CollectWrapper = /*#__PURE__*/styled__default.div.withConfig({
 
 var GlobalDailyProgress = function GlobalDailyProgress(_ref) {
   var tasks = _ref.tasks,
-    onClaimAllRewards = _ref.onClaimAllRewards;
+    onClaimAllRewards = _ref.onClaimAllRewards,
+    globalRewardClaimed = _ref.globalRewardClaimed;
   var totalTasks = tasks.length;
   var completedTasks = tasks.filter(function (task) {
     return task.status === shared.TaskStatus.Completed;
   }).length;
-  var claimedTasks = tasks.filter(function (task) {
+  var allCompleted = tasks.length > 0 && tasks.every(function (task) {
+    return task.status === shared.TaskStatus.Completed;
+  });
+  var allClaimed = tasks.length > 0 && tasks.every(function (task) {
     return task.claimed === true;
-  }).length;
-  var allCompleted = completedTasks === totalTasks;
-  var allClaimed = claimedTasks === totalTasks;
-  var _React$useState = React__default.useState(false),
-    isClaimed = _React$useState[0],
-    setIsClaimed = _React$useState[1];
-  var handleClaimAll = function handleClaimAll(tasks) {
-    onClaimAllRewards(tasks);
-    setIsClaimed(true);
+  });
+  var shouldShowGlobalButton = allCompleted && allClaimed && !globalRewardClaimed;
+  var handleClaimAll = function handleClaimAll() {
+    var taskIdentifiers = tasks.map(function (task) {
+      return {
+        taskKey: task.key,
+        type: task.type
+      };
+    });
+    onClaimAllRewards({
+      tasks: taskIdentifiers
+    });
   };
   return React__default.createElement(GlobalProgressContainer, null, React__default.createElement(HeaderContainer$1, null, React__default.createElement(GlobeIcon, null, "\uD83C\uDF0D"), React__default.createElement(ProgressText, null, "Global Tasks Completed: ", completedTasks, "/", totalTasks)), React__default.createElement(ProgressBar, null, React__default.createElement(ProgressFill, {
     percentage: completedTasks / totalTasks * 100
-  })), totalTasks > 0 && allCompleted && allClaimed && React__default.createElement(React__default.Fragment, null, isClaimed ? React__default.createElement(ClaimedText$1, null, "Global Rewards Claimed") : React__default.createElement(CollectWrapper$1, null, React__default.createElement(Button, {
+  })), allCompleted && React__default.createElement(React__default.Fragment, null, shouldShowGlobalButton ? React__default.createElement(CollectWrapper$1, null, React__default.createElement(Button, {
     buttonType: exports.ButtonTypes.RPGUIButton,
     onPointerDown: handleClaimAll
-  }, "Collect Global Rewards"))));
+  }, "Collect Global Rewards")) : React__default.createElement(ClaimedText$1, null, "Global Rewards Claimed")));
 };
 var GlobalProgressContainer = /*#__PURE__*/styled__default.div.withConfig({
   displayName: "GlobalDailyProgress__GlobalProgressContainer",
@@ -29767,35 +29809,16 @@ var DailyTasks = function DailyTasks(_ref) {
     iconAtlasJSON = _ref.iconAtlasJSON,
     iconAtlasIMG = _ref.iconAtlasIMG;
   var _React$useState = React__default.useState(tasks),
-    localTasks = _React$useState[0],
-    setLocalTasks = _React$useState[1];
+    localTasks = _React$useState[0];
   var size = useResponsiveSize(scale);
-  var handleClaimReward = function handleClaimReward(taskKey, type) {
-    setLocalTasks(function (prevTasks) {
-      return prevTasks.map(function (task) {
-        return task.key === taskKey ? _extends({}, task, {
-          claimed: true
-        }) : task;
-      });
-    });
-    onClaimReward({
-      type: type,
-      taskKey: taskKey
-    });
-  };
-  var handleClaimAllRewards = function handleClaimAllRewards() {
-    var tasksToReward = localTasks.filter(function (task) {
-      return task.status === shared.TaskStatus.Completed && !task.claimed;
-    }).map(function (task) {
-      return {
-        type: task.type,
-        taskKey: task.key
-      };
-    });
-    onClaimGlobalReward({
-      tasks: tasksToReward
-    });
-  };
+  var _useDailyTasksState = useDailyTasksState({
+      onClaimReward: onClaimReward,
+      onClaimGlobalReward: onClaimGlobalReward
+    }),
+    globalRewardClaimed = _useDailyTasksState.globalRewardClaimed,
+    handleClaimReward = _useDailyTasksState.handleClaimReward,
+    handleClaimGlobalRewards = _useDailyTasksState.handleClaimGlobalRewards,
+    isTaskRewardClaimed = _useDailyTasksState.isTaskRewardClaimed;
   if (!size) return null;
   return React__default.createElement(TasksContainer, {
     type: exports.RPGUIContainerTypes.Framed,
@@ -29808,7 +29831,8 @@ var DailyTasks = function DailyTasks(_ref) {
     className: "tasks-container"
   }, React__default.createElement(GlobalDailyProgress, {
     tasks: localTasks,
-    onClaimAllRewards: handleClaimAllRewards
+    onClaimAllRewards: handleClaimGlobalRewards,
+    globalRewardClaimed: globalRewardClaimed
   }), localTasks.map(function (task) {
     return React__default.createElement(DailyTaskItem, {
       key: task.key,
@@ -29818,7 +29842,8 @@ var DailyTasks = function DailyTasks(_ref) {
       itemsAtlasJSON: itemsAtlasJSON,
       itemsAtlasIMG: itemsAtlasIMG,
       iconAtlasJSON: iconAtlasJSON,
-      iconAtlasIMG: iconAtlasIMG
+      iconAtlasIMG: iconAtlasIMG,
+      isRewardClaimed: isTaskRewardClaimed(task.key)
     });
   }))));
 };