1 files changed, 46 insertions, 23 deletions

diff --git a/npc/items/books.txt b/npc/items/books.txt
index e65dd9889..156b59817 100644
--- a/npc/items/books.txt
+++ b/npc/items/books.txt
@@ -468,39 +468,61 @@ function myself {
     mesc l("Doppelganger Waves Won: %s", fnum(.@udt));
     mesc l("Easter Eggs found: %d", .@egg);
     dnext;
-    // FIXME
-    if (.@who != .@why) return 0;
 
 
+    /* Feat Data */
+    detachrid();
+    attachrid(.@who);
+    .@yeti = YETIKING_WINNER;
+    .@hh = HEROESHOLD_WINNER;
+    .@reborn = REBIRTH_WINNER;
+    .@quirin = QUIRINO_WINNER;
+    .@ghq = GHQ_WINNER;
+    .@fort = FORT_1ST_VISIT;
+    detachrid();
+    attachrid(.@why);
     mes ".:: " + l("Personal Feats") + " ::.";
-    if (YETIKING_WINNER)
-        mesc l("Cleared the Yeti King Challenge %s ago", FuzzyTime(YETIKING_WINNER));
-    if (HEROESHOLD_WINNER)
-        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));
-    if (FORT_1ST_VISIT)
-        mesc l("First visit to Fortress Is. %s ago", FuzzyTime(FORT_1ST_VISIT));
-
-    if (reputation("Candor") >= 100)
+    if (.@yeti)
+        mesc l("Cleared the Yeti King Challenge %s ago", FuzzyTime(.@yeti));
+    if (.@hh)
+        mesc l("Cleared Heroes Hold %s ago", FuzzyTime(.@hh));
+    if (.@reborn)
+        mesc l("First reborn %s ago", FuzzyTime(.@reborn));
+    if (.@quirin)
+        mesc l("Won Quirino Voraz Arena %s ago", FuzzyTime(.@quirin));
+    if (.@ghq)
+        mesc l("First Grand Hunter challenge cleared %s ago", FuzzyTime(.@ghq));
+    if (.@fort)
+        mesc l("First visit to Fortress Is. %s ago", FuzzyTime(.@fort));
+
+    /* Heroic Data */
+    detachrid();
+    attachrid(.@who);
+    .@candor = (reputation("Candor") >= 100);
+    .@tulim = (reputation("Tulim") >= 100);
+    .@halin = (reputation("Halin") >= 100);
+    .@hurns = (reputation("Hurns") >= 100);
+    .@lof   = (reputation("LoF") >= 100);
+    .@nival = (reputation("Nival") >= 100);
+    .@frost = (reputation("Frostia") >= 100);
+    .@forte = (reputation("Fortress") >= 100);
+    detachrid();
+    attachrid(.@why);
+    if (.@candor)
         mesc l("%s Hero", l("Candor"));
-    if (reputation("Tulim") >= 100)
+    if (.@tulim)
         mesc l("%s Hero", l("Tulimshar"));
-    if (reputation("Halin") >= 100)
+    if (.@halin)
         mesc l("%s Hero", l("Halinarzo"));
-    if (reputation("Hurns") >= 100)
+    if (.@hurns)
         mesc l("%s Hero", l("Hurnscald"));
-    if (reputation("LoF") >= 100)
+    if (.@lof)
         mesc l("%s Hero", l("Land Of Fire"));
-    if (reputation("Nival") >= 100)
+    if (.@nival)
         mesc l("%s Hero", l("Nivalis"));
-    if (reputation("Frostia") >= 100)
+    if (.@frost)
         mesc l("%s Hero", l("Frostia"));
-    if (reputation("Fortress") >= 100)
+    if (.@forte)
         mesc l("%s Hero", l("Fortress Town"));
     // TODO: Total players invited to ML
     // TODO: Houses owned
@@ -509,6 +531,7 @@ function myself {
     // TODO: First election won date
     // TODO: Most used skill
     // TODO: Remember the position attained on previous events
+    // TODO: Gemini Quest
     //mes ".:: " + l("Achievements") + " ::.";
     return 0;
 }