--- cf.schmorp.de/maps/teamarena/twregister.map	2006/02/05 00:00:51	1.1
+++ cf.schmorp.de/maps/teamarena/twregister.map	2006/05/07 08:56:19	1.2
@@ -1,11 +1,11 @@
 arch map
 name twregister
+width 17
+height 14
 msg
 Creator: josh@woosworld.net
 Date:    3/21/2005
 endmsg
-width 17
-height 14
 end
 arch wasteland
 end
@@ -72,11 +72,11 @@
 end
 arch fire_witch
 name Elite Guard
+x 1
+y 1
 monster 0
 unaggressive 1
 stand_still 1
-x 1
-y 1
 end
 arch dungeon_magic
 x 1
@@ -103,10 +103,10 @@
 y 4
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 1
 y 5
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 1
@@ -137,20 +137,20 @@
 y 8
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 1
 y 9
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 1
 y 9
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 1
 y 10
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 1
@@ -170,20 +170,20 @@
 y 11
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 1
 y 12
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 1
 y 12
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 1
 y 13
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 1
@@ -218,11 +218,11 @@
 end
 arch fire_witch
 name Elite Guard
+x 2
+y 2
 monster 0
 unaggressive 1
 stand_still 1
-x 2
-y 2
 end
 arch dungeon_magic
 x 2
@@ -241,10 +241,10 @@
 y 4
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 2
 y 5
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 2
@@ -275,10 +275,10 @@
 y 8
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 2
 y 9
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 2
@@ -324,10 +324,10 @@
 y 12
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 2
 y 13
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 2
@@ -362,11 +362,11 @@
 end
 arch fire_witch
 name Elite Guard
+x 3
+y 2
 monster 0
 unaggressive 1
 stand_still 1
-x 3
-y 2
 end
 arch dungeon_magic
 x 3
@@ -385,10 +385,10 @@
 y 4
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 3
 y 5
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 3
@@ -404,10 +404,9 @@
 @match *
 Stand back.  Guards only.
 endmsg
-walk_on 0
-fly_on 0
 x 3
 y 6
+move_on 0
 end
 arch dirtfloor
 x 3
@@ -416,9 +415,9 @@
 arch dun0
 name Guard
 face witch_fire.111
-blocksview 0
 x 3
 y 6
+blocksview 0
 end
 arch dungeon_magic
 x 3
@@ -437,10 +436,10 @@
 y 8
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 3
 y 9
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 3
@@ -490,10 +489,10 @@
 y 12
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 3
 y 13
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 3
@@ -516,11 +515,11 @@
 end
 arch fire_witch
 name Elite Guard
+x 4
+y 1
 monster 0
 unaggressive 1
 stand_still 1
-x 4
-y 1
 end
 arch dungeon_magic
 x 4
@@ -547,10 +546,10 @@
 y 4
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 4
 y 5
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 4
@@ -581,10 +580,10 @@
 y 8
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 4
 y 9
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 4
@@ -630,10 +629,10 @@
 y 12
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 4
 y 13
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 4
@@ -643,50 +642,50 @@
 x 5
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 5
 y 1
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 5
 y 1
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 5
 y 2
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 5
 y 2
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 5
 y 3
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 5
 y 3
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 5
 y 4
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 5
 y 4
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 5
 y 5
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 5
@@ -703,9 +702,9 @@
 arch dun0
 name Guard
 face witch_fire.111
-blocksview 0
 x 5
 y 6
+blocksview 0
 end
 arch dungeon_magic
 x 5
@@ -724,50 +723,50 @@
 y 8
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 5
 y 9
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 5
 y 9
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 5
 y 10
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 5
 y 10
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 5
 y 11
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 5
 y 11
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 5
 y 12
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 5
 y 12
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 5
 y 13
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 5
@@ -888,10 +887,9 @@
 @match ruby|Ruby|rubies|Rubies
 Rubies are very valuable to our society.
 endmsg
-walk_on 0
-fly_on 0
 x 6
 y 11
+move_on 0
 end
 arch dirtfloor
 x 6
@@ -900,9 +898,9 @@
 arch dun0
 name Frosty
 face witch_fire.111
-blocksview 0
 x 6
 y 11
+blocksview 0
 end
 arch dungeon_magic
 x 6
@@ -1363,40 +1361,40 @@
 x 11
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 11
 y 1
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 11
 y 1
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 11
 y 2
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 11
 y 2
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 11
 y 3
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 11
 y 3
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 11
 y 4
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 11
@@ -1474,10 +1472,10 @@
 x 12
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 12
 y 1
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 12
@@ -1492,10 +1490,10 @@
 y 2
 end
 arch marker
+slaying team1
 msg
 Welcome to Team 1!
 endmsg
