Admins can always scry others. Add instructions to the book.

1 files changed, 22 insertions, 11 deletions

diff --git a/npc/items/books.txt b/npc/items/books.txt
index 80ba9d77e..fbf80dd30 100644
--- a/npc/items/books.txt
+++ b/npc/items/books.txt
@@ -284,12 +284,13 @@ function myself {
     .@all = getarg(0, true);
     .@who = getarg(1, getcharid(3));
     .@why = getcharid(3);
+    .@adm = is_admin();
 
     /* Basic Data */
     detachrid();
     attachrid(.@who);
     // No scrying
-    if (GSET_NOSCRY && .@who != .@why) {
+    if (GSET_NOSCRY && .@who != .@why && !.@adm) {
         detachrid();
         attachrid(.@why);
         return 1;
@@ -534,7 +535,6 @@ 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;
 }
@@ -579,11 +579,12 @@ function read_book {
             rif2(2, MAGIC_EXP, l("Ch 2 — About Magic Skills")),
             rif2(3, MAGIC_LVL, l("Ch 3 — Status Ailments")),
             rif2(4, true, l("Ch 4 — Information About You")),
-            rif2(5, true, l("Open Fishing Book")),
-            rif2(6, true, l("Open Petcaring Book")),
-            rif2(7, getq(LoFQuest_Pets), l("List of Unlocked Pets and Food")),
-            rif2(8, CRAFTQUEST, l("Open Recipe Book")),
-            rif2(9, true, l("Read Rules")),
+            rif2(5, true, l("Ch 5 — Information About Others")),
+            rif2(6, true, l("Open Fishing Book")),
+            rif2(7, true, l("Open Petcaring Book")),
+            rif2(8, getq(LoFQuest_Pets), l("List of Unlocked Pets and Food")),
+            rif2(9, CRAFTQUEST, l("Open Recipe Book")),
+            rif2(10, true, l("Read Rules")),
             l("Close");
         mes "";
 
@@ -638,12 +639,22 @@ function read_book {
                 myself();
                 break;
             case 5:
-                FishingBook();
+                mesc l("You can scry other players with: %s", b("@scry"));
+                mesc l("To scry Jesusaves, for example, you would do:");
+                mes b("@scry Jesusaves");
+                mes "";
+                mesc l("- Players can prevent being scry'ed with %s", b("@ucp"));
+                mesc l("- Some information like money won't be available.");
+                mesc l("- Target player must be online.");
+                next;
                 break;
             case 6:
-                PetcaringBook();
+                FishingBook();
                 break;
             case 7:
+                PetcaringBook();
+                break;
+            case 8:
                 mesf(".:: %s ::.", l("Grand Hunter Quest"));
                 if (PDQ_CheckGHQ(Maggot) >= 10000)
                     mesf("%s - %s",
@@ -685,12 +696,12 @@ function read_book {
                         getmonsterlink(BlackCat), getitemlink(Mashmallow));
                 next;
                 break;
-            case 8:
+            case 9:
                 closeclientdialog;
                 doevent("#RecipeBook::OnUse");
                 end;
                 break;
-            case 9:
+            case 10:
                 GameRules();
                 break;
             default: