split quest log

9 files changed, 204 insertions, 185 deletions

diff --git a/quests.xml b/quests.xml
index 9536b991..1128db97 100644
--- a/quests.xml
+++ b/quests.xml
@@ -1,188 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    See here for documentation: http://manaplus.org/quests.xml
+-->
 <quests>
-  <var id="1">
-    <effect map="029-2.tmx" npc="154" value="0" effect="45"/>
-    <effect map="029-2.tmx" npc="154" value="1,2,3" effect="46"/>
-    <effect map="029-2.tmx" npc="114" value="4,5,6,7" effect="46"/>
-    <quest name="Tutorial" group="Candor Island" incomplete="1">
-      <name>Introduction</name>
-      <text>Sorfina wants to ensure that you still possess basic motor skills. Walk over to the carpet to put her worries to rest.</text>
-      <text>The carpet is located at (33,27) in Candor Island Indoor.</text>
-    </quest>
-    <quest name="Tutorial" group="Candor Island" incomplete="2">
-      <name>Introduction</name>
-      <text>Sorfina remains skeptical and has instructed you to grab some clothes out of a nearby dresser.</text>
-      <text>The dresser is located at (29,24) in Candor Island Indoor.</text>
-    </quest>
-    <quest name="Tutorial" group="Candor Island" incomplete="3">
-      <name>Introduction</name>
-      <text>Sorfina wants to make sure that you can dress yourself. Open up your inventory and equip the clothes you took from the dresser.</text>
-      <text>You can equip items irregardless of your location, but you may prefer to change in the privacy of the corner at (26,23) in Candor Island Indoor.</text>
-    </quest>
-    <quest name="Tutorial" group="Candor Island" incomplete="4">
-      <name>Introduction</name>
-      <text>To repay your debt, Sorfina has requested that you assist her niece, Tanisha.</text>
-      <text>Tanisha is located at (110,88) in Candor Island Indoor.</text>
-    </quest>
-    <quest name="Tutorial" group="Candor Island" incomplete="5">
-      <name>Introduction</name>
-      <text>Tanisha, despite her job, is disgusted by maggots and wants you to squash them for her.</text>
-      <text>The maggots seem to be infesting near (102,88) in Candor Island Indoor.</text>
-    </quest>
-    <quest name="Tutorial" group="Candor Island" incomplete="6">
-      <name>Introduction</name>
-      <text>Tanisha has given you some useful equipment for squashing maggots. You'd better get to work!</text>
-      <text>The maggots seem to be infesting near (102,88) in Candor Island Indoor.</text>
-    </quest>
-    <quest name="Tutorial" group="Candor Island" incomplete="7">
-      <name>Introduction</name>
-      <text>You killed the maggots for Tanisha, so you should report back to her and see what she has to say.</text>
-      <text>Tanisha is located at (110,88) in Candor Island Indoor.</text>
-    </quest>
-    <quest name="Tutorial" group="Candor Island" complete="8">
-      <name>Introduction</name>
-      <text>You finished all the work that Sorfina and Tanisha had for you. They still seem happy to talk to you though.</text>
-      <text>Sorfina is located at (27,27) and Tanisha is located at (110,88) – both are in Candor Island Indoor.</text>
-    </quest>
-    <quest name="Bully" group="Candor Island" incomplete="9">
-      <name>Bully</name>
-      <text>Hasan sounds like a nasty fellow. You need to find out more about this bully.</text>
-      <text>Asking around town would probably be fruitful...</text>
-    </quest>
-    <quest name="Bully" group="Candor Island" incomplete="10">
-      <name>Finding the Weakness</name>
-      <text>Hasan needs to be taught a lesson!</text>
-      <text>Talk to Sorfina about giving Hasan what he deserves.</text>
-      <text>Sorfina is located at (27,27) in Candor Island Indoor.</text>
-    </quest>
-    <quest name="Bully" group="Candor Island" incomplete="11">
-      <name>Stinging the Heel</name>
-      <text>It seems as though Hasan is afraid of scorpions. Perhaps this could be his downfall...</text>
-      <text>You should go talk to Kaan at (46,95) on Candor Island and tell him what you've learned.</text>
-    </quest>
-    <quest name="Bully" group="Candor Island" incomplete="12">
-      <name>Surprise Scorpion</name>
-      <text>Approach Hasan and have Kaan summon a scorpion.</text>
-      <text>Hasan is holding a hostage at (33,33) on Candor Island.</text>
-    </quest>
-    <quest name="Bully" group="Candor Island" incomplete="13">
-      <name>An Unconventional Savior</name>
-      <text>You killed the scorpion and "saved" Hasan from his childhood fear.</text>
-      <text>Talk to him and see what he has to say.</text>
-    </quest>
-    <quest name="Bully" group="Candor Island" complete="14">
-      <name>A Changed Man</name>
-      <text>Thankfully, Hasan seems to have changed his ways for the better.</text>
-    </quest>
-  </var>
-  <var id="2">
-    <effect map="029-1.tmx" npc="156" value="0" effect="45"/>
-    <effect map="029-1.tmx" npc="156" value="1,2,3,4,5,6" effect="46"/>
-    <quest name="Valon" group="Candor Island" incomplete="1">
-      <name>By Order of the Council</name>
-      <text>The Council of Wizards has offered an incentive to those willing to help cull Candor's unruly wildlife population.</text>
-    </quest>
-    <quest name="Valon" group="Candor Island" incomplete="2">
-      <name>By Order of the Council: Maggots</name>
-      <text>The Council wants you to kill 10 Maggots.</text>
-    </quest>
-    <quest name="Valon" group="Candor Island" incomplete="3">
-      <name>By Order of the Council: House Maggots</name>
-      <text>The Council wants you to kill 5 House Maggots.</text>
-    </quest>
-    <quest name="Valon" group="Candor Island" incomplete="4">
-      <name>By Order of the Council: Tame Scorpion</name>
-      <text>The Council wants you to kill 3 Tame Scorpions.</text>
-    </quest>
-    <quest name="Valon" group="Candor Island" incomplete="5">
-      <name>By Order of the Council: Scorpion</name>
-      <text>The Council wants you to kill 1 Scorpion.</text>
-    </quest>
-    <quest name="Valon" group="Candor Island" complete="6">
-      <name>By Order of the Council</name>
-      <text>You finished killing all the monsters.</text>
-      <text>Go talk to Valon at (72,86) on Candor Island.</text>
-    </quest>
-    <quest name="Valon" group="Candor Island" complete="7">
-      <name>By Order of the Council</name>
-      <text>You filled your quota of monsters and completed the Council's request.</text>
-      <text>Other monsters that you kill will go towards your monster points, which Ishi will redeem at (47,97) on Candor Island.</text>
-    </quest>
-  </var>
-  <var id="3">
-    <effect map="029-2.tmx" npc="355" value="0" effect="45"/>
-    <effect map="029-2.tmx" npc="355" value="1,2,3,4,5,6" effect="46"/>
-    <quest name="Magic Wand" group="Candor Island" incomplete="1">
-      <name>MIT Candor: Admissions</name>
-      <text>You met Morgan, the head of the magic school of Candor.</text>
-      <text>Magic promises to be a powerful tool – once you get around to learning it that is...</text>
-    </quest>
-    <quest name="Magic Wand" group="Candor Island" incomplete="2">
-      <name>MIT Candor: The Power of the Wand</name>
-      <text>Morgan has taught you how to use #confringo, the wand's basic attack spell.</text>
-      <text>Equip your wand and try it out!</text>
-    </quest>
-    <quest name="Magic Wand" group="Candor Island" incomplete="3">
-      <name>MIT Candor: The Power of the Wand</name>
-      <text>You've successfully cast the spell!</text>
-      <text>You should go talk to Morgan at (101,57) in Candor Island Indoor and see what else she has to teach you.</text>
-    </quest>
-    <quest name="Magic Wand" group="Candor Island" complete="4">
-      <name>MIT Candor: The Power of the Wand</name>
-      <text>You learned the basic wand attack spell, #confringo.</text>
-    </quest>
-  </var>
-  <var id="4">
-    <effect map="029-1.tmx" npc="165" value="0" effect="45"/>
-    <effect map="029-1.tmx" npc="165" value="1,2,3" effect="46"/>
-    <quest name="Bug Bomb" group="Candor Island" incomplete="1">
-      <name>Buggy</name>
-      <text>Zegas needs some help. As an aspiring adventure, you should see if you can assist her.</text>
-    </quest>
-    <quest name="Bug Bomb" group="Candor Island" incomplete="2">
-      <name>A what bomb?</name>
-      <text>Zegas has lost her bug bomb inside one of her storage barrels. Find it and set it off to kill the remaining bugs.</text>
-    </quest>
-    <quest name="Bug Bomb" group="Candor Island" incomplete="3">
-      <name>Bug Bomb Goes Boom</name>
-      <text>You found the bug bomb and killed the bugs! You should tell Zegas about it.</text>
-    </quest>
-    <quest name="Bug Bomb" group="Candor Island" complete="4">
-      <name>Buggy</name>
-      <text>You finished helping Zegas with her bug infestation.</text>
-    </quest>
-  </var>
-  <var id="5">
-    <effect map="029-1.tmx" npc="113" value="0" effect="45"/>
-    <effect map="029-1.tmx" npc="113" value="1" effect="46"/>
-    <quest name="Bugman" group="Candor Island" incomplete="1">
-      <name>The Adventures of Action Bug</name>
-      <text>Vincent needs you to bring him some bug legs so he can make an action figure.</text>
-    </quest>
-    <quest name="Bugman" group="Candor Island" complete="2">
-      <name>The Adventures of Action Bug</name>
-      <text>You got Vincent all the bug legs that he needed to make his action figure!</text>
-    </quest>
-  </var>
-  <var id="6">
-    <effect map="029-1.tmx" npc="258" value="0" effect="45"/>
-    <effect map="029-1.tmx" npc="258" value="1,11,13,15,17,19,21,23,25,27,29,3,31,33,35,37,39,41,43,45,47,49,5,51,53,55,57,59,61,7,9,63" effect="46"/>
-    <effect map="029-1.tmx" npc="262" value="1,5,9,17,33,13,21,37,25,41,49,29,45,53,57,61" effect="46"/>
-    <effect map="029-1.tmx" npc="260" value="1,3,9,17,33,11,19,35,25,41,49,27,43,51,57,59" effect="46"/>
-    <effect map="029-1.tmx" npc="259" value="1,3,5,17,33,7,21,37,19,35,49,23,39,53,51,55" effect="46"/>
-    <effect map="029-1.tmx" npc="263" value="1,3,5,9,33,7,13,37,11,35,41,15,39,45,43,47" effect="46"/>
-    <effect map="029-1.tmx" npc="265" value="1,3,5,9,17,7,13,21,11,19,25,15,23,29,27,31" effect="46"/>
-    <quest name="Hide-n-seek" group="Candor Island" incomplete="1,11,13,15,17,19,21,23,25,27,29,3,31,33,35,37,39,41,43,45,47,49,5,51,53,55,57,59,61,7,9">
-      <name>Hide and Seek</name>
-      <text>Ayasha has recruited you in a game of Hide and Seek! Find all five of her friends hidden around Candor Island.</text>
-    </quest>
-    <quest name="Hide-n-seek" group="Candor Island" incomplete="63">
-      <name>Hide and Seek</name>
-      <text>You found all of Ayasha's friends! You should go talk to Ayasha to let her know.</text>
-    </quest>
-    <quest name="Hide-n-seek" group="Candor Island" complete="127">
-      <name>Hide and Seek</name>
-      <text>You finished playing Hide and Seek with Ayasha and her friends.</text>
-    </quest>
-  </var>
+  <include name="quests/_include.xml"/>
 </quests>
