diff --git a/navar_city/misc/dragon_guild b/navar_city/misc/dragon_guild
index 49f9a6f04..6e0dc1a82 100644
--- a/navar_city/misc/dragon_guild
+++ b/navar_city/misc/dragon_guild
@@ -8,282 +8,524 @@ shopgreed 1.00000
 shopmin 1
 shopmax 500000
 shoprace dragon
-width 16
-height 16
-enter_x 7
+width 19
+height 20
+enter_x 9
 enter_y 15
 msg
 Created:  2002-02-28
-Modified: 2008-12-02 Rick Tanner
+Modified: 2011-10-13 Rick Tanner
 endmsg
+outdoor 1
+end
+arch cobblestones2
+end
+arch cobblestones2
+y 1
+end
+arch cobblestones2
+y 2
+end
+arch cobblestones2
+y 3
+end
+arch cobblestones2
+y 4
+end
+arch cobblestones2
+y 5
+end
+arch cobblestones2
+y 6
+end
+arch cobblestones2
+y 7
+end
+arch cobblestones2
+y 8
+end
+arch cobblestones2
+y 9
+end
+arch cobblestones2
+y 10
+end
+arch cobblestones2
+y 11
+end
+arch cobblestones2
+y 12
+end
+arch cobblestones2
+y 13
+end
+arch cobblestones2
+y 14
+end
+arch cobblestones2
+y 15
+end
+arch cobblestones2
+y 16
+end
+arch cobblestones2
+y 17
+end
+arch cobblestones2
+y 18
+end
+arch grass_only
+y 19
+end
+arch grass_only
+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 1
+y 12
+end
+arch grass_only
+x 1
+y 13
+end
+arch grass_only
+x 1
+y 14
+end
+arch grass_only
+x 1
+y 15
+end
+arch grass_only
+x 1
+y 16
+end
+arch grass_only
+x 1
+y 17
+end
+arch grass_only
+x 1
+y 18
+end
+arch grass_only
+x 1
+y 19
+end
+arch grass_only
+x 2
+end
+arch grass_only
+x 2
+y 1
 end
 arch flagstone
+x 2
+y 2
 end
 arch westcwall_2_2_2
-end
-arch flagstone
-y 1
-end
-arch westcwall_2_1_1
-y 1
-end
-arch flagstone
-y 2
-end
-arch westcwall_2_1_1
+x 2
 y 2
 end
 arch flagstone
+x 2
 y 3
 end
 arch westcwall_2_1_1
+x 2
 y 3
 end
 arch flagstone
+x 2
 y 4
 end
 arch westcwall_2_1_1
+x 2
 y 4
 end
-arch flagstone
-y 5
-end
-arch westcwall_2_1_1
+arch light2
+x 2
 y 5
 end
 arch flagstone
+x 2
+y 5
+end
+arch westcwall_win1
+x 2
+y 5
+end
+arch flagstone
+x 2
 y 6
 end
-arch westcwall_3_2
+arch westcwall_2_1_1
+x 2
 y 6
 end
 arch flagstone
+x 2
 y 7
 end
 arch westcwall_2_1_1
+x 2
 y 7
 end
 arch flagstone
+x 2
 y 8
 end
-arch westcwall_2_1_1
-y 8
-end
-arch flagstone
-y 9
-end
-arch westcwall_2_1_1
-y 9
-end
-arch flagstone
-y 10
-end
-arch westcwall_2_1_1
-y 10
-end
-arch flagstone
-y 11
-end
 arch westcwall_3_2
+x 2
+y 8
+end
+arch flagstone
+x 2
+y 9
+end
+arch westcwall_2_1_1
+x 2
+y 9
+end
+arch light2
+x 2
+y 10
+end
+arch flagstone
+x 2
+y 10
+end
+arch westcwall_win1
+x 2
+y 10
+end
+arch flagstone
+x 2
+y 11
+end
+arch westcwall_2_1_1
+x 2
 y 11
 end
 arch flagstone
+x 2
 y 12
 end
 arch westcwall_2_1_1
+x 2
 y 12
 end
 arch flagstone
+x 2
 y 13
 end
-arch westcwall_2_1_1
+arch westcwall_3_2
+x 2
 y 13
 end
-arch flagstone
-y 14
-end
-arch westcwall_2_1_1
+arch light2
+x 2
 y 14
 end
 arch flagstone
+x 2
+y 14
+end
+arch westcwall_win1
+x 2
+y 14
+end
+arch flagstone
+x 2
 y 15
 end
+arch westcwall_2_1_1
+x 2
+y 15
+end
+arch flagstone
+x 2
+y 16
+end
+arch westcwall_2_1_1
+x 2
+y 16
+end
+arch flagstone
+x 2
+y 17
+end
 arch westcwall_2_2_1
-y 15
+x 2
+y 17
 end
-arch flagstone
-x 1
+arch grass_only
+x 2
+y 18
 end
-arch westcwall_2_1_2
-x 1
+arch grass_only
+x 2
+y 19
 end
-arch shop_empty
-x 1
+arch grass_only
+x 3
+end
+arch grass_only
+x 3
 y 1
 end
-arch shop_empty
-x 1
+arch flagstone
+x 3
+y 2
+end
+arch westcwall_2_1_2
+x 3
 y 2
 end
 arch shop_empty
-x 1
+x 3
 y 3
 end
 arch shop_empty
-x 1
+x 3
 y 4
 end
 arch shop_empty
-x 1
+x 3
 y 5
 end
-arch flagstone
-x 1
+arch shop_empty
+x 3
 y 6
 end
-arch westcwall_2_1_2
-x 1
-y 6
-end
-arch flagstone
-x 1
+arch shop_empty
+x 3
 y 7
 end
 arch flagstone
-x 1
+x 3
+y 8
+end
+arch westcwall_2_1_2
+x 3
 y 8
 end
 arch flagstone
