TresAbhi/blitzkit
1
0 Fork 0
mirror of https://github.com/blitzkit/blitzkit.git synced 2026-10-21 02:37:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: move ammo types to fire

Browse Source
This commit is contained in:
TrèsAbhi committed 2024-02-19 19:05:49 -06:00
1 parent ca030688cb
commit 58002958bf
2 files changed
+30 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/app/tools/tankopedia/[id]/components/Characteristics/components/Modules.tsx
+1 -26
View File
@@ -1,10 +1,6 @@
import { Flex, Heading } from '@radix-ui/themes';
import { ModuleButton } from '../../../../../../../components/ModuleButtons/ModuleButton';
import { ShellButton } from '../../../../../../../components/ModuleButtons/ShellButton';
import {
SHELL_NAMES,
TIER_ROMAN_NUMERALS,
} from '../../../../../../../core/blitzkrieg/tankDefinitions';
import { TIER_ROMAN_NUMERALS } from '../../../../../../../core/blitzkrieg/tankDefinitions';
import { mutateDuel, useDuel } from '../../../../../../../stores/duel';
import { ConfigurationChildWrapper } from './ConfigurationChildWrapper';
@@ -102,27 +98,6 @@ export function Modules() {
);
})}
</Flex>
<Flex>
{protagonist.gun.shells.map((shell, index) => {
return (
<ShellButton
key={shell.id}
shell={shell.icon}
discriminator={SHELL_NAMES[shell.type]}
selected={protagonist.shell.id === shell.id}
first={index === 0}
last={index === protagonist.gun.shells.length - 1}
rowChild
onClick={() => {
mutateDuel((draft) => {
draft.protagonist!.shell = shell;
});
}}
/>
);
})}
</Flex>
</Flex>
</ConfigurationChildWrapper>
);
src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx
+29 -3
View File
@@ -3,6 +3,7 @@ import { Flex, Heading, Slider, Text, TextField } from '@radix-ui/themes';
import { debounce } from 'lodash';
import { use, useEffect, useRef, useState } from 'react';
import { lerp } from 'three/src/math/MathUtils';
import { ShellButton } from '../../../../../../components/ModuleButtons/ShellButton';
import { isExplosive } from '../../../../../../core/blitz/isExplosive';
import { resolveNearPenetration } from '../../../../../../core/blitz/resolveNearPenetration';
import { coefficient } from '../../../../../../core/blitzkrieg/coefficient';
@@ -15,13 +16,14 @@ import { sum } from '../../../../../../core/blitzkrieg/sum';
import {
CREW_MEMBER_NAMES,
GUN_TYPE_NAMES,
SHELL_NAMES,
} from '../../../../../../core/blitzkrieg/tankDefinitions';
import { unionBoundingBox } from '../../../../../../core/blitzkrieg/unionBoundingBox';
import { useConsumable } from '../../../../../../hooks/useConsumable';
import { useEquipment } from '../../../../../../hooks/useEquipment';
import { useProvision } from '../../../../../../hooks/useProvision';
import { useProvisions } from '../../../../../../hooks/useProvisions';
import { useDuel } from '../../../../../../stores/duel';
import { mutateDuel, useDuel } from '../../../../../../stores/duel';
import { useTankopediaTemporary } from '../../../../../../stores/tankopedia';
import { Info } from './components/Info';
import { InfoWithDelta } from './components/InfoWithDelta';
@@ -230,9 +232,33 @@ export function Characteristics() {
}, [penetrationDistance]);
return (
<Flex direction="column" gap="4" style={{ width: '100%' }}>
<Flex direction="column" gap="8" style={{ width: '100%' }}>
<Flex direction="column" gap="2">
<Heading size="5">Fire</Heading>
<Flex align="center" gap="4">
<Heading size="5">Fire</Heading>
<Flex>
{gun.shells.map((thisShell, index) => {
return (
<ShellButton
key={thisShell.id}
shell={thisShell.icon}
discriminator={SHELL_NAMES[thisShell.type]}
selected={thisShell.id === shell.id}
first={index === 0}
last={index === gun.shells.length - 1}
rowChild
onClick={() => {
mutateDuel((draft) => {
draft.protagonist!.shell = thisShell;
});
}}
/>
);
})}
</Flex>
</Flex>
<Info name="Gun type">{GUN_TYPE_NAMES[gun.type]}</Info>
<InfoWithDelta name="DPM" decimals={0} unit="hp / min">
{dpm}