Fixed a bug in combatSystem
Merge branch 'master' of https://github.com/ravertass/KandidatRoguelike