--- deliantra/maps/onefang/IceCastle.map	2006/12/12 22:35:36	1.9
+++ deliantra/maps/onefang/IceCastle.map	2008/05/30 22:05:41	1.20
@@ -1,4 +1,5 @@
 arch map
+file_format_version 1
 name Prince onefang's Ice castle
 reset_timeout 7200
 difficulty 90
@@ -12,6 +13,7 @@
 Date: Sat Jan 25 21:22:20 2003
 endmsg
 outdoor 1
+music km/disco4
 end
 arch invis_exit
 slaying /world/world_110_118
@@ -9849,7 +9851,7 @@
 y 13
 speed 0.0
 connected 110
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -9882,7 +9884,7 @@
 y 14
 speed 0.0
 connected 109
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -9908,7 +9910,7 @@
 y 15
 speed 0.0
 connected 108
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -9934,7 +9936,7 @@
 y 16
 speed 0.0
 connected 107
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -9960,7 +9962,7 @@
 y 17
 speed 0.0
 connected 106
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -9986,7 +9988,7 @@
 y 18
 speed 0.0
 connected 105
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -10012,7 +10014,7 @@
 y 19
 speed 0.0
 connected 104
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -10038,7 +10040,7 @@
 y 20
 speed 0.0
 connected 103
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -10064,7 +10066,7 @@
 y 21
 speed 0.0
 connected 102
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -10090,7 +10092,7 @@
 y 22
 speed 0.0
 connected 101
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -10116,7 +10118,7 @@
 y 23
 speed 0.0
 connected 100
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -10140,7 +10142,7 @@
 name laser
 x 13
 y 24
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -11534,7 +11536,7 @@
 end
 arch guildmaster
 name hunk
-face barbarian.151
+face barbarian.x51
 hp 100
 maxhp 100
 x 15
@@ -14881,7 +14883,7 @@
 end
 arch guildmaster
 name hunk
-face barbarian.151
+face barbarian.x51
 hp 100
 maxhp 100
 x 19
@@ -18433,7 +18435,7 @@
 y 13
 speed 0.0
 connected 115
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18443,7 +18445,7 @@
 y 13
 speed 0.0
 connected 116
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18453,7 +18455,7 @@
 y 13
 speed 0.0
 connected 117
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18463,7 +18465,7 @@
 y 13
 speed 0.0
 connected 118
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18473,7 +18475,7 @@
 y 13
 speed 0.0
 connected 119
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18539,7 +18541,7 @@
 y 19
 speed 0.0
 connected 120
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18607,7 +18609,7 @@
 y 24
 speed 0.0
 connected 110
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18617,7 +18619,7 @@
 y 24
 speed 0.0
 connected 111
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18627,7 +18629,7 @@
 y 24
 speed 0.0
 connected 112
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18637,7 +18639,7 @@
 y 24
 speed 0.0
 connected 113
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18647,7 +18649,7 @@
 y 24
 speed 0.0
 connected 114
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -19593,7 +19595,7 @@
 resist_electricity 100
 resist_cold 100
 path_attuned 28
-material 256
+materialname adamant
 weight 850
 magic 15
 last_sp 0
@@ -20331,7 +20333,7 @@
 end
 arch guildmaster
 name hunk
-face barbarian.151
+face barbarian.x51
 hp 100
 maxhp 100
 x 25
@@ -21252,13 +21254,13 @@
 y 17
 speed 1
 level 1
-move_on 0
+move_on -all
 end
 arch mover_5
 x 26
 y 17
 speed 1
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 26
@@ -21274,13 +21276,13 @@
 y 18
 speed 1
 level 1
-move_on 0
+move_on -all
 end
 arch mover_5
 x 26
 y 18
 speed 1
-move_on 0
+move_on -all
 end
 arch pirate_lass
 name lass
@@ -21317,13 +21319,13 @@
 y 19
 speed 1.0
 level 1
-move_on 0
+move_on -all
 end
 arch mover_5
 x 26
 y 19
 speed 1
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 26
@@ -21339,13 +21341,13 @@
 y 20
 speed 1
 level 1
-move_on 0
+move_on -all
 end
 arch mover_3
 x 26
 y 20
 speed 1
-move_on 0
+move_on -all
 end
 arch prisoner
 name guy
