You can now save your fishing bait at `@ucp` (by @NetSysFire request)

Keep in mind that baits aren't universal - You may be unable to fish in some places.

2 files changed, 26 insertions, 7 deletions

diff --git a/npc/commands/ucp.txt b/npc/commands/ucp.txt
index f20a8eede..40f8ebaf3 100644
--- a/npc/commands/ucp.txt
+++ b/npc/commands/ucp.txt
@@ -209,6 +209,16 @@ function	script	UserCtrlPanel	{
                     mes l("Alchemy Table: ") + col(l("Ask everytime"), 2);
 
 
+                // GSET_FISHING_BAIT
+                // Fishing Bait Behavior
+                if (GSET_FISHING_BAIT > 1)
+                    mes l("Fishing bait: ") + col(l("Always use %s", getitemlink(GSET_FISHING_BAIT)), 2);
+                else if (GSET_FISHING_BAIT)
+                    mes l("Fishing bait: ") + col(l("Ask next time"), 1);
+                else
+                    mes l("Fishing bait: ") + col(l("Ask everytime"), 2);
+
+
                 // GSET_ALCOHOL_NOOVERDRINK
                 // Should players be allowed to drink themselves to death?
                 if (GSET_ALCOHOL_NOOVERDRINK)
@@ -264,6 +274,7 @@ function	script	UserCtrlPanel	{
                     l("Toggle Daily Reward screen"),
                     l("Text Wall Density"),
                     l("Alchemy Table brewing"),
+                    l("Automatic fishing bait"),
                     l("Lethal alcohol overdrinking"),
                     l("Change crafting method"),
                     l("Show Tutorial Protips"),
@@ -302,14 +313,16 @@ function	script	UserCtrlPanel	{
                         }
 						break;
                     case 6:
-                        GSET_ALCOHOL_NOOVERDRINK=!GSET_ALCOHOL_NOOVERDRINK; break;
+                        GSET_FISHING_BAIT = (GSET_FISHING_BAIT ? 0 : 1); break;
                     case 7:
-                        GSET_CRAFT_BOUND=!GSET_CRAFT_BOUND; break;
+                        GSET_ALCOHOL_NOOVERDRINK=!GSET_ALCOHOL_NOOVERDRINK; break;
                     case 8:
-                        TUTORIAL=!TUTORIAL; break;
+                        GSET_CRAFT_BOUND=!GSET_CRAFT_BOUND; break;
                     case 9:
-                        GSET_VALENTINE_EATALL=!GSET_VALENTINE_EATALL; break;
+                        TUTORIAL=!TUTORIAL; break;
                     case 10:
+                        GSET_VALENTINE_EATALL=!GSET_VALENTINE_EATALL; break;
+                    case 11:
                         GSET_AUTORECEIVE_COINS=!GSET_AUTORECEIVE_COINS; break;
                 }
                 clear;
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)
         {