Do not allow to override formation animation variants chosen when walking and define remaining combat variants

Fixing oversight from rP23352. Switching to columnar formation, adding or removing formation members does not reset animation variant passed by last order.

Also adding remaining combat variants for formationwalk.

Differential Revision: https://code.wildfiregames.com/D2556