@@ -21391,7 +21393,7 @@
 end
 arch guildmaster
 name hunk
-face barbarian.151
+face barbarian.x51
 hp 100
 maxhp 100
 x 26
@@ -21554,7 +21556,7 @@
 arch uk_sd
 name Calamity
 name_pl Calamity
-face uk_sd.114
+face uk_sd.x14
 dam 25
 x 26
 y 35
@@ -21581,7 +21583,6 @@
 sp 33
 x 26
 y 36
-unique 1
 end
 arch dungeon_magic
 x 26
@@ -21596,7 +21597,6 @@
 name_pl Meganthropopulos' Crown
 x 26
 y 37
-material 0
 end
 arch dungeon_magic
 x 26
@@ -21658,7 +21658,7 @@
 name broken gateway
 name_pl broken gateway
 slaying broken gateway
-face penta.111
+face penta.x11
 x 26
 y 41
 end
@@ -21693,7 +21693,6 @@
 name_pl Slithselest's wing
 x 26
 y 43
-material 0
 end
 arch dungeon_magic
 x 26
@@ -21748,7 +21747,6 @@
 name_pl Animator's ring
 x 26
 y 47
-material 0
 value 1000
 end
 arch dungeon_magic
@@ -21776,7 +21774,6 @@
 name_pl Head of the Ogre Chief
 x 26
 y 49
-material 0
 end
 arch dungeon_magic
 x 26
@@ -21810,7 +21807,6 @@
 slaying Head of the Goblin Chief
 x 26
 y 51
-material 0
 end
 arch dungeon_magic
 x 26
@@ -22265,13 +22261,13 @@
 y 17
 speed 1
 level 1
-move_on 0
+move_on -all
 end
 arch mover_7
 x 27
 y 17
 speed 1
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 27
@@ -22289,14 +22285,14 @@
 speed 1
 level 1
 attacktype 1
-move_on 0
+move_on -all
 end
 arch mover_2
 x 27
 y 18
 speed 1
 attacktype 1
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 27
@@ -22313,14 +22309,14 @@
 speed 1
 level 1
 attacktype 1
-move_on 0
+move_on -all
 end
 arch mover_2
 x 27
 y 19
 speed 1
 attacktype 1
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 27
@@ -22337,13 +22333,13 @@
 y 20
 speed 1
 level 1
-move_on 0
+move_on -all
 end
 arch mover_2
 x 27
 y 20
 speed 1
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 27
@@ -23203,13 +23199,13 @@
 y 17
 speed 1
 level 1
-move_on 0
+move_on -all
 end
 arch mover_3
 x 28
 y 17
 speed 1
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 28
@@ -23226,14 +23222,14 @@
 speed 1
 level 1
 attacktype 1
-move_on 0
+move_on -all
 end
 arch mover_8
 x 28
 y 18
 speed 1
 attacktype 1
-move_on 0
+move_on -all
 end
 arch dancing_girl
 name girl
@@ -23268,14 +23264,14 @@
 speed 1
 level 1
 attacktype 1
-move_on 0
+move_on -all
 end
 arch mover_8
 x 28
 y 19
 speed 1
 attacktype 1
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 28
@@ -23291,13 +23287,13 @@
 y 20
 speed 1
 level 1
-move_on 0
+move_on -all
 end
 arch mover_8
 x 28
 y 20
 speed 1
-move_on 0
+move_on -all
 end
 arch dancing_girl
 name girl
@@ -24082,13 +24078,13 @@
 y 17
 speed 1
 level 1
-move_on 0
+move_on -all
 end
 arch mover_5
 x 29
 y 17
 speed 1
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 29
@@ -24105,14 +24101,14 @@
 y 18
 speed 1
 level 1
-move_on 0
+move_on -all
 end
 arch mover_5
 x 29
 y 18
 speed 1
 attacktype 1
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 29
@@ -24128,13 +24124,13 @@
 y 19
 speed 1
 level 1
-move_on 0
+move_on -all
 end
 arch mover_5
 x 29
 y 19
 speed 1
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 29
@@ -24151,13 +24147,13 @@
 y 20
 speed 1
 level 1
