From 657e057cbef670f213f5afb8110af8706cbfb5be Mon Sep 17 00:00:00 2001 From: ECWireless Date: Sat, 26 Oct 2024 10:01:07 -0600 Subject: [PATCH 1/2] Add remaining move names in MONSTER_MOVE_MAPPING --- packages/client/src/components/ActionsPanel.tsx | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/client/src/components/ActionsPanel.tsx b/packages/client/src/components/ActionsPanel.tsx index 2ad4c9b42..a2cd1b7be 100644 --- a/packages/client/src/components/ActionsPanel.tsx +++ b/packages/client/src/components/ActionsPanel.tsx @@ -31,6 +31,17 @@ export const MONSTER_MOVE_MAPPING: Record = { '12': 'Venom Bite', '13': 'Ember', '14': 'Iron Sword', + '15': 'Wall of Force', + '16': 'Venom Bite', + '17': 'Claw', + '18': 'Wall of Force', + '19': 'Burrow Strike', + '20': 'Steel Sword', + '21': 'Fire Lance', + '22': 'Spectral Bite', + '23': 'Maul', + '24': 'Steel Sword', + '25': 'Dragon Breath', }; export const ActionsPanel = (): JSX.Element => { @@ -526,7 +537,7 @@ export const ActionsPanel = (): JSX.Element => { const itemName = currentBattle?.encounterType === EncounterType.PvE && attack.attackerId !== character?.id - ? MONSTER_MOVE_MAPPING[(opponent as Monster).mobId] + ? MONSTER_MOVE_MAPPING[(opponent as Monster).mobId] ?? 'an item' : attackItem?.name ?? 'an item'; const possibleStatusEffectAttack = statusEffectActions.find( From a7b2111b38184dc96bddda9e9a895dcca41fdcb6 Mon Sep 17 00:00:00 2001 From: ECWireless Date: Sat, 26 Oct 2024 10:01:46 -0600 Subject: [PATCH 2/2] Use correct inventory amounts --- packages/client/src/components/StatsPanel.tsx | 10 ++++++- packages/client/src/pages/Character.tsx | 30 +++++++++++++++++-- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/packages/client/src/components/StatsPanel.tsx b/packages/client/src/components/StatsPanel.tsx index df3430840..1bbc4ad59 100644 --- a/packages/client/src/components/StatsPanel.tsx +++ b/packages/client/src/components/StatsPanel.tsx @@ -138,6 +138,14 @@ export const StatsPanel = (): JSX.Element => { }; }, [character]); + const consumablesInInventory = useMemo(() => { + return inventoryConsumables + .reduce((acc, item) => { + return acc + item.balance; + }, BigInt(0)) + .toString(); + }, [inventoryConsumables]); + if (!character) { return ( @@ -412,7 +420,7 @@ export const StatsPanel = (): JSX.Element => { > Consumables - {inventoryConsumables.length} + {consumablesInInventory} diff --git a/packages/client/src/pages/Character.tsx b/packages/client/src/pages/Character.tsx index 4e6d2a325..fb28d2a77 100644 --- a/packages/client/src/pages/Character.tsx +++ b/packages/client/src/pages/Character.tsx @@ -750,6 +750,30 @@ const ItemsPanel = ({ character }: { character: Character }): JSX.Element => { const maxWeaponsEquipped = equippedSpellsAndWeaponsIds.length === MAX_EQUIPPED_WEAPONS; + const armorInInventory = useMemo(() => { + return inventoryArmor + .reduce((acc, item) => { + return acc + item.balance; + }, BigInt(0)) + .toString(); + }, [inventoryArmor]); + + const spellsAndWeaponsInInventory = useMemo(() => { + return spellsAndWeapons + .reduce((acc, item) => { + return acc + item.balance; + }, BigInt(0)) + .toString(); + }, [spellsAndWeapons]); + + const consumablesInInventory = useMemo(() => { + return inventoryConsumables + .reduce((acc, item) => { + return acc + item.balance; + }, BigInt(0)) + .toString(); + }, [inventoryConsumables]); + if (isLoadingItemTemplates) { return ( @@ -779,7 +803,7 @@ const ItemsPanel = ({ character }: { character: Character }): JSX.Element => { - Armor ({inventoryArmor.length}) - {equippedArmor.length}/ + Armor ({armorInInventory}) - {equippedArmor.length}/ {MAX_EQUIPPED_ARMOR} equipped{' '} {maxArmorEquipped && (Max armor equipped)} @@ -815,7 +839,7 @@ const ItemsPanel = ({ character }: { character: Character }): JSX.Element => { })} - Weapons & Spells ({spellsAndWeapons.length}) -{' '} + Weapons & Spells ({spellsAndWeaponsInInventory}) -{' '} {equippedSpellsAndWeaponsIds.length}/{MAX_EQUIPPED_WEAPONS} equipped{' '} {maxWeaponsEquipped && ( @@ -856,7 +880,7 @@ const ItemsPanel = ({ character }: { character: Character }): JSX.Element => { })} - Consumables ({inventoryConsumables.length}) + Consumables ({consumablesInInventory})