feat: shell capacity

packages/core/src/protos/tank_definitions.proto

@@ -155,6 +155,7 @@ message GunDefinitionBase {
   required float dispersion_shot = 12;
   required float dispersion_damaged = 13;
   repeated Unlock unlocks = 14;
+  required uint32 shell_capacity = 15;
 }
 
 message ShellDefinition {

packages/core/src/protos/tank_definitions.ts

@@ -484,6 +484,7 @@ export interface GunDefinitionBase {
   dispersion_shot: number;
   dispersion_damaged: number;
   unlocks: Unlock[];
+  shell_capacity: number;
 }
 
 export interface ShellDefinition {
@@ -2944,6 +2945,7 @@ function createBaseGunDefinitionBase(): GunDefinitionBase {
     dispersion_shot: 0,
     dispersion_damaged: 0,
     unlocks: [],
+    shell_capacity: 0,
   };
 }
 
@@ -2991,6 +2993,9 @@ export const GunDefinitionBase: MessageFns<GunDefinitionBase> = {
     for (const v of message.unlocks) {
       Unlock.encode(v!, writer.uint32(114).fork()).join();
     }
+    if (message.shell_capacity !== 0) {
+      writer.uint32(120).uint32(message.shell_capacity);
+    }
     return writer;
   },
 
@@ -3113,6 +3118,14 @@ export const GunDefinitionBase: MessageFns<GunDefinitionBase> = {
           message.unlocks.push(Unlock.decode(reader, reader.uint32()));
           continue;
         }
+        case 15: {
+          if (tag !== 120) {
+            break;
+          }
+
+          message.shell_capacity = reader.uint32();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -3144,6 +3157,7 @@ export const GunDefinitionBase: MessageFns<GunDefinitionBase> = {
         assertSet("GunDefinitionBase.dispersion_damaged", object.dispersion_damaged),
       ),
       unlocks: globalThis.Array.isArray(object?.unlocks) ? object.unlocks.map((e: any) => Unlock.fromJSON(e)) : [],
+      shell_capacity: globalThis.Number(assertSet("GunDefinitionBase.shell_capacity", object.shell_capacity)),
     };
   },
 
@@ -3191,6 +3205,9 @@ export const GunDefinitionBase: MessageFns<GunDefinitionBase> = {
     if (message.unlocks?.length) {
       obj.unlocks = message.unlocks.map((e) => Unlock.toJSON(e));
     }
+    if (message.shell_capacity !== 0) {
+      obj.shell_capacity = Math.round(message.shell_capacity);
+    }
     return obj;
   },
 
@@ -3215,6 +3232,7 @@ export const GunDefinitionBase: MessageFns<GunDefinitionBase> = {
     message.dispersion_shot = object.dispersion_shot ?? 0;
     message.dispersion_damaged = object.dispersion_damaged ?? 0;
     message.unlocks = object.unlocks?.map((e) => Unlock.fromPartial(e)) || [];
+    message.shell_capacity = object.shell_capacity ?? 0;
     return message;
   },
 };

packages/scripts/src/buildAssets/definitions.ts

@@ -311,6 +311,7 @@ interface GunDefinitionsList {
         afterShot: number;
         whileGunDamaged: number;
       };
+      maxAmmo: number;
       aimingTime: number;
       shotDispersionRadius: number;
       userString: string;
@@ -1174,6 +1175,7 @@ export async function definitions() {
                 dispersion_shot: shotDispersionFactors.afterShot,
                 dispersion_traverse: shotDispersionFactors.turretRotation,
                 unlocks: resolveUnlocks(gun.unlocks),
+                shell_capacity: gun.maxAmmo ?? gunListEntry.maxAmmo,
               } satisfies GunDefinitionBase;
 
               tankDefinitions.tanks[tankId].turrets[turretIndex].guns.push({

packages/website/src/components/Compare/Body.tsx

@@ -157,6 +157,12 @@ export function Body({ stats }: BodyProps) {
           value="shellRange"
           decimals={0}
         />
+        <CompareRow
+          stats={stats}
+          name="Shell capacity"
+          value="shellCapacity"
+          decimals={0}
+        />
         <CompareRow
           stats={stats}
           name="Aim time"

packages/website/src/components/TankSearch/components/Sort.tsx

@@ -124,6 +124,14 @@ export function Sort() {
             >
               Shell range
             </DropdownMenu.CheckboxItem>
+            <DropdownMenu.CheckboxItem
+              checked={tankopediaSort.by === 'fire.shellCapacity'}
+              onClick={() => {
+                $tankopediaSort.setKey('by', 'fire.shellCapacity');
+              }}
+            >
+              Shell capacity
+            </DropdownMenu.CheckboxItem>
             <DropdownMenu.CheckboxItem
               checked={tankopediaSort.by === 'fire.aimTime'}
               onClick={() => {

packages/website/src/components/TankSearch/index.tsx

@@ -275,6 +275,16 @@ export const TankSearch = memo<TankSearchProps>(
             );
             break;
 
+          case 'fire.shellCapacity':
+            sorted = filtered.sort(
+              (a, b) =>
+                a.turrets.at(-1)!.guns.at(-1)!.gun_type!.value.base
+                  .shell_capacity -
+                b.turrets.at(-1)!.guns.at(-1)!.gun_type!.value.base
+                  .shell_capacity,
+            );
+            break;
+
           case 'fire.aimTime':
             sorted = filtered.sort(
               (a, b) =>

packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/index.tsx

@@ -329,10 +329,12 @@ export function Characteristics() {
           <InfoWithDelta name="Shell velocity" unit="m/s" decimals={0}>
             {stats.shellVelocity}
           </InfoWithDelta>
-
           <InfoWithDelta name="Shell range" unit="m/s" decimals={0}>
             {stats.shellRange}
           </InfoWithDelta>
+          <InfoWithDelta name="Shell capacity" unit="m/s" decimals={0}>
+            {stats.shellCapacity}
+          </InfoWithDelta>
           <InfoWithDelta
             decimals={2}
             name="Aim time"

packages/website/src/core/blitzkit/tankCharacteristics.ts

@@ -506,6 +506,7 @@ export function tankCharacteristics(
   const shellRicochet = isExplosive(shell.type) ? undefined : shell.ricochet;
   const crewCount = tank.crew.length;
   const shellRange = shell.range;
+  const shellCapacity = gun.gun_type!.value.base.shell_capacity;
 
   return {
     crewCount,
@@ -570,5 +571,6 @@ export function tankCharacteristics(
     length,
     volume,
     shellRange,
+    shellCapacity,
   };
 }

packages/website/src/stores/tankopediaPersistent/constants.ts

@@ -16,6 +16,7 @@ export const SORT_UNITS: Record<TankopediaSortBy, string | undefined> = {
   'fire.reload': 's',
   'fire.shellVelocity': 'm/s',
   'fire.shellRange': 'm',
+  'fire.shellCapacity': undefined,
   'fire.standardPenetration': 'mm',
   'maneuverability.backwardsSpeed': 'kph',
   'maneuverability.forwardsSpeed': 'kph',
@@ -48,6 +49,7 @@ export const SORT_NAMES = {
   'fire.damage': 'damage',
   'fire.shellVelocity': 'shell velocity',
   'fire.shellRange': 'shell range',
+  'fire.shellCapacity': 'shell capacity',
   'fire.aimTime': 'aim time',
   'fire.dispersionStill': 'dispersion still',
   'fire.dispersionMoving': 'dispersion moving',