Fixes and API for combat
Merge branch 'master' of https://github.com/JellysThree/RoachKiller