Fixes to JSaves' Grimorium

2 files changed, 26 insertions, 22 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 3a628e5f4..0738a8805 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -739,6 +739,20 @@ item_db: (
 	">
 },
 {
+	Id: 535
+	AegisName: "JesusalvaGrimorium"
+	Name: "Jesusaves's Grimorium"
+	Type: "IT_USABLE"
+	Buy: 64000
+	Sell: 1
+	Weight: 25
+	KeepAfterUse: true
+	Refine: false
+	Script: <"
+		doevent "#Book-JGrimorium::OnUse";
+	">
+},
+{
 	Id: 536
 	AegisName: "PetcaringGuide"
 	Name: "Fluffy Animals who Love Their Owners"
@@ -2102,20 +2116,6 @@ item_db: (
 	">
 },
 {
-	Id: 609
-	AegisName: "JesusalvaGrimorium"
-	Name: "Jesusalva Grimorium"
-	Type: "IT_USABLE"
-	Buy: 64000
-	Sell: 1
-	Weight: 25
-	KeepAfterUse: true
-	Refine: false
-	Script: <"
-		doevent "#Book-JGrimorium::OnUse";
-	">
-},
-{
 	Id: 700
 	AegisName: "SmallTentacles"
 	Name: "Small Tentacles"
diff --git a/npc/items/books.txt b/npc/items/books.txt
index 5b44e529e..072d8dda3 100644
--- a/npc/items/books.txt
+++ b/npc/items/books.txt
@@ -163,18 +163,20 @@ OnInit:
             mes "";
 
             select
-                rif(@menu == 1, "► ") + l("Ch 1 — Fishing apparatus"),
-                rif(@menu == 2, "► ") + l("Ch 2 — Baits"),
-                rif(@menu == 3, "► ") + l("Ch 3 — Location"),
-                rif(@menu == 4, "► ") + l("Ch 4 — Casting"),
-                rif(@menu == 5, "► ") + l("Ch 5 — Reeling");
+                rif( MAGIC_LVL >= 2  ,rif(@menu == 1, "► ") + l("Ch 1 — Prologue")),
+                rif( false   ,rif(@menu == 2, "► ") + l("Ch 2 — Baits")),
+                rif( false   ,rif(@menu == 3, "► ") + l("Ch 3 — Location")),
+                rif( false   ,rif(@menu == 4, "► ") + l("Ch 4 — Casting")),
+                rif( false   ,rif(@menu == 5, "► ") + l("Ch 5 — Reeling")),
+                l("Close");
 
             switch(@menu)
             {
                 case 1:
                     narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                        l("You'll want your fishing rod to be flexible but solid."),
-                        l("Comfortable grip is important especially for newcomers, since they'll be holding it for quite a while.");
+                        l("Mana is something which existed since the being, but nobody knows much about."),
+                        l("This book will write itself, and reveal you the Secret Of Mana."),
+                        l("Give it time, increase your magic power, and you'll find out the truth.");
                     break;
                 case 2:
                     narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
@@ -204,6 +206,8 @@ OnInit:
                         l("To successfully catch a fish, you need to pull up your hook by clicking it, right after it submerges."),
                         l("Should you be too quick or wait too long, you will most likely fail.");
                     break;
+                default:
+                    close;
             }
         } while (true);
 
@@ -221,7 +225,7 @@ OnUse:
     bye;
 
 OnInit:
-    .book_name$ = getitemname(FishingGuideVolI);
+    .book_name$ = getitemname(JesusalvaGrimorium);
     .sex = G_OTHER;
     .distance = 1;
     end;