summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/020-1/serge.txt4
-rw-r--r--npc/functions/mobhunter.txt22
2 files changed, 20 insertions, 6 deletions
diff --git a/npc/020-1/serge.txt b/npc/020-1/serge.txt
index 09101a206..dd921e1aa 100644
--- a/npc/020-1/serge.txt
+++ b/npc/020-1/serge.txt
@@ -20,8 +20,8 @@
goto L_WinterQuest;
L_Main:
- //if (GHQUEST)
- // GHQ_Assign(Fluffy, "Nivalis", "150.000 GP, 60 "+getitemlink(StrangeCoin));
+ if (GHQUEST)
+ GHQ_Assign(Fluffy, "Nivalis", "125.000 GP, 60 "+getitemlink(StrangeCoin));
close;
L_OutOfSeason:
diff --git a/npc/functions/mobhunter.txt b/npc/functions/mobhunter.txt
index fadba48c8..f40a9f137 100644
--- a/npc/functions/mobhunter.txt
+++ b/npc/functions/mobhunter.txt
@@ -1,7 +1,6 @@
// TMW-2 Script
// Author: Jesusalva
// Desc: Grand Hunter Quest Utils
-// Note: Remember to update Aidan too
// MobID
function script GHQ_GetQuestIDByMonsterID {
@@ -24,6 +23,9 @@ function script GHQ_GetQuestIDByMonsterID {
case Moggun:
return 6;
break;
+ case Fluffy:
+ return 7;
+ break;
default:
debugmes "Invalid mob ID: " + getarg(0);
dispbottom l("ERROR, Please report: GHQ GQID: Invalid ID: @@", getarg(0));
@@ -54,6 +56,9 @@ function script GHQ_GetMonsterIDByQuestID {
case 6:
return Moggun;
break;
+ case 7:
+ return Fluffy;
+ break;
default:
debugmes "Invalid quest ID: " + getarg(0);
dispbottom l("ERROR, Please report: GHQ GMID: Invalid ID: @@", getarg(0));
@@ -133,7 +138,7 @@ function script GHQ_GetRewardsOnCompletion {
getitem StrangeCoin, 80;
getexp 15750, 100;
mesn;
- mesq l("Good job, here is 300,000 GP and 80 @@!", getitemlink(StrangeCoin));
+ mesq l("Good job, here is @@ GP and @@ @@!", format_number(300000), format_number(80), getitemlink(StrangeCoin));
mesc l("Gained @@ XP", "15750");
close;
case Scorpion:
@@ -150,7 +155,7 @@ function script GHQ_GetRewardsOnCompletion {
getitem StrangeCoin, 60;
getexp 15750, 100;
mesn;
- mesq l("Good job, here is 175,000 GP and 60 @@!", getitemlink(StrangeCoin));
+ mesq l("Good job, here is @@ GP and @@ @@!", format_number(175000), format_number(60), getitemlink(StrangeCoin));
mesc l("Gained @@ XP", "15750");
close;
case Pinkie:
@@ -167,7 +172,16 @@ function script GHQ_GetRewardsOnCompletion {
getitem StrangeCoin, 60;
getexp 15750, 100;
mesn;
- mesq l("Good job, here is 150,000 GP and 60 @@!", getitemlink(StrangeCoin));
+ mesq l("Good job, here is @@ GP and @@ @@!", format_number(150000), format_number(60), getitemlink(StrangeCoin));
+ mesc l("Gained @@ XP", "15750");
+ close;
+ case Fluffy:
+ setq General_Hunter, 0, 0;
+ Zeny=Zeny+125000;
+ getitem StrangeCoin, 60;
+ getexp 15750, 100;
+ mesn;
+ mesq l("Good job, here is @@ GP and @@ @@!", format_number(125000), format_number(60), getitemlink(StrangeCoin));
mesc l("Gained @@ XP", "15750");
close;
}