Try a new tactic with the "alarm system" on brest/zorn/castle.upper.floor.two

and made cosmetic changes to the map.

Put in a fixed reset (30 minutes) for the Scorn Battle Arena maps (exception
is the underground map which is not changed).


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5953 282e977c-c81d-0410-88c4-b93c2d0d6712

brest/zorn/castle.upper.floor.two

@@ -7713,6 +7713,47 @@ arch cobblestones2
 x 20
 y 24
 end
+arch gryphon
+name Zorn Canary
+title Guardian of the NW Tower room
+Int 10
+hp 15000
+sp 500
+maxsp 500
+exp 3500000
+dam 49
+wc -50
+ac -40
+x 20
+y 24
+level 109
+attacktype 384
+resist_physical 50
+resist_fire 50
+resist_electricity 50
+resist_cold 50
+resist_confusion 50
+resist_acid 50
+resist_drain 50
+resist_weaponmagic 50
+resist_ghosthit 50
+resist_slow 50
+resist_deplete 50
+resist_death 50
+resist_chaos 50
+resist_blind 50
+will_apply 4
+see_invisible 1
+can_use_skill 1
+arch skill_clawing
+end
+arch perm_magic_portal
+name NW Tower
+slaying castle.upper.floor.two
+hp 9
+sp 9
+end
+end
 arch cobblestones2
 x 20
 y 25
@@ -7745,6 +7786,47 @@ arch cobblestones2
 x 20
 y 32
 end
+arch gryphon
+name Zorn Canary
+title Guardian of the SW Tower room
+Int 10
+hp 15000
+sp 500
+maxsp 500
+exp 3500000
+dam 49
+wc -50
+ac -40
+x 20
+y 32
+level 109
+attacktype 384
+resist_physical 50
+resist_fire 50
+resist_electricity 50
+resist_cold 50
+resist_confusion 50
+resist_acid 50
+resist_drain 50
+resist_weaponmagic 50
+resist_ghosthit 50
+resist_slow 50
+resist_deplete 50
+resist_death 50
+resist_chaos 50
+resist_blind 50
+will_apply 4
+see_invisible 1
+can_use_skill 1
+arch skill_clawing
+end
+arch perm_magic_portal
+name SW Tower
+slaying castle.upper.floor.two
+hp 9
+sp 49
+end
+end
 arch cobblestones2
 x 20
 y 33
@@ -10392,32 +10474,42 @@ arch cobblestones2
 x 26
 y 9
 end
-arch spikes_closed
+arch magic_mouth
+msg
+You hear a click and a subtle ticking sound as if a timer has started. You get the feeling that staying here for very long might be a bad idea.
+endmsg
 x 26
 y 9
 connected 1987
-end
+activate_on_release 0
-arch spikes_moving
-x 26
-y 9
-end
-arch food
-x 26
-y 9
 end
 arch cobblestones2
 x 26
 y 10
 end
-arch spikes_closed
+arch magic_mouth
+msg
+You hear a click and a.subtle ticking sound as if a timer has started. You get the feeling that staying here for very long might be a bad idea.
+endmsg
 x 26
 y 10
-connected 1987
+connected 1990
+activate_on_release 0
 end
 arch cobblestones2
 x 26
 y 11
 end
+arch magic_mouth
+name alarm goes off!
+msg
+YOU SUDDENLY HEAR A LOUD ALARM AND THE SOUNDS OF ACTIVITY! RUN! GET AWAY! RUN! GET AWAY! RUN! GET AWAY! RUN! GET AWAY!
+endmsg
+x 26
+y 11
+connected 12000
+activate_on_release 0
+end
 arch altar_trigger
 name trigger the nasty events
 food 1
@@ -10425,6 +10517,62 @@ x 26
 y 11
 connected 12000
 end
