Battle system almost finished

Battle system almost finished