add incombat check before movement