Cleanup and improve readability

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");

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,
     });
   }
 

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(),

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({

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);

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(),

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

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,
     });
   }
 

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 {