--- deliantra/maps/pup_land/raffle/raffle3_u2.map	2006/02/05 00:01:25	1.1
+++ deliantra/maps/pup_land/raffle/raffle3_u2.map	2007/03/05 12:33:15	1.6
@@ -1,30 +1,25 @@
 arch map
-region pupland
+file_format_version 1
 name raffle_u1
+region pupland
+width 37
+height 41
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Mon Feb 24 21:58:23 1997
 endmsg
-x 37
-y 41
+invisible 3
 level 7
 value 5
 weight 3600
-invisible 3
 end
 arch blocked
-msg
-endmsg
 end
 arch blocked
-msg
-endmsg
 y 1
 end
 arch blocked
-msg
-endmsg
 y 2
 end
 arch dungeon_magic
@@ -34,28 +29,18 @@
 y 3
 end
 arch blocked
-msg
-endmsg
 y 3
 end
 arch blocked
-msg
-endmsg
 y 4
 end
 arch blocked
-msg
-endmsg
 y 5
 end
 arch blocked
-msg
-endmsg
 y 6
 end
 arch blocked
-msg
-endmsg
 y 7
 end
 arch small_stones
@@ -71,8 +56,6 @@
 y 9
 end
 arch blocked
-msg
-endmsg
 y 10
 end
 arch small_stones
@@ -124,18 +107,12 @@
 y 18
 end
 arch blocked
-msg
-endmsg
 y 19
 end
 arch blocked
-msg
-endmsg
 y 21
 end
 arch blocked
-msg
-endmsg
 y 22
 end
 arch small_stones
@@ -169,38 +146,24 @@
 y 27
 end
 arch blocked
-msg
-endmsg
 y 28
 end
 arch blocked
-msg
-endmsg
 y 29
 end
 arch blocked
-msg
-endmsg
 y 30
 end
 arch blocked
-msg
-endmsg
 y 31
 end
 arch blocked
-msg
-endmsg
 y 32
 end
 arch blocked
-msg
-endmsg
 y 33
 end
 arch blocked
-msg
-endmsg
 x 1
 end
 arch spikes_open
@@ -222,8 +185,6 @@
 connected 202
 end
 arch blocked
-msg
-endmsg
 x 1
 y 3
 end
@@ -244,8 +205,6 @@
 y 5
 end
 arch blocked
-msg
-endmsg
 x 1
 y 6
 end
@@ -354,8 +313,6 @@
 y 19
 end
 arch blocked
-msg
-endmsg
 x 1
 y 20
 end
@@ -456,49 +413,33 @@
 y 32
 end
 arch blocked
-msg
-endmsg
 x 1
 y 33
 end
 arch blocked
-msg
-endmsg
 x 1
 y 34
 end
 arch blocked
-msg
-endmsg
 x 1
 y 35
 end
 arch blocked
-msg
-endmsg
 x 1
 y 36
 end
 arch blocked
-msg
-endmsg
 x 1
 y 37
 end
 arch blocked
-msg
-endmsg
 x 2
 end
 arch blocked
-msg
-endmsg
 x 2
 y 1
 end
 arch blocked
-msg
-endmsg
 x 2
 y 2
 end
@@ -574,6 +515,27 @@
 x 2
 y 11
 end
+arch big_dragon
+name Mega Dragon
+con 100
+wis 1
+pow 15
+hp 20000
+maxhp 10000
+sp 200
+maxsp 200
+exp 1000000
+dam 500
+wc -99
+ac -66
+x 2
+y 11
+level 50
+attacktype 1
+resist_slow -100
+resist_paralyze -100
+resist_fear -100
+end
 arch dungeon_magic
 x 2
 y 12
@@ -775,20 +737,14 @@
 y 36
 end
 arch blocked
-msg
-endmsg
 x 2
 y 37
 end
 arch blocked
-msg
-endmsg
 x 2
 y 38
 end
 arch blocked
-msg
-endmsg
 x 2
 y 39
 end
@@ -797,8 +753,6 @@
 y 40
 end
 arch blocked
