1. Close help overlay in bank if it's visible.

2. Prioritise depositing items in ItemReqBanking to avoid scenario where the script is trying to withdraw an item req, but the inventory is full.
3. Prioritise banks over deposit boxes in Banking, to avoid scenario where the script uses a deposit box to deposit all items, but then goes to the bank to withdraw items.

v3.2.4

Author: Explv

resources-archive.zip

@@ -3,13 +3,17 @@
 import org.osbot.rs07.api.map.Area;
 import util.Executable;
 import util.Sleep;
+import util.widget.CachedWidget;
+import util.widget.filters.WidgetActionFilter;
 
 import java.util.stream.Stream;
 
 public abstract class Banking extends Executable {
 
     private static final Area[] ALL_BANK_AND_DEPOSIT_BOX_AREAS = Stream.concat(Stream.of(Bank.AREAS), Stream.of(DepositBox.AREAS)).toArray(Area[]::new);
 
+    private static final CachedWidget CONTINUE_BANK_INSTRUCTIONS_WIDGET = new CachedWidget(new WidgetActionFilter("Continue"));
+
     private final boolean useDepositBoxes;
 
     protected enum BankType {
@@ -34,6 +38,8 @@ public void run() throws InterruptedException {
             walkToBank();
         } else if (!isBankOpen()) {
             currentBankType = openBank();
+        } else if (CONTINUE_BANK_INSTRUCTIONS_WIDGET.isVisible(getWidgets())) {
+            CONTINUE_BANK_INSTRUCTIONS_WIDGET.interact(getWidgets(), "Continue");
         } else {
             succeeded = bank(currentBankType);
         }
@@ -54,24 +60,33 @@ private boolean walkToBank() {
     }
 
     boolean isBankOpen() {
-        if (useDepositBoxes) {
+        if (getBank() != null) {
+            return getBank().isOpen();
+        }
+
+        if (useDepositBoxes && getDepositBox() != null) {
             return getDepositBox().isOpen();
         }
-        return getBank().isOpen();
+
+        return false;
     }
 
-    BankType openBank() throws InterruptedException {
+    private BankType openBank() throws InterruptedException {
+        if (getBank() != null) {
+            if (getBank().open()) {
+                Sleep.sleepUntil(() -> getBank().isOpen(), 5000);
+            }
+            return BankType.BANK;
+        }
+
         if (useDepositBoxes && getDepositBox() != null) {
             if (getDepositBox().open()) {
                 Sleep.sleepUntil(() -> getDepositBox().isOpen(), 5000);
             }
             return BankType.DEPOSIT_BOX;
         }
 
-        if (getBank().open()) {
-            Sleep.sleepUntil(() -> getBank().isOpen(), 5000);
-        }
-        return BankType.BANK;
+        throw new IllegalStateException("Cannot open bank, no bank or deposit box found.");
     }
 
     /**

src/main/java/activities/banking/Banking.java

@@ -119,11 +119,60 @@ public int execute() throws InterruptedException {
     private void getItemRequirements(final ItemReq... itemReqs) {
         final List<ItemReq> itemReqList = Arrays.asList(itemReqs);
 
-        List<ItemReq> equipableItemReqs = itemReqList.stream().filter(ItemReq::isEquipable).collect(Collectors.toList());
-        Filter<Item> equipableItemReqFilter = item -> equipableItemReqs.stream().anyMatch(req -> req.isRequirementItem(item));
+        final List<ItemReq> equipableItemReqs = itemReqList.stream().filter(ItemReq::isEquipable).collect(Collectors.toList());
+        final Filter<Item> equipableItemReqFilter = item -> equipableItemReqs.stream().anyMatch(req -> req.isRequirementItem(item));
+        final List<ItemReq> nonEquipableItemReqsList = itemReqList.stream().filter(req -> !req.isEquipable()).collect(Collectors.toList());
+
+        // First we deposit any items that are not a requirement
+        execute(new Event() {
+            @Override
+            public int execute() throws InterruptedException {
+                if (!getInventory().contains(item -> !itemReqFilter.match(item))) {
+                    setFinished();
+                    return 0;
+                }
+
+                if (!getBank().isOpen()) {
+                    getBank().open();
+                } else {
+                    getBank().depositAllExcept(itemReqFilter);
+                }
+                return 600;
+            }
+        });
+
+        // Then we deposit any excess item reqs we have
+        execute(new Event() {
+            Queue<ItemReq> nonEquipableItemReqs = new LinkedList<>(nonEquipableItemReqsList);
+
+            @Override
+            public int execute() throws InterruptedException {
+                if (nonEquipableItemReqs.isEmpty()) {
+                    setFinished();
+                    return 0;
+                }
+
+                if (!getBank().isOpen()) {
+                    getBank().open();
+                } else {
+                    ItemReq itemReq = nonEquipableItemReqs.peek();
+
+                    int targetAmount = reqTargetAmountMap.get(itemReq);
+                    long amountOnPlayer = itemReq.getAmount(getInventory(), getEquipment());
+
+                    if (amountOnPlayer > targetAmount && targetAmount != ItemReq.QUANTITY_ALL) {
+                        depositExcess(itemReq);
+                    } else {
+                        nonEquipableItemReqs.poll();
+                    }
+                }
+                return 600;
+            }
+        });
+
 
         if (!equipableItemReqs.isEmpty()) {
-            // First we want to withdraw any equipable item reqs
+            // Now we want to withdraw any equipable item reqs
             Event withdrawEquipables = execute(new Event() {
                 Queue<ItemReq> equipableItemReqQueue = new LinkedList<>(equipableItemReqs);
 
@@ -132,7 +181,10 @@ private void getItemRequirements(final ItemReq... itemReqs) {
                 public int execute() throws InterruptedException {
                     if (equipableItemReqQueue.isEmpty()) {
                         setFinished();
-                    } else if (!getBank().isOpen()) {
+                        return 0;
+                    }
+
+                    if (!getBank().isOpen()) {
                         getBank().open();
                     } else if (getInventory().contains(item -> !equipableItemReqFilter.match(item))) {
                         getBank().depositAllExcept(equipableItemReqFilter);
@@ -180,38 +232,35 @@ public int execute() throws InterruptedException {
             });
         }
 
-        final List<ItemReq> nonEquipableItemReqsList = itemReqList.stream().filter(req -> !req.isEquipable()).collect(Collectors.toList());
-
         // Finally we want to withdraw any remaining item reqs
         Event withdrawNonEquipableEvent = execute(new Event() {
             Queue<ItemReq> nonEquipableItemReqs = new LinkedList<>(nonEquipableItemReqsList);
 
             @Override
             public int execute() throws InterruptedException {
+                if (nonEquipableItemReqs.isEmpty()) {
+                    setFinished();
+                    return 0;
+                }
+
                 if (!getBank().isOpen()) {
                     getBank().open();
-                } else if (getInventory().contains(item -> !itemReqFilter.match(item))) {
-                    getBank().depositAllExcept(itemReqFilter);
-                } else if (nonEquipableItemReqs.isEmpty()) {
-                    setFinished();
-                } else {
-                    ItemReq itemReq = nonEquipableItemReqs.peek();
+                    return 0;
+                }
 
-                    int targetAmount = reqTargetAmountMap.get(itemReq);
-                    long amountOnPlayer = itemReq.getAmount(getInventory(), getEquipment());
+                ItemReq itemReq = nonEquipableItemReqs.peek();
 
-                    if (amountOnPlayer > targetAmount && targetAmount != ItemReq.QUANTITY_ALL) {
-                        depositExcess(itemReq);
-                    } else if (!itemReq.hasRequirement(getInventory(), getEquipment())) {
-                        if (!withdrawItemReq(itemReq)) {
-                            setFailed();
-                        }
-                    } else if (amountOnPlayer < targetAmount && getBank().contains(itemReq.getName())) {
-                        withdrawItemReq(itemReq);
-                    } else {
-                        nonEquipableItemReqs.poll();
+                int targetAmount = reqTargetAmountMap.get(itemReq);
+                long amountOnPlayer = itemReq.getAmount(getInventory(), getEquipment());
+
+                if (amountOnPlayer < targetAmount) {
+                    if (!withdrawItemReq(itemReq)) {
+                        setFailed();
                     }
+                } else {
+                    nonEquipableItemReqs.poll();
                 }
+
                 return 600;
             }
         });

src/main/java/activities/banking/ItemReqBanking.java

@@ -28,7 +28,7 @@
 @ScriptManifest(author = "Explv", name = "Explv's AIO " + AIO.VERSION, info = "AIO", version = 0, logo = "http://i.imgur.com/58Zz0fb.png")
 public class AIO extends Script {
 
-    public static final String VERSION = "v3.2.3";
+    public static final String VERSION = "v3.2.4";
 
     private Gui gui;
     private Paint paint;