Refactored some of the Combat code because it didn't work out :)
Merge branch 'master' of https://github.com/floAr/ADG_Scarlet_Gamma