Improve the grand monster hunter script (readability and make less confusing)

1 files changed, 26 insertions, 23 deletions

diff --git a/npc/functions/mobhunter.txt b/npc/functions/mobhunter.txt
index 1c42a4f36..89b402a4e 100644
--- a/npc/functions/mobhunter.txt
+++ b/npc/functions/mobhunter.txt
@@ -136,110 +136,110 @@ function	script	GHQ_GetRewardsOnMilestone	{
 
     // 1st step: 1000 kills
     if (is_between(.@old, .@new, 1000)) {
-        mesc l("Goal: @@/@@ reached!", .@new, 1000), 2;
+        mesc l("Goal: @@/@@ reached!", fnum(.@new), fnum(1000)), 2;
         .@xp+=.@bxp*10;
         .@gp+=(.@bhp/2);
         .@jp+=10;
     } else if (.@new < 1000) {
-        mesc l("@@: @@/@@", l("1st step"), .@new, 1000);
+        mesc l("@@: @@/@@", l("1st step"), fnum(.@new), fnum(1000));
     }
 
     // 2nd step: 2000 kills
     if (is_between(.@old, .@new, 2000)) {
-        mesc l("Goal: @@/@@ reached!", .@new, 2000), 2;
+        mesc l("Goal: @@/@@ reached!", fnum(.@new), fnum(2000)), 2;
         .@xp+=.@bxp*20;
         .@gp+=.@bhp;
         .@jp+=20;
     } else if (.@new < 2000) {
-        mesc l("@@: @@/@@", l("2nd step"), .@new, 2000);
+        mesc l("@@: @@/@@", l("2nd step"), fnum(.@new), fnum(2000));
     }
 
     // BONUS step: 2500 kills
     if (is_between(.@old, .@new, 2500)) {
-        mesc l("Bonus Goal: @@/@@ reached!", .@new, 2500), 2;
+        mesc l("Bonus Goal: @@/@@ reached!", fnum(.@new), fnum(2500)), 2;
         .@sc=1+(.@blv/10);
     }
 
     // 3rd step: 3000 kills
     if (is_between(.@old, .@new, 3000)) {
-        mesc l("Goal: @@/@@ reached!", .@new, 3000), 2;
+        mesc l("Goal: @@/@@ reached!", fnum(.@new), fnum(3000)), 2;
         .@xp+=.@bxp*30;
         .@gp+=.@bhp;
         .@jp+=30;
     } else if (.@new < 3000) {
-        mesc l("@@: @@/@@", l("3rd step"), .@new, 3000);
+        mesc l("@@: @@/@@", l("3rd step"), fnum(.@new), fnum(3000));
     }
 
     // 4th step: 4000 kills
     if (is_between(.@old, .@new, 4000)) {
-        mesc l("Goal: @@/@@ reached!", .@new, 4000), 2;
+        mesc l("Goal: @@/@@ reached!", fnum(.@new), fnum(4000)), 2;
         .@xp+=.@bxp*40;
         .@gp+=.@bhp;
         .@jp+=40;
     } else if (.@new < 4000) {
-        mesc l("@@: @@/@@", l("4th step"), .@new, 4000);
+        mesc l("@@: @@/@@", l("4th step"), fnum(.@new), fnum(4000));
     }
 
     // 5th step: 5000 kills
     if (is_between(.@old, .@new, 5000)) {
-        mesc l("Goal: @@/@@ reached!", .@new, 5000), 2;
+        mesc l("Goal: @@/@@ reached!", fnum(.@new), fnum(5000)), 2;
         .@sc=1+(.@blv/10);
         .@xp+=.@bxp*50;
         .@gp+=.@bhp;
         .@jp+=50;
     } else if (.@new < 5000) {
-        mesc l("@@: @@/@@", l("bonus step"), .@new, 5000);
+        mesc l("@@: @@/@@", l("bonus step"), fnum(.@new), fnum(5000));
     }
 
     // 6th step: 6000 kills
     if (is_between(.@old, .@new, 6000)) {
-        mesc l("Goal: @@/@@ reached!", .@new, 6000), 2;
+        mesc l("Goal: @@/@@ reached!", fnum(.@new), fnum(6000)), 2;
         .@xp+=.@bxp*60;
         .@gp+=.@bhp;
         .@jp+=60;
     } else if (.@new < 6000) {
-        mesc l("@@: @@/@@", l("6th step"), .@new, 6000);
+        mesc l("@@: @@/@@", l("6th step"), fnum(.@new), fnum(6000));
     }
 
     // 7th step: 7000 kills
     if (is_between(.@old, .@new, 7000)) {
-        mesc l("Goal: @@/@@ reached!", .@new, 7000), 2;
+        mesc l("Goal: @@/@@ reached!", fnum(.@new), fnum(7000)), 2;
         .@xp+=.@bxp*70;
         .@gp+=.@bhp;
         .@jp+=70;
     } else if (.@new < 7000) {
-        mesc l("@@: @@/@@", l("7th step"), .@new, 7000);
+        mesc l("@@: @@/@@", l("7th step"), fnum(.@new), fnum(7000));
     }
 
     // BONUS step: 7500 kills
     if (is_between(.@old, .@new, 7500)) {
-        mesc l("Bonus Goal: @@/@@ reached!", .@new, 7500), 2;
+        mesc l("Bonus Goal: @@/@@ reached!", fnum(.@new), fnum(7500)), 2;
         .@sc=1+(.@blv/10);
     }
 
     // 8th step: 8000 kills
     if (is_between(.@old, .@new, 8000)) {
-        mesc l("Goal: @@/@@ reached!", .@new, 8000), 2;
+        mesc l("Goal: @@/@@ reached!", fnum(.@new), fnum(8000)), 2;
         .@xp+=.@bxp*80;
         .@gp+=.@bhp;
         .@jp+=80;
     } else if (.@new < 8000) {
-        mesc l("@@: @@/@@", l("8th step"), .@new, 8000);
+        mesc l("@@: @@/@@", l("8th step"), fnum(.@new), fnum(8000));
     }
 
     // 9th step: 9000 kills
     if (is_between(.@old, .@new, 9000)) {
-        mesc l("Goal: @@/@@ reached!", .@new, 9000), 2;
+        mesc l("Goal: @@/@@ reached!", fnum(.@new), fnum(9000)), 2;
         .@xp+=.@bxp*90;
         .@gp+=.@bhp;
         .@jp+=90;
     } else if (.@new < 9000) {
-        mesc l("@@: @@/@@", l("9th step"), .@new, 9000);
+        mesc l("@@: @@/@@", l("9th step"), fnum(.@new), fnum(9000));
     }
 
     // 10th step: 10000 kills
     if (is_between(.@old, .@new, 10000)) {
-        mesc l("Goal: @@/@@ reached!", .@new, 10000), 2;
+        mesc l("Goal: @@/@@ reached!", fnum(.@new), fnum(10000)), 2;
 
         // Main reward
         getitem StrangeCoin, .@blv*2;
@@ -306,14 +306,17 @@ function	script	GHQ_Assign	{
         mes l("The great prize is to unlock a pet!");
     if (.@q == .@id) {
         .@m=GHQ_GetMonsterIDByQuestID(.@q);
-        mes l("You are currently hunting @@/10000 @@.", .@p, getmonsterlink(.@m));
+        if (.@p > 10000)
+            mes l("You have already hunted the %s I requested.", getmonsterlink(.@m));
+        else
+            mes l("You are currently hunting @@/10000 @@.", fnum(.@p), getmonsterlink(.@m));
         next;
         closedialog;
         goodbye;
     }
     if (.@q) {
         .@m=GHQ_GetMonsterIDByQuestID(.@q);
-        mes l("You are currently hunting @@/10000 @@. Do you want to switch?", .@p, getmonsterlink(.@m));
+        mes l("You are currently hunting @@/10000 @@. Do you want to switch?", fnum(.@p), getmonsterlink(.@m));
         mesc l("Protip: Your current progress will be saved.");
     }
     select