-x 1
+x 3
 y 9
 end
 arch flagstone
-x 1
+x 3
 y 10
 end
 arch flagstone
-x 1
-y 11
-end
-arch westcwall_1_3
-x 1
+x 3
 y 11
 end
 arch flagstone
-x 1
+x 3
 y 12
 end
 arch flagstone
-x 1
+x 3
+y 13
+end
+arch westcwall_1_3
+x 3
 y 13
 end
 arch flagstone
-x 1
+x 3
 y 14
 end
 arch flagstone
-x 1
-y 15
-end
-arch westcwall_2_1_2
-x 1
+x 3
 y 15
 end
 arch flagstone
-x 2
+x 3
+y 16
+end
+arch flagstone
+x 3
+y 17
 end
 arch westcwall_2_1_2
-x 2
+x 3
+y 17
 end
-arch shop_empty
-x 2
+arch grass_only
+x 3
+y 18
+end
+arch grass_only
+x 3
+y 19
+end
+arch grass_only
+x 4
+end
+arch grass_only
+x 4
 y 1
 end
-arch residue
-name ancient fire elemental's residue
-x 2
-y 1
-value 400
-last_eat 2
-unpaid 1
-end
-arch shop_empty
-x 2
+arch light2
+x 4
 y 2
 end
-arch residue
-name ancient fire elemental's residue
-x 2
+arch flagstone
+x 4
+y 2
+end
+arch westcwall_win2
+x 4
 y 2
-value 400
-last_eat 2
-unpaid 1
 end
 arch shop_empty
-x 2
+x 4
 y 3
 end
 arch residue
 name ancient fire elemental's residue
-x 2
+x 4
 y 3
 value 400
 last_eat 2
 unpaid 1
 end
+arch light4
+x 4
+y 4
+end
 arch shop_empty
-x 2
+x 4
 y 4
 end
 arch residue
 name ancient fire elemental's residue
-x 2
+x 4
 y 4
 value 400
 last_eat 2
 unpaid 1
 end
 arch shop_empty
-x 2
+x 4
 y 5
 end
-arch flagstone
-x 2
+arch residue
+name ancient fire elemental's residue
+x 4
+y 5
+value 400
+last_eat 2
+unpaid 1
+end
+arch shop_empty
+x 4
 y 6
 end
-arch swall_1_4
-x 2
+arch residue
+name ancient fire elemental's residue
+x 4
 y 6
+value 400
+last_eat 2
+unpaid 1
 end
-arch westcwall_1_3
-x 2
-y 6
+arch light4
+x 4
+y 7
 end
-arch flagstone
-x 2
+arch shop_empty
+x 4
 y 7
 end
 arch flagstone
-x 2
+x 4
+y 8
+end
+arch swall_1_4
+x 4
+y 8
+end
+arch westcwall_1_3
+x 4
 y 8
 end
 arch flagstone
-x 2
+x 4
 y 9
 end
-arch flagstone
-x 2
+arch light4
+x 4
 y 10
 end
 arch flagstone
-x 2
+x 4
+y 10
+end
+arch flagstone
+x 4
 y 11
 end
+arch flagstone
+x 4
+y 12
+end
+arch flagstone
+x 4
+y 13
+end
 arch door_look_1
 hp 0
 exp 0
-x 2
-y 11
+x 4
+y 13
 level 0
 type 0
 randomitems none
@@ -291,366 +533,434 @@ move_block 0
 alive 0
 end
 arch flagstone
-x 2
-y 12
-end
-arch flagstone
-x 2
-y 13
-end
-arch flagstone
-x 2
+x 4
 y 14
 end
+arch light4
+x 4
+y 15
+end
+arch flagstone
+x 4
+y 15
+end
+arch flagstone
+x 4
+y 16
+end
 arch table
-x 2
-y 14
+x 4
+y 16
+end
+arch light2
+x 4
+y 17
 end
 arch flagstone
-x 2
-y 15
+x 4
+y 17
 end
-arch westcwall_2_1_2
-x 2
-y 15
+arch westcwall_win2
+x 4
+y 17
+end
+arch grass_only
+x 4
+y 18
+end
+arch grass_only
+x 4
+y 19
+end
+arch grass_only
+x 5
+end
+arch grass_only
+x 5
+y 1
 end
 arch flagstone
-x 3
+x 5
+y 2
 end
 arch westcwall_2_1_2
-x 3
-end
-arch shop_empty
-x 3
-y 1
-end
-arch residue
-name ancient cold elemental's residue
-x 3
-y 1
-value 400
-last_eat 4
-unpaid 1
-end
-arch shop_empty
-x 3
+x 5
 y 2
 end
-arch residue
-name ancient cold elemental's residue
-x 3
-y 2
-value 400
-last_eat 4
-unpaid 1
-end
 arch shop_empty
-x 3
+x 5
 y 3
 end
 arch residue
 name ancient cold elemental's residue
-x 3
+x 5
 y 3
 value 400
 last_eat 4
 unpaid 1
 end
 arch shop_empty
-x 3
+x 5
 y 4
 end
 arch residue
 name ancient cold elemental's residue
-x 3
+x 5
 y 4
 value 400
 last_eat 4
 unpaid 1
 end
 arch shop_empty
-x 3
+x 5
 y 5
 end
-arch flagstone
-x 3
+arch residue
+name ancient cold elemental's residue
+x 5
+y 5
+value 400
+last_eat 4
+unpaid 1
+end
+arch shop_empty
+x 5
 y 6
 end
+arch residue
+name ancient cold elemental's residue
+x 5
+y 6
+value 400
+last_eat 4
+unpaid 1
+end
+arch shop_empty
+x 5
+y 7
+end
+arch flagstone
+x 5
+y 8
+end
 arch swall_2_1_2
