update some fishing-related scripts for new narrator function

3 files changed, 30 insertions, 29 deletions

diff --git a/npc/001-1/eugene.txt b/npc/001-1/eugene.txt
index 677683d1..d931826d 100644
--- a/npc/001-1/eugene.txt
+++ b/npc/001-1/eugene.txt
@@ -16,15 +16,15 @@
     .BaitID = SmallTentacles;
     .BaitCount = 10;
 
-    narrator 0,
+    narrator 4,
         l("You see a raijin boy, sitting on the edge of the dock."),
         l("He's holding a fishing rod, and his eyes are pointed towards the surface of the sea.");
 
     .@q = getq(ArtisQuests_Fishman);
-    if (.@q == 2) goto L_QuestDone;
     if (.@q == 1) goto L_CheckItems;
+    if (.@q == 2) goto L_QuestDone;
 
-    speech 0,
+    speech 2,
         l("Ahoi."),
         l("Hey, check out my brand new fishing rod. I bought it only today."),
         l("I was so excited, I wanted to try it as soon as possible."),
@@ -36,11 +36,11 @@
     {
         case 1:
             setq ArtisQuests_Fishman, 1;
-            speech
+            speech 1,
                 l("Thank you. I'll wait here.");
             close;
         case 2:
-            speech
+            speech 1,
                 l("But I'm almost out of @@...", getitemlink(.BaitID));
             close;
     }
@@ -48,13 +48,13 @@
 L_CheckItems:
     if (countitem(.BaitID) < .BaitCount)
     {
-        speech 0,
+        speech
             l("Sorry, but you don't have what I need for bait."),
             l("I need @@ @@.", .BaitCount, getitemlink(.BaitID));
         close;
     }
 
-    speech 0,
+    speech
         l("That's exactly what I needed."),
         l("As a thank you, accept my old fishing rod."),
         l("It's not as good as my new one, but still useful."),
@@ -70,7 +70,7 @@ L_CheckItems:
 
 L_QuestDone:
     // Idea for future: Eugene telling fishman jokes.
-    speech 0,
+    speech
         l("Ahoy, @@!", strcharinfo(0)),
         l("Is the fish biting today?");
     close;
diff --git a/npc/001-1/wateranimation.txt b/npc/001-1/wateranimation.txt
index 3edf87de..60f988f0 100644
--- a/npc/001-1/wateranimation.txt
+++ b/npc/001-1/wateranimation.txt
@@ -5,7 +5,7 @@
 //    Water animations, splash, fishes, etc...
 
 001-1,116,123,0	script	#water_animation0	NPC_WATER_SPLASH,{
-    narrator 0,
+    narrator 4,
         l("You see some fish reflecting the sun on the surface of the ocean.");
     fishing;
     close;
@@ -17,7 +17,7 @@ OnInit:
 }
 
 001-1,119,102,0	script	#water_animation1	NPC_WATER_SPLASH,{
-    narrator 0,
+    narrator 4,
         l("You see some fish reflecting the sun on the surface of the ocean.");
     fishing;
     close;
@@ -29,7 +29,7 @@ OnInit:
 }
 
 001-1,167,82,0	script	#water_animation2	NPC_WATER_SPLASH,{
-    narrator 0,
+    narrator 4,
         l("You see some fish reflecting the sun on the surface of the ocean.");
     fishing;
     close;
@@ -41,7 +41,7 @@ OnInit:
 }
 
 001-1,167,40,0	script	#water_animation3	NPC_WATER_SPLASH,{
-    narrator 0,
+    narrator 4,
         l("You see some fish reflecting the sun on the surface of the ocean.");
     fishing;
     close;
@@ -53,7 +53,7 @@ OnInit:
 }
 
 001-1,104,127,0	script	#water_animation4	NPC_WATER_SPLASH,{
-    narrator 0,
+    narrator 4,
         l("You see some fish reflecting the sun on the surface of the ocean.");
     fishing;
     close;
@@ -65,7 +65,7 @@ OnInit:
 }
 
 001-1,166,123,0	script	#water_animation5	NPC_WATER_SPLASH,{
-    narrator 0,
+    narrator 4,
         l("You see some fish reflecting the sun on the surface of the ocean.");
     fishing;
     close;
@@ -77,7 +77,7 @@ OnInit:
 }
 
 001-1,181,119,0	script	#water_animation6	NPC_WATER_SPLASH,{
-    narrator 0,
+    narrator 4,
         l("You see some fish reflecting the sun on the surface of the ocean.");
     fishing;
     close;
@@ -89,7 +89,7 @@ OnInit:
 }
 
 001-1,202,114,0	script	#water_animation7	NPC_WATER_SPLASH,{
-    narrator 0,
+    narrator 4,
         l("You see some fish reflecting the sun on the surface of the ocean.");
     fishing;
     close;
@@ -101,7 +101,7 @@ OnInit:
 }
 
 001-1,187,86,0	script	#water_animation8	NPC_WATER_SPLASH,{
-    narrator 0,
+    narrator 4,
         l("You see some fish reflecting the sun on the surface of the ocean.");
     fishing;
     close;
diff --git a/npc/functions/fishing.txt b/npc/functions/fishing.txt
index 3445c125..3c8e8c40 100644
--- a/npc/functions/fishing.txt
+++ b/npc/functions/fishing.txt
@@ -50,28 +50,28 @@ L_ChooseBait:
             return -2;
     }
 
-    narrator 0,
+    narrator 2,
         l("What will be the bait for the fish?");
     .@idx = select(.@sel$);
 
     if (.@idx == .@cnt + 1)
     {
-        narrator l("You take your fishing rod and leave.");
+        narrator 1,
+            l("You take your fishing rod and leave.");
         return 0;
     }
 
     .@bait = .@user_items[.@idx - 1];
     delitem .@bait, 1;
 
-    narrator l("You use a @@ as a bait.", getitemname(.@bait));
-    mes col(l("You patiently wait..."), 9);
-    mes "";
+    narrator 3,
+        l("You use a @@ as a bait.", getitemname(.@bait)),
+        l("You patiently wait...");
 
 L_Wait:
     sleep2 rand(.@wait_time_min, .@wait_time_max);
     .@tick = gettimetick(0);
 
-
     mes col(l("Splash!"), 9);
     mes "";
 
@@ -93,14 +93,14 @@ L_Wait:
             {
                 getitem .@fish_id, 1;
 
-                narrator
+                narrator 1,
                     l("You caught a @@!", getitemname(.@fish_id));
 
                 return 1;
             }
             else
             {
-                narrator
+                narrator 5,
                     l("You pulled too late and lost the bait.");
 
                 goto L_ChooseBait;
@@ -111,21 +111,22 @@ L_Wait:
 
             if (.@curr_wait_times > .@max_wait_times)
             {
-                narrator
+                narrator 5,
                     l("The fish ate all your bait.");
                 goto L_ChooseBait;
             }
             else
             {
-                narrator l("The fish ate small part of your bait.");
-                mes col(l("But you decide to patiently wait."), 9);
+                narrator 3,
+                    l("The fish ate small part of your bait."),
+                    l("But you decide to patiently wait.");
 
                 goto L_Wait;
             }
             break;
 
         case 3:
-            narrator
+            narrator 1,
                 l("You take your fishing rod and leave.");
             return 0;
     }