Replace handler with specific one. Requires arch revision 15303.

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

darcap/cave/level4

@@ -17824,10 +17824,8 @@ drop_if_quest darcap/Cameron-wine 30
 arch quest_prevent_drop
 name darcap/Cameron-wine 50
 end
-arch event_pickup
+arch quest_advance_pickup
 name darcap/Cameron-wine 30>40
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch event_death

darcap/darcap/quest

@@ -948,10 +948,8 @@ arch button_handle
 name handle earth
 x 6
 y 2
-arch event_apply
+arch quest_advance_apply
 name darcap/Elemental-Earth 10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch flagstone
@@ -1092,10 +1090,8 @@ arch button_handle
 name handle air
 x 6
 y 13
-arch event_apply
+arch quest_advance_apply
 name darcap/Elemental-Air 10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch flagstone
@@ -1223,10 +1219,8 @@ Good luck!
 endmsg
 x 7
 y 7
-arch event_apply
+arch quest_advance_apply
 name darcap/Elemental 0>10
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch flagstone
@@ -1875,10 +1869,8 @@ arch button_handle
 x 11
 y 4
 connected 2
-arch event_apply
+arch quest_advance_apply
 name darcap/Elemental 20>30
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch flagstone
@@ -1957,10 +1949,8 @@ arch button_handle
 x 11
 y 11
 connected 2
-arch event_apply
+arch quest_advance_apply
 name darcap/Elemental 20>30
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch flagstone
@@ -2897,10 +2887,8 @@ arch button_handle
 name handle water
 x 17
 y 2
-arch event_apply
+arch quest_advance_apply
 name darcap/Elemental-Water 10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch flagstone
@@ -3041,10 +3029,8 @@ arch button_handle
 name handle fire
 x 17
 y 13
-arch event_apply
+arch quest_advance_apply
 name darcap/Elemental-Fire 10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch flagstone

darcap/quest/fire

@@ -4528,10 +4528,8 @@ hp 18
 sp 14
 x 21
 y 5
-arch event_apply
+arch quest_advance_apply
 name darcap/Elemental 0>10
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch dirtfloor

darcap/quest/water

@@ -312,10 +312,8 @@ hp 18
 sp 1
 x 1
 y 1
-arch event_apply
+arch quest_advance_apply
 name darcap/Elemental 0>10
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch sea

darcap/town2/tower2

@@ -2673,10 +2673,8 @@ hp 5
 sp 1
 x 13
 y 26
-arch event_apply
+arch quest_advance_apply
 name darcap/Elemental 0>10
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch giant

darcap/town2/tower4

@@ -2065,10 +2065,8 @@ hp 6
 sp 14
 x 11
 y 20
-arch event_apply
+arch quest_advance_apply
 name darcap/Elemental 0>10
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch stonefloor2

euthville/demon_quest

@@ -4426,10 +4426,8 @@ arch key2
 name broken gateway
 slaying broken gateway
 face penta.111
-arch event_pickup
+arch quest_advance_pickup
 name scorn/DemonPit 30>40
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 arch quest_prevent_drop
 name scorn/DemonPit 50

navar_city/misc/city1mermaid

@@ -1722,10 +1722,8 @@ hp 5
 sp 5
 x 18
 y 11
-arch event_apply
+arch quest_advance_apply
 name scorn/Rhyz 10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch woodfloor

quests/peterm/quests/dragonquest2

@@ -3359,10 +3359,8 @@ reflect_missile 1
 reflect_spell 1
 xrays 1
 lifesave 1
-arch event_pickup
+arch quest_advance_pickup
 name scorn/DragonWhisker 50>60
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 arch quest_prevent_drop
 name scorn/DragonWhisker 70

quests/peterm/quests/goblin_chief

@@ -1602,19 +1602,15 @@ arch goblin_head
 name Head of the Goblin Chief
 slaying Head of the Goblin Chief
 material 0
-arch event_pickup
+arch quest_advance_pickup
 name scorn/GoblinKing 30>40
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 arch quest_prevent_drop
 name scorn/GoblinKing 50
 end
 end
-arch event_death
+arch quest_advance_death
 name scorn/GoblinKing 20>30
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch pstone_4

quests/peterm/quests/mushroom_quest

@@ -1615,10 +1615,8 @@ y 27
 arch quest_prevent_drop
 name scorn/BlueMushroom 50
 end
-arch event_pickup
+arch quest_advance_pickup
 name scorn/BlueMushroom 30>40
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch sea

quests/peterm/quests/ogre_chief

@@ -4080,10 +4080,8 @@ end
 arch head
 name Head of the Ogre Chief
 material 0
