Fixed a lot of the combat math and created some methods for handling them.