diff --git a/darcap/cave/level4 b/darcap/cave/level4 index 2ab23b1b2..77aaf24de 100644 --- a/darcap/cave/level4 +++ b/darcap/cave/level4 @@ -17821,10 +17821,8 @@ arch scythe1 name Talok's scythe material 0 drop_if_quest darcap/Cameron-wine 30 -arch event_drop +arch quest_prevent_drop name darcap/Cameron-wine 50 -title Python -slaying /python/quests/QuestEssentialUntil.py end arch event_pickup name darcap/Cameron-wine 30>40 diff --git a/darcap/darcap/potionshop b/darcap/darcap/potionshop index 6dfef6eb7..cb9c2365e 100644 --- a/darcap/darcap/potionshop +++ b/darcap/darcap/potionshop @@ -454,10 +454,8 @@ arch pouch arch blood name Molthir's famous potion for the back face vial_red.111 -arch event_drop +arch quest_prevent_drop name darcap/Spike 50 -title Python -slaying /python/quests/QuestEssentialUntil.py end end end diff --git a/darcap/darcap/shop_g b/darcap/darcap/shop_g index 2da0f274d..0deea887e 100644 --- a/darcap/darcap/shop_g +++ b/darcap/darcap/shop_g @@ -1842,10 +1842,8 @@ arch blackroot name smaprh root name_pl smaprh roots nrof 5 -arch event_drop +arch quest_prevent_drop name darcap/Spike 40 -title Python -slaying /python/quests/QuestEssentialUntil.py end end end diff --git a/euthville/demon_quest b/euthville/demon_quest index cd91e200b..fca08d43b 100644 --- a/euthville/demon_quest +++ b/euthville/demon_quest @@ -4431,10 +4431,8 @@ name scorn/DemonPit 30>40 title Python slaying /python/quests/QuestAdvance.py end -arch event_drop +arch quest_prevent_drop name scorn/DemonPit 50 -title Python -slaying /python/quests/QuestEssentialUntil.py end end end diff --git a/navar_city/misc/navarwiz b/navar_city/misc/navarwiz index 1d9363ff2..368b3a205 100644 --- a/navar_city/misc/navarwiz +++ b/navar_city/misc/navarwiz @@ -351,10 +351,8 @@ name_pl potions of gem essence resist_physical 0 value 0 identified 1 -arch event_drop +arch quest_prevent_drop name scorn/Rhyz 40 -title Python -slaying /python/quests/QuestEssentialUntil.py end end end diff --git a/quests/peterm/quests/dragonquest2 b/quests/peterm/quests/dragonquest2 index dbcdb0dd9..676d228cd 100644 --- a/quests/peterm/quests/dragonquest2 +++ b/quests/peterm/quests/dragonquest2 @@ -3364,10 +3364,8 @@ name scorn/DragonWhisker 50>60 title Python slaying /python/quests/QuestAdvance.py end -arch event_drop +arch quest_prevent_drop name scorn/DragonWhisker 70 -title Python -slaying /python/quests/QuestEssentialUntil.py end end arch pstone_2 diff --git a/quests/peterm/quests/goblin_chief b/quests/peterm/quests/goblin_chief index 8d782966b..432c3a3ce 100644 --- a/quests/peterm/quests/goblin_chief +++ b/quests/peterm/quests/goblin_chief @@ -1607,10 +1607,8 @@ name scorn/GoblinKing 30>40 title Python slaying /python/quests/QuestAdvance.py end -arch event_drop +arch quest_prevent_drop name scorn/GoblinKing 50 -title Python -slaying /python/quests/QuestEssentialUntil.py end end arch event_death diff --git a/quests/peterm/quests/mushroom_quest b/quests/peterm/quests/mushroom_quest index 94eb7b722..fa61f8479 100644 --- a/quests/peterm/quests/mushroom_quest +++ b/quests/peterm/quests/mushroom_quest @@ -1612,10 +1612,8 @@ name blue mushroom name_pl blue mushrooms x 8 y 27 -arch event_drop +arch quest_prevent_drop name scorn/BlueMushroom 50 -title Python -slaying /python/quests/QuestEssentialUntil.py end arch event_pickup name scorn/BlueMushroom 30>40 diff --git a/quests/peterm/quests/ogre_chief b/quests/peterm/quests/ogre_chief index 486cc8181..82f6cfb8a 100644 --- a/quests/peterm/quests/ogre_chief +++ b/quests/peterm/quests/ogre_chief @@ -4085,10 +4085,8 @@ name scorn/OgreKing 30>40 title Python slaying /python/quests/QuestAdvance.py end -arch event_drop +arch quest_prevent_drop name scorn/OgreKing 50 -title Python -slaying /python/quests/QuestEssentialUntil.py end end arch skill_throwing diff --git a/quests/peterm/quests/titan_quest b/quests/peterm/quests/titan_quest index f8b163d7f..049a32e30 100644 --- a/quests/peterm/quests/titan_quest +++ b/quests/peterm/quests/titan_quest @@ -3793,10 +3793,8 @@ name scorn/TitanCrown 60>70 title Python slaying /python/quests/QuestAdvance.py end -arch event_drop +arch quest_prevent_drop name scorn/TitanCrown 80 -title Python -slaying /python/quests/QuestEssentialUntil.py end end arch event_death diff --git a/quests/peterm/quests/wyvern_quest b/quests/peterm/quests/wyvern_quest index 89d8d974d..28e719967 100644 --- a/quests/peterm/quests/wyvern_quest +++ b/quests/peterm/quests/wyvern_quest @@ -3743,10 +3743,8 @@ carrying 25 arch dragon_wing name Slithselest's wing material 0 -arch event_drop +arch quest_prevent_drop name scorn/WyvernWing 50 -title Python -slaying /python/quests/QuestEssentialUntil.py end arch event_pickup name scorn/WyvernWing 30>40 diff --git a/santo_dominion/mudman/mudman.3 b/santo_dominion/mudman/mudman.3 index 0496fa0ae..030cdb667 100644 --- a/santo_dominion/mudman/mudman.3 +++ b/santo_dominion/mudman/mudman.3 @@ -1657,10 +1657,8 @@ name santo_dominion/Mudman 20>30 title Python slaying /python/quests/QuestAdvance.py end -arch event_drop +arch quest_prevent_drop name santo_dominion/Mudman 40 -title Python -slaying /python/quests/QuestEssentialUntil.py end end arch spell_mass_confusion diff --git a/scorn/houses/farmhouse b/scorn/houses/farmhouse index c00805e88..edfb7d0c6 100644 --- a/scorn/houses/farmhouse +++ b/scorn/houses/farmhouse @@ -393,10 +393,8 @@ arch key2 name Farmer's key name_pl Farmer's keys slaying scornfarmkey -arch event_drop +arch quest_prevent_drop name scorn/TerrysFarm 60 -title Python -slaying /python/quests/QuestEssentialUntil.py end end end @@ -2181,10 +2179,8 @@ msg Blood-stained troll head, still drooling from greed endmsg face head.111 -arch event_drop +arch quest_prevent_drop name scorn/TerrysFarm 60 -title Python -slaying /python/quests/QuestEssentialUntil.py end end arch big_club diff --git a/scorn/houses/riverside_manor b/scorn/houses/riverside_manor index 6bc3fced6..32aa8ac3c 100644 --- a/scorn/houses/riverside_manor +++ b/scorn/houses/riverside_manor @@ -518,10 +518,8 @@ name scorn/WalkingStick 0>10 20-40>50 title Python slaying /python/quests/QuestAdvance.py end -arch event_drop +arch quest_prevent_drop name scorn/WalkingStick 60 -title Python -slaying /python/quests/QuestEssentialUntil.py end end arch table_3 @@ -1656,10 +1654,8 @@ name scorn/CoffeeGoose 20-80>90 title Python slaying /python/quests/QuestAdvance.py end -arch event_drop +arch quest_prevent_drop name scorn/CoffeeGoose 100 -title Python -slaying /python/quests/QuestEssentialUntil.py end end arch grass diff --git a/scorn/kar/somehouse3 b/scorn/kar/somehouse3 index 6dc13ea37..6efb627a5 100644 --- a/scorn/kar/somehouse3 +++ b/scorn/kar/somehouse3 @@ -545,10 +545,8 @@ arch key2 name gorks key name_pl gorks keys slaying mork -arch event_drop +arch quest_prevent_drop name scorn/GorksTreasure 50 -title Python -slaying /python/quests/QuestEssentialUntil.py end end end diff --git a/scorn/peterm/undead_quest b/scorn/peterm/undead_quest index 33e705d93..e3e13d109 100644 --- a/scorn/peterm/undead_quest +++ b/scorn/peterm/undead_quest @@ -207,10 +207,8 @@ name scorn/Animator 30>40 title Python slaying /python/quests/QuestAdvance.py end -arch event_drop +arch quest_prevent_drop name scorn/Animator 50 -title Python -slaying /python/quests/QuestEssentialUntil.py end end arch event_death diff --git a/scorn/taverns/barking_mule b/scorn/taverns/barking_mule index 35cdf3eb5..ce53d8328 100644 --- a/scorn/taverns/barking_mule +++ b/scorn/taverns/barking_mule @@ -203,10 +203,8 @@ name scorn/Earhorn 20-30>50 0>10 title Python slaying python/quests/QuestAdvance.py end -arch event_drop +arch quest_prevent_drop name scorn/Earhorn 60 -title Python -slaying /python/quests/QuestEssentialUntil.py end end end diff --git a/start/newbieshouse b/start/newbieshouse index eb0b2fe31..bce747b41 100644 --- a/start/newbieshouse +++ b/start/newbieshouse @@ -4620,10 +4620,8 @@ Use this key to open the locked door in the training house. endmsg x 15 y 5 -arch event_drop +arch quest_prevent_drop name tutorial/keys 50 -title Python -slaying /python/quests/QuestEssentialUntil.py end end arch dungeon_magic @@ -4948,10 +4946,8 @@ slaying open_door msg Use this key to open the locked door in the training house. endmsg -arch event_drop +arch quest_prevent_drop name tutorial/keys 50 -title Python -slaying /python/quests/QuestEssentialUntil.py end arch event_pickup name tutorial/keys 30>40 diff --git a/styles/monsterstyles/undead_quest/undead_quest_21 b/styles/monsterstyles/undead_quest/undead_quest_21 index c8254f0de..55c3daa99 100644 --- a/styles/monsterstyles/undead_quest/undead_quest_21 +++ b/styles/monsterstyles/undead_quest/undead_quest_21 @@ -111,10 +111,8 @@ dam 25 attacktype 69633 value 100000 magic 7 -arch event_drop +arch quest_prevent_drop name scorn/LordSpectre 60 -title Python -slaying /python/quests/QuestEssentialUntil.py end arch event_pickup name scorn/LordSpectre 30-40>50 diff --git a/test/quest_handling/quest_map b/test/quest_handling/quest_map index 74dbebe38..b64876b79 100644 --- a/test/quest_handling/quest_map +++ b/test/quest_handling/quest_map @@ -312,10 +312,8 @@ name testquest 0>30 10>20 title Python slaying python/quests/QuestAdvance.py end -arch event_drop +arch quest_prevent_drop name testquest 40 -title Python -slaying /python/quests/QuestEssentialUntil.py end end arch graymarble @@ -1701,10 +1699,8 @@ stand_still 1 arch coffee_empty name mcguffin name_pl mcguffins -arch event_drop +arch quest_prevent_drop name testquest2 30 -title Python -slaying /python/quests/QuestEssentialUntil.py end end arch npc_dialog