+arch creator
+other_arch food
+x 26
+y 11
+connected 1987
+activate_on_push 0
+end
+arch creator
+other_arch food
+x 26
+y 11
+connected 1988
+activate_on_push 0
+end
+arch creator
+other_arch food
+x 26
+y 11
+connected 1989
+activate_on_push 0
+end
+arch creator
+other_arch food
+x 26
+y 11
+connected 1990
+activate_on_push 0
+end
+arch creator
+other_arch food
+x 26
+y 11
+connected 1991
+activate_on_push 0
+end
+arch creator
+other_arch food
+x 26
+y 11
+connected 1992
+activate_on_push 0
+end
+arch creator
+other_arch food
+x 26
+y 11
+connected 1993
+activate_on_push 0
+end
+arch creator
+other_arch food
+x 26
+y 11
+connected 1994
+activate_on_push 0
+end
 arch cobblestones2
 x 26
 y 12
@@ -10795,44 +10943,46 @@ arch stonefloor2
 x 27
 y 9
 end
-arch awall_1_1
+arch magic_mouth
-name alarm system
+msg
+You hear.a click and a subtle ticking sound as if a timer has started. You get the feeling that staying here for very long might be a bad idea.
+endmsg
 x 27
 y 9
+connected 1988
+activate_on_release 0
 end
 arch stonefloor2
 x 27
 y 10
 end
-arch awall_2_1_1
-name alarm system
-x 27
-y 10
-end
 arch magic_mouth
-name alarm goes off!
 msg
-YOU SUDDENLY HEAR A LOUD ALARM AND THE SOUNDS OF ACTIVITY! RUN! GET AWAY! RUN! GET AWAY! RUN! GET AWAY! RUN! GET AWAY!
+You hear a click and a subtle ticking.sound as if a timer has started. You get the feeling that staying here for very long might be a bad idea.
 endmsg
 x 27
-y 11
+y 10
-connected 12000
+connected 1991
 activate_on_release 0
 end
 arch stonefloor2
 x 27
 y 11
 end
-arch awall_2_1_1
+arch magic_mouth
-name alarm system
+msg
+You hear a click and a subtle ticking sound as if a.timer has started. You get the feeling that staying here for very long might be a bad idea.
+endmsg
 x 27
 y 11
+connected 1993
+activate_on_release 0
 end
 arch stonefloor2
 x 27
 y 12
 end
-arch awall_2_2_4
+arch awall_2_1_2
 name alarm system
 x 27
 y 12
@@ -11250,34 +11400,46 @@ arch stonefloor2
 x 28
 y 9
 end
-arch awall_1_1
+arch magic_mouth
-name alarm system
+msg
+You hear a click.and a subtle ticking sound as if a timer has started. You get the feeling that staying here for very long might be a bad idea.
+endmsg
 x 28
 y 9
+connected 1989
+activate_on_release 0
 end
 arch stonefloor2
 x 28
 y 10
 end
-arch awall_2_1_1
+arch magic_mouth
-name alarm system
+msg
+You hear a click and a subtle ticking sound as.if a timer has started. You get the feeling that staying here for very long might be a bad idea.
+endmsg
 x 28
 y 10
+connected 1992
+activate_on_release 0
 end
 arch stonefloor2
 x 28
 y 11
 end
-arch awall_2_1_1
+arch magic_mouth
-name alarm system
+msg
+You hear a click and a subtle ticking sound as if a timer has.started. You get the feeling that staying here for very long might be a bad idea.
+endmsg
 x 28
 y 11
+connected 1994
+activate_on_release 0
 end
 arch stonefloor2
 x 28
 y 12
 end
-arch awall_2_1_1
+arch awall_2_1_2
 name alarm system
 x 28
 y 12
@@ -11286,7 +11448,7 @@ arch stonefloor2
 x 28
 y 13
 end
-arch awall_3_1
+arch awall_2_1_2
 name alarm system
 x 28
 y 13
