Fix comparison
Add room generator base class which allows us to merge neighboring rooms together