feat: read notes

- removed simpleocr in favour of the built-in pixelocr. Nothing was tested.
-

Author: Torwent

.github/workflows/version.yml

@@ -8,9 +8,7 @@ on:
 
 jobs:
   version:
-    if: >
-      ${{ github.event.workflow_run.conclusion == 'success' &&
-          github.event.workflow_run.event == 'push' }}  # Only run if Tests succeeded and was triggered by a push
+    if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'push' }}
     runs-on: ubuntu-latest
 
     steps:

osrs/interfaces/chat/chat.simba

@@ -98,7 +98,7 @@ begin
   b.X2 := b.X1 + Self.InputLine.Width div 4;
   b.Y2 := Self.InputLine.Y2;
 
-  Result := OCR.RecognizeStatic(b, TOCRColorFilter.Create([$FFFFFF, $000000]), RSFonts.PLAIN_12);
+  Result := OCR.RecognizeStatic(b, OCR.PLAIN_12, [$FFFFFF, $000000], 0);
 
   if ':' in Result then
     Result := Result.Before(':');
@@ -170,17 +170,13 @@ end;
 
 
 function TRSChat.GetQuery(): String;
-const
-  FILTER: TOCRColorFilter := TOCRColorFilter.Create([$000000]);
 begin
-  Result := OCR.Recognize(Self.Bounds, FILTER, RSFonts.BOLD_12);
+  Result := OCR.Recognize(Self.Bounds, OCR.BOLD, [$0], 0);
 end;
 
 function TRSChat.GetQueryAnswer(): String;
-var
-  FILTER: TOCRColorFilter := TOCRColorFilter.Create([8388608]);
 begin
-  Result := OCR.Recognize(Self.Bounds, FILTER, RSFonts.BOLD_12);
+  Result := OCR.Recognize(Self.Bounds, OCR.BOLD, [$800000], 0);
 end;
 
 function TRSChat.FindQuery(query: String; caseSensitive: Boolean = False): Boolean;
@@ -232,7 +228,7 @@ begin
     tpa += Target.FindColor(colors[i], 0, Self.Bounds);
 
   b := tpa.Bounds();
-  strings := OCR.RecognizeLines(b, TOCRColorFilter.Create(colors), RSFonts.QUILL_8);
+  strings := OCR.RecognizeLines(b, OCR.QUILL_8, colors, 0);
 
   boxes := b.Partition(strings.Length, 1);
 

osrs/interfaces/chooseoption.simba

@@ -36,7 +36,6 @@ Core record responsible with interacting with the choose option context menu.
 *)
   TRSChooseOption = record
     Bounds: TBox;
-    OCRFilter: TOCRInvertColorFilter;
     const TitleImg: TImage = ImageFromString('IMG:AQAAAGYAAAASAAAAAAAAAP21aQABAAAAIKprAAEAAADI5D8BAAAAAM0CAQABAAAAOIe7BgAAAAAApLsGAAAAADQBAACYAQAAOIe7BgAAAAABAAAAZgAAABIAAAAYAAAAAAAAAAAAAAAAAAAAAwAAABgIEAgICAAAAAEAAAIAAAAAAAAAAAAAAAAAAAAAiVBORw0KGgoAAAANSUhEUgAAAGYAAAASCAIAAAAmDjziAAAAzUlEQVR4nO2U0Q2AMAhE3c4F/HX/NYzxo9oWvAO0mkBqoqTA9Qmd1mXORa1pf9IoS2S0JTLaWmRlaK+ed3X1rdU2RkT1eXjOysarvMoA9TwlG+mmLyAzNH4iC0AWcxAcWfce8fjb0sqRdGSenEpUP5BCVu3xvEs4wE63lcOjtEuTHUwnJuXH4hpspf3iSxZJVkglPCcyRGZJkeKlpFGYPMMohRjwRYpvXdTgSN2hDODtfgUfG1s5EfEWZL8zsEkj671X7BlLZLQNQJaLWhvxdfuwwsTSHQAAAABJRU5ErkJggg==');
   end;
 
@@ -108,19 +107,6 @@ begin
   Result := Self.WaitOpen(600);
 end;
 