-msg
-endmsg
 x 3
 end
 arch spikes_open
@@ -1090,14 +1044,10 @@
 y 36
 end
 arch blocked
-msg
-endmsg
 x 3
 y 37
 end
 arch blocked
-msg
-endmsg
 x 3
 y 38
 end
@@ -1113,14 +1063,10 @@
 y 39
 end
 arch blocked
-msg
-endmsg
 x 3
 y 40
 end
 arch blocked
-msg
-endmsg
 x 4
 end
 arch small_stones
@@ -1323,8 +1269,6 @@
 y 23
 end
 arch blocked
-msg
-endmsg
 x 4
 y 24
 end
@@ -1433,8 +1377,6 @@
 y 37
 end
 arch blocked
-msg
-endmsg
 x 4
 y 38
 end
@@ -1444,8 +1386,6 @@
 connected 302
 end
 arch blocked
-msg
-endmsg
 x 4
 y 40
 end
@@ -1614,7 +1554,7 @@
 arch cave13
 x 5
 y 20
-no_pass 0
+move_block -all
 end
 arch dungeon_magic
 x 5
@@ -2095,8 +2035,6 @@
 y 40
 end
 arch blocked
-msg
-endmsg
 x 7
 end
 arch small_stones
@@ -2268,8 +2206,6 @@
 y 21
 end
 arch blocked
-msg
-endmsg
 x 7
 y 22
 end
@@ -2410,14 +2346,10 @@
 y 39
 end
 arch blocked
-msg
-endmsg
 x 7
 y 40
 end
 arch blocked
-msg
-endmsg
 x 8
 end
 arch small_stones
@@ -2505,14 +2437,10 @@
 y 10
 end
 arch blocked
-msg
-endmsg
 x 8
 y 10
 end
 arch blocked
-msg
-endmsg
 x 8
 y 11
 end
@@ -2669,7 +2597,7 @@
 y 30
 end
 arch block_door_closed
-face cave1.111
+face cave1.x11
 x 8
 y 30
 speed 0.500000
@@ -2716,6 +2644,19 @@
 x 8
 y 35
 end
+arch big_wiz
+name Arch Wizard
+pow 24
+hp 8000
+maxhp 8000
+maxsp 300
+exp 800000
+ac -30
+x 8
+y 35
+speed_left -32.099998
+level 50
+end
 arch dungeon_magic
 x 8
 y 36
@@ -2757,8 +2698,6 @@
 y 40
 end
 arch blocked
-msg
-endmsg
 x 9
 end
 arch small_stones
@@ -2953,6 +2892,10 @@
 x 9
 y 24
 end
+arch big_wiz
+x 9
+y 24
+end
 arch dungeon_magic
 x 9
 y 25
@@ -3002,7 +2945,7 @@
 y 30
 end
 arch block_door_closed
-face cave3.111
+face cave3.x11
 x 9
 y 30
 speed 0.500000
@@ -3279,7 +3222,7 @@
 y 13
 end
 arch block_door_closed
-face cave2.111
+face cave2.x11
 x 10
 y 13
 speed 0.500000
@@ -3295,7 +3238,7 @@
 y 14
 end
 arch block_door_closed
-face cave4.111
+face cave4.x11
 x 10
 y 14
 speed 0.500000
@@ -3514,8 +3457,6 @@
 y 39
 end
 arch blocked
-msg
-endmsg
 x 10
 y 40
 end
@@ -3565,6 +3506,10 @@
 x 11
 y 5
 end
+arch big_dragon
+x 11
+y 5
+end
 arch dungeon_magic
 x 11
 y 6
@@ -3645,6 +3590,27 @@
 x 11
 y 15
 end
+arch big_dragon
+name Mega Dragon
+con 100
+wis 1
+pow 15
+hp 20000
+maxhp 10000
+sp 200
+maxsp 200
+exp 1000000
+dam 500
+wc -99
+ac -66
+x 11
+y 15
+level 50
+attacktype 1
+resist_slow -100
+resist_paralyze -100
+resist_fear -100
+end
 arch dungeon_magic
 x 11
 y 16
