From 570c1c9b704c33ec35e62b56fd64f579a9c554ec Mon Sep 17 00:00:00 2001
From: Danial <admin@redsparr0w.com>
Date: Thu, 7 Oct 2021 12:26:03 +1300
Subject: [PATCH] Update fishing

---
 src/main/java/ParaScript/Main.java            |  4 ++++
 src/main/java/ParaScript/data/Variables.java  |  2 ++
 src/main/java/ParaScript/strategies/Fish.java | 11 ++++-------
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/ParaScript/Main.java b/src/main/java/ParaScript/Main.java
index 5c8c582..161e611 100644
--- a/src/main/java/ParaScript/Main.java
+++ b/src/main/java/ParaScript/Main.java
@@ -50,6 +50,10 @@ public class Main extends Script implements MessageListener, Paintable {
             strategies.add(new Bank());
             strategies.add(new Walk());
         }
+        if(Variables.skill_to_train == Skill.SMITHING) {
+            strategies.add(new Smelt());
+            strategies.add(new BankSmithing());
+        }
         if(Variables.skill_to_train == Skill.THIEVING) {
             strategies.add(new Thieving());
         }
diff --git a/src/main/java/ParaScript/data/Variables.java b/src/main/java/ParaScript/data/Variables.java
index 622ceca..decc792 100644
--- a/src/main/java/ParaScript/data/Variables.java
+++ b/src/main/java/ParaScript/data/Variables.java
@@ -177,6 +177,8 @@ public class Variables {
                 return new int[]{woodcutting_tree_selected.getItemID()};
             case "Mining":
                 return mining_rock_selected.getItemID();
+            case "Fishing":
+                return fishing_spot_selected.getItemIDs();
             case "Attack":
                 return fighting_item_ids;
             default:
diff --git a/src/main/java/ParaScript/strategies/Fish.java b/src/main/java/ParaScript/strategies/Fish.java
index e03919d..029f213 100644
--- a/src/main/java/ParaScript/strategies/Fish.java
+++ b/src/main/java/ParaScript/strategies/Fish.java
@@ -17,7 +17,8 @@ public class Fish implements Strategy {
                 && fishingSpot != null
                 && (Variables.getStatus() == "none" || Variables.getStatus() == "fishing")
                 && !Players.getMyPlayer().isInCombat()
-                && Players.getMyPlayer().getAnimation() == -1) {
+                && Players.getMyPlayer().getAnimation() == -1
+                && !Inventory.isFull()) {
             Variables.setStatus("fishing");
             return true;
         }
@@ -28,11 +29,7 @@ public class Fish implements Strategy {
     @Override
     public void execute() {
         try {
-            if (Variables.shouldDropItems()) {
-                if (Inventory.getCount(441) >= 1) Inventory.getItem(441).interact(Items.Option.DROP);
-            }
-
-            fishingSpot.interact(Variables.fishing_type_selected);
+            fishingSpot.interact(Variables.fishing_spot_selected.actionType);
             Time.sleep(1000);
 
             // Wait for the Player to finish fishing (max 60 seconds)
@@ -44,7 +41,7 @@ public class Fish implements Strategy {
 
     private Npc fishingSpot(){
         try {
-            for (Npc spot : Npcs.getNearest(316)) {
+            for(Npc spot : Npcs.getNearest(Variables.fishing_spot_selected.getIDs())){
                 if (spot != null)
                     return spot;
             }