Try a tweak on fishing to see if it works

3 files changed, 18 insertions, 18 deletions

diff --git a/npc/001-1/wateranimation.txt b/npc/001-1/wateranimation.txt
index 1dc66c99f..6f65fb603 100644
--- a/npc/001-1/wateranimation.txt
+++ b/npc/001-1/wateranimation.txt
@@ -7,7 +7,7 @@
 
 001-1,254,70,0	script	#water_animation_aeros0	NPC_WATER_SPLASH,{
 
-    fishing; // begin or continue fishing
+    fishing(.common_fish, .rare_fish); // begin or continue fishing
     close;
 
 OnInit:
diff --git a/npc/functions/daily.txt b/npc/functions/daily.txt
index 197ea3592..52ad2e18b 100644
--- a/npc/functions/daily.txt
+++ b/npc/functions/daily.txt
@@ -16,7 +16,7 @@ function	script	daily_login_bonus_handler	{
     //      Number of monthly connections
     //  #LOGIN_ALLTIME
     //      Number of times you claimed the top prize (27 days streak)
-    debugmes "DLBH";
+    //debugmes "DLBH";
 
     if (#LOGIN_DAY != gettime(5)) {
         // demure check: Are you on a start area?
diff --git a/npc/functions/fishing.txt b/npc/functions/fishing.txt
index e9d52d41f..f3942de79 100644
--- a/npc/functions/fishing.txt
+++ b/npc/functions/fishing.txt
@@ -52,10 +52,26 @@ OnPCLogoutEvent:
     end;
 }
 
+// Syntax: fishing()
+// Syntax: fishing ( COMMON, RARE, BAITS )
 function	script	fishing	{
 
 ///////////////////////////////////////////
 // Var initialization
+    .@common_fish=getarg(0, 0);
+    .@rare_fish=getarg(0, 0);
+    if (getarraysize(.@common_fish) < 1 || .@common_fish == 0) {
+        // default fishes
+        setarray .@common_fish,
+            CommonCarp;
+    }
+
+    if (getarraysize(.@rare_fish) < 1 || .@rare_fish == 0) {
+        // default fishes
+        setarray .@rare_fish,
+            GrassCarp;
+    }
+    debugmes("[FISH] Initialized with %d common and %d rare fishes", getarraysize(.@common_fish), getarraysize(.@rare_fish));
 
     .@npc$ = strnpcinfo(0); // the full name of the fishing spot
 
@@ -105,22 +121,6 @@ function	script	fishing	{
 
     .@fish_id = CommonCarp; // failsafe
     
-    .@common_fish=getvariableofnpc(.common_fish, .@npc$);
-    if (getarraysize(.@common_fish) < 1)
-    {
-        // default fishes
-        setarray .@common_fish,
-            CommonCarp;
-    }
-
-    .@rare_fish=getvariableofnpc(.rare_fish, .@npc$);
-    if (getarraysize(.@rare_fish) < 1)
-    {
-        // default fishes
-        setarray .@rare_fish,
-            GrassCarp;
-    }
-    debugmes("[FISH] Initialized with %d common and %d rare fishes", getarraysize(.@common_fish), getarraysize(.@rare_fish));
 
     if (getvariableofnpc(.bait_ids[0], .@npc$) < 1)
     {