tank icons

packages/game/JSExport/GameInterface.cs

@@ -24,56 +24,20 @@ public partial class GameInterface
   private readonly BlitzFileProvider provider;
 
   public HashSet<string> files;
-  public string[] tanksDirectoryNations;
 
   public GameInterface(string directory, string map, string temp)
   {
     provider = new(directory, map, temp);
-
     files = [.. provider.Files.Keys];
-
-    var tanksBase = "Blitz/Content/Tanks/";
-    tanksDirectoryNations =
-    [
-      .. files
-        .Where(path => path.StartsWith(tanksBase))
-        .Select(path => path[tanksBase.Length..])
-        .Select(path => path.Split('/')[0])
-        .Where(nation => !nation.EndsWith(".uasset") && nation != "TankStub")
-        .Distinct(),
-    ];
   }
 
   public HashSet<string> Files => files;
-  public string[] TanksDirectoryNations => tanksDirectoryNations;
 
-  public byte[] TankBigIcon(string tankId, string pdaName)
+  public byte[] TankBigIcon(string tag)
   {
-    foreach (var nation in tanksDirectoryNations)
+    var pda = provider.Discovered<UPrimaryDataAsset>(tag);
-    {
+    var icon = pda.Get<FSoftObjectPath>("BigIcon");
-      var path = $"Blitz/Content/Tanks/{nation}/{tankId}/{pdaName}.{pdaName}";
+    return provider.Image(icon);
-
-      if (provider.TryLoadPackageObject<UPrimaryDataAsset>(path, out var pda))
-      {
-        var icon = pda.Get<FSoftObjectPath>("BigIcon");
-        var uTexture = icon.Load<UTexture2D>();
-        var cTexture = uTexture.Decode(ETexturePlatform.DesktopMobile);
-
-        if (cTexture is null)
-        {
-          Console.WriteLine($"No tank big icon found for {tankId} in {pdaName}");
-          return [];
-        }
-
-        var bitmap = cTexture.ToSkBitmap();
-        var data = bitmap.Encode(SKEncodedImageFormat.Webp, 80);
-
-        return data.ToArray();
-      }
-    }
-
-    Console.WriteLine($"No tank big icon found for {tankId} in {pdaName}");
-    return [];
   }
 
   [GeneratedRegex(@"T_UI_Flag_(\w+)_S")]

packages/game/Models/BlitzFileProvider.cs

@@ -67,6 +67,7 @@ public partial class BlitzFileProvider : DefaultFileProvider
 
   public T Discovered<T>(string path) where T : UObject
   {
+    Console.WriteLine(discovered[path]);
     return LoadPackageObject<T>(discovered[path]);
   }
 

packages/i18n/strings/en.json

@@ -272,7 +272,8 @@
     },
 
     "loadout": {
-      "state": "State",
+      "dynamics": "Dynamics",
+      "status": "Status",
       "consumables": "Consumables",
       "modules": "Modules",
       "equipment": "Equipment",

packages/website-ue/src/components/TankopediaCharacteristics/index.module.css

@@ -1,5 +1,5 @@
 .characteristics-wrapper {
-  margin: 0 var(--space-4);
+  margin: var(--space-4);
 
   --base-cell-width: 20rem;
   --group-span: 7;

packages/website-ue/src/components/TankopediaLoadout/index.module.css

@@ -13,7 +13,13 @@
     }
   }
 
-  .states {
+  .state {
+    display: flex;
+    flex-direction: column;
+    gap: var(--space-2);
+  }
+
+  .status {
     display: flex;
     flex-direction: column;
     gap: var(--space-2);

packages/website-ue/src/components/TankopediaLoadout/index.tsx

@@ -55,22 +55,25 @@ export function TankopediaLoadout({ characteristics }: TankopediaLoadoutProps) {
 
   return (
     <>
-      <State />
       {showModules && <Modules />}
       <Equipment />
       <Consumables characteristics={characteristics} />
+      <State />
+      <Status />
     </>
   );
 }
 
 function State() {
   const strings = useStrings();
-  const status = Tankopedia.use((state) => state.protagonist.status);
+
+  const shell = Tankopedia.use((state) => state.protagonist.shell);
+  const speed = Tankopedia.use((state) => state.protagonist.speed);
 
   return (
     <div className={styles.section}>
       <div className={styles.header}>
-        <Heading size="4">{strings.tanks.loadout.state}</Heading>
+        <Heading size="4">{strings.tanks.loadout.dynamics}</Heading>
 
         <IconButton
           color="red"
@@ -84,7 +87,36 @@ function State() {
         </IconButton>
       </div>
 
-      <div className={styles.states}>
+      <div className={styles.state}>
+        <span>shell: {shell}</span>
+        <span>speed: {speed}</span>
+      </div>
+    </div>
+  );
+}
+
+function Status() {
+  const strings = useStrings();
+  const status = Tankopedia.use((state) => state.protagonist.status);
+
+  return (
+    <div className={styles.section}>
+      <div className={styles.header}>
+        <Heading size="4">{strings.tanks.loadout.status}</Heading>
+
+        <IconButton
+          color="red"
+          onClick={() => {
+            Tankopedia.mutate((draft) => {
+              draft.protagonist.consumables = [];
+            });
+          }}
+        >
+          <TrashIcon />
+        </IconButton>
+      </div>
+
+      <div className={styles.status}>
         {vehicleStatusKeys.map((group, index) => (
           <div key={index} className={styles.group}>
             {group.map((key) => (

packages/website-ue/src/pages/[media]/tanks/big/[id].webp.ts

@@ -1,24 +1,23 @@
 import type { APIContext } from "astro";
 import { api } from "../../../../api/dynamic";
-import {
+import { clientUnmountedResponse } from "../../../../api/responses";
-  clientUnmountedResponse,
+import { mixStaticPaths } from "../../../../astro/mixStaticPaths";
-  notFoundResponse,
+import { assertDiscoveryTag } from "../../../../game/assertDiscoveryTag";
-} from "../../../../api/responses";
 import { game } from "../../../../game/game";
 import { clientUnmounted } from "../../../../game/unmounted";
 import { getStaticPaths as _getStaticPaths } from "../../../[api]/tanks/[id].json";
 import { getStaticPaths as __getStaticPaths } from "../../_index";
-import { mixStaticPaths } from "../../../../astro/mixStaticPaths";
 
 export const getStaticPaths = mixStaticPaths(__getStaticPaths, _getStaticPaths);
 
 export async function GET({ params }: APIContext<never, { id: string }>) {
   if (clientUnmounted) return clientUnmountedResponse;
 
-  const tank = await api.tank(params.id);
+  const item = api.metadata.item(params.id);
-  const image = game!.tankBigIcon(params.id, tank.tank!.visual_data);
+  const assetDiscovery = item.BlitzStaticAssetsDiscovery();
+  const tag = assertDiscoveryTag(assetDiscovery);
+  const icon = game!.tankBigIcon(tag);
+  const array = new Uint8Array(icon);
 
-  if (image.length === 0) return notFoundResponse;
+  return new Response(array);
-
-  return new Response(new Uint8Array(image));
 }

packages/website-ue/src/tankopedia/tankState.ts

@@ -17,6 +17,10 @@ export interface TankState {
   speed: number;
   terrainHardness: TerrainHardness;
 
+  isHullRotating: boolean;
+  isTurretRotating: boolean;
+  isGunRotating: boolean;
+
   status: Record<VehicleStatusKey, boolean>;
 }