Merge branch 'main' into ue4

packages/scripts/src/buildAssets/blitzkitTankIcons.ts

@@ -7,7 +7,6 @@ import { FileChange } from '../core/github/commitMultipleFiles';
 export async function blitzkitTankIcons() {
   console.log('Building blitzkit tank icons...');
 
-  console.log('Starting website dev server...');
   const browser = await launch();
   const page = await browser.newPage();
   const tanks = Object.values((await fetchTankDefinitions()).tanks);
@@ -19,12 +18,14 @@ export async function blitzkitTankIcons() {
       width: BLITZKIT_TANK_ICON_SIZE.width - 1,
       height: BLITZKIT_TANK_ICON_SIZE.height,
     });
-    await page.goto(`http://localhost:4321/api/tankopedia/tank-icon/${id}/`, {
-      waitUntil: 'networkidle0',
-    });
 
-    if (index === 0) {
-      console.log('Dev server started!');
+    try {
+      await page.goto(`http://localhost:4321/api/tankopedia/tank-icon/${id}/`, {
+        waitUntil: 'networkidle0',
+      });
+    } catch (error) {
+      console.error(`${id} ${name} time out`, error);
+      continue;
     }
 
     const screenshot = await page.screenshot({

packages/scripts/src/buildAssets/index.ts

@@ -21,7 +21,6 @@ import { gameModeBanners } from './gameModeBanners';
 import { glossary } from './glossary';
 import { migration } from './migration';
 import { moduleIcons } from './moduleIcons';
-import { popularTanks } from './popularTanks';
 import { shellIcons } from './shellIcons';
 import { skillIcons } from './skillIcons';
 import { tankArmors } from './tankArmors';
@@ -47,7 +46,7 @@ const methods = [
   boosterIcons,
   tankIcons,
   blitzkitTankIcons,
-  popularTanks,
+  // popularTanks,
   glossary,
 ];
 

packages/scripts/src/buildAssets/tankModels.ts

@@ -32,9 +32,6 @@ export async function tankModels() {
       if (tankKey.includes('tutorial_bot')) continue;
 
       const id = toUniqueId(nation, tank.id);
-
-      if (id !== 21777) continue;
-
       const parameters = await readYAMLDVPL<TankParameters>(
         `${DATA}/3d/Tanks/Parameters/${nation}/${tankKey}.yaml`,
       );
@@ -43,8 +40,6 @@ export async function tankModels() {
         parameters.resourcesPath.blitzModelPath.replace(/\.sc2$/, ''),
       );
 
-      await writeFile('../../temp/model.glb', await nodeIO.writeBinary(model));
-
       changes.push({
         path: `3d/tanks/models/${id}.glb`,
         content: Buffer.from(await nodeIO.writeBinary(model)),

packages/scripts/src/core/github/commitMultipleFiles.ts

@@ -73,12 +73,13 @@ export async function commitMultipleFiles(
       }
 
       if (diff.status === DiffStatus.Unchanged) {
-        console.log(`🔵 (${diff.change.toLocaleString()}B) ${change.path}`);
+        // just don't bother
+        // console.log(`🔵 (${diff.change.toLocaleString()}B) ${change.path}`);
       } else {
         console.log(
           `${
             diff.status === DiffStatus.New ? '🟢' : '🟡'
-          } (+${diff.change.toLocaleString()}B) ${change.path}`,
+          } (${diff.change > 0 ? '+' : ''}${diff.change.toLocaleString()}B) ${change.path}`,
         );
         changes.push(change);
       }