fix(TBaseBankScript): should properly trigger bankempty when there's …

…not enough of the item we need
Torwent · Sep 14, 2024 · 224f138 · 224f138
1 parent 7c37dcf
commit 224f138
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/osr/basescript.simba b/osr/basescript.simba
@@ -658,6 +658,7 @@ function TBaseBankScript.Withdraw(out item: TRSBankItem; attempts: Int32 = 3): B
 var
   count, stack, attempt: Int32;
   invItem: TRSItem;
+  b: TBox;
 begin
   if item.Noted then
     invItem := 'Noted ' + item.Item
@@ -671,18 +672,29 @@ begin
       Exit;
 
     count := Inventory.CountItem(invItem);
-    Result := Bank.WithdrawItem(item, item.Quantity <> 1) and
-              WaitUntil(
-                (Inventory.CountItemStack(invItem) > stack) or
-                (Inventory.CountItem(invItem) > count), 300, 3000
-              );
 
-    if Result then
-      Exit;
+    if Bank.FindItem(item, b) then
+    begin
+      if Bank.CountItemStack(item.Item) < item.Quantity then
+      begin
+        Self.BankEmpty := Bank.IsOpen();
+        if Self.BankEmpty then
+          SaveScreenshot('bankempty' + DIRECTORYSEPARATOR + 'bankempty', MainScreen.Bounds());
+        if Self.CollectEmpty and Self.CollectTimer.IsFinished() then
+          Self.CollectEmpty := False;
+        Exit;
+      end;
+
+      Result := Bank.WithdrawHelper(b, item.Quantity, item.Noted, item.Quantity <> 1);
+    end;
+
+    Result := Result and
+              WaitUntil((Inventory.CountItemStack(invItem) > stack) or
+                        (Inventory.CountItem(invItem) > count), 300, 3000);
+    if Result then Exit;
 
     Bank.UnHoverIncinerator();
-    if Bank.IsSearchOpen() then
-      Bank.CloseSearch();
+    if Bank.IsSearchOpen() then  Bank.CloseSearch();
 
     if attempt > 1 then
       Mouse.Move(Bank.GetSlotBoxes().Merge(), True);

diff --git a/osr/interfaces/mainscreen/mainscreen.simba b/osr/interfaces/mainscreen/mainscreen.simba
@@ -265,7 +265,6 @@ end;
 ```pascal
 function TRSMainScreen.FindEnemyHitsplats(): Boolean;
 ```
-
 Returns the hitsplats on screen that don't belong to the player.
 
 Example:
@@ -306,7 +305,6 @@ end;
 ```pascal
 function TRSMainScreen.InCombat: Boolean;
 ```
-
 Returns true if we are currently in combat.
 With slow attack speed between you and the enemy this might return false negatives.
 
@@ -325,7 +323,6 @@ end;
 ```pascal
 function TRSMainScreen.WaitInCombat(waitTime: Int32; interval: Int32 = -1): Boolean;
 ```
-
 Waits the specified **waitTime** until we are in combat.
 
 Example:
@@ -346,7 +343,6 @@ end;
 ```pascal
 function TRSMainScreen.WaitNotInCombat(waitTime: Int32; interval: Int32 = -1): Boolean;
 ```
-
 Waits the specified **waitTime** until we are nto in combat.
 
 Example: