Grimorium: No longer close on Recipe or Cooking books.

3 files changed, 40 insertions, 9 deletions

diff --git a/npc/031-3/cook.txt b/npc/031-3/cook.txt
index 5609e0f23..fb3b5dd51 100644
--- a/npc/031-3/cook.txt
+++ b/npc/031-3/cook.txt
@@ -7,6 +7,7 @@
 //    Doesn't teach any recipe, though. Legit max level for cooking skill is 6.
 
 031-3,35,55,0	script	Ashley Loisl	NPC_SAVIOR_F,{
+    public function cookHelp;
     mesn;
     mesq l("Ho... Congratulations in making this far.");
     mesc l("Ashley raises an eyebrown at you.");
@@ -54,6 +55,12 @@
     close;
 
 OnCookHelp:
+    cookHelp(false);
+    close;
+
+public function cookHelp {
+    if (getarg(0, true))
+        setnpcdialogtitle l("Cooking Instructions - by Ashley Loisl");
     mesn;
     mesq l("The most important thing to keep in mind is that %s.", b(l("cooked food expire")));
     next;
@@ -80,7 +87,8 @@ OnCookHelp:
     next;
     mesn;
     mesq l("Eating the food most suitable for your battle style is the secret for having an edge over your opponents. Don't waste precious food while so many people starve at Halinarzo and it'll be a profitable passtime.");
-    close;
+    return;
+}
 
 OnInit:
     .@npcId = getnpcid(.name$);
diff --git a/npc/craft/recipes.txt b/npc/craft/recipes.txt
index 3f4504a4e..8e40057c2 100644
--- a/npc/craft/recipes.txt
+++ b/npc/craft/recipes.txt
@@ -10,7 +10,7 @@
     function readAlchemy;
     function readCrafting;
 
-OnUse:
+    public function readIndex {
     setnpcdialogtitle l("Recipe Book");
 
     mesc l("You open the Recipe Book. Each recipe you get can be put here.");
@@ -32,6 +32,11 @@ OnUse:
                 readCrafting(); break;
         }
     } while (@menu != 1);
+    return;
+}
+
+OnUse:
+    readIndex();
     closeclientdialog;
     close;
 
diff --git a/npc/items/books.txt b/npc/items/books.txt
index 94a642604..86162f146 100644
--- a/npc/items/books.txt
+++ b/npc/items/books.txt
@@ -618,6 +618,8 @@ function read_book {
 
     do
     {
+        setnpcdialogtitle l(.book_name$);
+
         narrator S_NO_NPC_NAME,
             l("Please select a chapter:");
 
@@ -635,7 +637,12 @@ function read_book {
             rif2(9, CRAFTQUEST, l("Open Recipe Book")),
             rif2(10, true, l("Read Rules")),
             rif2(11, getskilllv(TMW2_COOKING), l("Open Cooking Manual")),
-            rif2(12, getq(General_Narrator) >= 16, l("Open Homunculus Manual")),
+            //rif2(12, getq(General_Narrator) >= 16, l("Open Homunculus Manual")),
+            rif2(12, getq(LoFQuest_EPISODE) >= 17, l("Ch 6 — The Originals")),
+            rif2(13, false, l("Ch 7 — The World's Edge")),
+            rif2(14, getq(General_Narrator) >= 16, l("Ch 8 — Homunculus Manual")),
+            rif2(15, false, l("Ch 9 — The World's Heart")),
+            rif2(16, false, l("Ch 10 — The Moubootaur vs Mana Source")),
             l("Close");
         mes "";
 
@@ -748,21 +755,32 @@ function read_book {
                 next;
                 break;
             case 9:
-                closeclientdialog;
-                doevent("#RecipeBook::OnUse");
-                end;
+                "#RecipeBook"::readIndex();
+                next;
                 break;
             case 10:
                 GameRules();
                 break;
             case 11:
-                closeclientdialog;
-                doevent("Ashley Loisl::OnCookHelp");
-                end;
+                "Ashley Loisl"::cookHelp();
+                next;
+                break;
             case 12:
+                next;
+                break;
+            case 13:
+                next;
+                break;
+            case 14:
                 closeclientdialog;
                 doevent("Notebook#MKHB::OnBookRead");
                 end;
+            case 15:
+                next;
+                break;
+            case 16:
+                next;
+                break;
             default:
                 close;
         }