@@ -11331,6 +11493,46 @@ arch stonefloor2
 x 28
 y 23
 end
+arch gryphon
+name Zorn Canary
+title Guardian of the Top Floor
+Int 10
+hp 15000
+sp 500
+maxsp 500
+exp 3500000
+dam 49
+wc -50
+ac -40
+x 28
+y 23
+level 109
+attacktype 384
+resist_physical 50
+resist_fire 50
+resist_electricity 50
+resist_cold 50
+resist_confusion 50
+resist_acid 50
+resist_drain 50
+resist_weaponmagic 50
+resist_ghosthit 50
+resist_slow 50
+resist_deplete 50
+resist_death 50
+resist_chaos 50
+resist_blind 50
+will_apply 4
+see_invisible 1
+can_use_skill 1
+arch skill_clawing
+end
+arch dragonclaw
+name canary claw
+name_pl canary claws
+material 0
+end
+end
 arch stonefloor2
 x 28
 y 24
@@ -11354,6 +11556,13 @@ arch stonefloor2
 x 28
 y 27
 end
+arch gate_open_1
+name security gate
+x 28
+y 27
+connected 12000
+activate_on_release 0
+end
 arch light1
 x 28
 y 27
@@ -11362,6 +11571,12 @@ arch stonefloor2
 x 28
 y 28
 end
+arch gate_open_2
+x 28
+y 28
+connected 12000
+activate_on_release 0
+end
 arch light2
 x 28
 y 28
@@ -11370,10 +11585,26 @@ arch stonefloor2
 x 28
 y 29
 end
+arch gate_open_2
+x 28
+y 29
+connected 12000
+activate_on_release 0
+end
+arch light2
+x 28
+y 29
+end
 arch stonefloor2
 x 28
 y 30
 end
+arch gate_open_2
+x 28
+y 30
+connected 12000
+activate_on_release 0
+end
 arch light2
 x 28
 y 30
@@ -11382,6 +11613,13 @@ arch stonefloor2
 x 28
 y 31
 end
+arch gate_open_1
+name security gate
+x 28
+y 31
+connected 12000
+activate_on_release 0
+end
 arch light1
 x 28
 y 31
@@ -11642,15 +11880,6 @@ name alarm system
 x 29
 y 9
 end
-arch magic_mouth
-msg
-You hear a click and a subtle ticking sound as if a timer has started. You get the feeling that staying here for very long might be a bad idea.
-endmsg
-x 29
-y 10
-connected 1987
-activate_on_release 0
-end
 arch stonefloor2
 x 29
 y 10
@@ -11673,7 +11902,7 @@ arch stonefloor2
 x 29
 y 12
 end
-arch awall_2_2_1
+arch awall_3_1
 name alarm system
 x 29
 y 12
@@ -11800,6 +12029,13 @@ arch stonefloor2
 x 29
 y 27
 end
+arch gate_open_1
+name security gate
+x 29
+y 27
+connected 12000
+activate_on_release 0
+end
 arch light1
 x 29
 y 27
@@ -11811,6 +12047,7 @@ You hear the peculiar roar of
 a large chaos dragon wafting
 down the stairs.
 endmsg
+food 1
 x 29
 y 28
 end
@@ -11825,6 +12062,16 @@ sp 28
 x 29
 y 28
 end
+arch teleporter
+hp 29
+sp 15
+x 29
+y 28
+speed 0.0
+level 200
+invisible 1
+connected 12000
+end
 arch magic_mouth
 name chaos dragon warning
 msg
@@ -11832,6 +12079,7 @@ You hear the peculiar roar of
 a large chaos dragon wafting
 down the stairs.
 endmsg
+food 1
 x 29
 y 29
 end
@@ -11846,9 +12094,15 @@ sp 29
 x 29
 y 29
 end
-arch light3
+arch teleporter
+hp 28
+sp 15
 x 29
 y 29
