From 0808bb0d9b8a36c9ed80b4bc5473415c5b7e7eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Sun, 6 Oct 2024 00:09:43 -0500 Subject: [PATCH] fix: some linting for new proto 7 --- packages/core/src/blitzkit/availableProvisions.ts | 2 +- .../website/src/components/ProvisionsManager.tsx | 2 +- .../components/Consumables.tsx | 15 ++++++++------- .../CharacteristicsSection/components/Modules.tsx | 10 +++++++++- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/packages/core/src/blitzkit/availableProvisions.ts b/packages/core/src/blitzkit/availableProvisions.ts index f7a884433..f4799f24c 100644 --- a/packages/core/src/blitzkit/availableProvisions.ts +++ b/packages/core/src/blitzkit/availableProvisions.ts @@ -10,7 +10,7 @@ export function availableProvisions( gun: GunDefinition, provisionDefinitions: ProvisionDefinitions, ) { - return Object.values(provisionDefinitions).filter((provision) => + return Object.values(provisionDefinitions.provisions).filter((provision) => checkConsumableProvisionInclusivity(provision, tank, gun), ); } diff --git a/packages/website/src/components/ProvisionsManager.tsx b/packages/website/src/components/ProvisionsManager.tsx index b8aafd752..339d1071e 100644 --- a/packages/website/src/components/ProvisionsManager.tsx +++ b/packages/website/src/components/ProvisionsManager.tsx @@ -16,7 +16,7 @@ export function ProvisionsManager({ }: ProvisionsManagerProps) { return ( - {provisions.map((provision, index) => { + {provisions.map((provision) => { const isSelected = selected.includes(provision); return ( diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Consumables.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Consumables.tsx index 72527736e..1791ba01e 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Consumables.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Consumables.tsx @@ -20,13 +20,14 @@ export function Consumables() { const mutateDuel = Duel.useMutation(); const protagonist = Duel.use((state) => state.protagonist); const consumables = Duel.use((state) => state.protagonist.consumables); - const consumablesList = Object.values(consumableDefinitions).filter( - (consumable) => - checkConsumableProvisionInclusivity( - consumable, - protagonist.tank, - protagonist.gun, - ), + const consumablesList = Object.values( + consumableDefinitions.consumables, + ).filter((consumable) => + checkConsumableProvisionInclusivity( + consumable, + protagonist.tank, + protagonist.gun, + ), ); const cooldownBooster = Duel.use( (state) => state.protagonist.cooldownBooster, diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx index 7b7b0db00..e6236eaef 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx @@ -42,6 +42,14 @@ interface ModuleWithUnlocks { unlocks: Unlock[]; } +const moduleTypeTypeIconName: Record = { + [ModuleType.VEHICLE]: '', + [ModuleType.ENGINE]: 'engine', + [ModuleType.TRACKS]: 'chassis', + [ModuleType.TURRET]: 'turret', + [ModuleType.GUN]: 'gun', +}; + function ModuleButton({ tier, selected, @@ -113,7 +121,7 @@ function ModuleButton({ src={ isTank ? tankIcon(unlock.id) - : asset(`icons/modules/${unlock.type}.webp`) + : asset(`icons/modules/${moduleTypeTypeIconName[unlock.type]}.webp`) } style={{ width: isTank ? 64 : 32,