--- deliantra/maps/onefang/suites.map	2006/03/23 09:14:44	1.1
+++ deliantra/maps/onefang/suites.map	2006/03/24 08:22:13	1.2
@@ -1,16 +1,16 @@
 arch map
 name suites
+reset_timeout 7200
+difficulty 2
+width 32
+height 44
+enter_x 1
+enter_y 1
 msg
 Creator: David Seikel
 Email: won_fang@yahoo.com.au
 Date: Sat Jan 25 21:22:20 2003
 endmsg
-width 32
-height 44
-enter_x 1
-enter_y 1
-reset_timeout 7200
-difficulty 2
 unique 1
 outdoor 1
 end
@@ -173,8 +173,8 @@
 y 12
 end
 arch icecube
-glow_radius 4
 y 12
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -251,8 +251,8 @@
 y 19
 end
 arch icecube
-glow_radius 4
 y 19
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -398,8 +398,8 @@
 y 32
 end
 arch icecube
-glow_radius 4
 y 32
+glow_radius 4
 end
 arch woods
 y 33
@@ -414,20 +414,20 @@
 y 36
 end
 arch jungle_1
-blocksview 0
 y 37
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 y 38
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 y 39
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 y 40
+blocksview 0
 end
 arch woods
 y 41
@@ -436,8 +436,8 @@
 y 42
 end
 arch jungle_1
-blocksview 0
 y 43
+blocksview 0
 end
 arch fog
 y 43
@@ -483,14 +483,6 @@
 x 1
 y 2
 end
-arch button_trigger
-event_trigger_plugin Python
-event_trigger /onefang/python/PO/greeting.py
-invisible 1
-walk_off 0
-x 1
-y 2
-end
 arch dungeon_magic
 x 1
 y 3
@@ -540,6 +532,8 @@
 y 6
 end
 arch igate_closed_1
+x 1
+y 6
 speed 0.500000
 resist_physical 30
 resist_magic 30
@@ -549,8 +543,6 @@
 resist_acid 30
 resist_ghosthit 30
 connected 1
-x 1
-y 6
 end
 arch woodfloor2
 name woodfloor
@@ -560,10 +552,7 @@
 end
 arch mailbox
 name Private mailbox
-event_apply_plugin Python
-event_apply /onefang/python/PO/receive.py
-event_close_plugin Python
-event_close /onefang/python/PO/send.py
+name_pl Private mailbox
 msg
 Recieving Mail
 -----------------------
@@ -586,12 +575,15 @@
 NOTE - Multiple lines doesn't
 work yet.
 endmsg
-name_pl Private mailbox
+x 1
+y 7
 material 0
 weight 0
 no_pick 1
-x 1
-y 7
+event_apply /onefang/python/PO/receive.py
+event_apply_plugin Python
+event_close /onefang/python/PO/send.py
+event_close_plugin Python
 end
 arch woodfloor2
 name woodfloor
@@ -618,9 +610,9 @@
 y 11
 end
 arch brazier
-glow_radius 4
 x 1
 y 11
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -643,9 +635,9 @@
 y 13
 end
 arch brazier
-glow_radius 4
 x 1
 y 13
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -660,7 +652,6 @@
 y 15
 end
 arch fireplace
-glow_radius 2
 x 1
 y 15
 end
@@ -671,7 +662,6 @@
 y 16
 end
 arch fireplace
-glow_radius 2
 x 1
 y 16
 end
@@ -708,9 +698,9 @@
 y 20
 end
 arch bookshelf
-no_pick 1
 x 1
 y 20
+no_pick 1
 end
 arch woodfloor2
 name woodfloor
@@ -751,7 +741,6 @@
 y 25
 end
 arch fireplace
-glow_radius 2
 x 1
 y 25
 end
@@ -762,7 +751,6 @@
 y 26
 end
 arch fireplace
-glow_radius 2
 x 1
 y 26
 end
@@ -823,9 +811,9 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 1
 y 33
+blocksview 0
 end
 arch woods
 x 1
@@ -852,24 +840,24 @@
 y 39
 end
 arch jungle_1
-blocksview 0
 x 1
 y 40
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 1
 y 41
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 1
 y 42
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 1
 y 43
+blocksview 0
 end
 arch dungeon_magic
 x 2
@@ -895,14 +883,6 @@
 x 2
 y 1
 end