+speed 0.0
+level 200
+invisible 1
+connected 12000
 end
 arch magic_mouth
 name chaos dragon warning
@@ -11857,6 +12111,7 @@ You hear the peculiar roar of
 a large chaos dragon wafting
 down the stairs.
 endmsg
+food 1
 x 29
 y 30
 end
@@ -11871,10 +12126,27 @@ sp 30
 x 29
 y 30
 end
+arch teleporter
+hp 30
+sp 15
+x 29
+y 30
+speed 0.0
+level 200
+invisible 1
+connected 12000
+end
 arch stonefloor2
 x 29
 y 31
 end
+arch gate_open_1
+name security gate
+x 29
+y 31
+connected 12000
+activate_on_release 0
+end
 arch light1
 x 29
 y 31
@@ -12142,7 +12414,7 @@ exp 59900
 food 1
 x 30
 y 9
-connected 1987
+connected 1994
 end
 arch stonefloor2
 x 30
@@ -12150,7 +12422,7 @@ y 10
 end
 arch altar_trigger
 name start timer
-exp 9
+exp 90
 food 1
 x 30
 y 10
@@ -12166,7 +12438,7 @@ exp 900
 food 1
 x 30
 y 11
-connected 1987
+connected 1988
 end
 arch stonefloor2
 x 30
@@ -12249,6 +12521,13 @@ arch stonefloor2
 x 30
 y 27
 end
+arch gate_open_1
+name security gate
+x 30
+y 27
+connected 12000
+activate_on_release 0
+end
 arch light1
 x 30
 y 27
@@ -12257,6 +12536,12 @@ arch stonefloor2
 x 30
 y 28
 end
+arch gate_open_2
+x 30
+y 28
+connected 12000
+activate_on_release 0
+end
 arch light2
 x 30
 y 28
@@ -12265,10 +12550,26 @@ arch stonefloor2
 x 30
 y 29
 end
+arch gate_open_2
+x 30
+y 29
+connected 12000
+activate_on_release 0
+end
+arch light2
+x 30
+y 29
+end
 arch stonefloor2
 x 30
 y 30
 end
+arch gate_open_2
+x 30
+y 30
+connected 12000
+activate_on_release 0
+end
 arch light2
 x 30
 y 30
@@ -12277,6 +12578,13 @@ arch stonefloor2
 x 30
 y 31
 end
+arch gate_open_1
+name security gate
+x 30
+y 31
+connected 12000
+activate_on_release 0
+end
 arch light1
 x 30
 y 31
@@ -12528,7 +12836,7 @@ exp 49900
 food 1
 x 31
 y 9
-connected 1987
+connected 1993
 end
 arch stonefloor2
 x 31
@@ -12539,7 +12847,7 @@ name alarm system randomizer
 msg
 There are 8 chances here. From near two hours
 down to the alarm goes off immediately. This
-should make thing *really* fun. :)
+should make things *really* fun. :)
 endmsg
 x 31
 y 10
@@ -12558,7 +12866,7 @@ exp 9900
 food 1
 x 31
 y 11
-connected 1987
+connected 1989
 end
 arch stonefloor2
 x 31
@@ -12993,7 +13301,7 @@ exp 39900
 food 1
 x 32
 y 9
-connected 1987
+connected 1992
 end
 arch cobblestones2
 x 32
@@ -13005,7 +13313,7 @@ exp 29900
 food 1
 x 32
 y 10
-connected 1987
+connected 1991
 end
 arch cobblestones2
 x 32
@@ -13017,7 +13325,7 @@ exp 19900
 food 1
 x 32
 y 11
-connected 1987
+connected 1990
 end
 arch cobblestones2
 x 32
@@ -14846,6 +15154,47 @@ arch cobblestones2
 x 36
 y 24
 end
