diff --git a/scorn/houses/barracks b/scorn/houses/barracks
index b0f41b6b7..b910cec67 100644
--- a/scorn/houses/barracks
+++ b/scorn/houses/barracks
@@ -3,1343 +3,1617 @@ name Barracks
 reset_timeout 7200
 difficulty 12
 region scorn
-width 25
-height 10
-enter_x 24
-enter_y 4
+width 27
+height 12
+enter_x 25
+enter_y 5
 msg
 Created:  2003-01-04
-Modified: 2017-07-28 Kevin Zheng
+Modified: 2020-01-13 Rick Tanner
 endmsg
 end
-arch cobblestones2
+arch grass_only
 end
-arch cobblestones2
+arch dwall_2_1_2
+end
+arch grass_only
 y 1
 end
-arch cobblestones2
+arch grass_only
 y 2
 end
-arch cobblestones2
+arch grass_only
 y 3
 end
-arch cobblestones2
+arch grass_only
 y 4
 end
-arch cobblestones2
+arch grass_only
 y 5
 end
-arch cobblestones2
+arch grass_only
 y 6
 end
-arch cobblestones2
+arch grass_only
 y 7
 end
-arch cobblestones2
+arch grass_only
 y 8
 end
-arch cobblestones2
+arch grass_only
 y 9
 end
-arch cobblestones2
+arch grass_only
+y 10
+end
+arch grass_only
+y 11
+end
+arch grass_only
 x 1
 end
-arch dirtfloor
+arch dwall_2_1_2
+x 1
+end
+arch grass_only
 x 1
 y 1
 end
+arch grass_only
+x 1
+y 2
+end
+arch grass_only
+x 1
+y 3
+end
+arch grass_only
+x 1
+y 4
+end
+arch grass_only
+x 1
+y 5
+end
+arch grass_only
+x 1
+y 6
+end
+arch grass_only
+x 1
+y 7
+end
+arch grass_only
+x 1
+y 8
+end
+arch grass_only
+x 1
+y 9
+end
+arch grass_only
+x 1
+y 10
+end
+arch grass_only
+x 1
+y 11
+end
+arch grass_only
+x 2
+end
+arch dwall_2_1_2
+x 2
+end
+arch grass_only
+x 2
+y 1
+end
+arch cobblestones2
+x 2
+y 2
+end
 arch dwall_2_2_2
-x 1
-y 1
-end
-arch dirtfloor
-x 1
+x 2
 y 2
 end
-arch dwall_2_1_1
-x 1
-y 2
-end
-arch dirtfloor
-x 1
+arch cobblestones2
+x 2
 y 3
 end
 arch dwall_2_1_1
-x 1
+x 2
 y 3
 end
-arch dirtfloor
-x 1
+arch cobblestones2
+x 2
 y 4
 end
 arch dwall_2_1_1
-x 1
+x 2
 y 4
 end
-arch dirtfloor
-x 1
+arch cobblestones2
+x 2
 y 5
 end
 arch dwall_2_1_1
-x 1
+x 2
 y 5
 end
-arch dirtfloor
-x 1
+arch cobblestones2
+x 2
 y 6
 end
 arch dwall_2_1_1
-x 1
+x 2
 y 6
 end
-arch dirtfloor
-x 1
+arch cobblestones2
+x 2
 y 7
 end
 arch dwall_2_1_1
-x 1
+x 2
 y 7
 end
-arch dirtfloor
-x 1
+arch cobblestones2
+x 2
 y 8
 end
+arch dwall_2_1_1
+x 2
+y 8
+end
+arch cobblestones2
+x 2
+y 9
+end
 arch dwall_2_2_1
-x 1
-y 8
-end
-arch cobblestones2
-x 1
+x 2
 y 9
 end
+arch grass_only
+x 2
+y 10
+end
+arch grass_only
+x 2
+y 11
+end
+arch grass_only
+x 3
+end
+arch dwall_2_1_2
+x 3
+end
+arch grass_only
+x 3
+y 1
+end
 arch cobblestones2
-x 2
-end
-arch dirtfloor
-x 2
-y 1
-end
-arch cwall_2_1_2
-x 2
-y 1
-end
-arch dirtfloor
-x 2
+x 3
 y 2
 end
-arch dirtfloor
-x 2
+arch cwall_2_1_2
+x 3
+y 2
+end
+arch cobblestones2
+x 3
 y 3
 end
+arch cobblestones2
+x 3
+y 4
+end
 arch bed_1
-x 2
-y 3
+x 3
+y 4
 end
 arch medium_guard
-x 2
-y 3
-end
-arch dirtfloor
-x 2
+x 3
 y 4
 end
+arch cobblestones2
+x 3
+y 5
+end
 arch bed_1
-x 2
-y 4
+x 3
+y 5
 end
 arch light_guard
-x 2
-y 4
-end
-arch dirtfloor
-x 2
+x 3
 y 5
 end
+arch cobblestones2
+x 3
+y 6
+end
 arch bed_1
-x 2
-y 5
+x 3
+y 6
 end
 arch knight
-x 2
-y 5
-end
-arch dirtfloor
-x 2
+x 3
 y 6
 end
+arch cobblestones2
+x 3
+y 7
+end
 arch bed_1
-x 2
-y 6
+x 3
+y 7
 end
 arch light_guard
-x 2
-y 6
-end
-arch dirtfloor
-x 2
+x 3
 y 7
 end
+arch cobblestones2
+x 3
+y 8
+end
 arch bed_1
-x 2
-y 7
+x 3
+y 8
 end
 arch guard
-x 2
-y 7
-end
-arch dirtfloor
-x 2
-y 8
-end
-arch cwall_2_1_2
-x 2
+x 3
 y 8
 end
 arch cobblestones2
-x 2
+x 3
 y 9
 end
-arch cobblestones2
-x 3
-end
-arch dirtfloor
-x 3
-y 1
-end
 arch cwall_2_1_2
 x 3
