Update the fishing support with the new animation.

1 files changed, 193 insertions, 150 deletions

diff --git a/npc/001-1/wateranimation.txt b/npc/001-1/wateranimation.txt
index ad409d1a..fda5f23e 100644
--- a/npc/001-1/wateranimation.txt
+++ b/npc/001-1/wateranimation.txt
@@ -5,23 +5,23 @@
 //    Water animations, splash, fishes, etc...
 
 001-1,116,123,0	script	#water_animation0	NPC_WATER_SPLASH,{
-    // skip the narator when we are in fishing
-    if (@pull != 1 && @pull != 2)
-        narrator 4, l("You see some fish reflecting the sun on the surface of the water.");
-    fishing strnpcinfo(3); // give the name of npc for set the addtimer.
+
+    fishingspot strnpcinfo(3);
+    fishing strnpcinfo(3);
     close;
 
-OnPull:
-    emotion 106; // here the effect, emote is just for try :3
-    if (@pull == 3) // is too late or too soon, don't set the @pull 2
-                    // useless for now, because if you fail that delete the timer
-                    // just a security
-        end;
-    else
-        @pull = 2; // set 2, the fish bite the bait
-        @tick = gettimetick(0); // the tick required for the pull_max 
+OnBiteBait:
+    .dir = LEFT;
+    @tick = gettimetick(0);
+
     end;
 
+OnTimer35000:
+    .dir = DOWN;
+    @occupy = false;
+
+    close;
+
 OnInit:
     .sex = G_OTHER;
     .distance = 5;
@@ -29,20 +29,23 @@ OnInit:
 }
 
 001-1,119,102,0	script	#water_animation1	NPC_WATER_SPLASH,{
-    if (@pull != 1 && @pull != 2)
-        narrator 4, l("You see some fish reflecting the sun on the surface of the water.");
+
+    fishingspot strnpcinfo(3);
     fishing strnpcinfo(3);
     close;
 
-OnPull:
-    emotion 106;
-    if (@pull == 3)
-        end;
-    else
-        @pull = 2;
-        @tick = gettimetick(0);
+OnBiteBait:
+    .dir = LEFT;
+    @tick = gettimetick(0);
+
     end;
 
+OnTimer35000:
+    .dir = DOWN;
+    @occupy = false;
+
+    close;
+
 OnInit:
     .sex = G_OTHER;
     .distance = 5;
@@ -50,20 +53,23 @@ OnInit:
 }
 
 001-1,167,82,0	script	#water_animation2	NPC_WATER_SPLASH,{
-    if (@pull != 1 && @pull != 2)
-        narrator 4, l("You see some fish reflecting the sun on the surface of the water.");
+
+    fishingspot strnpcinfo(3);
     fishing strnpcinfo(3);
     close;
 
-OnPull:
-    emotion 106;
-    if (@pull == 3)
-        end;
-    else
-        @pull = 2;
-        @tick = gettimetick(0);
+OnBiteBait:
+    .dir = LEFT;
+    @tick = gettimetick(0);
+
     end;
 
+OnTimer35000:
+    .dir = DOWN;
+    @occupy = false;
+
+    close;
+
 OnInit:
     .sex = G_OTHER;
     .distance = 5;
@@ -71,20 +77,23 @@ OnInit:
 }
 
 001-1,167,40,0	script	#water_animation3	NPC_WATER_SPLASH,{
-    if (@pull != 1 && @pull != 2)
-        narrator 4, l("You see some fish reflecting the sun on the surface of the water.");
+
+    fishingspot strnpcinfo(3);
     fishing strnpcinfo(3);
     close;
 
-OnPull:
-    emotion 106;
-    if (@pull == 3)
-        end;
-    else
-        @pull = 2;
-        @tick = gettimetick(0);
+OnBiteBait:
+    .dir = LEFT;
+    @tick = gettimetick(0);
+
     end;
 
+OnTimer35000:
+    .dir = DOWN;
+    @occupy = false;
+
+    close;
+
 OnInit:
     .sex = G_OTHER;
     .distance = 5;
@@ -92,20 +101,23 @@ OnInit:
 }
 
 001-1,104,127,0	script	#water_animation4	NPC_WATER_SPLASH,{
-    if (@pull != 1 && @pull != 2)
-        narrator 4, l("You see some fish reflecting the sun on the surface of the water.");
+
+    fishingspot strnpcinfo(3);
     fishing strnpcinfo(3);
     close;
 
-OnPull:
-    emotion 106;
-    if (@pull == 3)
-        end;
-    else
-        @pull = 2;
-        @tick = gettimetick(0);
+OnBiteBait:
+    .dir = LEFT;
+    @tick = gettimetick(0);
+
     end;
 