-arch button_trigger
-event_trigger_plugin Python
-event_trigger /onefang/python/PO/greeting.py
-invisible 1
-walk_off 0
-x 2
-y 1
-end
 arch dungeon_magic
 x 2
 y 2
@@ -913,14 +893,6 @@
 x 2
 y 2
 end
-arch button_trigger
-event_trigger_plugin Python
-event_trigger /onefang/python/PO/greeting.py
-invisible 1
-walk_off 0
-x 2
-y 2
-end
 arch dungeon_magic
 x 2
 y 3
@@ -962,6 +934,8 @@
 y 6
 end
 arch igate_closed_1
+x 2
+y 6
 speed 0.500000
 resist_physical 30
 resist_magic 30
@@ -971,8 +945,6 @@
 resist_acid 30
 resist_ghosthit 30
 connected 1
-x 2
-y 6
 end
 arch woodfloor2
 name woodfloor
@@ -1005,10 +977,10 @@
 y 11
 end
 arch altar_lythander
-glow_radius 2
-level 20
 x 2
 y 11
+level 20
+glow_radius 2
 end
 arch woodfloor2
 name woodfloor
@@ -1031,13 +1003,13 @@
 y 13
 end
 arch power_crystal
-glow_radius 4
-material 256
-no_pick 1
-identified 1
 maxsp 500
 x 2
 y 13
+material 256
+glow_radius 4
+no_pick 1
+identified 1
 end
 arch woodfloor2
 name woodfloor
@@ -1190,14 +1162,14 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 2
 y 33
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 2
 y 34
+blocksview 0
 end
 arch woods
 x 2
@@ -1220,37 +1192,37 @@
 y 38
 end
 arch jungle_1
-blocksview 0
 x 2
 y 39
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 2
 y 40
+blocksview 0
 end
 arch fog
 x 2
 y 40
 end
 arch jungle_2
-blocksview 0
 x 2
 y 41
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 2
 y 42
+blocksview 0
 end
 arch fog
 x 2
 y 42
 end
 arch jungle_2
-blocksview 0
 x 2
 y 43
+blocksview 0
 end
 arch dungeon_magic
 x 3
@@ -1277,7 +1249,6 @@
 y 1
 end
 arch fireplace
-glow_radius 2
 x 3
 y 1
 end
@@ -1300,9 +1271,9 @@
 name_pl Apartment costs 100 gold
 slaying money
 food 1000
-connected 1
 x 3
 y 3
+connected 1
 end
 arch woodfloor2
 name woodfloor
@@ -1319,9 +1290,9 @@
 name_pl Apartment costs 100 gold
 slaying money
 food 1000
-connected 1
 x 3
 y 4
+connected 1
 end
 arch woodfloor2
 name woodfloor
@@ -1354,9 +1325,9 @@
 y 6
 end
 arch icecube
-glow_radius 4
 x 3
 y 6
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -1389,9 +1360,9 @@
 y 11
 end
 arch brazier
-glow_radius 4
 x 3
 y 11
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -1404,9 +1375,9 @@
 y 12
 end
 arch icecube
-glow_radius 4
 x 3
 y 12
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -1415,9 +1386,9 @@
 y 13
 end
 arch brazier
-glow_radius 4
 x 3
 y 13
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -1570,14 +1541,14 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 3
 y 33
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 3
 y 34
+blocksview 0
 end
 arch woods
 x 3
@@ -1600,24 +1571,24 @@
 y 39
 end
 arch jungle_1
-blocksview 0
 x 3
 y 40
+blocksview 0
 end
 arch jungle_2
-blocksview 0
 x 3
 y 41
+blocksview 0
 end
 arch jungle_2
-blocksview 0
 x 3
 y 42
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 3
 y 43
+blocksview 0
 end
 arch dungeon_magic
 x 4
@@ -1666,9 +1637,9 @@
 name_pl Apartment costs 100 gold
 slaying money
 food 1000
-connected 1
 x 4
 y 3
+connected 1
 end
 arch woodfloor2
 name woodfloor
@@ -1686,13 +1657,6 @@
 x 4
 y 4
 end
-arch longtable_2_2_2
-name Karen's desk
-name_pl Karen's desk
-no_pass 1024
-x 4
-y 4
-end
 arch dungeon_magic
 x 4
 y 5