+y 9
+end
+arch grass_only
+x 3
+y 10
+end
+arch grass_only
+x 3
+y 11
+end
+arch grass_only
+x 4
+end
+arch dwall_2_1_2
+x 4
+end
+arch grass_only
+x 4
 y 1
 end
-arch dirtfloor
-x 3
+arch cobblestones2
+x 4
 y 2
 end
-arch dirtfloor
-x 3
+arch cwall_2_1_2
+x 4
+y 2
+end
+arch cobblestones2
+x 4
 y 3
 end
-arch dirtfloor
-x 3
+arch cobblestones2
+x 4
 y 4
 end
-arch dirtfloor
-x 3
+arch cobblestones2
+x 4
 y 5
 end
-arch dirtfloor
-x 3
+arch cobblestones2
+x 4
 y 6
 end
-arch dirtfloor
-x 3
+arch cobblestones2
+x 4
 y 7
 end
-arch dirtfloor
-x 3
-y 8
-end
-arch cwall_2_1_2
-x 3
+arch cobblestones2
+x 4
 y 8
 end
 arch cobblestones2
-x 3
+x 4
 y 9
 end
-arch cobblestones2
-x 4
-end
-arch dirtfloor
-x 4
-y 1
-end
 arch cwall_2_1_2
 x 4
+y 9
+end
+arch grass_only
+x 4
+y 10
+end
+arch grass_only
+x 4
+y 11
+end
+arch grass_only
+x 5
+end
+arch dwall_2_1_2
+x 5
+end
+arch grass_only
+x 5
 y 1
 end
-arch dirtfloor
-x 4
+arch cobblestones2
+x 5
 y 2
 end
-arch dirtfloor
-x 4
+arch cwall_2_1_2
+x 5
+y 2
+end
+arch cobblestones2
+x 5
 y 3
 end
+arch cobblestones2
+x 5
+y 4
+end
 arch dwall_1_1
-x 4
-y 3
-end
-arch dirtfloor
-x 4
+x 5
 y 4
 end
+arch cobblestones2
+x 5
+y 5
+end
 arch dwall_2_1_1
-x 4
-y 4
-end
-arch dirtfloor
-x 4
+x 5
 y 5
 end
-arch cwall_2_1_1
-x 4
-y 5
-end
-arch dirtfloor
-x 4
+arch cobblestones2
+x 5
 y 6
 end
 arch cwall_2_1_1
-x 4
+x 5
 y 6
 end
-arch dirtfloor
-x 4
+arch cobblestones2
+x 5
 y 7
 end
 arch cwall_2_1_1
-x 4
+x 5
 y 7
 end
-arch dirtfloor
-x 4
+arch cobblestones2
+x 5
 y 8
 end
-arch dwall_3_1
-x 4
+arch cwall_2_1_1
+x 5
 y 8
 end
 arch cobblestones2
-x 4
+x 5
 y 9
 end
+arch dwall_3_1
+x 5
+y 9
+end
+arch grass_only
+x 5
+y 10
+end
+arch grass_only
+x 5
+y 11
+end
+arch grass_only
+x 6
+end
+arch dwall_2_1_2
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
 arch cobblestones2
-x 5
-end
-arch dirtfloor
-x 5
-y 1
-end
-arch cwall_2_1_2
-x 5
-y 1
-end
-arch dirtfloor
-x 5
+x 6
 y 2
 end
-arch dirtfloor
-x 5
+arch cwall_2_1_2
+x 6
+y 2
+end
+arch cobblestones2
+x 6
 y 3
 end
-arch bed_1
-x 5
-y 3
-end
-arch dirtfloor
-x 5
+arch cobblestones2
+x 6
 y 4
 end
 arch bed_1
-x 5
+x 6
 y 4
 end
+arch cobblestones2
+x 6
+y 5
+end
+arch bed_1
+x 6
+y 5
+end
 arch guard
-x 5
-y 4
-end
-arch dirtfloor
-x 5
+x 6
 y 5
 end
-arch bed_1
-x 5
-y 5
-end
-arch dirtfloor
-x 5
+arch cobblestones2
+x 6
 y 6
 end
 arch bed_1
-x 5
+x 6
 y 6
 end
+arch cobblestones2
+x 6
+y 7
+end
+arch bed_1
+x 6
+y 7
+end
 arch medium_guard
-x 5
-y 6
-end
-arch dirtfloor
-x 5
+x 6
 y 7
 end
+arch cobblestones2
+x 6
+y 8
+end
 arch bed_1
-x 5
-y 7
+x 6
+y 8
 end
 arch light_guard
-x 5
-y 7
-end
-arch dirtfloor
-x 5
-y 8
-end
-arch cwall_2_1_2
-x 5
+x 6
 y 8
 end
 arch cobblestones2
-x 5
+x 6
 y 9
 end
-arch cobblestones2
-x 6
-end
-arch dirtfloor
-x 6
-y 1
-end
 arch cwall_2_1_2
 x 6
+y 9
+end
+arch grass_only
+x 6
+y 10
+end
+arch grass_only
+x 6
+y 11
+end
+arch grass_only
+x 7
+end
+arch dwall_2_1_2
+x 7
+end
+arch grass_only
+x 7
 y 1
 end
-arch dirtfloor
-x 6
+arch cobblestones2
+x 7
 y 2
 end
-arch dirtfloor
-x 6
+arch cwall_2_1_2
+x 7
+y 2
+end
+arch cobblestones2
+x 7
 y 3
 end
-arch dirtfloor
-x 6
+arch cobblestones2
+x 7
 y 4
 end
-arch dirtfloor
-x 6
+arch cobblestones2
+x 7
 y 5
 end
-arch knight
-x 6
-y 5
-end
-arch dirtfloor
-x 6
+arch cobblestones2
+x 7
 y 6
 end
-arch dirtfloor
-x 6
+arch knight
+x 7
+y 6
+end
+arch cobblestones2
+x 7
 y 7
 end
-arch dirtfloor
-x 6
-y 8
-end
-arch cwall_2_1_2
-x 6
+arch cobblestones2
+x 7
 y 8
 end
 arch cobblestones2