+OnTimer35000:
+    .dir = DOWN;
+    @occupy = false;
+
+    close;
+
 OnInit:
     .sex = G_OTHER;
     .distance = 5;
@@ -113,20 +125,23 @@ OnInit:
 }
 
 001-1,166,123,0	script	#water_animation5	NPC_WATER_SPLASH,{
-    if (@pull != 1 && @pull != 2)
-        narrator 4, l("You see some fish reflecting the sun on the surface of the water.");
+
+    fishingspot strnpcinfo(3);
     fishing strnpcinfo(3);
     close;
 
-OnPull:
-    emotion 106;
-    if (@pull == 3)
-        end;
-    else
-        @pull = 2;
-        @tick = gettimetick(0);
+OnBiteBait:
+    .dir = LEFT;
+    @tick = gettimetick(0);
+
     end;
 
+OnTimer35000:
+    .dir = DOWN;
+    @occupy = false;
+
+    close;
+
 OnInit:
     .sex = G_OTHER;
     .distance = 5;
@@ -134,20 +149,23 @@ OnInit:
 }
 
 001-1,181,119,0	script	#water_animation6	NPC_WATER_SPLASH,{
-    if (@pull != 1 && @pull != 2)
-        narrator 4, l("You see some fish reflecting the sun on the surface of the water.");
+
+    fishingspot strnpcinfo(3);
     fishing strnpcinfo(3);
     close;
 
-OnPull:
-    emotion 106;
-    if (@pull == 3)
-        end;
-    else
-        @pull = 2;
-        @tick = gettimetick(0);
+OnBiteBait:
+    .dir = LEFT;
+    @tick = gettimetick(0);
+
     end;
 
+OnTimer35000:
+    .dir = DOWN;
+    @occupy = false;
+
+    close;
+
 OnInit:
     .sex = G_OTHER;
     .distance = 5;
@@ -155,20 +173,23 @@ OnInit:
 }
 
 001-1,202,114,0	script	#water_animation7	NPC_WATER_SPLASH,{
-    if (@pull != 1 && @pull != 2)
-        narrator 4, l("You see some fish reflecting the sun on the surface of the water.");
+
+    fishingspot strnpcinfo(3);
     fishing strnpcinfo(3);
     close;
 
-OnPull:
-    emotion 106;
-    if (@pull == 3)
-        end;
-    else
-        @pull = 2;
-        @tick = gettimetick(0);
+OnBiteBait:
+    .dir = LEFT;
+    @tick = gettimetick(0);
+
     end;
 
+OnTimer35000:
+    .dir = DOWN;
+    @occupy = false;
+
+    close;
+
 OnInit:
     .sex = G_OTHER;
     .distance = 5;
@@ -176,20 +197,23 @@ OnInit:
 }
 
 001-1,187,86,0	script	#water_animation8	NPC_WATER_SPLASH,{
-    if (@pull != 1 && @pull != 2)
-        narrator 4, l("You see some fish reflecting the sun on the surface of the water.");
+
+    fishingspot strnpcinfo(3);
     fishing strnpcinfo(3);
     close;
 
-OnPull:
-    emotion 106;
-    if (@pull == 3)
-        end;
-    else
-        @pull = 2;
-        @tick = gettimetick(0);
+OnBiteBait:
+    .dir = LEFT;
+    @tick = gettimetick(0);
+
     end;
 
+OnTimer35000:
+    .dir = DOWN;
+    @occupy = false;
+
+    close;
+
 OnInit:
     .sex = G_OTHER;
     .distance = 5;
@@ -197,20 +221,23 @@ OnInit:
 }
 
 001-1,32,57,0	script	#water_animation9	NPC_WATER_SPLASH,{
-    if (@pull != 1 && @pull != 2)
-        narrator 4, l("You see some fish reflecting the sun on the surface of the water.");
+
+    fishingspot strnpcinfo(3);
     fishing strnpcinfo(3);
     close;
 
-OnPull:
-    emotion 106;
-    if (@pull == 3)
-        end;
-    else
-        @pull = 2;
-        @tick = gettimetick(0);
+OnBiteBait:
+    .dir = LEFT;
+    @tick = gettimetick(0);
+
     end;
 
+OnTimer35000:
+    .dir = DOWN;
+    @occupy = false;
+
+    close;
+
 OnInit:
     .sex = G_OTHER;
     .distance = 5;
@@ -218,20 +245,23 @@ OnInit:
 }
 
 001-1,40,144,0	script	#water_animation10	NPC_WATER_SPLASH,{
-    if (@pull != 1 && @pull != 2)
-        narrator 4, l("You see some fish reflecting the sun on the surface of the water.");
+
+    fishingspot strnpcinfo(3);
     fishing strnpcinfo(3);
     close;
 
