Merge quests into less files: Now it is one file per region.

29 files changed, 708 insertions, 792 deletions

diff --git a/quests/_include.xml b/quests/_include.xml
index fa22352a..6a7317b1 100644
--- a/quests/_include.xml
+++ b/quests/_include.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <quests>
-  <include name="quests/candor/_include.xml"/>
-  <include name="quests/kaizei/_include.xml"/>
-  <include name="quests/argeas/_include.xml"/>
-  <include name="quests/tonori/_include.xml"/>
+  <include name="quests/argaes.xml"/>
+  <include name="quests/candor.xml"/>
+  <include name="quests/kaizei.xml"/>
+  <include name="quests/tonori.xml"/>
 </quests>
diff --git a/quests/argeas/celestia.xml b/quests/argaes.xml
index c085d931..9c1e943e 100644
--- a/quests/argeas/celestia.xml
+++ b/quests/argaes.xml
@@ -1,5 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <quests>
+  <var id="17">
+    <effect map="008-1.tmx" npc="154" value="0" effect="45"/>
+    <effect map="008-1.tmx" npc="154" value="1,2" effect="46"/>
+    <quest name="Banu" group="Argeas" incomplete="1">
+      <name>Banu</name>
+      <text>Fill Banu's empty water bottle.</text>
+    </quest>
+    <quest name="Banu" group="Argeas" incomplete="2">
+      <name>Banu</name>
+      <text>Fetch Banu a Knife from the market.</text>
+    </quest>
+    <quest name="Banu" group="Argeas" complete="3">
+      <name>Banu</name>
+      <text>Complete</text>
+    </quest>
+  </var>
   <var id="22">
     <effect map="009-8.tmx" npc="144" value="1,4" effect="45"/>
     <effect map="009-8.tmx" npc="144" value="2,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205" effect="46"/>
@@ -215,4 +231,35 @@
       <text>Reward: [@@677|@@] or 150,000 GP.</text>
     </quest>
   </var>
+  <var id="11">
+    <effect map="009-2.tmx" npc="117" value="0,2" effect="45"/>
+    <effect map="009-2.tmx" npc="117" value="1,3" effect="46"/>
+    <quest name="Soup" group="Argeas" incomplete="1">
+      <name>Soup</name>
+      <text>Bernard needs a Roasted Maggot</text>
+    </quest>
+    <quest name="Soup" group="Argeas" complete="2">
+      <name>Soup</name>
+      <text>Brought Bernard Roasted Maggot</text>
+    </quest>
+    <quest name="Soup" group="Argeas" incomplete="3">
+      <name>Soup 2nd part</name>
+      <text>Bernard needs 3 Maggot Slimes</text>
+    </quest>
+    <quest name="Soup" group="Argeas" complete="4,5,6">
+      <name>Soup 2nd part</name>
+      <text>Brought Bernard 3 Maggot Slimes</text>
+    </quest>
+    <!-- Mikhail quest depends on Bernard quest but is not the same quest -->
+    <effect map="008-1.tmx" npc="120" value="4" effect="45"/>
+    <effect map="008-1.tmx" npc="120" value="5" effect="46"/>
+    <quest name="Slime" group="Argeas" incomplete="5">
+      <name>Slime</name>
+      <text>Bring Mikhail 5 Maggot Slimes</text>
+    </quest>
+    <quest name="Slime" group="Argeas" complete="6">
+      <name>Slime</name>
+      <text>Brought Mikhail 5 Maggot Slimes</text>
+    </quest>
+  </var>
 </quests>
