SimpleOCR update

osr/antiban.simba

@@ -608,7 +608,7 @@ begin
   begin
     B := Box(MainScreen.Center, 250, 100);
 
-    if OCR.LocateText(B, Name, RS_FONT_BOLD_12, TOCRColorRule.Create([$00FFFF, 0]), 0.85) then
+    if OCR.LocateText(B, Name, RS_FONT_BOLD_12, TOCRColorFilter.Create([$00FFFF, 0]), 0.85) then
     begin
       if Self.DebugRandoms then
       begin

osr/bank.simba

@@ -592,9 +592,9 @@ begin
   TPA := ATPA[0];
 
   //Now we run OCR on the number TPA to find out what number is it and set our result
-  Result := OCR.RecognizeNumber(TPA.Bounds, TOCRColorRule.Create([10672356]), RS_FONT_PLAIN_11);
+  Result := OCR.RecognizeNumber(TPA.Bounds, TOCRColorFilter.Create([10672356]), RS_FONT_PLAIN_11);
   if Result = 0 then
-    Result := OCR.RecognizeNumber(TPA.Bounds, TOCRColorRule.Create([16777215]), RS_FONT_PLAIN_11);
+    Result := OCR.RecognizeNumber(TPA.Bounds, TOCRColorFilter.Create([16777215]), RS_FONT_PLAIN_11);
 
   if (Result > 0) and OpenTab then
     Self.OpenTab(Result);

osr/bankpin.simba

@@ -74,10 +74,10 @@ function TRSBankPin.Enter(Pin: String): Boolean;
 
   function GetDigitToEnter: Char;
   begin 
-    if OCR.LocateText(Self.Bounds, 'FIRST',  RS_FONT_BOLD_12, TOCRColorRule.Create([$FFFFFF]), 1) then Exit(Pin[1]);
-    if OCR.LocateText(Self.Bounds, 'SECOND', RS_FONT_BOLD_12, TOCRColorRule.Create([$FFFFFF]), 1) then Exit(Pin[2]);
-    if OCR.LocateText(Self.Bounds, 'THIRD',  RS_FONT_BOLD_12, TOCRColorRule.Create([$FFFFFF]), 1) then Exit(Pin[3]);
-    if OCR.LocateText(Self.Bounds, 'FOURTH', RS_FONT_BOLD_12, TOCRColorRule.Create([$FFFFFF]), 1) then Exit(Pin[4]);
+    if OCR.LocateText(Self.Bounds, 'FIRST',  RS_FONT_BOLD_12, TOCRColorFilter.Create([$FFFFFF]), 1) then Exit(Pin[1]);
+    if OCR.LocateText(Self.Bounds, 'SECOND', RS_FONT_BOLD_12, TOCRColorFilter.Create([$FFFFFF]), 1) then Exit(Pin[2]);
+    if OCR.LocateText(Self.Bounds, 'THIRD',  RS_FONT_BOLD_12, TOCRColorFilter.Create([$FFFFFF]), 1) then Exit(Pin[3]);
+    if OCR.LocateText(Self.Bounds, 'FOURTH', RS_FONT_BOLD_12, TOCRColorFilter.Create([$FFFFFF]), 1) then Exit(Pin[4]);
   end;
 
 var

osr/chat.simba

@@ -148,7 +148,7 @@ var
 begin
   for Color in Colors do
   begin
-    Result := OCR.RecognizeStatic(Self.GetLineBoxes()[CHAT_INPUT_LINE], TOCRColorRule.Create([Color]), RS_FONT_PLAIN_12);
+    Result := OCR.RecognizeStatic(Self.GetLineBoxes()[CHAT_INPUT_LINE], TOCRColorFilter.Create([Color]), RS_FONT_PLAIN_12);
     if Result <> '' then
       Break;
   end;
@@ -206,7 +206,7 @@ Example
 *)
 function TRSChat.GetQuery: String;
 begin
-  Result := OCR.Recognize(Self.Bounds(), TOCRColorRule.Create([$000000]), RS_FONT_BOLD_12);
+  Result := OCR.Recognize(Self.Bounds(), TOCRColorFilter.Create([$000000]), RS_FONT_BOLD_12);
 end;
 
 (*
@@ -223,7 +223,7 @@ Example
 *)
 function TRSChat.GetQueryAnswer: String;
 begin
