Fix incorrect miss chance
Merge remote-tracking branch 'upstream/master' into branch0.18
Calculate actual avoidance before clamping to MAX_AVOIDANCE
Merge remote-tracking branch 'mainline/branch0.18'

Conflicts:
	src/MapRenderer.cpp