-move_on 0
+move_on -all
 end
 arch mover_7
 x 29
 y 20
 speed 1
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 29
@@ -26805,7 +26801,7 @@
 y 13
 speed 0.0
 connected 120
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -26913,7 +26909,7 @@
 y 24
 speed 0.0
 connected 120
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -28377,7 +28373,7 @@
 x 34
 y 16
 invisible 1
-move_off 0
+move_off -all
 arch event_trigger
 name 
 title Python
@@ -28396,7 +28392,7 @@
 x 34
 y 17
 invisible 1
-move_off 0
+move_off -all
 arch event_trigger
 name 
 title Python
@@ -28415,7 +28411,7 @@
 x 34
 y 18
 invisible 1
-move_off 0
+move_off -all
 arch event_trigger
 name 
 title Python
@@ -28439,7 +28435,7 @@
 x 34
 y 19
 invisible 1
-move_off 0
+move_off -all
 arch event_trigger
 name 
 title Python
@@ -28463,7 +28459,7 @@
 x 34
 y 20
 invisible 1
-move_off 0
+move_off -all
 arch event_trigger
 name 
 title Python
@@ -28482,7 +28478,7 @@
 x 34
 y 21
 invisible 1
-move_off 0
+move_off -all
 arch event_trigger
 name 
 title Python
@@ -30027,7 +30023,7 @@
 @match *
 You can go in.
 endmsg
-face ninja.151
+face ninja.x51
 wis 3
 hp 1000
 maxhp 1000
@@ -30120,7 +30116,7 @@
 @match *
 You can go in.
 endmsg
-face ninja.151
+face ninja.x51
 wis 3
 hp 1000
 maxhp 1000
@@ -39254,11 +39250,7 @@
 endmsg
 x 48
 y 77
-arch event_close
-name 
-title Python
-slaying /onefang/python/PO/send.py
-end
+invisible 1
 end
 arch evergreens
 x 48
@@ -40854,7 +40846,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 51
 y 12
 end
@@ -40874,7 +40866,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 51
 y 13
 end
@@ -40893,7 +40885,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 51
 y 14
 end
@@ -40912,7 +40904,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 51
 y 15
 end
@@ -40931,7 +40923,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 51
 y 16
 end
@@ -40950,7 +40942,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 51
 y 17
 end
@@ -40969,7 +40961,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 51
 y 18
 end
@@ -40988,7 +40980,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 51
 y 19
 end
@@ -41719,7 +41711,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 52
 y 12
 end
@@ -41738,7 +41730,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 52
 y 13
 end
@@ -41759,7 +41751,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 52
 y 14
 end
@@ -41779,7 +41771,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 52
 y 15
 end
@@ -41799,7 +41791,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 52
 y 16
 end
@@ -41819,7 +41811,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 52
 y 17
 end
@@ -41839,7 +41831,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 52
 y 18
 end
@@ -41860,7 +41852,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 52
 y 19
 end
@@ -42572,7 +42564,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 53
 y 12
 end
@@ -42591,7 +42583,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 53
 y 13
 end
@@ -42611,7 +42603,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 53
 y 14
 end
@@ -42629,7 +42621,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 53
 y 15
 end
@@ -42640,7 +42632,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 53
 y 16
 end
@@ -42651,7 +42643,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 53
 y 17
 end
@@ -42666,7 +42658,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 53
 y 18
 end
@@ -42686,7 +42678,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 53
 y 19
 end
@@ -43397,7 +43389,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 54
 y 12
 end
@@ -43416,7 +43408,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 54
 y 13
 end
@@ -43436,7 +43428,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 54
 y 14
 end
@@ -43447,7 +43439,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 54
 y 15
 end
@@ -43468,7 +43460,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 54
 y 16
 end
@@ -43489,7 +43481,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 54
 y 17
 end
@@ -43500,7 +43492,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 54
 y 18
 end
@@ -43520,7 +43512,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 54
 y 19
 end
@@ -43577,6 +43569,9 @@
 y 23
 end
 arch booze_table
+name serving booze
+slaying money
+food 30
 x 54
 y 23
 end
@@ -43591,6 +43586,9 @@
 y 24
 end
 arch booze_table
+name serving booze
+slaying money
+food 30
 x 54
 y 24
 end
@@ -43605,6 +43603,9 @@
 y 25
 end
 arch booze_table
+name serving booze
+slaying money
+food 30
 x 54
 y 25
 end
@@ -43619,6 +43620,9 @@
 y 26
 end
 arch booze_table
+name serving booze
+slaying money
+food 30
 x 54
 y 26
 end
@@ -43633,6 +43637,9 @@
 y 27
 end
 arch booze_table
+name serving booze
+slaying money
+food 30
 x 54
 y 27
 end
@@ -43647,6 +43654,9 @@
 y 28
 end
 arch booze_table
+name serving booze
+slaying money
+food 30
 x 54
 y 28
 end
@@ -44205,7 +44215,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 55
 y 12
 end
@@ -44224,7 +44234,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 55
 y 13
 end
@@ -44244,7 +44254,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 55
 y 14
 end
@@ -44255,7 +44265,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 55
 y 15
 end
@@ -44276,7 +44286,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 55
 y 16
 end
@@ -44297,7 +44307,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 55
 y 17
 end
@@ -44308,7 +44318,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 55
 y 18
 end
@@ -44328,7 +44338,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 55
 y 19
 end
@@ -45071,7 +45081,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 56
 y 12
 end
@@ -45090,7 +45100,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 56
 y 13
 end
@@ -45110,7 +45120,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 56
 y 14
 end
@@ -45121,7 +45131,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 56
 y 15
 end
@@ -45138,7 +45148,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 56
 y 16
 end
@@ -45149,7 +45159,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 56
 y 17
 end
@@ -45160,7 +45170,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 56
 y 18
 end
@@ -45180,7 +45190,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 56
 y 19
 end
@@ -45902,7 +45912,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 57
 y 12
 end
@@ -45921,7 +45931,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 57
 y 13
 end
@@ -45942,7 +45952,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 57
 y 14
 end
@@ -45962,7 +45972,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 57
 y 15
 end
@@ -45978,7 +45988,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 57
 y 16
 end
@@ -45994,7 +46004,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 57
 y 17
 end
@@ -46014,7 +46024,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 57
 y 18
 end
@@ -46035,7 +46045,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 57
 y 19
 end
@@ -46744,7 +46754,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 58
 y 12
 end
@@ -46764,7 +46774,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 58
 y 13
 end
@@ -46783,7 +46793,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 58
 y 14
 end
@@ -46803,7 +46813,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 58
 y 15
 end
@@ -46820,7 +46830,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 58
 y 16
 end
@@ -46837,14 +46847,14 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 58
 y 17
 end
 arch check_floor
 name wall
 slaying onefang
-face swall_5.111
+face swall_5.x11
 x 58
 y 17
 invisible 0
@@ -46863,7 +46873,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 58
 y 18
 end
@@ -46882,7 +46892,7 @@
 arch flagstone
 name floor
 name_pl floor
-face shop_empty.111
+face shop_empty.x11
 x 58
 y 19
 end
@@ -47609,7 +47619,7 @@
 y 12
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 59
 y 12
 end
@@ -47626,7 +47636,7 @@
 y 13
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 59
 y 13
 end
@@ -47640,7 +47650,7 @@
 y 14
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 59
 y 14
 end
@@ -47659,7 +47669,7 @@
 connected 4
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 59
 y 15
 end
@@ -47674,7 +47684,7 @@
 connected 4
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 59
 y 16
 end
@@ -47683,7 +47693,7 @@
 y 17
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 59
 y 17
 end
@@ -47696,7 +47706,7 @@
 y 18
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 59
 y 18
 end
@@ -47710,7 +47720,7 @@
 y 19
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 59
 y 19
 end
@@ -48425,7 +48435,7 @@
 y 12
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 60
 y 12
 end
@@ -48442,7 +48452,7 @@
 y 13
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 60
 y 13
 end
@@ -48455,7 +48465,7 @@
 y 14
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 60
 y 14
 end
@@ -48464,7 +48474,7 @@
 y 15
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 60
 y 15
 end
@@ -48477,7 +48487,7 @@
 y 16
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 60
 y 16
 end
@@ -48486,7 +48496,7 @@
 y 17
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 60
 y 17
 end
@@ -48499,7 +48509,7 @@
 y 18
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 60
 y 18
 end
@@ -48508,7 +48518,7 @@
 y 19
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 60
 y 19
 end
@@ -49242,7 +49252,7 @@
 y 12
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 61
 y 12
 end