@@ -1703,13 +1667,6 @@
 x 4
 y 5
 end
-arch longtable_1_2
-name Karen's desk
-name_pl Karen's desk
-no_pass 1024
-x 4
-y 5
-end
 arch dungeon_magic
 x 4
 y 6
@@ -1855,9 +1812,9 @@
 y 23
 end
 arch brazier
-glow_radius 4
 x 4
 y 23
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -1898,9 +1855,9 @@
 y 28
 end
 arch brazier
-glow_radius 4
 x 4
 y 28
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -1921,9 +1878,9 @@
 y 31
 end
 arch brazier
-glow_radius 4
 x 4
 y 31
+glow_radius 4
 end
 arch dungeon_magic
 x 4
@@ -1944,19 +1901,19 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 4
 y 33
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 4
 y 34
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 4
 y 35
+blocksview 0
 end
 arch woods
 x 4
@@ -1975,24 +1932,24 @@
 y 39
 end
 arch jungle_1
-blocksview 0
 x 4
 y 40
+blocksview 0
 end
 arch jungle_2
-blocksview 0
 x 4
 y 41
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 4
 y 42
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 4
 y 43
+blocksview 0
 end
 arch dungeon_magic
 x 5
@@ -2052,13 +2009,6 @@
 x 5
 y 4
 end
-arch longtable_1_3
-name Karen's desk
-name_pl Karen's desk
-no_pass 1024
-x 5
-y 4
-end
 arch dungeon_magic
 x 5
 y 5
@@ -2069,80 +2019,6 @@
 x 5
 y 5
 end
-arch princess
-name Karen, the receptionist
-face princess.112
-event_say_plugin Python
-event_say /onefang/python/bank/Karen.py
-msg
-Karen is exceptionally beautiful, 
-and she is dressed to kill.
-endmsg
-level 20
-race elf
-speed 5.0
-attacktype 1
-dam 16
-wc 6
-hp 100
-maxhp 100
-ac 0
-Con 40
-reflect_missile 1
-hitback 1
-reflect_spell 1
-sp 20
-maxsp 20
-Pow 20
-path_attuned 588897
-see_invisible 1
-can_see_in_dark 1
-can_use_rod 1
-can_use_skill 1
-friendly 1
-will_apply 7
-pick_up 0
-resist_physical 29
-resist_confusion 100
-resist_poison 30
-resist_fear 100
-resist_chaos 100
-name_pl Karen, the receptionist
-Dex 30
-Cha 45
-speed_left -0.250161
-state 1
-has_ready_bow 268435456
-has_ready_scroll 131072
-has_ready_weapon 67108864
-x 5
-y 5
-arch low_boots
-name silken slippers of comeliness
-name_pl silken slippers of comeliness
-value 25000
-item_power 1
-applied 1
-Cha 2
-been_applied 65536
-end
-arch wig
-name wig of comeliness
-name_pl wig of comeliness
-value 1400
-item_power 2
-applied 1
-Cha 3
-been_applied 65536
-end
-arch dress1
-name Incredibly beautiful dress
-name_pl Incredibly beautiful dress
-value 30000
-applied 1
-been_applied 65536
-end
-end
 arch dungeon_magic
 x 5
 y 6
@@ -2256,9 +2132,9 @@
 y 19
 end
 arch icecube
-glow_radius 4
 x 5
 y 19
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -2371,66 +2247,66 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 5
 y 33
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 5
 y 34
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 5
 y 35
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 5
 y 36
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 5
 y 37
+blocksview 0
 end
 arch woods
 x 5
 y 38
 end
 arch jungle_1
-blocksview 0
 x 5
 y 39
+blocksview 0
 end
 arch jungle_2
-blocksview 0
 x 5
 y 40
+blocksview 0
 end
 arch fog
 x 5
 y 40
 end
 arch jungle_1
-blocksview 0
 x 5
 y 41
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 5
 y 42
+blocksview 0
 end
 arch fog
 x 5
 y 42
 end
 arch jungle_1
-blocksview 0
 x 5
 y 43
+blocksview 0
 end
 arch dungeon_magic
 x 6
@@ -2457,11 +2333,13 @@
 y 1
 end
 arch locked_door2
-face ldoor_white2.111
+slaying onefangKey
 msg
 You need Prince onefangs key to open this door.
 endmsg
