--- deliantra/maps/onefang/IceCastle.map	2007/02/07 01:35:44	1.13
+++ deliantra/maps/onefang/IceCastle.map	2010/04/09 14:26:25	1.21
@@ -13,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
@@ -9850,7 +9851,7 @@
 y 13
 speed 0.0
 connected 110
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -9883,7 +9884,7 @@
 y 14
 speed 0.0
 connected 109
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -9909,7 +9910,7 @@
 y 15
 speed 0.0
 connected 108
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -9935,7 +9936,7 @@
 y 16
 speed 0.0
 connected 107
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -9961,7 +9962,7 @@
 y 17
 speed 0.0
 connected 106
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -9987,7 +9988,7 @@
 y 18
 speed 0.0
 connected 105
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -10013,7 +10014,7 @@
 y 19
 speed 0.0
 connected 104
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -10039,7 +10040,7 @@
 y 20
 speed 0.0
 connected 103
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -10065,7 +10066,7 @@
 y 21
 speed 0.0
 connected 102
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -10091,7 +10092,7 @@
 y 22
 speed 0.0
 connected 101
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -10117,7 +10118,7 @@
 y 23
 speed 0.0
 connected 100
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -10141,7 +10142,7 @@
 name laser
 x 13
 y 24
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18434,7 +18435,7 @@
 y 13
 speed 0.0
 connected 115
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18444,7 +18445,7 @@
 y 13
 speed 0.0
 connected 116
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18454,7 +18455,7 @@
 y 13
 speed 0.0
 connected 117
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18464,7 +18465,7 @@
 y 13
 speed 0.0
 connected 118
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18474,7 +18475,7 @@
 y 13
 speed 0.0
 connected 119
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18540,7 +18541,7 @@
 y 19
 speed 0.0
 connected 120
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18608,7 +18609,7 @@
 y 24
 speed 0.0
 connected 110
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18618,7 +18619,7 @@
 y 24
 speed 0.0
 connected 111
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18628,7 +18629,7 @@
 y 24
 speed 0.0
 connected 112
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18638,7 +18639,7 @@
 y 24
 speed 0.0
 connected 113
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -18648,7 +18649,7 @@
 y 24
 speed 0.0
 connected 114
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -21253,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
@@ -21275,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
@@ -21318,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
@@ -21340,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
@@ -22260,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
@@ -22284,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
@@ -22308,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
@@ -22332,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
@@ -23198,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
@@ -23221,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
@@ -23263,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
@@ -23286,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
@@ -24077,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
@@ -24100,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
@@ -24123,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
@@ -24146,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
@@ -26800,7 +26801,7 @@
 y 13
 speed 0.0
 connected 120
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -26908,7 +26909,7 @@
 y 24
 speed 0.0
 connected 120
-move_block 0
+move_block -all
 no_pick 1
 blocksview 0
 end
@@ -28372,7 +28373,7 @@
 x 34
 y 16
 invisible 1
-move_off 0
+move_off -all
 arch event_trigger
 name 
 title Python
@@ -28391,7 +28392,7 @@
 x 34
 y 17
 invisible 1
-move_off 0
+move_off -all
 arch event_trigger
 name 
 title Python
@@ -28410,7 +28411,7 @@
 x 34
 y 18
 invisible 1
-move_off 0
+move_off -all
 arch event_trigger
 name 
 title Python
@@ -28434,7 +28435,7 @@
 x 34
 y 19
 invisible 1
-move_off 0
+move_off -all
 arch event_trigger
 name 
 title Python
@@ -28458,7 +28459,7 @@
 x 34
 y 20
 invisible 1
-move_off 0
+move_off -all
 arch event_trigger
 name 
 title Python
@@ -28477,7 +28478,7 @@
 x 34
 y 21
 invisible 1
-move_off 0
+move_off -all
 arch event_trigger
 name 
 title Python
@@ -29096,7 +29097,7 @@
 x 35
 y 10
 end
-arch cwall_magentamarble
+arch admin_block
 x 35
 y 10
 end
@@ -29112,7 +29113,7 @@
 x 35
 y 11
 end
-arch cwall_magentamarble
+arch admin_block
 x 35
 y 11
 end
@@ -29362,7 +29363,7 @@
 x 35
 y 26
 end
-arch cwall_magentamarble
+arch admin_block
 x 35
 y 26
 end
@@ -29374,7 +29375,7 @@
 x 35
 y 27
 end
