@rpg-engine/long-bow 0.8.52 → 0.8.53

package/package.json

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

package/src/components/DailyTasks/DailyTasks.tsx

@@ -1,12 +1,12 @@
 import {
   ICharacterDailyTask,
   ICollectGlobalRewardRequest,
-  ITaskIdentifier,
+  ICollectRewardRequest,
+  TaskType,
 } from '@rpg-engine/shared';
-import React from 'react';
+import React, { useState } from 'react';
 import styled from 'styled-components';
 import { uiColors } from '../../constants/uiColors';
-import { useDailyTasksState } from '../../hooks/useDailyTasksState';
 import { useResponsiveSize } from '../CraftBook/hooks/useResponsiveSize';
 import { DraggableContainer } from '../DraggableContainer';
 import { RPGUIContainerTypes } from '../RPGUI/RPGUIContainer';
@@ -16,7 +16,7 @@ import { getTaskIcon } from './utils/dailyTasks.utils';
 
 export interface IDailyTasksProps {
   tasks: ICharacterDailyTask[];
-  onClaimReward: (task: ITaskIdentifier) => void;
+  onClaimReward: (task: ICollectRewardRequest) => void;
   onClaimGlobalReward: (tasks: ICollectGlobalRewardRequest) => void;
   onClose: () => void;
   scale?: number;
@@ -24,6 +24,7 @@ export interface IDailyTasksProps {
   itemsAtlasIMG: string;
   iconAtlasJSON?: Record<string, any>;
   iconAtlasIMG?: string;
+  globalRewardClaimed?: boolean;
 }
 
 export const DailyTasks: React.FC<IDailyTasksProps> = ({
@@ -36,19 +37,31 @@ export const DailyTasks: React.FC<IDailyTasksProps> = ({
   itemsAtlasIMG,
   iconAtlasJSON,
   iconAtlasIMG,
+  globalRewardClaimed = false,
 }): JSX.Element | null => {
   const [localTasks] = React.useState(tasks);
   const size = useResponsiveSize(scale);
+  const [claimedTasks, setClaimedTasks] = useState<string[]>([]);
+  const [globalRewardClaimedLocal, setGlobalRewardClaimedLocal] = useState(
+    false
+  );
+
+  const handleClaimReward = (taskKey: string, taskType: TaskType) => {
+    onClaimReward({
+      taskKey,
+      type: taskType,
+    });
+    setClaimedTasks(prev => [...prev, taskKey]);
+  };
+
+  const handleClaimGlobalRewards = (tasks: ICollectGlobalRewardRequest) => {
+    onClaimGlobalReward(tasks);
+    setGlobalRewardClaimedLocal(true);
+  };
 
-  const {
-    globalRewardClaimed,
-    handleClaimReward,
-    handleClaimGlobalRewards,
-    isTaskRewardClaimed,
-  } = useDailyTasksState({
-    onClaimReward,
-    onClaimGlobalReward,
-  });
+  const isTaskRewardClaimed = (taskKey: string): boolean => {
+    return claimedTasks.includes(taskKey);
+  };
 
   if (!size) return null;
 
@@ -67,7 +80,9 @@ export const DailyTasks: React.FC<IDailyTasksProps> = ({
           <GlobalDailyProgress
             tasks={localTasks}
             onClaimAllRewards={handleClaimGlobalRewards}
-            globalRewardClaimed={globalRewardClaimed}
+            globalRewardClaimed={
+              globalRewardClaimed || globalRewardClaimedLocal
+            }
           />
           {localTasks.map(task => (
             <DailyTaskItem
@@ -79,7 +94,7 @@ export const DailyTasks: React.FC<IDailyTasksProps> = ({
               itemsAtlasIMG={itemsAtlasIMG}
               iconAtlasJSON={iconAtlasJSON}
               iconAtlasIMG={iconAtlasIMG}
-              isRewardClaimed={isTaskRewardClaimed(task.key)}
+              isRewardClaimed={task.claimed || isTaskRewardClaimed(task.key)}
             />
           ))}
         </TasksList>
@@ -145,3 +160,5 @@ const TaskTitle = styled.h2`
   font-size: 1.4rem !important;
   width: 100%;
 `;
+
+

package/src/components/DailyTasks/GlobalDailyProgress.tsx

@@ -34,6 +34,8 @@ export const GlobalDailyProgress: React.FC<IGlobalTaskProgressProps> = ({
   const shouldShowGlobalButton =
     allCompleted && allClaimed && !globalRewardClaimed;
 
+  const shouldShowClaimedMessage = globalRewardClaimed;
+
   const handleClaimAll = () => {
     const taskIdentifiers = tasks.map(task => ({
       taskKey: task.key,
@@ -55,7 +57,7 @@ export const GlobalDailyProgress: React.FC<IGlobalTaskProgressProps> = ({
       </ProgressBar>
       {allCompleted && (
         <>
-          {shouldShowGlobalButton ? (
+          {shouldShowGlobalButton && (
             <CollectWrapper>
               <Button
                 buttonType={ButtonTypes.RPGUIButton}
@@ -64,7 +66,8 @@ export const GlobalDailyProgress: React.FC<IGlobalTaskProgressProps> = ({
                 Collect Global Rewards
               </Button>
             </CollectWrapper>
-          ) : (
+          )}
+          {shouldShowClaimedMessage && (
             <ClaimedText>Global Rewards Claimed</ClaimedText>
           )}
         </>

package/dist/hooks/useDailyTasksState.d.ts

@@ -1,13 +0,0 @@
-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/src/hooks/useDailyTasksState.ts

@@ -1,40 +0,0 @@
-import { ICollectGlobalRewardRequest, ITaskIdentifier, TaskType } from '@rpg-engine/shared';
-import { useState } from 'react';
-
-interface IUseDailyTasksStateProps {
-    onClaimReward: (task: ITaskIdentifier) => void;
-    onClaimGlobalReward: (tasks: ICollectGlobalRewardRequest) => void;
-}
-
-export function useDailyTasksState({
-    onClaimReward,
-    onClaimGlobalReward,
-}: IUseDailyTasksStateProps) {
-    const [globalRewardClaimed, setGlobalRewardClaimed] = useState(false);
-    const [claimedTaskKeys, setClaimedTaskKeys] = useState<string[]>([]);
-
-    const handleClaimReward = (taskKey: string, type: TaskType) => {
-        onClaimReward({
-            type,
-            taskKey,
-        });
-        setClaimedTaskKeys(prev => [...prev, taskKey]);
-    };
-
-    const handleClaimGlobalRewards = (tasks: ICollectGlobalRewardRequest) => {
-        onClaimGlobalReward(tasks);
-        setGlobalRewardClaimed(true);
-    };
-
-    const isTaskRewardClaimed = (taskKey: string): boolean => {
-        return claimedTaskKeys.includes(taskKey);
-    };
-
-    return {
-        globalRewardClaimed,
-        claimedTaskKeys,
-        isTaskRewardClaimed,
-        handleClaimReward,
-        handleClaimGlobalRewards,
-    };
-}