Add final map handling for the non-city based royalty quests

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

quests/peterm/quests/TitanGate

@@ -8,7 +8,7 @@ enter_x 6
 enter_y 1
 msg
 Created:  2000-02-12
-Modified: 2010-02-11 Nicolas Weeger
+Modified: 2010-05-04 Cavesomething
 endmsg
 maplore
 @quest Scorn Royalty Quest
@@ -443,6 +443,11 @@ endmsg
 x 5
 y 5
 unaggressive 1
+arch event_say
+name quests/peterm/quests/titanguard.msg
+title Python
+slaying /python/dialog/npc_dialog.py
+end
 end
 arch dungeon_floor
 x 5
@@ -538,13 +543,6 @@ arch dungeon_floor
 x 6
 y 4
 end
-arch magic_mouth
-msg
-Hmm, these guards look thirsty.
-endmsg
-x 6
-y 5
-end
 arch dungeon_floor
 x 6
 y 5
@@ -553,11 +551,15 @@ arch dungeon_floor
 x 6
 y 6
 end
-arch altar
+arch check_floor
-slaying booze
+hp 1
 x 6
 y 6
-connected 1
+arch event_trigger
+name scorn/TitanCrown 30-90 1
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch dungeon_floor
 x 6
@@ -688,6 +690,16 @@ arch dungeon_floor
 x 7
 y 6
 end
+arch check_floor
+hp 1
+x 7
+y 6
+arch event_trigger
+name scorn/TitanCrown 30-90 1
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
+end
 arch dungeon_floor
 x 7
 y 7

quests/peterm/quests/dragonquest2

@@ -8,7 +8,7 @@ enter_x 2
 enter_y 2
 msg
 Created:  1994-08-19 peterm (peterm@soda.csua.berkeley.edu)
-Modified: 2008-12-22 Rick Tanner
+Modified: 2010-05-05 Cavesomething
 endmsg
 maplore
 @quest Scorn Royalty Quest
@@ -3359,6 +3359,16 @@ reflect_missile 1
 reflect_spell 1
 xrays 1
 lifesave 1
+arch event_pickup
+name scorn/DragonWhisker 50>60
+title Python
+slaying /python/quests/QuestAdvance.py
+end
+arch event_drop
+name scorn/DragonWhisker 70
+title Python
+slaying /python/quests/QuestEssentialUntil.py
+end
 end
 arch pstone_2
 x 14

quests/peterm/quests/goblin_chief

@@ -8,7 +8,7 @@ enter_x 14
 enter_y 9
 msg
 Created:  2000-06-05
-Modified: 2008-09-22 Rick Tanner
+Modified: 2010-05-05 Cavesomething
 endmsg
 maplore
 @quest Scorn Royalty Quest
@@ -1602,6 +1602,21 @@ arch goblin_head
 name Head of the Goblin Chief
 slaying Head of the Goblin Chief
 material 0
+arch event_pickup
+name scorn/GoblinKing 30>40
+title Python
+slaying /python/quests/QuestAdvance.py
+end
+arch event_drop
+name scorn/GoblinKing 50
+title Python
+slaying /python/quests/QuestEssentialUntil.py
+end
+end
+arch event_death
+name scorn/GoblinKing 20>30
+title Python
+slaying /python/quests/QuestAdvance.py
 end
 end
 arch pstone_4

quests/peterm/quests/mushroom_quest

@@ -8,7 +8,7 @@ enter_x 2
 enter_y 2
 msg
 Created:  2000-06-05
-Modified: 2008-12-22 Rick Tanner
+Modified: 2010-05-05 Cavesomething
 endmsg
 maplore
 @quest Scorn Royalty Quest
@@ -1608,9 +1608,20 @@ x 8
 y 27
 end
 arch mushroom_3
-slaying bunion
+name blue mushroom
+name_pl blue mushrooms
 x 8
 y 27
+arch event_drop
+name scorn/BlueMushroom 50
+title Python
+slaying /python/quests/QuestEssentialUntil.py
+end
+arch event_pickup
+name scorn/BlueMushroom 30>40
+title Python
+slaying /python/quests/QuestAdvance.py
+end
 end
 arch sea
 x 8

quests/peterm/quests/ogre_chief

@@ -8,7 +8,7 @@ enter_x 6
 enter_y 6
 msg
 Created:  2000-06-17
-Modified: 2008-12-22 Rick Tanner
+Modified: 2010-05-05 Cavesomething
 endmsg
 maplore
 @quest Scorn Royalty Quest
@@ -4080,11 +4080,26 @@ end
 arch head
 name Head of the Ogre Chief
 material 0
+arch event_pickup
+name scorn/OgreKing 30>40
+title Python
+slaying /python/quests/QuestAdvance.py
+end
+arch event_drop
+name scorn/OgreKing 50
+title Python
+slaying /python/quests/QuestEssentialUntil.py
+end
 end
 arch skill_throwing
 end
 arch small_shield
 end
+arch event_death
+name scorn/OgreKing 20>30
+title Python
+slaying /python/quests/QuestAdvance.py
+end
 end
 arch large_stones
 x 15

