change fishing pull_max, add timer; change label name in wateranimation

2 files changed, 21 insertions, 17 deletions

diff --git a/npc/001-1/wateranimation.txt b/npc/001-1/wateranimation.txt
index fda5f23e..8f3bac17 100644
--- a/npc/001-1/wateranimation.txt
+++ b/npc/001-1/wateranimation.txt
@@ -16,7 +16,7 @@ OnBiteBait:
 
     end;
 
-OnTimer35000:
+OnRemoveBait:
     .dir = DOWN;
     @occupy = false;
 
@@ -40,7 +40,7 @@ OnBiteBait:
 
     end;
 
-OnTimer35000:
+OnRemoveBait:
     .dir = DOWN;
     @occupy = false;
 
@@ -64,7 +64,7 @@ OnBiteBait:
 
     end;
 
-OnTimer35000:
+OnRemoveBait:
     .dir = DOWN;
     @occupy = false;
 
@@ -88,7 +88,7 @@ OnBiteBait:
 
     end;
 
-OnTimer35000:
+OnRemoveBait:
     .dir = DOWN;
     @occupy = false;
 
@@ -112,7 +112,7 @@ OnBiteBait:
 
     end;
 
-OnTimer35000:
+OnRemoveBait:
     .dir = DOWN;
     @occupy = false;
 
@@ -136,7 +136,7 @@ OnBiteBait:
 
     end;
 
-OnTimer35000:
+OnRemoveBait:
     .dir = DOWN;
     @occupy = false;
 
@@ -160,7 +160,7 @@ OnBiteBait:
 
     end;
 
-OnTimer35000:
+OnRemoveBait:
     .dir = DOWN;
     @occupy = false;
 
@@ -184,7 +184,7 @@ OnBiteBait:
 
     end;
 
-OnTimer35000:
+OnRemoveBait:
     .dir = DOWN;
     @occupy = false;
 
@@ -208,7 +208,7 @@ OnBiteBait:
 
     end;
 
-OnTimer35000:
+OnRemoveBait:
     .dir = DOWN;
     @occupy = false;
 
@@ -232,7 +232,7 @@ OnBiteBait:
 
     end;
 
-OnTimer35000:
+OnRemoveBait:
     .dir = DOWN;
     @occupy = false;
 
@@ -256,7 +256,7 @@ OnBiteBait:
 
     end;
 
-OnTimer35000:
+OnRemoveBait:
     .dir = DOWN;
     @occupy = false;
 
@@ -280,7 +280,7 @@ OnBiteBait:
 
     end;
 
-OnTimer35000:
+OnRemoveBait:
     .dir = DOWN;
     @occupy = false;
 
@@ -304,7 +304,7 @@ OnBiteBait:
 
     end;
 
-OnTimer35000:
+OnRemoveBait:
     .dir = DOWN;
     @occupy = false;
 
@@ -328,7 +328,7 @@ OnBiteBait:
 
     end;
 
-OnTimer35000:
+OnRemoveBait:
     .dir = DOWN;
     @occupy = false;
 
@@ -352,7 +352,7 @@ OnBiteBait:
 
     end;
 
-OnTimer35000:
+OnRemoveBait:
     .dir = DOWN;
     @occupy = false;
 
@@ -376,7 +376,7 @@ OnBiteBait:
 
     end;
 
-OnTimer35000:
+OnRemoveBait:
     .dir = DOWN;
     @occupy = false;
 
diff --git a/npc/functions/fishing.txt b/npc/functions/fishing.txt
index c2b4fda2..49ca3727 100644
--- a/npc/functions/fishing.txt
+++ b/npc/functions/fishing.txt
@@ -38,7 +38,7 @@ function	script	fishing	{
 
     .@wait_time_min = 4000;
     .@wait_time_max = 18000;
-    .@pull_rand_max = 500;
+    .@pull_rand_max = 800;
     .@fish_id = CommonCarp;
     .@rare_fish_chance = 25;
 
@@ -57,11 +57,14 @@ function	script	fishing	{
             setnpcdir getarg(0), DOWN;
 
             deltimer getarg(0) + "::OnBiteBait";
+            deltimer getarg(0) + "::OnRemoveBait";
             narrator l("You pulled too soon and lost the bait.");
 
             close;
         case LEFT:
             @occupy = false;
+            deltimer getarg(0) + "::OnRemoveBait";
+
             setnpcdir getarg(0), DOWN;
 
             getmapxy (.@mapbis$, .@xbis, .@ybis, 0);
@@ -170,6 +173,7 @@ OnChooseBait:
     .@delay = rand(.@wait_time_min, .@wait_time_max);
 
     addtimer .@delay, getarg(0) + "::OnBiteBait";
+    addtimer (.@delay + 5000), getarg(0) + "::OnRemoveBait";
 
     close;
 }