-x 6
+x 7
 y 9
 end
-arch cobblestones2
-x 7
-end
-arch dirtfloor
-x 7
-y 1
-end
 arch cwall_2_1_2
 x 7
+y 9
+end
+arch grass_only
+x 7
+y 10
+end
+arch grass_only
+x 7
+y 11
+end
+arch grass_only
+x 8
+end
+arch dwall_2_1_2
+x 8
+end
+arch grass_only
+x 8
 y 1
 end
-arch dirtfloor
-x 7
+arch cobblestones2
+x 8
 y 2
 end
-arch dirtfloor
-x 7
+arch cwall_2_1_2
+x 8
+y 2
+end
+arch cobblestones2
+x 8
 y 3
 end
+arch cobblestones2
+x 8
+y 4
+end
 arch dwall_1_1
-x 7
-y 3
-end
-arch dirtfloor
-x 7
+x 8
 y 4
 end
-arch cwall_2_1_1
-x 7
-y 4
-end
-arch dirtfloor
-x 7
+arch cobblestones2
+x 8
 y 5
 end
 arch cwall_2_1_1
-x 7
+x 8
 y 5
 end
-arch dirtfloor
-x 7
+arch cobblestones2
+x 8
 y 6
 end
 arch cwall_2_1_1
-x 7
+x 8
 y 6
 end
-arch dirtfloor
-x 7
+arch cobblestones2
+x 8
 y 7
 end
 arch cwall_2_1_1
-x 7
+x 8
 y 7
 end
-arch dirtfloor
-x 7
+arch cobblestones2
+x 8
 y 8
 end
+arch cwall_2_1_1
+x 8
+y 8
+end
+arch cobblestones2
+x 8
+y 9
+end
 arch dwall_3_1
-x 7
-y 8
-end
-arch cobblestones2
-x 7
+x 8
 y 9
 end
+arch grass_only
+x 8
+y 10
+end
+arch grass_only
+x 8
+y 11
+end
+arch grass_only
+x 9
+end
+arch dwall_2_1_2
+x 9
+end
+arch grass_only
+x 9
+y 1
+end
 arch cobblestones2
-x 8
-end
-arch dirtfloor
-x 8
-y 1
-end
-arch cwall_2_1_2
-x 8
-y 1
-end
-arch dirtfloor
-x 8
+x 9
 y 2
 end
-arch dirtfloor
-x 8
+arch cwall_2_1_2
+x 9
+y 2
+end
+arch cobblestones2
+x 9
 y 3
 end
+arch cobblestones2
+x 9
+y 4
+end
 arch bed_1
-x 8
-y 3
+x 9
+y 4
 end
 arch light_guard
-x 8
-y 3
-end
-arch dirtfloor
-x 8
+x 9
 y 4
 end
-arch bed_1
-x 8
-y 4
-end
-arch dirtfloor
-x 8
+arch cobblestones2
+x 9
 y 5
 end
 arch bed_1
-x 8
+x 9
 y 5
 end
+arch cobblestones2
+x 9
+y 6
+end
+arch bed_1
+x 9
+y 6
+end
 arch medium_guard
-x 8
-y 5
-end
-arch dirtfloor
-x 8
+x 9
 y 6
 end
-arch bed_1
-x 8
-y 6
-end
-arch dirtfloor
-x 8
+arch cobblestones2
+x 9
 y 7
 end
 arch bed_1
-x 8
+x 9
 y 7
 end
+arch cobblestones2
+x 9
+y 8
+end
+arch bed_1
+x 9
+y 8
+end
 arch knight
-x 8
-y 7
-end
-arch dirtfloor
-x 8
-y 8
-end
-arch cwall_2_1_2
-x 8
+x 9
 y 8
 end
 arch cobblestones2
-x 8
+x 9
 y 9
 end
-arch cobblestones2
-x 9
-end
-arch dirtfloor
-x 9
-y 1
-end
 arch cwall_2_1_2
 x 9
+y 9
+end
+arch grass_only
+x 9
+y 10
+end
+arch grass_only
+x 9
+y 11
+end
+arch grass_only
+x 10
+end
+arch dwall_2_1_2
+x 10
+end
+arch grass_only
+x 10
 y 1
 end
-arch dirtfloor
-x 9
+arch cobblestones2
+x 10
 y 2
 end
+arch cwall_2_1_2
+x 10
+y 2
+end
+arch cobblestones2
+x 10
+y 3
+end
 arch charwoman
-x 9
-y 2
-end
-arch dirtfloor
-x 9
+x 10
 y 3
 end
-arch dirtfloor
-x 9
+arch cobblestones2
+x 10
 y 4
 end
-arch dirtfloor
-x 9
+arch cobblestones2
+x 10
 y 5
 end
-arch dirtfloor
-x 9
+arch cobblestones2
+x 10
 y 6
 end
-arch dirtfloor
-x 9
+arch cobblestones2
+x 10
 y 7
 end
-arch dirtfloor
-x 9
-y 8
-end
-arch cwall_2_1_2
-x 9
+arch cobblestones2
+x 10
 y 8
 end
 arch cobblestones2
-x 9
+x 10
 y 9
 end
-arch cobblestones2
-x 10
-end
-arch dirtfloor
-x 10
-y 1
-end
 arch cwall_2_1_2
 x 10
+y 9
+end
+arch grass_only
+x 10
+y 10
+end
+arch grass_only
+x 10
+y 11
+end
+arch grass_only
+x 11
+end
+arch dwall_2_1_2
+x 11
+end
+arch grass_only
+x 11
 y 1
 end
-arch dirtfloor
-x 10
+arch cobblestones2
+x 11
 y 2
 end
-arch dirtfloor
-x 10
+arch cwall_2_1_2
+x 11
+y 2
+end
+arch cobblestones2
+x 11
 y 3
 end
+arch cobblestones2
+x 11
+y 4
+end
 arch dwall_1_1
