Combat system fixing: spirit attack was always 0, and the will attack button was treated as a spirit attack