feat: burst data

packages/website/src/components/Tankopedia/HeroSection/components/Options/components/CustomShellButton.tsx

@@ -90,7 +90,7 @@ export function CustomShellButton() {
                         modified.normalization = undefined;
                         modified.ricochet = undefined;
                         modified.explosion_radius =
-                          gun.gun_type!.value.base.shells.find(
+                          gun.shells.find(
                             (shell) => shell.type === ShellType.HE,
                           )?.explosion_radius ?? 1;
                         break;

packages/website/src/components/Tankopedia/HeroSection/components/Options/components/QuickInputs/index.tsx

@@ -21,8 +21,7 @@ export function QuickInputs() {
   const tankModelDefinition = useTankModelDefinition();
   const turretModelDefinition =
     tankModelDefinition.turrets[protagonist.turret.id];
-  const gunModelDefinition =
-    turretModelDefinition.guns[protagonist.gun.gun_type!.value.base.id];
+  const gunModelDefinition = turretModelDefinition.guns[protagonist.gun.id];
   const initialGunPitch =
     tankModelDefinition.initial_turret_rotation?.pitch ?? 0;
   const hasImprovedVerticalStabilizer = useEquipment(122);

packages/website/src/components/Tankopedia/HeroSection/components/Options/index.tsx

@@ -141,7 +141,7 @@ export function Options({ thicknessRange, canvas, skeleton }: OptionsProps) {
                   mr="2"
                   mb="1"
                 >
-                  {TIER_ROMAN_NUMERALS[antagonistGun.gun_type!.value.base.tier]}
+                  {TIER_ROMAN_NUMERALS[antagonistGun.tier]}
                 </Text>
 
                 <img
@@ -161,26 +161,20 @@ export function Options({ thicknessRange, canvas, skeleton }: OptionsProps) {
                 {[...antagonistUniqueGuns].reverse().map(({ gun, turret }) => (
                   <ModuleButton
                     module="gun"
-                    key={gun.gun_type!.value.base.id}
+                    key={gun.id}
                     onClick={() =>
                       mutateDuel((draft) => {
                         draft.antagonist.turret = turret;
                         draft.antagonist.gun = gun;
-                        draft.antagonist.shell =
-                          gun.gun_type!.value.base.shells[0];
+                        draft.antagonist.shell = gun.shells[0];
                       })
                     }
-                    selected={
-                      gun.gun_type!.value.base.id ===
-                      antagonistGun.gun_type!.value.base.id
-                    }
-                    discriminator={
-                      TIER_ROMAN_NUMERALS[gun.gun_type!.value.base.tier]
-                    }
+                    selected={gun.id === antagonistGun.id}
+                    discriminator={TIER_ROMAN_NUMERALS[gun.tier]}
                     secondaryDiscriminator={
                       <Text style={{ fontSize: '0.75em' }}>
                         {literals(strings.common.units.mm, [
-                          gun.gun_type!.value.base.shells[0].caliber.toFixed(0),
+                          gun.shells[0].caliber.toFixed(0),
                         ])}
                       </Text>
                     }
@@ -198,7 +192,7 @@ export function Options({ thicknessRange, canvas, skeleton }: OptionsProps) {
           }}
           overflow="hidden"
         >
-          {antagonistGun.gun_type!.value.base.shells.map((thisShell) => (
+          {antagonistGun.shells.map((thisShell) => (
             <IconButton
               color={
                 thisShell.id === antagonistShell.id && !hasCustomShell
@@ -367,8 +361,7 @@ export function Options({ thicknessRange, canvas, skeleton }: OptionsProps) {
                         draft.antagonist.turret = tank.turrets.at(-1)!;
                         draft.antagonist.gun =
                           draft.antagonist.turret.guns.at(-1)!;
-                        draft.antagonist.shell =
-                          draft.antagonist.gun.gun_type!.value.base.shells[0];
+                        draft.antagonist.shell = draft.antagonist.gun.shells[0];
                       });
                       setAntagonistSelectorOpen(false);
                     }}

packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/Control.tsx

@@ -56,9 +56,7 @@ export function Controls({
   const antagonistTurretModelDefinition =
     antagonistModelDefinition.turrets[antagonistTurret.id];
   const protagonistGunModelDefinition =
-    protagonistTurretModelDefinition.guns[
-      protagonistGun.gun_type!.value.base.id
-    ];
+    protagonistTurretModelDefinition.guns[protagonistGun.id];
   const protagonistHullOrigin = new Vector3(
     protagonistTrackModelDefinition.origin.x,
     protagonistTrackModelDefinition.origin.y,

packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/InitialAligner.tsx

@@ -14,7 +14,7 @@ export function InitialAligner() {
 
   const tankModel = modelDefinitions.models[tank.id];
   const turretModel = tankModel.turrets[turret.id];
-  const gunModel = turretModel.guns[gun.gun_type!.value.base.id];
+  const gunModel = turretModel.guns[gun.id];
 
   useEffect(() => {
     const [pitch, yaw] = applyPitchYawLimits(

packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/SceneProps/index.tsx

@@ -49,7 +49,7 @@ export function SceneProps() {
   const trackModelDefinition =
     modelDefinitions.models[tank.id].tracks[track.id];
   const gunModelDefinition =
-    tankModelDefinition.turrets[turret.id].guns[gun.gun_type!.value.base.id];
+    tankModelDefinition.turrets[turret.id].guns[gun.id];
   const turretModelDefinition = tankModelDefinition.turrets[turret.id];
   const hullOrigin = new Vector3(
     trackModelDefinition.origin.x,

packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/TankModel.tsx

@@ -28,8 +28,7 @@ export function TankModel() {
   const tankModelDefinition = useTankModelDefinition();
   const turretModelDefinition =
     tankModelDefinition.turrets[protagonist.turret.id];
-  const gunModelDefinition =
-    turretModelDefinition.guns[protagonist.gun.gun_type!.value.base.id];
+  const gunModelDefinition = turretModelDefinition.guns[protagonist.gun.id];
   const { gltf } = useModel(protagonist.tank.id);
   const nodes = Object.values(gltf.nodes);
 

packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/TransitionSkeleton/index.tsx

@@ -31,8 +31,7 @@ export function TransitionSkeleton() {
   const tankModelDefinition = useTankModelDefinition();
   const turretModelDefinition =
     tankModelDefinition.turrets[protagonist.turret.id];
-  const gunModelDefinition =
-    turretModelDefinition.guns[protagonist.gun.gun_type!.value.base.id];
+  const gunModelDefinition = turretModelDefinition.guns[protagonist.gun.id];
   const { gltf } = useModel(protagonist.tank.id);
   const nodes = Object.values(gltf.nodes);
   const revealed = tankopediaEphemeralStore((state) => state.revealed);

packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/index.tsx

@@ -59,8 +59,7 @@ export const TankSandbox = forwardRef<HTMLCanvasElement, TankSandboxProps>(
     const tankModelDefinition = useTankModelDefinition();
     const turretModelDefinition =
       tankModelDefinition.turrets[protagonistTurret.id];
-    const gunModelDefinition =
-      turretModelDefinition.guns[protagonistGun.gun_type!.value.base.id];
+    const gunModelDefinition = turretModelDefinition.guns[protagonistGun.id];
     const rawDisplay = TankopediaEphemeral.use((state) => state.display);
     const [display, setDisplay] = useState(rawDisplay);
     const hideTankModelUnderArmor = TankopediaPersistent.use(

packages/website/src/components/Tankopedia/HeroSection/index.tsx

@@ -29,8 +29,7 @@ export function HeroSection({ skeleton }: MaybeSkeletonComponentProps) {
       (filtered.reduce((accumulator, thisTank) => {
         return (
           accumulator +
-          thisTank.turrets.at(-1)!.guns.at(-1)!.gun_type!.value.base.shells[0]
-            .penetration.near
+          thisTank.turrets.at(-1)!.guns.at(-1)!.shells[0].penetration.near
         );
       }, 0) /
         filtered.length) *
@@ -51,8 +50,7 @@ export function HeroSection({ skeleton }: MaybeSkeletonComponentProps) {
 
   useEffect(() => {
     function handleKeyDown(event: KeyboardEvent) {
-      const { shells } =
-        duelStore.getState().antagonist.gun.gun_type!.value.base;
+      const { shells } = duelStore.getState().antagonist.gun;
 
       times(3, (index) => {
         if (event.key === `${index + 1}` && shells.length > index) {