Battle animations, faceoff screen, ai logic
merging branches