Change how Fishing Book works

1 files changed, 62 insertions, 60 deletions

diff --git a/npc/items/books.txt b/npc/items/books.txt
index 66040f332..4aee90ca8 100644
--- a/npc/items/books.txt
+++ b/npc/items/books.txt
@@ -6,71 +6,75 @@
 // Description:
 //    Books used by TMW-2. Some are from evol.
 
-000-0,0,0,0	script	#Book-Fishing1	NPC_HIDDEN,{
+function	script	FishingBook	{
+    narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
+        l("To get started with fishing, you'll need two things: a fishing rod and a bait."),
+        l("You just need one fishing rod, although you should take more than one single bait.");
 
-    function read_book {
+    @menu = 0; // reset for the rif
 
-        setnpcdialogtitle l(.book_name$);
+    do
+    {
+        narrator S_NO_NPC_NAME,
+            l("Please select a chapter:");
 
-        narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("To get started with fishing, you'll need two things: a fishing rod and a bait."),
-            l("You just need one fishing rod, although you should take more than one single bait.");
+        mes "";
 
-        @menu = 0; // reset for the rif
+        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"),
+            l("close");
 
-        do
+        switch(@menu)
         {
-            narrator S_NO_NPC_NAME,
-                l("Please select a chapter:");
-
-            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");
+            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.");
+                break;
+            case 2:
+                narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                    l("You can use many diverse items to lure fishes."),
+                    l("Most common and widely popular in the fish realm are @@ and pieces of @@.",
+                        getitemlink(SmallTentacles), getitemlink(Bread)),
+                    l("Some types of fish also enjoy @@ quite a bit.",
+                        getitemlink(Aquada)),
+                    l("Some people, however, prefer to fish with more unorthodox baits, such as @@ or @@.",
+                        getitemlink(RoastedMaggot), getitemlink(CaveSnakeTongue)),
+                    l("Other food can be used as a bait, too.");
+                break;
+            case 3:
+                narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                    l("Find yourself a nice dry spot on a coast where you can easily reach into deep water."),
+                    l("Fishing next to shallow water is not going to work well, because fishes seldom go there."),
+                    l("You can easily identify fishing spots, small bubbles and fishes are visible from the surface."),
+                    l("Don't forget to come as close as possible to these spots!");
+                break;
+            case 4:
+                narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                    l("Toss the hook into deep water by clicking on where you want to cast it."),
+                    l("Make sure to put on a bait after you click, though!"),
+                    l("After that, stay still and be patient, but also alert!");
+                break;
+            case 5:
+                narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                    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;
+        }
+    } while (@menu != 6);
+    return;
+}
 
-            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.");
-                    break;
-                case 2:
-                    narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                        l("You can use many diverse items to lure fishes."),
-                        l("Most common and widely popular in the fish realm are @@ and pieces of @@.",
-                            getitemlink(SmallTentacles), getitemlink(Bread)),
-                        l("Some types of fish also enjoy @@ quite a bit.",
-                            getitemlink(Aquada)),
-                        l("Some people, however, prefer to fish with more unorthodox baits, such as @@ or @@.",
-                            getitemlink(RoastedMaggot), getitemlink(CaveSnakeTongue)),
-                        l("Other food can be used as a bait, too.");
-                    break;
-                case 3:
-                    narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                        l("Find yourself a nice dry spot on a coast where you can easily reach into deep water."),
-                        l("Fishing next to shallow water is not going to work well, because fishes seldom go there."),
-                        l("You can easily identify fishing spots, small bubbles and fishes are visible from the surface."),
-                        l("Don't forget to come as close as possible to these spots!");
-                    break;
-                case 4:
-                    narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                        l("Toss the hook into deep water by clicking on where you want to cast it."),
-                        l("Make sure to put on a bait after you click, though!"),
-                        l("After that, stay still and be patient, but also alert!");
-                    break;
-                case 5:
-                    narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                        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;
-            }
-        } while (true);
+000-0,0,0,0	script	#Book-Fishing1	NPC_HIDDEN,{
 
+    function read_book {
+        setnpcdialogtitle l(.book_name$);
+        FishingBook();
+        closeclientdialog;
         end;
     }
 
@@ -260,9 +264,7 @@ OnInit:
                     next;
                     break;
                 case 4:
-                    closeclientdialog;
-                    doevent "#Book-Fishing1::OnUse";
-                    end;
+                    FishingBook();
                     break;
                 case 5:
                     GameRules();