mod movecalc to updated version
Merge branch 'clif7786' of https://github.com/cjeffery/sworsorc into clif7786