diff --git a/quests/_include.xml b/quests/_include.xml
new file mode 100644
index 00000000..e037d993
--- /dev/null
+++ b/quests/_include.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<quests>
+  <include name="quests/candor/_include.xml"/>
+  <!-- include name="quests/argeas/_include.xml"/ -->
+  <!-- include name="quests/tonori/_include.xml"/ -->
+  <!-- include name="quests/kaizei/_include.xml"/ -->
+</quests>
diff --git a/quests/candor/_include.xml b/quests/candor/_include.xml
new file mode 100644
index 00000000..eb9ecade
--- /dev/null
+++ b/quests/candor/_include.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<quests>
+  <include name="quests/candor/tutorial.xml"/>
+  <include name="quests/candor/hasan.xml"/>
+  <include name="quests/candor/valon.xml"/>
+  <include name="quests/candor/zegas.xml"/>
+  <include name="quests/candor/vincent.xml"/>
+  <include name="quests/candor/hide-n-seek.xml"/>
+</quests>
diff --git a/quests/candor/hasan.xml b/quests/candor/hasan.xml
new file mode 100644
index 00000000..e080fac5
--- /dev/null
+++ b/quests/candor/hasan.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<quests>
+  <var id="1">
+    <quest name="Bully" group="Candor Island" incomplete="9">
+      <name>Bully</name>
+      <text>Hasan sounds like a nasty fellow. You need to find out more about this bully.</text>
+      <text>Asking around town would probably be fruitful...</text>
+    </quest>
+    <quest name="Bully" group="Candor Island" incomplete="10">
+      <name>Finding the Weakness</name>
+      <text>Hasan needs to be taught a lesson!</text>
+      <text>Talk to Sorfina about giving Hasan what he deserves.</text>
+      <text>Sorfina is located at (27,27) in Candor Island Indoor.</text>
+    </quest>
+    <quest name="Bully" group="Candor Island" incomplete="11">
+      <name>Stinging the Heel</name>
+      <text>It seems as though Hasan is afraid of scorpions. Perhaps this could be his downfall...</text>
+      <text>You should go talk to Kaan at (46,95) on Candor Island and tell him what you've learned.</text>
+    </quest>
+    <quest name="Bully" group="Candor Island" incomplete="12">
+      <name>Surprise Scorpion</name>
+      <text>Approach Hasan and have Kaan summon a scorpion.</text>
+      <text>Hasan is holding a hostage at (33,33) on Candor Island.</text>
+    </quest>
+    <quest name="Bully" group="Candor Island" incomplete="13">
+      <name>An Unconventional Savior</name>
+      <text>You killed the scorpion and "saved" Hasan from his childhood fear.</text>
+      <text>Talk to him and see what he has to say.</text>
+    </quest>
+    <quest name="Bully" group="Candor Island" complete="14">
+      <name>A Changed Man</name>
+      <text>Thankfully, Hasan seems to have changed his ways for the better.</text>
+    </quest>
+  </var>
+</quests>
diff --git a/quests/candor/hide-n-seek.xml b/quests/candor/hide-n-seek.xml
new file mode 100644
index 00000000..0106db24
--- /dev/null
+++ b/quests/candor/hide-n-seek.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<quests>
+  <var id="6">
+    <effect map="029-1.tmx" npc="258" value="0" effect="45"/>
+    <effect map="029-1.tmx" npc="258" value="1,11,13,15,17,19,21,23,25,27,29,3,31,33,35,37,39,41,43,45,47,49,5,51,53,55,57,59,61,7,9,63" effect="46"/>
+    <effect map="029-1.tmx" npc="262" value="1,5,9,17,33,13,21,37,25,41,49,29,45,53,57,61" effect="46"/>
+    <effect map="029-1.tmx" npc="260" value="1,3,9,17,33,11,19,35,25,41,49,27,43,51,57,59" effect="46"/>
+    <effect map="029-1.tmx" npc="259" value="1,3,5,17,33,7,21,37,19,35,49,23,39,53,51,55" effect="46"/>
+    <effect map="029-1.tmx" npc="263" value="1,3,5,9,33,7,13,37,11,35,41,15,39,45,43,47" effect="46"/>
+    <effect map="029-1.tmx" npc="265" value="1,3,5,9,17,7,13,21,11,19,25,15,23,29,27,31" effect="46"/>
+    <quest name="Hide-n-seek" group="Candor Island" incomplete="1,11,13,15,17,19,21,23,25,27,29,3,31,33,35,37,39,41,43,45,47,49,5,51,53,55,57,59,61,7,9">
+      <name>Hide and Seek</name>
+      <text>Ayasha has recruited you in a game of Hide and Seek! Find all five of her friends hidden around Candor Island.</text>
+    </quest>
+    <quest name="Hide-n-seek" group="Candor Island" incomplete="63">
+      <name>Hide and Seek</name>
+      <text>You found all of Ayasha's friends! You should go talk to Ayasha to let her know.</text>
+    </quest>
+    <quest name="Hide-n-seek" group="Candor Island" complete="127">
+      <name>Hide and Seek</name>
+      <text>You finished playing Hide and Seek with Ayasha and her friends.</text>
+    </quest>
+  </var>
+</quests>
diff --git a/quests/candor/tutorial.xml b/quests/candor/tutorial.xml
new file mode 100644
index 00000000..f5cc521a
--- /dev/null
+++ b/quests/candor/tutorial.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<quests>
+  <var id="1">
+    <!-- SORFINA -->
+    <effect map="029-2.tmx" npc="154" value="0" effect="45"/>
+    <effect map="029-2.tmx" npc="154" value="1,2,3" effect="46"/>
+    <quest name="Tutorial" group="Candor Island" incomplete="1">
+      <name>Introduction</name>
+      <text>Sorfina wants to ensure that you still possess basic motor skills. Walk over to the carpet to put her worries to rest.</text>
+      <text>The carpet is located at (33,27) in Candor Island Indoor.</text>
+    </quest>
+    <quest name="Tutorial" group="Candor Island" incomplete="2">
+      <name>Introduction</name>
+      <text>Sorfina remains skeptical and has instructed you to grab some clothes out of a nearby dresser.</text>
+      <text>The dresser is located at (29,24) in Candor Island Indoor.</text>
+    </quest>
+    <quest name="Tutorial" group="Candor Island" incomplete="3">
+      <name>Introduction</name>
+      <text>Sorfina wants to make sure that you can dress yourself. Open up your inventory and equip the clothes you took from the dresser.</text>
+      <text>You can equip items irregardless of your location, but you may prefer to change in the privacy of the corner at (26,23) in Candor Island Indoor.</text>
+    </quest>
+    <!-- TANISHA -->
+    <effect map="029-2.tmx" npc="114" value="4,5,6,7" effect="46"/>
+    <quest name="Tutorial" group="Candor Island" incomplete="4">
+      <name>Introduction</name>
+      <text>To repay your debt, Sorfina has requested that you assist her niece, Tanisha.</text>
+      <text>Tanisha is located at (110,88) in Candor Island Indoor.</text>
+    </quest>
+    <quest name="Tutorial" group="Candor Island" incomplete="5">
+      <name>Introduction</name>
+      <text>Tanisha, despite her job, is disgusted by maggots and wants you to squash them for her.</text>
+      <text>The maggots seem to be infesting near (102,88) in Candor Island Indoor.</text>
+    </quest>
+    <quest name="Tutorial" group="Candor Island" incomplete="6">
+      <name>Introduction</name>
+      <text>Tanisha has given you some useful equipment for squashing maggots. You'd better get to work!</text>
+      <text>The maggots seem to be infesting near (102,88) in Candor Island Indoor.</text>
+    </quest>
+    <quest name="Tutorial" group="Candor Island" incomplete="7">
+      <name>Introduction</name>
+      <text>You killed the maggots for Tanisha, so you should report back to her and see what she has to say.</text>
+      <text>Tanisha is located at (110,88) in Candor Island Indoor.</text>
+    </quest>
+    <quest name="Tutorial" group="Candor Island" complete="8">
+      <name>Introduction</name>
+      <text>You finished all the work that Sorfina and Tanisha had for you. They still seem happy to talk to you though.</text>
+      <text>Sorfina is located at (27,27) and Tanisha is located at (110,88) – both are in Candor Island Indoor.</text>
+    </quest>
+  </var>
+</quests>
diff --git a/quests/candor/valon.xml b/quests/candor/valon.xml
new file mode 100644
index 00000000..7205304e
--- /dev/null
+++ b/quests/candor/valon.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<quests>
+  <var id="2">
+    <effect map="029-1.tmx" npc="156" value="0" effect="45"/>
+    <effect map="029-1.tmx" npc="156" value="1,2,3,4,5,6" effect="46"/>
+    <quest name="Valon" group="Candor Island" incomplete="1">
+      <name>By Order of the Council</name>
+      <text>The Council of Wizards has offered an incentive to those willing to help cull Candor's unruly wildlife population.</text>
+    </quest>
+    <quest name="Valon" group="Candor Island" incomplete="2">
+      <name>By Order of the Council: Maggots</name>
+      <text>The Council wants you to kill 10 Maggots.</text>
+    </quest>
+    <quest name="Valon" group="Candor Island" incomplete="3">
+      <name>By Order of the Council: House Maggots</name>
+      <text>The Council wants you to kill 5 House Maggots.</text>
+    </quest>
+    <quest name="Valon" group="Candor Island" incomplete="4">
+      <name>By Order of the Council: Tame Scorpion</name>
+      <text>The Council wants you to kill 3 Tame Scorpions.</text>
+    </quest>
+    <quest name="Valon" group="Candor Island" incomplete="5">
+      <name>By Order of the Council: Scorpion</name>
+      <text>The Council wants you to kill 1 Scorpion.</text>
+    </quest>
+    <quest name="Valon" group="Candor Island" complete="6">
+      <name>By Order of the Council</name>
+      <text>You finished killing all the monsters.</text>
+      <text>Go talk to Valon at (72,86) on Candor Island.</text>
+    </quest>
+    <quest name="Valon" group="Candor Island" complete="7">
+      <name>By Order of the Council</name>
+      <text>You filled your quota of monsters and completed the Council's request.</text>
+      <text>Other monsters that you kill will go towards your monster points, which Ishi will redeem at (47,97) on Candor Island.</text>
+    </quest>
+  </var>
+</quests>
diff --git a/quests/candor/vincent.xml b/quests/candor/vincent.xml
new file mode 100644
index 00000000..04aae320
--- /dev/null
+++ b/quests/candor/vincent.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<quests>
+  <var id="5">
+    <effect map="029-1.tmx" npc="113" value="0" effect="45"/>
+    <effect map="029-1.tmx" npc="113" value="1" effect="46"/>
+    <quest name="Bugman" group="Candor Island" incomplete="1">
+      <name>The Adventures of Action Bug</name>
+      <text>Vincent needs you to bring him some bug legs so he can make an action figure.</text>
+    </quest>
+    <quest name="Bugman" group="Candor Island" complete="2">
+      <name>The Adventures of Action Bug</name>
+      <text>You got Vincent all the bug legs that he needed to make his action figure!</text>
+    </quest>
+  </var>
+</quests>
diff --git a/quests/candor/zegas.xml b/quests/candor/zegas.xml
new file mode 100644
index 00000000..f8b15c4a
--- /dev/null
+++ b/quests/candor/zegas.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<quests>
+  <var id="4">
+    <effect map="029-1.tmx" npc="165" value="0" effect="45"/>
+    <effect map="029-1.tmx" npc="165" value="1,2,3" effect="46"/>
+    <quest name="Bug Bomb" group="Candor Island" incomplete="1">
+      <name>Buggy</name>
+      <text>Zegas needs some help. As an aspiring adventure, you should see if you can assist her.</text>
+    </quest>
+    <quest name="Bug Bomb" group="Candor Island" incomplete="2">
+      <name>A what bomb?</name>
+      <text>Zegas has lost her bug bomb inside one of her storage barrels. Find it and set it off to kill the remaining bugs.</text>
+    </quest>
+    <quest name="Bug Bomb" group="Candor Island" incomplete="3">
+      <name>Bug Bomb Goes Boom</name>
+      <text>You found the bug bomb and killed the bugs! You should tell Zegas about it.</text>
+    </quest>
+    <quest name="Bug Bomb" group="Candor Island" complete="4">
+      <name>Buggy</name>
+      <text>You finished helping Zegas with her bug infestation.</text>
+    </quest>
+  </var>
+</quests>