Revert "Dungeon_NEW"

This reverts commit 1bbb00b70dcd0faa4a7dd7396ce0fe5df642ea25.
Revert "Revert "Dungeon_NEW""

This reverts commit e3d02a832f02671c8ae57bca35023bd0b0e19308.