Merge branch 'master' into jesusalva/newmaps

1 files changed, 214 insertions, 31 deletions

diff --git a/quests.xml b/quests.xml
index 0d84d718..329598de 100644
--- a/quests.xml
+++ b/quests.xml
@@ -213,19 +213,19 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
 			<wiki>**It's not only lengthy, but it have long dialogs!**</wiki>
 			<wiki>**YOU HAVE BEEN WARNED!**</wiki>
 			<wiki></wiki>
-			<name>In Seek Of True Identity</name>
+			<name>Who Am I?</name>
 			<text>I better find out who I am.</text>
 			<text>I mean, it is annoying when all you know is your name.</text>
 			<text></text>
 			<text>I bet the ##BShip's captain##b can help.</text>
 		</quest>
 		<quest name="★ - Who Am I?" group="General" incomplete="1">
-			<name>In Seek Of True Identity</name>
+			<name>Who Am I?</name>
 			<text>In Tulimshar, after getting out of the ship, I should visit the first building.</text>
 			<text>It is the townhall. ##BLua##b should be able to help me.</text>
 			<text></text>
 		</quest>
-		<quest name="★ - Who Am I?" group="General" incomplete="2">
+		<quest name="★ - Seek Of An Identity" group="General" incomplete="2">
 			<name>In Seek Of True Identity</name>
 			<text>I was born at Halinarzo but moved at just 4.</text>
 			<text>I must get some levels before attempting such dangerous journey.</text>
@@ -237,14 +237,14 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
 			<text>* Fishing Rod</text>
 			<text>* Lifestone Pendant</text>
 		</quest>
-		<quest name="★ - Who Am I?" group="General" incomplete="3">
+		<quest name="★ - Seek Of An Identity" group="General" incomplete="3">
 			<name>In Seek Of True Identity</name>
 			<text>Lua said I should use the money to travel to Hurnscald and meet the mayor.</text>
 			<text>However, given ship travels are so expensive...</text>
 			<text>Perhaps I should finish some sidequests around here first?</text>
 			<text></text>
 		</quest>
-		<quest name="★ - Who Am I?" group="General" incomplete="4">
+		<quest name="★ - Seek Of An Identity" group="General" incomplete="4">
 			<name>In Seek Of True Identity</name>
 			<text>Airlia, in the city hall, told me the mayor is out.</text>
 			<text>Well, nobody in the city hall seems to be the mayor.</text>
@@ -257,14 +257,14 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
 			<text>Alas, who's the mayor, anyway? How will I know when I see them?</text>
 			<text></text>
 		</quest>
-		<quest name="★ - Who Am I?" group="General" incomplete="5">
-			<name>In Seek Of True Identity</name>
+		<quest name="★ - A Hand Washes The Other" group="General" incomplete="5">
+			<name>A Hand Washes The Other</name>
 			<text>Hurnscald's mayor, Rakinorf, should be on the Inn upstairs.</text>
 			<text>That's usually an area restricted to sponsors, but they did an exception.</text>
 			<text></text>
 		</quest>
-		<quest name="★ - Who Am I?" group="General" incomplete="6">
-			<name>In Seek Of True Identity</name>
+		<quest name="★ - A Hand Washes The Other" group="General" incomplete="6">
+			<name>A Hand Washes The Other</name>
 			<text>Hurnscald's mayor, Rakinorf, is a complicated man.</text>
 			<text>I should use those Return Potions to reach Halin before they expire.</text>
 			<text></text>
@@ -292,18 +292,87 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
 			<text></text>
 			<text>Anyway, I should go to Hurnscald and talk to the Mayor about reaching the World Edge.</text>
 		</quest>
-		<quest name="★ - A Thing Called Family" group="General" incomplete="10">
+		<quest name="★ - A Thing Called Family" group="General" incomplete="10,11">
 			<name>It's Not About Me</name>
 			<text>I should go to Nivalis, talk with the Blue Sage for help.</text>
 			<text></text>
 		</quest>