-x 3
-y 6
-end
-arch flagstone
-x 3
-y 7
-end
-arch shop_mat
-x 3
-y 7
-end
-arch flagstone
-x 3
+x 5
 y 8
 end
 arch flagstone
-x 3
+x 5
+y 9
+end
+arch shop_mat
+x 5
 y 9
 end
 arch flagstone
-x 3
+x 5
 y 10
 end
 arch flagstone
-x 3
-y 11
-end
-arch westcwall_1_4
-x 3
+x 5
 y 11
 end
 arch flagstone
-x 3
+x 5
 y 12
 end
 arch flagstone
-x 3
+x 5
+y 13
+end
+arch westcwall_1_4
+x 5
 y 13
 end
 arch flagstone
-x 3
+x 5
 y 14
 end
 arch flagstone
-x 3
-y 15
-end
-arch westcwall_2_1_2
-x 3
+x 5
 y 15
 end
 arch flagstone
-x 4
+x 5
+y 16
+end
+arch flagstone
+x 5
+y 17
 end
 arch westcwall_2_1_2
-x 4
+x 5
+y 17
 end
-arch shop_empty
-x 4
+arch grass_only
+x 5
+y 18
+end
+arch grass_only
+x 5
+y 19
+end
+arch grass_only
+x 6
+end
+arch grass_only
+x 6
 y 1
 end
-arch residue
-name ancient electric elemental's residue
-x 4
-y 1
-value 400
-last_eat 3
-unpaid 1
-end
-arch shop_empty
-x 4
+arch flagstone
+x 6
 y 2
 end
-arch residue
-name ancient electric elemental's residue
-x 4
+arch westcwall_2_1_2
+x 6
 y 2
-value 400
-last_eat 3
-unpaid 1
 end
 arch shop_empty
-x 4
+x 6
 y 3
 end
 arch residue
 name ancient electric elemental's residue
-x 4
+x 6
 y 3
 value 400
 last_eat 3
 unpaid 1
 end
 arch shop_empty
-x 4
+x 6
 y 4
 end
 arch residue
 name ancient electric elemental's residue
-x 4
+x 6
 y 4
 value 400
 last_eat 3
 unpaid 1
 end
 arch shop_empty
-x 4
+x 6
 y 5
 end
+arch residue
+name ancient electric elemental's residue
+x 6
+y 5
+value 400
+last_eat 3
+unpaid 1
+end
+arch shop_empty
+x 6
+y 6
+end
+arch residue
+name ancient electric elemental's residue
+x 6
+y 6
+value 400
+last_eat 3
+unpaid 1
+end
+arch shop_empty
+x 6
+y 7
+end
 arch shop_mat
-x 4
-y 5
-end
-arch flagstone
-x 4
-y 6
-end
-arch swall_2_1_2
-x 4
-y 6
-end
-arch flagstone
-x 4
+x 6
 y 7
 end
 arch flagstone
-x 4
+x 6
+y 8
+end
+arch swall_2_1_2
+x 6
 y 8
 end
 arch flagstone
-x 4
+x 6
 y 9
 end
 arch flagstone
-x 4
+x 6
 y 10
 end
 arch flagstone
-x 4
+x 6
 y 11
 end
+arch flagstone
+x 6
+y 12
+end
+arch flagstone
+x 6
+y 13
+end
 arch westcwall_3_3
-x 4
-y 11
-end
-arch flagstone
-x 4
-y 12
-end
-arch westcwall_2_1_1
-x 4
-y 12
-end
-arch flagstone
-x 4
-y 13
-end
-arch westcwall_2_1_1
-x 4
+x 6
 y 13
 end
 arch flagstone
-x 4
+x 6
 y 14
 end
 arch westcwall_2_1_1
-x 4
+x 6
 y 14
 end
 arch flagstone
-x 4
+x 6
 y 15
 end
+arch westcwall_2_1_1
+x 6
+y 15
+end
+arch flagstone
+x 6
+y 16
+end
+arch westcwall_2_1_1
+x 6
+y 16
+end
+arch flagstone
+x 6
+y 17
+end
 arch westcwall_3_1
-x 4
-y 15
+x 6
+y 17
+end
+arch grass_only
+x 6
+y 18
+end
+arch grass_only
+x 6
+y 19
+end
+arch grass_only
+x 7
+end
+arch grass_only
+x 7
+y 1
 end
 arch flagstone
-x 5
+x 7
+y 2
 end
 arch cwall_2_1_2
-x 5
+x 7
+y 2
 end
 arch westcwall_2_1_2
-x 5
-end
-arch shop_empty
-x 5
-y 1
-end
-arch residue
-name ancient poison elemental's residue
-x 5
-y 1
-last_eat 10
-unpaid 1
-end
-arch shop_empty
-x 5
+x 7
 y 2
 end
-arch residue
-name ancient poison elemental's residue
-x 5
-y 2
-last_eat 10
-unpaid 1
-end
 arch shop_empty
-x 5
+x 7
 y 3
 end
 arch residue
 name ancient poison elemental's residue
-x 5
+x 7
 y 3
 last_eat 10
 unpaid 1
 end
+arch light4
+x 7
+y 4
+end
 arch shop_empty
-x 5
+x 7
 y 4
 end
 arch residue
 name ancient poison elemental's residue
-x 5
+x 7
 y 4
 last_eat 10
 unpaid 1
 end
 arch shop_empty
-x 5
+x 7
 y 5
 end
-arch flagstone
-x 5
+arch residue
+name ancient poison elemental's residue
+x 7
+y 5
+last_eat 10
+unpaid 1
+end
+arch shop_empty
+x 7
 y 6
 end
-arch swall_1_3_half
-x 5
+arch residue
+name ancient poison elemental's residue
+x 7
 y 6
+last_eat 10
+unpaid 1
 end