-slaying team1
 food 500000
 x 12
 y 2
@@ -1504,15 +1502,15 @@
 slaying teamwar
 hp 4
 sp 8
-speed 0.2
 x 12
 y 2
+speed 0.2
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 12
 y 3
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 12
@@ -1528,25 +1526,25 @@
 end
 arch altar_trigger
 name Team 1 - 250 Rubies
+slaying ruby
 msg
 Lets get ready to rumble!!
 endmsg
-slaying ruby
-food 250
-connected 4
 exp 1
+food 250
 x 12
 y 4
+connected 4
 end
 arch teleporter
-invisible 1
 hp 12
 sp 2
-connected 4
-speed 0.0
-activate_on_release 0
 x 12
 y 4
+speed 0.0
+invisible 1
+connected 4
+activate_on_release 0
 end
 arch dungeon_magic
 x 12
@@ -1609,9 +1607,9 @@
 arch dun0
 name Tourist Guide
 face witch_fire.111
-blocksview 0
 x 12
 y 10
+blocksview 0
 end
 arch dungeon_magic
 x 12
@@ -1623,25 +1621,25 @@
 end
 arch altar_trigger
 name 1 ruby
+slaying ruby
 msg
 Ok, go take your seat!
 endmsg
-slaying ruby
-food 1
-connected 21
 exp 1
+food 1
 x 12
 y 11
+connected 21
 end
 arch teleporter
-invisible 1
 hp 14
 sp 11
-connected 21
-speed 0.0
-activate_on_release 0
 x 12
 y 11
+speed 0.0
+invisible 1
+connected 21
+activate_on_release 0
 end
 arch dungeon_magic
 x 12
@@ -1659,30 +1657,30 @@
 x 13
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 13
 y 1
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 13
 y 1
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 13
 y 2
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 13
 y 2
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 13
 y 3
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 13
@@ -1699,9 +1697,9 @@
 arch dun0
 name Arena Master
 face witch_fire.111
-blocksview 0
 x 13
 y 4
+blocksview 0
 end
 arch dungeon_magic
 x 13
@@ -1716,10 +1714,9 @@
 Oh, we have been having some trouble powering the teleporters...
 You will probably need some more rubies to power them.  I think 250 should do it for your team for awhile..
 endmsg
-walk_on 0
-fly_on 0
 x 13
 y 5
+move_on 0
 end
 arch dirtfloor
 x 13
@@ -1758,30 +1755,30 @@
 y 9
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 13
 y 10
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 13
 y 10
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 13
 y 11
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 13
 y 11
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 13
 y 12
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 13
@@ -1795,10 +1792,10 @@
 x 14
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 14
 y 1
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 14
@@ -1813,10 +1810,10 @@
 y 2
 end
 arch marker
+slaying team2
 msg
 Welcome to Team 2!
 endmsg
-slaying team2
 food 500000
 x 14
 y 2
@@ -1825,15 +1822,15 @@
 slaying teamwar
 hp 34
 sp 8
-speed 0.2
 x 14
 y 2
+speed 0.2
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 14
 y 3
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 14
@@ -1849,25 +1846,25 @@
 end
 arch altar_trigger
 name Team 2 - 250 Rubies
+slaying ruby
 msg
 Lets get ready to rumble!!
 endmsg
-slaying ruby
-food 250
-connected 5
 exp 1
+food 250
 x 14
 y 4
+connected 5
 end
 arch teleporter
-invisible 1
 hp 14
 sp 2
-connected 5
-speed 0.0
-activate_on_release 0
 x 14
 y 4
+speed 0.0
+invisible 1
+connected 5
+activate_on_release 0
 end
 arch dungeon_magic
 x 14
@@ -1910,10 +1907,10 @@
 y 9
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 14
 y 10
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 14
@@ -1929,25 +1926,25 @@
 end
 arch marker
 slaying tw_spectator
-connected 21
 food 2500
-walk_on 0
-walk_off 0
 x 14
 y 11
+connected 21
+move_on 0
+move_off 0
 end
 arch teleporter
 hp 14
 sp 9
-speed 0.2
 x 14
 y 11
+speed 0.2
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 14
 y 12
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 14
@@ -1961,40 +1958,40 @@
 x 15
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 15
 y 1
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 15
 y 1
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 15
 y 2
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 15
 y 2
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 15
 y 3
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 15
 y 3
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 15
 y 4
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 15
@@ -2041,30 +2038,30 @@
 y 9
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 15
 y 10
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 15
 y 10
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 15
 y 11
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 15
 y 11
 end
 arch permanent_lava
-no_pass 1
-cursed 1
 x 15
 y 12
+move_block all
+cursed 1
 end
 arch dungeon_magic
 x 15