-slaying onefangKey
+face ldoor_white2.111
+x 6
+y 1
 resist_physical 30
 resist_magic 30
 resist_electricity 30
@@ -2469,8 +2347,6 @@
 resist_confusion 30
 resist_acid 30
 resist_ghosthit 30
-x 6
-y 1
 end
 arch dungeon_magic
 x 6
@@ -2487,9 +2363,9 @@
 y 2
 end
 arch icecube
-glow_radius 4
 x 6
 y 2
+glow_radius 4
 end
 arch dungeon_magic
 x 6
@@ -2523,10 +2399,14 @@
 x 6
 y 4
 end
+arch swall_2_1_1
+x 6
+y 4
+end
 arch icecube
-glow_radius 4
 x 6
 y 4
+glow_radius 4
 end
 arch dungeon_magic
 x 6
@@ -2538,6 +2418,14 @@
 x 6
 y 5
 end
+arch swall_2_1_1
+x 6
+y 5
+end
+arch icecube
+x 6
+y 5
+end
 arch dungeon_magic
 x 6
 y 6
@@ -2552,6 +2440,10 @@
 x 6
 y 6
 end
+arch swall_3_1
+x 6
+y 6
+end
 arch icecube
 x 6
 y 6
@@ -2733,66 +2625,66 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 6
 y 33
+blocksview 0
 end
 arch evergreens
 x 6
 y 34
 end
 arch jungle_1
-blocksview 0
 x 6
 y 35
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 6
 y 36
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 6
 y 37
+blocksview 0
 end
 arch fog
 x 6
 y 37
 end
 arch jungle_1
-blocksview 0
 x 6
 y 38
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 6
 y 39
+blocksview 0
 end
 arch jungle_2
-blocksview 0
 x 6
 y 40
+blocksview 0
 end
 arch fog
 x 6
 y 40
 end
 arch jungle_2
-blocksview 0
 x 6
 y 41
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 6
 y 42
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 6
 y 43
+blocksview 0
 end
 arch dungeon_magic
 x 7
@@ -3057,59 +2949,59 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 7
 y 33
+blocksview 0
 end
 arch jungle_2
-blocksview 0
 x 7
 y 34
+blocksview 0
 end
 arch jungle_2
-blocksview 0
 x 7
 y 35
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 7
 y 36
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 7
 y 37
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 7
 y 38
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 7
 y 39
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 7
 y 40
+blocksview 0
 end
 arch jungle_2
-blocksview 0
 x 7
 y 41
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 7
 y 42
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 7
 y 43
+blocksview 0
 end
 arch dungeon_magic
 x 8
@@ -3226,9 +3118,9 @@
 y 10
 end
 arch brazier
-glow_radius 4
 x 8
 y 10
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -3261,9 +3153,9 @@
 y 15
 end
 arch brazier
-glow_radius 4
 x 8
 y 15
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -3294,9 +3186,9 @@
 y 19
 end
 arch icecube
-glow_radius 4
 x 8
 y 19
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -3409,58 +3301,58 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 8
 y 33
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 8
 y 34
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 8
 y 35
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 8
 y 36
+blocksview 0
 end
 arch jungle_2
-blocksview 0
 x 8
 y 37
+blocksview 0
 end
 arch evergreens
 x 8
 y 38
 end
 arch jungle_1
-blocksview 0
 x 8
 y 39
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 8
 y 40
+blocksview 0
 end
 arch jungle_2
-blocksview 0
 x 8
 y 41
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 8
 y 42
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 8
 y 43
+blocksview 0
 end
 arch dungeon_magic
 x 9
@@ -3559,7 +3451,6 @@
 y 7
 end
 arch fireplace
-glow_radius 2
 x 9
 y 7
 end
@@ -3646,7 +3537,6 @@
 y 18
 end
 arch fireplace
-glow_radius 2
 x 9
 y 18
 end
@@ -3697,9 +3587,9 @@
 y 23
 end
 arch brazier
-glow_radius 4
 x 9
 y 23
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -3740,9 +3630,9 @@
 y 28
 end
 arch brazier
-glow_radius 4
 x 9
 y 28
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -3763,9 +3653,9 @@
 y 31
 end
 arch brazier
-glow_radius 4
 x 9
 y 31
+glow_radius 4
 end
 arch dungeon_magic
 x 9
@@ -3786,67 +3676,67 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 9
 y 33
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 9
 y 34
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 9
 y 35
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 9
 y 36
