diff --git a/quests/peterm/Nethack_in_crossfire_Yendor b/quests/peterm/Nethack_in_crossfire_Yendor
index f62f75882..0991469f0 100644
--- a/quests/peterm/Nethack_in_crossfire_Yendor
+++ b/quests/peterm/Nethack_in_crossfire_Yendor
@@ -1,14 +1,14 @@
 arch map
 name Nethack in Crossfire -- Yendor
 difficulty 115
-region scorn
+region mazes
 width 69
 height 69
 enter_x 32
 enter_y 3
 msg
 Created:  2001-05-07
-Modified: 2021-07-26 Saiapatsu
+Modified: 2022-02-06 Kevin Zheng
 endmsg
 end
 arch pstone_4
diff --git a/quests/peterm/Nethack_in_crossfire_entrance b/quests/peterm/Nethack_in_crossfire_entrance
index 05284e021..a0c7099df 100644
--- a/quests/peterm/Nethack_in_crossfire_entrance
+++ b/quests/peterm/Nethack_in_crossfire_entrance
@@ -1,171 +1,1088 @@
 arch map
 name Nethack in Crossfire Entrance
-difficulty 9999
-region scorn
+difficulty 1
+region mazes
+darkness 1
 width 16
-height 16
+height 14
 enter_x 2
 enter_y 1
 msg
 Created:  2001-05-06
-Modified: 2021-07-25 Andreas Kirschbaum
+Modified: 2022-02-06 Kevin Zheng
 endmsg
 end
-arch woodfloor
+arch cobblestones2
 end
-arch wwall_2_2_2
+arch cwall_2_2_2
 end
-arch woodfloor
+arch cobblestones2
 y 1
 end
-arch wwall_2_1_1
+arch cwall_2_1_1
 y 1
 end
-arch woodfloor
+arch cobblestones2
 y 2
 end
-arch wwall_2_1_1
+arch cwall_2_1_1
 y 2
 end
-arch woodfloor
+arch cobblestones2
 y 3
 end
-arch wwall_2_1_1
+arch cwall_2_1_1
 y 3
 end
-arch woodfloor
+arch cobblestones2
 y 4
 end
-arch wwall_2_1_1
+arch cwall_2_2_1
 y 4
 end
-arch woodfloor
+arch blocked
 y 5
 end
-arch wwall_3_2
-y 5
-end
-arch woodfloor
+arch blocked
 y 6
 end
-arch wwall_2_1_1
-y 6
-end
-arch woodfloor
+arch blocked
 y 7
 end
-arch wwall_3_2
-y 7
-end
-arch woodfloor
+arch blocked
 y 8
 end
-arch wwall_2_1_1
-y 8
-end
-arch woodfloor
+arch cobblestones2
 y 9
 end
-arch wwall_3_2
+arch cwall_2_2_2
 y 9
 end
-arch woodfloor
+arch cobblestones2
 y 10
 end
-arch wwall_2_1_1
+arch cwall_2_1_1
 y 10
 end
-arch woodfloor
+arch cobblestones2
 y 11
 end
-arch wwall_3_2
+arch cwall_2_1_1
 y 11
 end
-arch woodfloor
+arch cobblestones2
 y 12
 end
-arch wwall_2_1_1
+arch cwall_2_1_1
 y 12
 end
-arch woodfloor
+arch cobblestones2
 y 13
 end
-arch wwall_3_2
+arch cwall_2_2_1
 y 13
 end
-arch woodfloor
-y 14
-end
-arch wwall_2_1_1
-y 14
-end
-arch woodfloor
-y 15
-end
-arch wwall_2_2_1
-y 15
-end
-arch woodfloor
+arch cobblestones2
 x 1
 end
-arch wwall_2_1_2
+arch cwall_2_1_2
 x 1
 end
-arch woodfloor
+arch cobblestones2
 x 1
 y 1
 end
-arch exit
-slaying /world/world_104_115
-hp -1
-sp -1
+arch stair_up
+slaying /world/world_111_114
+hp 13
+sp 38
 x 1
 y 1
 end
-arch woodfloor
+arch cobblestones2
 x 1
 y 2
 end
-arch dungeon_magic
-x 1
-y 2
-end
-arch woodfloor
+arch cobblestones2
 x 1
 y 3
 end
-arch grate_closed_1
-x 1
-y 3
-speed 0.500000
-connected 2
-end
-arch dungeon_magic
+arch brazier
 x 1
 y 3
 end
-arch woodfloor
+arch cobblestones2
 x 1
 y 4
 end
-arch check_inv
+arch cwall_2_1_2
+x 1
+y 4
+end
+arch blocked
+x 1
+y 5
+end
+arch blocked
+x 1
+y 6
+end
+arch blocked
+x 1
+y 7
+end
+arch blocked
+x 1
+y 8
+end
+arch cobblestones2
+x 1
+y 9
+end
+arch cwall_2_1_2
+x 1
+y 9
+end
+arch cobblestones2
+x 1
+y 10
+end
+arch brazier
+x 1
+y 10
+end
+arch cobblestones2
+x 1
+y 11
+end
+arch altar
 slaying Amulet of Yendor
+food 1
 x 1
+y 11
+end
+arch cobblestones2
+x 1
+y 12
+end
+arch brazier
+x 1
+y 12
+end
+arch cobblestones2
+x 1
+y 13
+end
+arch cwall_2_1_2
+x 1
+y 13
+end
+arch cobblestones2
+x 2
+end
+arch cwall_2_1_2
+x 2
+end
+arch cobblestones2
+x 2
+y 1
+end
+arch cobblestones2
+x 2
+y 2
+end
+arch cobblestones2
+x 2
+y 3
+end
+arch cobblestones2
+x 2
 y 4
-connected 2
 end
-arch woodfloor
-x 1
+arch cwall_2_1_2
+x 2
+y 4
+end
+arch blocked
+x 2
 y 5
 end
-arch wwall_2_1_2
-x 1
-y 5
-end
-arch woodfloor
-x 1
+arch blocked
+x 2
 y 6
 end
