Merge pull request #222 from karelpak1/Position-fix

.

.github/workflows/host-bot.yml

@@ -1,13 +1,7 @@
 name: Host
 
 on:
-  push:
-    branches: main
-  schedule:
-    - cron: "0 */5 * * *"
   workflow_dispatch:
-  release:
-    types: [created, published, released, edited]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

docs/changelogs/1.29.15.md

@@ -0,0 +1,5 @@
+# BlitzKit 1.29.15
+
+## Fixes
+
+- Tanks now use alpha clipping to render translucency, fixing a lot of "ghostly" looking tanks

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitzkit",
-  "version": "1.29.14",
+  "version": "1.29.15",
   "license": "BlitzKit License",
   "private": true,
   "scripts": {

packages/core/src/streams/bufferToBigInt.ts

@@ -0,0 +1,3 @@
+export function bufferToBigInt(buffer: ArrayBuffer) {
+  return new DataView(buffer).getBigUint64(0, true);
+}

packages/core/src/streams/index.ts

@@ -1,4 +1,5 @@
 export * from './buffer';
+export * from './bufferToBigInt';
 export * from './dds';
 export * from './dids';
 export * from './pvr';
@@ -7,3 +8,4 @@ export * from './sc2';
 export * from './scg';
 export * from './scpg';
 export * from './windows';
+

packages/i18n/strings/es.json

@@ -320,9 +320,16 @@
       }
     },
     "commands": {
+      "dead": "# Stat Commands Are Dead\n\nThe BlitzKit Discord bot used to use BlitzStars to fetch periodic statistics. BlitzStars has enabled aggressive Cloudflare protections; hence, disabling BlitzKit from using BlitzStar's API. This has impacted the following commands:\n\n- `/stats`\n- `/today`\n- `/breakdown`\n- `/evolution`\n- `/full-stats`\n\nPlease use [Aftermath](<https://amth.one/invite>) as an alternative which is completely independent of BlitzStars. BlitzKit-hosted stat commands will return in the near future.",
       "replay": {
         "name": "repetición",
-        "description": "Mostrar resultados de la repetición"
+        "description": "Mostrar resultados de la repetición",
+        "options": {
+          "file": {
+            "name": "file",
+            "description": "Replay file"
+          }
+        }
       },
       "research": {
         "name": "desarollar",
@@ -1005,8 +1012,8 @@
           "title": "Características",
           "compare": {
             "label": "Comparar con",
-            "class": "Tier {tier} {class}",
-            "tier": "All of tier {tier}",
+            "class": "{tier} {class}",
+            "tier": "All tier {tier}",
             "all": "Todos los tanques"
           },
           "values": {

packages/i18n/strings/fr.json

@@ -320,9 +320,16 @@
       }
     },
     "commands": {
+      "dead": "# Stat Commands Are Dead\n\nThe BlitzKit Discord bot used to use BlitzStars to fetch periodic statistics. BlitzStars has enabled aggressive Cloudflare protections; hence, disabling BlitzKit from using BlitzStar's API. This has impacted the following commands:\n\n- `/stats`\n- `/today`\n- `/breakdown`\n- `/evolution`\n- `/full-stats`\n\nPlease use [Aftermath](<https://amth.one/invite>) as an alternative which is completely independent of BlitzStars. BlitzKit-hosted stat commands will return in the near future.",
       "replay": {
         "name": "rejouer",
-        "description": "Afficher les résultats de la relecture"
+        "description": "Afficher les résultats de la relecture",
+        "options": {
+          "file": {
+            "name": "file",
+            "description": "Replay file"
+          }
+        }
       },
       "research": {
         "name": "recherche",
@@ -1005,8 +1012,8 @@
           "title": "Characteristics",
           "compare": {
             "label": "Compare against",
-            "class": "Tier {tier} {class}",
-            "tier": "All of tier {tier}",
+            "class": "{tier} {class}",
+            "tier": "All tier {tier}",
             "all": "All tanks"
           },
           "values": {

packages/i18n/strings/ja.json

@@ -320,9 +320,16 @@
       }
     },
     "commands": {
+      "dead": "# Stat Commands Are Dead\n\nThe BlitzKit Discord bot used to use BlitzStars to fetch periodic statistics. BlitzStars has enabled aggressive Cloudflare protections; hence, disabling BlitzKit from using BlitzStar's API. This has impacted the following commands:\n\n- `/stats`\n- `/today`\n- `/breakdown`\n- `/evolution`\n- `/full-stats`\n\nPlease use [Aftermath](<https://amth.one/invite>) as an alternative which is completely independent of BlitzStars. BlitzKit-hosted stat commands will return in the near future.",
       "replay": {
         "name": "replay",
-        "description": "Display replay results"
+        "description": "Display replay results",
+        "options": {
+          "file": {
+            "name": "file",
+            "description": "Replay file"
+          }
+        }
       },
       "research": {
         "name": "研究",
@@ -1005,8 +1012,8 @@
           "title": "性能値",
           "compare": {
             "label": "比較対象",
-            "class": "Tier {tier} {class}",
-            "tier": "All of tier {tier}",
+            "class": "{tier} {class}",
+            "tier": "All tier {tier}",
             "all": "全車輌"
           },
           "values": {

packages/i18n/strings/pl.json

@@ -1,7 +1,7 @@
 {
   "test": {
     "default": "",
-    "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}.",
+    "long": ".",
     "fox": "Szybki brązowy lis przeskoczył nad leniwym psem."
   },
   "common": {
@@ -320,9 +320,16 @@
       }
     },
     "commands": {
+      "dead": "# Stat Commands Are Dead\n\nThe BlitzKit Discord bot used to use BlitzStars to fetch periodic statistics. BlitzStars has enabled aggressive Cloudflare protections; hence, disabling BlitzKit from using BlitzStar's API. This has impacted the following commands:\n\n- `/stats`\n- `/today`\n- `/breakdown`\n- `/evolution`\n- `/full-stats`\n\nPlease use [Aftermath](<https://amth.one/invite>) as an alternative which is completely independent of BlitzStars. BlitzKit-hosted stat commands will return in the near future.",
       "replay": {
         "name": "powtórz",
-        "description": "Wyświetl wyniki powtórki"
+        "description": "Wyświetl wyniki powtórki",
+        "options": {
+          "file": {
+            "name": "file",
+            "description": "Replay file"
+          }
+        }
       },
       "research": {
         "name": "badanie",
@@ -1005,8 +1012,8 @@
           "title": "Characteristics",
           "compare": {
             "label": "Compare against",
-            "class": "Tier {tier} {class}",
-            "tier": "All of tier {tier}",
+            "class": "{tier} {class}",
+            "tier": "All tier {tier}",
             "all": "All tanks"
           },
           "values": {

packages/i18n/strings/pt.json

@@ -320,9 +320,16 @@
       }
     },
     "commands": {
+      "dead": "# Stat Commands Are Dead\n\nThe BlitzKit Discord bot used to use BlitzStars to fetch periodic statistics. BlitzStars has enabled aggressive Cloudflare protections; hence, disabling BlitzKit from using BlitzStar's API. This has impacted the following commands:\n\n- `/stats`\n- `/today`\n- `/breakdown`\n- `/evolution`\n- `/full-stats`\n\nPlease use [Aftermath](<https://amth.one/invite>) as an alternative which is completely independent of BlitzStars. BlitzKit-hosted stat commands will return in the near future.",
       "replay": {
         "name": "replay",
-        "description": "Exibir resultados de replays"
+        "description": "Exibir resultados de replays",
+        "options": {
+          "file": {
+            "name": "file",
+            "description": "Replay file"
+          }
+        }
       },
       "research": {
         "name": "pesquisa",
@@ -1005,8 +1012,8 @@
           "title": "Características",
           "compare": {
             "label": "Comparar com",
-            "class": "Tier {tier} {class}",
-            "tier": "All of tier {tier}",
+            "class": "{tier} {class}",
+            "tier": "All tier {tier}",
             "all": "Todos os tanques"
           },
           "values": {

packages/i18n/strings/ru.json

@@ -320,9 +320,16 @@
       }
     },
     "commands": {
+      "dead": ".",
       "replay": {
         "name": "повтор",
-        "description": "Показать результаты повтора"
+        "description": "Показать результаты повтора",
+        "options": {
+          "file": {
+            "name": "Файл",
+            "description": "Запись повтора"
+          }
+        }
       },
       "research": {
         "name": "исследование",
@@ -1005,8 +1012,8 @@
           "title": "Характеристики",
           "compare": {
             "label": "Сравнивать с",
-            "class": "{class} {tier} уровня",
-            "tier": "Все {tier} уровня",
+            "class": "Уровень Тип",
+            "tier": "Все уровни",
             "all": "Все танки"
           },
           "values": {

packages/i18n/strings/uk.json

@@ -1,7 +1,7 @@
 {
   "test": {
     "default": "тест",
-    "long": "{fruit}",
+    "long": "{color}{fruit}",
     "fox": "Швидка бура лисиця перестрибує через лінивого собаку."
   },
   "common": {
@@ -23,7 +23,7 @@
     },
     "shells": {
       "ap": "ББ",
-      "ap_cr": "APCR",
+      "ap_cr": "",
       "hc": "HEAT",
       "he": "ОФ"
     },
@@ -320,9 +320,16 @@
       }
     },
     "commands": {
+      "dead": ".",
       "replay": {
         "name": "реплей",
-        "description": "Показати результати реплею"
+        "description": "Показати результати реплею",
+        "options": {
+          "file": {
+            "name": "",
+            "description": "Replay filehttps://crowdin.com/editor/blitzkrieg/80/en-uk?view=side-by-side#9706"
+          }
+        }
       },
       "research": {
         "name": "дослідження",
@@ -660,7 +667,7 @@
       },
       "tank_search": {
         "select_dialog_title": "Знайти танк",
-        "swap_dialog_title": "Swap tank",
+        "swap_dialog_title": "Резервуар підміни",
         "clear_filters": "Очистити",
         "login": "Увійдіть, щоб скористатися",
         "search_bar_hint": "Шукайте техніку...",
@@ -671,8 +678,8 @@
         "sorting_by": "Відсортувати за {name}",
         "clear": "Clear",
         "tier": "Рівень {tier}",
-        "passive": "{name} (Passive)",
-        "active": "{name} (Active)",
+        "passive": "",
+        "active": "{name}{name}",
         "no_tanks_found": {
           "body": "Нічого не знайдено.",
           "search_again": "Спробуйте шукати заново.",
@@ -735,11 +742,11 @@
     },
     "home": {
       "pwa": {
-        "title": "Install the BlitzKit App",
+        "title": "",
         "new": "",
-        "checking": "Checking compatibility...",
-        "instructions": "Instructions for Apple devices.",
-        "install": "Install",
+        "checking": "",
+        "instructions": ".",
+        "install": "",
         "dismiss": "Dismiss"
       },
       "discord": {
@@ -823,7 +830,7 @@
         "help": {
           "title": "Partially reveal tank?",
           "description": "Reveals the tank without showing the name. This round will be considered incorrect and break your streak!",
-          "cancel": "Cancel",
+          "cancel": "",
           "reveal": "Reveal"
         },
         "clear": "Clear",
@@ -1005,8 +1012,8 @@
           "title": "Characteristics",
           "compare": {
             "label": "Compare against",
-            "class": "Tier {tier} {class}",
-            "tier": "All of tier {tier}",
+            "class": "{tier} {class}",
+            "tier": "All tier {tier}",
             "all": "Усі танки"
           },
           "values": {
@@ -1274,7 +1281,7 @@
               "button": "Generate URL",
               "title": "Generate URL",
               "subtitle": "Search an account to track",
-              "cancel": "Cancel",
+              "cancel": "",
               "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\".",

packages/i18n/strings/zh.json

@@ -320,9 +320,16 @@
       }
     },
     "commands": {
+      "dead": "# Stat Commands Are Dead\n\nThe BlitzKit Discord bot used to use BlitzStars to fetch periodic statistics. BlitzStars has enabled aggressive Cloudflare protections; hence, disabling BlitzKit from using BlitzStar's API. This has impacted the following commands:\n\n- `/stats`\n- `/today`\n- `/breakdown`\n- `/evolution`\n- `/full-stats`\n\nPlease use [Aftermath](<https://amth.one/invite>) as an alternative which is completely independent of BlitzStars. BlitzKit-hosted stat commands will return in the near future.",
       "replay": {
         "name": "回放",
-        "description": "显示重播结果"
+        "description": "显示重播结果",
+        "options": {
+          "file": {
+            "name": "file",
+            "description": "Replay file"
+          }
+        }
       },
       "research": {
         "name": "研发",
@@ -1005,8 +1012,8 @@
           "title": "属性",
           "compare": {
             "label": "比较",
-            "class": "{tier}阶 {class}",
-            "tier": "所有 {tier} 阶",
+            "class": "{tier} {class}",
+            "tier": "All tier {tier}",
             "all": "所有坦克"
           },
           "values": {

packages/scripts/src/buildAssets/tankModels.ts

@@ -12,12 +12,14 @@ export async function tankModels() {
 
   using uploader = new AssetUploader("tank models");
   const nodeIO = new NodeIO().registerExtensions(ALL_EXTENSIONS);
-  const nations = vfs.dir(`Data/XML/item_defs/vehicles`).filter((nation) => nation !== "common")
+  const nations = vfs
+    .dir(`Data/XML/item_defs/vehicles`)
+    .filter((nation) => nation !== "common");
 
   for (const nationIndex in nations) {
     const nation = nations[nationIndex];
     const tanks = await vfs.xml<{ root: VehicleDefinitionList }>(
-      `Data/XML/item_defs/vehicles/${nation}/list.xml`
+      `Data/XML/item_defs/vehicles/${nation}/list.xml`,
     );
     const entries = Object.entries(tanks.root);
 
@@ -26,11 +28,11 @@ export async function tankModels() {
 
       const id = toUniqueId(nation, tank.id);
       const parameters = await vfs.yaml<TankParameters>(
-        `Data/3d/Tanks/Parameters/${nation}/${tankKey}.yaml`
+        `Data/3d/Tanks/Parameters/${nation}/${tankKey}.yaml`,
       );
       const model = await extractModel(
         vfs,
-        parameters.resourcesPath.blitzModelPath.replace(/\.sc2$/, "")
+        parameters.resourcesPath.blitzModelPath.replace(/\.sc2$/, ""),
       );
       const content = Buffer.from(await nodeIO.writeBinary(model));
 
@@ -39,4 +41,4 @@ export async function tankModels() {
   }
 
   await uploader.flush();
-}
+}

packages/scripts/src/core/blitz/extractArmor.ts

@@ -6,13 +6,13 @@ import {
 } from "@blitzkit/core";
 import { Accessor, Document, Node, Scene } from "@gltf-transform/core";
 import { times } from "lodash-es";
-import { SteamVFS } from "../vfs/steam";
+import { AbstractVFS } from "../vfs/abstract";
 import {
   vertexAttributeGLTFName,
   vertexAttributeGltfVectorSizes,
 } from "./extractModel/constants";
 
-export async function extractArmor(vfs: SteamVFS, fileName: string) {
+export async function extractArmor(vfs: AbstractVFS, fileName: string) {
   const sc2Path = `Data/3d/Tanks/CollisionMeshes/${fileName}.sc2`;
   const scgPath = `Data/3d/Tanks/CollisionMeshes/${fileName}.scg`;
   const sc2 = new Sc2ReadStream(
@@ -141,4 +141,4 @@ export async function extractArmor(vfs: SteamVFS, fileName: string) {
   parseHierarchies(sc2["#hierarchy"], scene);
 
   return document;
-}
+}

packages/scripts/src/core/blitz/extractModel/index.ts

@@ -1,4 +1,5 @@
 import {
+  bufferToBigInt,
   Hierarchy,
   Sc2ReadStream,
   ScgReadStream,
@@ -9,7 +10,7 @@ import { Document, Material, Node, Scene } from "@gltf-transform/core";
 import { dedup, prune } from "@gltf-transform/functions";
 import { times } from "lodash-es";
 import { dirname } from "path";
-import { SteamVFS } from "../../vfs/steam";
+import { AbstractVFS } from "../../vfs/abstract";
 import { readBaseColor } from "../readBaseColor";
 import { readNormal } from "../readNormal";
 import { readRoughnessMetallic } from "../readRoughnessMetallic";
@@ -25,7 +26,7 @@ const omitMeshNames = {
   end: ["_POINT"],
 };
 
-export async function extractModel(vfs: SteamVFS, path: string) {
+export async function extractModel(vfs: AbstractVFS, path: string) {
   const sc2Path = `Data/3d/${path}.sc2`;
   const scgPath = `Data/3d/${path}.scg`;
   const sc2 = new Sc2ReadStream(
@@ -40,7 +41,7 @@ export async function extractModel(vfs: SteamVFS, path: string) {
   const materials = new Map<bigint, Material | bigint | undefined>();
 
   for (const node of sc2["#dataNodes"]) {
-    const id = new DataView(node["#id"]).getBigUint64(0, true);
+    const id = bufferToBigInt(node["#id"]);
 
     if (node.parentMaterialKey !== undefined) {
       /**
@@ -80,8 +81,20 @@ export async function extractModel(vfs: SteamVFS, path: string) {
           configIndex < node.configCount;
           configIndex++
         ) {
-          if (!hasAlpha) continue;
-          material.setAlphaMode("BLEND").setDoubleSided(true);
+          const archive = node[`configArchive_${configIndex}`];
+
+          if (
+            archive.configName !== "Default" ||
+            !archive.enabledPresets?.AlphaTest
+          ) {
+            continue;
+          }
+
+          const view = new DataView(archive.properties.alphatestThreshold);
+          const _ = view.getUint8(0); // only god knows what these flags are
+          const alphaCutoff = view.getFloat32(1, true);
+
+          material.setAlphaMode("MASK").setAlphaCutoff(alphaCutoff);
         }
       }
 
@@ -116,7 +129,7 @@ export async function extractModel(vfs: SteamVFS, path: string) {
         );
       }
 
-      materials.set(new DataView(node["#id"]).getBigUint64(0, true), material);
+      materials.set(id, material);
     }
   }
 
@@ -157,6 +170,7 @@ export async function extractModel(vfs: SteamVFS, path: string) {
             break;
 
           case "TransformComponent": {
+            component["tc.localTranslation"] = [0, 0, 0]; // Game when is loading model resets position to [0, 0, 0], so any set value is ignored.
             node.setTranslation(component["tc.localTranslation"]);
             node.setRotation(component["tc.localRotation"]);
             node.setScale(component["tc.localScale"]);
@@ -266,4 +280,4 @@ export async function extractModel(vfs: SteamVFS, path: string) {
   await document.transform(prune({ keepAttributes: true }), dedup());
 
   return document;
-}
+}

packages/website/src/constants/tools.ts

@@ -55,11 +55,6 @@ export const tools: Record<string, Tool> = {
     id: "session",
     button: "blue",
   },
-  discord: {
-    id: "discord",
-    href: "https://discord.com/application-directory/1097673957865443370",
-    button: "indigo",
-  },
   tier_list: {
     id: "tier-list",
     strings: "tier_list",