1 files changed, 27 insertions, 12 deletions

diff --git a/npc/003-1/aidan.txt b/npc/003-1/aidan.txt
index 23b1f3014..30131abac 100644
--- a/npc/003-1/aidan.txt
+++ b/npc/003-1/aidan.txt
@@ -72,11 +72,13 @@
 
     mesn l("Aidan, the Monster Guide");
     mesq l("You currently have @@ Monster Points. These points are acquired while killing monsters.", Mobpt);
-    if (getq(General_Hunter) == 0) goto L_Register;
-    mesn;
+    if (getq(General_Hunter) == 0 && !GHQUEST) goto L_Register;
+    if (getq(General_Hunter) == 0) goto L_Assign;
+    mes "";
     mesq l("Current Progress: @@/10,000 kills", getq2(General_Hunter));
     if (getq2(General_Hunter) >= 10000) goto L_Finish;
-    close;
+    goto L_Assign;
+    close; // Will never be reach.
 
 L_Register:
     next;
@@ -85,23 +87,36 @@ L_Register:
     next;
     mesn;
     mesq l("You can gain rares, even. Come register for this special program. It's free!");
+    if (askyesno() == ASK_YES) {
+        GHQUEST=1;
+        setarray GHMEMO, 0, 0, 0;
+        mesn;
+        mesq l("Registered, well come to the Grand Hunter Quest!");
+        next;
+        goto L_Assign;
+    } else {
+        mes "";
+        mesn;
+        mesq l("A pity...");
+        close;
+    }
     // TODO: Here we must setarray, and add the flag you are now allowed to do these quests.
     // Then the other NPCs can give you other monsters to kill, backuping previous values
     // to this array. You won't be penalized for switching.
+
+L_Assign:
+    mes "";
+    mesn;
+    mes l("I represent the Tulimshar Hunters. We hunt Maggots.");
+    mes l("The great prize is @@, a pet which eats Bug Legs.", getitemlink(MaggotCocoon));
     select
         l("I'm not interested."),
-        l("(Lv 20) Maggots"),
-        l("(Lv 60) Snakes");
+        rif(GHMEMO[1] < 10000,l("I'll hunt 10,000 maggots."));
 
     switch (@menu) {
     case 2:
-        setq(General_Hunter, 1);
-        mesn;
-        mesq l("Good luck! Don't come back until you reach 10000 kills!");
-        close;
-        break;
-    case 3:
-        setq(General_Hunter, 2);
+        GHMEMO[getq(General_Hunter)]=getq2(General_Hunter);
+        setq(General_Hunter, 1, GHMEMO[1]);
         mesn;
         mesq l("Good luck! Don't come back until you reach 10000 kills!");
         close;