Finished initial combat implementation

No crippling combat bugs! Yay!