@@ -49259,11 +49269,14 @@
 y 13
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 61
 y 13
 end
 arch food_table
+name serving food
+slaying money
+food 70
 x 61
 y 13
 end
@@ -49272,7 +49285,7 @@
 y 14
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 61
 y 14
 end
@@ -49281,11 +49294,14 @@
 y 15
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 61
 y 15
 end
 arch food_table
+name serving food
+slaying money
+food 70
 x 61
 y 15
 end
@@ -49294,7 +49310,7 @@
 y 16
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 61
 y 16
 end
@@ -49303,11 +49319,14 @@
 y 17
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 61
 y 17
 end
 arch food_table
+name serving food
+slaying money
+food 70
 x 61
 y 17
 end
@@ -49316,7 +49335,7 @@
 y 18
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 61
 y 18
 end
@@ -49329,7 +49348,7 @@
 y 19
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 61
 y 19
 end
@@ -50089,7 +50108,7 @@
 y 12
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 62
 y 12
 end
@@ -50106,7 +50125,7 @@
 y 13
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 62
 y 13
 end
@@ -50123,7 +50142,7 @@
 y 14
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 62
 y 14
 end
@@ -50132,7 +50151,7 @@
 y 15
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 62
 y 15
 end
@@ -50145,7 +50164,7 @@
 y 16
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 62
 y 16
 end
@@ -50154,7 +50173,7 @@
 y 17
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 62
 y 17
 end
@@ -50167,7 +50186,7 @@
 y 18
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 62
 y 18
 end
@@ -50176,7 +50195,7 @@
 y 19
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 62
 y 19
 end
@@ -50885,7 +50904,7 @@
 y 12
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 63
 y 12
 end
@@ -50902,7 +50921,7 @@
 y 13
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 63
 y 13
 end
@@ -50916,7 +50935,7 @@
 y 14
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 63
 y 14
 end
@@ -50925,7 +50944,7 @@
 y 15
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 63
 y 15
 end
@@ -50934,7 +50953,7 @@
 y 16
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 63
 y 16
 end
@@ -50943,7 +50962,7 @@
 y 17
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 63
 y 17
 end
@@ -50952,7 +50971,7 @@
 y 18
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 63
 y 18
 end
@@ -50966,7 +50985,7 @@
 y 19
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 63
 y 19
 end
@@ -51675,7 +51694,7 @@
 y 12
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 64
 y 12
 end
@@ -51692,7 +51711,7 @@
 y 13
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 64
 y 13
 end
@@ -51701,7 +51720,7 @@
 y 14
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 64
 y 14
 end
@@ -51714,7 +51733,7 @@
 y 15
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 64
 y 15
 end
@@ -51723,7 +51742,7 @@
 y 16
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 64
 y 16
 end
@@ -51736,7 +51755,7 @@
 y 17
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 64
 y 17
 end
@@ -51745,7 +51764,7 @@
 y 18
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 64
 y 18
 end
@@ -51758,7 +51777,7 @@
 y 19
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 64
 y 19
 end
@@ -52481,7 +52500,7 @@
 y 12
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 65
 y 12
 end
@@ -52498,7 +52517,7 @@
 y 13
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 65
 y 13
 end
@@ -52515,11 +52534,14 @@
 y 14
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 65
 y 14
 end
 arch dragon_steak_table
+name serving dragon steak
+slaying money
+food 150
 x 65
 y 14
 end
@@ -52528,7 +52550,7 @@
 y 15
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 65
 y 15
 end
@@ -52537,11 +52559,14 @@
 y 16
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 65
 y 16
 end
 arch dragon_steak_table
+name serving dragon steak
+slaying money
+food 150
 x 65
 y 16
 end
@@ -52550,7 +52575,7 @@
 y 17
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 65
 y 17
 end
@@ -52559,11 +52584,14 @@
 y 18
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 65
 y 18
 end
 arch dragon_steak_table
+name serving dragon steak
+slaying money
+food 150
 x 65
 y 18
 end
@@ -52572,7 +52600,7 @@
 y 19
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 65
 y 19
 end
@@ -52634,7 +52662,7 @@
 end
 arch guildmaster
 name alchemist
-face alchemist.151
+face alchemist.x51
 hp 100
 maxhp 100
 x 65