-x 10
-y 3
-end
-arch dirtfloor
-x 10
+x 11
 y 4
 end
-arch cwall_2_1_1
-x 10
-y 4
-end
-arch dirtfloor
-x 10
+arch cobblestones2
+x 11
 y 5
 end
 arch cwall_2_1_1
-x 10
+x 11
 y 5
 end
-arch dirtfloor
-x 10
+arch cobblestones2
+x 11
 y 6
 end
 arch cwall_2_1_1
-x 10
+x 11
 y 6
 end
-arch dirtfloor
-x 10
+arch cobblestones2
+x 11
 y 7
 end
 arch cwall_2_1_1
-x 10
+x 11
 y 7
 end
-arch dirtfloor
-x 10
+arch cobblestones2
+x 11
 y 8
 end
-arch dwall_3_1
-x 10
+arch cwall_2_1_1
+x 11
 y 8
 end
 arch cobblestones2
-x 10
+x 11
 y 9
 end
+arch dwall_3_1
+x 11
+y 9
+end
+arch grass_only
+x 11
+y 10
+end
+arch grass_only
+x 11
+y 11
+end
+arch grass_only
+x 12
+end
+arch dwall_2_1_2
+x 12
+end
+arch grass_only
+x 12
+y 1
+end
 arch cobblestones2
-x 11
-end
-arch dirtfloor
-x 11
-y 1
-end
-arch cwall_2_1_2
-x 11
-y 1
-end
-arch dirtfloor
-x 11
+x 12
 y 2
 end
-arch dirtfloor
-x 11
+arch cwall_2_1_2
+x 12
+y 2
+end
+arch cobblestones2
+x 12
 y 3
 end
+arch cobblestones2
+x 12
+y 4
+end
 arch bed_1
-x 11
-y 3
+x 12
+y 4
 end
 arch medium_guard
-x 11
-y 3
-end
-arch dirtfloor
-x 11
+x 12
 y 4
 end
-arch bed_1
-x 11
-y 4
-end
-arch dirtfloor
-x 11
+arch cobblestones2
+x 12
 y 5
 end
 arch bed_1
-x 11
+x 12
+y 5
+end
+arch cobblestones2
+x 12
+y 6
+end
+arch bed_1
+x 12
+y 6
+end
+arch knight
+x 12
+y 6
+end
+arch cobblestones2
+x 12
+y 7
+end
+arch bed_1
+x 12
+y 7
+end
+arch guard
+x 12
+y 7
+end
+arch cobblestones2
+x 12
+y 8
+end
+arch bed_1
+x 12
+y 8
+end
+arch cobblestones2
+x 12
+y 9
+end
+arch cwall_2_1_2
+x 12
+y 9
+end
+arch grass_only
+x 12
+y 10
+end
+arch grass_only
+x 12
+y 11
+end
+arch grass_only
+x 13
+end
+arch dwall_2_1_2
+x 13
+end
+arch grass_only
+x 13
+y 1
+end
+arch cobblestones2
+x 13
+y 2
+end
+arch cwall_2_1_2
+x 13
+y 2
+end
+arch cobblestones2
+x 13
+y 3
+end
+arch cobblestones2
+x 13
+y 4
+end
+arch cobblestones2
+x 13
+y 5
+end
+arch light_guard
+x 13
+y 5
+end
+arch cobblestones2
+x 13
+y 6
+end
+arch cobblestones2
+x 13
+y 7
+end
+arch cobblestones2
+x 13
+y 8
+end
+arch cobblestones2
+x 13
+y 9
+end
+arch cwall_2_1_2
+x 13
+y 9
+end
+arch grass_only
+x 13
+y 10
+end
+arch grass_only
+x 13
+y 11
+end
+arch grass_only
+x 14
+end
+arch dwall_2_1_2
+x 14
+end
+arch grass_only
+x 14
+y 1
+end
+arch cobblestones2
+x 14
+y 2
+end
+arch cwall_2_1_2
+x 14
+y 2
+end
+arch cobblestones2
+x 14
+y 3
+end
+arch cobblestones2
+x 14
+y 4
+end
+arch dwall_1_1
+x 14
+y 4
+end
+arch cobblestones2
+x 14
+y 5
+end
+arch cwall_2_1_1
+x 14
+y 5
+end
+arch cobblestones2
+x 14
+y 6
+end
+arch cwall_2_1_1
+x 14
+y 6
+end
+arch cobblestones2
+x 14
+y 7
+end
+arch cwall_2_1_1
+x 14
+y 7
+end
+arch cobblestones2
+x 14
+y 8
+end
+arch cwall_2_1_1
+x 14
+y 8
+end
+arch cobblestones2
+x 14
+y 9
+end
+arch dwall_3_1
+x 14
+y 9
+end
+arch grass_only
+x 14
+y 10
+end
+arch grass_only
+x 14
+y 11
+end
+arch grass_only
+x 15
+end
+arch dwall_2_1_2
+x 15
+end
+arch grass_only
+x 15
+y 1
+end
+arch cobblestones2
+x 15
+y 2
+end
+arch cwall_2_1_2
+x 15
+y 2
+end
+arch cobblestones2
+x 15
+y 3
+end
+arch cobblestones2
+x 15
+y 4
+end
+arch bed_1
+x 15
+y 4
+end
+arch cobblestones2
+x 15
+y 5
+end
+arch bed_1
+x 15
+y 5
+end
+arch light_guard
+x 15
+y 5
+end
+arch cobblestones2
+x 15
+y 6
+end
+arch bed_1
+x 15
+y 6
+end
+arch cobblestones2
+x 15
+y 7
+end
+arch bed_1
+x 15
+y 7
+end
+arch medium_guard
+x 15
+y 7
+end
+arch cobblestones2
+x 15
+y 8
+end
+arch bed_1
+x 15
+y 8
+end
+arch light_guard
+x 15
+y 8
+end
+arch cobblestones2
+x 15
+y 9
+end
+arch cwall_2_1_2
+x 15
+y 9
+end
+arch grass_only
+x 15
+y 10
+end
+arch grass_only
+x 15
+y 11
+end
+arch grass_only
+x 16
+end
+arch dwall_2_1_2
+x 16
+end
+arch grass_only
+x 16
+y 1
+end
+arch cobblestones2
+x 16
+y 2
+end
+arch cwall_2_1_2
+x 16
+y 2
+end
+arch cobblestones2
+x 16
+y 3
+end
+arch cobblestones2
+x 16
+y 4
+end
+arch cobblestones2
+x 16
+y 5
+end
+arch cobblestones2
+x 16
+y 6
+end
+arch medium_guard
+x 16
+y 6
+end
+arch cobblestones2
+x 16
+y 7
+end
+arch cobblestones2
+x 16
+y 8
+end
+arch cobblestones2
+x 16
+y 9
+end
+arch cwall_2_1_2
+x 16
+y 9
+end
+arch grass_only
+x 16
+y 10
+end
+arch grass_only
+x 16
+y 11
+end
+arch grass_only
+x 17
+end
+arch dwall_2_1_2
+x 17
+end
+arch grass_only
+x 17
+y 1
+end
+arch cobblestones2
+x 17
+y 2
+end
+arch cwall_2_1_2
+x 17
+y 2
+end
+arch cobblestones2
+x 17
+y 3
+end
+arch cobblestones2
+x 17
+y 4
+end
+arch dwall_1_1
+x 17
+y 4
+end
+arch cobblestones2
+x 17
+y 5
+end
+arch cwall_2_1_1
+x 17
+y 5
+end
+arch cobblestones2
+x 17
+y 6
+end
+arch cwall_2_1_1
+x 17
+y 6
+end
+arch cobblestones2
+x 17
+y 7
+end
+arch cwall_2_1_1
+x 17
+y 7
+end
+arch cobblestones2
+x 17
+y 8
+end
+arch cwall_2_1_1
+x 17
+y 8
+end
+arch cobblestones2
+x 17
+y 9
+end
+arch dwall_3_1
+x 17
+y 9
+end
+arch grass_only
+x 17
+y 10
+end
+arch grass_only
+x 17
+y 11
+end
+arch grass_only
+x 18
+end
+arch dwall_2_1_2
+x 18
+end
+arch grass_only
+x 18
+y 1
+end
+arch cobblestones2
+x 18
+y 2
+end
+arch cwall_2_1_2
+x 18
+y 2
+end
+arch cobblestones2
+x 18
+y 3
+end
+arch cobblestones2
+x 18
+y 4
+end
+arch bed_1
+x 18
+y 4
+end
+arch guard
+x 18
+y 4
+end
+arch cobblestones2
+x 18
+y 5
+end
+arch bed_1
+x 18
 y 5
 end
 arch knight
