take best unit and count amulet at most once for guards blocking movement
Merge branch 'fix_block_movement' of github.com:stm2/server into stm2-fix_block_movement

Conflicts:
	scripts/tests/eressea.lua
	src/kernel/move.c
Merge branch 'stm2-fix_block_movement'