Merged many things with the dungeon generator