Replaced Enemy Movement setter
Merge branch 'master'