Completely reworked the combat method(a lot of testing to be done)
Merge remote branch 'origin/master'