From ab7be16b6bc75756901fa224e8b876e985ac6e5b Mon Sep 17 00:00:00 2001
From: Danial <admin@redsparr0w.com>
Date: Thu, 7 Oct 2021 13:35:42 +1300
Subject: [PATCH] Update dropping items

---
 src/main/java/ParaScript/Main.java           |  4 ++-
 src/main/java/ParaScript/data/Variables.java |  7 +++-
 src/main/java/ParaScript/ui/UI.java          | 34 ++++++++++++++++++++
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ParaScript/Main.java b/src/main/java/ParaScript/Main.java
index f6d2791..d7f6b16 100644
--- a/src/main/java/ParaScript/Main.java
+++ b/src/main/java/ParaScript/Main.java
@@ -39,7 +39,6 @@ public class Main extends Script implements MessageListener, Paintable {
         strategies.add(new UpdateBank());
         strategies.add(new UpdateExperience());
         strategies.add(new ScriptState());
-        strategies.add(new Drop());
 
         // if(Variables.skill_to_train == Skill.CRAFTING) {
         //     strategies.add(new Crafting());
@@ -79,6 +78,9 @@ public class Main extends Script implements MessageListener, Paintable {
             strategies.add(new Walk());
             strategies.add(new PickupItems());
         }
+        
+        // These strategies should always be running
+        strategies.add(new Drop());
         strategies.add(new HandleLogin());
         provide(strategies);
         return true;
diff --git a/src/main/java/ParaScript/data/Variables.java b/src/main/java/ParaScript/data/Variables.java
index decc792..3c84ffd 100644
--- a/src/main/java/ParaScript/data/Variables.java
+++ b/src/main/java/ParaScript/data/Variables.java
@@ -47,10 +47,11 @@ public class Variables {
 
     // Thieving
     public static ThievingNpcs thieving_npc_selected = ThievingNpcs.MAN_WOMAN;
-    //public static String thieving_method = "None";
+    public static String thieving_method = "Drop";
 
     // Fishing
     public static FishingSpots fishing_spot_selected = FishingSpots.NET;
+    public static String fishing_method = "Drop";
 
     // Banking
     public static int[] bank_items = new int[]{};
@@ -207,6 +208,10 @@ public class Variables {
                 return woodcutting_method.equalsIgnoreCase("Drop");
             case "Mining":
                 return mining_method.equalsIgnoreCase("Drop");
+            case "Fishing":
+                return fishing_method.equalsIgnoreCase("Drop");
+            case "Thieving":
+                return thieving_method.equalsIgnoreCase("Drop");
             default:
                 return false;
         }
diff --git a/src/main/java/ParaScript/ui/UI.java b/src/main/java/ParaScript/ui/UI.java
index 54c2289..bfcb838 100644
--- a/src/main/java/ParaScript/ui/UI.java
+++ b/src/main/java/ParaScript/ui/UI.java
@@ -52,9 +52,11 @@ public class UI extends JFrame {
     private JComboBox thievingNpcSelect = new JComboBox();
     private JLabel lblThievingNpcCustomID = new JLabel("Custom NPC IDs");
     private JTextField thievingNpcCustomID = new JTextField();
+    private JComboBox thievingMethod = new JComboBox();
 
     // Fishing
     private JComboBox fishingTypeSelect = new JComboBox();
+    private JComboBox fishingMethod = new JComboBox();
 
     // Our colors
     private Color Color_MidnightBlue = new Color(44, 62, 80);
@@ -600,6 +602,22 @@ public class UI extends JFrame {
         lblThievingNpcCustomID.setVisible(false);
         thievingNpcCustomID.setVisible(false);
 
+        // What should we do with our items
+        JLabel lblThievingMethod = new JLabel("Method");
+        lblThievingMethod.setForeground(Color_WhiteSmoke);
+        lblThievingMethod.setBounds(20, 60, 150, 20);
+        thievingPanel.add(lblThievingMethod);
+        thievingMethod.setModel(new DefaultComboBoxModel(new String[]{
+                "Drop",
+        }));
+        thievingMethod.setBounds(20, 80, 150, 20);
+        thievingMethod.addActionListener (new ActionListener () {
+            public void actionPerformed(ActionEvent e) {
+                Variables.thieving_method = thievingMethod.getSelectedItem().toString();
+            }
+        });
+        thievingPanel.add(thievingMethod);
+
         /*
          * Fishing Panel
          */
@@ -628,6 +646,22 @@ public class UI extends JFrame {
         });
         fishingPanel.add(fishingTypeSelect);
 
+        // What should we do with out fish
+        JLabel lblFishingMethod = new JLabel("Method");
+        lblFishingMethod.setForeground(Color_WhiteSmoke);
+        lblFishingMethod.setBounds(20, 60, 150, 20);
+        fishingPanel.add(lblFishingMethod);
+        fishingMethod.setModel(new DefaultComboBoxModel(new String[]{
+                "Drop",
+        }));
+        fishingMethod.setBounds(20, 80, 150, 20);
+        fishingMethod.addActionListener (new ActionListener () {
+            public void actionPerformed(ActionEvent e) {
+                Variables.fishing_method = fishingMethod.getSelectedItem().toString();
+            }
+        });
+        fishingPanel.add(fishingMethod);
+
         /*
          * Slave Panel
          *