alois/OpenFrontIO
1
0
Fork 0
mirror of https://github.com/openfrontio/OpenFrontIO.git synced 2026-06-22 04:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extracted shared target resolution logic into getTargetTile()

Browse Source
This commit is contained in:
Ryan Barlow
2026-01-03 21:44:16 +00:00
parent e702c7dc23
commit 102cd5cb56
1 changed files with 27 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/graphics/layers/NukeTrajectoryPreviewLayer.ts
+27 -57
View File
@@ -104,36 +104,7 @@ export class NukeTrajectoryPreviewLayer implements Layer {
return;
}
let targetTile: TileRef | null = null;
// If ghost is locked, use the locked tile; otherwise use mouse position
if (this.uiState.lockedGhostTile) {
targetTile = this.uiState.lockedGhostTile;
} else {
// Convert mouse position to world coordinates
const rect = this.transformHandler.boundingRect();
if (!rect) {
this.trajectoryPoints = [];
this.cachedSpawnTile = null;
return;
}
const localX = this.mousePos.x - rect.left;
const localY = this.mousePos.y - rect.top;
const worldCoords = this.transformHandler.screenToWorldCoordinates(
localX,
localY,
);
if (!this.game.isValidCoord(worldCoords.x, worldCoords.y)) {
this.trajectoryPoints = [];
this.lastTargetTile = null;
this.cachedSpawnTile = null;
return;
}
targetTile = this.game.ref(worldCoords.x, worldCoords.y);
}
const targetTile = this.getTargetTile();
if (targetTile === null) {
this.trajectoryPoints = [];
@@ -204,33 +175,7 @@ export class NukeTrajectoryPreviewLayer implements Layer {
return;
}
let targetTile: TileRef | null = null;
// If ghost is locked, use the locked tile; otherwise use mouse position
if (this.uiState.lockedGhostTile) {
targetTile = this.uiState.lockedGhostTile;
} else {
// Convert mouse position to world coordinates
const rect = this.transformHandler.boundingRect();
if (!rect) {
this.trajectoryPoints = [];
return;
}
const localX = this.mousePos.x - rect.left;
const localY = this.mousePos.y - rect.top;
const worldCoords = this.transformHandler.screenToWorldCoordinates(
localX,
localY,
);
if (!this.game.isValidCoord(worldCoords.x, worldCoords.y)) {
this.trajectoryPoints = [];
return;
}
targetTile = this.game.ref(worldCoords.x, worldCoords.y);
}
const targetTile = this.getTargetTile();
if (targetTile === null) {
this.trajectoryPoints = [];
@@ -319,6 +264,31 @@ export class NukeTrajectoryPreviewLayer implements Layer {
}
}
// Shared helper to resolve the current target tile, preferring a locked ghost tile when present
private getTargetTile(): TileRef | null {
if (this.uiState.lockedGhostTile) {
return this.uiState.lockedGhostTile;
}
const rect = this.transformHandler.boundingRect();
if (!rect) {
return null;
}
const localX = this.mousePos.x - rect.left;
const localY = this.mousePos.y - rect.top;
const worldCoords = this.transformHandler.screenToWorldCoordinates(
localX,
localY,
);
if (!this.game.isValidCoord(worldCoords.x, worldCoords.y)) {
return null;
}
return this.game.ref(worldCoords.x, worldCoords.y);
}
/**
* Draw trajectory preview line on the canvas
*/