-x 11
+x 18
 y 5
 end
-arch dirtfloor
-x 11
+arch cobblestones2
+x 18
 y 6
 end
 arch bed_1
-x 11
+x 18
+y 6
+end
+arch cobblestones2
+x 18
+y 7
+end
+arch bed_1
+x 18
+y 7
+end
+arch light_guard
+x 18
+y 7
+end
+arch cobblestones2
+x 18
+y 8
+end
+arch bed_1
+x 18
+y 8
+end
+arch medium_guard
+x 18
+y 8
+end
+arch cobblestones2
+x 18
+y 9
+end
+arch cwall_2_1_2
+x 18
+y 9
+end
+arch grass_only
+x 18
+y 10
+end
+arch grass_only
+x 18
+y 11
+end
+arch grass_only
+x 19
+end
+arch dwall_2_1_2
+x 19
+end
+arch grass_only
+x 19
+y 1
+end
+arch cobblestones2
+x 19
+y 2
+end
+arch cwall_2_1_2
+x 19
+y 2
+end
+arch cobblestones2
+x 19
+y 3
+end
+arch cobblestones2
+x 19
+y 4
+end
+arch cobblestones2
+x 19
+y 5
+end
+arch cobblestones2
+x 19
 y 6
 end
 arch guard
-x 11
+x 19
 y 6
 end
-arch dirtfloor
-x 11
+arch cobblestones2
+x 19
 y 7
 end
-arch bed_1
-x 11
-y 7
-end
-arch dirtfloor
-x 11
-y 8
-end
-arch cwall_2_1_2
-x 11
+arch cobblestones2
+x 19
 y 8
 end
 arch cobblestones2
-x 11
+x 19
 y 9
 end
-arch cobblestones2
-x 12
-end
-arch dirtfloor
-x 12
-y 1
-end
 arch cwall_2_1_2
-x 12
-y 1
-end
-arch dirtfloor
-x 12
-y 2
-end
-arch dirtfloor
-x 12
-y 3
-end
-arch dirtfloor
-x 12
-y 4
-end
-arch light_guard
-x 12
-y 4
-end
-arch dirtfloor
-x 12
-y 5
-end
-arch dirtfloor
-x 12
-y 6
-end
-arch dirtfloor
-x 12
-y 7
-end
-arch dirtfloor
-x 12
-y 8
-end
-arch cwall_2_1_2
-x 12
-y 8
-end
-arch cobblestones2
-x 12
+x 19
 y 9
 end
+arch grass_only
+x 19
+y 10
+end
+arch grass_only
+x 19
+y 11
+end
+arch grass_only
+x 20
+end
+arch dwall_2_1_2
+x 20
+end
+arch grass_only
+x 20
+y 1
+end
 arch cobblestones2
-x 13
-end
-arch dirtfloor
-x 13
-y 1
-end
-arch cwall_2_1_2
-x 13
-y 1
-end
-arch dirtfloor
-x 13
+x 20
 y 2
 end
-arch dirtfloor
-x 13
+arch cwall_2_1_2
+x 20
+y 2
+end
+arch cobblestones2
+x 20
 y 3
 end
+arch cobblestones2
+x 20
+y 4
+end
 arch dwall_1_1
-x 13
-y 3
-end
-arch dirtfloor
-x 13
+x 20
 y 4
 end