-arch westcwall_1_4
-x 5
-y 6
+arch light4
+x 7
+y 7
 end
-arch flagstone
-x 5
+arch shop_empty
+x 7
 y 7
 end
 arch flagstone
-x 5
+x 7
+y 8
+end
+arch swall_1_3_half
+x 7
+y 8
+end
+arch westcwall_1_4
+x 7
 y 8
 end
 arch flagstone
-x 5
+x 7
 y 9
 end
 arch flagstone
-x 5
+x 7
 y 10
 end
 arch flagstone
-x 5
-y 11
-end
-arch westcwall_2_1_2
-x 5
+x 7
 y 11
 end
 arch flagstone
-x 5
+x 7
 y 12
 end
+arch flagstone
+x 7
+y 13
+end
+arch westcwall_2_1_2
+x 7
+y 13
+end
+arch flagstone
+x 7
+y 14
+end
 arch green_dragon1
 msg
 @match hi|enter|open|gate
@@ -658,8 +968,8 @@ Only dragons may enter here.
 @match *
 Welcome to the dragon guild.
 endmsg
-x 5
-y 12
+x 7
+y 14
 resist_physical 100
 resist_magic 100
 resist_fire 100
@@ -683,256 +993,358 @@ resist_holyword 100
 resist_blind 100
 end
 arch flagstone
-x 5
-y 13
-end
-arch flagstone
-x 5
-y 14
-end
-arch flagstone
-x 5
-y 15
-end
-arch westcwall_2_1_2
-x 5
+x 7
 y 15
 end
 arch flagstone
-x 6
+x 7
+y 16
+end
+arch light2
+x 7
+y 17
+end
+arch flagstone
+x 7
+y 17
 end
 arch westcwall_2_1_2
-x 6
+x 7
+y 17
 end
-arch shop_empty
-x 6
+arch westcwall_win2
+x 7
+y 17
+end
+arch grass_only
+x 7
+y 18
+end
+arch grass_only
+x 7
+y 19
+end
+arch grass_only
+x 8
+end
+arch grass_only
+x 8
 y 1
 end
-arch shop_empty
-x 6
+arch flagstone
+x 8
+y 2
+end
+arch westcwall_2_1_2
+x 8
 y 2
 end
 arch shop_empty
-x 6
+x 8
 y 3
 end
 arch shop_empty
-x 6
+x 8
 y 4
 end
 arch shop_empty
-x 6
+x 8
 y 5
 end
-arch flagstone
-x 6
+arch shop_empty
+x 8
 y 6
 end
+arch shop_empty
+x 8
+y 7
+end
+arch flagstone
+x 8
+y 8
+end
 arch westcwall_2_1_2
-x 6
-y 6
+x 8
+y 8
 end
 arch flagstone
-x 6
-y 7
+x 8
+y 9
 end
 arch sign_w
 name shop
-x 6
-y 7
-end
-arch flagstone
-x 6
-y 8
-end
-arch flagstone
-x 6
+x 8
 y 9
 end
-arch pedestal
-x 6
-y 10
-connected 1
-end
-arch flagstone
-x 6
+arch light4
+x 8
 y 10
 end
 arch flagstone
-x 6
-y 11
+x 8
+y 10
 end
-arch westcwall_1_3
-x 6
+arch flagstone
+x 8
 y 11
 end
 arch pedestal
-slaying dragon
-x 6
+x 8
 y 12
 connected 1
 end
 arch flagstone
-x 6
+x 8
 y 12
 end
 arch flagstone
-x 6
+x 8
 y 13
 end
-arch flagstone
-x 6
-y 14
-end
-arch flagstone
-x 6
-y 15
-end
 arch westcwall_1_3
-x 6
-y 15
-end
-arch flagstone
-x 7
-end
-arch westcwall_3_3
-x 7
-end
-arch flagstone
-x 7
-y 1
-end
-arch westcwall_2_1_1
-x 7
-y 1
-end
-arch flagstone
-x 7
-y 2
-end
-arch westcwall_2_1_1
-x 7
-y 2
-end
-arch flagstone
-x 7
-y 3
-end
-arch westcwall_2_1_1
-x 7
-y 3
-end
-arch flagstone
-x 7
-y 4
-end
-arch westcwall_2_1_1
-x 7
-y 4
-end
-arch flagstone
-x 7
-y 5
-end
-arch westcwall_2_1_1
-x 7
-y 5
-end
-arch flagstone
-x 7
-y 6
-end
-arch westcwall_3_1
-x 7
-y 6
-end
-arch flagstone
-x 7
-y 7
-end
-arch flagstone
-x 7
-y 8
-end
-arch flagstone
-x 7
-y 9
-end
-arch pedestal
-x 7
-y 10
-connected 1
-end
-arch flagstone
-x 7
-y 10
-end
-arch pedestal
-slaying dragon
-x 7
-y 11
-connected 1
-end
-arch flagstone
-x 7
-y 11
-end
-arch igate_closed_1
-x 7
-y 11
-connected 1
-end
-arch pedestal
-slaying dragon
-x 7
-y 12
-connected 1
-end
-arch flagstone
-x 7
-y 12
-end
-arch flagstone
-x 7
+x 8
 y 13
 end
+arch pedestal
+slaying dragon
+x 8
+y 14
+connected 1
+end
 arch flagstone
-x 7
+x 8
 y 14
 end
-arch flagstone
-x 7
+arch light4
+x 8
 y 15
 end
-arch oakdoor_2
+arch flagstone
+x 8
+y 15
+end
+arch button_small
+x 8
+y 16
+connected 2
+end
+arch flagstone
+x 8
+y 16
+end
+arch flagstone
+x 8
+y 17
+end
+arch westcwall_1_3
+x 8
+y 17
+end
+arch dungeon_magic
+x 8
+y 18
+end
+arch invis_exit
 slaying /world/world_122_117
 hp 3
 sp 15
