Fixed yet another combat bug
Merge branch 'master' of github.com:KittyTristy/roguekit