BattleState integrated with game, gameover state added