Some combat updates and formulas
Merge branch 'master' of https://github.com/Evertras/Iroth