From c9ddd1d2e37382969b809ae20f36882889398260 Mon Sep 17 00:00:00 2001 From: troytt <47798984@qq.com> Date: Fri, 2 Oct 2026 02:37:53 +0000 Subject: [PATCH] fix(frontend): remove non-vanilla pre-game statusText instructions for 1.13c parity --- src/client/frontend/frontend-renderer.ts | 20 ------------- src/client/main.ts | 36 ++++++------------------ 2 files changed, 9 insertions(+), 47 deletions(-) diff --git a/src/client/frontend/frontend-renderer.ts b/src/client/frontend/frontend-renderer.ts index 3651011..e981a32 100644 --- a/src/client/frontend/frontend-renderer.ts +++ b/src/client/frontend/frontend-renderer.ts @@ -1263,14 +1263,6 @@ export class FrontendRenderer { color: 0, }) - if (!loginErr && this.state.statusText) { - this.drawBitmapText(this.state.statusText, 400, 274, { - font: 'fontformal11', - color: 4, - align: 'center', - }) - } - for (const btn of this.getActiveButtons()) { this.drawButton(btn) } @@ -1450,12 +1442,6 @@ export class FrontendRenderer { color: 1, align: 'center', }) - } else if (this.state.statusText) { - this.drawBitmapText(this.state.statusText, 300, 56, { - font: 'fontformal11', - color: 4, - align: 'center', - }) } // 8 character slots (2 columns x 4 rows) @@ -1697,12 +1683,6 @@ export class FrontendRenderer { color: 1, align: 'center', }) - } else if (this.state.statusText) { - this.drawBitmapText(this.state.statusText, 596, 388, { - font: 'fontformal10', - color: 4, - align: 'center', - }) } // Bottom Channel Character Lineup Bar (`y = 500..585` per D2Multi.dll 0x6f9ea0c0) diff --git a/src/client/main.ts b/src/client/main.ts index e8ea44f..3b9faba 100644 --- a/src/client/main.ts +++ b/src/client/main.ts @@ -449,7 +449,7 @@ async function bootPlayApp(): Promise { frontendRenderer.setAsyncHandlers({ onConnect: async (st) => { - st.statusText = 'CONNECTING TO BATTLE.NET...' + st.statusText = '' st.lastError = null st.loginError = null frontendRenderer.render(performance.now()) @@ -465,9 +465,7 @@ async function bootPlayApp(): Promise { } if (loginInFlight) return loginInFlight = true - st.statusText = createNewAccount - ? 'CREATING ACCOUNT & LOGGING IN...' - : 'AUTHENTICATING WITH BATTLE.NET & MCP...' + st.statusText = '' st.loginError = null st.lastError = null frontendRenderer.render(performance.now()) @@ -480,11 +478,9 @@ async function bootPlayApp(): Promise { st.gateway = res.realms[0].title } applyOnlineCharactersToFlowState(st, res.characters) - st.statusText = '' } catch (err) { // A lost session was already routed to the login screen by `onSessionLost`. if (!(err instanceof SessionLostError)) { - st.statusText = '' st.loginError = err instanceof Error ? err.message : String(err) st.lastError = st.loginError } @@ -501,7 +497,7 @@ async function bootPlayApp(): Promise { frontendRenderer.render(performance.now()) return } - st.statusText = 'CREATING CHARACTER ON REALM...' + st.statusText = '' st.charCreateError = null st.lastError = null frontendRenderer.render(performance.now()) @@ -525,41 +521,35 @@ async function bootPlayApp(): Promise { ladder: st.isLadder, }) applyOnlineCharactersToFlowState(st, chars) - st.statusText = '' } catch (err) { if (err instanceof SessionLostError) return - st.statusText = '' st.charCreateError = err instanceof Error ? err.message : String(err) st.lastError = st.charCreateError } frontendRenderer.render(performance.now()) }, onDeleteCharacter: async (st, charName) => { - st.statusText = 'DELETING CHARACTER...' + st.statusText = '' st.lastError = null frontendRenderer.render(performance.now()) try { const chars = await session.deleteCharacter(charName) applyOnlineCharactersToFlowState(st, chars) - st.statusText = '' } catch (err) { if (err instanceof SessionLostError) return - st.statusText = '' st.lastError = err instanceof Error ? err.message : String(err) } frontendRenderer.render(performance.now()) }, onConvertCharacter: async (st, charName) => { - st.statusText = 'CONVERTING CHARACTER TO EXPANSION...' + st.statusText = '' st.lastError = null frontendRenderer.render(performance.now()) try { const chars = await session.convertCharacterToExpansion(charName) applyOnlineCharactersToFlowState(st, chars) - st.statusText = '' } catch (err) { if (err instanceof SessionLostError) return - st.statusText = '' st.lastError = err instanceof Error ? err.message : String(err) } frontendRenderer.render(performance.now()) @@ -567,12 +557,11 @@ async function bootPlayApp(): Promise { onSelectCharacter: async (st) => { const selected = st.roster[st.selectedSlotIndex] if (!selected) return - st.statusText = 'LOGGING CHARACTER INTO REALM...' + st.statusText = '' st.lastError = null frontendRenderer.render(performance.now()) try { await session.selectCharacter(selected.name) - st.statusText = '' st.stage = 'bnet_lobby' st.lobbySubPanel = 'create' st.createGameError = null @@ -582,7 +571,6 @@ async function bootPlayApp(): Promise { st.activeInput = 'gameName' } catch (err) { if (err instanceof SessionLostError) return - st.statusText = '' st.lastError = err instanceof Error ? err.message : String(err) } frontendRenderer.render(performance.now()) @@ -590,7 +578,7 @@ async function bootPlayApp(): Promise { onListGames: async (st) => { st.lobbySubPanel = 'join' st.activeInput = 'gameName' - st.statusText = 'QUERYING ACTIVE GAMES...' + st.statusText = '' st.lastError = null frontendRenderer.render(performance.now()) try { @@ -608,10 +596,8 @@ async function bootPlayApp(): Promise { st.gameName = st.realmGames[0].name } } - st.statusText = '' } catch (err) { if (err instanceof SessionLostError) return - st.statusText = '' st.lastError = err instanceof Error ? err.message : String(err) } frontendRenderer.render(performance.now()) @@ -653,7 +639,7 @@ async function bootPlayApp(): Promise { st.doorFrame = 0 st.createGameError = null st.lastError = null - st.statusText = 'CREATING & JOINING GAME...' + st.statusText = '' frontendRenderer.render(performance.now()) try { await session.enterGame({ @@ -667,14 +653,12 @@ async function bootPlayApp(): Promise { levelDiff, }, }) - st.statusText = '' st.sceneReady = true st.stage = 'in_game' inGameView = true syncVisibility() } catch (err) { if (err instanceof SessionLostError) return - st.statusText = '' st.stage = 'bnet_lobby' st.createGameError = err instanceof Error ? err.message : String(err) st.lastError = st.createGameError @@ -687,7 +671,7 @@ async function bootPlayApp(): Promise { st.doorFrame = 0 st.createGameError = null st.lastError = null - st.statusText = 'JOINING GAME SERVER...' + st.statusText = '' frontendRenderer.render(performance.now()) try { await session.enterGame({ @@ -695,14 +679,12 @@ async function bootPlayApp(): Promise { name: gameName, password: gamePassword, }) - st.statusText = '' st.sceneReady = true st.stage = 'in_game' inGameView = true syncVisibility() } catch (err) { if (err instanceof SessionLostError) return - st.statusText = '' st.stage = 'bnet_lobby' st.createGameError = err instanceof Error ? err.message : String(err) st.lastError = st.createGameError