feat: bank interface

Unfinished.

Fixed a ton of bugs on itemfinder

Author: Torwent

osrs.simba

@@ -46,6 +46,7 @@
 {$IFNDEF SRLT_MAPLOADER_INCLUDED}           {$I osrs/map/maploader.simba}
 {$IFNDEF SRLT_MAP_INCLUDED}                 {$I osrs/map/map.simba}
 {$IFNDEF SRLT_MAPDEBUGGER_INCLUDED}         {$I osrs/map/mapdebugger.simba}
+{$IFNDEF SRLT_BANK_INCLUDED}                {$I osrs/interfaces/mainscreen/bank.simba}
 
 
 
@@ -86,3 +87,4 @@
 {$ELSE}{$ENDIF}
 {$ELSE}{$ENDIF}
 {$ELSE}{$ENDIF}
+{$ELSE}{$ENDIF}

osrs/finders/items/itemfinder.simba

@@ -24,15 +24,31 @@ type
   end;
 
 
-procedure TRSItemFinder.Align(image, template: TImage);
+function TRSItemFinder.Align(image, template: TImage): Boolean;
 var
   borderA, borderB: TPointArray;
+  bounds: TBox;
+  align, p: TPoint;
 begin
   borderA  := image.FindColor(RSColors.ITEM_BORDER, 0);
   borderB := template.FindColor(RSColors.ITEM_BORDER, 0) + template.FindColor(RSColors.ITEM_BORDER_WHITE, 0);
 
-  image.Crop(borderA.Bounds());
-  template.Crop(borderB.Bounds());
+  align := borderA[High(borderA)] - borderB[High(borderB)];
+
+  borderB := borderB.Offset(align);
+  for p in borderB do
+  begin
+    if p.Y <= 8 then Continue;//stack number... Don't compare.
+
+    //borders don't match.
+    if not image.InImage(p.X, p.Y) then Exit;
+    if image.Pixel[p.X, p.Y] <> RSColors.ITEM_BORDER then Exit;
+  end;
+
+  bounds := borderA.Bounds();
+  image.Crop(bounds);
+  template.Crop(bounds.Offset([-align.X, -align.Y]));
+  Result := True;
 end;
 
 procedure TRSItemFinder.Clean(image, template: TImage);
@@ -49,6 +65,7 @@ begin
   for color in RSColors.STACK_COLORS do
     tpa += template.FindColor(color, 0);
 
+  tpa += template.FindColor(RSColors.ITEM_BORDER, 0);
   image.DrawTPA(tpa);
   template.DrawTPA(tpa);
 end;

osrs/interfaces/mainscreen/bank.simba