-OnPull:
-    emotion 106;
-    if (@pull == 3)
-        end;
-    else
-        @pull = 2;
-        @tick = gettimetick(0);
+OnBiteBait:
+    .dir = LEFT;
+    @tick = gettimetick(0);
+
     end;
 
+OnTimer35000:
+    .dir = DOWN;
+    @occupy = false;
+
+    close;
+
 OnInit:
     .sex = G_OTHER;
     .distance = 5;
@@ -239,20 +269,23 @@ OnInit:
 }
 
 001-1,58,131,0	script	#water_animation11	NPC_WATER_SPLASH,{
-    if (@pull != 1 && @pull != 2)
-        narrator 4, l("You see some fish reflecting the sun on the surface of the water.");
+
+    fishingspot strnpcinfo(3);
     fishing strnpcinfo(3);
     close;
 
-OnPull:
-    emotion 106;
-    if (@pull == 3)
-        end;
-    else
-        @pull = 2;
-        @tick = gettimetick(0);
+OnBiteBait:
+    .dir = LEFT;
+    @tick = gettimetick(0);
+
     end;
 
+OnTimer35000:
+    .dir = DOWN;
+    @occupy = false;
+
+    close;
+
 OnInit:
     .sex = G_OTHER;
     .distance = 5;
@@ -260,20 +293,23 @@ OnInit:
 }
 
 001-1,76,137,0	script	#water_animation12	NPC_WATER_SPLASH,{
-    if (@pull != 1 && @pull != 2)
-        narrator 4, l("You see some fish reflecting the sun on the surface of the water.");
+
+    fishingspot strnpcinfo(3);
     fishing strnpcinfo(3);
     close;
 
-OnPull:
-    emotion 106;
-    if (@pull == 3)
-        end;
-    else
-        @pull = 2;
-        @tick = gettimetick(0);
+OnBiteBait:
+    .dir = LEFT;
+    @tick = gettimetick(0);
+
     end;
 
+OnTimer35000:
+    .dir = DOWN;
+    @occupy = false;
+
+    close;
+
 OnInit:
     .sex = G_OTHER;
     .distance = 5;
@@ -281,20 +317,23 @@ OnInit:
 }
 
 001-1,109,132,0	script	#water_animation13	NPC_WATER_SPLASH,{
-    if (@pull != 1 && @pull != 2)
-        narrator 4, l("You see some fish reflecting the sun on the surface of the water.");
+
+    fishingspot strnpcinfo(3);
     fishing strnpcinfo(3);
     close;
 
-OnPull:
-    emotion 106;
-    if (@pull == 3)
-        end;
-    else
-        @pull = 2;
-        @tick = gettimetick(0);
+OnBiteBait:
+    .dir = LEFT;
+    @tick = gettimetick(0);
+
     end;
 
+OnTimer35000:
+    .dir = DOWN;
+    @occupy = false;
+
+    close;
+
 OnInit:
     .sex = G_OTHER;
     .distance = 5;
@@ -302,20 +341,23 @@ OnInit:
 }
 
 001-1,141,93,0	script	#water_animation14	NPC_WATER_SPLASH,{
-    if (@pull != 1 && @pull != 2)
-        narrator 4, l("You see some fish reflecting the sun on the surface of the water.");
+
+    fishingspot strnpcinfo(3);
     fishing strnpcinfo(3);
     close;
 
-OnPull:
-    emotion 106;
-    if (@pull == 3)
-        end;
-    else
-        @pull = 2;
-        @tick = gettimetick(0);
+OnBiteBait:
+    .dir = LEFT;
+    @tick = gettimetick(0);
+
     end;
 
+OnTimer35000:
+    .dir = DOWN;
+    @occupy = false;
+
+    close;
+
 OnInit:
     .sex = G_OTHER;
     .distance = 5;
@@ -323,22 +365,23 @@ OnInit:
 }
 
 001-1,168,57,0	script	#water_animation15	NPC_WATER_SPLASH,{
-    if (@pull != 1 && @pull != 2)
-    {
-        narrator 4, l("You see some fish reflecting the sun on the surface of the water. " + @pull + "");
-    }
+
+    fishingspot strnpcinfo(3);
     fishing strnpcinfo(3);
     close;
 
-OnPull:
-    emotion 106;
-    if (@pull == 3)
-        end;
-    else
-        @pull = 2;
-        @tick = gettimetick(0);
+OnBiteBait:
+    .dir = LEFT;
+    @tick = gettimetick(0);
+
     end;
 
+OnTimer35000:
+    .dir = DOWN;
+    @occupy = false;
+
+    close;
+
 OnInit:
     .sex = G_OTHER;
     .distance = 5;