From d10a34f0d342672b585970e7a3c48b576741ab67 Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Sun, 20 Sep 2015 00:02:53 +0200
Subject: Add manual blank mes and remove some extra next on eugene and the
 fishing script.

---
 npc/001-1/eugene.txt      |  3 ++-
 npc/functions/fishing.txt | 21 ++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'npc')

diff --git a/npc/001-1/eugene.txt b/npc/001-1/eugene.txt
index 1231c765..ad64bf0c 100644
--- a/npc/001-1/eugene.txt
+++ b/npc/001-1/eugene.txt
@@ -36,10 +36,12 @@
     {
         case 1:
             setq ArtisQuests_Fishman, 1;
+            mes "";
             speech
                 l("Thank you. I'll wait here.");
             close;
         case 2:
+            mes "";
             speech
                 l("But I'm almost out of @@...", getitemlink(.BaitID));
             close;
@@ -80,4 +82,3 @@ OnInit:
     setnpcdistance 2;
     end;
 }
-
diff --git a/npc/functions/fishing.txt b/npc/functions/fishing.txt
index 4d754adc..728c5353 100644
--- a/npc/functions/fishing.txt
+++ b/npc/functions/fishing.txt
@@ -54,6 +54,7 @@ L_ChooseBait:
         l("What will be the bait for the fish?");
     .@idx = select(.@sel$);
 
+    mes "";
     if (.@idx == .@cnt + 1)
     {
         narrator l("You take your fishing rod and leave.");
@@ -63,16 +64,14 @@ L_ChooseBait:
     .@bait = .@user_items[.@idx - 1];
     delitem .@bait, 1;
 
-    narrator
-        l("You use a @@ as a bait.", getitemname(.@bait)),
-        l("You patiently wait...");
+    narrator l("You use a @@ as a bait.", getitemname(.@bait));
+    mes col(l("You patiently wait..."), 9);
 
 L_Wait:
     sleep2 rand(.@wait_time_min, .@wait_time_max);
     .@tick = gettimetick(0);
 
     mes col(l("Splash!"), 9);
-    mes "";
 
     menuint
         l("Pull!"), 1,
@@ -87,21 +86,28 @@ L_Wait:
             if (!rand(.@rare_fish_chance))
                 .@fish_id = GrassCarp;
             // debugmes "timediff = " + .@timediff;
+
             if (.@rnd <= .@pull_rand_max)
             {
                 getitem .@fish_id, 1;
+
+                mes "";
                 narrator
                     l("You caught a @@!", getitemname(.@fish_id));
+
                 return 1;
             }
             else
             {
+                mes "";
                 narrator
                     l("You pulled too late and lost the bait.");
+
                 goto L_ChooseBait;
             }
 
         case 2:
+            mes "";
             .@curr_wait_times += 1;
 
             if (.@curr_wait_times > .@max_wait_times)
@@ -112,14 +118,15 @@ L_Wait:
             }
             else
             {
-                narrator
-                    l("The fish ate small part of your bait."),
-                    l("But you decide to patiently wait.");
+                narrator l("The fish ate small part of your bait.");
+                mes col(l("But you decide to patiently wait."), 9);
+
                 goto L_Wait;
             }
             break;
 
         case 3:
+            mes "";
             narrator
                 l("You take your fishing rod and leave.");
             return 0;
-- 
cgit v1.2.3-60-g2f50