Reworked fighting to use an autoattack system ready for adding spells