fix(frontend): remove non-vanilla pre-game statusText instructions for 1.13c parity
This commit is contained in:
parent
55584da799
commit
c9ddd1d2e3
|
|
@ -1263,14 +1263,6 @@ export class FrontendRenderer {
|
||||||
color: 0,
|
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()) {
|
for (const btn of this.getActiveButtons()) {
|
||||||
this.drawButton(btn)
|
this.drawButton(btn)
|
||||||
}
|
}
|
||||||
|
|
@ -1450,12 +1442,6 @@ export class FrontendRenderer {
|
||||||
color: 1,
|
color: 1,
|
||||||
align: 'center',
|
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)
|
// 8 character slots (2 columns x 4 rows)
|
||||||
|
|
@ -1697,12 +1683,6 @@ export class FrontendRenderer {
|
||||||
color: 1,
|
color: 1,
|
||||||
align: 'center',
|
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)
|
// Bottom Channel Character Lineup Bar (`y = 500..585` per D2Multi.dll 0x6f9ea0c0)
|
||||||
|
|
|
||||||
|
|
@ -449,7 +449,7 @@ async function bootPlayApp(): Promise<PlayAppController> {
|
||||||
|
|
||||||
frontendRenderer.setAsyncHandlers({
|
frontendRenderer.setAsyncHandlers({
|
||||||
onConnect: async (st) => {
|
onConnect: async (st) => {
|
||||||
st.statusText = 'CONNECTING TO BATTLE.NET...'
|
st.statusText = ''
|
||||||
st.lastError = null
|
st.lastError = null
|
||||||
st.loginError = null
|
st.loginError = null
|
||||||
frontendRenderer.render(performance.now())
|
frontendRenderer.render(performance.now())
|
||||||
|
|
@ -465,9 +465,7 @@ async function bootPlayApp(): Promise<PlayAppController> {
|
||||||
}
|
}
|
||||||
if (loginInFlight) return
|
if (loginInFlight) return
|
||||||
loginInFlight = true
|
loginInFlight = true
|
||||||
st.statusText = createNewAccount
|
st.statusText = ''
|
||||||
? 'CREATING ACCOUNT & LOGGING IN...'
|
|
||||||
: 'AUTHENTICATING WITH BATTLE.NET & MCP...'
|
|
||||||
st.loginError = null
|
st.loginError = null
|
||||||
st.lastError = null
|
st.lastError = null
|
||||||
frontendRenderer.render(performance.now())
|
frontendRenderer.render(performance.now())
|
||||||
|
|
@ -480,11 +478,9 @@ async function bootPlayApp(): Promise<PlayAppController> {
|
||||||
st.gateway = res.realms[0].title
|
st.gateway = res.realms[0].title
|
||||||
}
|
}
|
||||||
applyOnlineCharactersToFlowState(st, res.characters)
|
applyOnlineCharactersToFlowState(st, res.characters)
|
||||||
st.statusText = ''
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
// A lost session was already routed to the login screen by `onSessionLost`.
|
// A lost session was already routed to the login screen by `onSessionLost`.
|
||||||
if (!(err instanceof SessionLostError)) {
|
if (!(err instanceof SessionLostError)) {
|
||||||
st.statusText = ''
|
|
||||||
st.loginError = err instanceof Error ? err.message : String(err)
|
st.loginError = err instanceof Error ? err.message : String(err)
|
||||||
st.lastError = st.loginError
|
st.lastError = st.loginError
|
||||||
}
|
}
|
||||||
|
|
@ -501,7 +497,7 @@ async function bootPlayApp(): Promise<PlayAppController> {
|
||||||
frontendRenderer.render(performance.now())
|
frontendRenderer.render(performance.now())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
st.statusText = 'CREATING CHARACTER ON REALM...'
|
st.statusText = ''
|
||||||
st.charCreateError = null
|
st.charCreateError = null
|
||||||
st.lastError = null
|
st.lastError = null
|
||||||
frontendRenderer.render(performance.now())
|
frontendRenderer.render(performance.now())
|
||||||
|
|
@ -525,41 +521,35 @@ async function bootPlayApp(): Promise<PlayAppController> {
|
||||||
ladder: st.isLadder,
|
ladder: st.isLadder,
|
||||||
})
|
})
|
||||||
applyOnlineCharactersToFlowState(st, chars)
|
applyOnlineCharactersToFlowState(st, chars)
|
||||||
st.statusText = ''
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (err instanceof SessionLostError) return
|
if (err instanceof SessionLostError) return
|
||||||
st.statusText = ''
|
|
||||||
st.charCreateError = err instanceof Error ? err.message : String(err)
|
st.charCreateError = err instanceof Error ? err.message : String(err)
|
||||||
st.lastError = st.charCreateError
|
st.lastError = st.charCreateError
|
||||||
}
|
}
|
||||||
frontendRenderer.render(performance.now())
|
frontendRenderer.render(performance.now())
|
||||||
},
|
},
|
||||||
onDeleteCharacter: async (st, charName) => {
|
onDeleteCharacter: async (st, charName) => {
|
||||||
st.statusText = 'DELETING CHARACTER...'
|
st.statusText = ''
|
||||||
st.lastError = null
|
st.lastError = null
|
||||||
frontendRenderer.render(performance.now())
|
frontendRenderer.render(performance.now())
|
||||||
try {
|
try {
|
||||||
const chars = await session.deleteCharacter(charName)
|
const chars = await session.deleteCharacter(charName)
|
||||||
applyOnlineCharactersToFlowState(st, chars)
|
applyOnlineCharactersToFlowState(st, chars)
|
||||||
st.statusText = ''
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (err instanceof SessionLostError) return
|
if (err instanceof SessionLostError) return
|
||||||
st.statusText = ''
|
|
||||||
st.lastError = err instanceof Error ? err.message : String(err)
|
st.lastError = err instanceof Error ? err.message : String(err)
|
||||||
}
|
}
|
||||||
frontendRenderer.render(performance.now())
|
frontendRenderer.render(performance.now())
|
||||||
},
|
},
|
||||||
onConvertCharacter: async (st, charName) => {
|
onConvertCharacter: async (st, charName) => {
|
||||||
st.statusText = 'CONVERTING CHARACTER TO EXPANSION...'
|
st.statusText = ''
|
||||||
st.lastError = null
|
st.lastError = null
|
||||||
frontendRenderer.render(performance.now())
|
frontendRenderer.render(performance.now())
|
||||||
try {
|
try {
|
||||||
const chars = await session.convertCharacterToExpansion(charName)
|
const chars = await session.convertCharacterToExpansion(charName)
|
||||||
applyOnlineCharactersToFlowState(st, chars)
|
applyOnlineCharactersToFlowState(st, chars)
|
||||||
st.statusText = ''
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (err instanceof SessionLostError) return
|
if (err instanceof SessionLostError) return
|
||||||
st.statusText = ''
|
|
||||||
st.lastError = err instanceof Error ? err.message : String(err)
|
st.lastError = err instanceof Error ? err.message : String(err)
|
||||||
}
|
}
|
||||||
frontendRenderer.render(performance.now())
|
frontendRenderer.render(performance.now())
|
||||||
|
|
@ -567,12 +557,11 @@ async function bootPlayApp(): Promise<PlayAppController> {
|
||||||
onSelectCharacter: async (st) => {
|
onSelectCharacter: async (st) => {
|
||||||
const selected = st.roster[st.selectedSlotIndex]
|
const selected = st.roster[st.selectedSlotIndex]
|
||||||
if (!selected) return
|
if (!selected) return
|
||||||
st.statusText = 'LOGGING CHARACTER INTO REALM...'
|
st.statusText = ''
|
||||||
st.lastError = null
|
st.lastError = null
|
||||||
frontendRenderer.render(performance.now())
|
frontendRenderer.render(performance.now())
|
||||||
try {
|
try {
|
||||||
await session.selectCharacter(selected.name)
|
await session.selectCharacter(selected.name)
|
||||||
st.statusText = ''
|
|
||||||
st.stage = 'bnet_lobby'
|
st.stage = 'bnet_lobby'
|
||||||
st.lobbySubPanel = 'create'
|
st.lobbySubPanel = 'create'
|
||||||
st.createGameError = null
|
st.createGameError = null
|
||||||
|
|
@ -582,7 +571,6 @@ async function bootPlayApp(): Promise<PlayAppController> {
|
||||||
st.activeInput = 'gameName'
|
st.activeInput = 'gameName'
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (err instanceof SessionLostError) return
|
if (err instanceof SessionLostError) return
|
||||||
st.statusText = ''
|
|
||||||
st.lastError = err instanceof Error ? err.message : String(err)
|
st.lastError = err instanceof Error ? err.message : String(err)
|
||||||
}
|
}
|
||||||
frontendRenderer.render(performance.now())
|
frontendRenderer.render(performance.now())
|
||||||
|
|
@ -590,7 +578,7 @@ async function bootPlayApp(): Promise<PlayAppController> {
|
||||||
onListGames: async (st) => {
|
onListGames: async (st) => {
|
||||||
st.lobbySubPanel = 'join'
|
st.lobbySubPanel = 'join'
|
||||||
st.activeInput = 'gameName'
|
st.activeInput = 'gameName'
|
||||||
st.statusText = 'QUERYING ACTIVE GAMES...'
|
st.statusText = ''
|
||||||
st.lastError = null
|
st.lastError = null
|
||||||
frontendRenderer.render(performance.now())
|
frontendRenderer.render(performance.now())
|
||||||
try {
|
try {
|
||||||
|
|
@ -608,10 +596,8 @@ async function bootPlayApp(): Promise<PlayAppController> {
|
||||||
st.gameName = st.realmGames[0].name
|
st.gameName = st.realmGames[0].name
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
st.statusText = ''
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (err instanceof SessionLostError) return
|
if (err instanceof SessionLostError) return
|
||||||
st.statusText = ''
|
|
||||||
st.lastError = err instanceof Error ? err.message : String(err)
|
st.lastError = err instanceof Error ? err.message : String(err)
|
||||||
}
|
}
|
||||||
frontendRenderer.render(performance.now())
|
frontendRenderer.render(performance.now())
|
||||||
|
|
@ -653,7 +639,7 @@ async function bootPlayApp(): Promise<PlayAppController> {
|
||||||
st.doorFrame = 0
|
st.doorFrame = 0
|
||||||
st.createGameError = null
|
st.createGameError = null
|
||||||
st.lastError = null
|
st.lastError = null
|
||||||
st.statusText = 'CREATING & JOINING GAME...'
|
st.statusText = ''
|
||||||
frontendRenderer.render(performance.now())
|
frontendRenderer.render(performance.now())
|
||||||
try {
|
try {
|
||||||
await session.enterGame({
|
await session.enterGame({
|
||||||
|
|
@ -667,14 +653,12 @@ async function bootPlayApp(): Promise<PlayAppController> {
|
||||||
levelDiff,
|
levelDiff,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
st.statusText = ''
|
|
||||||
st.sceneReady = true
|
st.sceneReady = true
|
||||||
st.stage = 'in_game'
|
st.stage = 'in_game'
|
||||||
inGameView = true
|
inGameView = true
|
||||||
syncVisibility()
|
syncVisibility()
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (err instanceof SessionLostError) return
|
if (err instanceof SessionLostError) return
|
||||||
st.statusText = ''
|
|
||||||
st.stage = 'bnet_lobby'
|
st.stage = 'bnet_lobby'
|
||||||
st.createGameError = err instanceof Error ? err.message : String(err)
|
st.createGameError = err instanceof Error ? err.message : String(err)
|
||||||
st.lastError = st.createGameError
|
st.lastError = st.createGameError
|
||||||
|
|
@ -687,7 +671,7 @@ async function bootPlayApp(): Promise<PlayAppController> {
|
||||||
st.doorFrame = 0
|
st.doorFrame = 0
|
||||||
st.createGameError = null
|
st.createGameError = null
|
||||||
st.lastError = null
|
st.lastError = null
|
||||||
st.statusText = 'JOINING GAME SERVER...'
|
st.statusText = ''
|
||||||
frontendRenderer.render(performance.now())
|
frontendRenderer.render(performance.now())
|
||||||
try {
|
try {
|
||||||
await session.enterGame({
|
await session.enterGame({
|
||||||
|
|
@ -695,14 +679,12 @@ async function bootPlayApp(): Promise<PlayAppController> {
|
||||||
name: gameName,
|
name: gameName,
|
||||||
password: gamePassword,
|
password: gamePassword,
|
||||||
})
|
})
|
||||||
st.statusText = ''
|
|
||||||
st.sceneReady = true
|
st.sceneReady = true
|
||||||
st.stage = 'in_game'
|
st.stage = 'in_game'
|
||||||
inGameView = true
|
inGameView = true
|
||||||
syncVisibility()
|
syncVisibility()
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (err instanceof SessionLostError) return
|
if (err instanceof SessionLostError) return
|
||||||
st.statusText = ''
|
|
||||||
st.stage = 'bnet_lobby'
|
st.stage = 'bnet_lobby'
|
||||||
st.createGameError = err instanceof Error ? err.message : String(err)
|
st.createGameError = err instanceof Error ? err.message : String(err)
|
||||||
st.lastError = st.createGameError
|
st.lastError = st.createGameError
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue