Updated successfully to 3.4,
made battle_states an enum