Combat Old + New

Merges mechanics of both old combat (pre 1.9) and new combat. (1.9+) Spam is now viable.