@@ -3759,7 +3725,7 @@
 end
 arch magic_ear
 msg
-@match Pilkul|PilKul|pilkul
+@match pilkul
 Click.
 endmsg
 x 11
@@ -4428,8 +4394,6 @@
 y 31
 end
 arch blocked
-msg
-endmsg
 x 13
 y 32
 end
@@ -4729,8 +4693,6 @@
 connected 2000
 end
 arch blocked
-msg
-endmsg
 x 14
 y 32
 end
@@ -4779,8 +4741,6 @@
 y 39
 end
 arch blocked
-msg
-endmsg
 x 14
 y 40
 end
@@ -4847,8 +4807,6 @@
 y 7
 end
 arch blocked
-msg
-endmsg
 x 15
 y 8
 end
@@ -4885,14 +4843,10 @@
 y 12
 end
 arch blocked
-msg
-endmsg
 x 15
 y 13
 end
 arch blocked
-msg
-endmsg
 x 15
 y 14
 end
@@ -5011,7 +4965,7 @@
 arch cave6
 x 15
 y 28
-no_pass 0
+move_block -all
 end
 arch small_stones
 x 15
@@ -5022,8 +4976,6 @@
 y 29
 end
 arch blocked
-msg
-endmsg
 x 15
 y 30
 end
@@ -5039,8 +4991,6 @@
 y 31
 end
 arch blocked
-msg
-endmsg
 x 15
 y 32
 end
@@ -5077,26 +5027,18 @@
 y 37
 end
 arch blocked
-msg
-endmsg
 x 15
 y 38
 end
 arch blocked
-msg
-endmsg
 x 15
 y 39
 end
 arch blocked
-msg
-endmsg
 x 15
 y 40
 end
 arch blocked
-msg
-endmsg
 x 16
 end
 arch small_stones
@@ -5156,14 +5098,10 @@
 y 7
 end
 arch blocked
-msg
-endmsg
 x 16
 y 8
 end
 arch blocked
-msg
-endmsg
 x 16
 y 9
 end
@@ -5176,26 +5114,18 @@
 y 11
 end
 arch blocked
-msg
-endmsg
 x 16
 y 12
 end
 arch blocked
-msg
-endmsg
 x 16
 y 13
 end
 arch blocked
-msg
-endmsg
 x 16
 y 14
 end
 arch blocked
-msg
-endmsg
 x 16
 y 15
 end
@@ -5322,7 +5252,7 @@
 arch cave8
 x 16
 y 28
-no_pass 0
+move_block -all
 end
 arch flagstone
 x 16
@@ -5399,13 +5329,9 @@
 y 40
 end
 arch blocked
-msg
-endmsg
 x 17
 end
 arch blocked
-msg
-endmsg
 x 17
 y 1
 end
@@ -5722,8 +5648,6 @@
 y 40
 end
 arch blocked
-msg
-endmsg
 x 18
 end
 arch small_stones
@@ -5775,8 +5699,6 @@
 y 6
 end
 arch blocked
-msg
-endmsg
 x 18
 y 7
 end
@@ -5943,8 +5865,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 18
 y 26
 end
@@ -6081,7 +6001,7 @@
 arch cave15
 x 19
 y 2
-no_pass 0
+move_block -all
 end
 arch dungeon_magic
 x 19
@@ -6112,8 +6032,6 @@
 y 5
 end
 arch blocked
-msg
-endmsg
 x 19
 y 6
 end
@@ -6283,8 +6201,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 19
 y 26
 end
@@ -6473,8 +6389,6 @@
 y 5
 end
 arch blocked
-msg
-endmsg
 x 20
 y 6
 end
@@ -6657,8 +6571,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 20
 y 26
 end
@@ -7070,8 +6982,6 @@
 y 33
 end
 arch blocked
-msg
-endmsg
 x 21
 y 33
 end
@@ -7592,8 +7502,6 @@
 y 40
 end
 arch blocked
-msg
-endmsg
 x 23
 end
 arch small_stones
@@ -7969,8 +7877,6 @@
 y 40
 end
 arch blocked