+blocksview 0
 end
 arch jungle_2
-blocksview 0
 x 9
 y 37
+blocksview 0
 end
 arch jungle_2
-blocksview 0
 x 9
 y 38
+blocksview 0
 end
 arch fog
 x 9
 y 38
 end
 arch jungle_1
-blocksview 0
 x 9
 y 39
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 9
 y 40
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 9
 y 41
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 9
 y 42
+blocksview 0
 end
 arch fog
 x 9
 y 42
 end
 arch jungle_1
-blocksview 0
 x 9
 y 43
+blocksview 0
 end
 arch dungeon_magic
 x 10
@@ -4151,63 +4041,63 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 10
 y 33
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 10
 y 34
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 10
 y 35
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 10
 y 36
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 10
 y 37
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 10
 y 38
+blocksview 0
 end
 arch fog
 x 10
 y 38
 end
 arch jungle_1
-blocksview 0
 x 10
 y 39
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 10
 y 40
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 10
 y 41
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 10
 y 42
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 10
 y 43
+blocksview 0
 end
 arch dungeon_magic
 x 11
@@ -4512,9 +4402,9 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 11
 y 33
+blocksview 0
 end
 arch evergreens
 x 11
@@ -4525,43 +4415,43 @@
 y 35
 end
 arch jungle_2
-blocksview 0
 x 11
 y 36
+blocksview 0
 end
 arch jungle_2
-blocksview 0
 x 11
 y 37
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 11
 y 38
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 11
 y 39
+blocksview 0
 end
 arch evergreens
 x 11
 y 40
 end
 arch jungle_1
-blocksview 0
 x 11
 y 41
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 11
 y 42
+blocksview 0
 end
 arch jungle_2
-blocksview 0
 x 11
 y 43
+blocksview 0
 end
 arch dungeon_magic
 x 12
@@ -4575,8 +4465,8 @@
 x 12
 end
 arch icecube
-glow_radius 4
 x 12
+glow_radius 4
 end
 arch dungeon_magic
 x 12
@@ -4611,9 +4501,9 @@
 y 2
 end
 arch icecube
-glow_radius 4
 x 12
 y 2
+glow_radius 4
 end
 arch dungeon_magic
 x 12
@@ -4640,9 +4530,9 @@
 y 4
 end
 arch icecube
-glow_radius 4
 x 12
 y 4
+glow_radius 4
 end
 arch dungeon_magic
 x 12
@@ -4677,9 +4567,9 @@
 y 6
 end
 arch icecube
-glow_radius 4
 x 12
 y 6
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -4794,9 +4684,9 @@
 y 20
 end
 arch bookshelf
-no_pick 1
 x 12
 y 20
+no_pick 1
 end
 arch woodfloor2
 name woodfloor
@@ -4837,7 +4727,6 @@
 y 25
 end
 arch fireplace
-glow_radius 2
 x 12
 y 25
 end
@@ -4848,7 +4737,6 @@
 y 26
 end
 arch fireplace
-glow_radius 2
 x 12
 y 26
 end
@@ -4905,52 +4793,52 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 12
 y 33
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 12
 y 34
+blocksview 0
 end
 arch evergreens
 x 12
 y 35
 end
 arch jungle_1
-blocksview 0
 x 12
 y 36
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 12
 y 37
+blocksview 0
 end
 arch evergreens
 x 12
 y 38
 end
 arch jungle_2
-blocksview 0
 x 12
 y 39
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 12
 y 40
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 12
 y 41
+blocksview 0
 end
 arch jungle_2
-blocksview 0
 x 12
 y 42
+blocksview 0
 end
 arch woods_2
 x 12
@@ -5067,9 +4955,9 @@
 y 10
 end
 arch brazier
-glow_radius 4
 x 13
 y 10
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -5102,9 +4990,9 @@
 y 15
 end
 arch brazier
-glow_radius 4
 x 13
 y 15
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -5133,9 +5021,9 @@
 y 19
 end
 arch icecube
-glow_radius 4
 x 13
 y 19
+glow_radius 4
 end
 arch grassmedium
 x 13
@@ -5242,9 +5130,9 @@
 y 28
 end
 arch icecube
-glow_radius 4
 x 13
 y 28
+glow_radius 4
 end
 arch marble
 x 13