-arch event_pickup
+arch quest_advance_pickup
 name scorn/OgreKing 30>40
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 arch quest_prevent_drop
 name scorn/OgreKing 50
@@ -4093,10 +4091,8 @@ arch skill_throwing
 end
 arch small_shield
 end
-arch event_death
+arch quest_advance_death
 name scorn/OgreKing 20>30
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch large_stones

quests/peterm/quests/titan_quest

@@ -3788,19 +3788,15 @@ carrying 12300
 arch crown
 name Meganthropopulos' Crown
 material 0
-arch event_pickup
+arch quest_advance_pickup
 name scorn/TitanCrown 60>70
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 arch quest_prevent_drop
 name scorn/TitanCrown 80
 end
 end
-arch event_death
+arch quest_advance_death
 name scorn/TitanCrown 50>60
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch woodfloor2

quests/peterm/quests/wyvern_quest

@@ -3746,16 +3746,12 @@ material 0
 arch quest_prevent_drop
 name scorn/WyvernWing 50
 end
-arch event_pickup
+arch quest_advance_pickup
 name scorn/WyvernWing 30>40
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
-arch event_death
+arch quest_advance_death
 name scorn/WyvernWing 20>30
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch medium_stones

santo_dominion/mudman/mudman.3

@@ -1652,10 +1652,8 @@ name Mudman's residue
 type 0
 material 0
 value 4000
-arch event_pickup
+arch quest_advance_pickup
 name santo_dominion/Mudman 20>30
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 arch quest_prevent_drop
 name santo_dominion/Mudman 40

scorn/anthony/portgate

@@ -830,10 +830,8 @@ arch check_floor
 hp 1
 x 7
 y 9
-arch event_trigger
+arch quest_advance_trigger
 name scorn/PortGate 0-10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch dungeon_floor
@@ -946,10 +944,8 @@ arch check_floor
 hp 1
 x 8
 y 9
-arch event_trigger
+arch quest_advance_trigger
 name scorn/PortGate 0-10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch dungeon_floor
@@ -1062,10 +1058,8 @@ arch check_floor
 hp 1
 x 9
 y 9
-arch event_trigger
+arch quest_advance_trigger
 name scorn/PortGate 0-10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch dungeon_floor
@@ -1216,10 +1210,8 @@ arch check_floor
 hp 1
 x 10
 y 9
-arch event_trigger
+arch quest_advance_trigger
 name scorn/PortGate 0-10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch dungeon_floor

scorn/houses/alfalfa_basement

@@ -1532,10 +1532,8 @@ face rock.111
 x 14
 y 14
 no_pick 1
-arch event_apply
+arch quest_advance_apply
 name scorn/OrcDress 40>50
-title Python
-slaying python/quests/QuestAdvance.py
 end
 arch card
 name Gate Pass
@@ -1551,10 +1549,8 @@ without recompense or liability.
 endmsg
 value 800
 identified 1
-arch event_pickup
+arch quest_advance_pickup
 name scorn/GatePass 0-10>30
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 end

scorn/houses/alfalfa_upstairs

@@ -554,10 +554,8 @@ This dress is huge, far larger than any normal-sized person might wear.
 endmsg
 value 1
 race_restriction :giant:
-arch event_pickup
+arch quest_advance_pickup
 name scorn/OrcDress 20>30
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 end

scorn/houses/cornerbrook

@@ -4043,9 +4043,7 @@ name Mark's key
 slaying marks_key
 x 24
 y 24
-arch event_pickup
+arch quest_advance_pickup
 name scorn/CoffeeGoose 47>50 20-45>60
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end

scorn/houses/farmhouse

@@ -401,10 +401,8 @@ end
 arch npc_dialog
 name scorn/houses/terrys_wife.msg
 end
-arch event_death
+arch quest_advance_death
 name scorn/TerrysFarm 0-50>70
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch woodfloor2
@@ -845,10 +843,8 @@ stand_still 1
 arch npc_dialog
 name scorn/houses/terry.msg
 end
-arch event_death
+arch quest_advance_death
 name scorn/TerrysFarm 0-50>70
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch woodfloor2
@@ -2197,10 +2193,8 @@ end
 arch goldcoin
 nrof 50
 end
-arch event_death
+arch quest_advance_death
 name scorn/TerrysFarm 30-40>50
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch pstone_1

scorn/houses/riverside_manor

@@ -513,10 +513,8 @@ endmsg
 x 2
 y 21
 type 21
-arch event_pickup
+arch quest_advance_pickup
 name scorn/WalkingStick 0>10 20-40>50
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 arch quest_prevent_drop
 name scorn/WalkingStick 60
@@ -1649,10 +1647,8 @@ face goose.131
 animation goose
 x 9
 y 19
