From f6a418499b58edbeca7c7f1c84d5453395013d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Sun, 3 Mar 2024 16:08:29 -0600 Subject: [PATCH] feat: direct depot --- .github/workflows/cd-assets.yml | 2 +- .vscode/settings.json | 1 + scripts/buildAssets/constants.ts | 11 ++++++----- src/core/blitzkrieg/secrets.ts | 1 + submodules/closedkrieg | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cd-assets.yml b/.github/workflows/cd-assets.yml index 70480c78a..7207bba0e 100644 --- a/.github/workflows/cd-assets.yml +++ b/.github/workflows/cd-assets.yml @@ -44,7 +44,7 @@ jobs: run: yarn setup:depotdownloader - name: Run DepotDownloader - run: ./temp/depotDownloader/DepotDownloader.exe -app 444200 -username ${{ secrets.DEPOT_DOWNLOADER_USERNAME }} -password "${{ secrets.DEPOT_DOWNLOADER_PASSWORD }}" + run: ./temp/depotDownloader/DepotDownloader.exe -app 444202 -username ${{ secrets.DEPOT_DOWNLOADER_USERNAME }} -password "${{ secrets.DEPOT_DOWNLOADER_PASSWORD }}" - name: Build assets run: | diff --git a/.vscode/settings.json b/.vscode/settings.json index dfd14db10..dca4e6fa9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -140,6 +140,7 @@ "webp", "winrate", "wireframe", + "WOTB", "wotblitz", "xffn", "xkdkw", diff --git a/scripts/buildAssets/constants.ts b/scripts/buildAssets/constants.ts index 741fa1fb0..d9c07cac5 100644 --- a/scripts/buildAssets/constants.ts +++ b/scripts/buildAssets/constants.ts @@ -1,12 +1,13 @@ -import { readdir } from 'fs/promises'; import { argv } from 'process'; const isDepot = argv.includes('--depot'); +export const WOTB_WIN32_DEPOT = 444202; export const DATA = isDepot - ? await (async () => { - const [installationVersion] = await readdir('depots/444202'); - return `depots/444202/${installationVersion}/Data`; - })() + ? // ? await (async () => { + // const [installationVersion] = await readdir(`depots/${WOTB_WIN32_DEPOT}`); + // return `depots/${WOTB_WIN32_DEPOT}/${installationVersion}/Data`; + // })() + `depots/${WOTB_WIN32_DEPOT}/Data` : 'C:/Program Files (x86)/Steam/steamapps/common/World of Tanks Blitz/Data'; export const POI = { diff --git a/src/core/blitzkrieg/secrets.ts b/src/core/blitzkrieg/secrets.ts index 264382263..5cb7ae534 100644 --- a/src/core/blitzkrieg/secrets.ts +++ b/src/core/blitzkrieg/secrets.ts @@ -6,6 +6,7 @@ export const SECRET_KEYS = [ 'DISCORD_TOKEN', 'GH_TOKEN', 'DISCORD_BLITZ_DB', + 'WOTB_DLC_CDN', ] as const; export type SECRET = typeof SECRET_KEYS extends readonly (infer T)[] diff --git a/submodules/closedkrieg b/submodules/closedkrieg index ea6012c50..39fb1bbe9 160000 --- a/submodules/closedkrieg +++ b/submodules/closedkrieg @@ -1 +1 @@ -Subproject commit ea6012c50ba7a5d1c6673ac9a8067759a5ec5f05 +Subproject commit 39fb1bbe9c6f1690f0d085dc765c7c99aa01b11a