@@ -5295,65 +5183,65 @@
 y 32
 end
 arch icecube
-glow_radius 4
 x 13
 y 32
+glow_radius 4
 end
 arch jungle_1
-blocksview 0
 x 13
 y 33
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 13
 y 34
+blocksview 0
 end
 arch evergreens
 x 13
 y 35
 end
 arch jungle_1
-blocksview 0
 x 13
 y 36
+blocksview 0
 end
 arch fog
 x 13
 y 36
 end
 arch jungle_1
-blocksview 0
 x 13
 y 37
+blocksview 0
 end
 arch evergreens
 x 13
 y 38
 end
 arch jungle_1
-blocksview 0
 x 13
 y 39
+blocksview 0
 end
 arch fog
 x 13
 y 39
 end
 arch jungle_1
-blocksview 0
 x 13
 y 40
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 13
 y 41
+blocksview 0
 end
 arch jungle_2
-blocksview 0
 x 13
 y 42
+blocksview 0
 end
 arch woods_2
 x 13
@@ -5534,9 +5422,9 @@
 y 19
 end
 arch icecube
-glow_radius 4
 x 14
 y 19
+glow_radius 4
 end
 arch grassmedium
 x 14
@@ -5611,9 +5499,9 @@
 y 28
 end
 arch icecube
-glow_radius 4
 x 14
 y 28
+glow_radius 4
 end
 arch marble
 x 14
@@ -5660,44 +5548,44 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 14
 y 33
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 14
 y 34
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 14
 y 35
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 14
 y 36
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 14
 y 37
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 14
 y 38
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 14
 y 39
+blocksview 0
 end
 arch jungle_2
-blocksview 0
 x 14
 y 40
+blocksview 0
 end
 arch woods_2
 x 14
@@ -5820,7 +5708,6 @@
 y 7
 end
 arch fireplace
-glow_radius 2
 x 15
 y 7
 end
@@ -5896,11 +5783,11 @@
 end
 arch magic_mouth
 name Bathroom
+name_pl Bathroom
 msg
 You've never seen such a fancy
 bathroom before.
 endmsg
-name_pl Bathroom
 x 15
 y 19
 end
@@ -5970,11 +5857,11 @@
 end
 arch magic_mouth
 name Throne room
+name_pl Throne room
 msg
 Throne room.  Please wash your hands
 after use.
 endmsg
-name_pl Throne room
 x 15
 y 28
 end
@@ -6011,39 +5898,39 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 15
 y 33
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 15
 y 34
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 15
 y 35
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 15
 y 36
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 15
 y 37
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 15
 y 38
+blocksview 0
 end
 arch jungle_2
-blocksview 0
 x 15
 y 39
+blocksview 0
 end
 arch woods_2
 x 15
@@ -6233,11 +6120,11 @@
 end
 arch magic_mouth
 name Bathroom
+name_pl Bathroom
 msg
 So this is what indoor plumbing is
 all about.
 endmsg
-name_pl Bathroom
 x 16
 y 19
 end
@@ -6299,11 +6186,11 @@
 end
 arch magic_mouth
 name Throne room
+name_pl Throne room
 msg
 Throne room.  Please wash your hands
 after use.
 endmsg
-name_pl Throne room
 x 16
 y 28
 end
@@ -6340,24 +6227,24 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 16
 y 33
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 16
 y 34
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 16
 y 35
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 16
 y 36
+blocksview 0
 end
 arch woods_2
 x 16
@@ -6498,7 +6385,6 @@
 y 10
 end
 arch fireplace
-glow_radius 2
 x 17
 y 10
 end
@@ -6563,9 +6449,9 @@
 y 19
 end
 arch icecube
-glow_radius 4
 x 17
 y 19
+glow_radius 4
 end
 arch grassmedium
 x 17
@@ -6608,9 +6494,9 @@
 y 28
 end
 arch icecube
-glow_radius 4
 x 17
 y 28
+glow_radius 4
 end
 arch marble
 x 17
@@ -6654,19 +6540,19 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 17
 y 33
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 17
 y 34
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 17
 y 35
+blocksview 0
 end
 arch woods_2
 x 17
@@ -6720,8 +6606,8 @@
 x 18
 end
 arch icecube
-glow_radius 4
 x 18
+glow_radius 4
 end
 arch dungeon_magic
 x 18
@@ -6756,9 +6642,9 @@
 y 2
 end
 arch icecube
-glow_radius 4
 x 18
 y 2
+glow_radius 4
 end
 arch dungeon_magic
 x 18
@@ -6785,9 +6671,9 @@
 y 4
 end
 arch icecube
-glow_radius 4
 x 18
 y 4
+glow_radius 4
 end
 arch dungeon_magic
 x 18
@@ -6822,9 +6708,9 @@
 y 6
 end
 arch icecube
-glow_radius 4
 x 18
 y 6
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -6893,9 +6779,9 @@
 y 11
 end
 arch icecube
-glow_radius 4
 x 18
 y 11
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -6996,9 +6882,9 @@
 y 19
 end
 arch icecube
-glow_radius 4
 x 18
 y 19
+glow_radius 4
 end
 arch grassmedium
 x 18
@@ -7105,9 +6991,9 @@
 y 28
 end
 arch icecube
-glow_radius 4
 x 18
 y 28
+glow_radius 4
 end
 arch marble
 x 18
@@ -7158,24 +7044,24 @@
 y 32
 end
 arch icecube
-glow_radius 4
 x 18
 y 32
+glow_radius 4
 end
 arch jungle_1
-blocksview 0
 x 18
 y 33
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 18
 y 34
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 18
 y 35
+blocksview 0
 end
 arch woods_2
 x 18
@@ -7348,9 +7234,9 @@
 y 14
 end
 arch chest_2
-no_pick 1
 x 19
 y 14
+no_pick 1
 end
 arch woodfloor2
 name woodfloor
@@ -7365,9 +7251,9 @@
 y 16
 end
 arch chest_2
-no_pick 1
 x 19
 y 16
+no_pick 1
 end
 arch woodfloor2
 name woodfloor
@@ -7406,9 +7292,9 @@
 y 20
 end
 arch bookshelf
-no_pick 1
 x 19
 y 20
+no_pick 1
 end
 arch woodfloor2
 name woodfloor
@@ -7457,7 +7343,6 @@
 y 25
 end
 arch fireplace
-glow_radius 2
 x 19
 y 25
 end
@@ -7468,7 +7353,6 @@
 y 26
 end
 arch fireplace
-glow_radius 2
 x 19
 y 26
 end
@@ -7529,19 +7413,19 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 19
 y 33
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 19
 y 34
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 19
 y 35
+blocksview 0
 end
 arch woods_2
 x 19
@@ -7609,6 +7493,10 @@
 x 20
 y 2
 end
+arch pentagram_111
+x 20
+y 2
+end
 arch dungeon_magic
 x 20
 y 3
@@ -7858,14 +7746,14 @@
 y 33
 end
 arch jungle_1
-blocksview 0
 x 20
 y 34
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 20
 y 35
+blocksview 0
 end
 arch woods_2
 x 20
@@ -7924,7 +7812,6 @@
 y 1
 end
 arch fireplace
-glow_radius 2
 x 21
 y 1
 end
@@ -7969,9 +7856,9 @@
 y 5
 end
 arch cauldron
-glow_radius 1
 x 21
 y 5
+glow_radius 1
 end
 arch dungeon_magic
 x 21
@@ -8024,9 +7911,9 @@
 y 10
 end
 arch cauldron
-glow_radius 1
 x 21
 y 10
+glow_radius 1
 end
 arch woodfloor2
 name woodfloor
@@ -8197,18 +8084,18 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 21
 y 33
+blocksview 0
 end
 arch evergreens
 x 21
 y 34
 end
 arch jungle_1
-blocksview 0
 x 21
 y 35
+blocksview 0
 end
 arch woods_2
 x 21
@@ -8459,9 +8346,9 @@
 y 23
 end
 arch brazier
-glow_radius 4
 x 22
 y 23
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -8494,9 +8381,9 @@
 y 28
 end
 arch brazier
-glow_radius 4
 x 22
 y 28
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -8517,9 +8404,9 @@
 y 31
 end
 arch brazier
-glow_radius 4
 x 22
 y 31
+glow_radius 4
 end
 arch dungeon_magic
 x 22
@@ -8540,19 +8427,19 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 22
 y 33
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 22
 y 34
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 22
 y 35
+blocksview 0
 end
 arch woods_2
 x 22
@@ -8763,9 +8650,9 @@
 y 19
 end
 arch icecube
