From 91b2098e3575679e51f78fef7b186d74650a8a2d Mon Sep 17 00:00:00 2001 From: cavesomething Date: Sun, 30 May 2010 20:36:31 +0000 Subject: [PATCH] Use setwhen conditions to advance the aristocracy quest line rather than setting it explicitly git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13356 282e977c-c81d-0410-88c4-b93c2d0d6712 --- scorn/aristocracy.quests | 38 ++++++++++++++++++++++++++++++ scorn/misc/king_archduke.msg | 2 +- scorn/misc/king_count.msg | 2 +- scorn/misc/king_duke.msg | 2 +- scorn/misc/magistrate_baron.msg | 2 +- scorn/misc/magistrate_baronet.msg | 2 +- scorn/misc/magistrate_civilian.msg | 2 +- scorn/misc/magistrate_earl.msg | 2 +- scorn/misc/magistrate_knight.msg | 2 +- scorn/misc/magistrate_marquis.msg | 2 +- 10 files changed, 47 insertions(+), 9 deletions(-) diff --git a/scorn/aristocracy.quests b/scorn/aristocracy.quests index b6aa7a9a7..db852d3cb 100644 --- a/scorn/aristocracy.quests +++ b/scorn/aristocracy.quests @@ -7,52 +7,82 @@ step 5 description I have spoken to the magistrate who offered a means for me to obtain station in court end_description +setwhen +scorn/GoblinKing 10 +end_setwhen end_step step 10 description I have been dubbed a Knight of Scorn end_description +setwhen +scorn/GoblinKing finished +end_setwhen end_step step 20 description I have been appointed a Baronet of Scorn end_description +setwhen +scorn/OgreKing finished +end_setwhen end_step step 30 description I have been appointed a Baron of Scorn end_description +setwhen +scorn/Animator finished +end_setwhen end_step step 40 description I have been appointed a Earl of Scorn end_description +setwhen +scorn/BlueMushroom finished +end_setwhen end_step step 50 description I have been appointed a Marquis of Scorn end_description +setwhen +scorn/WyvernWing finished +end_setwhen end_step step 60 description I have been appointed a Count of Scorn end_description +setwhen +scorn/DemonPit finished +end_setwhen end_step step 70 description I have been appointed a Duke of Scorn end_description +setwhen +scorn/DragonWhisker finished +end_setwhen end_step step 80 description I have been appointed a Arch Duke of Scorn end_description +setwhen +scorn/TitanCrown finished +end_setwhen end_step step 90 finishes_quest description I have been named Prince of Scorn end_description +setwhen +scorn/LordSpectre finished +end_setwhen end_step end_quest @@ -405,12 +435,20 @@ finishes_quest description I have found another way through the gate. end_description +setwhen +scorn/PortGate finished +scorn/CityGate finished +scorn/ScornHero <=10 +end_setwhen end_step step 50 finishes_quest description I have been pronounced the 'Hero of Scorn' end_description +setwhen +scorn/GoblinKing finished +end_setwhen end_step end_quest diff --git a/scorn/misc/king_archduke.msg b/scorn/misc/king_archduke.msg index f627fdba9..93262327e 100644 --- a/scorn/misc/king_archduke.msg +++ b/scorn/misc/king_archduke.msg @@ -3,7 +3,7 @@ { "match" : ["curse", "calamity", "spectre", "yes"], "pre" : [["quest", "scorn/LordSpectre", "10"], ["item", "Calamity"], ["token", "question", "curse"]], - "post" : [["takeitem", "Calamity"], ["quest", "scorn/LordSpectre", "60"], ["quest", "scorn/Aristocracy", "90"], ["givecontents", "Prince Reward"], ["settoken", "question", "0"]], + "post" : [["takeitem", "Calamity"], ["quest", "scorn/LordSpectre", "60"], ["givecontents", "Prince Reward"], ["settoken", "question", "0"]], "msg" : ["Congratulations on completing your quest. We have a new Prince of the Realm!\nPlease take this fine sword as a reward. May it serve you well!"] },{ "match" : ["curse", "calamity", "spectre", "yes"], diff --git a/scorn/misc/king_count.msg b/scorn/misc/king_count.msg index 12671df70..de6ee158b 100644 --- a/scorn/misc/king_count.msg +++ b/scorn/misc/king_count.msg @@ -3,7 +3,7 @@ { "match" : ["dragon", "whisker", "lords", "weapon", "yes"], "pre" : [["quest", "scorn/DragonWhisker", "10"], ["item", "Ruggilli's Whisker"], ["token", "question", "whisker"]], - "post" : [["takeitem", "Ruggilli's Whisker"], ["quest", "scorn/DragonWhisker", "70"], ["quest", "scorn/Aristocracy", "70"], ["givecontents", "Duke Reward"], ["settoken", "question", "0"]], + "post" : [["takeitem", "Ruggilli's Whisker"], ["quest", "scorn/DragonWhisker", "70"], ["givecontents", "Duke Reward"], ["settoken", "question", "0"]], "msg" : ["Congratulations on completing your quest. Kneel and receive your accolade.....\n You are now a Duke!\n Also, please take this fine sword as a reward. May it serve you well, the NEXT time you run into dragons."] },{ "match" : ["dragon", "whisker", "lords", "weapon", "yes"], diff --git a/scorn/misc/king_duke.msg b/scorn/misc/king_duke.msg index 20b04f5b3..8155036b9 100644 --- a/scorn/misc/king_duke.msg +++ b/scorn/misc/king_duke.msg @@ -3,7 +3,7 @@ { "match" : ["titan", "crown", "pretender", "meganthropopulos", "yes"], "pre" : [["quest", "scorn/TitanCrown", "10"], ["item", "Meganthropopulos' Crown"], ["token", "question", "crown"]], - "post" : [["takeitem", "Meganthropopulos' Crown"], ["quest", "scorn/TitanCrown", "70"], ["quest", "scorn/Aristocracy", "80"], ["givecontents", "Archduke Reward"], ["settoken", "question", "0"]], + "post" : [["takeitem", "Meganthropopulos' Crown"], ["quest", "scorn/TitanCrown", "70"], ["givecontents", "Archduke Reward"], ["settoken", "question", "0"]], "msg" : ["Congratulations on completing your quest. Kneel and receive your accolade.....\n You are now an Archduke! \n Also, please take this fine shield as a reward. May it serve you well!"] },{ "match" : ["titan", "crown", "pretender", "meganthropopulos", "yes"], diff --git a/scorn/misc/magistrate_baron.msg b/scorn/misc/magistrate_baron.msg index 2cda44e5e..005317c7e 100644 --- a/scorn/misc/magistrate_baron.msg +++ b/scorn/misc/magistrate_baron.msg @@ -3,7 +3,7 @@ { "match" : ["mushroom", "cure", "blue", "yes"], "pre" : [["quest", "scorn/BlueMushroom", "10"], ["item", "blue mushroom"], ["token", "question", "mushroom"]], - "post" : [["takeitem", "blue mushroom"], ["quest", "scorn/BlueMushroom", "50"], ["quest", "scorn/Aristocracy", "40"], ["givecontents", "Marquis Reward"], ["settoken", "question", "0"]], + "post" : [["takeitem", "blue mushroom"], ["quest", "scorn/BlueMushroom", "50"], ["givecontents", "Marquis Reward"], ["settoken", "question", "0"]], "msg" : ["Congratulations on completing your quest. Kneel and receive your accolade.....\n You are now a Marquis!\n Also, please take this fine potion as a reward. May it serve you well!"] },{ "match" : ["mushroom", "cure", "blue", "yes"], diff --git a/scorn/misc/magistrate_baronet.msg b/scorn/misc/magistrate_baronet.msg index dbd93239b..da6726417 100644 --- a/scorn/misc/magistrate_baronet.msg +++ b/scorn/misc/magistrate_baronet.msg @@ -3,7 +3,7 @@ { "match" : ["ring", "animator", "token", "yes"], "pre" : [["quest", "scorn/Animator", "10"], ["item", "Animator's Ring"], ["token", "question", "animator"]], - "post" : [["takeitem", "Animator's Ring"], ["quest", "scorn/Animator", "50"], ["quest", "scorn/Aristocracy", "30"], ["givecontents", "Baron Reward"], ["settoken", "question", "0"]], + "post" : [["takeitem", "Animator's Ring"], ["quest", "scorn/Animator", "50"], ["givecontents", "Baron Reward"], ["settoken", "question", "0"]], "msg" : ["Congratulations on completing your quest. Kneel and receive your accolade.....\n You are now a Baron! \n Also, please take this fine longbow as a reward. May it serve you well!"] },{ "match" : ["ring", "animator", "token", "yes"], diff --git a/scorn/misc/magistrate_civilian.msg b/scorn/misc/magistrate_civilian.msg index 92ac99e03..3d7541442 100644 --- a/scorn/misc/magistrate_civilian.msg +++ b/scorn/misc/magistrate_civilian.msg @@ -3,7 +3,7 @@ { "match" : ["head", "goblin", "chief", "yes"], "pre" : [["quest", "scorn/GoblinKing", "10"], ["item", "Head of the Goblin Chief"], ["token", "question", "goblin"]], - "post" : [["takeitem", "Head of the Goblin Chief"], ["quest", "scorn/GoblinKing", "50"], ["quest", "scorn/Aristocracy", "10"], ["givecontents", "Knight Reward"], ["settoken", "question", "0"], ["quest", "scorn/ScornHero", "50"]], + "post" : [["takeitem", "Head of the Goblin Chief"], ["quest", "scorn/GoblinKing", "50"], ["givecontents", "Knight Reward"], ["settoken", "question", "0"]], "msg" : ["Congratulations on completing your quest. Kneel and receive your accolade.....\n You are now sir $you, Knight of Scorn, with all the privileges pertaining thereto."] },{ "match" : ["head", "goblin", "chief", "yes"], diff --git a/scorn/misc/magistrate_earl.msg b/scorn/misc/magistrate_earl.msg index c68621738..30a8ffc14 100644 --- a/scorn/misc/magistrate_earl.msg +++ b/scorn/misc/magistrate_earl.msg @@ -3,7 +3,7 @@ { "match" : ["demon", "euthville", "portal", "broken", "threat", "yes"], "pre" : [["quest", "scorn/DemonPit", "10"], ["item", "broken gateway"], ["token", "question", "demon"]], - "post" : [["takeitem", "broken gateway"], ["quest", "scorn/DemonPit", "50"], ["quest", "scorn/Aristocracy", "60"], ["givecontents", "Count Reward"], ["settoken", "question", "0"]], + "post" : [["takeitem", "broken gateway"], ["quest", "scorn/DemonPit", "50"], ["givecontents", "Count Reward"], ["settoken", "question", "0"]], "msg" : ["Congratulations on completing your quest. Kneel and receive your accolade.....\n You are now a Count!\n Also, please take this fine sword as a reward. May it serve you well!"] },{ "match" : ["demon", "euthville", "portal", "broken", "threat", "yes"], diff --git a/scorn/misc/magistrate_knight.msg b/scorn/misc/magistrate_knight.msg index fdbcb973d..c64d4616b 100644 --- a/scorn/misc/magistrate_knight.msg +++ b/scorn/misc/magistrate_knight.msg @@ -3,7 +3,7 @@ { "match" : ["head", "ogre", "chief", "yes"], "pre" : [["quest", "scorn/OgreKing", "10"], ["item", "Head of the Ogre Chief"], ["token", "question", "ogre"]], - "post" : [["takeitem", "Head of the Ogre Chief"], ["quest", "scorn/OgreKing", "50"], ["quest", "scorn/Aristocracy", "20"], ["givecontents", "Baronet Reward"], ["settoken", "question", "0"]], + "post" : [["takeitem", "Head of the Ogre Chief"], ["quest", "scorn/OgreKing", "50"], ["givecontents", "Baronet Reward"], ["settoken", "question", "0"]], "msg" : ["Congratulations on completing your quest. Kneel and receive your accolade.....\n You are now a Baronet!\n Also, please take this girdle as a reward. May it serve you well!"] },{ "match" : ["head", "ogre", "chief", "yes"], diff --git a/scorn/misc/magistrate_marquis.msg b/scorn/misc/magistrate_marquis.msg index 8ccae89f0..b9b6da4bc 100644 --- a/scorn/misc/magistrate_marquis.msg +++ b/scorn/misc/magistrate_marquis.msg @@ -3,7 +3,7 @@ { "match" : ["wing", "wyvern", "snack", "slithselest", "yes"], "pre" : [["quest", "scorn/WyvernWing", "10"], ["item", "Slithselest's wing"], ["token", "question", "wing"]], - "post" : [["takeitem", "Slithselest's wing"], ["quest", "scorn/WyvernWing", "50"], ["quest", "scorn/Aristocracy", "50"], ["givecontents", "Earl Reward"], ["settoken", "question", "0"]], + "post" : [["takeitem", "Slithselest's wing"], ["quest", "scorn/WyvernWing", "50"], ["givecontents", "Earl Reward"], ["settoken", "question", "0"]], "msg" : ["Congratulations on completing your quest.\nKneel and receive your accolade.....\nYou are now an Earl!\n Also, please take this fine shield as a reward. May it serve you well!"] },{ "match" : ["wing", "wyvern", "snack", "slithselest", "yes"],