Worked on combat logic