-glow_radius 4
 x 23
 y 19
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -8862,19 +8749,19 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 23
 y 33
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 23
 y 34
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 23
 y 35
+blocksview 0
 end
 arch woods_2
 x 23
@@ -8924,8 +8811,8 @@
 x 24
 end
 arch icecube
-glow_radius 4
 x 24
+glow_radius 4
 end
 arch dungeon_magic
 x 24
@@ -8960,9 +8847,9 @@
 y 2
 end
 arch icecube
-glow_radius 4
 x 24
 y 2
+glow_radius 4
 end
 arch dungeon_magic
 x 24
@@ -8989,9 +8876,9 @@
 y 4
 end
 arch icecube
-glow_radius 4
 x 24
 y 4
+glow_radius 4
 end
 arch dungeon_magic
 x 24
@@ -9026,9 +8913,9 @@
 y 6
 end
 arch icecube
-glow_radius 4
 x 24
 y 6
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -9037,7 +8924,6 @@
 y 7
 end
 arch fireplace
-glow_radius 2
 x 24
 y 7
 end
@@ -9072,9 +8958,9 @@
 y 12
 end
 arch brazier
-glow_radius 4
 x 24
 y 12
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -9221,19 +9107,19 @@
 y 32
 end
 arch jungle_1
-blocksview 0
 x 24
 y 33
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 24
 y 34
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 24
 y 35
+blocksview 0
 end
 arch woods_2
 x 24
@@ -9364,7 +9250,6 @@
 y 7
 end
 arch fireplace
-glow_radius 2
 x 25
 y 7
 end
@@ -9547,14 +9432,14 @@
 y 33
 end
 arch jungle_1
-blocksview 0
 x 25
 y 34
+blocksview 0
 end
 arch jungle_1
-blocksview 0
 x 25
 y 35
+blocksview 0
 end
 arch woods_2
 x 25
@@ -9785,9 +9670,9 @@
 y 19
 end
 arch icecube
-glow_radius 4
 x 26
 y 19
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -10170,9 +10055,9 @@
 y 23
 end
 arch brazier
-glow_radius 4
 x 27
 y 23
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -10205,9 +10090,9 @@
 y 28
 end
 arch brazier
-glow_radius 4
 x 27
 y 28
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -10228,9 +10113,9 @@
 y 31
 end
 arch brazier
-glow_radius 4
 x 27
 y 31
+glow_radius 4
 end
 arch dungeon_magic
 x 27
@@ -11109,9 +10994,9 @@
 y 11
 end
 arch brazier
-glow_radius 4
 x 30
 y 11
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -11120,7 +11005,6 @@
 y 12
 end
 arch fireplace
-glow_radius 2
 x 30
 y 12
 end
@@ -11131,7 +11015,6 @@
 y 13
 end
 arch fireplace
-glow_radius 2
 x 30
 y 13
 end
@@ -11142,9 +11025,9 @@
 y 14
 end
 arch brazier
-glow_radius 4
 x 30
 y 14
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -11207,9 +11090,9 @@
 y 20
 end
 arch bookshelf
-no_pick 1
 x 30
 y 20
+no_pick 1
 end
 arch woodfloor2
 name woodfloor
@@ -11258,7 +11141,6 @@
 y 25
 end
 arch fireplace
-glow_radius 2
 x 30
 y 25
 end
@@ -11269,7 +11151,6 @@
 y 26
 end
 arch fireplace
-glow_radius 2
 x 30
 y 26
 end
@@ -11393,8 +11274,8 @@
 x 31
 end
 arch icecube
-glow_radius 4
 x 31
+glow_radius 4
 end
 arch dungeon_magic
 x 31
@@ -11501,9 +11382,9 @@
 y 6
 end
 arch icecube
-glow_radius 4
 x 31
 y 6
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -11684,9 +11565,9 @@
 y 19
 end
 arch icecube
-glow_radius 4
 x 31
 y 19
+glow_radius 4
 end
 arch woodfloor2
 name woodfloor
@@ -11871,9 +11752,9 @@
 y 32
 end
 arch icecube
-glow_radius 4
 x 31
 y 32
+glow_radius 4
 end
 arch grass
 x 31
@@ -11919,7 +11800,3 @@
 x 31
 y 43
 end
-arch pentagram_111
-x 20
-y 2
-end