Correctly don't apply a berserk penalty when ctrl-attacking (#8882).

As usual in movement code, there's some nasty duplication that would be
ideally fixed, but this is simpler for now.

(cherry picked from commit 1dd05b10fb99519fca7e075989b7078e5b811755)