-arch cwall_magentamarble
+arch admin_block
 x 35
 y 27
 end
@@ -29930,7 +29931,7 @@
 x 36
 y 10
 end
-arch cwall_magentamarble
+arch admin_block
 x 36
 y 10
 end
@@ -30248,7 +30249,7 @@
 x 36
 y 27
 end
-arch cwall_magentamarble
+arch admin_block
 x 36
 y 27
 end
@@ -30824,7 +30825,7 @@
 x 37
 y 10
 end
-arch cwall_magentamarble
+arch admin_block
 x 37
 y 10
 end
@@ -30974,7 +30975,7 @@
 x 37
 y 27
 end
-arch cwall_magentamarble
+arch admin_block
 x 37
 y 27
 end
@@ -31526,7 +31527,7 @@
 x 38
 y 10
 end
-arch cwall_magentamarble
+arch admin_block
 x 38
 y 10
 end
@@ -31666,7 +31667,7 @@
 x 38
 y 27
 end
-arch cwall_magentamarble
+arch admin_block
 x 38
 y 27
 end
@@ -32232,7 +32233,7 @@
 x 39
 y 10
 end
-arch cwall_magentamarble
+arch admin_block
 x 39
 y 10
 end
@@ -32382,7 +32383,7 @@
 x 39
 y 27
 end
-arch cwall_magentamarble
+arch admin_block
 x 39
 y 27
 end
@@ -32955,7 +32956,7 @@
 x 40
 y 10
 end
-arch cwall_magentamarble
+arch admin_block
 x 40
 y 10
 end
@@ -33105,7 +33106,7 @@
 x 40
 y 27
 end
-arch cwall_magentamarble
+arch admin_block
 x 40
 y 27
 end
@@ -33675,7 +33676,7 @@
 x 41
 y 10
 end
-arch cwall_magentamarble
+arch admin_block
 x 41
 y 10
 end
@@ -33845,7 +33846,7 @@
 x 41
 y 27
 end
-arch cwall_magentamarble
+arch admin_block
 x 41
 y 27
 end
@@ -34389,7 +34390,7 @@
 x 42
 y 10
 end
-arch cwall_magentamarble
+arch admin_block
 x 42
 y 10
 end
@@ -34401,7 +34402,7 @@
 x 42
 y 11
 end
-arch cwall_magentamarble
+arch admin_block
 x 42
 y 11
 end
@@ -34413,7 +34414,7 @@
 x 42
 y 12
 end
-arch cwall_magentamarble
+arch admin_block
 x 42
 y 12
 end
@@ -34425,7 +34426,7 @@
 x 42
 y 13
 end
-arch cwall_magentamarble
+arch admin_block
 x 42
 y 13
 end
@@ -34437,7 +34438,7 @@
 x 42
 y 14
 end
-arch cwall_magentamarble
+arch admin_block
 x 42
 y 14
 end
@@ -34449,7 +34450,7 @@
 x 42
 y 15
 end
-arch cwall_magentamarble
+arch admin_block
 x 42
 y 15
 end
@@ -34461,7 +34462,7 @@
 x 42
 y 16
 end
-arch cwall_magentamarble
+arch admin_block
 x 42
 y 16
 end
@@ -34473,7 +34474,7 @@
 x 42
 y 17
 end
-arch cwall_magentamarble
+arch admin_block
 x 42
 y 17
 end
@@ -34485,7 +34486,7 @@
 x 42
 y 18
 end
-arch cwall_magentamarble
+arch admin_block
 x 42
 y 18
 end
@@ -34497,7 +34498,7 @@
 x 42
 y 19
 end
-arch cwall_magentamarble
+arch admin_block
 x 42
 y 19
 end
@@ -34509,7 +34510,7 @@
 x 42
 y 20
 end
-arch cwall_magentamarble
+arch admin_block
 x 42
 y 20
 end
@@ -34521,7 +34522,7 @@
 x 42
 y 21
 end
-arch cwall_magentamarble
+arch admin_block
 x 42
 y 21
 end
@@ -34533,7 +34534,7 @@
 x 42
 y 22
 end
-arch cwall_magentamarble
+arch admin_block
 x 42
 y 22
 end
@@ -34545,7 +34546,7 @@
 x 42
 y 23
 end
-arch cwall_magentamarble
+arch admin_block
 x 42
 y 23
 end
@@ -34557,7 +34558,7 @@
 x 42
 y 24
 end
-arch cwall_magentamarble
+arch admin_block
 x 42
 y 24
 end