+arch blocked
+x 2
+y 7
+end
+arch blocked
+x 2
+y 8
+end
+arch cobblestones2
+x 2
+y 9
+end
+arch cwall_2_1_2
+x 2
+y 9
+end
+arch cobblestones2
+x 2
+y 10
+end
+arch cobblestones2
+x 2
+y 11
+end
+arch cobblestones2
+x 2
+y 12
+end
+arch cobblestones2
+x 2
+y 13
+end
+arch cwall_2_1_2
+x 2
+y 13
+end
+arch cobblestones2
+x 3
+end
+arch cwall_2_1_2
+x 3
+end
+arch cobblestones2
+x 3
+y 1
+end
+arch cobblestones2
+x 3
+y 2
+end
+arch cobblestones2
+x 3
+y 3
+end
+arch cobblestones2
+x 3
+y 4
+end
+arch cwall_2_1_2
+x 3
+y 4
+end
+arch blocked
+x 3
+y 5
+end
+arch blocked
+x 3
+y 6
+end
+arch blocked
+x 3
+y 7
+end
+arch blocked
+x 3
+y 8
+end
+arch cobblestones2
+x 3
+y 9
+end
+arch cwall_2_1_2
+x 3
+y 9
+end
+arch cobblestones2
+x 3
+y 10
+end
+arch cobblestones2
+x 3
+y 11
+end
+arch cobblestones2
+x 3
+y 12
+end
+arch cobblestones2
+x 3
+y 13
+end
+arch cwall_2_1_2
+x 3
+y 13
+end
+arch cobblestones2
+x 4
+end
+arch cwall_2_1_2
+x 4
+end
+arch cobblestones2
+x 4
+y 1
+end
+arch cobblestones2
+x 4
+y 2
+end
+arch cobblestones2
+x 4
+y 3
+end
+arch cobblestones2
+x 4
+y 4
+end
+arch cwall_2_1_2
+x 4
+y 4
+end
+arch blocked
+x 4
+y 5
+end
+arch blocked
+x 4
+y 6
+end
+arch blocked
+x 4
+y 7
+end
+arch blocked
+x 4
+y 8
+end
+arch cobblestones2
+x 4
+y 9
+end
+arch cwall_2_1_2
+x 4
+y 9
+end
+arch cobblestones2
+x 4
+y 10
+end
+arch cobblestones2
+x 4
+y 11
+end
+arch cobblestones2
+x 4
+y 12
+end
+arch cobblestones2
+x 4
+y 13
+end
+arch cwall_2_1_2
+x 4
+y 13
+end
+arch cobblestones2
+x 5
+end
+arch cwall_2_1_2
+x 5
+end
+arch cobblestones2
+x 5
+y 1
+end
+arch cobblestones2
+x 5
+y 2
+end
+arch cobblestones2
+x 5
+y 3
+end
+arch cobblestones2
+x 5
+y 4
+end
+arch cwall_2_1_2
+x 5
+y 4
+end
+arch blocked
+x 5
+y 5
+end
+arch blocked
+x 5
+y 6
+end
+arch blocked
+x 5
+y 7
+end
+arch blocked
+x 5
+y 8
+end
+arch cobblestones2
+x 5
+y 9
+end
+arch cwall_2_1_2
+x 5
+y 9
+end
+arch cobblestones2
+x 5
+y 10
+end
+arch cobblestones2
+x 5
+y 11
+end
+arch cobblestones2
+x 5
+y 12
+end
+arch cobblestones2
+x 5
+y 13
+end
+arch cwall_2_1_2
+x 5
+y 13
+end
+arch cobblestones2
+x 6
+end
+arch cwall_2_1_2
+x 6
+end
+arch cobblestones2
+x 6
+y 1
+end
+arch cobblestones2
+x 6
+y 2
+end
+arch cobblestones2
+x 6
+y 3
+end
+arch sign
+msg
+Welcome to the Mazes of Menace. The Mazes of Menace is a tribute to the venerable game Nethack, which inspired many of the things you will find in Crossfire. The resemblance of these random maps to the true game, Nethack, is more in spirit than in detail.
+
+Beware! In these series of maps, you'll find many customized monsters in the Nethack style, that will have little in common with monsters which may look like it in the broader Crossfire game. In particular, more monsters attack with acid, and the undead often have madness and paralysis in their touch, as in Nethack.
+endmsg
+x 6
+y 3
+end
+arch cobblestones2
+x 6
+y 4
+end
+arch cwall_1_3
+x 6
+y 4
+end
+arch blocked
+x 6
+y 5
+end
+arch blocked
+x 6
+y 6
+end
+arch blocked
+x 6
+y 7
+end
+arch blocked
+x 6
+y 8
+end
+arch cobblestones2
+x 6
+y 9
+end
+arch cwall_1_3
+x 6
+y 9
+end
+arch cobblestones2
+x 6
+y 10
+end
+arch cobblestones2
+x 6
+y 11
+end
+arch cobblestones2
+x 6
+y 12
+end
+arch cobblestones2
+x 6
+y 13
+end
+arch cwall_2_1_2
+x 6
+y 13
+end
+arch cobblestones2
+x 7
+end
+arch cwall_2_1_2
+x 7
+end
+arch cobblestones2
+x 7
+y 1
+end
+arch cobblestones2
+x 7
+y 2
+end
+arch cobblestones2
+x 7
+y 3
+end
+arch woodfloor2
+x 7
+y 4
+end
+arch woodfloor2
+x 7
+y 5
+end
+arch woodfloor2
+x 7
+y 6
+end
+arch woodfloor2
+x 7
+y 7
+end
+arch woodfloor2
+x 7
+y 8
+end
+arch woodfloor2
+x 7
+y 9
+end
+arch cobblestones2
+x 7
+y 10
+end
+arch cobblestones2
+x 7
+y 11
+end
+arch cobblestones2
+x 7
+y 12
+end
+arch cobblestones2
+x 7
+y 13
+end
+arch cwall_2_1_2
+x 7
+y 13
+end
+arch cobblestones2
+x 8
+end
+arch cwall_2_1_2
+x 8
+end
+arch cobblestones2
+x 8
+y 1
+end
+arch cobblestones2
+x 8
+y 2
+end
+arch cobblestones2
+x 8
+y 3
+end
+arch woodfloor2
+x 8
+y 4
+end
+arch woodfloor2
+x 8
+y 5
+end
+arch woodfloor2
+x 8
+y 6
+end
+arch woodfloor2
+x 8
+y 7
+end
+arch woodfloor2
+x 8
+y 8
+end
+arch woodfloor2
+x 8
+y 9
+end
+arch cobblestones2
+x 8
+y 10
+end
+arch cobblestones2
+x 8
+y 11
+end
+arch cobblestones2
+x 8
+y 12
+end
+arch cobblestones2
+x 8
+y 13
+end
+arch cwall_2_1_2
+x 8
+y 13
+end
+arch cobblestones2
+x 9
+end
+arch cwall_2_1_2
+x 9
+end
+arch cobblestones2
+x 9
+y 1
+end
+arch cobblestones2
+x 9
+y 2
+end
+arch cobblestones2
+x 9
+y 3
+end
+arch cobblestones2
+x 9
+y 4
+end
+arch cwall_1_4
+x 9
+y 4
+end
+arch blocked
+x 9
+y 5
+end
+arch blocked
+x 9
+y 6
+end
+arch blocked
+x 9
+y 7
+end
+arch blocked
+x 9
+y 8
+end
+arch cobblestones2
+x 9
+y 9
+end
+arch cwall_1_4
+x 9
+y 9
+end
+arch cobblestones2
+x 9
+y 10
+end
+arch cobblestones2
+x 9
+y 11
+end
+arch cobblestones2
+x 9
+y 12
+end
+arch cobblestones2
+x 9
+y 13
+end
+arch cwall_2_1_2
+x 9
+y 13
+end
+arch cobblestones2
+x 10
+end
+arch cwall_2_1_2
+x 10
+end
+arch cobblestones2
+x 10
+y 1
+end
+arch cobblestones2
+x 10
+y 2
+end
+arch cobblestones2
+x 10
+y 3
+end
+arch cobblestones2
+x 10
+y 4
+end
+arch cwall_2_1_2
+x 10
+y 4
+end
+arch blocked
+x 10
+y 5
+end
+arch blocked
+x 10
+y 6
+end
+arch blocked
+x 10
+y 7
+end
+arch blocked
+x 10
+y 8
+end
+arch cobblestones2
+x 10
+y 9
+end
+arch cwall_2_1_2
+x 10
+y 9
+end
+arch cobblestones2
+x 10
+y 10
+end
+arch cobblestones2
+x 10
+y 11
+end
+arch cobblestones2
+x 10
+y 12
+end
+arch cobblestones2
+x 10
+y 13
+end
+arch cwall_2_1_2
+x 10
+y 13
+end
+arch cobblestones2
+x 11
+end
+arch cwall_2_1_2
+x 11
+end
+arch cobblestones2
+x 11
+y 1
+end
+arch cobblestones2
+x 11
+y 2
+end
+arch cobblestones2
+x 11
+y 3
+end
+arch cobblestones2
+x 11
+y 4
+end
+arch cwall_2_1_2
+x 11
+y 4
+end
+arch blocked
+x 11
+y 5
+end
+arch blocked
+x 11
+y 6
+end
+arch blocked
+x 11
+y 7
+end
+arch blocked
+x 11
+y 8
+end
+arch cobblestones2
+x 11
+y 9
+end
+arch cwall_2_1_2
+x 11
+y 9
+end
+arch cobblestones2
+x 11
+y 10
+end
+arch cobblestones2
+x 11
+y 11
+end
+arch cobblestones2
+x 11
+y 12
+end
+arch cobblestones2
+x 11
+y 13
+end
+arch cwall_2_1_2
+x 11
+y 13
+end
+arch cobblestones2
+x 12
+end
+arch cwall_2_1_2
+x 12
+end
+arch cobblestones2
+x 12
+y 1
+end
+arch cobblestones2
+x 12
+y 2
+end
+arch cobblestones2
+x 12
+y 3
+end
+arch cobblestones2
+x 12
+y 4
+end
+arch cwall_2_1_2
+x 12
+y 4
+end
+arch blocked
+x 12
+y 5
+end
+arch blocked
+x 12
+y 6
+end
+arch blocked
+x 12
+y 7
+end
+arch blocked
+x 12
+y 8
+end
+arch cobblestones2
+x 12
+y 9
+end
+arch cwall_2_1_2
+x 12
+y 9
+end
+arch cobblestones2
+x 12
+y 10
+end
+arch cobblestones2
+x 12
+y 11
+end
+arch cobblestones2
+x 12
+y 12
+end
+arch cobblestones2
+x 12
+y 13
+end
+arch cwall_2_1_2
+x 12
+y 13
+end
+arch cobblestones2
+x 13
+end
+arch cwall_2_1_2
+x 13
+end
+arch cobblestones2
+x 13
+y 1
+end
+arch cobblestones2
+x 13
+y 2
+end
+arch cobblestones2
+x 13
+y 3
+end
+arch cobblestones2
+x 13
+y 4
+end
+arch cwall_2_1_2
+x 13
+y 4
+end
+arch blocked
+x 13
+y 5
+end
+arch blocked
+x 13
+y 6
+end
+arch blocked
+x 13
+y 7
+end
+arch blocked
+x 13
+y 8
+end
+arch cobblestones2
+x 13
+y 9
+end
+arch cwall_2_1_2
+x 13
+y 9
+end
+arch cobblestones2
+x 13
+y 10
+end
+arch cobblestones2
+x 13
+y 11
+end
+arch cobblestones2
+x 13
+y 12
+end
+arch cobblestones2
+x 13
+y 13
+end
+arch cwall_2_1_2
+x 13
+y 13
+end
+arch cobblestones2
+x 14
+end
+arch cwall_2_1_2
+x 14
+end
+arch cobblestones2
+msg
+A previous version of this map contained a save bed at (14, 1). As a result, on old servers this save bed may still exist, and so this square must be kept clear and accessible.
+endmsg
+x 14
+y 1
+end
+arch cobblestones2
+x 14
+y 2
+end
+arch cobblestones2
+x 14
+y 3
+end
+arch brazier
+x 14
+y 3
+end
+arch cobblestones2
+x 14
+y 4
+end
+arch cwall_2_1_2
+x 14
+y 4
+end
+arch blocked
+x 14
+y 5
+end
+arch sign
+name Note for Mappers
+msg
+A previous version of this map contained a save bed at (14, 1). On old servers, this save bed and square underneath might still exist. Therefore, this square must be kept clear and accessible in all future versions.
+endmsg
+x 14
+y 6
+end
+arch blocked
+x 14
+y 7
+end
+arch blocked
+x 14
+y 8
+end
+arch cobblestones2
+x 14
+y 9
+end
+arch cwall_2_1_2
+x 14
+y 9
+end
+arch cobblestones2
+x 14
+y 10
+end
+arch brazier
+x 14
+y 10
+end
+arch cobblestones2
+x 14
+y 11
+end
 arch stair_down_2
 slaying /!
 msg
@@ -175,1852 +1092,124 @@ wallstyle dungeon
 exitstyle sstair
 monsterstyle nethack
 decorstyle nethack
-xsize 35
-ysize 35
+xsize 79
+ysize 21
 symmetry 1
 dungeon_depth 23
 orientation 1
 final_map /quests/peterm/Nethack_in_crossfire_Yendor
 treasureoptions 73
 endmsg
