From 6fcfc8be3c44584e5a5c4b29a1b05b00a7e7fd28 Mon Sep 17 00:00:00 2001 From: variablevince <24507472+VariableVince@users.noreply.github.com> Date: Thu, 26 Jun 2025 01:13:11 +0200 Subject: [PATCH] Cleanup and improve readability --- src/client/Main.ts | 6 ------ src/client/Transport.ts | 6 +++--- src/client/graphics/layers/EventsDisplay.ts | 17 +++++++++-------- src/core/Schemas.ts | 4 ++-- src/core/execution/ExecutionManager.ts | 4 ++-- src/core/execution/QuickChatExecution.ts | 10 +++++----- src/core/game/Game.ts | 4 ++-- src/core/game/GameImpl.ts | 14 +++++++------- src/core/game/GameUpdates.ts | 6 +++--- 9 files changed, 33 insertions(+), 38 deletions(-) diff --git a/src/client/Main.ts b/src/client/Main.ts index c96e2fe17..79ca563f2 100644 --- a/src/client/Main.ts +++ b/src/client/Main.ts @@ -165,12 +165,6 @@ class Client { } }); - // const ctModal = document.querySelector("chat-modal") as ChatModal; - // ctModal instanceof ChatModal; - // document.getElementById("chat-button").addEventListener("click", () => { - // ctModal.open(); - // }); - const hlpModal = document.querySelector("help-modal") as HelpModal; hlpModal instanceof HelpModal; const helpButton = document.getElementById("help-button"); diff --git a/src/client/Transport.ts b/src/client/Transport.ts index 3c8d7d364..91dd0e77a 100644 --- a/src/client/Transport.ts +++ b/src/client/Transport.ts @@ -123,7 +123,7 @@ export class SendQuickChatEvent implements GameEvent { constructor( public readonly recipient: PlayerView, public readonly quickChatKey: string, - public readonly target?: PlayerID, + public readonly playerInMessageID?: PlayerID, ) {} } @@ -511,9 +511,9 @@ export class Transport { this.sendIntent({ type: "quick_chat", clientID: this.lobbyConfig.clientID, - recipient: event.recipient.id(), + recipientID: event.recipient.id(), quickChatKey: event.quickChatKey, - target: event.target, + playerInMessageID: event.playerInMessageID, }); } diff --git a/src/client/graphics/layers/EventsDisplay.ts b/src/client/graphics/layers/EventsDisplay.ts index f05409f7d..bf2c58bbf 100644 --- a/src/client/graphics/layers/EventsDisplay.ts +++ b/src/client/graphics/layers/EventsDisplay.ts @@ -299,23 +299,24 @@ export class EventsDisplay extends LitElement implements Layer { onDisplayChatEvent(event: DisplayChatMessageUpdate) { const myPlayer = this.game.myPlayer(); if ( - event.playerID === null || + event.playerSID === null || !myPlayer || - myPlayer.smallID() !== event.playerID + myPlayer.smallID() !== event.playerSID ) { return; } const baseMessage = translateText(`chat.${event.category}.${event.key}`); let translatedMessage = baseMessage; - if (event.target) { + if (event.playerInMessageID) { try { - const targetPlayer = this.game.player(event.target); - const targetName = targetPlayer?.name() ?? event.target; - translatedMessage = baseMessage.replace("[P1]", targetName); + const messagePlayer = this.game.player(event.playerInMessageID); + const messagePlayerName = + messagePlayer?.name() ?? event.playerInMessageID; + translatedMessage = baseMessage.replace("[P1]", messagePlayerName); } catch (e) { console.warn( - `Failed to resolve player for target ID '${event.target}'`, + `Failed to resolve player for target ID '${event.playerInMessageID}'`, e, ); return; @@ -324,7 +325,7 @@ export class EventsDisplay extends LitElement implements Layer { this.addEvent({ description: translateText(event.isFrom ? "chat.from" : "chat.to", { - user: event.recipient, + user: event.otherPlayer, msg: translatedMessage, }), createdAt: this.game.ticks(), diff --git a/src/core/Schemas.ts b/src/core/Schemas.ts index 85e6ddd49..5638ad858 100644 --- a/src/core/Schemas.ts +++ b/src/core/Schemas.ts @@ -323,9 +323,9 @@ export const MoveWarshipIntentSchema = BaseIntentSchema.extend({ export const QuickChatIntentSchema = BaseIntentSchema.extend({ type: z.literal("quick_chat"), - recipient: ID, + recipientID: ID, quickChatKey: QuickChatKeySchema, - target: ID.optional(), + playerInMessageID: ID.optional(), }); export const MarkDisconnectedIntentSchema = BaseIntentSchema.extend({ diff --git a/src/core/execution/ExecutionManager.ts b/src/core/execution/ExecutionManager.ts index 27888e41a..beb84571d 100644 --- a/src/core/execution/ExecutionManager.ts +++ b/src/core/execution/ExecutionManager.ts @@ -118,9 +118,9 @@ export class Executor { case "quick_chat": return new QuickChatExecution( player, - intent.recipient, + intent.recipientID, intent.quickChatKey, - intent.target, + intent.playerInMessageID, ); case "mark_disconnected": return new MarkDisconnectedExecution(player, intent.isDisconnected); diff --git a/src/core/execution/QuickChatExecution.ts b/src/core/execution/QuickChatExecution.ts index b3f79830f..a73326e89 100644 --- a/src/core/execution/QuickChatExecution.ts +++ b/src/core/execution/QuickChatExecution.ts @@ -10,10 +10,10 @@ export class QuickChatExecution implements Execution { private sender: Player, private recipientID: PlayerID, private quickChatKey: string, - private target: PlayerID | undefined, + private playerInMessageID: PlayerID | undefined, ) {} - init(mg: Game, ticks: number): void { + init(mg: Game): void { this.mg = mg; if (!mg.hasPlayer(this.recipientID)) { console.warn( @@ -26,13 +26,13 @@ export class QuickChatExecution implements Execution { this.recipient = mg.player(this.recipientID); } - tick(ticks: number): void { + tick(): void { const message = this.getMessageFromKey(this.quickChatKey); this.mg.displayChat( message[1], message[0], - this.target, + this.playerInMessageID, this.recipient.id(), true, this.sender.name(), @@ -41,7 +41,7 @@ export class QuickChatExecution implements Execution { this.mg.displayChat( message[1], message[0], - this.target, + this.playerInMessageID, this.sender.id(), false, this.recipient.name(), diff --git a/src/core/game/Game.ts b/src/core/game/Game.ts index aa19683f3..f66d7a9fa 100644 --- a/src/core/game/Game.ts +++ b/src/core/game/Game.ts @@ -647,10 +647,10 @@ export interface Game extends GameMap { displayChat( message: string, category: string, - target: PlayerID | undefined, + playerInMessageID: PlayerID | undefined, playerID: PlayerID | null, isFrom: boolean, - recipient: string, + otherPlayer: string, ): void; // Nations diff --git a/src/core/game/GameImpl.ts b/src/core/game/GameImpl.ts index 19e89a2d8..1839e5aa2 100644 --- a/src/core/game/GameImpl.ts +++ b/src/core/game/GameImpl.ts @@ -633,23 +633,23 @@ export class GameImpl implements Game { displayChat( message: string, category: string, - target: PlayerID | undefined, + playerInMessageID: PlayerID | undefined, playerID: PlayerID | null, isFrom: boolean, - recipient: string, + otherPlayer: string, ): void { - let id: number | null = null; + let smallPID: number | null = null; if (playerID !== null) { - id = this.player(playerID).smallID(); + smallPID = this.player(playerID).smallID(); } this.addUpdate({ type: GameUpdateType.DisplayChatEvent, key: message, category: category, - target: target, - playerID: id, + playerInMessageID: playerInMessageID, + playerSID: smallPID, isFrom, - recipient: recipient, + otherPlayer: otherPlayer, }); } diff --git a/src/core/game/GameUpdates.ts b/src/core/game/GameUpdates.ts index 0c76f3a95..f3c14bfa8 100644 --- a/src/core/game/GameUpdates.ts +++ b/src/core/game/GameUpdates.ts @@ -209,10 +209,10 @@ export type DisplayChatMessageUpdate = { type: GameUpdateType.DisplayChatEvent; key: string; category: string; - target: string | undefined; - playerID: number | null; + playerInMessageID: string | undefined; + playerSID: number | null; isFrom: boolean; - recipient: string; + otherPlayer: string; }; export interface WinUpdate {