Fixing Combat

Finally got my combat AI working properly again.