-msg
-endmsg
 x 24
 end
 arch small_stones
@@ -8030,32 +7936,22 @@
 y 7
 end
 arch blocked
-msg
-endmsg
 x 24
 y 8
 end
 arch blocked
-msg
-endmsg
 x 24
 y 9
 end
 arch blocked
-msg
-endmsg
 x 24
 y 10
 end
 arch blocked
-msg
-endmsg
 x 24
 y 11
 end
 arch blocked
-msg
-endmsg
 x 24
 y 12
 end
@@ -8327,8 +8223,6 @@
 y 40
 end
 arch blocked
-msg
-endmsg
 x 25
 end
 arch small_stones
@@ -8388,20 +8282,14 @@
 y 7
 end
 arch blocked
-msg
-endmsg
 x 25
 y 8
 end
 arch blocked
-msg
-endmsg
 x 25
 y 9
 end
 arch blocked
-msg
-endmsg
 x 25
 y 10
 end
@@ -8437,6 +8325,10 @@
 x 25
 y 14
 end
+arch dread
+x 25
+y 14
+end
 arch dungeon_magic
 x 25
 y 15
@@ -8518,8 +8410,6 @@
 y 23
 end
 arch blocked
-msg
-endmsg
 x 25
 y 24
 end
@@ -8777,8 +8667,6 @@
 y 7
 end
 arch blocked
-msg
-endmsg
 x 26
 y 8
 end
@@ -8887,26 +8775,18 @@
 y 21
 end
 arch blocked
-msg
-endmsg
 x 26
 y 22
 end
 arch blocked
-msg
-endmsg
 x 26
 y 23
 end
 arch blocked
-msg
-endmsg
 x 26
 y 24
 end
 arch blocked
-msg
-endmsg
 x 26
 y 25
 end
@@ -9635,7 +9515,7 @@
 y 22
 end
 arch block_door_closed
-face cave2.111
+face cave2.x11
 x 28
 y 22
 speed 0.500000
@@ -9643,7 +9523,7 @@
 connected 600
 end
 arch block_door_closed
-face blocked.111
+face blocked.x11
 x 28
 y 23
 speed 0.500000
@@ -9651,7 +9531,7 @@
 connected 600
 end
 arch block_door_closed
-face blocked.111
+face blocked.x11
 x 28
 y 24
 speed 0.500000
@@ -9659,7 +9539,7 @@
 connected 600
 end
 arch block_door_closed
-face blocked.111
+face blocked.x11
 x 28
 y 25
 speed 0.500000
@@ -9671,7 +9551,7 @@
 y 26
 end
 arch block_door_closed
-face cave4.111
+face cave4.x11
 x 28
 y 26
 speed 0.500000
@@ -10437,20 +10317,14 @@
 y 22
 end
 arch blocked
-msg
-endmsg
 x 30
 y 23
 end
 arch blocked
-msg
-endmsg
 x 30
 y 24
 end
 arch blocked
-msg
-endmsg
 x 30
 y 25
 end
@@ -10463,8 +10337,6 @@
 y 26
 end
 arch blocked
-msg
-endmsg
 x 30
 y 26
 end
@@ -10520,7 +10392,7 @@
 y 31
 end
 arch block_door_closed
-face mine_C.111
+face mine_C.x11
 x 30
 y 31
 speed 0.500000
@@ -10536,7 +10408,7 @@
 y 32
 end
 arch block_door_closed
-face mine_A.111
+face mine_A.x11
 x 30
 y 32
 speed 0.500000
@@ -10572,6 +10444,11 @@
 y 35
 attacktype 1
 end
+arch big_demon
+x 30
+y 35
+speed_left -7.900000
+end
 arch dungeon_magic
 x 30
 y 36
@@ -10755,7 +10632,7 @@
 y 14
 end
 arch block_door_closed
-face cave21.111
+face cave21.x11
 x 31
 y 14
 speed 0.500000
@@ -10771,7 +10648,7 @@
 y 15
 end
 arch block_door_closed
