fix: Merge pull request #251 from clubxj/master

fix: Compatibility with SRL-T

Author: TwistedSlayerHelm

osr/basescript.simba

@@ -632,10 +632,11 @@ begin
 end;
 
 
-function TBaseBankScript.RanOut(out item: TRSBankItem; attempts: Int32 = 3): Boolean;
+function TBaseBankScript.RanOut(item: TRSBankItem; attempts: Int32 = 3): Boolean;
 var
   attempt: Int32;
   b: TBox;
+  position: TRSBankPosition;
 begin
   for attempt := 1 to attempts do
   begin
@@ -654,11 +655,12 @@ begin
       Continue;
     end;
 
-    if item.Tab = -1 then Continue;
-    if Bank.GetCurrentTab() <> item.Tab then Continue;
+    position := Bank._GetCachedPosition(item.Item);
+    if position.Tab = -1 then Continue;
+    if Bank.GetCurrentTab() <> position.Tab then Continue;
 
-    if item.Scroll = -1 then Continue;
-    if not InRange(Bank.GetScrollPosition(), item.Scroll-3, item.Scroll+3) then Continue;
+    if position.Scroll = -1 then Continue;
+    if not InRange(Bank.GetScrollPosition(), position.Scroll-3, position.Scroll+3) then Continue;
 
     Break;
   end;

osr/deprecated.simba

@@ -45,18 +45,6 @@ var
   StatsPayload: TStatsPayload;
 {$H+}
 
-function TBaseBankScript.Withdraw(item: TRSBankWithdrawItem): Boolean; overload; deprecated 'Use the TRSBankItem version instead!';
-var
-  tmp: TRSBankItem;
-begin
-  tmp := TRSBankItem.Setup(item.item, item.Quantity, item.Noted);
-  tmp.Tab := Self.BankTab;
-
-  Result := Self.Withdraw(tmp);
-
-  Self.BankTab := tmp.Tab;
-end;
-
 
 function TRSWalker.GetMMPoly(tpa: TPointArray): TPointArray; deprecated 'Use TRSWalker.WorldToMM() instead.';
 begin

osr/handlers/consumablehandler.simba

@@ -96,8 +96,8 @@ begin
     begin
       Self.DebugLn('Consumable found: ' + ToStr(item));
       consumable := Self.Setup(item);
-      consumable.BankItem.Tab := Bank.GetCurrentTab(); //TODO: Search parent maybe?
-      consumable.BankItem.Scroll := Bank.GetScrollPosition();
+      Bank._CachePosition(consumable.BankItem.Item, [Bank.GetCurrentTab(), Bank.GetScrollPosition()]);
+      //TODO: Search parent maybe?
 
       Result += consumable;
     end;
@@ -400,7 +400,7 @@ begin
     if Self.FindItems(TRASH_ARRAY, trashSlots) then
     begin
       if Bank.IsOpen() then
-        Bank.DepositSlot([trashSlots[0], -1], False)
+        Bank.DepositHelper(Inventory.GetSlotBox(trashSlots[0]), Bank.QUANTITY_ALL, False)
       else
         Self.ShiftDrop(trashSlots.Intersection(Self.RandomPattern()));
       slots := slots.Difference(trashSlots);

osr/interfaces/mainscreen/bank.simba

@@ -22,11 +22,6 @@ begin
 end;
 
 
-function TRSBank.ContainsItem(item: TRSBankWithdrawItem): Boolean; overload; deprecated 'Use the TRSBankItem version instead!';
-begin
-  Result := Self.ContainsItem(item.Item);
-end;
-
 function TRSBank.FindItem(bankTab: Int32; item: TRSItem; out Bounds: TBox): Boolean; overload;
 begin
   if Self.OpenTab(bankTab) then
@@ -39,16 +34,6 @@ begin
     Result := Self.ContainsItem(item);
 end;
 
