Fix Monster movement

Instead of doing civvie moves *and* monster moves in the same update, do one or
the other.

Unfortunately, it looks like their collision detection stopped bugging in the
way that allowed us to take damage.