Start step counting again after battle.
Merge branch 'feature/multiple-battles'