Skip to content

fix: correct isEnemy function calls with required team ID arguments #1226

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

Merged
braedonsaunders merged 1 commit into from
Feb 2, 2026
Merged

fix: correct isEnemy function calls with required team ID arguments #1226

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
24 changes: 22 additions & 2 deletions src/engine/systems/ai/AITacticsManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,6 +1205,16 @@ export class AITacticsManager {
const units = this.world.getEntitiesWith('Unit', 'Transform', 'Selectable', 'Health');
const enemyPositions: Array<{ x: number; y: number }> = [];

// Get AI's team ID from one of its own units
let myTeamId = 0;
for (const entity of units) {
const selectable = entity.get<Selectable>('Selectable')!;
if (selectable.playerId === ai.playerId) {
myTeamId = selectable.teamId;
break;
}
}

for (const entity of units) {
const selectable = entity.get<Selectable>('Selectable')!;
const unit = entity.get<Unit>('Unit')!;
Expand All @@ -1217,7 +1227,7 @@ export class AITacticsManager {
if (unit.isWorker) continue;

// Use isEnemy check for proper team handling
if (!isEnemy(ai.playerId, selectable.playerId)) continue;
if (!isEnemy(ai.playerId, myTeamId, selectable.playerId, selectable.teamId)) continue;

enemyPositions.push({ x: transform.x, y: transform.y });
}
Expand Down Expand Up @@ -1246,6 +1256,16 @@ export class AITacticsManager {
private hasRemainingEnemyUnits(ai: AIPlayer): boolean {
const units = this.world.getEntitiesWith('Unit', 'Selectable', 'Health');

// Get AI's team ID from one of its own units
let myTeamId = 0;
for (const entity of units) {
const selectable = entity.get<Selectable>('Selectable')!;
if (selectable.playerId === ai.playerId) {
myTeamId = selectable.teamId;
break;
}
}

for (const entity of units) {
const selectable = entity.get<Selectable>('Selectable')!;
const unit = entity.get<Unit>('Unit')!;
Expand All @@ -1254,7 +1274,7 @@ export class AITacticsManager {
if (selectable.playerId === ai.playerId) continue;
if (health.isDead()) continue;
if (unit.isWorker) continue;
if (!isEnemy(ai.playerId, selectable.playerId)) continue;
if (!isEnemy(ai.playerId, myTeamId, selectable.playerId, selectable.teamId)) continue;

return true;
}
Expand Down
Loading