Move magic numbers on GHQ to functions/

1 files changed, 6 insertions, 5 deletions

diff --git a/npc/003-1/aidan.txt b/npc/003-1/aidan.txt
index 69e5e434a..665024337 100644
--- a/npc/003-1/aidan.txt
+++ b/npc/003-1/aidan.txt
@@ -103,14 +103,15 @@ L_Assign:
     GHQ_Assign(Maggot, "Tulimshar", getitemlink(MaggotCocoon));
     end;
 
+
 L_Finish:
     // Check if you can store a Strange Coin (you really should)
     inventoryplace StrangeCoin, 1;
     mes l("Current progress: @@/10000 @@", getq2(General_Hunter), getmonsterlink(GHQ_GetMonsterIDByQuestID(getq(General_Hunter))));
     mes "";
     GHMEMO[getq(General_Hunter)]=getq2(General_Hunter);
-    switch (getq(General_Hunter)) {
-    case 1:
+    switch (GHQ_GetMonsterIDByQuestID(getq(General_Hunter))) {
+    case Maggot:
         setq General_Hunter, 0, 0;
         Zeny=Zeny+25000;
         inventoryplace MaggotCocoon, 1;
@@ -120,7 +121,7 @@ L_Finish:
         mesq l("Good job, here is 25,000 GP and 15,750 EXP.");
         mesq l("And your rare, a @@! Enjoy!", getitemlink(MaggotCocoon));
         close;
-    case 2:
+    case Snake:
         setq General_Hunter, 0, 0;
         Zeny=Zeny+300000;
         getitem StrangeCoin, 80;
@@ -129,7 +130,7 @@ L_Finish:
         mesq l("Good job, here is 300,000 GP and 80 @@!", getitemlink(StrangeCoin));
         mesc l("Gained @@ XP", "15750");
         close;
-    case 3:
+    case Scorpion:
         setq General_Hunter, 0, 0;
         Zeny=Zeny+100000;
         getexp 15750, 100;
@@ -137,7 +138,7 @@ L_Finish:
         mesq l("Good job, here is 100,000 GP!");
         mesc l("Gained @@ XP", "15750");
         close;
-    case 4:
+    case ForestMushroom:
         setq General_Hunter, 0, 0;
         Zeny=Zeny+275000;
         getitem StrangeCoin, 60;