summaryrefslogtreecommitdiff
path: root/npc/functions
diff options
context:
space:
mode:
Diffstat (limited to 'npc/functions')
-rw-r--r--npc/functions/fishing.txt12
1 files changed, 9 insertions, 3 deletions
diff --git a/npc/functions/fishing.txt b/npc/functions/fishing.txt
index 647ff19d5..e6d4adbbb 100644
--- a/npc/functions/fishing.txt
+++ b/npc/functions/fishing.txt
@@ -284,10 +284,15 @@ function script fishing {
l("You see some fish reflecting the sun on the surface of the water."),
(.@net_ratio == 1 ? l("What will be the bait for the fish?") : l("You need @@ units of bait for this fishing spot. What will you use?", .@net_ratio));
- mes "##B" + l("Drag and drop an item from your inventory.") + "##b";
+ if (GSET_FISHING_BAIT > 1) {
+ .@bait = GSET_FISHING_BAIT;
+ } else {
+ mes "##B" + l("Drag and drop an item from your inventory.") + "##b";
- .@bait = requestitem();
- .@bait_c = false;
+ .@bait = requestitem();
+ if (GSET_FISHING_BAIT)
+ GSET_FISHING_BAIT = .@bait;
+ }
if (.@bait < .@net_ratio) {
narrator S_FIRST_BLANK_LINE,
@@ -301,6 +306,7 @@ function script fishing {
return -6;
}
+ .@bait_c = false;
for (.@i = 0; .@i < .@baits; .@i += 2) {
if (getvariableofnpc(.bait_ids[.@i], .@npc$) == .@bait)
{