quests/peterm/quests/titan_quest

@@ -7,7 +7,7 @@ height 35
 enter_x 35
 enter_y 33
 msg
-Modified: 2008-12-22 Rick Tanner
+Modified: 2010-05-05 Cavesomething
 endmsg
 maplore
 @quest Scorn Royalty Quest
@@ -3788,6 +3788,21 @@ carrying 12300
 arch crown
 name Meganthropopulos' Crown
 material 0
+arch event_pickup
+name scorn/TitanCrown 60>70
+title Python
+slaying /python/quests/QuestAdvance.py
+end
+arch event_drop
+name scorn/TitanCrown 80
+title Python
+slaying /python/quests/QuestEssentialUntil.py
+end
+end
+arch event_death
+name scorn/TitanCrown 50>60
+title Python
+slaying /python/quests/QuestAdvance.py
 end
 end
 arch woodfloor2

quests/peterm/quests/titanguard.msg

@@ -0,0 +1,52 @@
+{
+  "location": "wilderness/Titanguard",
+  "rules": [
+  {
+  "match" : ["no"],
+  "pre" : [["token", "question", "helptitan"]],
+  "post" : [["settoken", "question", "0"]],
+  "msg" : ["NONE SHALL pass..."]
+  },{
+  "match" : ["yes", "booze"],
+  "pre" : [["quest", "scorn/TitanCrown", "40"], ["token", "status", "askbooze"],["item", "booze", "10"]],
+  "post" : [["settoken", "status", "0"], ["quest", "scorn/TitanCrown", "50"],["takeitem", "booze", "0"], ["connection", "1"]],
+  "msg" : ["Aah, that's better....\n Well, I promised I'd let you past, and so I shall, just keep it a secret between ourselves, hmm?\n I'd get in trouble if it was discovered I was letting people through the gate."]
+  },{
+  "match" : ["yes", "booze"],
+  "pre" : [["quest", "scorn/TitanCrown", "40"], ["token", "status", "askbooze"],["item", "booze"]],
+  "post" : [["settoken", "status", "0"]],
+  "msg" : ["Is that all you have? I'll need more than that to slake my thirst, I *am* a giant you know."]
+  },{
+  "match" : ["yes", "booze"],
+  "pre" : [["quest", "scorn/TitanCrown", "40"], ["token", "status", "askbooze"]],
+  "post" : [["settoken", "status", "0"]],
+  "msg" : ["Where is it?"]
+  },{
+  "match" : ["thirsty"],
+  "pre" : [["quest", "scorn/TitanCrown", "10-30"], ["token", "status", "wantsdrink"]],
+  "post" : [["settoken", "status", "0"], ["quest", "scorn/TitanCrown", "40"]],
+  "msg" : ["It's so hot today!  And we can't leave our posts.\n Say, if you brought some booze for me I'd be mighty obliged.  I am VERY thirsty!\n Yes, if you bring enough, I'll let you in!"]
+  },{
+  "match" : ["thirsty"],
+  "pre" : [["quest", "scorn/TitanCrown", "10-30"], ["token", "status", "wantsdrink"]],
+  "post" : [["settoken", "status", "0"], ["quest", "scorn/TitanCrown", "40"]],
+  "msg" : ["It's so hot today!  And we can't leave our posts.\n Say, if you brought some booze for me I'd be mighty obliged.  I am VERY thirsty!\n Yes, if you bring enough, I'll let you in!"]
+  },{
+  "match" : ["*"],
+  "pre" : [["quest", "scorn/TitanCrown", "40"]],
+  "post" : [["settoken", "status", "askbooze"]],
+  "msg" : ["Have you brought booze for me?"],
+  "replies" : [["yes", "Yes, Here is your booze"], ["no", "No, I'm still looking for some booze for you"]]
+  },{
+  "match" : ["*"],
+  "pre" : [["quest", "scorn/TitanCrown", "10"]],
+  "post" : [["settoken", "status", "wantsdrink"]],
+  "msg" : ["NONE SHALL pass...\n\n Haaa, how thirsty am I...\n*sigh*"],
+  "replies" : [["thirsty", "Would you like something to drink?"]]
+  },{
+  "match" : ["*"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["NONE SHALL pass..."]
+  }
+]}

quests/peterm/quests/wyvern_quest

@@ -8,7 +8,7 @@ enter_x 1
 enter_y 2
 msg
 Created:  2000-06-07
-Modified: 2009-07-12 Andreas Kirschbaum
+Modified: 2010-05-05 Cavesomething
 endmsg
 maplore
 @quest Scorn Royalty Quest
@@ -3743,6 +3743,21 @@ carrying 25
 arch dragon_wing
 name Slithselest's wing
 material 0
+arch event_drop
+name scorn/WyvernWing 50
+title Python
+slaying /python/quests/QuestEssentialUntil.py
+end
+arch event_pickup
+name scorn/WyvernWing 30>40
+title Python
+slaying /python/quests/QuestAdvance.py
+end
+end
+arch event_death
+name scorn/WyvernWing 20>30
+title Python
+slaying /python/quests/QuestAdvance.py
 end
 end
 arch medium_stones