Track more information, disclose more information, but hide some private info.

Monster Points, Total Gold, upgrades available, etc. are too intimate.

6 files changed, 33 insertions, 6 deletions

diff --git a/npc/001-10-1/scripts.txt b/npc/001-10-1/scripts.txt
index b42a9dcfd..fd7c89c6e 100644
--- a/npc/001-10-1/scripts.txt
+++ b/npc/001-10-1/scripts.txt
@@ -40,9 +40,12 @@ OnReward1:
         getitem BottledDust, 9+.bonus;
     else
         getitem BottledDust, 1;
+    // FALLTHROUGH
 OnReward2:
-    if (.pwin && getcharid(1) == .pwin)
+    if (.pwin && getcharid(1) == .pwin) {
+        setq2 LoFQuest_COD, getq2(LoFQuest_COD) + 1;
         getitem BottledDust, 1;
+    }
     warp "018-2-1", 24, 29;
     end;
 
diff --git a/npc/001-8/hub.txt b/npc/001-8/hub.txt
index a189f2fd0..414ba25ad 100644
--- a/npc/001-8/hub.txt
+++ b/npc/001-8/hub.txt
@@ -314,6 +314,8 @@ OnTimer900000:
 OnVictory:
     @qhub_victor=1;
     announce(sprintf("##1HUNGRY QUIRIN EVENT: ##3##B%s has won the match! Hail!", strcharinfo(0)), bc_all|bc_npc);
+    if (!QUIRINO_WINNER)
+        QUIRINO_WINNER = gettimetick(2);
 OnPCDieEvent:
     @qhub_died=1;
 OnPCLogoutEvent:
diff --git a/npc/018-2-1/dustman.txt b/npc/018-2-1/dustman.txt
index 36c37f653..905e791b4 100644
--- a/npc/018-2-1/dustman.txt
+++ b/npc/018-2-1/dustman.txt
@@ -107,7 +107,7 @@ L_COD:
         mesn;
         mesq l("Hey, do you know the ##BCall Of Dusty##b event?");
         next;
-        setq LoFQuest_COD, 1;
+        setq1 LoFQuest_COD, 1;
         goto L_InformationCOD;
     }
 
diff --git a/npc/functions/mobhunter.txt b/npc/functions/mobhunter.txt
index 1a96a2f60..b38fea25d 100644
--- a/npc/functions/mobhunter.txt
+++ b/npc/functions/mobhunter.txt
@@ -161,6 +161,10 @@ function	script	GHQ_GetRewardsOnMilestone	{
         Zeny=Zeny+.@bhp*25; // Maggot: 10.000 gp. That's plenty.
         getexp .@bhp*BaseLevel, .@bhp; // The monster hp, once again, drastically affects
 
+        // Achievements
+        if (!GHQ_WINNER)
+            GHQ_WINNER = gettimetick(2);
+
         // Grand Prize
         switch (.@monsterId) {
         case Pinkie:
diff --git a/npc/functions/mobpoint.txt b/npc/functions/mobpoint.txt
index 2139c02df..53ec1a91c 100644
--- a/npc/functions/mobpoint.txt
+++ b/npc/functions/mobpoint.txt
@@ -53,6 +53,7 @@ OnUnlock:
 
 OnNPCKillEvent:
     $MONSTERS_KILLED+=1;
+    MONSTERS_KILLED+=1;
 
     // Remove undue Job exp
     // The check is probably correct, but setparam is not working =/
diff --git a/npc/items/books.txt b/npc/items/books.txt
index 18f27ad7e..e18d497ee 100644
--- a/npc/items/books.txt
+++ b/npc/items/books.txt
@@ -177,13 +177,18 @@ function myself {
         mesc l("Civil status: Single");
     if (islegendary())
         mesc l("You are a legendary hero.");
+    if (getpetinfo(0))
+        mesc l("Proud owner of %s the %s.", getpetinfo(2), getpetinfo(1));
+    if (gethominfo(0))
+        mesc l("Proud owner of %s the Homunculus.", gethominfo(2));
     mesc l("Born %s ago", FuzzyTime(#REG_DATE));
     dnext;
 
 
     mes ".:: " + l("Magic Status") + " ::.";
     mesc l("Current magic rank: %d", MAGIC_LVL);
-    mesc l("You have @@/@@ magic skill points available.",
+    if (.@all)
+     mesc l("You have @@/@@ magic skill points available.",
             b(sk_points()), sk_maxpoints());
     mesc l("Your current scholar rank: %s (%s Research Points)",
             academicrank(), fnum(MAGIC_RP));
@@ -193,7 +198,7 @@ function myself {
 
     mes ".:: " + l("Rogue Status") + " ::.";
     mesc l("Your current rank: %s", thiefrank());
-    if (THIEF_EXP > (THIEF_RANK*2)**5)
+    if (.@all && THIEF_EXP > (THIEF_RANK*2)**5)
         mesc l("An upgrade is available."), 2;
     dnext;
 
@@ -205,11 +210,14 @@ function myself {
 
 
     mes ".:: " + l("Miscellaneous Status") + " ::.";
-    mesc l("Monster Points: %s", fnum(Mobpt));
+    if (.@all)
+     mesc l("Monster Points: %s", fnum(Mobpt));
     mesc l("Times died: %s", fnum(PC_DIE_COUNTER));
     mesc l("Times reborn: %d", REBIRTH);
-    mesc l("Total Gold: %s", fnum((Zeny+BankVault)));
+    if (.@all)
+     mesc l("Total Gold: %s", fnum((Zeny+BankVault)));
     mesc l("Honor Points: %s", fnum(HONOR));
+    mesc l("Monsters killed: %s", fnum(MONSTERS_KILLED));
     if (getcharid(2) > 0) {
         .@gid=getcharid(2);
         .@pos=getguildrole(.@gid, getcharid(3));
@@ -229,6 +237,7 @@ function myself {
     mesc l("Candor Battle Score: %s", fnum(CRAZYPOINTS));
     mesc l("Candor Bloodbath Score: %s", FuzzyTime(gettimetick(2)+SCANDORPTS));
     mesc l("Times won Capture the Flag: %s", fnum(CAPTURE_FLAG));
+    mesc l("Times won Call of Dusty: %s", fnum(getq2(LoFQuest_COD)));
     mesc l("Mercenary Quests completed: %s", fnum(MERCENARY_DAILYQUEST));
     mesc l("Doppelganger Waves Won: %s", fnum(UDTRANK));
     mesc l("Easter Eggs found: %d", getq3(General_EasterEggs));
@@ -242,7 +251,15 @@ function myself {
         mesc l("Cleared Heroes Hold %s ago", FuzzyTime(YETIKING_WINNER));
     if (REBIRTH_WINNER)
         mesc l("First reborn %s ago", FuzzyTime(REBIRTH_WINNER));
+    if (QUIRINO_WINNER)
+        mesc l("Won Quirino Voraz Arena %s ago", FuzzyTime(QUIRINO_WINNER));
+    if (GHQ_WINNER)
+        mesc l("First Grand Hunter challenge cleared %s ago", FuzzyTime(GHQ_WINNER));
     // TODO: Total players invited to ML
+    // TODO: Houses owned
+    // TODO: Times elected
+    // TODO: Admin of how many towns?
+    // TODO: First election won date
     // TODO: Most used skill
     //mes ".:: " + l("Achievements") + " ::.";
     return;