-(*
-## ChooseOption.Setup
-```pascal
-procedure TRSChooseOption.Setup();
-```
-TRSChooseOption setup method.
-This is responsible for loading the needed bitmaps into memory and is automatically called for you when a script is ran so you
-don't have to call it.
-*)
-procedure TRSChooseOption.Setup();
-begin
-  Self.OCRFilter := TOCRInvertColorFilter.Create([4674653, 0]);
-end;
 
 (*
 ## ChooseOption.GetOptions
@@ -149,7 +135,7 @@ begin
     b.Y2 := b.Y1 + 15;
     if b.Y2 > Self.Bounds.Y2 then Exit;
 
-    Result[i].Text := OCR.RecognizeStatic(b, Self.OCRFilter, RSFonts.BOLD_12_SHADOW);
+    Result[i].Text := OCR.RecognizeStatic(b, OCR.BOLD_SHADOW, [$47545D, $0], 0);
     Result[i].Bounds := b;
   end;
 end;
@@ -221,7 +207,7 @@ begin
     option.Bounds.Y2 := option.Bounds.Y1 + 15;
     if option.Bounds.Y2 > Self.Bounds.Y2 then Exit;
 
-    option.Text := OCR.RecognizeStatic(option.Bounds, Self.OCRFilter, RSFonts.BOLD_12_SHADOW);
+    option.Text := OCR.RecognizeStatic(option.Bounds, OCR.BOLD_SHADOW, [$47545D, $0], 0);
 
     if option.Text.ContainsAny(text, caseSensitive) then
       Exit(True);
@@ -321,6 +307,3 @@ var
 Global TRSChooseOption variable.
 *)
   ChooseOption: TRSChooseOption;
-begin
-  ChooseOption.Setup();
-end;

osrs/interfaces/gametabs/stats.simba

@@ -43,35 +43,13 @@ end;
 (*
 (TRSStats)=
 ## type TRSStats
-```pascal
-TRSStats = record
-  Levels: array [ERSSkill] of Integer;
-  Skills: TBoxArray;
-  StatsOCR, InfoOCR: TOCRColorFilter;
-end;
-```
+Main record used to interact with the stats gametab.
 *)
   TRSStats = record
     Levels: array [ERSSkill] of Integer;
     Skills: TBoxArray;
-    StatsOCR, InfoOCR: TOCRColorFilter;
   end;
 
