Added battle method to Room and removed methods from Map