-function TRSBank.ContainsItem(bankTab: Int32; item: TRSBankWithdrawItem): Boolean; overload; deprecated 'Use the TRSBankItem version instead!';
-var
-  bankItem: TRSBankItem;
-begin
-  bankItem := TRSBankItem.Setup(item.item, item.Quantity, item.Noted);
-  bankItem.Tab := bankTab;
-  Result := Self.ContainsItem(bankItem);
-end;
-
-
 
 function TRSBank.DepositAll(): Boolean; override;
 var
@@ -73,66 +58,6 @@ begin
   Result := buttons[i].Click();
 end;
 
-
-function TRSBank.WithdrawSlot(tab: Int32; item: TRSBankWithdrawSlot; useQuantityButtons: Boolean): Boolean; overload;
-var
-  itemCount: Int32;
-begin
-  if not Self.IsOpen or (tab = -1) then
-    Exit;
-
-  Self.OpenTab(tab);
-
-  itemCount := Self.CountSlotStack(item.Slot);
-  if Self.WithdrawSlot(item, useQuantityButtons) then
-    Result := WaitUntil(Self.CountSlotStack(item.Slot) < itemCount, 100, 2000);
-end;
-
-
-function TRSBank.WithdrawItem(out tab: Int32; item: TRSBankWithdrawItem; useQuantityButtons: Boolean): Boolean; overload; deprecated 'Use TRSBankItem version instead!';
-var
-  b: TBox;
-  count: Int32;
-begin
-  if not Self.IsOpen() then
-    Exit;
-
-  if Inventory.IsFull() and (Length(Item.Item.GetArray()) = 1) and not Inventory.ItemIsStackable(Item.Item) then
-    Exit;
-
-  if not Self.FindItem(item.Item, b) then
-  begin
-    if tab = -1 then
-      tab := Self.FindItemTab(item.Item)
-    else
-      Self.OpenTab(tab);
-
-    if not Self.FindItem(item.Item, b) then
-      Exit(False);
-  end;
-
-  count := SRL.GetItemAmount(b);
-  if Self.WithdrawHelper(b, item.Quantity, item.Noted, useQuantityButtons) then
-    Result := WaitUntil(SRL.GetItemAmount(b) < count, 100, 2000);
-end;
-
-function TRSBank.WithdrawItems(tab: Int32; items: array of TRSBankWithdrawItem; UseQuantityButtons: Boolean): Boolean; deprecated 'Use TRSBankItem version instead!';
-var
-  item: TRSBankWithdrawItem;
-  bankItem: TRSBankItem;
-begin
-  for item in items do
-  begin
-    bankItem := TRSBankItem.Setup(item.Item, item.Quantity, item.Noted);
-    bankItem.Tab := tab;
-    if not Self.WithdrawItem(bankItem, UseQuantityButtons) then
-      Exit(False);
-  end;
-  Result := True;
-end;
-
-
-
 function TRSBank.DepositAllBut(Tab: Int32; Items: TRSItemArray): Boolean; deprecated 'Use Bank.DepositRandomItems() instead.';
 var
   Item: TRSItem;
@@ -155,7 +80,7 @@ begin
     if not Self.IsOpen then //Exit in case the bank somehow closed.
       Exit;
 
-    if Self.DepositSlot([DepositSlots[0], Self.QUANTITY_ALL], True) then
+    if Self.DepositHelper(Inventory.GetSlotBox(DepositSlots[0]), Self.QUANTITY_ALL, True) then
       WaitUntil(not Inventory.IsSlotUsed(DepositSlots[0]), 100, 2000);
 
     DepositSlots := Slots.Difference(Inventory.GetUsedSlots);
@@ -177,7 +102,7 @@ begin
     if not Self.IsOpen() then //Exit in case the bank somehow closed.
       Exit;
 
-    if Self.DepositSlot([slots[0], Bank.QUANTITY_ALL], True) then
+    if Self.DepositHelper(Inventory.GetSlotBox(slots[0]), Bank.QUANTITY_ALL, True) then
       WaitUntil(not Inventory.IsSlotUsed(slots[0]), 100, 2000);
 
     slots := Inventory.FindRandomItems(items);