From 1ea2f2d9460659a9b49c5ffd04d4b94df03826ec Mon Sep 17 00:00:00 2001 From: variablevince <24507472+VariableVince@users.noreply.github.com> Date: Sun, 26 Oct 2025 07:25:10 +0100 Subject: [PATCH] Fixes --- src/core/GameRunner.ts | 4 ++-- src/core/game/Game.ts | 5 ++--- src/core/game/GameView.ts | 4 ++-- src/core/game/PlayerImpl.ts | 4 ++-- src/core/worker/Worker.worker.ts | 2 +- src/core/worker/WorkerClient.ts | 4 ++-- src/core/worker/WorkerMessages.ts | 2 +- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/core/GameRunner.ts b/src/core/GameRunner.ts index d65781002..0f4bf0434 100644 --- a/src/core/GameRunner.ts +++ b/src/core/GameRunner.ts @@ -182,14 +182,14 @@ export class GameRunner { playerID: PlayerID, x?: number, y?: number, - TransportShipFilter?: TransportShipFilter, + transportShipFilter?: TransportShipFilter, ): PlayerActions { const player = this.game.player(playerID); const tile = x !== undefined && y !== undefined ? this.game.ref(x, y) : null; const actions = { canAttack: tile !== null && player.canAttack(tile), - buildableUnits: player.buildableUnits(tile, TransportShipFilter), + buildableUnits: player.buildableUnits(tile, transportShipFilter), canSendEmojiAllPlayers: player.canSendEmoji(AllPlayers), } as PlayerActions; diff --git a/src/core/game/Game.ts b/src/core/game/Game.ts index 14837f109..db997058b 100644 --- a/src/core/game/Game.ts +++ b/src/core/game/Game.ts @@ -863,7 +863,6 @@ export interface NameViewData { // Filter for buildableUnits export enum TransportShipFilter { - Default = "default", // Include - Exclude = "exclude", // Exclude - Only = "only", // TransportShip only + Exclude = "exclude", + Only = "only", } diff --git a/src/core/game/GameView.ts b/src/core/game/GameView.ts index 1acd68ea3..3b93b7641 100644 --- a/src/core/game/GameView.ts +++ b/src/core/game/GameView.ts @@ -275,13 +275,13 @@ export class PlayerView { async actions( tile?: TileRef, - TransportShipFilter?: TransportShipFilter, + transportShipFilter?: TransportShipFilter, ): Promise { return this.game.worker.playerInteraction( this.id(), tile && this.game.x(tile), tile && this.game.y(tile), - TransportShipFilter, + transportShipFilter, ); } diff --git a/src/core/game/PlayerImpl.ts b/src/core/game/PlayerImpl.ts index 644ab060e..522d2db39 100644 --- a/src/core/game/PlayerImpl.ts +++ b/src/core/game/PlayerImpl.ts @@ -900,7 +900,7 @@ export class PlayerImpl implements Player { public buildableUnits( tile: TileRef | null, - transportShipFilter: TransportShipFilter = TransportShipFilter.Default, + transportShipFilter?: TransportShipFilter, ): BuildableUnit[] { const notInSpawnPhase = !this.mg.inSpawnPhase(); const result: BuildableUnit[] = []; @@ -914,7 +914,7 @@ export class PlayerImpl implements Player { if ( (u === UnitType.TransportShip && transportShipFilter === TransportShipFilter.Exclude) || - (u !== UnitType.TradeShip && + (u !== UnitType.TransportShip && transportShipFilter === TransportShipFilter.Only) ) { continue; diff --git a/src/core/worker/Worker.worker.ts b/src/core/worker/Worker.worker.ts index 1cafc3231..8260a6fa8 100644 --- a/src/core/worker/Worker.worker.ts +++ b/src/core/worker/Worker.worker.ts @@ -83,7 +83,7 @@ ctx.addEventListener("message", async (e: MessageEvent) => { message.playerID, message.x, message.y, - message.TransportShipFilter, + message.transportShipFilter, ); sendMessage({ type: "player_actions_result", diff --git a/src/core/worker/WorkerClient.ts b/src/core/worker/WorkerClient.ts index 3e384956d..3d71349a1 100644 --- a/src/core/worker/WorkerClient.ts +++ b/src/core/worker/WorkerClient.ts @@ -163,7 +163,7 @@ export class WorkerClient { playerID: PlayerID, x?: number, y?: number, - TransportShipFilter?: TransportShipFilter, + transportShipFilter?: TransportShipFilter, ): Promise { return new Promise((resolve, reject) => { if (!this.isInitialized) { @@ -188,7 +188,7 @@ export class WorkerClient { playerID: playerID, x: x, y: y, - TransportShipFilter: TransportShipFilter, + transportShipFilter: transportShipFilter, }); }); } diff --git a/src/core/worker/WorkerMessages.ts b/src/core/worker/WorkerMessages.ts index dc2be8ee9..d0e2037e4 100644 --- a/src/core/worker/WorkerMessages.ts +++ b/src/core/worker/WorkerMessages.ts @@ -63,7 +63,7 @@ export interface PlayerActionsMessage extends BaseWorkerMessage { playerID: PlayerID; x?: number; y?: number; - TransportShipFilter?: TransportShipFilter; + transportShipFilter?: TransportShipFilter; } export interface PlayerActionsResultMessage extends BaseWorkerMessage {