restructured states in BattleSystem to make it more consistent and easier to implement the battle system.