-x 1
-y 6
-end
-arch woodfloor
-x 1
-y 7
-end
-arch wwall_2_1_2
-x 1
-y 7
-end
-arch woodfloor
-x 1
-y 8
-end
-arch stair_down_2
-slaying /!
-msg
-layoutstyle rogue
-floorstyle lightdirt
-wallstyle dungeon
-exitstyle sstair
-monsterstyle nethack
-decorstyle nethack
-xsize 35
-ysize 35
-symmetry 1
-dungeon_depth 23
-orientation 1
-final_map /quests/peterm/Nethack_in_crossfire_Yendor
-treasureoptions 73
-endmsg
-x 1
-y 8
-end
-arch woodfloor
-x 1
-y 9
-end
-arch wwall_2_1_2
-x 1
-y 9
-end
-arch woodfloor
-x 1
-y 10
-end
-arch stair_down_2
-slaying /!
-msg
-layoutstyle rogue
-floorstyle lightdirt
-wallstyle dungeon
-exitstyle sstair
-monsterstyle nethack
-decorstyle nethack
-xsize 35
-ysize 35
-symmetry 1
-dungeon_depth 23
-orientation 1
-final_map /quests/peterm/Nethack_in_crossfire_Yendor
-treasureoptions 73
-endmsg
-x 1
-y 10
-end
-arch woodfloor
-x 1
-y 11
-end
-arch wwall_2_1_2
-x 1
-y 11
-end
-arch woodfloor
-x 1
-y 12
-end
-arch stair_down_2
-slaying /!
-msg
-layoutstyle rogue
-floorstyle lightdirt
-wallstyle dungeon
-exitstyle sstair
-monsterstyle nethack
-decorstyle nethack
-xsize 35
-ysize 35
-symmetry 1
-dungeon_depth 23
-orientation 1
-final_map /quests/peterm/Nethack_in_crossfire_Yendor
-treasureoptions 73
-endmsg
-x 1
-y 12
-end
-arch woodfloor
-x 1
-y 13
-end
-arch wwall_2_1_2
-x 1
-y 13
-end
-arch woodfloor
-x 1
-y 14
-end
-arch stair_down_2
-slaying /!
-msg
-layoutstyle rogue
-floorstyle lightdirt
-wallstyle dungeon
-exitstyle sstair
-monsterstyle nethack
-decorstyle nethack
-xsize 35
-ysize 35
-symmetry 1
-dungeon_depth 23
-orientation 1
-final_map /quests/peterm/Nethack_in_crossfire_Yendor
-treasureoptions 73
-endmsg
-x 1
-y 14
-end
-arch woodfloor
-x 1
-y 15
-end
-arch wwall_2_1_2
-x 1
-y 15
-end
-arch woodfloor
-x 2
-end
-arch wwall_2_1_2
-x 2
-end
-arch woodfloor
-x 2
-y 1
-end
-arch woodfloor
-x 2
-y 2
-end
-arch dungeon_magic
-x 2
-y 2
-end
-arch woodfloor
-x 2
-y 3
-end
-arch wwall_1_4
-x 2
-y 3
-end
-arch magic_mouth
-msg
-You must have the Amulet of Yendor to exit.
-endmsg
-x 2
-y 4
-end
-arch woodfloor
-x 2
-y 4
-end
-arch woodfloor
-x 2
-y 5
-end
-arch wwall_1_3
-x 2
-y 5
-end
-arch woodfloor
-x 2
-y 6
-end
-arch grate_closed_2
-x 2
-y 6
-speed 0.500000
-connected 3
-end
-arch dungeon_magic
-x 2
-y 6
-end
-arch woodfloor
-x 2
-y 7
-end
-arch wwall_1_3
-x 2
-y 7
-end
-arch woodfloor
-x 2
-y 8
-end
-arch grate_closed_2
-x 2
-y 8
-speed 0.500000
-connected 4
-end
-arch dungeon_magic
-x 2
-y 8
-end
-arch woodfloor
-x 2
-y 9
-end
-arch wwall_1_3
-x 2
-y 9
-end
-arch woodfloor
-x 2
-y 10
-end
-arch grate_closed_2
-x 2
-y 10
-speed 0.500000
-connected 5
-end
-arch dungeon_magic
-x 2
-y 10
-end
-arch woodfloor
-x 2
-y 11
-end
-arch wwall_1_3
-x 2
-y 11
-end
-arch woodfloor
-x 2
-y 12
-end
-arch grate_closed_2
-x 2
-y 12
-speed 0.500000
-connected 6
-end
-arch dungeon_magic
-x 2
-y 12
-end
-arch woodfloor
-x 2
-y 13
-end
-arch wwall_1_3
-x 2
-y 13
-end
-arch woodfloor
-x 2
-y 14
-end
-arch grate_closed_2
-x 2
-y 14
-speed 0.500000
-connected 7
-end
-arch dungeon_magic
-x 2
-y 14
-end
-arch woodfloor
-x 2
-y 15
-end
-arch wwall_2_1_2
-x 2
-y 15
-end
-arch woodfloor
-x 3
-end
-arch wwall_2_1_2
-x 3
-end
-arch woodfloor
-x 3
-y 1
-end
-arch woodfloor
-x 3
-y 2
-end
-arch woodfloor
-x 3
-y 3
-end
-arch wwall_2_1_2
-x 3
-y 3
-end
-arch woodfloor
-x 3
-y 4
-end
-arch woodfloor
-x 3
-y 5
-end
-arch woodfloor
-x 3
-y 6
-end
-arch button_handle
-x 3
-y 6
-connected 3
-end
-arch woodfloor
-x 3
-y 7
-end
-arch woodfloor
-x 3
-y 8
-end
-arch button_handle
-x 3
-y 8
-connected 4
-end
-arch woodfloor
-x 3
-y 9
-end
-arch woodfloor
-x 3
-y 10
-end
-arch button_handle
-x 3
-y 10
-connected 5
-end
-arch woodfloor
-x 3
-y 11
-end
-arch woodfloor
-x 3
-y 12
-end
-arch button_handle
-x 3
-y 12
-connected 6
-end
-arch woodfloor
-x 3
-y 13
-end
-arch woodfloor
-x 3
-y 14
-end
-arch button_handle
-x 3
-y 14
-connected 7
-end
-arch woodfloor
-x 3
-y 15
-end
-arch wwall_2_1_2
-x 3
-y 15
-end
-arch woodfloor
-x 4
-end
-arch wwall_2_1_2
-x 4
-end
-arch woodfloor
-x 4
-y 1
-end
-arch woodfloor
-x 4
-y 2
-end
-arch woodfloor
-x 4
-y 3
-end
-arch wwall_2_1_2
-x 4
-y 3
-end
-arch woodfloor
-x 4
-y 4
-end
-arch woodfloor
-x 4
-y 5
-end
-arch woodfloor
-x 4
-y 6
-end
-arch woodfloor
-x 4
-y 7
-end
-arch woodfloor
-x 4
-y 8
-end
-arch woodfloor
-x 4
-y 9
-end
-arch woodfloor
-x 4
-y 10
-end
-arch woodfloor
-x 4
-y 11
-end
-arch woodfloor
-x 4
-y 12
-end
-arch woodfloor
-x 4
-y 13
-end
-arch woodfloor
-x 4
-y 14
-end
-arch woodfloor
-x 4
-y 15
-end
-arch wwall_2_1_2
-x 4
-y 15
-end
-arch woodfloor
-x 5
-end
-arch wwall_2_1_2
-x 5
-end
-arch woodfloor
-x 5
-y 1
-end
-arch exit
-slaying Nethack_in_crossfire_entrance
-hp 7
-sp 1
-x 5
-y 1
-end
-arch woodfloor
-x 5
-y 2
-end
-arch woodfloor
-x 5
-y 3
-end
-arch wwall_2_1_2
-x 5
-y 3
-end
-arch woodfloor
-x 5
-y 4
-end
-arch woodfloor
-x 5
-y 5
-end
-arch woodfloor
-x 5
-y 6
-end
-arch wwall_2_2_2
-x 5
-y 6
-end
-arch woodfloor
-x 5
-y 7
-end
-arch wwall_2_1_1
-x 5
-y 7
-end
-arch woodfloor
-x 5
-y 8
-end
-arch wwall_2_1_1
-x 5
-y 8
-end
-arch woodfloor
-x 5
-y 9
-end
-arch wwall_2_1_1
-x 5
-y 9
-end
-arch woodfloor
-x 5
-y 10
-end
-arch wwall_2_1_1
-x 5
-y 10
-end
-arch woodfloor
-x 5
-y 11
-end
-arch wwall_2_1_1
-x 5
-y 11
-end
-arch woodfloor
-x 5
-y 12
-end
-arch wwall_2_1_1
-x 5
-y 12
-end
-arch woodfloor
-x 5
-y 13
-end
-arch wwall_2_1_1
-x 5
-y 13
-end
-arch woodfloor
-x 5
-y 14
-end
-arch wwall_2_1_1
-x 5
-y 14
-end
-arch woodfloor
-x 5
-y 15
-end
-arch wwall_3_1
-x 5
-y 15
-end
-arch woodfloor
-x 6
-end
-arch wwall_3_3
-x 6
-end
-arch woodfloor
-x 6
-y 1
-end
-arch wwall_2_1_1
-x 6
-y 1
-end
-arch woodfloor
-x 6
-y 2
-end
-arch wwall_2_1_1
-x 6
-y 2
-end
-arch woodfloor
-x 6
-y 3
-end
-arch wwall_3_1
-x 6
-y 3
-end
-arch magic_mouth
-msg
-Step on the mat to enter the Nethack Store.
-endmsg
-x 6
-y 4
-end
-arch woodfloor
-x 6
-y 4
-end
-arch woodfloor
-x 6
-y 5
-end
-arch shop_mat
-x 6
-y 5
-end
-arch woodfloor
-x 6
-y 6
-end
-arch wwall_2_1_2
-x 6
-y 6
-end
-arch woodfloor
-x 6
-y 7
-end
-arch shop_empty
-x 6
-y 7
-end
-arch shop_mat
-x 6
-y 7
-end
-arch woodfloor
-x 6
-y 8
-end
-arch shop_empty
-x 6
-y 8
-end
-arch woodfloor
-x 6
-y 9
-end
-arch shop_empty
-x 6
-y 9
-end
-arch create_eyeshield
-x 6
-y 9
-end
-arch woodfloor
-x 6
-y 10
-end
-arch shop_empty
-x 6
-y 10
-end
-arch create_green_dragon_mail
-x 6
-y 10
-end
-arch woodfloor
-x 6
-y 11
-end
-arch shop_empty
-x 6
-y 11
-end
-arch create_dragon_shield
-x 6
-y 11
-end
-arch woodfloor
-x 6
-y 12
-end
-arch shop_empty
-x 6
-y 12
-end
-arch create_dragon_mail
-x 6
-y 12
-end
-arch woodfloor
-x 6
-y 13
-end
-arch shop_empty
-x 6
-y 13
-end
-arch create_blue_dragon_mail
-x 6
-y 13
-end
-arch woodfloor
-x 6
-y 14
-end
-arch shop_empty
-x 6
-y 14
-end
-arch create_black_dragon_mail
-x 6
-y 14
-end
-arch woodfloor
-x 6
-y 15
-end
-arch wwall_2_1_2
-x 6
-y 15
-end
-arch woodfloor
-x 7
-end
-arch wwall_2_1_2
-x 7
-end
-arch woodfloor
-x 7
-y 1
-end
-arch magic_mouth
-msg
-Welcome to Nethack in Crossfire.  Nethack in Crossfire is a tribute to the venerable game Nethack, which inspired many of the things you will find in Crossfire.  The resemblance of these random maps to the true game, Nethack, is more in spirit than in detail.  Beware! In these series of maps, you'll find many customized monsters in the nethack style, that will have little in common with monsters which may look like it in the broader Crossfire game.  In particular, more monsters attack with acid, and the undead often have madness and paralysis in their touch, as in Nethack.  You will not be able to leave Nethack in Crossfire without the Amulet of Yendor, or dungeon master intervention.  To play Nethack in Crossfire, step onto the teleporter and say "Understood."
-endmsg
-x 7
-y 2
-end
-arch woodfloor
-x 7
-y 2
-end
-arch woodfloor
-x 7
-y 3
-end
-arch wwall_2_1_2
-x 7
-y 3
-end
-arch woodfloor
-x 7
-y 4
-end
-arch woodfloor
-x 7
-y 5
-end
-arch silver_converter
-x 7
-y 5
-end
-arch woodfloor
-x 7
-y 6
-end
-arch wwall_2_1_2
-x 7
-y 6
-end
-arch woodfloor
-x 7
-y 7
-end
-arch shop_empty
-x 7
-y 7
-end
-arch menu
-x 7
-y 7
-end
-arch woodfloor
-x 7
-y 8
-end
-arch shop_empty
-x 7
-y 8
-end
-arch woodfloor
-x 7
-y 9
-end
-arch shop_empty
-x 7
-y 9
-end
-arch woodfloor
-x 7
-y 10
-end
-arch shop_empty
-x 7
-y 10
-end
-arch woodfloor
-x 7
-y 11
-end
-arch shop_empty
-x 7
-y 11
-end
-arch woodfloor
-x 7
-y 12
-end
-arch shop_empty
-x 7
-y 12
-end
-arch woodfloor
-x 7
-y 13
-end
-arch shop_empty
-x 7
-y 13
-end
-arch woodfloor
-x 7
-y 14
-end
-arch shop_empty
-x 7
-y 14
-end
-arch woodfloor
-x 7
-y 15
-end
-arch wwall_2_1_2
-x 7
-y 15
-end
-arch woodfloor
-x 8
-end
-arch wwall_2_1_2
-x 8
-end
-arch woodfloor
-x 8
-y 1
-end
-arch exit
-slaying Nethack_in_crossfire_entrance
-hp 5
-sp 1
-x 8
-y 1
-end
-arch magic_mouth
-msg
-Welcome to Nethack in Crossfire.  Nethack in Crossfire is a tribute to the venerable game Nethack, which inspired many of the things you will find in Crossfire.  The resemblance of these random maps to the true game, Nethack, is more in spirit than in detail.  Beware! In these series of maps, you'll find many customized monsters in the nethack style, that will have little in common with monsters which may look like it in the broader Crossfire game.  In particular, more monsters attack with acid, and the undead often have madness and paralysis in their touch, as in Nethack.  You will not be able to leave Nethack in Crossfire without the Amulet of Yendor, or dungeon master intervention.  To play Nethack in Crossfire, step onto the teleporter and say "Understood."
-endmsg
-x 8
-y 2
-end
-arch woodfloor
-x 8
-y 2
-end
-arch woodfloor
-x 8
-y 3
-end
-arch wwall_2_1_2
-x 8
-y 3
-end
-arch woodfloor
-x 8
-y 4
-end
-arch woodfloor
-x 8
-y 5
-end
-arch gold_converter
-x 8
-y 5
-end
-arch woodfloor
-x 8
-y 6
-end
-arch wwall_2_1_2
-x 8
-y 6
-end
-arch woodfloor
-x 8
-y 7
-end
-arch shop_weapon
-x 8
-y 7
-end
-arch woodfloor
-x 8
-y 8
-end
-arch shop_empty
-x 8
-y 8
-end
-arch woodfloor
-x 8
-y 9
-end
-arch shop_gems
-x 8
-y 9
-end
-arch woodfloor
-x 8
-y 10
-end
-arch shop_empty
-x 8
-y 10
-end
-arch woodfloor
-x 8
-y 11
-end
-arch shop_wands
-x 8
-y 11
-end
-arch woodfloor
-x 8
-y 12
-end
-arch shop_empty
-x 8
-y 12
-end
-arch woodfloor
-x 8
-y 13
-end
-arch shop_books
-x 8
-y 13
-end
-arch woodfloor
-x 8
-y 14
-end
-arch shop_empty
-x 8
-y 14
-end
-arch woodfloor
-x 8
-y 15
-end
-arch wwall_2_1_2
-x 8
-y 15
-end
-arch woodfloor
-x 9
-end
-arch wwall_2_1_2
-x 9
-end
-arch magic_mouth
-msg
-Welcome to Nethack in Crossfire.  Nethack in Crossfire is a tribute to the venerable game Nethack, which inspired many of the things you will find in Crossfire.  The resemblance of these random maps to the true game, Nethack, is more in spirit than in detail.  Beware! In these series of maps, you'll find many customized monsters in the nethack style, that will have little in common with monsters which may look like it in the broader Crossfire game.  In particular, more monsters attack with acid, and the undead often have madness and paralysis in their touch, as in Nethack.  You will not be able to leave Nethack in Crossfire without the Amulet of Yendor, or dungeon master intervention.  To play Nethack in Crossfire, step onto the teleporter and say "Understood."
-endmsg
-x 9
-y 1
-end
-arch woodfloor
-x 9
-y 1
-end
-arch woodfloor
-x 9
-y 2
-end
-arch teleporter
-hp 11
-sp 1
-x 9
-y 2
-speed 0.000000
-connected 1
-damned 1
-end
-arch woodfloor
-x 9
-y 3
-end
-arch wwall_2_1_2
-x 9
-y 3
-end
-arch woodfloor
-x 9
-y 4
-end
-arch woodfloor
-x 9
-y 5
-end
-arch diamond_converter
-x 9
-y 5
-end
-arch woodfloor
-x 9
-y 6
-end
-arch wwall_2_1_2
-x 9
-y 6
-end
-arch woodfloor
-x 9
-y 7
-end
-arch shop_weapon
-x 9
-y 7
-end
-arch woodfloor
-x 9
-y 8
-end
-arch shop_empty
-x 9
-y 8
-end
-arch woodfloor
-x 9
-y 9
-end
-arch shop_gems
-x 9
-y 9
-end
-arch woodfloor
-x 9
-y 10
-end
-arch shop_empty
-x 9
-y 10
-end
-arch woodfloor
-x 9
-y 11
-end
-arch shop_wands
-x 9
-y 11
-end
-arch woodfloor
-x 9
-y 12
-end
-arch shop_empty
-x 9
-y 12
-end
-arch woodfloor
-x 9
-y 13
-end
-arch shop_amulets
-x 9
-y 13
-end
-arch woodfloor
-x 9
-y 14
-end
-arch shop_empty
-x 9
-y 14
-end
-arch woodfloor
-x 9
-y 15
-end
-arch wwall_2_1_2
-x 9
-y 15
-end
-arch woodfloor
-x 10
-end
-arch wwall_3_3
-x 10
-end
-arch woodfloor
-x 10
-y 1
-end
-arch wwall_2_1_1
-x 10
-y 1
-end
-arch magic_ear
-msg
-@match understood
-Click.
-endmsg
-x 10
-y 2
-connected 1
-end
-arch woodfloor
-x 10
-y 2
-end
-arch wwall_2_1_1
-x 10
-y 2
-end
-arch woodfloor
-x 10
-y 3
-end
-arch wwall_3_1
-x 10
-y 3
-end
-arch woodfloor
-x 10
-y 4
-end
-arch woodfloor
-x 10
-y 5
-end
-arch identify_table
-x 10
-y 5
-end
-arch woodfloor
-x 10
-y 6
-end
-arch wwall_2_1_2
-x 10
-y 6
-end
-arch woodfloor
-x 10
-y 7
-end
-arch shop_weapon
-x 10
-y 7
-end
-arch woodfloor
-x 10
-y 8
-end
-arch shop_empty
-x 10
-y 8
-end
-arch woodfloor
-x 10
-y 9
-end
-arch shop_gems
-x 10
-y 9
-end
-arch woodfloor
-x 10
-y 10
-end
-arch shop_empty
-x 10
-y 10
-end
-arch woodfloor
-x 10
-y 11
-end
-arch shop_scrolls
-x 10
-y 11
-end
-arch woodfloor
-x 10
-y 12
-end
-arch shop_empty
-x 10
-y 12
-end
-arch woodfloor
-x 10
-y 13
-end
-arch shop_amulets
-x 10
-y 13
-end
-arch woodfloor
-x 10
-y 14
-end
-arch shop_empty
-x 10
-y 14
-end
-arch woodfloor
-x 10
-y 15
-end
-arch wwall_2_1_2
-x 10
-y 15
-end
-arch woodfloor
-x 11
-end
-arch wwall_2_1_2
-x 11
-end
-arch woodfloor
-x 11
-y 1
-end
-arch woodfloor
-x 11
-y 2
-end
-arch woodfloor
-x 11
-y 3
-end
-arch wwall_2_1_2
-x 11
-y 3
-end
-arch woodfloor
-x 11
-y 4
-end
-arch woodfloor
-x 11
-y 5
-end
-arch food_table
-x 11
-y 5
-end
-arch woodfloor
-x 11
-y 6
-end
-arch wwall_2_1_2
-x 11
-y 6
-end
-arch woodfloor
-x 11
-y 7
-end
-arch shop_scrolls
-x 11
-y 7
-end
-arch woodfloor
-x 11
-y 8
-end
-arch shop_empty
-x 11
-y 8
-end
-arch woodfloor
-x 11
-y 9
-end
-arch shop_gems
-x 11
-y 9
-end
-arch woodfloor
-x 11
-y 10
-end
-arch shop_empty
-x 11
-y 10
-end
-arch woodfloor
-x 11
-y 11
-end
-arch shop_scrolls
-x 11
-y 11
-end
-arch woodfloor
-x 11
-y 12
-end
-arch shop_empty
-x 11
-y 12
-end
-arch woodfloor
-x 11
-y 13
-end
-arch shop_books
-x 11
-y 13
-end
-arch woodfloor
-x 11
-y 14
-end
-arch shop_empty
-x 11
-y 14
-end
-arch woodfloor
-x 11
-y 15
-end
-arch wwall_2_1_2
-x 11
-y 15
-end
-arch woodfloor
-x 12
-end
-arch wwall_2_1_2
-x 12
-end
-arch woodfloor
-x 12
-y 1
-end
-arch woodfloor
-x 12
-y 2
-end
-arch woodfloor
-x 12
-y 3
-end
-arch wwall_2_1_2
-x 12
-y 3
-end
-arch woodfloor
-x 12
-y 4
-end
-arch woodfloor
-x 12
-y 5
-end
-arch waybread_table
-x 12
-y 5
-end
-arch woodfloor
-x 12
-y 6
-end
-arch wwall_2_1_2
-x 12
-y 6
-end
-arch woodfloor
-x 12
-y 7
-end
-arch shop_armour
-x 12
-y 7
-end
-arch woodfloor
-x 12
-y 8
-end
-arch shop_empty
-x 12
-y 8
-end
-arch woodfloor
-x 12
-y 9
-end
-arch shop_gems
-x 12
-y 9
-end
-arch woodfloor
-x 12
-y 10
-end
-arch shop_empty
-x 12
-y 10
-end
-arch woodfloor
-x 12
-y 11
-end
-arch shop_scrolls
-x 12
-y 11
-end
-arch woodfloor
-x 12
-y 12
-end
-arch shop_empty
-x 12
-y 12
-end
-arch woodfloor
-x 12
-y 13
-end
-arch shop_books
-x 12
-y 13
-end
-arch woodfloor
-x 12
-y 14
-end
-arch shop_empty
-x 12
-y 14
-end
-arch woodfloor
-x 12
-y 15
-end
-arch wwall_2_1_2
-x 12
-y 15
-end
-arch woodfloor
-x 13
-end
-arch wwall_2_1_2
-x 13
-end
-arch woodfloor
-x 13
-y 1
-end
-arch woodfloor
-x 13
-y 2
-end
-arch woodfloor
-x 13
-y 3
-end
-arch wwall_1_3
-x 13
-y 3
-end
-arch woodfloor
-x 13
-y 4
-end
-arch woodfloor
-x 13
-y 5
-end
-arch woodfloor
-x 13
-y 6
-end
-arch wwall_2_1_2
-x 13
-y 6
-end
-arch woodfloor
-x 13
-y 7
-end
-arch shop_armour
-x 13
-y 7
-end
-arch woodfloor
-x 13
-y 8
-end
-arch shop_empty
-x 13
-y 8
-end
-arch woodfloor
-x 13
-y 9
-end
-arch shop_gems
-x 13
-y 9
-end
-arch woodfloor
-x 13
-y 10
-end
-arch shop_empty
-x 13
-y 10
-end
-arch woodfloor
-x 13
-y 11
-end
-arch shop_potions
-x 13
-y 11
-end
-arch woodfloor
-x 13
-y 12
-end
-arch shop_empty
-x 13
-y 12
-end
-arch woodfloor
-x 13
-y 13
-end
-arch shop_ring
-x 13
-y 13
-end
-arch woodfloor
-x 13
-y 14
-end
-arch shop_empty
-x 13
-y 14
-end
-arch woodfloor
-x 13
-y 15
-end
-arch wwall_2_1_2
-x 13
-y 15
-end
-arch woodfloor
-x 14
-end
-arch wwall_2_1_2
-x 14
-end
-arch woodfloor
-x 14
-y 1
-end
-arch woodfloor
-x 14
-y 1
-unique 1
-end
-arch bed_save
-x 14
-y 1
-end
-arch woodfloor
-x 14
-y 2
-end
-arch magic_mouth
-msg
-To begin your quest for the amulet, throw any of the switches and descend.  Each entrance will lead to a DIFFERENT set of random maps, but they will all end up at the Wizard of Yendor.
-endmsg
-x 14
-y 3
-end
-arch woodfloor
-x 14
-y 3
-end
-arch woodfloor
-x 14
-y 4
-end
-arch woodfloor
-x 14
-y 5
-end
-arch woodfloor
-x 14
-y 6
-end
-arch wwall_2_1_2
-x 14
-y 6
-end
-arch woodfloor
-x 14
-y 7
-end
-arch shop_armour
-x 14
-y 7
-end
-arch woodfloor
-x 14
-y 8
-end
-arch shop_empty
-x 14
-y 8
-end
-arch woodfloor
-x 14
-y 9
-end
-arch shop_gems
-x 14
-y 9
-end
-arch woodfloor
-x 14
-y 10
-end
-arch shop_empty
-x 14
-y 10
-end
-arch woodfloor
 x 14
 y 11
 end
