Fixed combat.
Fixed Map Combat