From b8898cd7f05c2aaf12ae00c49b33e41b9eea7afd Mon Sep 17 00:00:00 2001
From: Jittapan Pluemsumran <foreverfk@stephack.com>
Date: Tue, 7 Jun 2016 22:59:47 +0700
Subject: [PATCH] Updated Old Glast Heim instance * Adds official quest entries
 for the instance. * Modify behavior of item-giving NPCs. Fixes #701. Fixes
 #1343. Thanks to @exneval, @spinzaku and @tmav94.

---
 db/re/quest_db.txt                | 17 ++++++++++++++---
 npc/re/instances/OldGlastHeim.txt | 22 ++++++++++++++++++----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/db/re/quest_db.txt b/db/re/quest_db.txt
index bf6accc5cc..f9cbf8e1da 100644
--- a/db/re/quest_db.txt
+++ b/db/re/quest_db.txt
@@ -2518,9 +2518,20 @@
 12314,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"About skills"
 
 // Old Glast Heim
-12317,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Fake Keyblade"
-12318,0,2475,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Upper Cats: annoying guy"
-12319,0,2476,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Upper Cats: annoying guy"
+12316,0,0,0,0,0,0,0,"Meeting Hugin"
+12317,82800,0,0,0,0,0,0,"Trace of Time Travel"
+12318,0,2475,1,0,0,0,0,"Corrupted Soul Hunt"
+12319,0,2476,1,0,0,0,0,"Amdarais Hunt"
+12320,0,0,0,0,0,0,0,"Time Traveler"
+12321,0,0,0,0,0,0,0,"Time Conqueror"
+12322,0,0,0,0,0,0,0,"Space Distortion"
+
+12334,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Trace of Time Travel"
+12335,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Space Distortion"
+//12336,0,3151,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Corrupted Soul Hunt"
+//12337,0,3150,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Amdarais Soul Hunt"
+12338,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Time Traveler"
+12339,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Time Conqueror"
 
 12363,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"?????? ?? ??"
 
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index 434ef29760..f2f927b72d 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -1222,8 +1222,13 @@ OnTalk6:
 			mes "[Varmunt]";
 			mes "There's something unusual about this thing's aura. Maybe someday we will be able to understand what is behind all of this.";
 			cutin "gl_barmund1",2;
-			getitem 6608,1; //Coagulated Spell
-			setquest 12319;
+			erasequest 12318;
+			if (checkquest(12319,HUNTING) == -1)
+				setquest 12319;
+			setquest 12320;
+			erasequest 12320;
+			getitem 6607,1; //Temporal_Crystal
+			getitem 6608,1; //Coagulated_Spell
 			close2;
 			cutin "gl_barmund1",255;
 			end;
@@ -1925,9 +1930,18 @@ OnTimer80000:
 	if (checkquest(12319,HUNTING) == 2) {
 		mes "[Hugin]";
 		mes "Well, you are pretty ridiculous. Beginners shouldn't get the loot Amdarias drops.";
-		erasequest 12318;
 		erasequest 12319;
-		getitem 6608,1; //Coagulated Spell
+		setquest 12321;
+		setquest 12322;
+		erasequest 12321;
+		if (gh_instance) {
+			getitem 6607,1; //Temporal_Crystal
+			getitem 6608,1; //Coagulated_Spell
+		} else {
+			getitem 6607,5; //Temporal_Crystal
+			getitem 6608,5; //Coagulated_Spell
+			gh_instance = 1;
+		}
 		next;
 		mes "[Hugin]";
 		mes "Varmunt, I have arbitrarily stopped time. And soon, the time gap will be gone.";