-arch shop_potions
-x 14
-y 11
-end
-arch woodfloor
+arch cobblestones2
 x 14
 y 12
 end
-arch shop_empty
+arch brazier
 x 14
 y 12
 end
-arch woodfloor
+arch cobblestones2
 x 14
 y 13
 end
-arch shop_ring
+arch cwall_2_1_2
 x 14
 y 13
 end
-arch woodfloor
-x 14
-y 14
-end
-arch shop_empty
-x 14
-y 14
-end
-arch woodfloor
-x 14
-y 15
-end
-arch wwall_2_1_2
-x 14
-y 15
-end
-arch woodfloor
+arch cobblestones2
 x 15
 end
-arch wwall_2_2_3
+arch cwall_2_2_3
 x 15
 end
-arch woodfloor
+arch cobblestones2
 x 15
 y 1
 end
-arch wwall_2_1_1
+arch cwall_2_1_1
 x 15
 y 1
 end
-arch woodfloor
+arch cobblestones2
 x 15
 y 2
 end
-arch wwall_2_1_1
+arch cwall_2_1_1
 x 15
 y 2
 end
-arch woodfloor
+arch cobblestones2
 x 15
 y 3
 end
-arch wwall_2_1_1
+arch cwall_2_1_1
 x 15
 y 3
 end
