Refactored Combat.java according to the wiki