From 9e639a22fc010c0c577bf2c622eec8c20a1e328a Mon Sep 17 00:00:00 2001 From: Bob Date: Wed, 11 Sep 2024 22:38:06 -0400 Subject: [PATCH 1/3] add loot encounter type --- ui/src/app/components/encounters/EncounterTable.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ui/src/app/components/encounters/EncounterTable.tsx b/ui/src/app/components/encounters/EncounterTable.tsx index d013a3e5f..e9a767ba2 100644 --- a/ui/src/app/components/encounters/EncounterTable.tsx +++ b/ui/src/app/components/encounters/EncounterTable.tsx @@ -209,14 +209,17 @@ const EncounterTable = () => { const tier = gameData.ITEMS[ encounter.tier ].replace(/\s+/g, ""); + return (
- {` T${gameData.ITEM_TIERS[tier]}`} + + {gameData.ITEM_TYPES[encounter.tier]} + {` T${gameData.ITEM_TIERS[tier]} `}
); })() From a3ded5d17894a044b8ccc88f6c41ed42158b4986 Mon Sep 17 00:00:00 2001 From: Bob Date: Wed, 11 Sep 2024 22:57:22 -0400 Subject: [PATCH 2/3] Fix buy without equiping --- ui/src/app/components/encounters/utils.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/app/components/encounters/utils.tsx b/ui/src/app/components/encounters/utils.tsx index 8348bae92..5501f3e1d 100644 --- a/ui/src/app/components/encounters/utils.tsx +++ b/ui/src/app/components/encounters/utils.tsx @@ -68,7 +68,7 @@ export function getPurchaseItemsObjects( gameData: GameData ): ItemPurchaseObject[] { const purchaseItemsObjects = purchaseItems - .filter((item) => item.equip) + .filter((item) => item.equip === "1") .map((item) => { const itemName = gameData.ITEMS[Number(item.item)]; return getItemData(itemName); From 60dacbc711dcc99a359247d7851df6e2a378cfd2 Mon Sep 17 00:00:00 2001 From: Bob Date: Wed, 11 Sep 2024 23:06:14 -0400 Subject: [PATCH 3/3] Fix gold when buying w/o equipping --- ui/src/app/components/encounters/utils.tsx | 30 ++++++++-------------- ui/src/app/types/index.ts | 1 + 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/ui/src/app/components/encounters/utils.tsx b/ui/src/app/components/encounters/utils.tsx index 5501f3e1d..d41311f25 100644 --- a/ui/src/app/components/encounters/utils.tsx +++ b/ui/src/app/components/encounters/utils.tsx @@ -67,12 +67,14 @@ export function getPurchaseItemsObjects( purchaseItems: ItemPurchase[], gameData: GameData ): ItemPurchaseObject[] { - const purchaseItemsObjects = purchaseItems - .filter((item) => item.equip === "1") - .map((item) => { - const itemName = gameData.ITEMS[Number(item.item)]; - return getItemData(itemName); - }); + const purchaseItemsObjects = purchaseItems.map((item) => { + const itemName = gameData.ITEMS[Number(item.item)]; + const itemData = getItemData(itemName); + return { + ...itemData, + equip: item.equip === "1", + }; + }); return purchaseItemsObjects; } @@ -97,9 +99,9 @@ export function getItems( })) || []; let updatedItems: Item[] = equippedItems.map((item: any) => { - const purchaseItem = purchaseItemsObjects.find( - (purchaseItem) => purchaseItem.slot === item.slot - ); + const purchaseItem = purchaseItemsObjects + .filter((item) => item.equip) + .find((purchaseItem) => purchaseItem.slot === item.slot); if (purchaseItem) { return { ...purchaseItem, @@ -123,8 +125,6 @@ export function getItems( }); return updatedItems; - // }, [data.itemsByAdventurerQuery?.items, purchaseItemsObjects]); - // return items; } export function getPaths( @@ -135,11 +135,6 @@ export function getPaths( data: QueryData, hasBeast: boolean ) { - // const purchaseItems = useUIStore((state) => state.purchaseItems); - // const hasBeast = useAdventurerStore((state) => state.computed.hasBeast); - // const items = getItems(purchaseItems, data, gameData); - - // const outcomesWithPath = useMemo(() => { if (!updatedAdventurer || !items) return []; const decisionTree = getDecisionTree( updatedAdventurer!, @@ -152,7 +147,4 @@ export function getPaths( (a, b) => b[b.length - 1].adventurer.health! - a[a.length - 1].adventurer.health! ); - // }, [updatedAdventurer?.xp, adventurerEntropy, items]); - - // return outcomesWithPath; } diff --git a/ui/src/app/types/index.ts b/ui/src/app/types/index.ts index 35c49820c..8e588d36c 100644 --- a/ui/src/app/types/index.ts +++ b/ui/src/app/types/index.ts @@ -231,6 +231,7 @@ export interface ItemPurchaseObject { tier: number; type: string; slot: string; + equip: boolean; } export interface UpgradeStats {