-arch cwall_2_1_1
-x 13
-y 4
-end
-arch dirtfloor
-x 13
+arch cobblestones2
+x 20
 y 5
 end
 arch cwall_2_1_1
-x 13
+x 20
 y 5
 end
-arch dirtfloor
-x 13
+arch cobblestones2
+x 20
 y 6
 end
 arch cwall_2_1_1
-x 13
+x 20
 y 6
 end
-arch dirtfloor
-x 13
+arch cobblestones2
+x 20
 y 7
 end
 arch cwall_2_1_1
-x 13
+x 20
 y 7
 end
-arch dirtfloor
-x 13
+arch cobblestones2
+x 20
 y 8
 end
+arch cwall_2_1_1
+x 20
+y 8
+end
+arch cobblestones2
+x 20
+y 9
+end
 arch dwall_3_1
-x 13
-y 8
-end
-arch cobblestones2
-x 13
-y 9
-end
-arch cobblestones2
-x 14
-end
-arch dirtfloor
-x 14
-y 1
-end
-arch cwall_2_1_2
-x 14
-y 1
-end
-arch dirtfloor
-x 14
-y 2
-end
-arch dirtfloor
-x 14
-y 3
-end
-arch bed_1
-x 14
-y 3
-end
-arch dirtfloor
-x 14
-y 4
-end
-arch bed_1
-x 14
-y 4
-end
-arch light_guard
-x 14
-y 4
-end
-arch dirtfloor
-x 14
-y 5
-end
-arch bed_1
-x 14
-y 5
-end
-arch dirtfloor
-x 14
-y 6
-end
-arch bed_1
-x 14
-y 6
-end
-arch medium_guard
-x 14
-y 6
-end
-arch dirtfloor
-x 14
-y 7
-end
-arch bed_1
-x 14
-y 7
-end
-arch light_guard
-x 14
-y 7
-end
-arch dirtfloor
-x 14
-y 8
-end
-arch cwall_2_1_2
-x 14
-y 8
-end
-arch cobblestones2
-x 14
-y 9
-end
-arch cobblestones2
-x 15
-end
-arch dirtfloor
-x 15
-y 1
-end
-arch cwall_2_1_2
-x 15
-y 1
-end
-arch dirtfloor
-x 15
-y 2
-end
-arch dirtfloor
-x 15
-y 3
-end
-arch dirtfloor
-x 15
-y 4
-end
-arch dirtfloor
-x 15
-y 5
-end
-arch medium_guard
-x 15
-y 5
-end
-arch dirtfloor
-x 15
-y 6
-end
-arch dirtfloor
-x 15
-y 7
-end
-arch dirtfloor
-x 15
-y 8
-end
-arch cwall_2_1_2
-x 15
-y 8
-end
-arch cobblestones2
-x 15
-y 9
-end
-arch cobblestones2
-x 16
-end
-arch dirtfloor
-x 16
-y 1
-end
-arch cwall_2_1_2
-x 16
-y 1
-end
-arch dirtfloor
-x 16
-y 2
-end
-arch dirtfloor
-x 16
-y 3
-end
-arch dwall_1_1
-x 16
-y 3
-end
-arch dirtfloor
-x 16
-y 4
-end
-arch cwall_2_1_1
-x 16
-y 4
-end
-arch dirtfloor
-x 16
-y 5
-end
-arch cwall_2_1_1
-x 16
-y 5
-end
-arch dirtfloor
-x 16
-y 6
-end
-arch cwall_2_1_1
-x 16
-y 6
-end
-arch dirtfloor
-x 16
-y 7
-end
-arch cwall_2_1_1
-x 16
-y 7
-end
-arch dirtfloor
-x 16
-y 8
-end
-arch dwall_3_1
-x 16
-y 8
-end
-arch cobblestones2
-x 16
-y 9
-end
-arch cobblestones2
-x 17
-end
-arch dirtfloor
-x 17
-y 1
-end
-arch cwall_2_1_2
-x 17
-y 1
-end
-arch dirtfloor
-x 17
-y 2
-end
-arch dirtfloor
-x 17
-y 3
-end
-arch bed_1
-x 17
-y 3
-end
-arch guard
-x 17
-y 3
-end
-arch dirtfloor
-x 17
-y 4
-end
-arch bed_1
-x 17
-y 4
-end
-arch knight
-x 17
-y 4
-end
-arch dirtfloor
-x 17
-y 5
-end
-arch bed_1
-x 17
-y 5
-end
-arch dirtfloor
-x 17
-y 6
-end
-arch bed_1
-x 17
-y 6
-end
-arch light_guard
-x 17
-y 6
-end
-arch dirtfloor
-x 17
-y 7
-end
-arch bed_1
-x 17
-y 7
-end
-arch medium_guard
-x 17
-y 7
-end
-arch dirtfloor
-x 17
-y 8
-end
-arch cwall_2_1_2
-x 17
-y 8
-end
-arch cobblestones2
-x 17
-y 9
-end
-arch cobblestones2
-x 18
-end
-arch dirtfloor
-x 18
-y 1
-end
-arch cwall_2_1_2
-x 18
-y 1
-end
-arch dirtfloor
-x 18
-y 2
-end
-arch dirtfloor
-x 18
-y 3
-end
-arch dirtfloor
-x 18
-y 4
-end
-arch dirtfloor
-x 18
-y 5
-end
-arch guard
-x 18
-y 5
-end
-arch dirtfloor
-x 18
-y 6
-end
-arch dirtfloor
-x 18
-y 7
-end
-arch dirtfloor
-x 18
-y 8
-end
-arch cwall_2_1_2
-x 18
-y 8
-end
-arch cobblestones2
-x 18
-y 9
-end
-arch cobblestones2
-x 19
-end
-arch dirtfloor
-x 19
-y 1
-end
-arch cwall_2_1_2
-x 19
-y 1
-end
-arch dirtfloor
-x 19
-y 2
-end
-arch dirtfloor
-x 19
-y 3
-end
-arch dwall_1_1
-x 19
-y 3
-end
-arch dirtfloor
-x 19
-y 4
-end
-arch cwall_2_1_1
-x 19
-y 4
-end
-arch dirtfloor
-x 19
-y 5
-end
-arch cwall_2_1_1
-x 19
-y 5
-end
-arch dirtfloor
-x 19
-y 6
-end
-arch cwall_2_1_1
-x 19
-y 6
-end
-arch dirtfloor
-x 19
-y 7
-end
-arch cwall_2_1_1
-x 19
-y 7
-end
-arch dirtfloor
-x 19
-y 8
-end
-arch dwall_3_1
-x 19
-y 8
-end
-arch cobblestones2
-x 19
-y 9
-end
-arch cobblestones2
 x 20
