Fixed bug in combat system. Added combat log