From db931bb13b99f7a058b178bc2460958b6356ca46 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Wed, 1 Apr 2026 13:48:47 +0200 Subject: Enable auto pick area and char --- webAO/packets/handlers/handleDONE.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'webAO/packets/handlers/handleDONE.ts') diff --git a/webAO/packets/handlers/handleDONE.ts b/webAO/packets/handlers/handleDONE.ts index 676c807..4cdd785 100644 --- a/webAO/packets/handlers/handleDONE.ts +++ b/webAO/packets/handlers/handleDONE.ts @@ -1,5 +1,6 @@ import queryParser from "../../utils/queryParser"; -import { client, clientState } from "../../client"; +import { client, clientState, autoChar } from "../../client"; +import { pickChar } from "../../dom/pickChar"; const { mode } = queryParser(); /** @@ -16,4 +17,13 @@ export const handleDONE = (_args: string[]) => { // Spectators don't need to pick a character document.getElementById("client_waiting")!.style.display = "none"; } + + if (autoChar) { + const charIndex = client.chars.findIndex( + (c: any) => c && c.name.toLowerCase() === autoChar.toLowerCase() + ); + if (charIndex !== -1) { + pickChar(charIndex); + } + } }; -- cgit From 1d96e313911bcd8705392e8c75cd2275c604225f Mon Sep 17 00:00:00 2001 From: David Skoland Date: Wed, 1 Apr 2026 14:07:23 +0200 Subject: always hide charselect --- webAO/packets/handlers/handleDONE.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'webAO/packets/handlers/handleDONE.ts') diff --git a/webAO/packets/handlers/handleDONE.ts b/webAO/packets/handlers/handleDONE.ts index 4cdd785..c4e2454 100644 --- a/webAO/packets/handlers/handleDONE.ts +++ b/webAO/packets/handlers/handleDONE.ts @@ -1,6 +1,5 @@ import queryParser from "../../utils/queryParser"; import { client, clientState, autoChar } from "../../client"; -import { pickChar } from "../../dom/pickChar"; const { mode } = queryParser(); /** @@ -19,11 +18,16 @@ export const handleDONE = (_args: string[]) => { } if (autoChar) { + // Hide charselect immediately (spectator mode) so the user isn't stuck + // on the selection screen. If the CC request succeeds, PV will confirm it. + document.getElementById("client_waiting")!.style.display = "none"; + document.getElementById("client_charselect")!.style.display = "none"; + const charIndex = client.chars.findIndex( (c: any) => c && c.name.toLowerCase() === autoChar.toLowerCase() ); if (charIndex !== -1) { - pickChar(charIndex); + client.sender.sendCharacter(charIndex); } } }; -- cgit From d24cdeff690017969cebdee08e91db89848fd7ed Mon Sep 17 00:00:00 2001 From: David Skoland Date: Wed, 1 Apr 2026 14:22:29 +0200 Subject: fix only area bug --- webAO/packets/handlers/handleDONE.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'webAO/packets/handlers/handleDONE.ts') diff --git a/webAO/packets/handlers/handleDONE.ts b/webAO/packets/handlers/handleDONE.ts index c4e2454..947e2a1 100644 --- a/webAO/packets/handlers/handleDONE.ts +++ b/webAO/packets/handlers/handleDONE.ts @@ -1,5 +1,6 @@ import queryParser from "../../utils/queryParser"; -import { client, clientState, autoChar } from "../../client"; +import { client, clientState, autoChar, autoArea } from "../../client"; +import { area_click } from "../../dom/areaClick"; const { mode } = queryParser(); /** @@ -17,6 +18,18 @@ export const handleDONE = (_args: string[]) => { document.getElementById("client_waiting")!.style.display = "none"; } + if (autoArea) { + const areaIndex = client.areas.findIndex( + (a: any) => a && a.name.toLowerCase() === autoArea.toLowerCase() + ); + if (areaIndex !== -1) { + const el = document.getElementById(`area${areaIndex}`); + if (el) { + area_click(el as HTMLElement); + } + } + } + if (autoChar) { // Hide charselect immediately (spectator mode) so the user isn't stuck // on the selection screen. If the CC request succeeds, PV will confirm it. -- cgit