Moved combat commands to new data