mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-21 16:36:36 +00:00
70745faac4
## Description: Improve type safety and runtime correctness by: 1. Enabling TypeScript's [strictNullChecks](https://www.typescriptlang.org/tsconfig/#strictNullChecks) compiler option. 2. Replacing all loose equality operators (`==` and `!=`) with strict equality operators (`===` and `!==`). 3. Cleaning up of type declarations, null handling logic, and equality expressions throughout the project. Currently, the code allows implicit assumptions that `null` and `undefined` are interchangeable, and relies on type-coercing equality checks that can introduce subtle bugs. These practices make it difficult to reason about when values may be absent and hinder the effectiveness of static analysis. Migrating to strict null checks and enforcing strict equality comparisons will clarify intent, reduce bugs, and make the codebase safer and easier to maintain. Fixes #466 ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced - [x] I understand that submitting code with bugs that could have been caught through manual testing blocks releases and new features for all contributors --------- Co-authored-by: Scott Anderson <662325+scottanderson@users.noreply.github.com> Co-authored-by: evanpelle <openfrontio@gmail.com>
185 lines
4.9 KiB
TypeScript
185 lines
4.9 KiB
TypeScript
import { consolex } from "../Consolex";
|
|
import { Game } from "../game/Game";
|
|
import { GameMap, TileRef } from "../game/GameMap";
|
|
import { PseudoRandom } from "../PseudoRandom";
|
|
import { DistanceBasedBezierCurve } from "../utilities/Line";
|
|
import { AStar, PathFindResultType, TileResult } from "./AStar";
|
|
import { MiniAStar } from "./MiniAStar";
|
|
|
|
const parabolaMinHeight = 50;
|
|
|
|
export class ParabolaPathFinder {
|
|
constructor(private mg: GameMap) {}
|
|
private curve: DistanceBasedBezierCurve | undefined;
|
|
|
|
computeControlPoints(
|
|
orig: TileRef,
|
|
dst: TileRef,
|
|
distanceBasedHeight = true,
|
|
) {
|
|
const p0 = { x: this.mg.x(orig), y: this.mg.y(orig) };
|
|
const p3 = { x: this.mg.x(dst), y: this.mg.y(dst) };
|
|
const dx = p3.x - p0.x;
|
|
const dy = p3.y - p0.y;
|
|
const distance = Math.sqrt(dx * dx + dy * dy);
|
|
const maxHeight = distanceBasedHeight
|
|
? Math.max(distance / 3, parabolaMinHeight)
|
|
: 0;
|
|
// Use a bezier curve always pointing up
|
|
const p1 = {
|
|
x: p0.x + (p3.x - p0.x) / 4,
|
|
y: Math.max(p0.y + (p3.y - p0.y) / 4 - maxHeight, 0),
|
|
};
|
|
const p2 = {
|
|
x: p0.x + ((p3.x - p0.x) * 3) / 4,
|
|
y: Math.max(p0.y + ((p3.y - p0.y) * 3) / 4 - maxHeight, 0),
|
|
};
|
|
|
|
this.curve = new DistanceBasedBezierCurve(p0, p1, p2, p3);
|
|
}
|
|
|
|
nextTile(speed: number): TileRef | true {
|
|
if (!this.curve) {
|
|
throw new Error("ParabolaPathFinder not initialized");
|
|
}
|
|
const nextPoint = this.curve.increment(speed);
|
|
if (!nextPoint) {
|
|
return true;
|
|
}
|
|
return this.mg.ref(Math.floor(nextPoint.x), Math.floor(nextPoint.y));
|
|
}
|
|
}
|
|
|
|
export class AirPathFinder {
|
|
constructor(
|
|
private mg: GameMap,
|
|
private random: PseudoRandom,
|
|
) {}
|
|
|
|
nextTile(tile: TileRef, dst: TileRef): TileRef | true {
|
|
const x = this.mg.x(tile);
|
|
const y = this.mg.y(tile);
|
|
const dstX = this.mg.x(dst);
|
|
const dstY = this.mg.y(dst);
|
|
|
|
if (x === dstX && y === dstY) {
|
|
return true;
|
|
}
|
|
|
|
// Calculate next position
|
|
let nextX = x;
|
|
let nextY = y;
|
|
|
|
const ratio = Math.floor(1 + Math.abs(dstY - y) / (Math.abs(dstX - x) + 1));
|
|
|
|
if (this.random.chance(ratio) && x !== dstX) {
|
|
if (x < dstX) nextX++;
|
|
else if (x > dstX) nextX--;
|
|
} else {
|
|
if (y < dstY) nextY++;
|
|
else if (y > dstY) nextY--;
|
|
}
|
|
if (nextX === x && nextY === y) {
|
|
return true;
|
|
}
|
|
return this.mg.ref(nextX, nextY);
|
|
}
|
|
}
|
|
|
|
export class PathFinder {
|
|
private curr: TileRef | null = null;
|
|
private dst: TileRef | null = null;
|
|
private path: TileRef[] | null = null;
|
|
private aStar: AStar;
|
|
private computeFinished = true;
|
|
|
|
private constructor(
|
|
private game: Game,
|
|
private newAStar: (curr: TileRef, dst: TileRef) => AStar,
|
|
) {}
|
|
|
|
public static Mini(game: Game, iterations: number, maxTries: number = 20) {
|
|
return new PathFinder(game, (curr: TileRef, dst: TileRef) => {
|
|
return new MiniAStar(
|
|
game.map(),
|
|
game.miniMap(),
|
|
curr,
|
|
dst,
|
|
iterations,
|
|
maxTries,
|
|
);
|
|
});
|
|
}
|
|
|
|
nextTile(
|
|
curr: TileRef | null,
|
|
dst: TileRef | null,
|
|
dist: number = 1,
|
|
): TileResult {
|
|
if (curr === null) {
|
|
consolex.error("curr is null");
|
|
return { type: PathFindResultType.PathNotFound };
|
|
}
|
|
if (dst === null) {
|
|
consolex.error("dst is null");
|
|
return { type: PathFindResultType.PathNotFound };
|
|
}
|
|
|
|
if (this.game.manhattanDist(curr, dst) < dist) {
|
|
return { type: PathFindResultType.Completed, tile: curr };
|
|
}
|
|
|
|
if (this.computeFinished) {
|
|
if (this.shouldRecompute(curr, dst)) {
|
|
this.curr = curr;
|
|
this.dst = dst;
|
|
this.path = null;
|
|
this.aStar = this.newAStar(curr, dst);
|
|
this.computeFinished = false;
|
|
return this.nextTile(curr, dst);
|
|
} else {
|
|
const tile = this.path?.shift();
|
|
if (tile === undefined) {
|
|
throw new Error("missing tile");
|
|
}
|
|
return { type: PathFindResultType.NextTile, tile };
|
|
}
|
|
}
|
|
|
|
switch (this.aStar.compute()) {
|
|
case PathFindResultType.Completed:
|
|
this.computeFinished = true;
|
|
this.path = this.aStar.reconstructPath();
|
|
// Remove the start tile
|
|
this.path.shift();
|
|
|
|
return this.nextTile(curr, dst);
|
|
case PathFindResultType.Pending:
|
|
return { type: PathFindResultType.Pending };
|
|
case PathFindResultType.PathNotFound:
|
|
return { type: PathFindResultType.PathNotFound };
|
|
default:
|
|
throw new Error("unexpected compute result");
|
|
}
|
|
}
|
|
|
|
private shouldRecompute(curr: TileRef, dst: TileRef) {
|
|
if (this.path === null || this.curr === null || this.dst === null) {
|
|
return true;
|
|
}
|
|
const dist = this.game.manhattanDist(curr, dst);
|
|
let tolerance = 10;
|
|
if (dist > 50) {
|
|
tolerance = 10;
|
|
} else if (dist > 25) {
|
|
tolerance = 5;
|
|
} else {
|
|
tolerance = 0;
|
|
}
|
|
if (this.game.manhattanDist(this.dst, dst) > tolerance) {
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
}
|