--- deliantra/maps/pup_land/raffle/raffle3.map	2006/02/05 00:01:25	1.1
+++ deliantra/maps/pup_land/raffle/raffle3.map	2007/03/05 12:33:15	1.7
@@ -1,16 +1,17 @@
 arch map
-region pupland
+file_format_version 1
 name raffle
+region pupland
+width 22
+height 30
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sun Dec 29 03:15:18 1996
 endmsg
-x 22
-y 30
+stand_still 1
 value 5
 weight 3600
-stand_still 1
 end
 arch blocked
 end
@@ -538,7 +539,7 @@
 arch flagstone
 x 2
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 19
@@ -549,10 +550,10 @@
 end
 arch bolt_silk
 name tissue paper
-face tissu.111
+face tissu.x11
 x 2
 y 1
-material 1
+materialname paper
 end
 arch dungeon_magic
 x 2
@@ -708,11 +709,9 @@
 ac 0
 x 2
 y 13
-material 0
 randomitems none
+move_block -all
 alive 0
-no_pass 0
-pass_thru 0
 end
 arch dungeon_magic
 x 2
@@ -866,7 +865,7 @@
 arch flagstone
 x 3
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 19
@@ -877,7 +876,7 @@
 end
 arch bed_1
 name kitty's bed
-face neko_kago.111
+face neko_kago.x11
 x 3
 y 1
 attacktype 256
@@ -887,20 +886,20 @@
 arch neko
 name kitty
 msg
-@match mew|Mew|MEW
+@match mew
 Mew mew mew?!
 (You can understand our language,
  can't you?!)
-@match hello|Hello
+@match hello
 Mew mew.
 (Hello. I'm a Kitty.)
-@match hi|Hi
+@match hi
 Mew.
 (Hi. I'm a Kitty.)
-@match kitty|Kitty
+@match kitty
 Mew mew!
 (I'm Hungry!)
-@match hungry|Hungry
+@match hungry
 Mew mew mew mew!!!!
 (I like fish very much!)
 @match yes
@@ -940,11 +939,11 @@
 sleep 0
 arch collar
 name lovely collar
-Cha 3
+cha 3
 end
 arch orcchop
 name kitty's dead body
-face dead_neko.111
+face dead_neko.x11
 weight 500
 end
 end
@@ -1282,7 +1281,7 @@
 arch flagstone
 x 4
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 19
@@ -1296,8 +1295,8 @@
 msg
 Japanese traditional healthy food.
 endmsg
-face icecube.111
-Con 2
+face icecube.x11
+con 2
 food 999
 x 4
 y 1
@@ -1616,7 +1615,7 @@
 arch flagstone
 x 5
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 19
@@ -1627,7 +1626,7 @@
 end
 arch talisman_sorcery
 name rabbit's foot
-face r_foot.111
+face r_foot.x11
 luck 1
 x 5
 y 1
@@ -1945,7 +1944,7 @@
 arch flagstone
 x 6
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 19
@@ -1956,8 +1955,8 @@
 end
 arch stylus
 name QP
-face doll.111
-Cha 2
+face doll.x11
+cha 2
 x 6
 y 1
 end
@@ -2274,7 +2273,7 @@
 You need the raffle ticket No.3 to pull
 this lever.
 endmsg
-face enchantment.111
+face enchantment.x11
 x 6
 y 26
 invisible 1
@@ -2331,7 +2330,7 @@
 arch flagstone
 x 7
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 19
@@ -2342,8 +2341,8 @@
 end
 arch holy_symbol
 name unlucky strike
-face unluck.111
-Con -1
+face unluck.x11
+con -1
 x 7
 y 1
 resist_confusion 30
@@ -2689,7 +2688,7 @@
 arch flagstone
 x 8
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 19
@@ -3062,7 +3061,7 @@
 arch flagstone
 x 9
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 19
@@ -3417,7 +3416,7 @@
 arch flagstone
 x 10
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 19
@@ -3774,7 +3773,7 @@
 arch flagstone
 x 11
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 19
@@ -4123,7 +4122,7 @@
 arch flagstone
 x 12
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 19
@@ -4481,7 +4480,7 @@
 arch flagstone
 x 13
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 19
@@ -4862,7 +4861,7 @@
 arch flagstone
 x 14
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 19
@@ -5236,7 +5235,7 @@
 arch flagstone
 x 15
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 19