Skip to content

Fixed pirating not being disabled when a warship's owner has no port in that body of water #4458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TKTK123456 wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −7
Open

Fixed pirating not being disabled when a warship's owner has no port in that body of water #4458

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions src/core/execution/WarshipExecution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ export class WarshipExecution implements Execution {
);

// Trade-ship-specific state, lazily computed.
let hasPort: boolean | undefined;
let hasReachablePort: boolean | undefined;
let patrolTile: number | undefined;
let patrolRangeSquared: number | undefined;
let warshipComponent: number | null | undefined = undefined;
Expand All @@ -264,23 +264,30 @@ export class WarshipExecution implements Execution {
const type = unit.type();

if (includeTradeShips && type === UnitType.TradeShip) {
if (hasPort === undefined) {
hasPort = owner.unitCount(UnitType.Port) > 0;
if (warshipComponent === undefined) {
warshipComponent = mg.getWaterComponent(this.warship.tile());
}
if (hasReachablePort === undefined && warshipComponent !== null) {
hasReachablePort = false;
for (const port of owner.units(UnitType.Port)) {
hasReachablePort = mg.hasWaterComponent(
port.tile(),
warshipComponent,
);
if (hasReachablePort) break;
}
patrolTile = this.warship.warshipState().patrolTile;
patrolRangeSquared = config.warshipPatrolRange() ** 2;
}
if (
!hasPort ||
!hasReachablePort ||
patrolTile === undefined ||
unit.isSafeFromPirates() ||
unit.targetUnit()?.owner() === owner ||
unit.targetUnit()?.owner().isFriendly(owner)
) {
continue;
}
if (warshipComponent === undefined) {
warshipComponent = mg.getWaterComponent(this.warship.tile());
}
if (
warshipComponent !== null &&
!mg.hasWaterComponent(unit.tile(), warshipComponent)
Expand Down
Loading