added combat working with test creatures

Apparently I had written some of it before and didn't hook it up right or something, because it's working now