@@ -53294,7 +53322,7 @@
 y 12
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 66
 y 12
 end
@@ -53311,7 +53339,7 @@
 y 13
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 66
 y 13
 end
@@ -53320,7 +53348,7 @@
 y 14
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 66
 y 14
 end
@@ -53333,7 +53361,7 @@
 y 15
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 66
 y 15
 end
@@ -53342,7 +53370,7 @@
 y 16
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 66
 y 16
 end
@@ -53355,7 +53383,7 @@
 y 17
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 66
 y 17
 end
@@ -53364,7 +53392,7 @@
 y 18
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 66
 y 18
 end
@@ -53377,7 +53405,7 @@
 y 19
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 66
 y 19
 end
@@ -54072,7 +54100,7 @@
 y 12
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 67
 y 12
 end
@@ -54089,7 +54117,7 @@
 y 13
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 67
 y 13
 end
@@ -54103,7 +54131,7 @@
 y 14
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 67
 y 14
 end
@@ -54112,7 +54140,7 @@
 y 15
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 67
 y 15
 end
@@ -54121,7 +54149,7 @@
 y 16
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 67
 y 16
 end
@@ -54130,7 +54158,7 @@
 y 17
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 67
 y 17
 end
@@ -54139,7 +54167,7 @@
 y 18
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 67
 y 18
 end
@@ -54153,7 +54181,7 @@
 y 19
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 67
 y 19
 end
@@ -54910,7 +54938,7 @@
 y 12
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 68
 y 12
 end
@@ -54927,7 +54955,7 @@
 y 13
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 68
 y 13
 end
@@ -54936,7 +54964,7 @@
 y 14
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 68
 y 14
 end
@@ -54949,7 +54977,7 @@
 y 15
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 68
 y 15
 end
@@ -54962,7 +54990,7 @@
 y 16
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 68
 y 16
 end
@@ -54975,7 +55003,7 @@
 y 17
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 68
 y 17
 end
@@ -54988,7 +55016,7 @@
 y 18
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 68
 y 18
 end
@@ -54997,7 +55025,7 @@
 y 19
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 68
 y 19
 end
@@ -55850,7 +55878,6 @@
 x 68
 y 72
 invisible 1
-unique 1
 end
 arch grass
 x 68
@@ -56065,7 +56092,7 @@
 y 12
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 69
 y 12
 end
@@ -56082,7 +56109,7 @@
 y 13
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 69
 y 13
 end
@@ -56095,7 +56122,7 @@
 y 14
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 69
 y 14
 end
@@ -56108,7 +56135,7 @@
 y 15
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 69
 y 15
 end
@@ -56121,7 +56148,7 @@
 y 16
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 69
 y 16
 end
@@ -56134,7 +56161,7 @@
 y 17
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 69
 y 17
 end
@@ -56147,7 +56174,7 @@
 y 18
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 69
 y 18
 end
@@ -56156,7 +56183,7 @@
 y 19
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 69
 y 19
 end
@@ -56212,9 +56239,8 @@
 name Pub with no beer
 name_pl Pub with no beer
 msg
-We don't have XXXX either B-).  Crossfire
-seems to have forgotten about
-including beer.
+We don't have XXXX either B-). Deliantra
+seems to have forgotten about including beer.
 endmsg
 x 69
 y 24
@@ -56523,7 +56549,6 @@
 endmsg
 x 69
 y 42
-material 0
 weight 0
 no_pick 1
 arch event_apply
@@ -56990,7 +57015,7 @@
 y 12
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 70
 y 12
 end
@@ -57007,7 +57032,7 @@
 y 13
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 70
 y 13
 end
@@ -57016,7 +57041,7 @@
 y 14
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 70
 y 14
 end
@@ -57029,7 +57054,7 @@
 y 15
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 70
 y 15
 end
@@ -57042,7 +57067,7 @@
 y 16
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 70
 y 16
 end
@@ -57055,7 +57080,7 @@
 y 17
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 70
 y 17
 end
@@ -57068,7 +57093,7 @@
 y 18
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 70
 y 18
 end
@@ -57077,7 +57102,7 @@
 y 19
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 70
 y 19
 end
@@ -57739,7 +57764,7 @@
 y 12
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 71
 y 12
 end
@@ -57756,7 +57781,7 @@
 y 13
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 71
 y 13
 end
