updated battle mechanics and added padding