-arch woodfloor
+arch cobblestones2
 x 15
 y 4
 end
-arch wwall_2_1_1
+arch cwall_2_2_4
 x 15
 y 4
 end
-arch woodfloor
+arch blocked
 x 15
 y 5
 end
-arch wwall_2_1_1
-x 15
-y 5
-end
-arch woodfloor
+arch blocked
 x 15
 y 6
 end
-arch wwall_3_4
-x 15
-y 6
-end
-arch woodfloor
+arch blocked
 x 15
 y 7
 end
-arch wwall_2_1_1
-x 15
-y 7
-end
-arch woodfloor
+arch blocked
 x 15
 y 8
 end
-arch wwall_2_1_1
-x 15
-y 8
-end
-arch woodfloor
+arch cobblestones2
 x 15
 y 9
 end
-arch wwall_2_1_1
+arch cwall_2_2_3
 x 15
 y 9
 end
-arch woodfloor
+arch cobblestones2
 x 15
 y 10
 end
-arch wwall_2_1_1
+arch cwall_2_1_1
 x 15
 y 10
 end
-arch woodfloor
+arch cobblestones2
 x 15
 y 11
 end
-arch wwall_2_1_1
+arch cwall_2_1_1
 x 15
 y 11
 end
-arch woodfloor
+arch cobblestones2
 x 15
 y 12
 end
-arch wwall_2_1_1
+arch cwall_2_1_1
 x 15
 y 12
 end
-arch woodfloor
+arch cobblestones2
 x 15
 y 13
 end
-arch wwall_2_1_1
+arch cwall_2_2_4
 x 15
 y 13
 end
-arch woodfloor
-x 15
-y 14
-end
-arch wwall_2_1_1
-x 15
-y 14
-end
-arch woodfloor
-x 15
-y 15
-end
-arch wwall_2_2_4
-x 15
-y 15
-end
diff --git a/regions.reg b/regions.reg
index 1e5564e3e..7a876874d 100644
--- a/regions.reg
+++ b/regions.reg
@@ -239,4 +239,11 @@ msg
 Simply "Westlands" in Elvish, Andustar is a small elven settlement situated across the bay to the northwest of Scorn. Why the elves would settle so close to a large human city is a mystery to outsiders, but the elves have a reason.
 endmsg
 end