@@ -57765,7 +57790,7 @@
 y 14
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 71
 y 14
 end
@@ -57774,7 +57799,7 @@
 y 15
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 71
 y 15
 end
@@ -57783,7 +57808,7 @@
 y 16
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 71
 y 16
 end
@@ -57792,7 +57817,7 @@
 y 17
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 71
 y 17
 end
@@ -57806,7 +57831,7 @@
 connected 3
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 71
 y 18
 end
@@ -57820,7 +57845,7 @@
 connected 3
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 71
 y 19
 end
@@ -57908,7 +57933,7 @@
 y 27
 level 1
 invisible 0
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 71
@@ -57923,7 +57948,7 @@
 y 28
 level 1
 invisible 0
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 71
@@ -57980,7 +58005,7 @@
 arch check_floor
 name wall
 slaying onefang
-face swall_A.111
+face swall_A.x11
 x 71
 y 34
 invisible 0
@@ -57989,7 +58014,7 @@
 arch icecube
 x 71
 y 34
-material 4
+materialname glass
 weight 0
 glow_radius 4
 no_pick 1
@@ -58079,6 +58104,9 @@
 y 40
 end
 arch pearl_converter
+name buy pearls
+slaying money
+food 50
 x 71
 y 40
 end
@@ -58091,6 +58119,9 @@
 y 41
 end
 arch ruby_converter
+name buy rubies
+slaying money
+food 200
 x 71
 y 41
 end
@@ -58103,6 +58134,9 @@
 y 42
 end
 arch diamond_converter
+name buy diamonds
+slaying money
+food 400
 x 71
 y 42
 end
@@ -58485,7 +58519,7 @@
 y 12
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 72
 y 12
 end
@@ -58502,7 +58536,7 @@
 y 13
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 72
 y 13
 end
@@ -58511,7 +58545,7 @@
 y 14
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 72
 y 14
 end
@@ -58524,7 +58558,7 @@
 y 15
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 72
 y 15
 end
@@ -58537,7 +58571,7 @@
 y 16
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 72
 y 16
 end
@@ -58550,7 +58584,7 @@
 y 17
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 72
 y 17
 end
@@ -58568,7 +58602,7 @@
 connected 3
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 72
 y 18
 end
@@ -58582,7 +58616,7 @@
 connected 3
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 72
 y 19
 end
@@ -58670,7 +58704,7 @@
 y 27
 level 1
 invisible 0
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 72
@@ -58685,7 +58719,7 @@
 y 28
 level 1
 invisible 0
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 72
@@ -58752,7 +58786,7 @@
 arch check_floor
 name wall
 slaying onefang
-face swall_A.111
+face swall_A.x11
 x 72
 y 34
 invisible 0
@@ -58846,6 +58880,9 @@
 y 40
 end
 arch silver_converter
+name buy gold
+slaying money
+food 100
 x 72
 y 40
 end
@@ -58858,6 +58895,9 @@
 y 41
 end
 arch gold_converter
+name buy platinum
+slaying money
+food 10000
 x 72
 y 41
 end
@@ -58870,6 +58910,9 @@
 y 42
 end
 arch platinum_converter
+name buy gold
+slaying money
+food 100
 x 72
 y 42
 end
@@ -59253,7 +59296,7 @@
 y 12
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 73
 y 12
 end
@@ -59270,7 +59313,7 @@
 y 13
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 73
 y 13
 end
@@ -59283,7 +59326,7 @@
 y 14
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 73
 y 14
 end
@@ -59296,7 +59339,7 @@
 y 15
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 73
 y 15
 end
@@ -59309,7 +59352,7 @@
 y 16
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 73
 y 16
 end
@@ -59322,7 +59365,7 @@
 y 17
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 73
 y 17
 end
@@ -59335,7 +59378,7 @@
 y 18
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 73
 y 18
 end
@@ -59348,7 +59391,7 @@
 y 19
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 73
 y 19
 end
@@ -59449,7 +59492,7 @@
 y 27
 level 1
 invisible 0
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 73
@@ -59464,7 +59507,7 @@
 y 28
 level 1
 invisible 0
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 73
@@ -59630,8 +59673,7 @@
 y 40
 end
 arch altar