-  Result := OCR.Recognize(Self.Bounds(), TOCRColorRule.Create([8388608]), RS_FONT_BOLD_12);
+  Result := OCR.Recognize(Self.Bounds(), TOCRColorFilter.Create([8388608]), RS_FONT_BOLD_12);
 end;
 
 (*
@@ -291,7 +291,7 @@ var
   Boxes: TBoxArray;
   I, Key: Int32;
 begin
-  Strings := OCR.RecognizeMulti(Self.Bounds(), TOCRColorRule.Create(Colors), RS_FONT_QUILL_8, Boxes);
+  Strings := OCR.RecognizeLines(Self.Bounds(), TOCRColorFilter.Create(Colors), RS_FONT_QUILL_8, Boxes);
 
   SetLength(Result, Length(Strings));
   for I := 0 to High(Result) do
@@ -437,7 +437,7 @@ begin
         if (Matrix[StaticOffset][X] = CHAT_COLOR_BLACK) theN
           Matrix[StaticOffset][X] := Colors[0];
 
-    Result := OCR.RecognizeStatic(Matrix, TOCRColorRule.Create(Colors), RS_FONT_PLAIN_12);
+    Result := OCR._RecognizeStatic(Matrix, TOCRColorFilter.Create(Colors), RS_FONT_PLAIN_12);
   end;
 end;
 

osr/chooseoption.simba

@@ -100,7 +100,7 @@ begin
       if (B.Y2 > Bounds.Y2) then
         Exit;
 
-      Result[I].Text := OCR.RecognizeStatic(B, TOCRThresholdRule.Create(-1), RS_FONT_BOLD_12_SHADOW);
+      Result[I].Text := OCR.RecognizeStatic(B, TOCRThresholdFilter.Create(-1), RS_FONT_BOLD_12_SHADOW);
       Result[I].Bounds := B;
     end;
   end;

osr/combat.simba

@@ -278,7 +278,7 @@ begin
   B := Self.Bounds;
   B.Y2 := B.Y1 + 25;
 
-  Result := OCR.Recognize(B, TOCRColorRule.Create([2070783]), RS_FONT_QUILL_8);
+  Result := OCR.Recognize(B, TOCRColorFilter.Create([2070783]), RS_FONT_QUILL_8);
 end;
 
 (*
@@ -307,7 +307,7 @@ begin
   B.X1 += 20;
   B.X2 -= 20;
 
-  Result := OCR.RecognizeNumber(B, TOCRColorRule.Create([2070783]), RS_FONT_PLAIN_11);
+  Result := OCR.RecognizeNumber(B, TOCRColorFilter.Create([2070783]), RS_FONT_PLAIN_11);
 end;
 
 (*

osr/grandexchange.simba

@@ -198,8 +198,8 @@ begin
   B.Y2 := Self.Y1 + 65;
 
   case Self.GetCurrentInterface() of
-    ERSGEInterface.OFFER_SETUP:  Result := OCR.Recognize(B, TOCRColorRule.Create([2070783]), RS_FONT_BOLD_12);
-    ERSGEInterface.OFFER_STATUS: Result := OCR.Recognize(B, TOCRColorRule.Create([2070783]), RS_FONT_BOLD_12);
+    ERSGEInterface.OFFER_SETUP:  Result := OCR.Recognize(B, TOCRColorFilter.Create([2070783]), RS_FONT_BOLD_12);
+    ERSGEInterface.OFFER_STATUS: Result := OCR.Recognize(B, TOCRColorFilter.Create([2070783]), RS_FONT_BOLD_12);
   end;
 end;
 
@@ -213,7 +213,7 @@ begin
   end;
 
   if Button.Visible() then
-    Result := OCR.RecognizeNumber(Button.Bounds, TOCRColorRule.Create([4176127]), RS_FONT_PLAIN_11);
+    Result := OCR.RecognizeNumber(Button.Bounds, TOCRColorFilter.Create([4176127]), RS_FONT_PLAIN_11);
 end;
 
 function TRSGrandExchange.GetItemPrice: Int32;
@@ -226,7 +226,7 @@ begin
   end;
 
   if Button.Visible() then
-    Result := OCR.RecognizeNumber(Button.Bounds,  TOCRColorRule.Create([4176127]), RS_FONT_PLAIN_11);
+    Result := OCR.RecognizeNumber(Button.Bounds,  TOCRColorFilter.Create([4176127]), RS_FONT_PLAIN_11);
 end;
 
 function TRSGrandExchange.GetItemTotalPrice: Int32;
@@ -239,7 +239,7 @@ begin
   end;
 
   if Button.Visible() then
-    Result := OCR.RecognizeNumber(Button.Bounds,  TOCRColorRule.Create([$FFFFFF]), RS_FONT_PLAIN_11);
+    Result := OCR.RecognizeNumber(Button.Bounds,  TOCRColorFilter.Create([$FFFFFF]), RS_FONT_PLAIN_11);
 end;
 
 function TRSGrandExchange.GetItemGuidePrice: Int32;
@@ -259,13 +259,13 @@ begin
     B.Y2 += 20;
     B.X2 += 40;
 
-    Result := OCR.RecognizeNumber(B,  TOCRColorRule.Create([4176127]), RS_FONT_PLAIN_11);
+    Result := OCR.RecognizeNumber(B,  TOCRColorFilter.Create([4176127]), RS_FONT_PLAIN_11);
   end;
 end;
 
 function TRSGrandExchange.IsSearchOpen: Boolean;
 begin
-  Result := OCR.LocateText(Chat.Bounds, 'What would you like to buy', RS_FONT_BOLD_12, TOCRColorRule.Create([$000000]), 1);
+  Result := OCR.LocateText(Chat.Bounds, 'What would you like to buy', RS_FONT_BOLD_12, TOCRColorFilter.Create([$000000]), 1);
 end;
 
 function TRSGrandExchange.OpenSearch: Boolean;
@@ -279,7 +279,7 @@ end;
 
 function TRSGrandExchange.GetCurrentSearch: String;
 begin
-  Result := OCR.Recognize(Chat.Bounds,  TOCRColorRule.Create([8388608]), RS_FONT_BOLD_12).StripR('*');
+  Result := OCR.Recognize(Chat.Bounds,  TOCRColorFilter.Create([8388608]), RS_FONT_BOLD_12).StripR('*');
 end;
 
 function TRSGrandExchange.ClearSearch: Boolean;
@@ -295,14 +295,14 @@ begin
   if (Item <> '') then
     Item[1] := UpCase(Item[1]);
 
-  Result := OCR.LocateText(Chat.Bounds, Item, RS_FONT_PLAIN_12,  TOCRColorRule.Create([$000000]), B) = 1;
+  Result := OCR.LocateText(Chat.Bounds, Item, RS_FONT_PLAIN_12,  TOCRColorFilter.Create([$000000]), B) = 1;
 end;
 
 function TRSGrandExchange.ClickSearch(Item: String): Boolean;
 var
   B: TBox;
 begin
-  Result := Self.IsSearchOpen() and (OCR.LocateText(Chat.Bounds, Item, RS_FONT_PLAIN_12,  TOCRColorRule.Create([$000000]), B) = 1);
+  Result := Self.IsSearchOpen() and (OCR.LocateText(Chat.Bounds, Item, RS_FONT_PLAIN_12,  TOCRColorFilter.Create([$000000]), B) = 1);
   if Result then
     Mouse.Click(B, MOUSE_LEFT);
 end;
@@ -311,7 +311,7 @@ function TRSGrandExchange.Search(Item: String; Click: Boolean): Boolean;
 var
   B: TBox;
 begin
-  if OCR.LocateText(Chat.Bounds, Item, RS_FONT_BOLD_12, TOCRColorRule.Create([8388608]), 1) then
+  if OCR.LocateText(Chat.Bounds, Item, RS_FONT_BOLD_12, TOCRColorFilter.Create([8388608]), 1) then
     Exit(True);
 
   if Self.OpenSearch() and Self.ClearSearch() then
@@ -358,16 +358,16 @@ var
 begin
   Slots := Self.GetOfferSlots();
 
-  case OCR.Recognize(Slots[Slot], TOCRColorRule.Create([2070783]), RS_FONT_BOLD_12) of
+  case OCR.Recognize(Slots[Slot], TOCRColorFilter.Create([2070783]), RS_FONT_BOLD_12) of
     'Empty': Result.OfferType := ERSGEOfferType.EMPTY;
     'Buy':   Result.OfferType := ERSGEOfferType.BUY;
     'Sell':  Result.OfferType := ERSGEOfferType.SELL;
   end;
 
   if (Result.OfferType <> ERSGEOfferType.EMPTY) then
   begin
-    Result.Item := OCR.RecognizeMulti(Slots[Slot], TOCRColorRule.Create([4176127]), RS_FONT_PLAIN_11).Merge(' ');
-    Result.PricePerItem := OCR.RecognizeNumber(Slots[Slot], TOCRColorRule.Create([2070783]), RS_FONT_PLAIN_11);
+    Result.Item := OCR.RecognizeLines(Slots[Slot], TOCRColorFilter.Create([4176127]), RS_FONT_PLAIN_11).Merge(' ');
+    Result.PricePerItem := OCR.RecognizeNumber(Slots[Slot], TOCRColorFilter.Create([2070783]), RS_FONT_PLAIN_11);
     Result.Quantity := SRL.GetItemAmount(Slots[Slot]);
     Result.TotalPrice := Result.Quantity * Result.PricePerItem;
     Result.Progress := Self.GetProgress(Slots[Slot], 105);
@@ -409,15 +409,15 @@ begin
 
     Item := [];
     Item.Bounds := Row;
-    Item.Item := OCR.Recognize(Columns[1].Expand(25, 0), TOCRColorRule.Create([4176127, $FFFFFF]), RS_FONT_PLAIN_12);
+    Item.Item := OCR.Recognize(Columns[1].Expand(25, 0), TOCRColorFilter.Create([4176127, $FFFFFF]), RS_FONT_PLAIN_12);
     if (Item.Item = '') then
       Continue;
 
     Item.Quantity := SRL.GetItemAmount(Columns[2]);
     if (Item.Quantity = 0) Then
       Item.Quantity := 1;
 
-    Item.TotalPrice := OCR.RecognizeNumber(Columns[3], TOCRColorRule.Create([2070783]), RS_FONT_PLAIN_11);
+    Item.TotalPrice := OCR.RecognizeNumber(Columns[3], TOCRColorFilter.Create([2070783]), RS_FONT_PLAIN_11);
     Item.PricePerItem := Item.TotalPrice div Item.Quantity;
 
     Result := Result + Item;

osr/interface.simba

@@ -362,12 +362,12 @@ end;
 
 function TRSButton.FindText(constref Text: String; constref Font: TFontSet; Color: Int32): Boolean; constref; overload;
 begin
-  Result := OCR.LocateText(Self.Bounds, Text, Font, TOCRColorRule.Create([Color]), 1);
+  Result := OCR.LocateText(Self.Bounds, Text, Font, TOCRColorFilter.Create([Color]), 1);
 end;
 
 function TRSButton.FindText(constref Text: String; constref Font: TFontSet): Boolean; constref; overload;
 begin
-  Result := OCR.LocateText(Self.Bounds, Text, Font, TOCRAnyColorRule.Create(0), 1);
+  Result := OCR.LocateText(Self.Bounds, Text, Font, TOCRColorFilter.Create([0]), 1);
 end;
 
 function TRSButton.FindText(Text: TStringArray; constref Font: TFontSet; out Found: String): Boolean; constref; overload;
@@ -521,7 +521,7 @@ begin
   B.Y2 := B.Y1 + 15;
   B.LimitTo(Self.Bounds);
 
-  Result := OCR.Recognize(B, TOCRThresholdRule.Create(15), RS_FONT_BOLD_12);
+  Result := OCR.Recognize(B, TOCRThresholdFilter.Create(15), RS_FONT_BOLD_12);
 end;
 
 function TRSTitledInteface.ClickCloseButton(PressEscape: Boolean = False): Boolean;

osr/login.simba

@@ -160,10 +160,10 @@ You probably will never to use this directly.
 *)
 function TRSLogin.FindText(Text: String; out B: TBox): Boolean;
 begin
-  Result := (OCR.LocateText(Self.Bounds, Text, RS_FONT_BOLD_12,  TOCRColorRule.Create([$FFFFFF]), B) = 1) or
-            (OCR.LocateText(Self.Bounds, Text, RS_FONT_BOLD_12,  TOCRColorRule.Create([$00FFFF]), B) = 1) or
-            (OCR.LocateText(Self.Bounds, Text, RS_FONT_PLAIN_12, TOCRColorRule.Create([$FFFFFF]), B) = 1) or
-            (OCR.LocateText(Self.Bounds, Text, RS_FONT_PLAIN_11, TOCRColorRule.Create([$FFFFFF]), B) = 1);
+  Result := (OCR.LocateText(Self.Bounds, Text, RS_FONT_BOLD_12,  TOCRColorFilter.Create([$FFFFFF]), B) = 1) or
+            (OCR.LocateText(Self.Bounds, Text, RS_FONT_BOLD_12,  TOCRColorFilter.Create([$00FFFF]), B) = 1) or
+            (OCR.LocateText(Self.Bounds, Text, RS_FONT_PLAIN_12, TOCRColorFilter.Create([$FFFFFF]), B) = 1) or
+            (OCR.LocateText(Self.Bounds, Text, RS_FONT_PLAIN_11, TOCRColorFilter.Create([$FFFFFF]), B) = 1);
 end;
 
 function TRSLogin.FindText(Text: String): Boolean; overload;
@@ -203,7 +203,7 @@ function TRSLogin.ClickWorld(World: Int32): Boolean;
 var
   B: TBox;
 begin
-  Result := OCR.LocateText(Self.Bounds, ToString(World), RS_FONT_BOLD_12, TOCRColorRule.Create([$000000]), B) = 1;
+  Result := OCR.LocateText(Self.Bounds, ToString(World), RS_FONT_BOLD_12, TOCRColorFilter.Create([$000000]), B) = 1;
 
   if Result then 
   begin
@@ -309,7 +309,7 @@ begin
   begin
     B.Y1 -= 25;
 
-    Result := OCR.RecognizeNumber(B, TOCRColorRule.Create([$FFFFFF]), RS_FONT_BOLD_12);
+    Result := OCR.RecognizeNumber(B, TOCRColorFilter.Create([$FFFFFF]), RS_FONT_BOLD_12);
   end;
 end;
 

osr/mainscreen.simba

@@ -143,8 +143,9 @@ type
   end;
 
   TRSMainScreen = record(TRSInterface)
+    UpTextBitmapBuffer: TMufasaBitmap;
     UpTextArea: TBox;
-    UpTextFilter: TCompareRules;
+    UpTextFilter: TOCRFilter;
 
     YellowClicks: TIntegerArray;
     RedClicks: TIntegerArray;
@@ -154,6 +155,7 @@ procedure TRSMainScreen.Free;
 var
   Bitmap: Int32;
 begin
+  Self.UpTextBitmapBuffer.Free();
   for Bitmap in Self.YellowClicks + Self.RedClicks do
     FreeBitmap(Bitmap);
 end;
@@ -175,7 +177,8 @@ begin
 
   Self.Name := 'MainScreen';
 
-  Self.UpTextFilter := TOCRAnyColorRule.Create(85, 60);
+  Self.UpTextBitmapBuffer.Init(Client.GetMBitmaps());
+  Self.UpTextFilter := TOCRAnyColorFilter.Create(85, 65);
   Self.UpTextFilter.MinCharacterMatch := '-';
 
   Self.YellowClicks := [
@@ -237,8 +240,16 @@ Example
   WriteLn(MainScreen.GetUpText());
 *)
 function TRSMainScreen.GetUpText(): String;
+var
+  Bitmap: TMufasaBitmap;
 begin
-  Result := OCR.RecognizeStatic(Self.UpTextArea, Self.UpTextFilter, RS_FONT_BOLD_12_SHADOW);
+  with Self.UpTextArea do
+    Self.UpTextBitmapBuffer.CopyClientToBitmap(Client.GetIOManager(), True, X1,Y1,X2,Y2);
+
+  // improve when bankscreen (and other interfaces) are open
+  // replace orange title text with interface background color
+  Self.UpTextBitmapBuffer.ReplaceColor(2070783, 3424329);
+  Result := OCR._RecognizeStatic(Self.UpTextBitmapBuffer.ToMatrix(), Self.UpTextFilter, RS_FONT_BOLD_12_SHADOW);
 
   {$IFDEF SRL_DEBUG_UPTEXT}
   Self.DebugLn('UpText: ' + Result);
@@ -611,7 +622,7 @@ function TRSMainScreen.FindHitsplats(Area: TBox): TRSHitsplatArray;
     for B in TPA.Cluster(3).ToTBA() do
       if (B.Width >= 10) and (B.Height >= 10) then
       begin
-        Hit := OCR.RecognizeNumber(B.Expand(5, Area), TOCRColorRule.Create([$FFFFFF]), RS_FONT_PLAIN_11);
+        Hit := OCR.RecognizeNumber(B.Expand(5, Area), TOCRColorFilter.Create([$FFFFFF]), RS_FONT_PLAIN_11);
 
         Result += [B.Middle(), Hit, Red];
       end;

osr/make.simba

@@ -353,7 +353,7 @@ begin
     if not WaitUntil((TPA := Self.FindHint()) <> [], SRL.TruncatedGauss(50, 1500), 4000) then
       Continue;
 
-    if SameText(OCR.Recognize(TPA.Bounds(), TOCRColorRule.Create([0]), RS_FONT_PLAIN_12), Item) then
+    if SameText(OCR.Recognize(TPA.Bounds(), TOCRColorFilter.Create([0]), RS_FONT_PLAIN_12), Item) then
     begin
       Self.Items += [Item, Buttons[I].Index , 0];
 

osr/minimap.simba

@@ -55,7 +55,7 @@ end;
 
 function TRSMinimap.GetOrbLevel(Orb: TCircle): Int32;
 begin
-  Result := OCR.RecognizeNumber([Orb.X-35, Orb.Y-1, Orb.X-15, Orb.Y+9], TOCRShadowRule.Create(), RS_FONT_PLAIN_11);
+  Result := OCR.RecognizeNumber([Orb.X-35, Orb.Y-1, Orb.X-15, Orb.Y+9], TOCRShadowFilter.Create(), RS_FONT_PLAIN_11);
 end;
 
 function TRSMinimap.GetRunEnergy: Int32;

osr/misc.simba

@@ -62,13 +62,13 @@ get the number of stacked items there are.
 function TSRL.GetItemAmount(constref Area: TBox): Int32; constref;
 begin
   if SRL.CountColor(RS_ITEM_YELLOW_STACK, Area) > 0 then
-    Result := OCR.RecognizeNumber(Area, TOCRColorRule.Create([RS_ITEM_YELLOW_STACK]), RS_FONT_PLAIN_11)
+    Result := OCR.RecognizeNumber(Area, TOCRColorFilter.Create([RS_ITEM_YELLOW_STACK]), RS_FONT_PLAIN_11)
   else
   if SRL.CountColor(RS_ITEM_WHITE_STACK, Area) > 0 then
-    Result := OCR.RecognizeNumber(Area, TOCRColorRule.Create([RS_ITEM_WHITE_STACK]), RS_FONT_PLAIN_11) * 1000
+    Result := OCR.RecognizeNumber(Area, TOCRColorFilter.Create([RS_ITEM_WHITE_STACK]), RS_FONT_PLAIN_11) * 1000
   else
   if SRL.CountColor(RS_ITEM_GREEN_STACK, Area) > 0 then
-    Result := OCR.RecognizeNumber(Area, TOCRColorRule.Create([RS_ITEM_GREEN_STACK]), RS_FONT_PLAIN_11) * 1000000;
+    Result := OCR.RecognizeNumber(Area, TOCRColorFilter.Create([RS_ITEM_GREEN_STACK]), RS_FONT_PLAIN_11) * 1000000;
 end;
 
 (*

osr/prayer.simba

@@ -106,7 +106,7 @@ begin
 
   if (GameTabs.GetCurrentTab() = ERSGameTab.PRAYER) then
   begin
-    Text := OCR.Recognize(Self.Bounds, TOCRColorRule.Create([$1F98FF]), RS_FONT_PLAIN_12); 
+    Text := OCR.Recognize(Self.Bounds, TOCRColorFilter.Create([$1F98FF]), RS_FONT_PLAIN_12); 
 
     Result := Text.Before('/').ExtractNumber();
   end;