-		<quest name="★ - The Sage Hunters" group="General" incomplete="11">
+		<quest name="★ - The Sage Hunters" group="General" incomplete="12">
 			<name>The Sage Hunters</name>
 			<text>Still in search of my family, I was involved in some conspiracy or other.</text>
 			<text>Seems like someone is looking to get the sages out of picture.</text>
 			<text></text>
 			<text>I also learned incredible information about the World... Death.</text>
 			<text>My next stop is Frostia's Townhall.</text>
+		</quest>
+		<quest name="★ - The Sage Hunters" group="General" incomplete="13">
+			<name>The Sage Hunters</name>
+			<text>Gelid Frozenheart, King of Frostia, welcomed me.</text>
+			<text>And Frostia is said to be the less receptive town...</text>
+			<text>Well, the guard certainly was rude.</text>
+			<text></text>
+			<text>He gave me some Real Estate Credits, and I should now book</text>
+			<text>a small apartment in the Inn.</text>
+		</quest>
+		<quest name="★ - The Sage Hunters" group="General" incomplete="14">
+			<name>The Sage Hunters</name>
+			<text>I should get base level 52 and job level 24.</text>
+			<text>Said next mission will be very dangerous.</text>
+			<text>I'm not sure I can finish it ##BEven at minimum required level##b</text>
+			<text></text>
+			<text>Just to be safe, I could try getting a better level.</text>
+		</quest>
+		<quest name="★ - The Sage Hunters" group="General" incomplete="15">
+			<name>The Sage Hunters</name>
+			<text>I was assigned a reconnaissance mission.</text>
+			<text>Investigate a haunted or cursed abandoned old village...</text>
+			<text>...Or something. The King will lead me the way.</text>
+			<text></text>
+			<text>I do not have a good feeling about this.</text>
+			<text>I should not only be careful with the traps,</text>
+			<text>But healing items and potions are a must.</text>
+			<text></text>
+			<text>If possible, I know a good level makes the difference.</text>
+		</quest>
+		<quest name="★ - Dark Clouds In Horizon" group="General" incomplete="16">
+			<name>Dark Clouds In Horizon</name>
+			<text>I've found out Isbamuth, grand-grand-grand...nephew of the Monster King.</text>
+			<text></text>
+			<text>He seems to be raging against the Monster King themselves.</text>
+			<text>Of course, nobody currently likes the Monster King</text>
+			<text>but he wants to succeed as the Monster King.</text>
+			<text></text>
+			<text>I also found out about the history of the Monster King</text>
+			<text>And about Homunculus, artificial lifeforms.</text>
+			<text>I've even got one myself. Time to report back.</text>
+			<text></text>
+			<text>I'm not sure if King Gelid will be pleased with this.</text>
+		</quest>
+		<quest name="★ - Dark Clouds In Horizon" group="General" incomplete="17">
+			<name>Dark Clouds In Horizon</name>
+			<text>King Gelid ordered me to deliver a letter to LoF Mayors.</text>
+			<text></text>
+			<text>I should hurry.</text>
+			<text>The Townhall is in LoF's Noble District, the uppermost area.</text>
+			<text></text>
+			<text>Usually it is closed, but I think I can enter it there.</text>
+			<text></text>
+			<text>##1##BWARNING:##b You need to wait further releases to continue this quest!##0</text>
+		</quest>
+		<quest name="★ - The Stolen Item" group="General" incomplete="18">
+			<name>The Stolen Item</name>
+			<text>An item was stolen from LoF's Witch, Lalica.</text>
+			<text></text>
+			<text>I should hurry to Elenium Mines and capture her.</text>
+			<text>Kenton advised me to be ready, at least level 72.</text>
+			<text></text>
+			<text>Are the mines really so dangerous?</text>
+			<text></text>
+			<text>##1##BWARNING:##b You need to wait further releases to continue this quest!##0</text>
+		</quest>
+		<quest name="★ - The Stolen Item" group="General" incomplete="19">
+			<name>The Stolen Item</name>
+			<text>The thief has been dealt with.</text>
 			<text></text>
 			<text>##1##BWARNING:##b You need to wait further releases to continue this quest!##0</text>
 		</quest>