-arch event_pickup
+arch quest_advance_pickup
 name scorn/CoffeeGoose 20-80>90
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 arch quest_prevent_drop
 name scorn/CoffeeGoose 100
@@ -2242,10 +2238,8 @@ arch check_floor
 hp 1
 x 13
 y 21
-arch event_trigger
+arch quest_advance_trigger
 name scorn/CoffeeGoose 50>70
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch woodfloor

scorn/houses/wizz.entry

@@ -879,10 +879,8 @@ Animal or plants entering the city of scorn must be quarantined in the Quarantin
 endmsg
 value 2500
 identified 1
-arch event_pickup
+arch quest_advance_pickup
 name scorn/PortPass 0-10>30
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 end

scorn/kar/gorks1

@@ -356,10 +356,8 @@ x 3
 y 3
 value 800
 identified 1
-arch event_pickup
+arch quest_advance_pickup
 name scorn/GatePass 0-10>30
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch woodfloor

scorn/kar/gorks3

@@ -285,10 +285,8 @@ end
 arch check_floor
 x 5
 y 8
-arch event_trigger
+arch quest_advance_trigger
 name scorn/GorksTreasure 40>50
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch cobblestones2

scorn/misc/church

@@ -524,10 +524,8 @@ final_map /scorn/peterm/undead_quest
 endmsg
 x 4
 y 14
-arch event_apply
+arch quest_advance_apply
 name scorn/Animator 10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch tree

scorn/misc/gatehouse

@@ -419,10 +419,8 @@ arch check_floor
 hp 1
 x 4
 y 5
-arch event_trigger
+arch quest_advance_trigger
 name scorn/CityGate 0-10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch cobblestones2
@@ -433,10 +431,8 @@ arch check_floor
 hp 1
 x 4
 y 6
-arch event_trigger
+arch quest_advance_trigger
 name scorn/CityGate 0-10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch cobblestones2
@@ -447,10 +443,8 @@ arch check_floor
 hp 1
 x 4
 y 7
-arch event_trigger
+arch quest_advance_trigger
 name scorn/CityGate 0-10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch cobblestones2

scorn/peterm/undead_quest

@@ -202,19 +202,15 @@ arch ring_nodrain
 name Animator's Ring
 material 0
 value 1000
-arch event_pickup
+arch quest_advance_pickup
 name scorn/Animator 30>40
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 arch quest_prevent_drop
 name scorn/Animator 50
 end
 end
-arch event_death
+arch quest_advance_death
 name scorn/Animator 20>30
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch pstone_1

scorn/shops/coffeeshop

@@ -424,10 +424,8 @@ arch coffee
 name Eswald's inferior coffee
 name_pl Eswald's inferior coffees
 food 1
-arch event_apply
+arch quest_advance_apply
 name scorn/CoffeeGoose 0>10
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 end

scorn/taverns/barking_mule

@@ -198,10 +198,8 @@ Git yer paws offa it!
 endmsg
 type 21
 value 1
-arch event_pickup
+arch quest_advance_pickup
 name scorn/Earhorn 20-30>50 0>10
-title Python
-slaying python/quests/QuestAdvance.py
 end
 arch quest_prevent_drop
 name scorn/Earhorn 60

scorn/taverns/goths

@@ -2209,10 +2209,8 @@ arch check_floor
 hp 1
 x 10
 y 21
-arch event_trigger
+arch quest_advance_trigger
 name scorn/GatePassword 0-10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch magic_mouth

scorn/taverns/goths2

@@ -1917,10 +1917,8 @@ the Quarantine Warehouse in the port area
 endmsg
 value 2500
 identified 1
-arch event_pickup
+arch quest_advance_pickup
 name scorn/PortPass 0-10>30
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 end

scorn/towers/lighthouse.3

@@ -403,10 +403,8 @@ x 5
 y 8
 value 800
 identified 1
-arch event_pickup
+arch quest_advance_pickup
 name scorn/GatePass 0-10>30
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch marble

start/newbieshouse

@@ -3316,10 +3316,8 @@ arch check_floor
 hp 1
 x 11
 y 10
-arch event_trigger
+arch quest_advance_trigger
 name tutorial/keys 0>10
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch dungeon_magic
@@ -4305,10 +4303,8 @@ arch random_wealth
 end
 arch random_food
 end
-arch event_apply
+arch quest_advance_apply
 name tutorial/keys 40>50
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch dungeon_magic
@@ -4949,10 +4945,8 @@ endmsg
 arch quest_prevent_drop
 name tutorial/keys 50
 end
-arch event_pickup
+arch quest_advance_pickup
 name tutorial/keys 30>40
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 end
@@ -4976,10 +4970,8 @@ arch check_floor
 hp 1
 x 16
 y 6
-arch event_trigger
+arch quest_advance_trigger
 name tutorial/keys 20>30
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch dungeon_magic
@@ -5007,10 +4999,8 @@ arch check_floor
 hp 1
 x 16
 y 8
-arch event_trigger
+arch quest_advance_trigger
 name tutorial/keys 10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch dungeon_magic

styles/monsterstyles/undead_quest/undead_quest_21

@@ -114,16 +114,12 @@ magic 7
 arch quest_prevent_drop
 name scorn/LordSpectre 60
 end
-arch event_pickup
+arch quest_advance_pickup
 name scorn/LordSpectre 30-40>50
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
-arch event_death
+arch quest_advance_death
 name scorn/LordSpectre 30>40
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch demilich

test/quest_handling/quest_map

@@ -138,10 +138,8 @@ end
 arch check_floor
 hp 1
 x 1
-arch event_trigger
+arch quest_advance_trigger
 name testquest2 10-20>25
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch graymarble
@@ -151,10 +149,8 @@ arch check_floor
 hp 1
 x 1
 y 1
-arch event_trigger
+arch quest_advance_trigger
 name testquest2 10-20>25
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch graymarble
@@ -165,10 +161,8 @@ arch check_floor
 hp 1
 x 1
 y 2
-arch event_trigger
+arch quest_advance_trigger
 name testquest2 10-20>25
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch graymarble
@@ -179,10 +173,8 @@ arch check_floor
 hp 1
 x 1
 y 3
-arch event_trigger
+arch quest_advance_trigger
 name testquest2 10-20>25
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch graymarble
@@ -193,10 +185,8 @@ arch check_floor
 hp 1
 x 1
 y 4
-arch event_trigger
+arch quest_advance_trigger
 name testquest2 10-20>25
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch graymarble
@@ -207,10 +197,8 @@ arch check_floor
 hp 1
 x 1
 y 5
-arch event_trigger
+arch quest_advance_trigger
 name testquest2 10-20>25
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch graymarble
@@ -221,10 +209,8 @@ arch check_floor
 hp 1
 x 1
 y 6
-arch event_trigger
+arch quest_advance_trigger
 name testquest2 10-20>25
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch graymarble
@@ -307,10 +293,8 @@ arch broadsword
 name testquesttarget
 name_pl testquesttargets
 x 2
-arch event_pickup
+arch quest_advance_pickup
 name testquest 0>30 10>20
-title Python
-slaying python/quests/QuestAdvance.py
 end
 arch quest_prevent_drop
 name testquest 40

world/world_102_108

@@ -726,10 +726,8 @@ hp 28
 sp 11
 x 3
 y 20
-arch event_apply
+arch quest_advance_apply
 name santo_dominion/Mudman 10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch shallow_sea

world/world_102_115

@@ -298,10 +298,8 @@ difficulty_increase 0.5
 endmsg
 x 1
 y 14
-arch event_apply
+arch quest_advance_apply
 name scorn/BlueMushroom 10>30
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch swamp

world/world_105_113

@@ -3099,10 +3099,8 @@ final_map /euthville/demon_quest
 endmsg
 x 11
 y 22
-arch event_apply
+arch quest_advance_apply
 name scorn/DemonPit 10>30
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch medium_stones

world/world_105_115

@@ -12860,10 +12860,8 @@ endmsg
 x 33
 y 15
 elevation 10852
-arch event_apply
+arch quest_advance_apply
 name scorn/GoblinKing 10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch mountain

world/world_105_118

@@ -7150,10 +7150,8 @@ endmsg
 x 28
 y 3
 is_floor 0
-arch event_apply
+arch quest_advance_apply
 name scorn/WyvernWing 10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch steppe

world/world_106_115

@@ -2361,10 +2361,8 @@ endmsg
 x 9
 y 18
 is_floor 0
-arch event_apply
+arch quest_advance_apply
 name scorn/OgreKing 10>20
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch hills

world/world_111_117

@@ -12405,10 +12405,8 @@ endmsg
 x 39
 y 42
 is_floor 0
-arch event_apply
+arch quest_advance_apply
 name scorn/DragonWhisker 10-40>50
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch mountain2

world/world_125_124

@@ -1235,10 +1235,8 @@ hp 6
 x 4
 y 42
 move_block 0
-arch event_apply
+arch quest_advance_apply
 name scorn/TitanCrown 10-20>30
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch grass_only

world/world_127_108

@@ -11705,10 +11705,8 @@ dungeon_depth 50
 endmsg
 x 45
 y 49
-arch event_apply
+arch quest_advance_apply
 name scorn/LordSpectre 10-20>30
-title Python
-slaying /python/quests/QuestAdvance.py
 end
 end
 arch sea