Created the combined combat character class

fixes #142