@@ -346,57 +415,66 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
 			<text></text>
 			<questgiver>Aidan</questgiver>
 			<coordinates x="95" y="97">Tulimshar (95,97)</coordinates>
-			<reward text1="[Maggot Cocoon]">{@@1}</reward>
 		</quest>
 		<quest name="Grand Hunter Quest" group="General" incomplete="2">
 			<name>Grand Hunter Quest</name>
 			<text>I promised Jacob to conduct an extermination.</text>
-			<text>The reward should be collected with Aidan.</text>
 			<text text1="[@@m1122|@@]">Progress: {@@var2}/10000 {@@1}.</text>
 			<text></text>
-			<questgiver>Lieutenant Jacob, Halinarzo (71,24)</questgiver>
-			<coordinates x="95" y="97">Tulimshar (95,97)</coordinates>
-			<reward>300,000 GP and 80 Strange Coins</reward>
+			<questgiver>Lieutenant Jacob</questgiver>
+			<coordinates x="71" y="24">Halinarzo (71,24)</coordinates>
 		</quest>
 		<quest name="Grand Hunter Quest" group="General" incomplete="4">
 			<name>Grand Hunter Quest</name>
 			<text>I promised Lufix to conduct an extermination.</text>
-			<text>The reward should be collected with Aidan.</text>
 			<text text1="[@@m1060|@@]">Progress: {@@var2}/10000 {@@1}.</text>
 			<text></text>
-			<questgiver>Lufix, Hurnscald (68,74)</questgiver>
-			<coordinates x="95" y="97">Tulimshar (95,97)</coordinates>
-			<reward>275,000 GP and 60 Strange Coins</reward>
+			<questgiver>Lufix</questgiver>
+			<coordinates x="68" y="74">Hurnscald (68,74)</coordinates>
 		</quest>
 		<quest name="Grand Hunter Quest" group="General" incomplete="5">
 			<name>Grand Hunter Quest</name>
 			<text>I promised Hinnak to conduct an extermination.</text>
-			<text>The reward should be collected with Aidan.</text>
 			<text text1="[@@m1132|@@]">Progress: {@@var2}/10000 {@@1}.</text>
 			<text></text>
-			<questgiver>Hinnak, Hurnscald (105,30)</questgiver>
-			<coordinates x="95" y="97">Tulimshar (95,97)</coordinates>
+			<questgiver>Hinnak</questgiver>
+			<coordinates x="105" y="30">Hurnscald (105,30)</coordinates>
 			<reward text1="[Pink Helmet]">{@@1}</reward>
 		</quest>
 		<quest name="Grand Hunter Quest" group="General" incomplete="6">
 			<name>Grand Hunter Quest</name>
 			<text>I promised Miler to conduct an extermination.</text>
-			<text>The reward should be collected with Aidan.</text>
 			<text text1="[@@m1070|@@]">Progress: {@@var2}/10000 {@@1}.</text>
 			<text></text>
 			<questgiver>Miler, Winterlands</questgiver>
-			<coordinates x="95" y="97">Tulimshar (95,97)</coordinates>
-			<reward>150,000 GP and 60 Strange Coins</reward>
 		</quest>
 		<quest name="Grand Hunter Quest" group="General" incomplete="7">
 			<name>Grand Hunter Quest</name>
 			<text>I promised Serge to conduct an extermination.</text>
-			<text>The reward should be collected with Aidan.</text>
 			<text text1="[@@m1022|@@]">Progress: {@@var2}/10000 {@@1}.</text>
 			<text></text>
 			<questgiver>Serge, Nivalis</questgiver>