@@ -34569,7 +34570,7 @@
 x 42
 y 25
 end
-arch cwall_magentamarble
+arch admin_block
 x 42
 y 25
 end
@@ -34581,7 +34582,7 @@
 x 42
 y 26
 end
-arch cwall_magentamarble
+arch admin_block
 x 42
 y 26
 end
@@ -34593,7 +34594,7 @@
 x 42
 y 27
 end
-arch cwall_magentamarble
+arch admin_block
 x 42
 y 27
 end
@@ -39249,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
@@ -43572,6 +43569,9 @@
 y 23
 end
 arch booze_table
+name serving booze
+slaying money
+food 30
 x 54
 y 23
 end
@@ -43586,6 +43586,9 @@
 y 24
 end
 arch booze_table
+name serving booze
+slaying money
+food 30
 x 54
 y 24
 end
@@ -43600,6 +43603,9 @@
 y 25
 end
 arch booze_table
+name serving booze
+slaying money
+food 30
 x 54
 y 25
 end
@@ -43614,6 +43620,9 @@
 y 26
 end
 arch booze_table
+name serving booze
+slaying money
+food 30
 x 54
 y 26
 end
@@ -43628,6 +43637,9 @@
 y 27
 end
 arch booze_table
+name serving booze
+slaying money
+food 30
 x 54
 y 27
 end
@@ -43642,6 +43654,9 @@
 y 28
 end
 arch booze_table
+name serving booze
+slaying money
+food 30
 x 54
 y 28
 end
@@ -49259,6 +49274,9 @@
 y 13
 end
 arch food_table
+name serving food
+slaying money
+food 70
 x 61
 y 13
 end
@@ -49281,6 +49299,9 @@
 y 15
 end
 arch food_table
+name serving food
+slaying money
+food 70
 x 61
 y 15
 end
@@ -49303,6 +49324,9 @@
 y 17
 end
 arch food_table
+name serving food
+slaying money
+food 70
 x 61
 y 17
 end
@@ -52515,6 +52539,9 @@
 y 14
 end
 arch dragon_steak_table
+name serving dragon steak
+slaying money
+food 150
 x 65
 y 14
 end
@@ -52537,6 +52564,9 @@
 y 16
 end
 arch dragon_steak_table
+name serving dragon steak
+slaying money
+food 150
 x 65
 y 16
 end
@@ -52559,6 +52589,9 @@
 y 18
 end
 arch dragon_steak_table
+name serving dragon steak
+slaying money
+food 150
 x 65
 y 18
 end
@@ -56206,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
@@ -57901,7 +57933,7 @@
 y 27
 level 1
 invisible 0
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 71
@@ -57916,7 +57948,7 @@
 y 28
 level 1
 invisible 0
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 71
@@ -58072,6 +58104,9 @@
 y 40
 end
 arch pearl_converter
+name buy pearls
+slaying money
+food 50
 x 71
 y 40
 end
@@ -58084,6 +58119,9 @@
 y 41
 end
 arch ruby_converter
+name buy rubies
+slaying money
+food 200
 x 71
 y 41
 end
@@ -58096,6 +58134,9 @@
 y 42
 end
 arch diamond_converter
+name buy diamonds
+slaying money
+food 400
 x 71
 y 42
 end
@@ -58663,7 +58704,7 @@
 y 27
 level 1
 invisible 0
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 72
@@ -58678,7 +58719,7 @@
 y 28
 level 1
 invisible 0
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 72
@@ -58839,6 +58880,8 @@
 y 40
 end
 arch silver_converter
+name buy gold
+slaying money
 x 72
 y 40
 end
@@ -58851,6 +58894,9 @@
 y 41
 end
 arch gold_converter
+name buy platinum
+slaying money
+food 10000
 x 72
 y 41
 end
@@ -58863,6 +58909,9 @@
 y 42
 end
 arch platinum_converter
+name buy gold
+slaying money
+food 100
 x 72
 y 42
 end
@@ -59442,7 +59491,7 @@
 y 27
 level 1
 invisible 0
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 73
@@ -59457,7 +59506,7 @@
 y 28
 level 1
 invisible 0
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 73
@@ -59623,8 +59672,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
@@ -59640,8 +59688,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
@@ -60252,7 +60299,7 @@
 y 28
 level 1
 invisible 0
-move_on 0
+move_on -all
 end
 arch dungeon_magic
 x 74
@@ -63857,7 +63904,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
@@ -63936,10 +63983,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