added attack resolver, removed move resolver trait until i can come up with better abstractions