-			<coordinates x="95" y="97">Tulimshar (95,97)</coordinates>
-			<reward>125,000 GP and 60 Strange Coins</reward>
+		</quest>
+		<quest name="Grand Hunter Quest" group="General" incomplete="8">
+			<name>Grand Hunter Quest</name>
+			<text>I promised Leona to conduct an extermination.</text>
+			<text text1="[@@m1123|@@]">Progress: {@@var2}/10000 {@@1}.</text>
+			<text></text>
+			<questgiver>Leona, Lilit</questgiver>
+		</quest>
+		<quest name="Grand Hunter Quest" group="General" incomplete="9">
+			<name>Grand Hunter Quest</name>
+			<text>I promised Sarah to conduct an extermination.</text>
+			<text text1="[@@m1029|@@]">Progress: {@@var2}/10000 {@@1}.</text>
+			<text></text>
+			<questgiver>Sarah, Tulimshar</questgiver>
+		</quest>
+		<quest name="Grand Hunter Quest" group="General" incomplete="10">
+			<name>Grand Hunter Quest</name>
+			<text>I promised Arkim to conduct an extermination.</text>
+			<text text1="[@@m1039|@@]">Progress: {@@var2}/10000 {@@1}.</text>
+			<text></text>
+			<questgiver>Arkim, Hurnscald</questgiver>
 		</quest>
 	</var>
 	<var id="16">
@@ -1243,7 +1321,64 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
 			<reward text1="[Sharp Knife]">{@@1}</reward>
 		</quest>
 	</var>
-	<!-- id 66 TBA -->
+	<var id="66">
+		<quest name="Dausen's Test of Strength" group="Tulimshar" incomplete="2,4,6">
+			<name>Dausen's Test of Strength</name>
+			<text>Dausen doesn't seems convinced of my strength just yet.</text>
+			<text>Maybe I should talk to him later!</text>
+			<text></text>
+			<questgiver>Lieutenant Dausen</questgiver>
+			<coordinates x="111" y="84">Tulimshar</coordinates>
+			<reward>54 gp</reward>
+		</quest>
+		<quest name="Dausen's Test of Strength" group="Tulimshar" incomplete="1">
+			<name>Dausen's Test of Strength</name>
+			<text>So Dausen wants me to kill 10 crocs. No big deal!</text>
+			<text text1="Crocs">I already killed {@@var2}/10 {@@1}</text>
+			<text></text>
+			<questgiver>Lieutenant Dausen</questgiver>
+			<coordinates x="111" y="84">Tulimshar</coordinates>
+			<reward>54 gp</reward>
+		</quest>
+		<quest name="Dausen's Test of Strength" group="Tulimshar" incomplete="3">
+			<name>Dausen's Test of Strength</name>
+			<text>Now Dausen wants me to kill blubs and ducks. That should also be fairly easy.</text>
+			<text text1="Ducks / Blubs">I already killed {@@var2}/37 {@@1}</text>
+			<text></text>
+			<questgiver>Lieutenant Dausen</questgiver>
+			<coordinates x="111" y="84">Tulimshar</coordinates>
+			<reward>84 gp</reward>
+			<level>14</level>
+		</quest>
+		<quest name="Dausen's Test of Strength" group="Tulimshar" incomplete="5">
+			<name>Dausen's Test of Strength</name>
+			<text>I showed Dausen my strength, but he wants me to kill some Desert Bandits and Sarracenus or Desert Log Heads</text>
+			<text text1="Desert Bandits">I already killed {@@var2}/100 {@@1}</text>
+			<text></text>
+			<questgiver>Lieutenant Dausen</questgiver>
+			<coordinates x="111" y="84">Tulimshar</coordinates>
+			<reward>132 gp</reward>
+			<level>22</level>
+		</quest>
+		<quest name="Dausen's Test of Strength" group="Tulimshar" incomplete="7">
+			<name>Dausen's Test of Strength</name>
+			<text>The final test of strength (I hope). I feel strong, but Dausen wants me even stronger.</text>
+			<text>I have accumulated {@@var2}/300 points</text>
+			<text>These points come from Giant Maggots (1), Snakes (5) and Black Scorpions (10).</text>
+			<text></text>
+			<questgiver>Lieutenant Dausen</questgiver>
+			<coordinates x="111" y="84">Tulimshar</coordinates>
+			<level>29</level>
+		</quest>
+		<quest name="Dausen's Test of Strength" group="Tulimshar" complete="8">
+			<name>Dausen's Test of Strength</name>
+			<text>Yes! I have passed all of Dausen's tests and he now acknowledges my strength!</text>
+			<text></text>
+			<questgiver>Lieutenant Dausen</questgiver>
+			<coordinates x="111" y="84">Tulimshar</coordinates>
+			<reward text1="[Coal]">6 {@@1}, 200 gp</reward>
+		</quest>
+	</var>
 	<var id="191">
 		<quest name="Tycoon's Hunt" group="Tulimshar" incomplete="2,3,5,6,8,9,11,14">
 			<name>Tycoon's Hunt</name>
