feat(FairyRing): unfinished, read notes

- added unfinished fairy ring interface
- `RSColors.TEXT_` constants have been moved into `RSFonts`
- Disable range checks for webgraph gen
- More tweaks to walker

Author: Torwent

osrs.simba

@@ -97,6 +97,7 @@ Summary: It includes this file until the current file is reached.
 
 {$IFNDEF WL_ANTIBAN_INCLUDED}               {$INCLUDE_ONCE osrs/antiban/antiban.simba}
 
+{$IFNDEF WL_FAIRYRING_INCLUDED}             {$INCLUDE_ONCE osrs/interfaces/mainscreen/fairyring.simba}
 {$IFNDEF WL_WALKER_INCLUDED}                {$INCLUDE_ONCE osrs/walker.simba}
 {$IFNDEF WL_COLORFINDER_INCLUDED}           {$INCLUDE_ONCE osrs/interfaces/mainscreen/finders/colorfinder.simba}
 
@@ -145,7 +146,7 @@ Summary: It includes this file until the current file is reached.
 {$IFNDEF WL_SETUP_INCLUDED}                 {$INCLUDE_ONCE osrs/interfaces/setup.simba}
 {$IFNDEF WL_OVERRIDES_INCLUDED}             {$INCLUDE_ONCE osrs/overrides.simba}
 
-{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}
+{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}
 {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}
 {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}
 {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}

osrs/interfaces/chat/chat.simba

@@ -48,7 +48,7 @@ Main record used to interact with the {ref}`Chat` interface.
     MessageLines: TBoxArray;
     InputLine: TBox;
     ReportButton: TRSButton;
-    const Colors: array [ERSChatColor] of TColor = [RSColors.TEXT_BLACK, $7F0000, $FF0000, $7F007F, $2010EF, RSColors.TEXT_RED, RSColors.TEXT_WHITE, $FF9090, RSColors.TEXT_DARK_BLUE, $005F00];
+    Colors: TColorArray;
   end;
 
 (*
@@ -86,6 +86,8 @@ begin
   Self.Scroll.Area.Y2 := Self.InputLine.Y1 - 1;
 
   Self.Scroll.Setup();
+
+  Self.Colors := [RSFonts.BLACK, $7F0000, $FF0000, $7F007F, $2010EF, RSFonts.RED, RSFonts.WHITE, $FF9090, RSFonts.DARK_BLUE, $005F00];
 end;
 
 (*
@@ -340,7 +342,7 @@ WriteLn Chat.GetQueryAnswer();
 *)
 function TRSChat.GetQueryAnswer(): String;
 begin
-  Result := OCR.Recognize(Self.Bounds, RSFonts.BOLD, [RSColors.TEXT_DARK_BLUE], 0);
+  Result := OCR.Recognize(Self.Bounds, RSFonts.BOLD, [RSFonts.DARK_BLUE], 0);
 end;
 
 (*

osrs/interfaces/chat/make.simba

@@ -282,13 +282,13 @@ begin
 
   if quantity = ERSItemQuantity.CUSTOM then
   begin
-    if amount = OCR.RecognizeNumber(Self.QuantityButtons[2], RSFonts.PLAIN_11, [Self.TEXT_COLOR, RSColors.TEXT_WHITE], 0) then
+    if amount = OCR.RecognizeNumber(Self.QuantityButtons[2], RSFonts.PLAIN_11, [Self.TEXT_COLOR, RSFonts.WHITE], 0) then
       Exit(2);
     Exit(1);
   end;
 
   for i := 1 to High(Self.QuantityButtons) do
-    if amount = OCR.RecognizeNumber(Self.QuantityButtons[i], RSFonts.PLAIN_11, [Self.TEXT_COLOR, RSColors.TEXT_WHITE], 0) then
+    if amount = OCR.RecognizeNumber(Self.QuantityButtons[i], RSFonts.PLAIN_11, [Self.TEXT_COLOR, RSFonts.WHITE], 0) then
       Exit(i);
   Result := -1;
 end;
@@ -307,7 +307,7 @@ WriteLn Make.IsQuantitySelected(Make.QUANTITY_ALL);
 *)
 function TRSMake.IsQuantitySelected(idx: Integer): Boolean;
 begin
-  Result := Target.HasColor(RSColors.TEXT_WHITE, 0, 1, Self.QuantityButtons[idx]);
+  Result := Target.HasColor(RSFonts.WHITE, 0, 1, Self.QuantityButtons[idx]);
 end;
 
 

osrs/interfaces/gametabs/achievements.simba

@@ -254,7 +254,7 @@ var
   slot: TRSDiarySlot;
 begin
   for slot in Self.GetSlots() do
-    if OCR.Locate(slot.Name, Self.Names[diary], [RSColors.TEXT_RED, RSColors.TEXT_YELLOW, RSColors.TEXT_GREEN, RSColors.TEXT_WHITE], 0, RSFonts.PLAIN_11) > 0.9 then
+    if OCR.Locate(slot.Name, Self.Names[diary], [RSFonts.RED, RSFonts.YELLOW, RSFonts.GREEN, RSFonts.WHITE], 0, RSFonts.PLAIN_11) > 0.9 then
       Exit(slot);
 end;
 

osrs/interfaces/gametabs/worldswitcher.simba

@@ -149,7 +149,7 @@ WriteLn WorldSwitcher.IsLoading();
 *)
 function TRSWorldSwitcher.IsLoading(): Boolean;
 begin
-  Result := not Target.HasColor(RSColors.TEXT_ORANGE, 0, 1, Self.CurrentWorldBounds);
+  Result := not Target.HasColor(RSFonts.ORANGE, 0, 1, Self.CurrentWorldBounds);
 end;
 
 (*
@@ -261,7 +261,7 @@ WriteLn WorldSwitcher.GetCurrentWorld();
 *)
 function TRSWorldSwitcher.GetCurrentWorld(): Integer;
 begin
-  Result := OCR.RecognizeNumber(Self.CurrentWorldBounds, RSFonts.BOLD, [RSColors.TEXT_ORANGE], 0);
+  Result := OCR.RecognizeNumber(Self.CurrentWorldBounds, RSFonts.BOLD, [RSFonts.ORANGE], 0);
 end;
 
 (*

osrs/interfaces/interface.simba

@@ -29,6 +29,7 @@ end;
 type
   TRSInterfaceTitle = record
     Bounds, CloseButton: TBox;
+    Font: ^TPixelFont;
     TitleColor: TColor;
     IsOpen: function (): Boolean of object;
   end;
@@ -50,9 +51,10 @@ begin
   Self.CloseButton.X2 := bounds.X2-7;
   Self.CloseButton.Y2 := bounds.Y1+28;
 
-  Self.TitleColor := RSColors.TEXT_ORANGE;
+  Self.TitleColor := RSFonts.ORANGE;
 
   Self.IsOpen := @Self._IsOpen;
+  Self.Font := @RSFonts.BOLD;
 end;
 
 
@@ -66,14 +68,14 @@ end;
 
 function TRSInterfaceTitle.GetTitle(): String;
 begin
-  Result := OCR.Recognize(Self.Bounds, RSFonts.BOLD, [Self.TitleColor, $0], 0);
+  Result := OCR.Recognize(Self.Bounds, Self.Font^, [Self.TitleColor, $0], 0);
 end;
 
 function TRSInterfaceTitle.IsTitle(text: String; similarity: Single = 0.8): Boolean;
 var
   match: Single;
 begin
-  match := OCR.LocateInvert(Self.Bounds, text, [$344049,$0], 2, RSFonts.BOLD);
+  match := OCR.LocateInvert(Self.Bounds, text, [$344049,$0], 2, Self.Font^);
   Result := match >= similarity;
 end;
 

osrs/interfaces/interfacearea.simba

@@ -82,9 +82,11 @@ begin
   Result := [];
 end;
 
-function TRSInterfaceArea.Close(escape: Boolean = True): Boolean;
+
+function TRSInterfaceArea.Close(escape: Boolean): Boolean;
 begin
-  if not Self.IsOpen() then Exit(True);
+  if not Self.IsOpen() then
+    Exit(True);
 
   case escape of
     False: Self.GetCloseButton().Click();
@@ -94,6 +96,12 @@ begin
   Result := SleepUntil(not Self.IsOpen(), 50, 600);
 end;
 
+function TRSInterfaceArea.Close(escapeProbability: Single = -1): Boolean; overload;
+begin
+  if escapeProbability = -1 then escapeProbability := Biometrics.RandomDouble(0.5);
+  Result := Self.Close(RandomBoolean(escapeProbability));
+end;
+
 
 function TRSInterfaceArea.CreateBounds(offset: TBox; width, height: Integer = 0): TBox;
 var

osrs/interfaces/mainscreen/anvil.simba

@@ -114,7 +114,7 @@ begin
   for i := 0 to High(boxes) do
   begin
     Self.QuantityButtons[i].Bounds := boxes[i];
-    Self.QuantityButtons[i].EnabledColors := [[RSColors.TEXT_WHITE]];
+    Self.QuantityButtons[i].EnabledColors := [[RSFonts.WHITE]];
   end;
 end;
 
@@ -180,7 +180,7 @@ begin
     Exit(Self.QuantityButtons[0].Enable());
 
   for i := 1 to High(Self.QuantityButtons) do
-    if Target.HasColor(RSColors.TEXT_BLACK, 0,  1, Self.QuantityButtons[i].Bounds) then
+    if Target.HasColor(RSFonts.BLACK, 0,  1, Self.QuantityButtons[i].Bounds) then
       btns += Self.QuantityButtons[i];
 
   if btns = [] then Exit;

osrs/interfaces/mainscreen/bank.simba

@@ -351,7 +351,7 @@ begin
   end;
 
   count := Target.CountColor($0, 0, Self._IsOpenHelperBox);
-  tpa := Target.FindColor(RSColors.TEXT_ORANGE, 0, Self._IsOpenHelperBox);
+  tpa := Target.FindColor(RSFonts.ORANGE, 0, Self._IsOpenHelperBox);
   Result := ((count = 94) and (Length(tpa) = 116)) or Self.Title.IsTitle('Bank') or Self.Title.IsTitle('Equip');
 
   if Result then
@@ -822,7 +822,7 @@ Internal helper function help process the tabs text when you search.
 Example:
 ```pascal
 if Bank.Search('logs') then
-  if Bank._FindTabText(Target.FindColor(RSColors.TEXT_LIGHT_YELLOW, 0, bounds), bounds) then
+  if Bank._FindTabText(Target.FindColor(RSFonts.LIGHT_YELLOW, 0, bounds), bounds) then
     ShowOnTarget(bounds);
 ```
 *)
@@ -870,10 +870,10 @@ begin
   bounds := [Self.Bounds.X1 + 56, Self.Bounds.Y1 + 77, Self.Bounds.X1 + 84, bounds.Y1];
   if bounds.Height < 8 then Exit(0);
 
-  if Self._FindTabText(Target.FindColor(RSColors.TEXT_LIGHT_YELLOW, 0, bounds), bounds) then
-    Result := OCR.RecognizeNumber(bounds, RSFonts.PLAIN_11, [RSColors.TEXT_LIGHT_YELLOW], 0);
-  if Self._FindTabText(Target.FindColor(RSColors.TEXT_WHITE, 0, bounds), bounds) then
-    Result := OCR.RecognizeNumber(bounds, RSFonts.PLAIN_11, [RSColors.TEXT_WHITE], 0);
+  if Self._FindTabText(Target.FindColor(RSFonts.LIGHT_YELLOW, 0, bounds), bounds) then
+    Result := OCR.RecognizeNumber(bounds, RSFonts.PLAIN_11, [RSFonts.LIGHT_YELLOW], 0);
+  if Self._FindTabText(Target.FindColor(RSFonts.WHITE, 0, bounds), bounds) then
+    Result := OCR.RecognizeNumber(bounds, RSFonts.PLAIN_11, [RSFonts.WHITE], 0);
 end;
 
 (*