fix: some linting for new proto 4

This commit is contained in:
TrèsAbhi committed 2024-10-05 20:55:44 -05:00
1 parent f14ca394b5
commit 53a9c5f2de
22 files changed
+155 -133

No files matched your search

@@ -1,8 +1,8 @@
import {
asset,
averageDefinitions,
fetchAverageDefinitions,
fetchTankDefinitions,
formatCompact,
tankDefinitions,
TIER_ROMAN_NUMERALS,
} from '@blitzkit/core';
import { Box, Flex, Link, Text } from '@radix-ui/themes';
@@ -14,13 +14,13 @@ interface NodeProps {
highlight?: boolean;
}
const awaitedTankDefinitions = await tankDefinitions;
const awaitedAverageDefinitions = await averageDefinitions;
const tankDefinitions = await fetchTankDefinitions();
const averageDefinitions = await fetchAverageDefinitions();
export function Node({ id, highlight, nextIds }: NodeProps) {
const xpMultiplier = TankopediaEphemeral.use((state) => state.xpMultiplier);
const tank = awaitedTankDefinitions[id];
const nextTanks = nextIds?.map((id) => awaitedTankDefinitions[id]);
const tank = tankDefinitions.tanks[id];
const nextTanks = nextIds?.map((id) => tankDefinitions.tanks[id]);
const thisTankXp =
tank.xp === undefined || tank.tier === 1 ? 0 : tank.xp! / xpMultiplier;
const nextTanksXp = nextTanks?.reduce(
@@ -29,7 +29,7 @@ export function Node({ id, highlight, nextIds }: NodeProps) {
(tank.xp === undefined || tank.tier === 1 ? 0 : tank.xp! / xpMultiplier),
0,
);
const averages = awaitedAverageDefinitions.averages[tank.id]?.mu;
const averages = averageDefinitions.averages[tank.id]?.mu;
const averageXp = averages ? averages.xp / averages.battles : undefined;
const games =
averages && nextTanks ? Math.round(nextTanksXp! / averageXp!) : undefined;
@@ -1,4 +1,4 @@
import { asset, imgur, tankDefinitions } from '@blitzkit/core';
import { asset, fetchTankDefinitions, imgur, TankType } from '@blitzkit/core';
import { CaretLeftIcon, CaretRightIcon, PlusIcon } from '@radix-ui/react-icons';
import { Flex, Heading, IconButton, ScrollArea, Text } from '@radix-ui/themes';
import { Fragment, useEffect, useMemo, useRef, useState } from 'react';
@@ -9,7 +9,7 @@ import { Node } from './components/Node';
type Line = number[];
const awaitedTankDefinitions = await tankDefinitions;
const tankDefinitions = await fetchTankDefinitions();
export const XP_MULTIPLIERS = [1, 2, 3, 4, 5, 10];
@@ -20,7 +20,7 @@ export function TechTreeSection() {
const container = useRef<HTMLDivElement>(null);
const lines = useMemo(() => {
function extend(line: Line): Line[] {
const root = awaitedTankDefinitions[line.at(-1)!];
const root = tankDefinitions.tanks[line.at(-1)!];
if (root.ancestors === undefined || root.tier === 1) {
return [line];
@@ -28,7 +28,7 @@ export function TechTreeSection() {
if (root.ancestors.length === 1 || root.tier === 2) {
line.push(
root.ancestors.find(
(ancestor) => !awaitedTankDefinitions[ancestor].deprecated,
(ancestor) => !tankDefinitions.tanks[ancestor].deprecated,
) ?? root.ancestors[0],
);
return extend(line);
@@ -53,14 +53,14 @@ export function TechTreeSection() {
const totalXp = line.reduce(
(xp, id) =>
xp +
(awaitedTankDefinitions[id].xp === undefined ||
awaitedTankDefinitions[id].tier === 1
(tankDefinitions.tanks[id].xp === undefined ||
tankDefinitions.tanks[id].tier === 1
? 0
: awaitedTankDefinitions[id].xp),
: tankDefinitions.tanks[id].xp),
0,
);
const totalCredits = line.reduce(
(credits, id) => credits + awaitedTankDefinitions[id].price.value,
(credits, id) => credits + tankDefinitions.tanks[id].price.value,
0,
);
@@ -70,7 +70,7 @@ export function TechTreeSection() {
});
if (
master.treeType !== 'researchable' ||
master.type !== TankType.RESEARCHABLE ||
master.ancestors === undefined ||
master.ancestors.length === 0
) {
@@ -163,7 +163,7 @@ export function TechTreeSection() {
<Flex align="center" gap="2" justify="center" p="4">
{line.map((id, index) => {
const last = index === line.length - 1;
const tank = awaitedTankDefinitions[id];
const tank = tankDefinitions.tanks[id];
return (
<Fragment key={id}>