implemented combat resolution, came up with idea for an 'override'
system for handling innates