fixed close combat and added ai
fixed combat merge
added mouse movement