-x 7
-y 15
-end
-arch flagstone
 x 8
+y 18
 end
-arch westcwall_2_1_2
+arch grass_only
 x 8
+y 18
 end
-arch flagstone
+arch grass_only
 x 8
-y 1
+y 19
 end
-arch bookshelf
-x 8
+arch grass_only
+x 9
+end
+arch grass_only
+x 9
 y 1
 end
 arch flagstone
-x 8
+x 9
+y 2
+end
+arch westcwall_3_3
+x 9
 y 2
 end
 arch flagstone
-x 8
+x 9
 y 3
 end
+arch westcwall_2_1_1
+x 9
+y 3
+end
+arch flagstone
+x 9
+y 4
+end
+arch westcwall_2_1_1
+x 9
+y 4
+end
+arch flagstone
+x 9
+y 5
+end
+arch westcwall_2_1_1
+x 9
+y 5
+end
+arch flagstone
+x 9
+y 6
+end
+arch westcwall_2_1_1
+x 9
+y 6
+end
+arch flagstone
+x 9
+y 7
+end
+arch westcwall_2_1_1
+x 9
+y 7
+end
+arch flagstone
+x 9
+y 8
+end
+arch westcwall_3_1
+x 9
+y 8
+end
+arch flagstone
+x 9
+y 9
+end
+arch flagstone
+x 9
+y 10
+end
+arch flagstone
+x 9
+y 11
+end
+arch pedestal
+x 9
+y 12
+connected 1
+end
+arch flagstone
+x 9
+y 12
+end
+arch pedestal
+slaying dragon
+x 9
+y 13
+connected 1
+end
+arch flagstone
+x 9
+y 13
+end
+arch igate_closed_1
+x 9
+y 13
+connected 1
+end
+arch pedestal
+slaying dragon
+x 9
+y 14
+connected 1
+end
+arch flagstone
+x 9
+y 14
+end
+arch flagstone
+x 9
+y 15
+end
+arch button_small
+x 9
+y 16
+connected 2
+end
+arch flagstone
+x 9
+y 16
+end
+arch button_small
+x 9
+y 17
+connected 2
+end
+arch flagstone
+x 9
+y 17
+end
+arch odoorn2_closed_1
+x 9
+y 17
+connected 2
+end
+arch dungeon_magic
+x 9
+y 18
+end
+arch invis_exit
+slaying /world/world_122_117
+hp 3
+sp 15
+x 9
+y 18
+end
+arch grass_only
+x 9
+y 18
+end
+arch grass_only
+x 9
+y 19
+end
+arch grass_only
+x 10
+end
+arch grass_only
+x 10
+y 1
+end
+arch flagstone
+x 10
+y 2
+end
+arch westcwall_2_1_2
+x 10
+y 2
+end
+arch flagstone
+x 10
+y 3
+end
+arch bookshelf
+x 10
+y 3
+end
+arch flagstone
+x 10
+y 4
+end
+arch flagstone
+x 10
+y 5
+end
 arch tome
 name flesh guide for hatchlings
 msg
@@ -943,13 +1355,13 @@ para elemental residues
 ghost's ectoplasm
 scorpion's stinger
 endmsg
-x 8
-y 3
+x 10
+y 5
 no_pick 1
 end
 arch flagstone
-x 8
-y 4
+x 10
+y 6
 end
 arch tome
 name flesh guide for wyrms
@@ -960,13 +1372,13 @@ demon's head
 elemental residues
 wyvern's steak
 endmsg
-x 8
-y 4
+x 10
+y 6
 no_pick 1
 end
 arch flagstone
-x 8
-y 5
+x 10
+y 7
 end
 arch tome
 name flesh guide for wyrms
@@ -975,140 +1387,189 @@ Delicious meals for wyverns:
 skull's tongue (mjam!)
 wyvern/dragon steaks
 endmsg
-x 8
-y 5
+x 10
+y 7
 no_pick 1
 end
 arch flagstone
-x 8
-y 6
+x 10
+y 8
 end
 arch westcwall_2_1_2
-x 8
-y 6
+x 10
+y 8
 end
 arch flagstone
-x 8
-y 7
+x 10
+y 9
 end
 arch sign_e
 name library
-x 8
-y 7
-end
-arch flagstone
-x 8
-y 8
-end
-arch flagstone
-x 8
+x 10
 y 9
 end
-arch pedestal
-x 8
+arch light4
+x 10
 y 10
+end
+arch flagstone
+x 10
+y 10
+end
+arch flagstone
+x 10
+y 11
+end
+arch pedestal
+x 10
+y 12
 connected 1
 end
 arch flagstone
-x 8
-y 10
+x 10
+y 12
 end
 arch flagstone
-x 8
-y 11
+x 10
+y 13
 end
 arch westcwall_1_4
-x 8
-y 11
+x 10
+y 13
 end
 arch pedestal
 slaying dragon
-x 8
-y 12
+x 10
+y 14
 connected 1
 end
 arch flagstone
-x 8
-y 12
-end
-arch flagstone
-x 8
-y 13
-end
-arch flagstone
-x 8
+x 10
 y 14
 end
-arch flagstone
-x 8
+arch light4
+x 10
 y 15
 end
+arch flagstone
+x 10
+y 15
+end
+arch button_small
+x 10
+y 16
+connected 2
+end
+arch flagstone
+x 10
+y 16
+end
+arch flagstone
+x 10
+y 17
+end
 arch westcwall_1_4
-x 8
-y 15
+x 10
+y 17
 end
-arch flagstone
-x 9
+arch dungeon_magic
+x 10
+y 18
 end
-arch westcwall_2_1_2
-x 9
+arch invis_exit
+slaying /world/world_122_117
+hp 3
+sp 15
+x 10
+y 18
 end