+arch gryphon
+name Zorn Canary
+title Guardian of the NE Tower room
+Int 10
+hp 15000
+sp 500
+maxsp 500
+exp 3500000
+dam 49
+wc -50
+ac -40
+x 36
+y 24
+level 109
+attacktype 384
+resist_physical 50
+resist_fire 50
+resist_electricity 50
+resist_cold 50
+resist_confusion 50
+resist_acid 50
+resist_drain 50
+resist_weaponmagic 50
+resist_ghosthit 50
+resist_slow 50
+resist_deplete 50
+resist_death 50
+resist_chaos 50
+resist_blind 50
+will_apply 4
+see_invisible 1
+can_use_skill 1
+arch skill_clawing
+end
+arch perm_magic_portal
+name NE Tower
+slaying castle.upper.floor.two
+hp 49
+sp 9
+end
+end
 arch cobblestones2
 x 36
 y 25
@@ -14878,6 +15227,47 @@ arch cobblestones2
 x 36
 y 32
 end
+arch gryphon
+name Zorn Canary
+title Guardian of the SE Tower room
+Int 10
+hp 15000
+sp 500
+maxsp 500
+exp 3500000
+dam 49
+wc -50
+ac -40
+x 36
+y 32
+level 109
+attacktype 384
+resist_physical 50
+resist_fire 50
+resist_electricity 50
+resist_cold 50
+resist_confusion 50
+resist_acid 50
+resist_drain 50
+resist_weaponmagic 50
+resist_ghosthit 50
+resist_slow 50
+resist_deplete 50
+resist_death 50
+resist_chaos 50
+resist_blind 50
+will_apply 4
+see_invisible 1
+can_use_skill 1
+arch skill_clawing
+end
+arch perm_magic_portal
+name SE Tower
+slaying castle.upper.floor.two
+hp 49
+sp 49
+end
+end
 arch cobblestones2
 x 36
 y 33
@@ -23758,207 +24148,3 @@ arch brush
 x 58
 y 58
 end
