From 3b05aedd017cc91c74fec2b501708dfd2f09ea1b Mon Sep 17 00:00:00 2001
From: qal21 <qal21@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sat, 13 Aug 2005 05:57:50 +0000
Subject: [PATCH] Fix several bugs with the arena death teleporter.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3541 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 scorn/misc/battle_arena/arena | 191 +++++++++++++++++++++-------------
 1 file changed, 117 insertions(+), 74 deletions(-)

diff --git a/scorn/misc/battle_arena/arena b/scorn/misc/battle_arena/arena
index cdab87ce6..ce6571eaa 100644
--- a/scorn/misc/battle_arena/arena
+++ b/scorn/misc/battle_arena/arena
@@ -6181,44 +6181,35 @@ arch dungeon_magic
 x 16
 y 3
 end
-arch battleground
+arch cobblestones
+type 58
 hp 28
 sp 37
 x 16
 y 3
 end
-arch cobblestones
-x 16
-y 3
-end
 arch dungeon_magic
 x 16
 y 4
 end
-arch battleground
+arch cobblestones
+type 58
 hp 28
 sp 37
 x 16
 y 4
 end
-arch cobblestones
-x 16
-y 4
-end
 arch dungeon_magic
 x 16
 y 5
 end
-arch battleground
+arch cobblestones
+type 58
 hp 28
 sp 37
 x 16
 y 5
 end
-arch cobblestones
-x 16
-y 5
-end
 arch stonefloor2
 name wall
 no_pass 1
@@ -6611,55 +6602,43 @@ arch dungeon_magic
 x 17
 y 3
 end
-arch battleground
+arch cobblestones
+type 58
 hp 28
 sp 37
 x 17
 y 3
 end
-arch cobblestones
-x 17
-y 3
-end
 arch dungeon_magic
 x 17
 y 4
 end
-arch battleground
+arch cobblestones
+type 58
 hp 28
 sp 37
 x 17
 y 4
 end
-arch cobblestones
-x 17
-y 4
-end
 arch dungeon_magic
 x 17
 y 5
 end
-arch battleground
+arch cobblestones
+type 58
 hp 28
 sp 37
 x 17
 y 5
 end
-arch cobblestones
-x 17
-y 5
-end
 arch dungeon_magic
 x 17
 y 6
 end
-arch battleground
-hp 28
-sp 37
-x 17
-y 6
-end
 arch pstone_2
+type 58
+hp 28
+sp 37
 x 17
 y 6
 end
@@ -6800,16 +6779,13 @@ arch dungeon_magic
 x 17
 y 28
 end
-arch battleground
+arch pstone_2
+type 58
 hp 28
 sp 37
 x 17
 y 28
 end
-arch pstone_2
-x 17
-y 28
-end
 arch grate_closed_1
 speed 0.500000
 protected 21
@@ -6830,16 +6806,13 @@ endmsg
 x 17
 y 29
 end
-arch battleground
+arch pstone_2
+type 58
 hp 28
 sp 37
 x 17
 y 29
 end
-arch pstone_2
-x 17
-y 29
-end
 arch stair_up_3
 name winner's exit
 slaying arena
@@ -7043,44 +7016,35 @@ arch dungeon_magic
 x 18
 y 3
 end
-arch battleground
+arch cobblestones
+type 58
 hp 28
 sp 37
 x 18
 y 3
 end
-arch cobblestones
-x 18
-y 3
-end
 arch dungeon_magic
 x 18
 y 4
 end
-arch battleground
+arch cobblestones
+type 58
 hp 28
 sp 37
 x 18
 y 4
 end
-arch cobblestones
-x 18
-y 4
-end
 arch dungeon_magic
 x 18
 y 5
 end
-arch battleground
+arch cobblestones
+type 58
 hp 28
 sp 37
 x 18
 y 5
 end
-arch cobblestones
-x 18
-y 5
-end
 arch stonefloor2
 name wall
 no_pass 1
@@ -10647,15 +10611,45 @@ arch blocked
 x 27
 y 35
 end
-arch blocked
+arch mover_4
+attacktype 1
+level 1
 x 27
 y 36
 end
-arch blocked
+arch flagstone
+name darkness
+face blocked.111
+no_magic 1
+damned 1
+x 27
+y 36
+end
+arch mover_3
+attacktype 1
+level 1
 x 27
 y 37
 end
-arch blocked
+arch flagstone
+name darkness
+face blocked.111
+no_magic 1
+damned 1
+x 27
+y 37
+end
+arch mover_2
+attacktype 1
+level 1
+x 27
+y 38
+end
+arch flagstone
+name darkness
+face blocked.111
+no_magic 1
+damned 1
 x 27
 y 38
 end
@@ -11094,13 +11088,22 @@ arch blocked
 x 28
 y 35
 end
-arch blocked
+arch mover_5
+attacktype 1
+level 1
 x 28
 y 36
 end
-arch button_small
+arch flagstone
+name darkness
+face blocked.111
+no_magic 1
+damned 1
+x 28
+y 36
+end
+arch pedestal
 name 20
-protected 20
 connected 20
 x 28
 y 37
@@ -11112,16 +11115,26 @@ x 28
 y 37
 end
 arch teleporter
+invisible 1
 slaying entrance
 sp 23
-speed 0.000000
-protected 20
-invisible 1
 connected 20
+speed 0.0
+protected 20
 x 28
 y 37
 end
-arch blocked
+arch mover_1
+attacktype 1
+level 1
+x 28
+y 38
+end
+arch flagstone
+name darkness
+face blocked.111
+no_magic 1
+damned 1
 x 28
 y 38
 end
@@ -11512,15 +11525,45 @@ arch blocked
 x 29
 y 35
 end
-arch blocked
+arch mover_6
+attacktype 1
+level 1
 x 29
 y 36
 end
-arch blocked
+arch flagstone
+name darkness
+face blocked.111
+no_magic 1
+damned 1
+x 29
+y 36
+end
+arch mover_7
+attacktype 1
+level 1
 x 29
 y 37
 end
-arch blocked
+arch flagstone
+name darkness
+face blocked.111
+no_magic 1
+damned 1
+x 29
+y 37
+end
+arch mover_8
+attacktype 1
+level 1
+x 29
+y 38
+end
+arch flagstone
+name darkness
+face blocked.111
+no_magic 1
+damned 1
 x 29
 y 38
 end