Moved combat to new EaUnitCombat.lua; various fixes