-arch gryphon
-name Zorn Canary
-title Guardian of the NW Tower room
-Int 10
-hp 15000
-sp 500
-maxsp 500
-exp 3500000
-dam 49
-wc -50
-ac -40
-x 20
-y 24
-level 109
-attacktype 384
-resist_physical 50
-resist_fire 50
-resist_electricity 50
-resist_cold 50
-resist_confusion 50
-resist_acid 50
-resist_drain 50
-resist_weaponmagic 50
-resist_ghosthit 50
-resist_slow 50
-resist_deplete 50
-resist_death 50
-resist_chaos 50
-resist_blind 50
-will_apply 4
-see_invisible 1
-can_use_skill 1
-arch skill_clawing
-end
-arch perm_magic_portal
-name NW Tower
-slaying castle.upper.floor.two
-hp 9
-sp 9
-end
-end
-arch gryphon
-name Zorn Canary
-title Guardian of the SW Tower room
-Int 10
-hp 15000
-sp 500
-maxsp 500
-exp 3500000
-dam 49
-wc -50
-ac -40
-x 20
-y 32
-level 109
-attacktype 384
-resist_physical 50
-resist_fire 50
-resist_electricity 50
-resist_cold 50
-resist_confusion 50
-resist_acid 50
-resist_drain 50
-resist_weaponmagic 50
-resist_ghosthit 50
-resist_slow 50
-resist_deplete 50
-resist_death 50
-resist_chaos 50
-resist_blind 50
-will_apply 4
-see_invisible 1
-can_use_skill 1
-arch skill_clawing
-end
-arch perm_magic_portal
-name SW Tower
-slaying castle.upper.floor.two
-hp 9
-sp 49
-end
-end
-arch gryphon
-name Zorn Canary
-title Guardian of the Top Floor
-Int 10
-hp 15000
-sp 500
-maxsp 500
-exp 3500000
-dam 49
-wc -50
-ac -40
-x 28
-y 23
-level 109
-attacktype 384
-resist_physical 50
-resist_fire 50
-resist_electricity 50
-resist_cold 50
-resist_confusion 50
-resist_acid 50
-resist_drain 50
-resist_weaponmagic 50
-resist_ghosthit 50
-resist_slow 50
-resist_deplete 50
-resist_death 50
-resist_chaos 50
-resist_blind 50
-will_apply 4
-see_invisible 1
-can_use_skill 1
-arch skill_clawing
-end
-arch dragonclaw
-name canary claw
-name_pl canary claws
-material 0
-end
-end
-arch gryphon
-name Zorn Canary
-title Guardian of the NE Tower room
-Int 10
-hp 15000
-sp 500
-maxsp 500
-exp 3500000
-dam 49
-wc -50
-ac -40
-x 36
-y 24
-level 109
-attacktype 384
-resist_physical 50
-resist_fire 50
-resist_electricity 50
-resist_cold 50
-resist_confusion 50
-resist_acid 50
-resist_drain 50
-resist_weaponmagic 50
-resist_ghosthit 50
-resist_slow 50
-resist_deplete 50
-resist_death 50
-resist_chaos 50
-resist_blind 50
-will_apply 4
-see_invisible 1
-can_use_skill 1
-arch skill_clawing
-end
-arch perm_magic_portal
-name NE Tower
-slaying castle.upper.floor.two
-hp 49
-sp 9
-end
-end
-arch gryphon
-name Zorn Canary
-title Guardian of the SE Tower room
-Int 10
-hp 15000
-sp 500
-maxsp 500
-exp 3500000
-dam 49
-wc -50
-ac -40
-x 36
-y 32
-level 109
-attacktype 384
-resist_physical 50
-resist_fire 50
-resist_electricity 50
-resist_cold 50
-resist_confusion 50
-resist_acid 50
-resist_drain 50
-resist_weaponmagic 50
-resist_ghosthit 50
-resist_slow 50
-resist_deplete 50
-resist_death 50
-resist_chaos 50
-resist_blind 50
-will_apply 4
-see_invisible 1
-can_use_skill 1
-arch skill_clawing
-end
-arch perm_magic_portal
-name SE Tower
-slaying castle.upper.floor.two
-hp 49
-sp 49
-end
-end

scorn/misc/battle_arena/arena

@@ -1,5 +1,6 @@
 arch map
 name Arena
+reset_timeout 1800
 difficulty 1
 region scornarena
 width 35
@@ -4037,10 +4038,10 @@ Gni hi hi... Mostrai rules!
 endmsg
 x 10
 y 3
+pick_up 0
 will_apply 0
 friendly 1
 run_away 0
-pick_up 0
 random_movement 0
 end
 arch dungeon_magic
@@ -4555,8 +4556,8 @@ y 30
 level 10
 type 0
 randomitems standard
-monster 1
 move_type walk
+monster 1
 friendly 1
 end
 arch dungeon_magic

scorn/misc/battle_arena/entrance

@@ -1,5 +1,6 @@
 arch map
 name Arena Entrance
+reset_timeout 1800
 difficulty 1
 region scornarena
 width 23
@@ -2032,9 +2033,9 @@ resist_godpower 100
 resist_holyword 100
 resist_blind 100
 randomitems none
+pick_up 0
 will_apply 0
 monster 0
-pick_up 0
 can_cast_spell 0
 can_use_scroll 0
 can_use_bow 0

scorn/misc/battle_arena/first-aide

@@ -1,5 +1,6 @@
 arch map
 name Arena First-Aide
+reset_timeout 1800
 difficulty 1
 region scornarena
 width 11

scorn/misc/battle_arena/snack

@@ -1,9 +1,10 @@
 arch map
 name Arena Snack Area
+reset_timeout 1800
 difficulty 1
 region scornarena
 shopitems food:10;*:-100
-shopgreed 1.4
+shopgreed 1.40000
 shopmax 2000
 width 11
 height 11