Ready for Implementation

Did some extensive testing of the combat system, made some alterations.
It should be ready to implement tomorrow.