+region mazes
+parent world
+longname Mazes of Menace
+msg
+Recently, you have begun to find yourself unfulfilled and distant in your daily occupation. Strange dreams of prospecting, stealing, crusading, and combat have haunted you in your sleep for many months, but you aren't sure of the reason. Some nights you awaken suddenly and cry out, terrified at the vivid recollection of the strange and powerful creatures that seem to be lurking behind every corner of the dungeon in your dream. Eventually you can resist the yearning to seek out the fantastic place in your dreams no longer. After all, when other adventurers came back this way after spending time in the caverns, they usually seemed better off than when they passed through the first time. And who was to say that all of those who did not return had not just kept going?
+endmsg
+end
 nomore
diff --git a/styles/decorstyles/nethack b/styles/decorstyles/nethack
index bcdecb4e2..22ef1fa46 100644
--- a/styles/decorstyles/nethack
+++ b/styles/decorstyles/nethack
@@ -4,300 +4,75 @@ width 10
 height 10
 msg
 Created:  2001-05-06
+Modified: 2022-02-06 Kevin Zheng
 endmsg
 end
-arch orange
-name mango
-food 333
+arch random_weapon
 end
-arch food
+arch random_bow
 y 1
 end
-arch loaf
-y 2
-end
-arch silvercoin
-y 3
-nrof 10
-end
-arch goldcoin
-y 4
-nrof 10
-end
-arch platinacoin
+arch generate_skeleton
 y 5
-nrof 10
 end
-arch orange
-name mango
-food 333
+arch random_shield
 x 1
 end
-arch food
+arch random_shield
 x 1
 y 1
 end
-arch loaf
-x 1
-y 2
-end
-arch silvercoin
-x 1
-y 3
-nrof 10
-end
-arch goldcoin
-x 1
-y 4
-nrof 10
-end
-arch platinacoin
+arch boulder
 x 1
 y 5
-nrof 10
 end
-arch orange
-name mango
-food 333
+arch random_food
 x 2
 end
-arch food
+arch random_food
 x 2
 y 1
 end
-arch waybread
+arch random_food
 x 2
 y 2
 end
-arch silvercoin
+arch random_food
 x 2
 y 3
-nrof 10
-end
-arch goldcoin
-x 2
-y 4
-nrof 10
-end
-arch platinacoin
-x 2
-y 5
-nrof 10
-end
-arch orange
-name mango
-food 333
-x 3
-end
-arch food
-x 3
-y 1
-end
-arch waybread
-x 3
-y 2
-end
-arch silvercoin
-x 3
-y 3
-nrof 100
-end
-arch goldcoin
-x 3
-y 4
-nrof 10
-end
-arch platinacoin
-x 3
-y 5
-nrof 10
-end
-arch orange
-name mango
-food 333
-x 4
-end
-arch roast_bird
-x 4
-y 1
-end
-arch waybread
-x 4
-y 2
-end
-arch silvercoin
-x 4
-y 3
-nrof 100
-end
-arch goldcoin
-x 4
-y 4
-nrof 100
-end
-arch platinacoin
-x 4
-y 5
-nrof 10
-end
-arch orange
-name mango
-food 333
-x 5
-end
-arch roast_bird
-x 5
-y 1
-end
-arch bag_popcorn
-x 5
-y 2
-end
-arch silvercoin
-x 5
-y 3
-nrof 100
-end
-arch goldcoin
-x 5
-y 4
-nrof 100
-end
-arch platinacoin
-x 5
-y 5
-nrof 10
-end
-arch orange
-name mango
-food 333
-x 6
-end
-arch roast_bird
-x 6
-y 1
-end
-arch bag_popcorn
-x 6
-y 2
-end
-arch silvercoin
-x 6
-y 3
-nrof 100
-end
-arch goldcoin
-x 6
-y 4
-nrof 100
-end
-arch platinacoin
-x 6
-y 5
-nrof 10
-end
-arch orange
-name mango
-food 333
-x 7
-end
-arch s_weasel
-food 300
-x 7
-y 1
-end
-arch pear
-food 250
-x 7
-y 2
-end
-arch silvercoin
-x 7
-y 3
-nrof 500
-end
-arch goldcoin
-x 7
-y 4
-nrof 100
-end
-arch platinacoin
-x 7
-y 5
-nrof 10
-end
-arch orange
-name mango
-food 333
-x 8
-end
-arch s_weasel
-food 300
-x 8
-y 1
-end
-arch apple
-food 250
-x 8
-y 2
-end
-arch silvercoin
-x 8
-y 3
-nrof 500
-end
-arch goldcoin
-x 8
-y 4
-nrof 100
-end
-arch platinacoin
-x 8
-y 5
-nrof 10
-end
-arch orange
-name mango
-food 333
-x 9
-end
-arch s_weasel
-food 300
-x 9
-y 1
-end
-arch potato
-x 9
-y 2
-end
-arch silvercoin
-x 9
-y 3
-nrof 500
-end
-arch goldcoin
-x 9
-y 4
-nrof 500
-end
-arch platinacoin
-x 9
-y 5
-nrof 10
-end
-arch random_spells
-x 9
-y 6
-end
-arch random_talisman
-x 9
-y 7
 end
 arch random_potion
-x 9
-y 8
+x 3
+end
+arch random_potion
+x 3
+y 1
+end
+arch random_potion
+x 3
+y 2
+end
+arch random_scroll
+x 4
+end
+arch random_scroll
+x 4
+y 1
+end
+arch random_scroll
+x 4
+y 2
+end
+arch random_spells
+x 5
+end
+arch random_talisman
+x 6
 end
 arch random_gem
-x 9
-y 9
+x 7
+end
+arch random_wealth
+x 7
+y 1
 end
diff --git a/world/world_111_114 b/world/world_111_114
index 507dd21f1..96ef20b87 100644
--- a/world/world_111_114
+++ b/world/world_111_114
@@ -3,7 +3,7 @@ name world_111_114
 width 50
 height 50
 msg
-Modified: 2007-12-24 tchize
+Modified: 2022-02-06 Kevin Zheng
 endmsg
 outdoor 1
 tile_path_1 world_111_113
@@ -3289,6 +3289,10 @@ arch evergreens2
 x 11
 y 36
 end
+arch pillars
+x 11
+y 36
+end
 arch woods
 x 11
 y 37
@@ -3304,10 +3308,6 @@ x 11
 y 39
 elevation 3112
 end
-arch evergreens2
-x 11
-y 39
-end
 arch grass_only
 x 11
 y 40
@@ -3317,6 +3317,10 @@ arch evergreens2
 x 11
 y 40
 end
+arch pillars
+x 11
+y 40
+end
 arch grass_only
 x 11
 y 41
@@ -3376,15 +3380,14 @@ arch evergreens2
 x 11
 y 47
 end
-arch hills
+arch footpath_2_2_2
 x 11
 y 48
 elevation 2781
 end
-arch hills
+arch footpath_2_1_1
 x 11
 y 49
-elevation 2740
 end
 arch mountain
 x 12
@@ -3590,29 +3593,21 @@ x 12
 y 36
 elevation 834
 end
-arch hills_rocky
+arch brush
 x 12
 y 37
-elevation 1304
+elevation 272
 end
 arch grass_only
 x 12
 y 38
 elevation 1960
 end
-arch evergreens2
-x 12
-y 38
-end
 arch grass_only
 x 12
 y 39
 elevation 2494
 end
-arch evergreens2
-x 12
-y 39
-end
 arch hills
 x 12
 y 40
@@ -3672,16 +3667,12 @@ arch evergreens2
 x 12
 y 46
 end
-arch hills
+arch footpath_2_2_2
 x 12
 y 47
 elevation 4622
 end
-arch woods5
-x 12
-y 47
-end
-arch hills_rocky
+arch footpath_2_2_4
 x 12
 y 48
 elevation 3810
@@ -3899,31 +3890,34 @@ x 13
 y 36
 elevation 953
 end
-arch brush
-x 13
-y 37
-elevation 456
-end
 arch grass
 x 13
+y 37
+elevation 953
+end
+arch brush
+x 13
+y 38
+elevation 456
+end
+arch stair_down
+slaying /quests/peterm/Nethack_in_crossfire_entrance
+hp 1
+sp 1
+x 13
 y 38
-elevation 714
 end
 arch grass_only
 x 13
 y 39
 elevation 1808
 end
-arch evergreens2
-x 13
-y 39
-end
 arch grass_only
 x 13
 y 40
 elevation 2313
 end
-arch evergreens2
+arch broken_generate_devil
 x 13
 y 40
 end
@@ -3981,15 +3975,11 @@ arch evergreens2
 x 13
 y 46
 end
-arch hills
+arch footpath_2_1_2
 x 13
 y 47
 elevation 4768
 end
-arch woods5
-x 13
-y 47
-end
 arch hills
 x 13
 y 48
@@ -4214,7 +4204,7 @@ end
 arch grass_only
 x 14
 y 36
-elevation 1296
+elevation 1595
 end
 arch evergreens2
 x 14
@@ -4230,7 +4220,7 @@ x 14
 y 38
 elevation 489
 end
-arch hills_rocky
+arch brush
 x 14
 y 39
 elevation 1346
@@ -4290,15 +4280,11 @@ arch evergreens2
 x 14
 y 46
 end
-arch hills
+arch footpath_2_1_2
 x 14
 y 47
 elevation 4679
 end
-arch woods5
-x 14
-y 47
-end
 arch hills
 x 14
 y 48
@@ -4529,12 +4515,16 @@ arch evergreens2
 x 15
 y 36
 end
+arch pillars
+x 15
+y 36
+end
 arch brush
 x 15
 y 37
 elevation 671
 end
-arch hills_rocky
+arch brush
 x 15
 y 38
 elevation 1193
@@ -4544,10 +4534,6 @@ x 15
 y 39
 elevation 1282
 end
