Revert "Merge branch 'NewQuests' into 'master'"

This reverts merge request !54

1 files changed, 47 insertions, 68 deletions

diff --git a/quests.xml b/quests.xml
index 6856d594..6a598317 100644
--- a/quests.xml
+++ b/quests.xml
@@ -292,18 +292,61 @@ 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>
 			<text></text>
 			<text>##1##BWARNING:##b You need to wait further releases to continue this quest!##0</text>
 		</quest>
@@ -400,19 +443,7 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
 		</quest>
 	</var>
 	<var id="16">
-		<quest name="Transmutation Magic" group="Magic" incomplete="1">
-			<name>Transmutation Magic</name>
-			<text>Auldsbel needs help to transmute stuff.</text>
-			<wiki>He wants:</wiki>
-			<wiki>* 60 Silk Cocoon</wiki>
-			<wiki>* 20 Mauve Herb</wiki>
-			<wiki>* 20 Shadow Herb</wiki>
-			<text></text>
-			<questgiver>Auldsbel</questgiver>
-			<coordinates x="32" y="24">Magic Academy.</coordinates>
-			<reward>250 gp</reward>
-		</quest>
-		<quest name="Transmutation Magic" group="Magic" incomplete="3">
+		<quest name="Transmutation Magic" group="Magic" incomplete="1,2,3,4">
 			<name>Transmutation Magic</name>
 			<text>Auldsbel needs help to transmute stuff.</text>
 			<text></text>
@@ -1255,50 +1286,6 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
 			<reward text1="[Sharp Knife]">{@@1}</reward>
 		</quest>
 	</var>
-	<var id="66">
-		<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>
-			<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>
-			<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>
-			<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>
-			<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>
-			<questgiver>Lieutenant Dausen</questgiver>
-			<coordinates x="111" y="84">Tulimshar</coordinates>
-			<reward text1="[Coal]">6 {@@1}, 200 gp</reward>
-		</quest>
-	</var>
-
 	<!-- id 66 TBA -->
 	<var id="191">
 		<quest name="Tycoon's Hunt" group="Tulimshar" incomplete="2,3,5,6,8,9,11,14">
@@ -1507,14 +1494,6 @@ 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>
 			<questgiver>Ryan</questgiver>
 			<coordinates x="29" y="57">Halinarzo, Library.</coordinates>
 			<reward text1="[Chef Hat]">{@@1}</reward>
@@ -2235,7 +2214,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>