-arch flagstone
-x 9
+arch grass_only
+x 10
+y 18
+end
+arch grass_only
+x 10
+y 19
+end
+arch grass_only
+x 11
+end
+arch grass_only
+x 11
 y 1
 end
 arch flagstone
-x 9
+x 11
+y 2
+end
+arch westcwall_2_1_2
+x 11
 y 2
 end
 arch flagstone
-x 9
+x 11
 y 3
 end
-arch flagstone
-x 9
+arch light4
+x 11
 y 4
 end
 arch flagstone
-x 9
+x 11
+y 4
+end
+arch flagstone
+x 11
 y 5
 end
-arch flagstone
-x 9
-y 6
-end
-arch westcwall_1_3
-x 9
+arch light4
+x 11
 y 6
 end
 arch flagstone
-x 9
+x 11
+y 6
+end
+arch flagstone
+x 11
 y 7
 end
 arch flagstone
-x 9
+x 11
+y 8
+end
+arch westcwall_1_3
+x 11
 y 8
 end
 arch flagstone
-x 9
+x 11
 y 9
 end
 arch flagstone
-x 9
+x 11
 y 10
 end
 arch flagstone
-x 9
-y 11
-end
-arch westcwall_2_1_2
-x 9
+x 11
 y 11
 end
 arch flagstone
-x 9
+x 11
 y 12
 end
+arch flagstone
+x 11
+y 13
+end
+arch westcwall_2_1_2
+x 11
+y 13
+end
+arch flagstone
+x 11
+y 14
+end
 arch sign
 msg
 Welcome to the dragon guild!
@@ -1116,60 +1577,81 @@ All dragons are permitted to enter.
 Other creatures may enter only in
 company of a dragon.
 endmsg
-x 9
-y 12
-end
-arch flagstone
-x 9
-y 13
-end
-arch flagstone
-x 9
+x 11
 y 14
 end
 arch flagstone
-x 9
-y 15
-end
-arch westcwall_2_1_2
-x 9
+x 11
 y 15
 end
 arch flagstone
-x 10
+x 11
+y 16
 end
-arch westcwall_2_1_2
-x 10
+arch light2
+x 11
+y 17
 end
 arch flagstone
-x 10
+x 11
+y 17
+end
+arch westcwall_win2
+x 11
+y 17
+end
+arch grass_only
+x 11
+y 18
+end
+arch grass_only
+x 11
+y 19
+end
+arch grass_only
+x 12
+end
+arch grass_only
+x 12
 y 1
 end
 arch flagstone
-x 10
+x 12
+y 2
+end
+arch westcwall_2_1_2
+x 12
 y 2
 end
 arch flagstone
-x 10
+x 12
 y 3
 end
 arch flagstone
-x 10
+x 12
 y 4
 end
 arch flagstone
-x 10
+x 12
 y 5
 end
 arch flagstone
-x 10
+x 12
 y 6
 end
+arch flagstone
+x 12
+y 7
+end
+arch flagstone
+x 12
+y 8
+end
 arch door_look_1
 hp 0
 exp 0
-x 10
-y 6
+x 12
+y 8
 level 0
 type 0
 randomitems none
@@ -1177,96 +1659,113 @@ move_block 0
 alive 0
 end
 arch flagstone
-x 10
-y 7
-end
-arch flagstone
-x 10
-y 8
-end
-arch flagstone
-x 10
+x 12
 y 9
 end
 arch flagstone
-x 10
+x 12
 y 10
 end
 arch flagstone
-x 10
+x 12
 y 11
 end
+arch flagstone
+x 12
+y 12
+end
+arch flagstone
+x 12
+y 13
+end
 arch westcwall_3_3
-x 10
-y 11
-end
-arch flagstone
-x 10
-y 12
-end
-arch westcwall_2_1_1
-x 10
-y 12
-end
-arch flagstone
-x 10
-y 13
-end
-arch westcwall_2_1_1
-x 10
+x 12
 y 13
 end
 arch flagstone
-x 10
+x 12
 y 14
 end
 arch westcwall_2_1_1
-x 10
+x 12
 y 14
 end
 arch flagstone
-x 10
+x 12
 y 15
 end
+arch westcwall_2_1_1
+x 12
+y 15
+end
+arch flagstone
+x 12
+y 16
+end
+arch westcwall_2_1_1
+x 12
+y 16
+end
+arch flagstone
+x 12
+y 17
+end
 arch westcwall_3_1
-x 10
-y 15
+x 12
+y 17
 end
-arch flagstone
-x 11
+arch grass_only
+x 12
+y 18
 end
-arch westcwall_2_1_2
-x 11
+arch grass_only
+x 12
+y 19
 end
-arch flagstone
-x 11
+arch grass_only
+x 13
+end
+arch grass_only
+x 13
 y 1
 end
 arch flagstone
-x 11
+x 13
+y 2
+end
+arch westcwall_2_1_2
+x 13
 y 2
 end
 arch flagstone
-x 11
+x 13
 y 3
 end
 arch flagstone
-x 11
+x 13
 y 4
 end
 arch flagstone
-x 11
+x 13
 y 5
 end
 arch flagstone
-x 11
+x 13
 y 6
 end
+arch flagstone
+x 13
+y 7
+end
+arch flagstone
+x 13
+y 8
+end
 arch door_look_1
 hp 0
 exp 0
-x 11
-y 6
+x 13
+y 8
 level 0
 type 0
 randomitems none
@@ -1274,120 +1773,153 @@ move_block 0
 alive 0
 end
 arch flagstone
-x 11
-y 7
-end
-arch flagstone
-x 11
-y 8
-end
-arch flagstone
-x 11
+x 13
 y 9
 end
 arch flagstone
-x 11
+x 13
 y 10
 end
 arch flagstone
-x 11
+x 13
 y 11
 end