@@ -1451,6 +1586,15 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
 			<text>I should keep feeding him these to get a good payment.</text>
 			<text>There's a special reward after a few...</text>
 			<text></text>
+			<wiki>In Tulimshar in the Magic Guild, there is a person, Maxime who can make some Tonori Delight at a cost:</wiki>
+			<wiki>* 12 Maggot Slime</wiki>
+			<wiki>*  8 Plushroom</wiki>
+			<wiki>*  4 Mushroom Spores</wiki>
+			<wiki>*  3 Scorpion Stinger</wiki>
+			<wiki>*  2 Cactus Drink</wiki>
+			<wiki>*  1 Roasted Maggot</wiki>
+			<wiki>* 150 gp</wiki>
+			<wiki></wiki>
 			<questgiver>Ryan</questgiver>
 			<coordinates x="29" y="57">Halinarzo, Library.</coordinates>
 			<reward text1="[Chef Hat]">{@@1}</reward>
@@ -2171,7 +2315,7 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
 		</quest>
 	</var>
 	<var id="119">
-		<quest name="Blue Sage - Pagefinders" group="Nivalis" incomplete="1">
+		<quest name="Blue Sage - Pagefinders" group="Nivalis" complete="1">
 			<name>Blue Sage - Pagefinders</name>
 			<text>Ensio needs help to collect lost bookpages.</text>
 			<text></text>
@@ -2201,6 +2345,45 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
 			<coordinates x="97" y="69">Lilit Kingdom, Trial Cave.</coordinates>
 		</quest>
 	</var>
+	<var id="251">
+		<quest name="Fairy Nemesis" group="Lilit" incomplete="1">
+			<name>Fairy Nemesis</name>
+			<text>Well, not exactly.</text>
+			<text>Shaabty wants me to kill 150 Mountain Snakes in Lilit</text>
+			<text>and bring back at least two snakes skins as a proof.</text>
+			<text></text>
+			<text>I've heard fairies hate snakes, but this is a lot of hatred.</text>
+			<text></text>
+			<questgiver>Shaabty</questgiver>
+			<text>Lilit Island, Indoors.</text>
+		</quest>
+		<quest name="Fairy Nemesis" group="Lilit" incomplete="2">
+			<name>Fairy Nemesis</name>
+			<text>After showing Shaabty how snakes are killed,</text>
+			<text>She offered me some Leather Trousers.</text>
+			<text></text>
+			<text>I need 10 Leather Patches and 8000 GP.</text>
+			<text></text>
+			<questgiver>Shaabty</questgiver>
+			<text>Lilit Island, Indoors.</text>
+		</quest>
+		<quest name="Fairy Nemesis" group="Lilit" incomplete="3">
+			<name>Fairy Nemesis</name>
+			<text>Shaabty is making trousers for me.</text>
+			<text>I need to wait her to finish.</text>
+			<text></text>
+			<questgiver>Shaabty</questgiver>
+			<text>Lilit Island, Indoors.</text>
+		</quest>
+		<quest name="Fairy Nemesis" group="Lilit" complete="4">
+			<name>Fairy Nemesis</name>
+			<text>After slaying several Mountain Snakes in Lilit,</text>
+			<text>Shaabty made some Leather Trousers for me.</text>
+			<text></text>
+			<questgiver>Shaabty</questgiver>
+			<text>Lilit Island, Indoors.</text>
+		</quest>
+	</var>
 
 	<!-- LAND OF FIRE VILLAGE QUESTS -->
 	<var id="270">