diff --git a/quests/argeas/_include.xml b/quests/argeas/_include.xml
deleted file mode 100644
index 30d9c9e1..00000000
--- a/quests/argeas/_include.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <include name="quests/argeas/soup_and_slimes.xml"/>
-  <include name="quests/argeas/banu.xml"/>
-  <include name="quests/argeas/celestia.xml"/>
-</quests>
diff --git a/quests/argeas/banu.xml b/quests/argeas/banu.xml
deleted file mode 100644
index 06d9c29a..00000000
--- a/quests/argeas/banu.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <var id="17">
-    <effect map="008-1.tmx" npc="154" value="0" effect="45"/>
-    <effect map="008-1.tmx" npc="154" value="1,2" effect="46"/>
-    <quest name="Banu" group="Argeas" incomplete="1">
-      <name>Banu</name>
-      <text>Fill Banu's empty water bottle.</text>
-    </quest>
-    <quest name="Banu" group="Argeas" incomplete="2">
-      <name>Banu</name>
-      <text>Fetch Banu a Knife from the market.</text>
-    </quest>
-    <quest name="Banu" group="Argeas" complete="3">
-      <name>Banu</name>
-      <text>Complete</text>
-    </quest>
-  </var>
-</quests>
diff --git a/quests/argeas/soup_and_slimes.xml b/quests/argeas/soup_and_slimes.xml
deleted file mode 100644
index 0afbd5c3..00000000
--- a/quests/argeas/soup_and_slimes.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <var id="11">
-    <effect map="009-2.tmx" npc="117" value="0,2" effect="45"/>
-    <effect map="009-2.tmx" npc="117" value="1,3" effect="46"/>
-    <quest name="Soup" group="Argeas" incomplete="1">
-      <name>Soup</name>
-      <text>Bernard needs a Roasted Maggot</text>
-    </quest>
-    <quest name="Soup" group="Argeas" complete="2">
-      <name>Soup</name>
-      <text>Brought Bernard Roasted Maggot</text>
-    </quest>
-    <quest name="Soup" group="Argeas" incomplete="3">
-      <name>Soup 2nd part</name>
-      <text>Bernard needs 3 Maggot Slimes</text>
-    </quest>
-    <quest name="Soup" group="Argeas" complete="4,5,6">
-      <name>Soup 2nd part</name>
-      <text>Brought Bernard 3 Maggot Slimes</text>
-    </quest>
-    <!-- Mikhail quest depends on Bernard quest but is not the same quest -->
-    <effect map="008-1.tmx" npc="120" value="4" effect="45"/>
-    <effect map="008-1.tmx" npc="120" value="5" effect="46"/>
-    <quest name="Slime" group="Argeas" incomplete="5">
-      <name>Slime</name>
-      <text>Bring Mikhail 5 Maggot Slimes</text>
-    </quest>
-    <quest name="Slime" group="Argeas" complete="6">
-      <name>Slime</name>
-      <text>Brought Mikhail 5 Maggot Slimes</text>
-    </quest>
-  </var>
-</quests>
diff --git a/quests/candor.xml b/quests/candor.xml
new file mode 100644
index 00000000..6284b2d6
--- /dev/null
+++ b/quests/candor.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0"?>
+<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>
+  <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>
+  <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" effect="45"/>
+    <effect map="029-2.tmx" npc="114" value="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>
+  <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="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="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>
diff --git a/quests/candor/_include.xml b/quests/candor/_include.xml
deleted file mode 100644
index eb9ecade..00000000
--- a/quests/candor/_include.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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
deleted file mode 100644
index e080fac5..00000000
--- a/quests/candor/hasan.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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
deleted file mode 100644
index 0106db24..00000000
--- a/quests/candor/hide-n-seek.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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
deleted file mode 100644
index b8da82c4..00000000
--- a/quests/candor/tutorial.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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" effect="45"/>
-    <effect map="029-2.tmx" npc="114" value="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
deleted file mode 100644
index 7205304e..00000000
--- a/quests/candor/valon.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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
deleted file mode 100644
index 04aae320..00000000
--- a/quests/candor/vincent.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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
deleted file mode 100644
index f8b15c4a..00000000
--- a/quests/candor/zegas.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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>
diff --git a/quests/kaizei.xml b/quests/kaizei.xml
new file mode 100644
index 00000000..03340f1d
--- /dev/null
+++ b/quests/kaizei.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<quests>
+  <var id="9">
+    <effect map="020-2.tmx" npc="191" value="0" effect="45"/>
+    <effect map="020-2.tmx" npc="191" value="1,3,5,7,9,11,15,17,19,23,31,33,35,39,47,63,65,67,71,79,95,127,129,131,135,143,159,191" effect="46"/>
+    <quest name="Baktar" group="Kaizei" incomplete="1,3,5,7,9,11,15,17,19,23,31,33,35,39,47,63,65,67,71,79,95,127,129,131,135,143,159,191">
+      <name>Warm Nostalgia</name>
+      <text>Baktar wants you to bring him some items from Tulimshar to remind him of the great times he had living there.</text>
+      <text>Baktar can be located at (70,61) in Nivalis Indoor.</text>
+    </quest>
+    <quest name="Baktar" group="Kaizei" complete="255">
+      <name>Warm Nostalgia</name>
+      <text>You gave Baktar all the items he requested and helped him finish his collection.</text>
+    </quest>
+  </var>
+  <var id="10">
+    <effect map="048-2.tmx" npc="110" value="13" effect="45"/>
+    <effect map="048-2.tmx" npc="110" value="2" effect="46"/>
+    <effect map="048-2.tmx" npc="130" value="13,14" effect="45"/>
+    <effect map="048-2.tmx" npc="130" value="2,3,4,11" effect="46"/>
+    <effect map="048-2.tmx" npc="134" value="1" effect="46"/>
+    <effect map="048-2.tmx" npc="134" value="10" effect="45"/>
+    <effect map="048-2.tmx" npc="365" value="3,4,5,6,7,8,9" effect="46"/>
+    <effect map="048-2.tmx" npc="363" value="3,4,5,6,7,8,9" effect="46"/>
+    <effect map="048-2.tmx" npc="366" value="3,4,5,6,7,8,9" effect="46"/>
+    <quest name="Blue Sage" group="Kaizei" incomplete="14">
+      <name>Hungry For Knowledge</name>
+      <text>Elias told you about the mutant slime infestation and the destruction of the library, which he said was on the third floor. You may be able to learn more about the situation by asking around...</text>
+    </quest>
+    <quest name="Blue Sage" group="Kaizei" incomplete="1">
+      <name>Misplaced Punishment</name>
+      <text>The distressed Peetu has asked you to talk to Chief Oskari on his behalf.</text>
+      <text>Chief Oskari can be found at (146,26) within the Blue Sages' Mansion.</text>
+    </quest>
+    <quest name="Blue Sage" group="Kaizei" incomplete="2,5,8">
+      <name>An Unbiased Investigation</name>
+      <text>You talked to Oskari, who has reassured you of Peetu's position and enlisted your help in discerning the actual turn of events.</text>
+      <text>In order to figure out what happened, you need to talk to more witnesses. Peetu might be a good place to start, but perhaps you should talk to someone more prominent...</text>
+    </quest>
+    <quest name="Blue Sage" group="Kaizei" incomplete="3,6,9,4,7">
+      <name>Masked Suspicion</name>
+      <text>After talking to Elias, you learned about a particularly suspicious character.</text>
+      <text>Maybe you should see if anyone else remembers the suspect...</text>
+    </quest>
+    <quest name="Blue Sage" group="Kaizei" incomplete="10">
+      <name>The Masked Malefactor</name>
+      <text>You've heard a convincing testimony against the masked man; you should go tell Oskari what you found!</text>
+      <text>Chief Oskari can be found at (146,26) within the Blue Sages' Mansion.</text>
+    </quest>
+    <quest name="Blue Sage" group="Kaizei" incomplete="11">
+      <name>Charges Absolved</name>
+      <text>You should tell Peetu that Oskari knows about the true perpetrator – he'll certainly be relieved to hear it!</text>
+      <text>Peetu is located at (25,135) within the Blue Sages' Mansion.</text>
+    </quest>
+    <quest name="Blue Sage" group="Kaizei" complete="12">
+      <name>Mystery Solved</name>
+      <text>Peetu, thankful for your help, gave you a pair of Silk Gloves for clearing his name.</text>
+    </quest>
+  </var>
+  <var id="8">
+    <effect map="031-1.tmx" npc="195" value="5" effect="45"/>
+    <effect map="031-1.tmx" npc="195" value="1,2,3,6" effect="46"/>
+    <effect map="031-2.tmx" npc="196" value="3" effect="45"/>
+    <effect map="031-4.tmx" npc="198" value="2" effect="45"/>
+    <effect map="031-4.tmx" npc="198" value="3" effect="46"/>
+    <!-- state 5 does not show up in the quest log because it is only to display the icon above the npc -->
+    <quest name="Angela" group="Kaizei" incomplete="6">
+      <name>A Mother's Fear</name>
+      <text>You met Angela outside an ominous cave, but she's in too much of a panic over her daughter's misfortune to tell you anything useful. Perhaps you could give her something to help her concentrate...</text>
+      <text>After you find something to calm her down, you can find Angela at (79,24) in the Nivalis Port area.</text>
+    </quest>
+    <quest name="Cindy" group="Kaizei" incomplete="1">
+      <name>The Power of Concentration</name>
+      <text>Angela has calmed down enough to tell you that Cindy has been kidnapped by Yetis! You might want to bring a few friends along to rescue her – yetis seem really tough!</text>
+      <text>Cindy can be found deep within the cavern at (42,42) in Cindy Cave.</text>
+    </quest>
+    <quest name="Cindy" group="Kaizei" incomplete="2">
+      <name>They're Finally Gone</name>
+      <text>You saved Cindy from the yetis – and managed to stay alive! You should talk to her and make sure that she's okay.</text>
+      <text>Cindy is located at (42,42) in Cindy Cave.</text>
+    </quest>
+    <quest name="Cindy" group="Kaizei" incomplete="3">
+      <name>A Welcome Gift</name>
+      <text>Cindy found something valuable in the cave and decided to give it to you! You should go talk to Angela and tell her what happened.</text>
+      <text>Cindy and Angela can be found at (27,26) in Angela's House.</text>
+    </quest>
+    <quest name="Cindy" group="Kaizei" complete="4">
+      <name>A Token of Gratitude</name>
+      <text>Angela, as a token of her gratitude, gave you a powerful rock knife.</text>
+      <text>You can help them retrieve presents from yetis or just stop by to say hello at (27,26) in Angela's House.</text>
+    </quest>
+  </var>
+  <var id="7">
+    <effect map="020-1.tmx" npc="400" value="1" effect="46"/>
+    <quest name="Well" group="Kaizei" incomplete="1">
+      <name>Lassie in the Making</name>
+      <text>You found a man trapped at the bottom of the well! You should try to find someone to help you get him out.</text>
+    </quest>
+    <quest name="Well" group="Kaizei" complete="2">
+      <name>Well That Was Easy</name>
+      <text>You told Miller about the man stuck in the well, and thankfully, he was able to quickly help the man out of his unusual predicament.</text>
+    </quest>
+  </var>
+</quests>
diff --git a/quests/kaizei/_include.xml b/quests/kaizei/_include.xml
deleted file mode 100644
index 12eae6fb..00000000
--- a/quests/kaizei/_include.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <include name="quests/kaizei/well.xml"/>
-  <include name="quests/kaizei/cindy.xml"/>
-  <include name="quests/kaizei/baktar.xml"/>
-  <include name="quests/kaizei/blue_sage.xml"/>
-</quests>
diff --git a/quests/kaizei/baktar.xml b/quests/kaizei/baktar.xml
deleted file mode 100644
index 715fc63a..00000000
--- a/quests/kaizei/baktar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <var id="9">
-    <effect map="020-2.tmx" npc="191" value="0" effect="45"/>
-    <effect map="020-2.tmx" npc="191" value="1,3,5,7,9,11,15,17,19,23,31,33,35,39,47,63,65,67,71,79,95,127,129,131,135,143,159,191" effect="46"/>
-    <quest name="Baktar" group="Kaizei" incomplete="1,3,5,7,9,11,15,17,19,23,31,33,35,39,47,63,65,67,71,79,95,127,129,131,135,143,159,191">
-      <name>Warm Nostalgia</name>
-      <text>Baktar wants you to bring him some items from Tulimshar to remind him of the great times he had living there.</text>
-      <text>Baktar can be located at (70,61) in Nivalis Indoor.</text>
-    </quest>
-    <quest name="Baktar" group="Kaizei" complete="255">
-      <name>Warm Nostalgia</name>
-      <text>You gave Baktar all the items he requested and helped him finish his collection.</text>
-    </quest>
-  </var>
-</quests>
diff --git a/quests/kaizei/blue_sage.xml b/quests/kaizei/blue_sage.xml
deleted file mode 100644
index ca1857e0..00000000
--- a/quests/kaizei/blue_sage.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <var id="10">
-    <effect map="048-2.tmx" npc="110" value="13" effect="45"/>
-    <effect map="048-2.tmx" npc="110" value="2" effect="46"/>
-    <effect map="048-2.tmx" npc="130" value="13,14" effect="45"/>
-    <effect map="048-2.tmx" npc="130" value="2,3,4,11" effect="46"/>
-    <effect map="048-2.tmx" npc="134" value="1" effect="46"/>
-    <effect map="048-2.tmx" npc="134" value="10" effect="45"/>
-    <effect map="048-2.tmx" npc="365" value="3,4,5,6,7,8,9" effect="46"/>
-    <effect map="048-2.tmx" npc="363" value="3,4,5,6,7,8,9" effect="46"/>
-    <effect map="048-2.tmx" npc="366" value="3,4,5,6,7,8,9" effect="46"/>
-    <quest name="Blue Sage" group="Kaizei" incomplete="14">
-      <name>Hungry For Knowledge</name>
-      <text>Elias told you about the mutant slime infestation and the destruction of the library, which he said was on the third floor. You may be able to learn more about the situation by asking around...</text>
-    </quest>
-    <quest name="Blue Sage" group="Kaizei" incomplete="1">
-      <name>Misplaced Punishment</name>
-      <text>The distressed Peetu has asked you to talk to Chief Oskari on his behalf.</text>
-      <text>Chief Oskari can be found at (146,26) within the Blue Sages' Mansion.</text>
-    </quest>
-    <quest name="Blue Sage" group="Kaizei" incomplete="2,5,8">
-      <name>An Unbiased Investigation</name>
-      <text>You talked to Oskari, who has reassured you of Peetu's position and enlisted your help in discerning the actual turn of events.</text>
-      <text>In order to figure out what happened, you need to talk to more witnesses. Peetu might be a good place to start, but perhaps you should talk to someone more prominent...</text>
-    </quest>
-    <quest name="Blue Sage" group="Kaizei" incomplete="3,6,9,4,7">
-      <name>Masked Suspicion</name>
-      <text>After talking to Elias, you learned about a particularly suspicious character.</text>
-      <text>Maybe you should see if anyone else remembers the suspect...</text>
-    </quest>
-    <quest name="Blue Sage" group="Kaizei" incomplete="10">
-      <name>The Masked Malefactor</name>
-      <text>You've heard a convincing testimony against the masked man; you should go tell Oskari what you found!</text>
-      <text>Chief Oskari can be found at (146,26) within the Blue Sages' Mansion.</text>
-    </quest>
-    <quest name="Blue Sage" group="Kaizei" incomplete="11">
-      <name>Charges Absolved</name>
-      <text>You should tell Peetu that Oskari knows about the true perpetrator – he'll certainly be relieved to hear it!</text>
-      <text>Peetu is located at (25,135) within the Blue Sages' Mansion.</text>
-    </quest>
-    <quest name="Blue Sage" group="Kaizei" complete="12">
-      <name>Mystery Solved</name>
-      <text>Peetu, thankful for your help, gave you a pair of Silk Gloves for clearing his name.</text>
-    </quest>
-  </var>
-</quests>
diff --git a/quests/kaizei/cindy.xml b/quests/kaizei/cindy.xml
deleted file mode 100644
index 28781680..00000000
--- a/quests/kaizei/cindy.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <var id="8">
-    <effect map="031-1.tmx" npc="195" value="5" effect="45"/>
-    <effect map="031-1.tmx" npc="195" value="1,2,3,6" effect="46"/>
-    <effect map="031-2.tmx" npc="196" value="3" effect="45"/>
-    <effect map="031-4.tmx" npc="198" value="2" effect="45"/>
-    <effect map="031-4.tmx" npc="198" value="3" effect="46"/>
-    <!-- state 5 does not show up in the quest log because it is only to display the icon above the npc -->
-    <quest name="Angela" group="Kaizei" incomplete="6">
-      <name>A Mother's Fear</name>
-      <text>You met Angela outside an ominous cave, but she's in too much of a panic over her daughter's misfortune to tell you anything useful. Perhaps you could give her something to help her concentrate...</text>
-      <text>After you find something to calm her down, you can find Angela at (79,24) in the Nivalis Port area.</text>
-    </quest>
-    <quest name="Cindy" group="Kaizei" incomplete="1">
-      <name>The Power of Concentration</name>
-      <text>Angela has calmed down enough to tell you that Cindy has been kidnapped by Yetis! You might want to bring a few friends along to rescue her – yetis seem really tough!</text>
-      <text>Cindy can be found deep within the cavern at (42,42) in Cindy Cave.</text>
-    </quest>
-    <quest name="Cindy" group="Kaizei" incomplete="2">
-      <name>They're Finally Gone</name>
-      <text>You saved Cindy from the yetis – and managed to stay alive! You should talk to her and make sure that she's okay.</text>
-      <text>Cindy is located at (42,42) in Cindy Cave.</text>
-    </quest>
-    <quest name="Cindy" group="Kaizei" incomplete="3">
-      <name>A Welcome Gift</name>
-      <text>Cindy found something valuable in the cave and decided to give it to you! You should go talk to Angela and tell her what happened.</text>
-      <text>Cindy and Angela can be found at (27,26) in Angela's House.</text>
-    </quest>
-    <quest name="Cindy" group="Kaizei" complete="4">
-      <name>A Token of Gratitude</name>
-      <text>Angela, as a token of her gratitude, gave you a powerful rock knife.</text>
-      <text>You can help them retrieve presents from yetis or just stop by to say hello at (27,26) in Angela's House.</text>
-    </quest>
-  </var>
-</quests>
diff --git a/quests/kaizei/well.xml b/quests/kaizei/well.xml
deleted file mode 100644
index be0a1298..00000000
--- a/quests/kaizei/well.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <var id="7">
-    <effect map="020-1.tmx" npc="400" value="1" effect="46"/>
-    <quest name="Well" group="Kaizei" incomplete="1">
-      <name>Lassie in the Making</name>
-      <text>You found a man trapped at the bottom of the well! You should try to find someone to help you get him out.</text>
-    </quest>
-    <quest name="Well" group="Kaizei" complete="2">
-      <name>Well That Was Easy</name>
-      <text>You told Miller about the man stuck in the well, and thankfully, he was able to quickly help the man out of his unusual predicament.</text>
-    </quest>
-  </var>
-</quests>
diff --git a/quests/tonori.xml b/quests/tonori.xml
new file mode 100644
index 00000000..edb5abb2
--- /dev/null
+++ b/quests/tonori.xml
@@ -0,0 +1,382 @@
+<?xml version="1.0"?>
+<quests>
+  <var id="18">
+    <effect map="002-1.tmx" npc="156" value="1,2,3,4,5,6,7,8,9,10,11,12,13,14" effect="46"/>
+    <effect map="001-1.tmx" npc="160" value="0" effect="45"/>
+    <effect map="001-1.tmx" npc="160" value="1,2,3,4,5,6,7,8,9,10,11" effect="46"/>
+    <effect map="001-1.tmx" npc="164" value="8,9,10,11,12,13,14" effect="46"/>
+    <quest name="Anwar" group="Tonori" incomplete="1">
+      <name>Anwar's Fields</name>
+      <text>Ask about fertilizer at MIT</text>
+    </quest>
+    <quest name="Anwar" group="Tonori" incomplete="2">
+      <name>Anwar's Fields</name>
+      <text>Get a Chocolate Cake for Tinris</text>
+    </quest>
+    <quest name="Anwar" group="Tonori" incomplete="3">
+      <name>Anwar's Fields</name>
+      <text>Bring Tinris 6 Maggot Slimes, 4 Bug Legs, 3 Scorpion Stingers and 1 Piles of Ash</text>
+    </quest>
+    <quest name="Anwar" group="Tonori" incomplete="4">
+      <name>Anwar's Fields</name>
+      <text>Take fertilizer to Anwar</text>
+    </quest>
+    <quest name="Anwar" group="Tonori" incomplete="5">
+      <name>Anwar's Fields</name>
+      <text>Fertilzer didn't help</text>
+    </quest>
+    <quest name="Anwar" group="Tonori" incomplete="6">
+      <name>Anwar's Fields</name>
+      <text>Bring Tinris 4 Maggot Slimes, 5 Bug Legs, 2 Scorpion Stingers, 2 Piles of Ash and 1 Cactus Potion</text>
+    </quest>
+    <quest name="Anwar" group="Tonori" incomplete="7">
+      <name>Anwar's Fields</name>
+      <text>Ask Eomie for help</text>
+    </quest>
+    <quest name="Anwar" group="Tonori" incomplete="8">
+      <name>Anwar's Fields</name>
+      <text>Eomie needs 5 Grass Seeds, 2 Bottles of Water and 2 Ice Cubes to cast spell on potion</text>
+    </quest>
+    <quest name="Anwar" group="Tonori" incomplete="9">
+      <name>Anwar's Fields</name>
+      <text>Take fertilizer to Anwar</text>
+    </quest>
+    <quest name="Anwar" group="Tonori" incomplete="10">
+      <name>Anwar's Fields</name>
+      <text>Anwar needs 3 pieces of Cotton Cloth and 30 Silk Cocoons for gifts</text>
+    </quest>
+    <quest name="Anwar" group="Tonori" incomplete="11">
+      <name>Anwar's Fields</name>
+      <text>Give Tinris Green V-Neck Sweater from Anwar</text>
+    </quest>
+    <quest name="Anwar" group="Tonori" incomplete="12">
+      <name>Anwar's Fields</name>
+      <text>Gave Tinris Green V-Neck Sweater from Anwar</text>
+    </quest>
+    <quest name="Anwar" group="Tonori" incomplete="13">
+      <name>Anwar's Fields</name>
+      <text>Bring Silk Headband to Eomie</text>
+    </quest>
+    <quest name="Anwar" group="Tonori" incomplete="14">
+      <name>Anwar's Fields</name>
+      <text>Brought Silk Headband to Eomie</text>
+    </quest>
+    <quest name="Anwar" group="Tonori" complete="15">
+      <name>Anwar's Fields</name>
+      <text>Complete</text>
+    </quest>
+  </var>
+  <var id="15">
+    <effect map="001-2.tmx" npc="117" value="0" effect="45"/>
+    <effect map="001-2.tmx" npc="117" value="1,2,3" effect="46"/>
+    <quest name="Tonori Delight" group="Tonori" incomplete="1">
+      <name>Tonori Delight</name>
+      <text>Fieri needs beer</text>
+    </quest>
+    <quest name="Tonori Delight" group="Tonori" incomplete="2">
+      <name>Tonori Delight</name>
+      <text>Brought Fieri beer</text>
+    </quest>
+    <quest name="Tonori Delight" group="Tonori" incomplete="3">
+      <name>Tonori Delight</name>
+      <text>Fieri needs 3 Maggot Slimes</text>
+    </quest>
+    <quest name="Tonori Delight" group="Tonori" complete="4">
+      <name>Tonori Delight</name>
+      <text>Complete</text>
+    </quest>
+  </var>
+  <var id="16">
+    <effect map="002-2.tmx" npc="162" value="0" effect="45"/>
+    <effect map="002-2.tmx" npc="162" value="1,2" effect="46"/>
+    <quest name="Imec's Stingers" group="Tonori" incomplete="1">
+      <name>Imec's Stingers</name>
+      <text>Take Imec's letter to government building</text>
+    </quest>
+    <quest name="Imec's Stingers" group="Tonori" incomplete="2">
+      <name>Imec's Stingers</name>
+      <text>Return government letter to Imec</text>
+    </quest>
+    <quest name="Imec's Stingers" group="Tonori" complete="3">
+      <name>Imec's Stingers</name>
+      <text>Complete</text>
+    </quest>
+  </var>
+  <var id="19">
+    <effect map="002-2.tmx" npc="193" value="0" effect="45"/>
+    <effect map="002-2.tmx" npc="193" value="2,8,9,15" effect="46"/>
+    <effect map="001-1.tmx" npc="213" value="1" effect="46"/>
+    <effect map="001-2.tmx" npc="107" value="3" effect="46"/>
+    <effect map="001-1.tmx" npc="103" value="4" effect="46"/>
+    <effect map="001-2.tmx" npc="117" value="5" effect="46"/>
+    <effect map="002-2.tmx" npc="106" value="7" effect="46"/>
+    <effect map="002-2.tmx" npc="191" value="10,11,12,14" effect="46"/>
+    <quest name="Kylian" group="Tonori" incomplete="1">
+      <name>Kylian</name>
+      <text>Get Kylian's Suitcase from the Dock</text>
+    </quest>
+    <quest name="Kylian" group="Tonori" incomplete="2">
+      <name>Kylian</name>
+      <text>Return Kylian's Suitcase from the Dock</text>
+    </quest>
+    <quest name="Kylian" group="Tonori" incomplete="3">
+      <name>Kylian</name>
+      <text>Find out who to talk to about a shop license</text>
+    </quest>
+    <quest name="Kylian" group="Tonori" incomplete="4">
+      <name>Kylian</name>
+      <text>Find some place for sight seeing in Tonori</text>
+    </quest>
+    <quest name="Kylian" group="Tonori" incomplete="5">
+      <name>Kylian</name>
+      <text>Find some good local eats</text>
+    </quest>
+    <quest name="Kylian" group="Tonori" incomplete="6">
+      <name>Kylian</name>
+      <text>Find some entertainment</text>
+    </quest>
+    <quest name="Kylian" group="Tonori" incomplete="7">
+      <name>Kylian</name>
+      <text>Find some place for nice clothing</text>
+    </quest>
+    <quest name="Kylian" group="Tonori" incomplete="8">
+      <name>Kylian</name>
+      <text>Return to Kylian later</text>
+    </quest>
+    <quest name="Kylian" group="Tonori" incomplete="9">
+      <name>Kylian</name>
+      <text>See if Kylian's shop is open yet</text>
+    </quest>
+    <quest name="Kylian" group="Tonori" incomplete="10">
+      <name>Kylian</name>
+      <text>Offered job working for Kylian</text>
+    </quest>
+    <quest name="Kylian" group="Tonori" incomplete="11">
+      <name>Kylian</name>
+      <text>Accepted job working for KPS</text>
+    </quest>
+    <quest name="Kylian" group="Tonori" incomplete="12">
+      <name>Kylian</name>
+      <text>Pick a delivery</text>
+    </quest>
+    <quest name="Kylian" group="Tonori" incomplete="13">
+      <name>Kylian</name>
+      <text>Deliver the package</text>
+    </quest>
+    <quest name="Kylian" group="Tonori" incomplete="14">
+      <name>Kylian</name>
+      <text>Return to KPS</text>
+    </quest>
+    <quest name="Kylian" group="Tonori" complete="15">
+      <name>Kylian</name>
+      <text>See Kylian</text>
+    </quest>
+  </var>
+  <var id="14">
+    <effect map="002-1.tmx" npc="122" value="0" effect="45"/>
+    <effect map="002-1.tmx" npc="122" value="1,2,4,6,21" effect="46"/>
+    <effect map="002-1.tmx" npc="123" value="3,5,7,10,18,19" effect="46"/>
+    <effect map="002-3.tmx" npc="109" value="8,11,13,15,17" effect="46"/>
+    <effect map="002-4.tmx" npc="109" value="9,12,14,16,20,22" effect="46"/>
+    <effect map="002-4.tmx" npc="400" value="22,23,24" effect="46"/>
+    <effect map="002-5.tmx" npc="340" value="25,26,27" effect="46"/>
+    <effect map="002-5.tmx" npc="378" value="25" effect="46"/>
+    <quest name="Mine" group="Tonori" incomplete="1">
+      <name>Mine</name>
+      <text>Bring Lt. Dausen 10 Cactus Drinks</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="2">
+      <name>Mine</name>
+      <text>Lt. Dausen needs help</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="3">
+      <name>Mine</name>
+      <text>Tell Stewen to hold their post</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="4">
+      <name>Mine</name>
+      <text>Return to Lt. Dausen</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="5">
+      <name>Mine</name>
+      <text>Tell Nickos to hold their post</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="6">
+      <name>Mine</name>
+      <text>Return to Lt. Dausen</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="7">
+      <name>Mine</name>
+      <text>Lt. Dausen wants you to talk to Nickos about the miners</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="8">
+      <name>Mine</name>
+      <text>Nickos wants you to check on the miners</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="9">
+      <name>Mine</name>
+      <text>Nathan is fine, but you should check on Naem</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="10">
+      <name>Mine</name>
+      <text>Return to Nickos</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="11">
+      <name>Mine</name>
+      <text>Help the Miners</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="12">
+      <name>Mine</name>
+      <text>Get a bag of ore from Naem</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="13">
+      <name>Mine</name>
+      <text>Take bag back to Nathan</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="14">
+      <name>Mine</name>
+      <text>Get another bag of ore from Naem</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="15">
+      <name>Mine</name>
+      <text>Take another bag back to Nathan</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="16">
+      <name>Mine</name>
+      <text>Get last bag of ore from Naem</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="17">
+      <name>Mine</name>
+      <text>Take last bag back to Nathan</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="18">
+      <name>Mine</name>
+      <text>Tell Nickos about the Scorpions</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="19">
+      <name>Mine</name>
+      <text>Bring Nickos 10 Angry Scorpion Stingers</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="20">
+      <name>Mine</name>
+      <text>Ask Naem to unlock the Underground Palace</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="21">
+      <name>Mine</name>
+      <text>Talk to Lt. Dausen about the key</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="22">
+      <name>Mine</name>
+      <text>Open the Underground Palace</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="23">
+      <name>Mine</name>
+      <text>Unlocked First Button</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="24">
+      <name>Mine</name>
+      <text>Unlocked Second Button</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="25">
+      <name>Mine</name>
+      <text>Underground Palace is open</text>
+      <text>Talk to Sema</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="26">
+      <name>Mine</name>
+      <text>Found the supply chest. Return to Sema</text>
+    </quest>
+    <quest name="Mine" group="Tonori" incomplete="27">
+      <name>Mine</name>
+      <text>Kill the Giant Cave Maggot and return to Sema</text>
+    </quest>
+    <quest name="Mine" group="Tonori" complete="28">
+      <name>Mine</name>
+      <text>Complete</text>
+    </quest>
+  </var>
+  <var id="13">
+    <effect map="001-2.tmx" npc="114" value="0" effect="45"/>
+    <effect map="001-2.tmx" npc="114" value="1" effect="46"/>
+    <quest name="Sandra" group="Tonori" incomplete="1">
+      <name>Sandra</name>
+      <text>Sandra needs 5 Scorpion Stingers</text>
+    </quest>
+    <quest name="Sandra" group="Tonori" complete="2">
+      <name>Sandra</name>
+      <text>Complete.</text>
+    </quest>
+  </var>
+  <var id="12">
+    <effect map="002-1.tmx" npc="106" value="0" effect="45"/>
+    <effect map="002-1.tmx" npc="106" value="1" effect="46"/>
+    <quest name="Sarah" group="Tonori" incomplete="1">
+      <name>Let me eat cake!</name>
+      <text>Sarah wants a piece of Cherry Cake</text>
+    </quest>
+    <quest name="Sarah" group="Tonori" complete="2">
+      <name>Let me eat cake!</name>
+      <text>Sarah has her cake and eaten it too</text>
+    </quest>
+  </var>
+  <var id="20">
+    <effect map="001-2.tmx" npc="147" value="0,2,5,8,11" effect="45"/>
+    <effect map="001-2.tmx" npc="147" value="1,3,4,6,7,9,10,12,13" effect="46"/>
+    <quest name="Terranite Armor" group="Tonori" incomplete="1">
+      <name>Terranite Armor</name>
+      <text>Bring Heathin 50 Coal</text>
+    </quest>
+    <quest name="Terranite Armor" group="Tonori" incomplete="2">
+      <name>Terranite Armor</name>
+      <text>Talk to Heathin again.</text>
+    </quest>
+    <quest name="Terranite Armor" group="Tonori" incomplete="3">
+      <name>Terranite Armor</name>
+      <text>Bring Heathin 100 Coal, 10 Terranite Ore and 20,000 gold pieces</text>
+    </quest>
+    <quest name="Terranite Armor" group="Tonori" incomplete="4">
+      <name>Terranite Armor</name>
+      <text>Heathin is making a Terranite Hood for you</text>
+    </quest>
+    <quest name="Terranite Armor" group="Tonori" incomplete="5">
+      <name>Terranite Armor</name>
+      <text>Talk to Heathin again.</text>
+    </quest>
+    <quest name="Terranite Armor" group="Tonori" incomplete="6">
+      <name>Terranite Armor</name>
+      <text>Heathin needs 200 Coal, 30 Terranite Ore and 40,000 gold pieces</text>
+    </quest>
+    <quest name="Terranite Armor" group="Tonori" incomplete="7">
+      <name>Terranite Armor</name>
+      <text>Heathin is making Terranite Legs for you</text>
+    </quest>
+    <quest name="Terranite Armor" group="Tonori" incomplete="8">
+      <name>Terranite Armor</name>
+      <text>Talk to Heathin again.</text>
+    </quest>
+    <quest name="Terranite Armor" group="Tonori" incomplete="9">
+      <name>Terranite Armor</name>
+      <text>Heathin needs 250 Coal, 40 Terranite Ore and 50,000 gold pieces</text>
+    </quest>
+    <quest name="Terranite Armor" group="Tonori" incomplete="10">
+      <name>Terranite Armor</name>
+      <text>Heathin is making a Terranite Chest for you</text>
+    </quest>
+    <quest name="Terranite Armor" group="Tonori" incomplete="11">
+      <name>Terranite Armor</name>
+      <text>Talk to Heathin again.</text>
+    </quest>
+    <quest name="Terranite Armor" group="Tonori" incomplete="12">
+      <name>Terranite Armor</name>
+      <text>Heathin needs 5 Coal, 1 Terranite Ore and 3,000 gold pieces</text>
+    </quest>
+    <quest name="Terranite Armor" group="Tonori" incomplete="13">
+      <name>Terranite Armor</name>
+      <text>Heathin is making a Terranite Arrows for you</text>
+    </quest>
+    <quest name="Terranite Armor" group="Tonori" complete="14">
+      <name>Terranite Armor</name>
+      <text>Complete</text>
+    </quest>
+  </var>
+</quests>
diff --git a/quests/tonori/_include.xml b/quests/tonori/_include.xml
deleted file mode 100644
index 9b1417a3..00000000
--- a/quests/tonori/_include.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <include name="quests/tonori/anwar.xml"/>
-  <include name="quests/tonori/fieri.xml"/>
-  <include name="quests/tonori/imec.xml"/>
-  <include name="quests/tonori/kylian.xml"/>
-  <include name="quests/tonori/mine.xml"/>
-  <include name="quests/tonori/sandra.xml"/>
-  <include name="quests/tonori/sarah.xml"/>
-  <include name="quests/tonori/terranite_armor.xml"/>
-</quests>
diff --git a/quests/tonori/anwar.xml b/quests/tonori/anwar.xml
deleted file mode 100644
index 2908244f..00000000
--- a/quests/tonori/anwar.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <var id="18">
-    <effect map="002-1.tmx" npc="156" value="1,2,3,4,5,6,7,8,9,10,11,12,13,14" effect="46"/>
-    <effect map="001-1.tmx" npc="160" value="0" effect="45"/>
-    <effect map="001-1.tmx" npc="160" value="1,2,3,4,5,6,7,8,9,10,11" effect="46"/>
-    <effect map="001-1.tmx" npc="164" value="8,9,10,11,12,13,14" effect="46"/>
-    <quest name="Anwar" group="Tonori" incomplete="1">
-      <name>Anwar's Fields</name>
-      <text>Ask about fertilizer at MIT</text>
-    </quest>
-    <quest name="Anwar" group="Tonori" incomplete="2">
-      <name>Anwar's Fields</name>
-      <text>Get a Chocolate Cake for Tinris</text>
-    </quest>
-    <quest name="Anwar" group="Tonori" incomplete="3">
-      <name>Anwar's Fields</name>
-      <text>Bring Tinris 6 Maggot Slimes, 4 Bug Legs, 3 Scorpion Stingers and 1 Piles of Ash</text>
-    </quest>
-    <quest name="Anwar" group="Tonori" incomplete="4">
-      <name>Anwar's Fields</name>
-      <text>Take fertilizer to Anwar</text>
-    </quest>
-    <quest name="Anwar" group="Tonori" incomplete="5">
-      <name>Anwar's Fields</name>
-      <text>Fertilzer didn't help</text>
-    </quest>
-    <quest name="Anwar" group="Tonori" incomplete="6">
-      <name>Anwar's Fields</name>
-      <text>Bring Tinris 4 Maggot Slimes, 5 Bug Legs, 2 Scorpion Stingers, 2 Piles of Ash and 1 Cactus Potion</text>
-    </quest>
-    <quest name="Anwar" group="Tonori" incomplete="7">
-      <name>Anwar's Fields</name>
-      <text>Ask Eomie for help</text>
-    </quest>
-    <quest name="Anwar" group="Tonori" incomplete="8">
-      <name>Anwar's Fields</name>
-      <text>Eomie needs 5 Grass Seeds, 2 Bottles of Water and 2 Ice Cubes to cast spell on potion</text>
-    </quest>
-    <quest name="Anwar" group="Tonori" incomplete="9">
-      <name>Anwar's Fields</name>
-      <text>Take fertilizer to Anwar</text>
-    </quest>
-    <quest name="Anwar" group="Tonori" incomplete="10">
-      <name>Anwar's Fields</name>
-      <text>Anwar needs 3 pieces of Cotton Cloth and 30 Silk Cocoons for gifts</text>
-    </quest>
-    <quest name="Anwar" group="Tonori" incomplete="11">
-      <name>Anwar's Fields</name>
-      <text>Give Tinris Green V-Neck Sweater from Anwar</text>
-    </quest>
-    <quest name="Anwar" group="Tonori" incomplete="12">
-      <name>Anwar's Fields</name>
-      <text>Gave Tinris Green V-Neck Sweater from Anwar</text>
-    </quest>
-    <quest name="Anwar" group="Tonori" incomplete="13">
-      <name>Anwar's Fields</name>
-      <text>Bring Silk Headband to Eomie</text>
-    </quest>
-    <quest name="Anwar" group="Tonori" incomplete="14">
-      <name>Anwar's Fields</name>
-      <text>Brought Silk Headband to Eomie</text>
-    </quest>
-    <quest name="Anwar" group="Tonori" complete="15">
-      <name>Anwar's Fields</name>
-      <text>Complete</text>
-    </quest>
-  </var>
-</quests>
diff --git a/quests/tonori/fieri.xml b/quests/tonori/fieri.xml
deleted file mode 100644
index cab72871..00000000
--- a/quests/tonori/fieri.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <var id="15">
-    <effect map="001-2.tmx" npc="117" value="0" effect="45"/>
-    <effect map="001-2.tmx" npc="117" value="1,2,3" effect="46"/>
-    <quest name="Tonori Delight" group="Tonori" incomplete="1">
-      <name>Tonori Delight</name>
-      <text>Fieri needs beer</text>
-    </quest>
-    <quest name="Tonori Delight" group="Tonori" incomplete="2">
-      <name>Tonori Delight</name>
-      <text>Brought Fieri beer</text>
-    </quest>
-    <quest name="Tonori Delight" group="Tonori" incomplete="3">
-      <name>Tonori Delight</name>
-      <text>Fieri needs 3 Maggot Slimes</text>
-    </quest>
-    <quest name="Tonori Delight" group="Tonori" complete="4">
-      <name>Tonori Delight</name>
-      <text>Complete</text>
-    </quest>
-  </var>
-</quests>
diff --git a/quests/tonori/imec.xml b/quests/tonori/imec.xml
deleted file mode 100644
index 1d724a7d..00000000
--- a/quests/tonori/imec.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <var id="16">
-    <effect map="002-2.tmx" npc="162" value="0" effect="45"/>
-    <effect map="002-2.tmx" npc="162" value="1,2" effect="46"/>
-    <quest name="Imec's Stingers" group="Tonori" incomplete="1">
-      <name>Imec's Stingers</name>
-      <text>Take Imec's letter to government building</text>
-    </quest>
-    <quest name="Imec's Stingers" group="Tonori" incomplete="2">
-      <name>Imec's Stingers</name>
-      <text>Return government letter to Imec</text>
-    </quest>
-    <quest name="Imec's Stingers" group="Tonori" complete="3">
-      <name>Imec's Stingers</name>
-      <text>Complete</text>
-    </quest>
-  </var>
-</quests>
diff --git a/quests/tonori/kylian.xml b/quests/tonori/kylian.xml
deleted file mode 100644
index 7e924dd0..00000000
--- a/quests/tonori/kylian.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <var id="19">
-    <effect map="002-2.tmx" npc="193" value="0" effect="45"/>
-    <effect map="002-2.tmx" npc="193" value="2,8,9,15" effect="46"/>
-    <effect map="001-1.tmx" npc="213" value="1" effect="46"/>
-    <effect map="001-2.tmx" npc="107" value="3" effect="46"/>
-    <effect map="001-1.tmx" npc="103" value="4" effect="46"/>
-    <effect map="001-2.tmx" npc="117" value="5" effect="46"/>
-    <effect map="002-2.tmx" npc="106" value="7" effect="46"/>
-    <effect map="002-2.tmx" npc="191" value="10,11,12,14" effect="46"/>
-    <quest name="Kylian" group="Tonori" incomplete="1">
-      <name>Kylian</name>
-      <text>Get Kylian's Suitcase from the Dock</text>
-    </quest>
-    <quest name="Kylian" group="Tonori" incomplete="2">
-      <name>Kylian</name>
-      <text>Return Kylian's Suitcase from the Dock</text>
-    </quest>
-    <quest name="Kylian" group="Tonori" incomplete="3">
-      <name>Kylian</name>
-      <text>Find out who to talk to about a shop license</text>
-    </quest>
-    <quest name="Kylian" group="Tonori" incomplete="4">
-      <name>Kylian</name>
-      <text>Find some place for sight seeing in Tonori</text>
-    </quest>
-    <quest name="Kylian" group="Tonori" incomplete="5">
-      <name>Kylian</name>
-      <text>Find some good local eats</text>
-    </quest>
-    <quest name="Kylian" group="Tonori" incomplete="6">
-      <name>Kylian</name>
-      <text>Find some entertainment</text>
-    </quest>
-    <quest name="Kylian" group="Tonori" incomplete="7">
-      <name>Kylian</name>
-      <text>Find some place for nice clothing</text>
-    </quest>
-    <quest name="Kylian" group="Tonori" incomplete="8">
-      <name>Kylian</name>
-      <text>Return to Kylian later</text>
-    </quest>
-    <quest name="Kylian" group="Tonori" incomplete="9">
-      <name>Kylian</name>
-      <text>See if Kylian's shop is open yet</text>
-    </quest>
-    <quest name="Kylian" group="Tonori" incomplete="10">
-      <name>Kylian</name>
-      <text>Offered job working for Kylian</text>
-    </quest>
-    <quest name="Kylian" group="Tonori" incomplete="11">
-      <name>Kylian</name>
-      <text>Accepted job working for KPS</text>
-    </quest>
-    <quest name="Kylian" group="Tonori" incomplete="12">
-      <name>Kylian</name>
-      <text>Pick a delivery</text>
-    </quest>
-    <quest name="Kylian" group="Tonori" incomplete="13">
-      <name>Kylian</name>
-      <text>Deliver the package</text>
-    </quest>
-    <quest name="Kylian" group="Tonori" incomplete="14">
-      <name>Kylian</name>
-      <text>Return to KPS</text>
-    </quest>
-    <quest name="Kylian" group="Tonori" complete="15">
-      <name>Kylian</name>
-      <text>See Kylian</text>
-    </quest>
-  </var>
-</quests>
diff --git a/quests/tonori/mine.xml b/quests/tonori/mine.xml
deleted file mode 100644
index aeab8df4..00000000
--- a/quests/tonori/mine.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <var id="14">
-    <effect map="002-1.tmx" npc="122" value="0" effect="45"/>
-    <effect map="002-1.tmx" npc="122" value="1,2,4,6,21" effect="46"/>
-    <effect map="002-1.tmx" npc="123" value="3,5,7,10,18,19" effect="46"/>
-    <effect map="002-3.tmx" npc="109" value="8,11,13,15,17" effect="46"/>
-    <effect map="002-4.tmx" npc="109" value="9,12,14,16,20,22" effect="46"/>
-    <effect map="002-4.tmx" npc="400" value="22,23,24" effect="46"/>
-    <effect map="002-5.tmx" npc="340" value="25,26,27" effect="46"/>
-    <effect map="002-5.tmx" npc="378" value="25" effect="46"/>
-    <quest name="Mine" group="Tonori" incomplete="1">
-      <name>Mine</name>
-      <text>Bring Lt. Dausen 10 Cactus Drinks</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="2">
-      <name>Mine</name>
-      <text>Lt. Dausen needs help</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="3">
-      <name>Mine</name>
-      <text>Tell Stewen to hold their post</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="4">
-      <name>Mine</name>
-      <text>Return to Lt. Dausen</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="5">
-      <name>Mine</name>
-      <text>Tell Nickos to hold their post</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="6">
-      <name>Mine</name>
-      <text>Return to Lt. Dausen</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="7">
-      <name>Mine</name>
-      <text>Lt. Dausen wants you to talk to Nickos about the miners</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="8">
-      <name>Mine</name>
-      <text>Nickos wants you to check on the miners</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="9">
-      <name>Mine</name>
-      <text>Nathan is fine, but you should check on Naem</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="10">
-      <name>Mine</name>
-      <text>Return to Nickos</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="11">
-      <name>Mine</name>
-      <text>Help the Miners</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="12">
-      <name>Mine</name>
-      <text>Get a bag of ore from Naem</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="13">
-      <name>Mine</name>
-      <text>Take bag back to Nathan</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="14">
-      <name>Mine</name>
-      <text>Get another bag of ore from Naem</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="15">
-      <name>Mine</name>
-      <text>Take another bag back to Nathan</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="16">
-      <name>Mine</name>
-      <text>Get last bag of ore from Naem</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="17">
-      <name>Mine</name>
-      <text>Take last bag back to Nathan</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="18">
-      <name>Mine</name>
-      <text>Tell Nickos about the Scorpions</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="19">
-      <name>Mine</name>
-      <text>Bring Nickos 10 Angry Scorpion Stingers</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="20">
-      <name>Mine</name>
-      <text>Ask Naem to unlock the Underground Palace</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="21">
-      <name>Mine</name>
-      <text>Talk to Lt. Dausen about the key</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="22">
-      <name>Mine</name>
-      <text>Open the Underground Palace</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="23">
-      <name>Mine</name>
-      <text>Unlocked First Button</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="24">
-      <name>Mine</name>
-      <text>Unlocked Second Button</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="25">
-      <name>Mine</name>
-      <text>Underground Palace is open</text>
-      <text>Talk to Sema</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="26">
-      <name>Mine</name>
-      <text>Found the supply chest. Return to Sema</text>
-    </quest>
-    <quest name="Mine" group="Tonori" incomplete="27">
-      <name>Mine</name>
-      <text>Kill the Giant Cave Maggot and return to Sema</text>
-    </quest>
-    <quest name="Mine" group="Tonori" complete="28">
-      <name>Mine</name>
-      <text>Complete</text>
-    </quest>
-  </var>
-</quests>
diff --git a/quests/tonori/sandra.xml b/quests/tonori/sandra.xml
deleted file mode 100644
index b445330f..00000000
--- a/quests/tonori/sandra.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <var id="13">
-    <effect map="001-2.tmx" npc="114" value="0" effect="45"/>
-    <effect map="001-2.tmx" npc="114" value="1" effect="46"/>
-    <quest name="Sandra" group="Tonori" incomplete="1">
-      <name>Sandra</name>
-      <text>Sandra needs 5 Scorpion Stingers</text>
-    </quest>
-    <quest name="Sandra" group="Tonori" complete="2">
-      <name>Sandra</name>
-      <text>Complete.</text>
-    </quest>
-  </var>
-</quests>
diff --git a/quests/tonori/sarah.xml b/quests/tonori/sarah.xml
deleted file mode 100644
index 09a6fee0..00000000
--- a/quests/tonori/sarah.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <var id="12">
-    <effect map="002-1.tmx" npc="106" value="0" effect="45"/>
-    <effect map="002-1.tmx" npc="106" value="1" effect="46"/>
-    <quest name="Sarah" group="Tonori" incomplete="1">
-      <name>Let me eat cake!</name>
-      <text>Sarah wants a piece of Cherry Cake</text>
-    </quest>
-    <quest name="Sarah" group="Tonori" complete="2">
-      <name>Let me eat cake!</name>
-      <text>Sarah has her cake and eaten it too</text>
-    </quest>
-  </var>
-</quests>
diff --git a/quests/tonori/terranite_armor.xml b/quests/tonori/terranite_armor.xml
deleted file mode 100644
index e71d4e08..00000000
--- a/quests/tonori/terranite_armor.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <var id="20">
-    <effect map="001-2.tmx" npc="147" value="0,2,5,8,11" effect="45"/>
-    <effect map="001-2.tmx" npc="147" value="1,3,4,6,7,9,10,12,13" effect="46"/>
-    <quest name="Terranite Armor" group="Tonori" incomplete="1">
-      <name>Terranite Armor</name>
-      <text>Bring Heathin 50 Coal</text>
-    </quest>
-    <quest name="Terranite Armor" group="Tonori" incomplete="2">
-      <name>Terranite Armor</name>
-      <text>Talk to Heathin again.</text>
-    </quest>
-    <quest name="Terranite Armor" group="Tonori" incomplete="3">
-      <name>Terranite Armor</name>
-      <text>Bring Heathin 100 Coal, 10 Terranite Ore and 20,000 gold pieces</text>
-    </quest>
-    <quest name="Terranite Armor" group="Tonori" incomplete="4">
-      <name>Terranite Armor</name>
-      <text>Heathin is making a Terranite Hood for you</text>
-    </quest>
-    <quest name="Terranite Armor" group="Tonori" incomplete="5">
-      <name>Terranite Armor</name>
-      <text>Talk to Heathin again.</text>
-    </quest>
-    <quest name="Terranite Armor" group="Tonori" incomplete="6">
-      <name>Terranite Armor</name>
-      <text>Heathin needs 200 Coal, 30 Terranite Ore and 40,000 gold pieces</text>
-    </quest>
-    <quest name="Terranite Armor" group="Tonori" incomplete="7">
-      <name>Terranite Armor</name>
-      <text>Heathin is making Terranite Legs for you</text>
-    </quest>
-    <quest name="Terranite Armor" group="Tonori" incomplete="8">
-      <name>Terranite Armor</name>
-      <text>Talk to Heathin again.</text>
-    </quest>
-    <quest name="Terranite Armor" group="Tonori" incomplete="9">
-      <name>Terranite Armor</name>
-      <text>Heathin needs 250 Coal, 40 Terranite Ore and 50,000 gold pieces</text>
-    </quest>
-    <quest name="Terranite Armor" group="Tonori" incomplete="10">
-      <name>Terranite Armor</name>
-      <text>Heathin is making a Terranite Chest for you</text>
-    </quest>
-    <quest name="Terranite Armor" group="Tonori" incomplete="11">
-      <name>Terranite Armor</name>
-      <text>Talk to Heathin again.</text>
-    </quest>
-    <quest name="Terranite Armor" group="Tonori" incomplete="12">
-      <name>Terranite Armor</name>
-      <text>Heathin needs 5 Coal, 1 Terranite Ore and 3,000 gold pieces</text>
-    </quest>
-    <quest name="Terranite Armor" group="Tonori" incomplete="13">
-      <name>Terranite Armor</name>
-      <text>Heathin is making a Terranite Arrows for you</text>
-    </quest>
-    <quest name="Terranite Armor" group="Tonori" complete="14">
-      <name>Terranite Armor</name>
-      <text>Complete</text>
-    </quest>
-  </var>
-</quests>