+arch flagstone
+x 13
+y 12
+end
+arch flagstone
+x 13
+y 13
+end
 arch westcwall_1_3
-x 11
-y 11
-end
-arch flagstone
-x 11
-y 12
-end
-arch barrel
-x 11
-y 12
-end
-arch flagstone
-x 11
-y 13
-end
-arch barrel
-x 11
+x 13
 y 13
 end
 arch flagstone
-x 11
+x 13
 y 14
 end
 arch barrel
-x 11
+x 13
 y 14
 end
 arch flagstone
-x 11
+x 13
 y 15
 end
-arch westcwall_2_1_2
-x 11
+arch barrel
+x 13
 y 15
 end
 arch flagstone
-x 12
+x 13
+y 16
 end
-arch westcwall_2_1_2
-x 12
+arch barrel
+x 13
+y 16
 end
 arch flagstone
-x 12
+x 13
+y 17
+end
+arch westcwall_2_1_2
+x 13
+y 17
+end
+arch grass_only
+x 13
+y 18
+end
+arch grass_only
+x 13
+y 19
+end
+arch grass_only
+x 14
+end
+arch grass_only
+x 14
 y 1
 end
-arch flagstone
-x 12
+arch light2
+x 14
 y 2
 end
 arch flagstone
-x 12
-y 3
+x 14
+y 2
+end
+arch westcwall_win2
+x 14
+y 2
 end
 arch flagstone
-x 12
+x 14
+y 3
+end
+arch light4
+x 14
 y 4
 end
 arch flagstone
-x 12
+x 14
+y 4
+end
+arch flagstone
+x 14
 y 5
 end
-arch flagstone
-x 12
-y 6
-end
-arch westcwall_1_4
-x 12
+arch light4
+x 14
 y 6
 end
 arch flagstone
-x 12
+x 14
+y 6
+end
+arch flagstone
+x 14
 y 7
 end
 arch flagstone
-x 12
+x 14
+y 8
+end
+arch westcwall_1_4
+x 14
 y 8
 end
 arch flagstone
-x 12
+x 14
 y 9
 end
-arch flagstone
-x 12
+arch light4
+x 14
 y 10
 end
 arch flagstone
-x 12
+x 14
+y 10
+end
+arch flagstone
+x 14
 y 11
 end
+arch flagstone
+x 14
+y 12
+end
+arch flagstone
+x 14
+y 13
+end
 arch door_look_1
 hp 0
 exp 0
-x 12
-y 11
+x 14
+y 13
 level 0
 type 0
 randomitems none
@@ -1395,293 +1927,450 @@ move_block 0
 alive 0
 end
 arch flagstone
-x 12
-y 12
-end
-arch flagstone
-x 12
-y 13
-end
-arch flagstone
-x 12
+x 14
 y 14
 end
-arch flagstone
-x 12
-y 15
-end
-arch westcwall_2_1_2
-x 12
+arch light4
+x 14
 y 15
 end
 arch flagstone
-x 13
-end
-arch westcwall_2_1_2
-x 13
+x 14
+y 15
 end
 arch flagstone
-x 13
+x 14
+y 16
+end
+arch light2
+x 14
+y 17
+end
+arch flagstone
+x 14
+y 17
+end
+arch westcwall_win2
+x 14
+y 17
+end
+arch grass_only
+x 14
+y 18
+end
+arch grass_only
+x 14
+y 19
+end
+arch grass_only
+x 15
+end
+arch grass_only
+x 15
 y 1
 end
+arch flagstone
+x 15
+y 2
+end
+arch westcwall_2_1_2
+x 15
+y 2
+end
+arch flagstone
+x 15
+y 3
+end
 arch bookshelf
-x 13
-y 1
-end
-arch flagstone
-x 13
-y 2
-end
-arch flagstone
-x 13
+x 15
 y 3
 end
 arch flagstone
-x 13
+x 15
 y 4
 end
 arch flagstone
-x 13
+x 15
 y 5
 end
 arch flagstone
-x 13
-y 6
-end
-arch westcwall_2_1_2
-x 13
+x 15
 y 6
 end
 arch flagstone
-x 13
+x 15
 y 7
 end
 arch flagstone
-x 13
+x 15
+y 8
+end
+arch westcwall_2_1_2
+x 15
 y 8
 end
 arch flagstone
-x 13
+x 15
 y 9
 end
 arch flagstone
-x 13
+x 15
 y 10
 end
 arch flagstone
-x 13
+x 15
 y 11
 end
+arch flagstone
+x 15
+y 12
+end
+arch flagstone
+x 15
+y 13
+end
 arch westcwall_1_4
-x 13
-y 11
-end
-arch flagstone
-x 13
-y 12
-end
-arch flagstone
-x 13
+x 15
 y 13
 end
 arch flagstone
-x 13
+x 15
 y 14
 end
 arch flagstone
-x 13
+x 15
 y 15
 end
+arch flagstone
+x 15
+y 16
+end
+arch flagstone
+x 15
+y 17
+end
 arch westcwall_2_1_2
-x 13
-y 15
+x 15
+y 17
+end
+arch grass_only
+x 15
+y 18
+end
+arch grass_only
+x 15
+y 19
+end
+arch grass_only
+x 16
+end
+arch grass_only
+x 16
+y 1
 end
 arch flagstone
-x 14
+x 16
+y 2
 end
 arch westcwall_2_2_3
-x 14
-end
-arch flagstone
-x 14
-y 1
-end
-arch westcwall_2_1_1
-x 14
-y 1
-end
-arch flagstone
-x 14
-y 2
-end
-arch westcwall_2_1_1
-x 14
+x 16
 y 2
 end
 arch flagstone
-x 14
+x 16
 y 3
 end
 arch westcwall_2_1_1
-x 14
+x 16
 y 3
 end
 arch flagstone
-x 14
+x 16
 y 4
 end
 arch westcwall_2_1_1