-arch evergreens2
-x 15
-y 39
-end
 arch grass_only
 x 15
 y 40
@@ -4557,6 +4543,10 @@ arch evergreens2
 x 15
 y 40
 end
+arch pillars
+x 15
+y 40
+end
 arch hills_rocky
 x 15
 y 41
@@ -4599,15 +4589,11 @@ arch evergreens2
 x 15
 y 46
 end
-arch hills
+arch footpath_2_1_2
 x 15
 y 47
 elevation 4572
 end
-arch woods5
-x 15
-y 47
-end
 arch hills_rocky
 x 15
 y 48
@@ -4844,7 +4830,7 @@ arch evergreens2
 x 16
 y 38
 end
-arch hills
+arch footpath_1_4
 x 16
 y 39
 elevation 1807
@@ -4894,33 +4880,21 @@ arch evergreens2
 x 16
 y 44
 end
-arch hills
+arch footpath_2_2_2
 x 16
 y 45
 elevation 4462
 end
-arch woods5
-x 16
-y 45
-end
-arch hills
+arch footpath_2_1_1
 x 16
 y 46
 elevation 4754
 end
-arch woods5
-x 16
-y 46
-end
-arch hills
+arch footpath_2_2_4
 x 16
 y 47
 elevation 4419
 end
-arch woods5
-x 16
-y 47
-end
 arch hills_rocky
 x 16
 y 48
@@ -5165,7 +5139,7 @@ arch evergreens2
 x 17
 y 38
 end
-arch hills_rocky
+arch footpath_2_1_2
 x 17
 y 39
 elevation 2196
@@ -5211,15 +5185,11 @@ arch evergreens2
 x 17
 y 44
 end
-arch hills
+arch footpath_2_1_2
 x 17
 y 45
 elevation 4740
 end
-arch woods5
-x 17
-y 45
-end
 arch steppe
 x 17
 y 46
@@ -5478,57 +5448,41 @@ x 18
 y 38
 elevation 2786
 end
-arch woods_2
+arch footpath_2_2_3
 x 18
 y 39
 elevation 2799
 end
-arch woods_2
+arch footpath_2_1_1
 x 18
 y 40
 elevation 2713
 end
-arch hills
+arch footpath_2_1_1
 x 18
 y 41
 elevation 2591
 end
-arch grass_only
+arch footpath_2_1_1
 x 18
 y 42
 elevation 2628
 end
-arch evergreens2
-x 18
-y 42
-end
-arch hills
+arch footpath_2_1_1
 x 18
 y 43
 elevation 3359
 end
-arch woods5
-x 18
-y 43
-end
-arch grass_only
+arch footpath_2_1_1
 x 18
 y 44
 elevation 4133
 end
-arch evergreens2
-x 18
-y 44
-end
-arch hills
+arch footpath_2_2_4
 x 18
 y 45
 elevation 4421
 end
-arch woods5
-x 18
-y 45
-end
 arch hills_rocky
 x 18
 y 46
diff --git a/world/world_111_115 b/world/world_111_115
index ba30fb19f..85dd7bb24 100644
--- a/world/world_111_115
+++ b/world/world_111_115
@@ -3,7 +3,7 @@ name world_111_115
 width 50
 height 50
 msg
-Modified: 2007-12-24 tchize
+Modified: 2022-02-06 Kevin Zheng
 endmsg
 outdoor 1
 tile_path_1 world_111_114
@@ -3584,76 +3584,44 @@ x 10
 y 49
 elevation 4627
 end
-arch grass_only
-x 11
-elevation 3488
-end
-arch evergreens2
+arch footpath_2_1_1
 x 11
 end
-arch grass_only
+arch footpath_2_1_1
 x 11
 y 1
 elevation 3072
 end
-arch tree5
-x 11
-y 1
-end
-arch grass_only
+arch footpath_2_1_1
 x 11
 y 2
 elevation 3438
 end
-arch tree5
-x 11
-y 2
-end
-arch grass_only
+arch footpath_2_1_1
 x 11
 y 3
 elevation 3270
 end
-arch tree5
-x 11
-y 3
-end
-arch grass_only
+arch footpath_2_1_1
 x 11
 y 4
 elevation 3059
 end
-arch tree5
-x 11
-y 4
-end
-arch grass_only
+arch footpath_2_1_1
 x 11
 y 5
 elevation 4607
 end
-arch tree5
-x 11
-y 5
-end
-arch grass_only
+arch footpath_2_1_1
 x 11
 y 6
 elevation 5680
 end
-arch tree5
-x 11
-y 6
-end
-arch grass_only
+arch footpath_2_2_1
 x 11
 y 7
 elevation 5711
 end
-arch tree5
-x 11
-y 7
-end
 arch grass_only
 x 11
 y 8
@@ -3832,164 +3800,96 @@ arch woods5
 x 11
 y 29
 end
-arch hills
+arch footpath_2_2_2
 x 11
 y 30
 elevation 1203
 end
-arch woods5
-x 11
-y 30
-end
-arch hills
+arch footpath_2_1_1
 x 11
 y 31
 elevation 1092
 end
-arch woods5
-x 11
-y 31
-end
-arch hills
+arch footpath_2_1_1
 x 11
 y 32
 elevation 1149
 end
-arch woods5
-x 11
-y 32
-end
-arch hills
+arch footpath_2_1_1
 x 11
 y 33
 elevation 1176
 end
-arch woods5
-x 11
-y 33
-end
-arch hills
+arch footpath_2_1_1
 x 11
 y 34
 elevation 1556
 end
-arch woods5
-x 11
-y 34
-end
-arch hills
+arch footpath_2_1_1
 x 11
 y 35
 elevation 1603
 end
-arch woods5
-x 11
-y 35
-end
-arch woods_3
+arch footpath_2_1_1
 x 11
 y 36
 elevation 1642
 end
-arch grass_only
+arch footpath_2_1_1
 x 11
 y 37
 elevation 1540
 end
-arch tree3
-x 11
-y 37
-end
-arch grass_only
+arch footpath_2_1_1
 x 11
 y 38
 elevation 966
 end
-arch tree3
-x 11
-y 38
-end
-arch grass_only
+arch footpath_2_1_1
 x 11
 y 39
 elevation 1517
 end
-arch evergreens2
-x 11
-y 39
-end
-arch grass_only
+arch footpath_2_1_1
 x 11
 y 40
 elevation 3085
 end
-arch evergreens2
-x 11
-y 40
-end
-arch grass_only
+arch footpath_2_1_1
 x 11
 y 41
 elevation 4358
 end
-arch tree5
-x 11
-y 41
-end
-arch grass_only
+arch footpath_2_1_1
 x 11
 y 42
 elevation 4654
 end
-arch tree5
-x 11
-y 42
-end
-arch grass_only
+arch footpath_2_1_1
 x 11
 y 43
 elevation 4066
 end
-arch tree5
-x 11
-y 43
-end
-arch grass_only
+arch footpath_2_1_1
 x 11
 y 44
 elevation 3782
 end
-arch evergreens2
-x 11
-y 44
-end
-arch grass_only
+arch footpath_2_1_1
 x 11
 y 45
 elevation 3969
 end
-arch tree3
-x 11
-y 45
-end
-arch grass_only
+arch footpath_2_1_1
 x 11
 y 46
 elevation 4119
 end
-arch tree5
-x 11
-y 46
-end
-arch grass_only
+arch footpath_2_2_1
 x 11
 y 47
 elevation 4020
 end
-arch tree5
-x 11
-y 47
-end
 arch steppe
 x 11
 y 48
@@ -4002,7 +3902,7 @@ elevation 2514
 end
 arch grass_only
 x 12
-elevation 3879
+elevation 3650
 end
 arch tree5
 x 12
@@ -4010,7 +3910,7 @@ end
 arch grass_only
 x 12
 y 1
-elevation 3748
+elevation 3650
 end
 arch tree5
 x 12
@@ -4061,25 +3961,17 @@ arch tree5
 x 12
 y 6
 end
-arch grass_only
+arch footpath_2_2_3
 x 12
 y 7
 elevation 5884
 end
-arch tree5
-x 12
-y 7
-end
-arch grass_only
+arch footpath_2_1_1
 x 12
 y 8
 elevation 5014
 end
-arch tree5
-x 12
-y 8
-end
-arch grass_only
+arch footpath_2_1_1
 x 12
 y 9
 elevation 4192
@@ -4088,7 +3980,7 @@ arch evergreens2
 x 12
 y 9
 end
-arch grass_only
+arch footpath_2_1_1
 x 12
 y 10
 elevation 3256
@@ -4097,7 +3989,7 @@ arch evergreens2
 x 12
 y 10
 end
-arch grass_only
+arch footpath_2_1_1
 x 12
 y 11
 elevation 4140
@@ -4106,7 +3998,7 @@ arch evergreens2
 x 12
 y 11
 end
-arch grass_only
+arch footpath_2_1_1
 x 12
 y 12
 elevation 4144
@@ -4115,7 +4007,7 @@ arch evergreens2
 x 12
 y 12
 end
-arch grass_only
+arch footpath_2_1_1
 x 12
 y 13
 elevation 3313
@@ -4124,7 +4016,7 @@ arch evergreens2
 x 12
 y 13
 end
-arch grass_only
+arch footpath_2_1_1
 x 12
 y 14
 elevation 2834
@@ -4133,12 +4025,12 @@ arch evergreens2
 x 12
 y 14
 end
-arch hills
+arch footpath_2_1_1
 x 12
 y 15
 elevation 2418
 end
-arch hills
+arch footpath_2_1_1
 x 12
 y 16
 elevation 862
@@ -4147,7 +4039,7 @@ arch woods5
 x 12
 y 16
 end
-arch hills
+arch footpath_2_1_1
 x 12
 y 17
 elevation 701
@@ -4156,12 +4048,12 @@ arch woods5
 x 12
 y 17
 end