@@ -0,0 +1,145 @@
+(*
+# Bank
+Methods to interact with the bank interface
+*)
+
+{$DEFINE SRLT_BANK_INCLUDED}
+{$IFNDEF SRLT_OSR}
+  {$I SRLT/osrs.simba}
+{$ENDIF}
+
+type
+  ERSBankButtons = (WORN, MENU);
+  ERSBankArrangement = enum(SWAP, INSERT);
+  ERSBankWithdraw = enum(ITEM, NOTE);
+  ERSBankQuantity = enum(QUANTITY_1, QUANTITY_5, QUANTITY_10, QUANTITY_CUSTOM, QUANTITY_ALL);
+  ERSBankDynamicButtons = enum(PLACEHOLDERS, SEARCH, DEPOSIT_INVENTORY, DEPOSIT_WORN);
+
+  TRSItemBankPosition = record
+    Tab: Integer;
+    Scroll: Integer;
+    Box: TBox;
+  end;
+
+  TRSBankItem = record
+    Item: TRSItem;
+    Quantity: Integer;
+    Noted: Boolean;
+  end;
+
+  TRSBankItemArray = array of TRSBankItem;
+
+  TRSBank = record
+    Bounds: TBox;
+    Slots: TRSSlotInterface;
+    Items: TRSItemInterface;
+
+    CachedQuantity: Int32;
+
+    Incenerator, PotionStorage, SlotsArea: TBox;
+
+    Tabs, SlotBoxes: TBoxArray;
+
+    Cache: record
+      Quantity: Integer;
+      Items: TStringMap<TRSItemBankPosition>;
+    end;
+    const QUANTITY_ALL: Integer = -1;
+    const QUANTITY_ALL_BUT_ONE: Integer = -2;
+  end;
+
+(*
+## Bank.FindItemBoundaries
+```pascal
+function TRSBank.FindItemBoundaries(): TBoxArray;
+```
+Finds item boundaries. This is an internal function used to retrieve the boxes we
+search for items in.
+
+Example:
+```pascal
+ShowOnClient(Self.FindItemBoundaries());
+```
+*)
+function TRSBank.FindItemBoundaries(): TBoxArray;
+var
+  tpa, final: TPointArray;
+  atpa: T2DPointArray;
+  b: TBox;
+  color: Int32;
+begin
+  final := Target.FindColor(RSColors.ITEM_BORDER, 0, Self.SlotsArea);
+  if final = [] then Exit;
+
+  for color in RSColors.STACK_COLORS do
+  begin
+    tpa := Target.FindColor(color, 0, Self.SlotsArea);
+    if tpa <> [] then final += tpa;
+  end;
+
+  atpa := final.Cluster(200, 3);
+
+  for tpa in atpa do
+  begin
+    b := tpa.Bounds();
+    if b.Height <= 5 then Continue;
+    Result += TBoxArray.Create([Self.SlotsArea.X1, b.Y1 - 1], 8, 1, 32, 32, [16, 0]);
+  end;
+end;
+
+(*
+## Bank.SetupInterface
+```pascal
+procedure Bank.SetupInterface;
+```
+Initializes Bank interface coordinates.
+
+```{note}
+This is automatically called on the **Bank** variable.
+```
+*)
+procedure TRSBank.SetupInterface();
+begin
+  with InterfaceArea do
+  begin
+    Self.Bounds.X1 := Max(Floor(Center.X-(Width-1)/2), Floor(Center.X-487/2));
+    Self.Bounds.X2 := Min(Floor(Center.X+(Width-1)/2), Floor(Center.X +487/2));
+    Self.Bounds.Y1 := Max(Floor(Center.Y-(Height-3)/2), Floor(Center.Y-799/2));
+    Self.Bounds.Y2 := Min(Floor(Center.Y+(Height-3)/2), Floor(Center.Y+799/2));
+  end;
+
+  Self.Tabs := TBoxArray.Create(Self.Bounds.TopLeft.Offset(47, 42), 10, 1, 35, 28, [5, 0]);
+  Self.SlotBoxes := TBoxArray.Create(Self.Bounds.TopLeft.Offset(57, 77), 8, (Self.Bounds.Height - 135) div 35, 31, 31, [17, 5]);
+
+  Self.SlotsArea.X1 := Self.Bounds.X1 + 57;
+  Self.SlotsArea.Y1 := Self.Bounds.Y1 + 77;
+  Self.SlotsArea.X2 := Self.Bounds.X2 - 63;
+  Self.SlotsArea.Y2 := Self.Bounds.Y2 - 44;
+
+  Self.Incenerator.X1 := Self.Bounds.X1 + 5;
+  Self.Incenerator.Y1 := Self.Bounds.Y2 - 113;
+  Self.Incenerator.X2 := Self.Bounds.X1 + 51;
+  Self.Incenerator.Y2 := Self.Bounds.Y2 - 44;
+
+  Self.PotionStorage.X1 := Self.Bounds.X1 + 8;
+  Self.PotionStorage.Y1 := Self.Bounds.Y2 - 156;
+  Self.PotionStorage.X2 := Self.Bounds.X1 + 51;
+  Self.PotionStorage.Y2 := Self.Bounds.Y2 - 118;
+
+  (*
+  Self.ScrollArea.X1 := Self.Bounds.X1 + 5;
+  Self.ScrollArea.Y1 := Self.Bounds.Y1 + 77;
+  Self.ScrollArea.X2 := Self.Bounds.X2 - 24;
+  Self.ScrollArea.Y2 := Self.Bounds.Y2 - 44;
+  *)
+
+
+  Self.Slots.Setup('Bank.Slots', Self.SlotBoxes, @Self.FindItemBoundaries);
+  Self.Items.Setup('Bank.Items', @Self.Slots, [0, 10, 3, 0]);
+end;
+
+
+
+var
+  Bank: TRSBank;
+

osrs/interfaces/setup.simba

@@ -20,6 +20,7 @@ begin
   RSInterface.SetupInterface();
   XPBar.SetupInterface();
   Prayer.SetupInterface();
+  Bank.SetupInterface();
 end;
 
 function TRSClient.IsLoggedIn(): Boolean; override;

utils/imagecompare.simba

@@ -16,15 +16,16 @@ type
 
   TImageCompareUtils = record
     Clean: procedure (image, template: TImage) of object;
-    Align: procedure (image, template: TImage) of object;
+    Align: function (image, template: TImage): Boolean of object;
     Filter: TImageCompareFilter;
   end;
 
 function TImageCompareUtils.Compare(image, template: TImage; var similarity: Single): Boolean;
 var
   match: Single;
 begin
-  if @Self.Align <> nil then Self.Align(image, template);
+  if @Self.Align <> nil then
+    if not Self.Align(image, template) then Exit;
 
   if (template.Width < image.Width) or (template.Height < image.Height) then
   begin