-x 14
+x 16
 y 4
 end
-arch flagstone
-x 14
-y 5
-end
-arch westcwall_2_1_1
-x 14
+arch light2
+x 16
 y 5
 end
 arch flagstone
-x 14
+x 16
+y 5
+end
+arch westcwall_win1
+x 16
+y 5
+end
+arch flagstone
+x 16
 y 6
 end
-arch westcwall_3_4
-x 14
+arch westcwall_2_1_1
+x 16
 y 6
 end
 arch flagstone
-x 14
+x 16
 y 7
 end
 arch westcwall_2_1_1
-x 14
+x 16
 y 7
 end
 arch flagstone
-x 14
+x 16
 y 8
 end
-arch westcwall_2_1_1
-x 14
-y 8
-end
-arch flagstone
-x 14
-y 9
-end
-arch westcwall_2_1_1
-x 14
-y 9
-end
-arch flagstone
-x 14
-y 10
-end
-arch westcwall_2_1_1
-x 14
-y 10
-end
-arch flagstone
-x 14
-y 11
-end
 arch westcwall_3_4
-x 14
+x 16
+y 8
+end
+arch flagstone
+x 16
+y 9
+end
+arch westcwall_2_1_1
+x 16
+y 9
+end
+arch light2
+x 16
+y 10
+end
+arch flagstone
+x 16
+y 10
+end
+arch westcwall_win1
+x 16
+y 10
+end
+arch flagstone
+x 16
+y 11
+end
+arch westcwall_2_1_1
+x 16
 y 11
 end
 arch flagstone
-x 14
+x 16
 y 12
 end
 arch westcwall_2_1_1
-x 14
+x 16
 y 12
 end
 arch flagstone
-x 14
+x 16
 y 13
 end
-arch westcwall_2_1_1
-x 14
+arch westcwall_3_4
+x 16
 y 13
 end
-arch flagstone
-x 14
-y 14
-end
-arch westcwall_2_1_1
-x 14
+arch light2
+x 16
 y 14
 end
 arch flagstone
-x 14
+x 16
+y 14
+end
+arch westcwall_win1
+x 16
+y 14
+end
+arch flagstone
+x 16
 y 15
 end
+arch westcwall_2_1_1
+x 16
+y 15
+end
+arch flagstone
+x 16
+y 16
+end
+arch westcwall_2_1_1
+x 16
+y 16
+end
+arch flagstone
+x 16
+y 17
+end
 arch westcwall_2_2_4
-x 14
-y 15
+x 16
+y 17
 end
-arch blocked
-x 15
+arch grass_only
+x 16
+y 18
 end
-arch blocked
-x 15
+arch grass_only
+x 16
+y 19
+end
+arch grass_only
+x 17
+end
+arch grass_only
+x 17
 y 1
 end
-arch blocked
-x 15
+arch grass_only
+x 17
 y 2
 end
-arch blocked
-x 15
+arch grass_only
+x 17
 y 3
 end
-arch blocked
-x 15
+arch grass_only
+x 17
 y 4
 end
-arch blocked
-x 15
+arch grass_only
+x 17
 y 5
 end
-arch blocked
-x 15
+arch grass_only
+x 17
 y 6
 end
-arch blocked
-x 15
+arch grass_only
+x 17
 y 7
 end
-arch blocked
-x 15
+arch grass_only
+x 17
 y 8
 end
-arch blocked
-x 15
+arch grass_only
+x 17
 y 9
 end
-arch blocked
-x 15
+arch grass_only
+x 17
 y 10
 end
-arch blocked
-x 15
+arch grass_only
+x 17
 y 11
 end
-arch blocked
-x 15
+arch grass_only
+x 17
 y 12
 end
-arch blocked
-x 15
+arch grass_only
+x 17
 y 13
 end
-arch blocked
-x 15
+arch grass_only
+x 17
 y 14
 end
-arch blocked
-x 15
+arch grass_only
+x 17
 y 15
 end
+arch grass_only
+x 17
+y 16
+end
+arch grass_only
+x 17
+y 17
+end
+arch grass_only
+x 17
+y 18
+end
+arch grass_only
+x 17
+y 19
+end
+arch cobblestones2
+x 18
+end
+arch cobblestones2
+x 18
+y 1
+end
+arch cobblestones2
+x 18
+y 2
+end
+arch cobblestones2
+x 18
+y 3
+end
+arch cobblestones2
+x 18
+y 4
+end
+arch cobblestones2
+x 18
+y 5
+end
+arch cobblestones2
+x 18
+y 6
+end
+arch cobblestones2
+x 18
+y 7
+end
+arch cobblestones2
+x 18
+y 8
+end
+arch cobblestones2
+x 18
+y 9
+end
+arch cobblestones2
+x 18
+y 10
+end
+arch cobblestones2
+x 18
+y 11
+end
+arch cobblestones2
+x 18
+y 12
+end
+arch cobblestones2
+x 18
+y 13
+end
+arch cobblestones2
+x 18
+y 14
+end
+arch cobblestones2
+x 18
+y 15
+end
+arch cobblestones2
+x 18
+y 16
+end
+arch cobblestones2
+x 18
+y 17
+end
+arch cobblestones2
+x 18
+y 18
+end
+arch grass_only
+x 18
+y 19
+end
diff --git a/world/world_122_117 b/world/world_122_117
index 89c5bf9e5..c5083e2b0 100644
--- a/world/world_122_117
+++ b/world/world_122_117
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2002-06-02
-Modified: 2011-09-20 Rick Tanner
+Modified: 2011-10-13 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_122_116
@@ -855,8 +855,8 @@ end
 arch guild_west
 name Navar Dragon Guild
 slaying /navar_city/misc/dragon_guild
-hp 7
-sp 14
+hp 9
+sp 15
 x 2
 y 14
 end