Fixed some discrepancies with unmarking tiles using wrong code.
Expanded combat to allow multi-attacks, damage modifiers and check for combat-based skills when necessary