Skip to content

Commit

Permalink
Fix vacatePos (AnyZerg move logic error) & Fix autoRun() (return inst…
Browse files Browse the repository at this point in the history
…ead of continue)

- causing a role to stop working in a colony if one creep of it's sort is spawning
  • Loading branch information
dev-bittlinger committed Oct 12, 2020
1 parent d646a48 commit eb2b78c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion src/movement/Movement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,6 @@ export class Movement {
}


// TODO: this is bugged somewhere
/**
* Recursively moves creeps out of the way of a position to make room for something, such as a spawning creep.
* If suicide is specified and there is no series of move commands that can move a block of creeps out of the way,
Expand Down
2 changes: 1 addition & 1 deletion src/overlords/CombatOverlord.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export abstract class CombatOverlord extends Overlord {
autoRun(roleCreeps: CombatZerg[], creepHandler: (creep: CombatZerg) => void) {
for (const creep of roleCreeps) {
if (creep.spawning) {
return;
continue;
}
if (creep.hasValidTask) {
creep.run();
Expand Down
2 changes: 1 addition & 1 deletion src/zerg/AnyZerg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ export abstract class AnyZerg {
}

move(direction: DirectionConstant, force = false) {
if (!this.blockMovement && !force) {
if (!this.blockMovement || force) {
const result = this.creep.move(direction);
if (result == OK) {
if (!this.actionLog.move) this.actionLog.move = true;
Expand Down

0 comments on commit eb2b78c

Please sign in to comment.