-(*
-## Stats.Setup()
-```pascal
-procedure TRSStats.Setup(); override;
-```
-Internal method responsible for setting up Stats.
-It's automatically called for you when the file is included.
-*)
-procedure TRSStats.Setup();
-begin
-  Self.StatsOCR := TOCRColorFilter.Create([65535]);
-  Self.InfoOCR := TOCRColorFilter.Create([0]);
-end;
-
-
 (*
 ## Stats.SetupInterface
 ```pascal
@@ -161,7 +139,7 @@ begin
   if lines = [] then Exit;
 
   for i := 0 to High(lines) do
-    lines[i] := OCR.Recognize([b.X1, b.Y1 + (i * 12), b.X2, b.Y1 + ((i+1) * 12) + 3],  Self.InfoOCR, RSFonts.PLAIN_12);
+    lines[i] := OCR.Recognize([b.X1, b.Y1 + (i * 12), b.X2, b.Y1 + ((i+1) * 12) + 3], OCR.PLAIN_12, [0], 0);
 
   if not (ToStr(skill).Capitalize() in lines[0]) then Exit;
 
@@ -220,7 +198,7 @@ begin
   if not Self.Open() then Exit(-1);
 
   with Self.Skills[skill] do
-    Result := OCR.RecognizeNumber([X1, Y2 - (Height div 2), X2, Y2], Self.StatsOCR, RSFonts.PLAIN_11);
+    Result := OCR.RecognizeNumber([X1, Y2 - (Height div 2), X2, Y2], OCR.PLAIN_11, [RSColors.STACK_YELLOW], 0);
 
   if Result > 0 then
     Self.Levels[skill] := Result;
@@ -268,7 +246,3 @@ var
 Global TRSStats variable.
 *)
   Stats: TRSStats;
-
-begin
-  Stats.Setup();
-end;

osrs/interfaces/interface.simba

@@ -43,7 +43,6 @@ end;
 type
   TRSInterfaceTitle = record
     Bounds, CloseButton: TBox;
-    TitleOCR: TOCRInvertColorFilter;
   end;
 
 procedure TRSInterfaceTitle.Setup(const bounds: TBox);
@@ -57,8 +56,6 @@ begin
   Self.CloseButton.Y1 := bounds.Y1+8;
   Self.CloseButton.X2 := bounds.X2-7;
   Self.CloseButton.Y2 := bounds.Y1+28;
-
-  Self.TitleOCR := TOCRInvertColorFilter.Create([3358536, 0], [5, 0]) ;
 end;
 
 
@@ -76,12 +73,12 @@ end;
 
 function TRSInterfaceTitle.GetTitle(): String;
 begin
-  Result := OCR.Recognize(Self.Bounds, Self.TitleOCR, RSFonts.BOLD_12);
+  Result := OCR.Recognize(Self.Bounds, OCR.BOLD, [RSColors.TEXT_ORANGE, $0], 0);
 end;
 
 function TRSInterfaceTitle.IsTitle(const text: String; const similarity: Single = 0.8): Boolean;
 begin
-  Result := OCR.Locate(Self.Bounds, text, RSFonts.BOLD_12, Self.TitleOCR) >= similarity;
+  Result := OCR.LocateInvert(Self.Bounds, text, [$344049,0], 2, OCR.BOLD) >= similarity;
 end;
 
 function TRSInterfaceTitle.WaitTitle(const text: String; const similarity: Single = 0.8; const time: Integer = 600; interval: Integer = -1): Boolean; overload;

osrs/interfaces/login.simba

@@ -6,13 +6,10 @@
 type
   TRSLoginLobby = record
     Bounds, Button: TBox;
-    OCRFilter: TOCRColorFilter;
   end;
 
 procedure TRSLoginLobby.Setup();
 begin
-  Self.OCRFilter := TOCRColorFilter.Create([$FFFFFF]);
-
   Self.Bounds.X1 := Target.Bounds.Width div 2 - 382;
   Self.Bounds.X2 := Target.Bounds.Width div 2 + 382;
   Self.Bounds.Y1 := Target.Bounds.Y1;
@@ -30,7 +27,7 @@ end;
 
 function TRSLoginLobby.IsOpen(): Boolean;
 begin
-  Result := 1 = OCR.Locate(Self.Button, 'CLICK HERE TO PLAY', RSFonts.BOLD_12_SHADOW,Self.OCRFilter);
+  Result := OCR.Locate(Self.Button, 'CLICK HERE TO PLAY', [$FFFFFF], 0, OCR.BOLD_SHADOW) > 0.999;
 end;
 
 function TRSLoginLobby.WaitOpen(const time: Integer = 600; interval: Integer = -1): Boolean;
@@ -67,7 +64,6 @@ type
   TRSLoginWorldSwitcher = record
     Bounds: TBox;
     OpenButton, CancelButton: TBox;
-    CurrentOCRFilter, WorldOCRFilter: TOCRColorFilter;
     CurrentWorld: Integer;
     WorldBoxes: TBoxArray;
 
@@ -76,9 +72,6 @@ type
 
 procedure TRSLoginWorldSwitcher.Setup();
 begin
-  Self.CurrentOCRFilter := TOCRColorFilter.Create([$FFFFFF]);
-  Self.WorldOCRFilter := TOCRColorFilter.Create([$000000, $0000FF]);
-
   Self.Bounds.X1 := Target.Bounds.Width div 2 - 382;
   Self.Bounds.X2 := Target.Bounds.Width div 2 + 382;
   Self.Bounds.Y1 := Target.Bounds.Y1;
@@ -142,7 +135,7 @@ end;
 
 function TRSLoginWorldSwitcher.Read(index: Integer): Integer;
 begin
-  Result := OCR.RecognizeNumber(Self.WorldBoxes[index], Self.WorldOCRFilter, RSFonts.BOLD_12);
+  Result := OCR.RecognizeNumber(Self.WorldBoxes[index], OCR.BOLD, [$000000, $0000FF], 0);
 end;
 
 
@@ -172,7 +165,7 @@ end;
 function TRSLoginWorldSwitcher.GetCurrent(): Integer;
 begin
   if not Self.Close() then Exit;
-  Result := OCR.RecognizeNumber(Self.OpenButton, Self.CurrentOCRFilter, RSFonts.BOLD_12_SHADOW);
+    Result := OCR.RecognizeNumber(Self.OpenButton, OCR.BOLD_SHADOW, [$FFFFFF], 0);
   if InRange(Self.CurrentWorld, 301, 580) then Self.CurrentWorld := Result;
 end;
 
@@ -181,7 +174,7 @@ function TRSLoginWorldSwitcher.Find(world: Integer; out index: Integer): Boolean
 begin
   repeat
     for index := 0 to High(Self.WorldBoxes) do
-      if OCR.RecognizeNumber(Self.WorldBoxes[index], Self.WorldOCRFilter, RSFonts.BOLD_12) = world then
+      if OCR.RecognizeNumber(Self.WorldBoxes[index], OCR.BOLD, [$000000, $0000FF], 0) = world then
         Exit(True);
   until not Self.NextPage();
 
@@ -249,9 +242,7 @@ type
   TRSLogin = record
     Lobby: TRSLoginLobby;
     WorldSwitcher: TRSLoginWorldSwitcher;
-
     Bounds: TBox;
-    WhiteOCR, YellowOCR: TOCRColorFilter;
 
     Inputs: array [ERSLoginInput] of TBox;
     Buttons: array [ERSLoginButton] of record
@@ -270,9 +261,6 @@ begin
   Self.WorldSwitcher.Setup();
   Self.Lobby.Setup();
 
-  Self.WhiteOCR := TOCRColorFilter.Create([$FFFFFF]);
-  Self.YellowOCR := TOCRColorFilter.Create([$00FFFF]);
-
   Self.Bounds.X1 := Target.Bounds.Width div 2 - 176;
   Self.Bounds.Y1 := Target.Bounds.Y1 + 172;
   Self.Bounds.X2 := Target.Bounds.Width div 2 + 176;
@@ -354,9 +342,9 @@ begin
   end;
 
   if Self.Buttons[button].Bold then
-    Result := Self.Buttons[button].Text = OCR.Recognize(Self.Buttons[button].Bounds, Self.WhiteOCR, RSFonts.BOLD_12_SHADOW)
-  else
-    Result := Self.Buttons[button].Text = OCR.Recognize(Self.Buttons[button].Bounds, Self.WhiteOCR, RSFonts.PLAIN_12);
+    Exit(Self.Buttons[button].Text = OCR.Recognize(Self.Buttons[button].Bounds, OCR.BOLD_SHADOW, [$FFFFFF], 0));
+
+  Result := Self.Buttons[button].Text = OCR.Recognize(Self.Buttons[button].Bounds, OCR.PLAIN_12, [$FFFFFF], 0);
 end;
 
 function TRSLogin.ClickButton(button: ERSLoginButton): Boolean;
@@ -410,9 +398,9 @@ function TRSLogin.GetMessage(): ERSLoginMessage;
 var
   dialog: String;
 begin
-  dialog := OCR.RecognizeLines(Self.Bounds, Self.YellowOCR, RSFonts.BOLD_12_SHADOW).Join(' ');
+  dialog := OCR.RecognizeLines(Self.Bounds, OCR.BOLD_SHADOW, [$00FFFF], 0).Join(' ');
   if dialog = '' then
-    dialog := OCR.RecognizeLines(Self.Bounds, Self.WhiteOCR, RSFonts.BOLD_12_SHADOW).Join(' ');
+    dialog := OCR.RecognizeLines(Self.Bounds, OCR.BOLD_SHADOW, [$FFFFFF], 0).Join(' ');
   if dialog = '' then Exit;
 
   for Result := ERSLoginMessage.WELCOME to High(ERSLoginMessage)-1 do

osrs/interfaces/mainscreen/mainscreen.simba

@@ -17,16 +17,17 @@ type
     TopLeft, TopRight, BottomRight, BottomLeft: TPoint;
 
     UpTextImageBuffer: TImage;
-    UpTextBox: TBox;
-    UpTextFilter: TOCRFilter;
+    UptextBounds: TBox;
+    UptextOCR: TPixelOCR;
 
     HighestPitch: Boolean;
   end;
 
 procedure TRSMainScreen.Setup();
 begin
-  Self.UptextFilter := TOCRAnyColorFilter.Create(85, 60);
-  Self.UptextFilter.Blacklist := ',.'+#39+#34;
+  Self.UptextOCR.Tolerance := 25;
+  Self.UptextOCR.ShadowTolerance := 65;
+  Self.UptextOCR.Whitelist := ['a'..'z', 'A'..'Z', '0'..'9', '-', '>', '(', ')', '/'];
 end;
 
 procedure TRSMainScreen.SetupInterface();
@@ -44,20 +45,20 @@ begin
   Self.BottomRight := Self.Bounds.BottomRight;
   Self.BottomLeft  := Self.Bounds.BottomLeft;
 
-  Self.UpTextBox.X1 := Self.Bounds.X1 + 3;
-  Self.UpTextBox.Y1 := Self.Bounds.Y1 + 3;
-  Self.UpTextBox.X2 := Self.Bounds.X1 + 500;
-  Self.UpTextBox.Y2 := Self.Bounds.Y1 + 21;
+  Self.UptextBounds.X1 := Self.Bounds.X1 + 3;
+  Self.UptextBounds.Y1 := Self.Bounds.Y1 + 3;
+  Self.UptextBounds.X2 := Self.Bounds.X1 + 500;
+  Self.UptextBounds.Y2 := Self.Bounds.Y1 + 21;
 end;
 
 
 function TRSMainScreen.GetUpText(): String;
+var
+  img: TImage;
 begin
-   if RSClient.Mode = ERSClientMode.FIXED then
-    Result := OCR.RecognizeStatic(Self.UpTextBox, Self.UptextFilter, RSFonts.BOLD_12_SHADOW)
-  else
-    Result := OCR.RecognizeStatic(Self.UpTextBox, Self.UptextFilter, RSFonts.BOLD_12_SHADOW);
-
+  img := TImage.CreateFromTarget(Self.UptextBounds);
+  Result := Self.UptextOCR.Recognize(img, OCR.BOLD_SHADOW, [0,0]);
+  img.Free();
   {$IFDEF DEBUG_UPTEXT}
   WriteLn GetDebugLn('MainScreen', 'UpText: ' + Result);
   {$ENDIF}

osrs/interfaces/minimap.simba

@@ -21,8 +21,6 @@ type
     Center: TPoint;
     Polygon: TPolygon;
 
-    OrbOCR: TOCRShadowFilter;
-
     Compass: record
       PreviousRadians: Single;
       Circle: TCircle;
@@ -270,7 +268,6 @@ begin
   until GetTickCount() > timeout;
 
   WriteLn GetDebugLn('Minimap', 'SetCompassAngle timed out.', EErrorLevel.WARN);
-
   //TODO:
   //if not RSClient.IsLoggedIn() then
   //  Login.LoginPlayer()
@@ -306,7 +303,9 @@ WriteLn Minimap.GetLevel(ERSMinimapOrb.PRAYER);
 *)
 function TRSMinimap.GetLevel(orb: ERSMinimapOrb): Integer;
 begin
-  Result := OCR.RecognizeNumber([Self.Orbs[orb].X-35, Self.Orbs[orb].Y-1, Self.Orbs[orb].X-15, Self.Orbs[orb].Y+9], Self.OrbOCR, RSFonts.PLAIN_11);
+  raise GetDebugLn('Minimap.GetLevel' , 'TODO');
+  //TODO:
+  //Result := OCR.RecognizeNumber([Self.Orbs[orb].X-35, Self.Orbs[orb].Y-1, Self.Orbs[orb].X-15, Self.Orbs[orb].Y+9], Self.OrbOCR, RSFonts.PLAIN_11);
 end;
 
 
@@ -750,7 +749,3 @@ var
 Global TRSMinimap variable.
 *)
   Minimap: TRSMinimap;
-
-begin
-  Minimap.OrbOCR := TOCRShadowFilter.Create();
-end;