Updated Combat class

1. Filled in some function prototypes
2. Need overview on prototypes and signatures
3. Need to check if more functions need to be added