diff --git a/src/ai.zig b/src/ai.zig index e884946c..003047f1 100644 --- a/src/ai.zig +++ b/src/ai.zig @@ -1238,17 +1238,6 @@ pub fn nightCreatureWork(mob: *Mob, alloc: mem.Allocator) void { } }; - // Now check if there are enemies adjacent to us, and face them to - // be disposed of next turn. - for (&DIRECTIONS) |d| if (mob.coord.move(d, state.mapgeometry)) |neighbor| { - if (state.dungeon.at(neighbor).mob) |othermob| { - if (othermob.isHostileTo(mob) and !othermob.ai.flag(.IgnoredByEnemies)) { - mob.facing = d; - tryRest(mob); // Rest to avoid moving and resetting face direction. - } - } - }; - var to = mob.ai.work_area.items[0]; if ((mob.ai.work_phase == .NC_PatrolTo and mob.cansee(to)) or @@ -1259,6 +1248,16 @@ pub fn nightCreatureWork(mob: *Mob, alloc: mem.Allocator) void { } else { mob.tryMoveTo(to); } + + // Now check if there are enemies adjacent to us, and face them to + // be disposed of next turn. + for (&DIRECTIONS) |d| if (mob.coord.move(d, state.mapgeometry)) |neighbor| { + if (state.dungeon.at(neighbor).mob) |othermob| { + if (othermob.isHostileTo(mob) and !othermob.ai.flag(.IgnoredByEnemies)) { + mob.facing = d; + } + } + }; }, else => unreachable, } diff --git a/src/spells.zig b/src/spells.zig index 1f0bd7c1..05829a45 100644 --- a/src/spells.zig +++ b/src/spells.zig @@ -540,7 +540,7 @@ pub const BOLT_AOE_AMNESIA = Spell{ .bolt_multitarget = false, .bolt_avoids_allies = true, // .checks_will = true, - .bolt_aoe = 3, // XXX: Need to update particle effect if changing this + .bolt_aoe = 4, // XXX: Need to update particle effect if changing this .animation = .{ .Particle = .{ .name = "zap-mass-amnesia" } }, .noise = .Silent, .effect_type = .{ .Status = .Amnesia },