diff options
| -rw-r--r-- | npc/005-1/wateranimation.txt | 10 | ||||
| -rw-r--r-- | npc/functions/fishing.txt | 9 |
2 files changed, 15 insertions, 4 deletions
diff --git a/npc/005-1/wateranimation.txt b/npc/005-1/wateranimation.txt index ce016c1c5..367d4cb9a 100644 --- a/npc/005-1/wateranimation.txt +++ b/npc/005-1/wateranimation.txt @@ -6,10 +6,18 @@ 005-1,74,52,0 script #water_animation_candor0 NPC_WATER_SPLASH,{ - pondfishing; // begin or continue fishing + fishing; // begin or continue fishing close; OnInit: + // default fishes + setarray .common_fish, + Roach; + + // rare fishes + setarray .rare_fish, + Tench; + .sex = G_OTHER; .distance = 4; end; diff --git a/npc/functions/fishing.txt b/npc/functions/fishing.txt index be11579d9..6cbc33ac0 100644 --- a/npc/functions/fishing.txt +++ b/npc/functions/fishing.txt @@ -104,15 +104,18 @@ function script fishing { .@pull_rand_max = (.@pull_rand_max ? .@pull_rand_max : 800); .@fish_id = CommonCarp; // failsafe - - if (getarraysize(getvariableofnpc(.common_fish, .@npc$)) < 1) + + .@common_fish=getvariableofnpc(.common_fish, .@npc$); + if (getarraysize(.@common_fish) < 1) { // default fishes setarray .@common_fish, CommonCarp; + debugmes "Default"; } - if (getarraysize(getvariableofnpc(.rare_fish, .@npc$)) < 1) + .@rare_fish=getvariableofnpc(.rare_fish, .@npc$); + if (getarraysize(.@rare_fish) < 1) { // default fishes setarray .@rare_fish, |