Fixes combat math
Merge branch 'master' of github.com:woodgern/DCProject