+y 9
 end
-arch dirtfloor
+arch grass_only
 x 20
+y 10
+end
+arch grass_only
+x 20
+y 11
+end
+arch grass_only
+x 21
+end
+arch dwall_2_1_2
+x 21
+end
+arch grass_only
+x 21
 y 1
 end
-arch cwall_2_1_2
-x 20
-y 1
-end
-arch dirtfloor
-x 20
+arch cobblestones2
+x 21
 y 2
 end
-arch dirtfloor
-x 20
+arch cwall_2_1_2
+x 21
+y 2
+end
+arch cobblestones2
+x 21
 y 3
 end
-arch dirtfloor
-x 20
+arch cobblestones2
+x 21
 y 4
 end
+arch cobblestones2
+x 21
+y 5
+end
 arch table_1x2
-x 20
-y 4
-end
-arch dirtfloor
-x 20
+x 21
 y 5
 end
-arch dirtfloor
-x 20
+arch cobblestones2
+x 21
 y 6
 end
+arch cobblestones2
+x 21
+y 7
+end
 arch table_3
-x 20
-y 6
+x 21
+y 7
 no_pick 1
 end
 arch quarto
@@ -1352,14 +1626,14 @@ In a world rich with sorcery and its users, some brave warriors forsake the help
 
 All praise be the Deathbringer.  Pity those who use wizardry, and kill those who set themselves as its champions, as well as magic-based monsters.  The Just shall bring happiness and honor.
 endmsg
-x 20
-y 6
+x 21
+y 7
 material 9
 no_pick 1
 end
-arch dirtfloor
-x 20
-y 7
+arch cobblestones2
+x 21
+y 8
 end
 arch stair_down
 slaying ../temples/valkyrie
@@ -1368,148 +1642,72 @@ You go down for a LONG distance... you wonder how deep down you are.  The air sm
 endmsg
 hp 16
 sp 17
-x 20
-y 7
-end
-arch dirtfloor
-x 20
-y 8
-end
-arch cwall_2_1_2
-x 20
+x 21
 y 8
 end
 arch cobblestones2
-x 20
+x 21
 y 9
 end
-arch cobblestones2
-x 21
-end
-arch dirtfloor
-x 21
-y 1
-end
 arch cwall_2_1_2
 x 21
+y 9
+end
+arch grass_only
+x 21
+y 10
+end
+arch grass_only
+x 21
+y 11
+end
+arch grass_only
+x 22
+end
+arch dwall_2_1_2
+x 22
+end
+arch grass_only
+x 22
 y 1
 end
-arch dirtfloor
-x 21
+arch cobblestones2
+x 22
 y 2
 end
+arch cwall_2_1_2
+x 22
+y 2
+end
+arch cobblestones2
+x 22
+y 3
+end
 arch clock
-x 21
-y 2
-end
-arch dirtfloor
-x 21
+x 22
 y 3
 end
-arch dirtfloor
-x 21
+arch cobblestones2
+x 22
 y 4
 end
-arch dirtfloor
-x 21
+arch cobblestones2
+x 22
 y 5
 end
+arch cobblestones2
+x 22
+y 6
+end
 arch charwoman
-x 21
-y 5
-end
-arch dirtfloor
-x 21
+x 22
 y 6
 end
-arch dirtfloor
-x 21
-y 7
-end
-arch dirtfloor
-x 21
-y 8
-end
-arch cwall_2_1_2
-x 21
-y 8
-end
-arch cobblestones2
-x 21
-y 9
-end
 arch cobblestones2
 x 22
-end
-arch dirtfloor
-x 22
-y 1
-end
-arch cwall_2_1_2
-x 22
-y 1
-end
-arch dirtfloor
-x 22
-y 2
-end
-arch chair_1.2
-x 22
-y 2
-end
-arch knight
-x 22
-y 2
-end
-arch dirtfloor
-x 22
-y 3
-end
-arch cwall_1_4
-x 22
-y 3
-end
-arch dirtfloor
-x 22
-y 4
-end
-arch door_1
-x 22
-y 4
-end
-arch dirtfloor
-x 22
-y 5
-end
-arch door_1
-x 22
-y 5
-end
-arch dirtfloor
-x 22
-y 6
-end
-arch cwall_1_4
-x 22
-y 6
-end
-arch dirtfloor
-x 22
 y 7
 end
-arch chair_1.2
-x 22
-y 7
-end
-arch knight
-x 22
-y 7
-end
-arch dirtfloor
-x 22
-y 8
-end
-arch cwall_2_1_2
+arch cobblestones2
 x 22
 y 8
 end
@@ -1517,119 +1715,341 @@ arch cobblestones2
 x 22
 y 9
 end
-arch cobblestones2
+arch cwall_2_1_2
+x 22
+y 9
+end
+arch grass_only
+x 22
+y 10
+end
+arch grass_only
+x 22
+y 11
+end
+arch grass_only
 x 23
 end
-arch dirtfloor
+arch dwall_2_1_2
+x 23
+end
+arch grass_only
 x 23
 y 1
 end