-name altar of detect curse (25 gp)
-name_pl altar of detect curse (25 gp)
+name altar of detect curse
 slaying money
 sp 79
 food 250
@@ -59647,8 +59689,7 @@
 y 41
 end
 arch altar
-name altar of detect magic (10 gp)
-name_pl altar of detect magic (10 gp)
+name altar of detect magic
 slaying money
 sp 76
 food 100
@@ -60056,7 +60097,7 @@
 y 12
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 74
 y 12
 end
@@ -60073,7 +60114,7 @@
 y 13
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 74
 y 13
 end
@@ -60087,7 +60128,7 @@
 y 14
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 74
 y 14
 end
@@ -60100,7 +60141,7 @@
 y 15
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 74
 y 15
 end
@@ -60113,7 +60154,7 @@
 y 16
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 74
 y 16
 end
@@ -60126,7 +60167,7 @@
 y 17
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 74
 y 17
 end
@@ -60139,7 +60180,7 @@
 y 18
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 74
 y 18
 end
@@ -60153,7 +60194,7 @@
 y 19
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 74
 y 19
 end
@@ -60239,7 +60280,7 @@
 end
 arch invis_exit
 slaying /onefang/IceCastle1
-face director.131
+face director.x31
 hp 74
 sp 27
 x 74
@@ -60259,7 +60300,7 @@
 y 28
 level 1
 invisible 0
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 74
@@ -60824,7 +60865,7 @@
 y 12
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 75
 y 12
 end
@@ -60842,7 +60883,7 @@
 y 13
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 75
 y 13
 end
@@ -60859,7 +60900,7 @@
 y 14
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 75
 y 14
 end
@@ -60876,7 +60917,7 @@
 y 15
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 75
 y 15
 end
@@ -60893,7 +60934,7 @@
 y 16
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 75
 y 16
 end
@@ -60910,7 +60951,7 @@
 y 17
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 75
 y 17
 end
@@ -60927,7 +60968,7 @@
 y 18
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 75
 y 18
 end
@@ -60944,7 +60985,7 @@
 y 19
 end
 arch marble
-face marble_blgr.111
+face marble_blgr.x11
 x 75
 y 19
 end
@@ -63864,7 +63905,7 @@
 the smithy next door keeps this room
 warm.
 Before anybody complians, the authors
-of Crossfire put one of these on
+of Deliantra put one of these on
 public display in Scorn.
 endmsg
 x 79
@@ -63892,7 +63933,7 @@
 end
 arch guildmaster
 name elf
-face elf.151
+face elf.x51
 hp 100
 maxhp 100
 x 79
@@ -63943,10 +63984,6 @@
 Fridays    River Dance
 Saturdays  Opera
 Sundays    Pink Floyd
-NOTE Unlike the mud wrestlers, the
-dancing girls are not supposed to be
-naked.  The Crossfire authors changed
-the graphics after I designed this.
 endmsg
 x 79
 y 39
@@ -64627,7 +64664,7 @@
 arch check_floor
 name wall
 slaying onefang
-face swall_5.111
+face swall_5.x11
 x 80
 y 26
 invisible 0
@@ -64636,7 +64673,7 @@
 arch icecube
 x 80
 y 26
-material 4
+materialname glass
 weight 0
 glow_radius 4
 no_pick 1
@@ -64767,7 +64804,7 @@
 arch check_floor
 name wall
 slaying onefang
-face swall_5.111
+face swall_5.x11
 x 80
 y 33
 invisible 0
@@ -64776,7 +64813,7 @@
 arch icecube
 x 80
 y 33
-material 4
+materialname glass
 weight 0
 glow_radius 4
 no_pick 1
@@ -64875,7 +64912,7 @@
 arch check_floor
 name wall
 slaying onefang
-face swall_5.111
+face swall_5.x11
 x 80
 y 39
 invisible 0
@@ -64884,7 +64921,7 @@
 arch icecube
 x 80
 y 39
-material 4
+materialname glass
 weight 0
 glow_radius 4
 no_pick 1
@@ -66987,7 +67024,7 @@
 name Master smith
 x 83
 y 26
-material 256
+materialname adamant
 no_pick 1
 identified 1
 end
@@ -67754,7 +67791,7 @@
 name Apprentice smith
 x 84
 y 26
-material 256
+materialname adamant
 no_pick 1
 identified 1
 end