made rooms and resolve combat