-face cave21.111
+face cave21.x11
 x 31
 y 15
 speed 0.500000
@@ -10843,8 +10720,6 @@
 y 23
 end
 arch blocked
-msg
-endmsg
 x 31
 y 24
 end
@@ -10862,8 +10737,6 @@
 y 26
 end
 arch blocked
-msg
-endmsg
 x 31
 y 26
 end
@@ -10885,7 +10758,7 @@
 end
 arch magic_ear
 msg
-@match Go|go
+@match go
 Click.
 endmsg
 x 31
@@ -11130,8 +11003,6 @@
 y 12
 end
 arch blocked
-msg
-endmsg
 x 32
 y 12
 end
@@ -11183,6 +11054,10 @@
 x 32
 y 18
 end
+arch dread
+x 32
+y 18
+end
 arch dungeon_magic
 x 32
 y 19
@@ -11251,8 +11126,6 @@
 y 26
 end
 arch blocked
-msg
-endmsg
 x 32
 y 26
 end
@@ -11600,14 +11473,10 @@
 y 24
 end
 arch blocked
-msg
-endmsg
 x 33
 y 25
 end
 arch blocked
-msg
-endmsg
 x 33
 y 26
 end
@@ -11785,6 +11654,19 @@
 x 34
 y 7
 end
+arch dread
+name Dreadful Dread
+hp 7000
+maxhp 5000
+exp 400000
+dam 200
+wc -50
+ac -40
+x 34
+y 7
+level 35
+attacktype 3
+end
 arch pstone_1
 x 34
 y 8
@@ -11925,8 +11807,6 @@
 y 23
 end
 arch blocked
-msg
-endmsg
 x 34
 y 24
 end
@@ -11936,8 +11816,6 @@
 connected 402
 end
 arch blocked
-msg
-endmsg
 x 34
 y 26
 end
@@ -12237,8 +12115,6 @@
 y 23
 end
 arch blocked
-msg
-endmsg
 x 35
 y 24
 end
@@ -12254,8 +12130,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 35
 y 26
 end
@@ -12521,8 +12395,6 @@
 y 19
 end
 arch blocked
-msg
-endmsg
 x 36
 y 20
 end
@@ -12543,8 +12415,6 @@
 y 22
 end
 arch blocked
-msg
-endmsg
 x 36
 y 23
 end
@@ -12553,14 +12423,10 @@
 y 24
 end
 arch blocked
-msg
-endmsg
 x 36
 y 25
 end
 arch blocked
-msg
-endmsg
 x 36
 y 26
 end
@@ -12676,92 +12542,3 @@
 x 36
 y 40
 end
-arch big_dragon
-name Mega Dragon
-Con 100
-Wis 1
-Pow 15
-hp 20000
-maxhp 10000
-sp 200
-maxsp 200
-exp 1000000
-dam 500
-wc -99
-ac -66
-x 2
-y 11
-level 50
-attacktype 1
-resist_slow -100
-resist_paralyze -100
-resist_fear -100
-end
-arch big_wiz
-name Arch Wizard
-Pow 24
-hp 8000
-maxhp 8000
-maxsp 300
-exp 800000
-ac -30
-x 8
-y 35
-speed_left -32.099998
-level 50
-end
-arch big_wiz
-x 9
-y 24
-end
-arch big_dragon
-x 11
-y 5
-end
-arch big_dragon
-name Mega Dragon
-Con 100
-Wis 1
-Pow 15
-hp 20000
-maxhp 10000
-sp 200
-maxsp 200
-exp 1000000
-dam 500
-wc -99
-ac -66
-x 11
-y 15
-level 50
-attacktype 1
-resist_slow -100
-resist_paralyze -100
-resist_fear -100
-end
-arch dread
-x 25
-y 14
-end
-arch big_demon
-x 30
-y 35
-speed_left -7.900000
-end
-arch dread
-x 32
-y 18
-end
-arch dread
-name Dreadful Dread
-hp 7000
-maxhp 5000
-exp 400000
-dam 200
-wc -50
-ac -40
-x 34
-y 7
-level 35
-attacktype 3
-end