add basic xi compatibility

packages/core/src/blitzkit/api/server/0_base.ts

@@ -246,6 +246,27 @@ export abstract class ServerBlitzKitAPI0 extends BlitzKitAPI {
     return this;
   }
 
+  protected getTankFilterIds(
+    name: string,
+    definitionKey: string,
+    filter: "include" | "exclude",
+  ) {
+    const keys = name.trim().split(/\s+/).filter(Boolean);
+
+    return keys.flatMap((key) => {
+      const id = this.tankStringIdMap[key];
+
+      if (id === undefined) {
+        console.warn(
+          `Skipping unavailable tank "${key}" in ${filter} vehicle filter for "${definitionKey}"`,
+        );
+        return [];
+      }
+
+      return [id];
+    });
+  }
+
   protected getString(name: string) {
     const collection: Record<string, string> = {
       [locales.default]: this.stringsI18n[locales.default][name],

packages/core/src/blitzkit/api/server/1_tankDefinitions.ts

@@ -595,9 +595,25 @@ export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 {
             for (const shellKey in gunListEntry.shots) {
               const gunShellEntry = gunListEntry.shots[shellKey];
               const shell = shellList.root[shellKey];
+
+              // Newer client data stores shot properties on the shell rather
+              // than repeating them under every gun's <shots> entry.
+              const speed =
+                typeof gunShellEntry === "string"
+                  ? shell.speed
+                  : gunShellEntry.speed;
+              const maxDistance =
+                typeof gunShellEntry === "string"
+                  ? shell.maxDistance
+                  : gunShellEntry.maxDistance;
+              const piercingPower =
+                typeof gunShellEntry === "string"
+                  ? shell.piercingPower
+                  : gunShellEntry.piercingPower;
+
               const shellId = toUniqueId(nation, shell.id);
               const shellName = this.getString(shell.userString);
-              const penetrationRaw = gunShellEntry.piercingPower
+              const penetrationRaw = piercingPower
                 .split(" ")
                 .filter((penetrationString) => penetrationString !== "")
                 .map(Number);
@@ -607,7 +623,7 @@ export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 {
               ].shells.push({
                 id: shellId,
                 name: shellName,
-                velocity: gunShellEntry.speed,
+                velocity: speed,
                 armor_damage: shell.damage.armor,
                 module_damage: shell.damage.devices,
                 caliber: shell.caliber,
@@ -623,7 +639,7 @@ export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 {
                   near: penetrationRaw[0],
                   far: penetrationRaw[1],
                 },
-                range: gunShellEntry.maxDistance,
+                range: maxDistance,
               });
             }
 

packages/core/src/blitzkit/api/server/2_camouflageDefinitions.ts

@@ -10,6 +10,8 @@ export abstract class ServerBlitzKitAPI2 extends ServerBlitzKitAPI1 {
     for (const camoKey in this.camouflagesXml!.root.camouflages) {
       const camo = this.camouflagesXml!.root.camouflages[camoKey];
 
+      if (!(camoKey in this.camouflagesYaml!)) continue;
+
       const yamlEntry = this.camouflagesYaml![camoKey];
       const fullName = yamlEntry.userString
         ? this.getString(yamlEntry.userString)

packages/core/src/blitzkit/api/server/6_consumableDefinitions.ts

@@ -44,9 +44,7 @@ export abstract class ServerBlitzKitAPI6 extends ServerBlitzKitAPI5 {
             filter_type: {
               $case: "ids",
               value: {
-                ids: includeRaw.name.split(/ +/).map((key) => {
+                ids: this.getTankFilterIds(includeRaw.name, key, "include"),
-                  return this.tankStringIdMap[key];
-                }),
               },
             },
           });
@@ -72,9 +70,7 @@ export abstract class ServerBlitzKitAPI6 extends ServerBlitzKitAPI5 {
             filter_type: {
               $case: "ids",
               value: {
-                ids: excludeRaw.name.split(/ +/).map((key) => {
+                ids: this.getTankFilterIds(excludeRaw.name, key, "exclude"),
-                  return this.tankStringIdMap[key];
-                }),
               },
             },
           });

packages/core/src/blitzkit/api/server/7_provisionDefinitions.ts

@@ -11,7 +11,7 @@ export abstract class ServerBlitzKitAPI7 extends ServerBlitzKitAPI6 {
   async provisionDefinitions() {
     const provisionDefinitions = ProvisionDefinitions.create();
 
-    Object.entries(this.provisionsCommon).forEach(([, provision]) => {
+    Object.entries(this.provisionsCommon).forEach(([key, provision]) => {
       const entry: Provision = {
         id: provision.id,
         exclude: [],
@@ -42,9 +42,7 @@ export abstract class ServerBlitzKitAPI7 extends ServerBlitzKitAPI6 {
             filter_type: {
               $case: "ids",
               value: {
-                ids: includeRaw.name.split(/ +/).map((key) => {
+                ids: this.getTankFilterIds(includeRaw.name, key, "include"),
-                  return this.tankStringIdMap[key];
-                }),
               },
             },
           });
@@ -70,9 +68,7 @@ export abstract class ServerBlitzKitAPI7 extends ServerBlitzKitAPI6 {
             filter_type: {
               $case: "ids",
               value: {
-                ids: excludeRaw.name
+                ids: this.getTankFilterIds(excludeRaw.name, key, "exclude"),
-                  .split(/ +/)
-                  .map((key) => this.tankStringIdMap[key]),
               },
             },
           });

packages/core/src/types/gunDefinitionsList.ts

@@ -20,7 +20,9 @@ export interface GunDefinitionsList {
       burst?: { count: number; rate: number };
       clip?: { count: number; rate: number };
       shots: {
-        [key: string]: {
+        [key: string]:
+          | ""
+          | {
               speed: number;
               piercingPower: string;
               maxDistance: number;

packages/core/src/types/shellDefinitionsList.ts

@@ -10,6 +10,9 @@ export type ShellDefinitionsList = Record<
     normalizationAngle?: number;
     ricochetAngle?: number;
     explosionRadius?: number;
+    speed: number;
+    maxDistance?: number;
+    piercingPower: string;
   }
 > & {
   icons: Record<string, string>;

packages/i18n/strings/pl.json

@@ -1,7 +1,7 @@
 {
   "test": {
     "default": "test",
-    "long": "To jest długi ciąg testowy. NIGDY NIE ZOBACZYSZ tego w interfejsie użytkownika. Mój ulubiony owoc to {fruit}, ponieważ ma kolor {color}. Tak bardzo go lubię, że powiem jego nazwę 3 razy! {fruit}! {fruit}! {fruit}! Po raz kolejny to {color}, a nie {not_color}.",
+    "long": "This is a long test string. You MUST NEVER see this in the UI. My favorite fruit is {fruit} because it has the color of {color}. I like it so much that I will say its name 3 times! {fruit}! {fruit}! {fruit}! Once again, it's {color}, not {not_color}.",
     "fox": "Szybki brązowy lis przeskoczył nad leniwym psem."
   },
   "common": {
@@ -19,7 +19,7 @@
     "gun_types": {
       "auto_loader": "Samo ładowacz",
       "auto_reloader": "Automatyczne przeładowanie",
-      "regular": "Regularny"
+      "regular": "Regular"
     },
     "shells": {
       "ap": "AP",
@@ -38,10 +38,10 @@
     },
     "branches": {
       "beta": "Beta",
-      "development": "Rozwój",
+      "development": "Development",
-      "opentest": "OtwartyTest",
+      "opentest": "OpenTest",
-      "preview": "Przegląd",
+      "preview": "Preview",
-      "production": "Produkcja"
+      "production": "Production"
     },
     "locales": {
       "en": "Angielski",
@@ -102,28 +102,28 @@
       "other": "Hybryda"
     },
     "tank_class_short": {
-      "-1": "nierozpoznany",
+      "-1": "unrecognized",
       "0": "Lekki",
       "1": "Średni",
       "2": "Ciężki",
-      "3": "NC"
+      "3": "TD"
     },
     "tank_class_short_plural_lowercase": {
       "0": "lekkie",
       "1": "średnie",
       "2": "ciężkie",
-      "3": "NC-ów"
+      "3": "TDs"
     },
     "tank_class_medium": {
-      "-1": "nierozpoznany",
+      "-1": "unrecognized",
       "0": "Lekki",
       "1": "Średni",
       "2": "Ciężki",
       "3": "Niszczyciel czołgów"
     },
     "tree_type": {
-      "-1": "nierozpoznany",
+      "-1": "unrecognized",
-      "0": "Drzewko technologiczne",
+      "0": "Tech tree",
       "1": "Premium",
       "2": "Kolekcjonerski"
     },
@@ -187,44 +187,44 @@
   },
   "website": {
     "redirect": {
-      "title": "301: przeniesiony na stałe",
+      "title": "301: moved permanently",
-      "body": "Ta strona została przeniesiona. Przekierowywanie..."
+      "body": "This page has moved. Redirecting..."
     },
     "settings": {
-      "title": "Ustawienia",
+      "title": "Settings",
-      "description": "Zmień ustawienia BlitzKit",
+      "description": "Change BlitzKit settings",
-      "dev_mode": "Tryb deweloperski",
+      "dev_mode": "Development mode",
-      "auto_load_models": "Automatycznie wczytaj modele",
+      "auto_load_models": "Auto-load models",
-      "language": "Język"
+      "language": "Language"
     },
     "common": {
       "player_search": {
-        "hint": "Szukaj graczy...",
+        "hint": "Search players...",
-        "no_results": "Brak wyników",
+        "no_results": "No results",
-        "searching": "Wyszukiwanie..."
+        "searching": "Searching..."
       },
       "copy_button": {
-        "copied": "Skopiowano!"
+        "copied": "Copied!"
       },
       "tank_search": {
-        "select_dialog_title": "Szukaj czołgów",
+        "select_dialog_title": "Search for tanks",
-        "swap_dialog_title": "Zamień czołg",
+        "swap_dialog_title": "Swap tank",
-        "clear_filters": "Wyczyść filtry",
+        "clear_filters": "Clear filters",
-        "login": "Zaloguj się, aby tego użyć",
+        "login": "Login to use this",
-        "search_bar_hint": "Szukaj czołgów...",
+        "search_bar_hint": "Search tanks...",
-        "recent": "Ostatnio oglądane",
+        "recent": "Recently viewed",
-        "select_all": "Zaznacz wszystko",
+        "select_all": "Select all",
-        "count_singular": "1 czołg",
+        "count_singular": "1 tank",
-        "count_plural": "{count} czołgi",
+        "count_plural": "{count} tanks",
-        "sorting_by": "Sortowanie według {name}",
+        "sorting_by": "Sorting by {name}",
-        "clear": "Wyczyść",
+        "clear": "Clear",
-        "tier": "Poziom czołgu {tier}",
+        "tier": "Tier {tier}",
-        "passive": "{name} (Pasywny)",
+        "passive": "{name} (Passive)",
         "active": "{name} (Aktywne)",
         "no_tanks_found": {
           "body": "Nie znaleziono czołgu.",
           "search_again": "",
-          "clear_filters": "Spróbuj wyczyścić filtry."
+          "clear_filters": "Try clearing filters."
         },
         "sort": {
           "meta.none": "brak",
@@ -443,71 +443,71 @@
               "ricochet": "Ricochet",
               "explosion_radius": "Explosion radius",
               "exit": "Exit",
-              "reset": "Zresetuj"
+              "reset": "Reset"
             },
-            "advanced": "Zaawansowane podświetlanie",
+            "advanced": "Advanced highlighting",
             "shot_card": {
               "element": {
-                "primary": "Główny",
+                "primary": "Primary",
                 "spaced": "Spaced",
-                "external": "Zewnętrzny",
+                "external": "External",
-                "gap": "Odstęp",
+                "gap": "Gap",
-                "gun": "Działo",
+                "gun": "Gun",
-                "track": "Gąsienice"
+                "track": "Tracks"
               },
               "status": {
-                "penetration": "{damage} penetracja punktów wytrzymałości",
+                "penetration": "{damage}hp penetration",
-                "blocked": "Zablokowany",
+                "blocked": "Blocked",
-                "ricochet": "Rykoszet",
+                "ricochet": "Ricochet",
-                "splash": "{damage} rozprysk punktów wytrzymałości"
+                "splash": "{damage}hp splash"
               },
               "stats": {
-                "thickness_and_angle": "{thickness}mm {angle}",
+                "thickness_and_angle": "{thickness}mm {angle}°",
-                "nominal": "{thickness}mm nominalny",
+                "nominal": "{thickness}mm nominal",
-                "ricochet_loss": "{loss}% penetracji"
+                "ricochet_loss": "{loss}% penetration"
               }
             }
           },
           "static": {
-            "name": "Pancerz statyczny",
+            "name": "Static armor",
-            "primary": "Główny Pancerz",
+            "primary": "Primary",
-            "spaced": "Ekran przeciwkumulacyjny",
+            "spaced": "Spaced",
-            "external": "Zewnętrzny",
+            "external": "External",
             "edit": {
-              "label": "Edytuj",
+              "label": "Edit",
-              "reset": "Zresetuj"
+              "reset": "Reset"
             }
           }
         },
         "meta": {
-          "back": "Powrót",
+          "back": "Back",
-          "compare": "Porównaj",
+          "compare": "Compare",
           "swap": {
-            "button": "Zamień",
+            "button": "Swap",
-            "title": "Zamień czołgi"
+            "title": "Swap tanks"
           },
           "vanilla": "Vanilla",
           "opentest": "OpenTest",
-          "full_name": "Pełna nazwa",
+          "full_name": "Full name",
           "nation": "Naród",
           "class": "Klasa",
           "tier": "Poziom",
           "type": "Rodzaj",
           "dev_id": "DEV: ID",
-          "dev_name": "DEV: NAZWA",
+          "dev_name": "DEV: NAME",
-          "purchase": "Cena zakupu",
+          "purchase": "Purchase price",
-          "restoration": "Cena odzyskania",
+          "restoration": "Restoration price",
           "sale": "Sale price",
           "research": "Research XP"
         },
         "tech_tree": {
-          "title": "Drzewko technologiczne",
+          "title": "Tech tree",
-          "battle": "1 bitwa",
+          "battle": "1 battle",
-          "battles": "{count} bitew",
+          "battles": "{count} battles",
-          "route": "Ścieżka {index} z {count}"
+          "route": "Route {index} of {count}"
         },
         "game_modes": {
-          "title": "Umiejętności trybu gry"
+          "title": "Game mode abilities"
         },
         "review": {
           "title": "Review videos",
@@ -520,26 +520,26 @@
             "equalize": "Equalize"
           },
           "modules": {
-            "title": "Moduły",
+            "title": "Modules",
-            "stock": "Standardowy",
+            "stock": "Stock",
-            "upgrade": "Ulepsz"
+            "upgrade": "Upgrade"
           },
           "equipment": {
-            "title": "Wyposażenie",
+            "title": "Equipment",
-            "clear": "Wyczyść"
+            "clear": "Clear"
           },
           "provisions": {
-            "title": "Materiały eksploatacyjne",
+            "title": "Provisions",
-            "clear": "Wyczyść"
+            "clear": "Clear"
           },
           "consumables": {
             "title": "Consumables",
-            "clear": "Wyczyść",
+            "clear": "Clear",
             "info": "Yellow consumables do not affect the statistics."
           },
           "skills": {
             "title": "Crew skills",
-            "clear": "Wyczyść",
+            "clear": "Clear",
             "maximize": "Maximize",
             "info": "Yellow skills only apply under special circumstances. Hold Space to quickly toggle between level 0 and 7."
           },
@@ -557,49 +557,49 @@
           },
           "values": {
             "shell_index": "Shell {index}",
-            "at_distance": "Z odległości {distance}m",
+            "at_distance": "At {distance}m",
-            "at_distance_slider_label": "Zasięg widzenia",
+            "at_distance_slider_label": "Distance",
-            "dispersion_at_distance": "Rozrzut na {distance}m",
+            "dispersion_at_distance": "Dispersion at {distance}m",
-            "gun_flexibility": "Elastyczność działa",
+            "gun_flexibility": "Gun flexibility",
-            "speed": "Prędkość",
+            "speed": "Speed",
-            "terrain_coefficients": "Współczynniki terenu",
+            "terrain_coefficients": "Terrain coefficients",
-            "raw_terrain_coefficients": "Surowe współczynniki terenu",
+            "raw_terrain_coefficients": "Raw terrain coefficients",
-            "power_to_weight_ratio": "Stosunek mocy do masy",
+            "power_to_weight_ratio": "Power to weight ratio",
-            "hull_traverse_speed": "Prędkość obrotu kadłuba",
+            "hull_traverse_speed": "Hull traverse speed",
-            "camouflage": "Kamuflaż",
+            "camouflage": "Camouflage",
-            "reload": "Przeładowanie",
+            "reload": "Reload",
-            "crewCount": "Liczba członków załogi",
+            "crewCount": "Crew count",
             "shellNormalization": "Normalization",
             "shellRicochet": "Ricochet",
-            "dpm": "Uszkodzenia na minutę",
+            "dpm": "DPM",
-            "dpmEffective": "Efektywne w 60s",
+            "dpmEffective": "Effective at 60s",
-            "peekabooDpm": "Obrażenia na minutę w stylu „wychyl i schowaj”",
+            "peekabooDpm": "Peekaboo DPM",
-            "peekabooDpmInfo": "Obrażenia na minutę przy założeniu, że strzelisz tylko po zresetowaniu kamuflażu (lub ponownym załadowaniu, jeśli jest wolniejszy) — co najmniej 10 sekund pomiędzy strzałami.",
+            "peekabooDpmInfo": "Damage per minute assuming you only fire after resetting camouflage (or the reload finishes, if it's slower) — at least 10 seconds between shots.",
-            "shells": "Pociski",
+            "shells": "Shells",
-            "mostOptimalShellIndex": "Optymalny pocisk",
+            "mostOptimalShellIndex": "Most optimal shell",
-            "shellReloads": "Przeładowania",
+            "shellReloads": "Reloads",
-            "shellReload": "Przeładowanie",
+            "shellReload": "Reload",
-            "intraClip": "Czas przeładowania pocisku",
+            "intraClip": "Intra-clip",
             "caliber": "Caliber",
             "penetration": "Penetration",
             "damage": "Uszkodzenia",
-            "damageWithoutAssault": "Uszkodzenia bez pocisków szturmowych",
+            "damageWithoutAssault": "Damage without assault shells",
-            "clipDamage": "Potencjał magazynu",
+            "clipDamage": "Clipping potential",
-            "moduleDamage": "Uszkodzenia modułów",
+            "moduleDamage": "Module damage",
-            "explosionRadius": "Promień eksplozji",
+            "explosionRadius": "Explosion radius",
-            "shellVelocity": "Prędkość pocisku",
+            "shellVelocity": "Shell velocity",
-            "aimTime": "Czas celowania",
+            "aimTime": "Aim time",
             "dispersion": "Still",
-            "dispersionMoving": "Podczas ruchu",
+            "dispersionMoving": "Moving",
-            "dispersionHullTraversing": "Obrót kadłuba",
+            "dispersionHullTraversing": "Hull traversing",
-            "dispersionTurretTraversing": "Obrót wieży",
+            "dispersionTurretTraversing": "Turret traversing",
-            "dispersionShooting": "Strzelanie",
+            "dispersionShooting": "Shooting",
-            "dispersionGunDamaged": "Uszkodzone Działo",
+            "dispersionGunDamaged": "Gun damaged",
-            "gunDepression": "Limit obrotu działa w dół",
+            "gunDepression": "Depression",
-            "gunElevation": "Limit obrotu działa w górę",
+            "gunElevation": "Elevation",
-            "gunFrontalDepression": "Przedni limit obrotu działa w dół",
+            "gunFrontalDepression": "Frontal depression",
-            "gunFrontalElevation": "Przedni limit obrotu działa w górę",
+            "gunFrontalElevation": "Frontal elevation",
-            "gunRearDepression": "Tylne opuszczanie działa",
+            "gunRearDepression": "Rear depression",
             "gunRearElevation": "Rear elevation",
             "azimuthLeft": "Azimuth left",
             "azimuthRight": "Azimuth right",
@@ -626,7 +626,7 @@
             "trackRepairTime": "Track repair time",
             "viewRange": "View range",
             "camouflageStill": "Still",
-            "camouflageMoving": "Podczas ruchu",
+            "camouflageMoving": "Moving",
             "camouflageShootingStill": "Shooting while still",
             "camouflageShootingMoving": "Shooting while moving",
             "camouflageCaughtOnFire": "Caught on fire",
@@ -648,7 +648,7 @@
         "crew": {
           "title": "Crew training",
           "info": "represents the other roles a crew member can take.",
-          "count": "Liczba członków załogi",
+          "count": "Crew count",
           "commander": "Commander",
           "gunner": "Gunner",
           "driver": "Driver",
@@ -663,7 +663,7 @@
         }
       },
       "compare": {
-        "name": "Porównaj",
+        "name": "Compare",
         "button": "Compare tanks",
         "description": "Compare tank statistics",
         "seo_description": "Compare tanks statistics and loadouts in World of Tanks Blitz",
@@ -673,7 +673,7 @@
             "title": "Add tanks",
             "description": "Select tanks to add to comparison"
           },
-          "clear": "Wyczyść",
+          "clear": "Clear",
           "deltas": {
             "none": "No deltas",
             "percentage": "Percentage",
@@ -686,17 +686,17 @@
         },
         "table": {
           "equipment": {
-            "clear": "Wyczyść",
+            "clear": "Clear",
             "apply_to_all": "Apply to all"
           },
           "skills": {
-            "clear": "Wyczyść",
+            "clear": "Clear",
             "maximize": "Maximize",
             "equalize": "Equalize"
           },
           "modules": {
-            "stock": "Standardowy",
+            "stock": "Stock",
-            "upgrade": "Ulepsz"
+            "upgrade": "Upgrade"
           },
           "provisions": {
             "clear": "Clear this tank",
@@ -761,14 +761,14 @@
         "seo_description": "Track your stats in real time as you play World of Tanks Blitz",
         "search": {
           "lookup": "Look up a player to get started",
-          "hint": "Szukaj graczy...",
+          "hint": "Search players...",
-          "searching": "Wyszukiwanie...",
+          "searching": "Searching...",
           "no_results": "No players found"
         },
         "controls": {
           "title": "Tracking {name}",
           "subtitle": "Since {time}",
-          "reset": "Zresetuj",
+          "reset": "Reset",
           "change": "Change"
         },
         "no_cc": {
@@ -792,7 +792,7 @@
         "description": "Rank Blitz tanks",
         "seo_description": "Explore tier lists ranking tanks from best to worst, based on player ratings and statistical performance in World of Tanks Blitz",
         "buttons": {
-          "reset": "Zresetuj",
+          "reset": "Reset",
           "share": "Share"
         }
       },
@@ -828,7 +828,7 @@
               "success": {
                 "title": "Copy URL",
                 "info": "Generated the URL for {name}. The embed will start tracking as soon as the URL is pasted. Reset at any time by right-clicking on PC or long-pressing on mobile and then selecting \"Reset\".",
-                "back": "Powrót",
+                "back": "Back",
                 "copy": "Copy URL"
               }
             },
@@ -839,7 +839,7 @@
           },
           "customize": {
             "title": "Customize",
-            "reset": "Zresetuj",
+            "reset": "Reset",
             "description": "Bells and whistles of your embed"
           }
         },

packages/i18n/strings/ru.json

@@ -38,10 +38,10 @@
     },
     "branches": {
       "beta": "Бета",
-      "development": "Разработка",
+      "development": "Development",
       "opentest": "Открытый тест",
-      "preview": "Предпросмотр",
+      "preview": "Preview",
-      "production": "Производство"
+      "production": "Production"
     },
     "locales": {
       "en": "Английский",
@@ -194,7 +194,7 @@
       "title": "Настройки",
       "description": "Изменить настройки BlitzKit",
       "dev_mode": "Режим разработчика",
-      "auto_load_models": "Автозагрузка моделей",
+      "auto_load_models": "Auto-load models",
       "language": "Язык"
     },
     "common": {
@@ -413,7 +413,7 @@
           }
         },
         "sandbox": {
-          "load_model": "Загрузить модель",
+          "load_model": "Load model",
           "poses": {
             "hull_down": "За холмом",
             "face_hug": "В упор",
@@ -574,7 +574,7 @@
             "dpm": "ДПМ",
             "dpmEffective": "Эффективность за 60с",
             "peekabooDpm": "Peekaboo DPM",
-            "peekabooDpmInfo": "Урон в минуту при условии, если вы сбросите камуфляж(или перезарядка окончена, если она медленнее) - не менее 10 секунд между выстрелами.",
+            "peekabooDpmInfo": "Damage per minute assuming you only fire after resetting camouflage (or the reload finishes, if it's slower) — at least 10 seconds between shots.",
             "shells": "Снарядов в барабане",
             "mostOptimalShellIndex": "Самый эффективный снаряд",
             "shellReloads": "Перезарядка",

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

@@ -7,12 +7,23 @@ import {
 import type { DuelMember } from "../../stores/duel";
 import { genericDefaultEquipmentMatrix } from "../../stores/duel/constants";
 
+export function defaultTankWeapon(tank: TankDefinition) {
+  for (const turret of [...tank.turrets].reverse()) {
+    for (const gun of [...turret.guns].reverse()) {
+      const shell = gun.shells[0];
+
+      if (shell) return { turret, gun, shell };
+    }
+  }
+
+  throw new Error(`Tank ${tank.id} has no gun with shells`);
+}
+
 export function tankToDuelMember(
   tank: TankDefinition,
   provisionDefinitions: ProvisionDefinitions,
 ) {
-  const turret = tank.turrets.at(-1)!;
+  const { turret, gun, shell } = defaultTankWeapon(tank);
-  const gun = turret.guns.at(-1)!;
 
   return {
     camouflage: true,
@@ -22,7 +33,7 @@ export function tankToDuelMember(
     provisions: createDefaultProvisions(tank, gun, provisionDefinitions),
     engine: tank.engines.at(-1)!,
     gun,
-    shell: tank.turrets.at(-1)!.guns.at(-1)!.shells[0],
+    shell,
     tank,
     track: tank.tracks.at(-1)!,
     turret,

packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro

@@ -13,6 +13,7 @@ import { load } from "cheerio";
 import { api } from "../../../../../core/blitzkit/api";
 import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths";
 import { tankCharacteristics } from "../../../../../core/blitzkit/tankCharacteristics";
+import { defaultTankWeapon } from "../../../../../core/blitzkit/tankToDuelMember";
 import { getStrings } from "../../../../../core/i18n/getStrings";
 import BaseLayout from "../../../../../layouts/BaseLayout.astro";
 import { genericDefaultEquipmentMatrix } from "../../../../../stores/duel/constants";
@@ -53,9 +54,7 @@ const title = literals(strings.website.tools.tankopedia.tank_seo_title, {
 const url = import.meta.env.SITE + Astro.url.pathname;
 
 const icon = alias("api", `/tanks/${id}/icons/big.webp`);
-const turret = tank.turrets.at(-1)!;
+const { turret, gun, shell } = defaultTankWeapon(tank);
-const gun = turret.guns.at(-1)!;
-const shell = gun.shells[0];
 const characteristics = tankCharacteristics(
   {
     tank,