Merge branch 'main' into next

.github/workflows/cd-assets.yml

@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
@@ -29,23 +29,12 @@ jobs:
         run: bun scripts/setupDepotDownloader.ts
 
       - name: Run DepotDownloader
-        run: ./temp/depotDownloader/DepotDownloader.exe -os windows -app 444200 -username ${{ secrets.DEPOT_DOWNLOADER_USERNAME }} -password "${{ secrets.DEPOT_DOWNLOADER_PASSWORD }}"
+        run: |
+          chmod +x ./temp/depotDownloader/DepotDownloader
+          ./temp/depotDownloader/DepotDownloader -os windows -app 444200 -username ${{ secrets.DEPOT_DOWNLOADER_USERNAME }} -password "${{ secrets.DEPOT_DOWNLOADER_PASSWORD }}"
 
       - name: Apply patches
-        run: |
+        run: DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }} GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DATABASE_URL=${{ secrets.DATABASE_URL }} WOTB_DLC_CDN=${{ secrets.WOTB_DLC_CDN }} bun scripts/applyPatches.ts --depot
-          $env:DISCORD_CLIENT_ID = "${{ secrets.DISCORD_CLIENT_ID }}"
-          $env:GH_TOKEN = "${{ secrets.GH_TOKEN }}" 
-          $env:DISCORD_TOKEN = "${{ secrets.DISCORD_TOKEN }}" 
-          $env:DATABASE_URL = "${{ secrets.DATABASE_URL }}" 
-          $env:WOTB_DLC_CDN = "${{ secrets.WOTB_DLC_CDN }}"
-          bun scripts/applyPatches.ts --depot
 
       - name: Build assets
-        run: |
+        run: DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }} GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DATABASE_URL=${{ secrets.DATABASE_URL }} VIDEOS_SHEET=${{ secrets.VIDEOS_SHEET }} GOOGLE_APPLICATION_CREDENTIALS=${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }} bun build:assets --all-targets --depot --production
-          $env:DISCORD_CLIENT_ID = "${{ secrets.DISCORD_CLIENT_ID }}"
-          $env:GH_TOKEN = "${{ secrets.GH_TOKEN }}" 
-          $env:DISCORD_TOKEN = "${{ secrets.DISCORD_TOKEN }}" 
-          $env:DATABASE_URL = "${{ secrets.DATABASE_URL }}" 
-          $env:VIDEOS_SHEET = "${{ secrets.VIDEOS_SHEET }}" 
-          $env:GOOGLE_APPLICATION_CREDENTIALS = "${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}"
-          bun build:assets --all-targets --depot --production

.vscode/settings.json

@@ -55,7 +55,6 @@
     "DIDS",
     "donotremove",
     "drei",
-    "Droodles",
     "dvpd",
     "dvpl",
     "DVPLCRC",

docs/about/credits.md

@@ -12,7 +12,7 @@ BlitzKit is a one man band **TrèsAbhi** but I am far from solo.
 | Game file layout               | Aeson                          |
 | 3-caliber rule edge cases      | Minitelrose, ChickenMan7777    |
 | Embed UX                       | \_34, HisRoyalFatness, Synx    |
-| Tankopedia pre-release testing | [OPTML], Aeson, \_34, Droodles |
+| Tankopedia pre-release testing | [OPTML], Aeson, \_34 |
-| Website advertisement platform | Aeson, Droodles                |
+| Website advertisement platform | Aeson                |
-| Compare pre-release testing    | [OPTML], Droodles              |
+| Compare pre-release testing    | [OPTML]              |
 | Redacted                       | GonnaHetzMe                    |

scripts/setupDepotDownloader.ts

@@ -18,13 +18,13 @@ await fetch(
       }>,
   )
   .then(({ assets }) => {
-    const asset = assets.find(({ name }) => name.includes('windows-x64'));
+    const asset = assets.find(({ name }) => name.includes('linux-x64'));
     if (!asset) throw new Error('No asset found');
     return fetch(asset.browser_download_url);
   })
   .then((response) => response.arrayBuffer())
   .then((arrayBuffer) =>
-    writeFile('temp/depotDownloader.zip', Buffer.from(arrayBuffer)),
+    writeFile('temp/depotDownloader.zip', new Uint8Array(arrayBuffer)),
   );
 
 console.log('Unzipping...');