Improved Player Class and combat function