-arch brush
+arch footpath_2_1_1
 x 12
 y 18
 elevation 28
 end
-arch hills
+arch footpath_2_1_1
 x 12
 y 19
 elevation 979
@@ -4170,93 +4062,59 @@ arch woods5
 x 12
 y 19
 end
-arch hills
-x 12
-y 20
-elevation 1975
-end
-arch woods5
+arch footpath_2_1_1
 x 12
 y 20
 end
-arch hills
+arch footpath_2_1_1
 x 12
 y 21
 elevation 2610
 end
-arch hills
+arch footpath_2_1_1
 x 12
 y 22
 elevation 2693
 end
-arch woods5
-x 12
-y 22
-end
-arch hills
+arch footpath_2_1_1
 x 12
 y 23
-elevation 2525
 end
-arch hills
+arch footpath_2_1_1
 x 12
 y 24
 elevation 2762
 end
-arch woods5
-x 12
-y 24
-end
-arch hills
+arch footpath_2_1_1
 x 12
 y 25
 elevation 2510
 end
-arch woods5
-x 12
-y 25
-end
-arch hills
+arch footpath_2_1_1
 x 12
 y 26
 elevation 1964
 end
-arch woods5
-x 12
-y 26
-end
-arch grass_only
+arch footpath_2_1_1
 x 12
 y 27
 elevation 1312
 end
-arch evergreens2
-x 12
-y 27
-end
-arch grass_only
+arch footpath_2_1_1
 x 12
 y 28
 elevation 1363
 end
-arch evergreens2
-x 12
-y 28
-end
-arch hills
+arch footpath_2_1_1
 x 12
 y 29
 elevation 1161
 end
-arch grass_only
+arch footpath_2_2_4
 x 12
 y 30
 elevation 1295
 end
-arch evergreens2
-x 12
-y 30
-end
 arch hills
 x 12
 y 31
@@ -4373,12 +4231,7 @@ arch tree5
 x 12
 y 46
 end
-arch grass_only
-x 12
-y 47
-elevation 3011
-end
-arch tree5
+arch footpath_2_1_2
 x 12
 y 47
 end
@@ -4737,21 +4590,17 @@ arch tree5
 x 13
 y 46
 end
-arch hills
+arch footpath_2_2_3
 x 13
 y 47
 elevation 818
 end
-arch woods5
-x 13
-y 47
-end
-arch woods
+arch footpath_2_1_1
 x 13
 y 48
 elevation 1691
 end
-arch hills
+arch footpath_2_1_1
 x 13
 y 49
 elevation 1414
diff --git a/world/world_111_116 b/world/world_111_116
index e42eab166..70fa897c6 100644
--- a/world/world_111_116
+++ b/world/world_111_116
@@ -7,7 +7,7 @@ height 50
 enter_x 1
 enter_y 1
 msg
-Modified: 2010-05-02 Cavesomething
+Modified: 2022-02-06 Kevin Zheng
 endmsg
 outdoor 1
 tile_path_1 world_111_115
@@ -2094,189 +2094,118 @@ x 6
 y 9
 elevation 0
 end
-arch grass_only
+arch footpath_2_2_2
 x 6
 y 10
 elevation 2863
 end
-arch tree5
-x 6
-y 10
-end
-arch grass_only
+arch footpath_2_1_1
 x 6
 y 11
 elevation 2183
 end
-arch tree5
-x 6
-y 11
-end
-arch grass_only
+arch footpath_2_1_1
 x 6
 y 12
 elevation 1766
 end
-arch tree5
-x 6
-y 12
-end
-arch grass_only
+arch footpath_2_1_1
 x 6
 y 13
 elevation 1559
 end
-arch tree5
-x 6
-y 13
-end
-arch grass_only
+arch footpath_2_1_1
 x 6
 y 14
 elevation 1536
 end
-arch tree5
-x 6
-y 14
-end
-arch grass_only
+arch footpath_2_1_1
 x 6
 y 15
 elevation 1357
 end
-arch tree5
-x 6
-y 15
-end
-arch grass_only
+arch footpath_2_1_1
 x 6
 y 16
 elevation 1436
 end
-arch tree5
-x 6
-y 16
-end
-arch grass_only
+arch footpath_2_1_1
 x 6
 y 17
 elevation 1120
 end
-arch tree5
-x 6
-y 17
-end
-arch grass_only
+arch footpath_2_1_1
 x 6
 y 18
 elevation 1996
 end
-arch tree5
-x 6
-y 18
-end
-arch grass_only
+arch footpath_2_1_1
 x 6
 y 19
 elevation 2448
 end
-arch tree5
-x 6
-y 19
-end
-arch grass_only
+arch footpath_2_1_1
 x 6
 y 20
 elevation 2248
 end
-arch tree5
-x 6
-y 20
-end
-arch jungle_1
+arch footpath_2_1_1
 x 6
 y 21
-elevation 0
 end
-arch grass_only
+arch footpath_2_1_1
 x 6
 y 22
 elevation 1573
 end
-arch tree5
-x 6
-y 22
-end
-arch grass_only
+arch footpath_2_1_1
 x 6
 y 23
 elevation 2384
 end
-arch tree5
-x 6
-y 23
-end
-arch woods_2
+arch footpath_2_1_1
 x 6
 y 24
 elevation 2650
 end
-arch grass_only
+arch footpath_2_1_1
 x 6
 y 25
 elevation 2459
 end
-arch tree5
-x 6
-y 25
-end
-arch grass_only
+arch footpath_2_1_1
 x 6
 y 26
 elevation 1926
 end
-arch tree5
-x 6
-y 26
-end
-arch grass_only
+arch footpath_2_1_1
 x 6
 y 27
 elevation 1306
 end
-arch tree5
-x 6
-y 27
-end
-arch jungle_2
+arch footpath_2_1_1
 x 6
 y 28
-elevation 0
 end
-arch woods_3
+arch footpath_2_1_1
 x 6
 y 29
-elevation 0
 end
-arch woods_3
+arch footpath_2_1_1
 x 6
 y 30
-elevation 0
 end
-arch woods_3
+arch footpath_2_1_1
 x 6
 y 31
-elevation 0
 end
-arch jungle_1
+arch footpath_2_1_1
 x 6
 y 32
-elevation 0
 end
-arch woods_3
+arch footpath_1_2
 x 6
 y 33
-elevation 0
 end
 arch cobblestones
 x 6
@@ -2443,15 +2372,11 @@ arch evergreens2
 x 7
 y 9
 end
-arch grass_only
+arch footpath_2_1_2
 x 7
 y 10
 elevation 2737
 end
-arch tree5
-x 7
-y 10
-end
 arch grass_only
 x 7
 y 11
@@ -2618,10 +2543,17 @@ x 7
 y 32
 elevation 0
 end
-arch woods_3
+arch grass
+x 7
+y 33
+end
+arch sign_e
+msg
+Hermes' Inn
+40 chains east
+endmsg
 x 7
 y 33
-elevation 0
 end
 arch cobblestones
 x 7
@@ -2784,15 +2716,11 @@ x 8
 y 9
 elevation 0
 end
-arch grass_only
+arch footpath_2_1_2
 x 8
 y 10
 elevation 2380
 end
-arch tree5
-x 8
-y 10
-end
 arch grass_only
 x 8
 y 11
@@ -3132,15 +3060,11 @@ arch tree5
 x 9
 y 9
 end
-arch grass_only
+arch footpath_2_1_2
 x 9
 y 10
 elevation 2003
 end
-arch tree5
-x 9
-y 10
-end
 arch grass_only
 x 9
 y 11
@@ -3417,83 +3341,50 @@ arch woods5
 x 10
 y 1
 end
-arch grass_only
+arch footpath_2_2_2
 x 10
 y 2
 elevation 1957
 end
-arch tree5
-x 10
-y 2
-end
-arch woods_2
+arch footpath_2_1_1
 x 10
 y 3
-elevation 0
 end
-arch grass_only
+arch footpath_2_1_1
 x 10
 y 4
 elevation 1177
 end
-arch tree5
-x 10
-y 4
-end
-arch grass_only
+arch footpath_2_1_1
 x 10
 y 5
 elevation 1027
 end
-arch tree5
-x 10
-y 5
-end
-arch grass_only
+arch footpath_2_1_1
 x 10
 y 6
 elevation 1274
 end
-arch tree5
-x 10
-y 6
-end
-arch grass_only
+arch footpath_2_1_1
 x 10
 y 7
 elevation 1626
 end
-arch tree5
-x 10
-y 7
-end
-arch grass_only
+arch footpath_2_1_1
 x 10
 y 8
 elevation 1556
 end
-arch tree5
-x 10
-y 8
-end
-arch grass_only
+arch footpath_2_1_1
 x 10
 y 9
 elevation 1573
 end
-arch tree5
-x 10
-y 9
-end
-arch grass_only
+arch footpath_2_2_4
 x 10
 y 10
 elevation 1542
 end
-arch tree5
-x 10
-y 10
-end
 arch grass_only
 x 10
 y 11
@@ -3742,15 +3633,11 @@ x 11
 y 1
 elevation 3687
 end
-arch grass_only
+arch footpath_2_1_2
 x 11
 y 2
 elevation 2958
 end
-arch tree5
-x 11
-y 2
-end
 arch grass_only
 x 11
 y 3
@@ -4076,7 +3963,7 @@ arch woods5
 x 12
 y 1
 end
-arch steppe
+arch footpath_2_1_2
 x 12
 y 2
 elevation 3080
@@ -4364,19 +4251,16 @@ x 12
 y 49
 elevation 0
 end
-arch hills
+arch footpath_2_1_1
 x 13
 elevation 2504
 end
-arch woods5
-x 13
-end
-arch woods
+arch footpath_2_1_1
 x 13
 y 1
 elevation 2868
 end
-arch woods_2
+arch footpath_2_2_4
 x 13
 y 2
 elevation 2480