+arch cobblestones2
+x 23
+y 2
+end
+arch cwall_2_1_2
+x 23
+y 2
+end
+arch cobblestones2
+x 23
+y 3
+end
+arch chair_1.2
+x 23
+y 3
+end
+arch knight
+x 23
+y 3
+end
+arch cobblestones2
+x 23
+y 4
+end
+arch cwall_1_4
+x 23
+y 4
+end
+arch cobblestones2
+x 23
+y 5
+end
+arch door_1
+x 23
+y 5
+end
+arch cobblestones2
+x 23
+y 6
+end
+arch door_1
+x 23
+y 6
+end
+arch cobblestones2
+x 23
+y 7
+end
+arch cwall_1_4
+x 23
+y 7
+end
+arch cobblestones2
+x 23
+y 8
+end
+arch chair_1.2
+x 23
+y 8
+end
+arch knight
+x 23
+y 8
+end
+arch cobblestones2
+x 23
+y 9
+end
+arch cwall_2_1_2
+x 23
+y 9
+end
+arch grass_only
+x 23
+y 10
+end
+arch grass_only
+x 23
+y 11
+end
+arch grass_only
+x 24
+end
+arch dwall_2_1_2
+x 24
+end
+arch grass_only
+x 24
+y 1
+end
+arch cobblestones2
+x 24
+y 2
+end
 arch dwall_2_2_3
-x 23
-y 1
-end
-arch dirtfloor
-x 23
+x 24
 y 2
 end
+arch cobblestones2
+x 24
+y 3
+end
 arch dwall_2_1_1
-x 23
-y 2
-end
-arch dirtfloor
-x 23
+x 24
 y 3
 end
+arch cobblestones2
+x 24
+y 4
+end
 arch cwall_2_2_4
-x 23
-y 3
-end
-arch cobblestones2
-x 23
+x 24
 y 4
 end
 arch cobblestones2
-x 23
+x 24
 y 5
 end
-arch dirtfloor
-x 23
+arch cobblestones2
+x 24
 y 6
 end
+arch cobblestones2
+x 24
+y 7
+end
 arch cwall_2_2_3
-x 23
-y 6
-end
-arch dirtfloor
-x 23
+x 24
 y 7
 end
+arch cobblestones2
+x 24
+y 8
+end
 arch dwall_2_1_1
-x 23
-y 7
-end
-arch dirtfloor
-x 23
+x 24
 y 8
 end
+arch cobblestones2
+x 24
+y 9
+end
 arch dwall_2_2_4
-x 23
-y 8
-end
-arch cobblestones2
-x 23
+x 24
 y 9
 end
-arch cobblestones2
+arch grass_only
 x 24
+y 10
 end
-arch cobblestones2
+arch grass_only
 x 24
+y 11
+end
+arch grass_only
+x 25
+end
+arch dwall_2_1_2
+x 25
+end
+arch grass_only
+x 25
 y 1
 end
-arch cobblestones2
-x 24
+arch grass_only
+x 25
 y 2
 end
-arch cobblestones2
-x 24
+arch dungeon_magic
+x 25
 y 3
 end
-arch invis_exit
-slaying /world/world_105_115
-hp 0
-sp 43
-x 24
-y 4
-end
-arch cobblestones2
-x 24
-y 4
+arch grass_only
+x 25
+y 3
+move_block all
 end
 arch invis_exit
 slaying /world/world_105_115
 hp 0
 sp 43
-x 24
+x 25
+y 4
+end
+arch grass_only
+x 25
+y 4
+end
+arch grass_only
+x 25
 y 5
 end
-arch cobblestones2
-x 24
-y 5
-end
-arch cobblestones2
-x 24
+arch grass_only
+x 25
 y 6
 end
-arch cobblestones2
-x 24
+arch invis_exit
+slaying /world/world_105_115
+hp 0
+sp 43
+x 25
 y 7
 end
-arch cobblestones2
-x 24
+arch grass_only
+x 25
+y 7
+end
+arch dungeon_magic
+x 25
 y 8
 end
-arch cobblestones2
-x 24
+arch grass_only
+x 25
+y 8
+move_block all
+end
+arch grass_only
+x 25
 y 9
 end
+arch grass_only
+x 25
+y 10
+end
+arch grass_only
+x 25
+y 11
+end
+arch grass_only
+x 26
+end
+arch dwall_2_1_2
+x 26
+end
+arch grass_only
+x 26
+y 1
+end
+arch grass_only
+x 26
+y 2
+end
+arch dungeon_magic
+x 26
+y 3
+end
+arch grass_only
+x 26
+y 3
+move_block all
+end
+arch invis_exit
+slaying /world/world_105_115
+hp 0
+sp 43
+x 26
+y 4
+end
+arch grass_only
+x 26
+y 4
+end
+arch invis_exit
+slaying /world/world_105_115
+hp 0
+sp 43
+x 26
+y 5
+end
+arch grass_only
+x 26
+y 5
+end
+arch invis_exit
+slaying /world/world_105_115
+hp 0
+sp 43
+x 26
+y 6
+end
+arch grass_only
+x 26
+y 6
+end
+arch invis_exit
+slaying /world/world_105_115
+hp 0
+sp 43
+x 26
+y 7
+end
+arch grass_only
+x 26
+y 7
+end
+arch dungeon_magic
+x 26
+y 8
+end
+arch grass_only
+x 26
+y 8
+move_block all
+end
+arch grass_only
+x 26
+y 9
+end
+arch grass_only
+x 26
+y 10
+end
+arch grass_only
+x 26
+y 11
+end
diff --git a/world/world_105_115 b/world/world_105_115
index 1e843c261..a29523e52 100644
--- a/world/world_105_115
+++ b/world/world_105_115
@@ -9,7 +9,7 @@ enter_x 5
 enter_y 37
 msg
 Created:  2001-02-16
-Modified: 2019-12-28 Kevin Zheng
+Modified: 2020-01-13 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_105_114
@@ -320,8 +320,8 @@ end
 arch barrack_long
 name Barracks
 slaying /scorn/houses/barracks
-hp 24
-sp 4
+hp 25
+sp 5
 y 43
 end
 arch dungeon_magic