Skip to content

fix: units resume attack-moving after killing target instead of going… #1379

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 2 commits into from
Feb 5, 2026
Merged

fix: units resume attack-moving after killing target instead of going… #1379

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a44ca2
fix: units resume attack-moving after killing target instead of going…
claude Feb 5, 2026
1afe426
fix: apply assault-destination resume to primary kill path (isDead)
claude Feb 5, 2026
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
15 changes: 12 additions & 3 deletions src/engine/systems/CombatSystem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,12 +768,21 @@ export class CombatSystem extends System {
// Resume attack-move to destination
unit.state = 'attackmoving';
unit.targetEntityId = null;
} else if (unit.isInAssaultMode && unit.assaultDestination) {
// RTS-STYLE: Resume attack-moving toward assault destination
// This is the SC2 behavior: after killing a target, units continue
// toward the a-move destination, engaging enemies along the way.
// Without this, units go idle and get stranded far from the fight.
unit.targetEntityId = null;
unit.targetX = unit.assaultDestination.x;
unit.targetY = unit.assaultDestination.y;
unit.state = 'attackmoving';
unit.path = [];
unit.pathIndex = 0;
} else if (unit.isInAssaultMode) {
// RTS-STYLE: Assault mode units stay in assault mode, ready to scan for new targets
// They go "idle" but with assault mode flag still set, so they keep scanning
// Assault mode but no destination - stay idle and scan for new targets
unit.targetEntityId = null;
unit.state = 'idle';
// Don't clear assault mode - unit will immediately scan for new targets next tick
} else if (!unit.executeNextCommand()) {
unit.clearTarget();
}
Expand Down
Loading