feat: change tier back to number

This commit is contained in:
tresabhi committed 2024-11-20 10:26:55 -06:00
1 parent 8089a5eaa6
commit fcb848df5b
16 files changed
+80 -119

No files matched your search

@@ -4,7 +4,6 @@ import {
TANK_CLASSES,
TankType,
TIER_ROMAN_NUMERALS,
type Tier,
} from '@blitzkit/core';
import { useStore } from '@nanostores/react';
import { ReloadIcon } from '@radix-ui/react-icons';
@@ -42,7 +41,7 @@ export function FilterControl({ compact }: FilterControlProps) {
>
<Flex direction={compact ? 'column' : { md: 'row', initial: 'column' }}>
{times(5, (index) => {
const tier = index as Tier;
const tier = index + 1;
const selected = tankFilters.tiers?.includes(tier);
return (
@@ -70,7 +69,7 @@ export function FilterControl({ compact }: FilterControlProps) {
</Flex>
<Flex direction={compact ? 'column' : { md: 'row', initial: 'column' }}>
{times(5, (index) => {
const tier = (index + 5) as Tier;
const tier = index + 6;
const selected = tankFilters.tiers?.includes(tier);
return (
@@ -1,4 +1,4 @@
import { type Tier, TIER_ROMAN_NUMERALS } from '@blitzkit/core';
import { TIER_ROMAN_NUMERALS } from '@blitzkit/core';
import { useStore } from '@nanostores/react';
import { Flex, IconButton, Text } from '@radix-ui/themes';
import { times } from 'lodash-es';
@@ -20,7 +20,7 @@ export const TierFilter = memo(() => {
style={{ borderRadius: 'var(--radius-full)' }}
>
{times(10, (index) => {
const tier = (10 - index) as Tier;
const tier = 10 - index;
const selected = tankFilters.tiers.includes(tier);
return (
@@ -30,25 +30,16 @@ export const TierFilter = memo(() => {
radius="none"
color={selected ? undefined : 'gray'}
highContrast
onClick={() =>
// mutateTankFilters((draft) => {
// if (draft.tiers?.includes(tier)) {
// draft.tiers = draft.tiers?.filter((t) => t !== tier);
// } else {
// draft.tiers = [...(draft.tiers ?? []), tier];
// }
// })
{
if (tankFilters.tiers.includes(tier)) {
$tankFilters.setKey(
'tiers',
tankFilters.tiers.filter((t) => t !== tier),
);
} else {
$tankFilters.setKey('tiers', [...tankFilters.tiers, tier]);
}
onClick={() => {
if (tankFilters.tiers.includes(tier)) {
$tankFilters.setKey(
'tiers',
tankFilters.tiers.filter((t) => t !== tier),
);
} else {
$tankFilters.setKey('tiers', [...tankFilters.tiers, tier]);
}
}
}}
>
<Text size="2">{TIER_ROMAN_NUMERALS[tier]}</Text>
</IconButton>
@@ -10,7 +10,6 @@ import {
TrackDefinition,
TurretDefinition,
type TankDefinition,
type Tier,
type Unlock,
} from '@blitzkit/core';
import {
@@ -58,7 +57,7 @@ function ModuleButton({
onClick,
}: {
unlock: Unlock;
tier: Tier;
tier: number;
selected: boolean;
top: boolean;
onClick: () => void;
@@ -3,7 +3,6 @@ import {
fetchAverageDefinitions,
fetchTankDefinitions,
formatCompact,
Tier,
TIER_ROMAN_NUMERALS,
} from '@blitzkit/core';
import { Box, Flex, Link, Skeleton, Text } from '@radix-ui/themes';
@@ -125,7 +124,7 @@ export function Node({ id, highlight, nextIds, skeleton }: NodeProps) {
</Text>
</Flex>
{averages && nextTanks && tank.tier !== Tier.X && (
{averages && nextTanks && tank.tier !== 10 && (
<Text color="gray" size="1" mt="2">
{skeleton && <Skeleton height="1em" width="4em" />}
{!skeleton && (
@@ -1,10 +1,4 @@
import {
asset,
fetchTankDefinitions,
imgur,
TankType,
Tier,
} 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';
@@ -32,10 +26,10 @@ export function TechTreeSection({ skeleton }: MaybeSkeletonComponentProps) {
function extend(line: Line): Line[] {
const root = tankDefinitions.tanks[line.at(-1)!];
if (root.ancestors === undefined || root.tier === Tier.I) {
if (root.ancestors === undefined || root.tier === 1) {
return [line];
} else {
if (root.ancestors.length === 1 || root.tier === Tier.II) {
if (root.ancestors.length === 1 || root.tier === 2) {
line.push(
root.ancestors.find(
(ancestor) => !tankDefinitions.tanks[ancestor].deprecated,
@@ -64,7 +58,7 @@ export function TechTreeSection({ skeleton }: MaybeSkeletonComponentProps) {
(xp, id) =>
xp +
(tankDefinitions.tanks[id].research_cost === undefined ||
tankDefinitions.tanks[id].tier === Tier.I
tankDefinitions.tanks[id].tier === 1
? 0
: (tankDefinitions.tanks[id].research_cost.research_cost_type!
.value as number)),
@@ -191,7 +185,7 @@ export function TechTreeSection({ skeleton }: MaybeSkeletonComponentProps) {
);
})}
{master.tier < Tier.X && (
{master.tier < 10 && (
<>
<Arrow />
{master.successors!.map((id, index) => (