combat implemented. many bugs :(
fixed merge conflicts