Pythonicized the player_battle function
Fixing merge conflict