fix: more work on the worldswitcher

finally added the jagex account advert failsafe to TRSBank

Author: Torwent

osrs/interfaces/gametabs/logout.simba

@@ -69,6 +69,8 @@ WriteLn Logout.Open();
 function TRSLogout.Open(): Boolean;
 begin
   Result := GameTabs.Open(ERSGameTab.LOGOUT);
+  if Result and WorldSwitcher._IsOpen() then
+    Result := WorldSwitcher.Close();
 end;
 
 
@@ -128,6 +130,7 @@ function TRSLogout.Logout(const attempts: UInt32 = 5; const time: UInt32 = 20000
 var
   i: Integer;
   interval: UInt32;
+  stars: ERSRating;
 begin
   if not Self.Open() then Exit;
   if WorldSwitcher.Logout() then Exit(True);
@@ -141,8 +144,9 @@ begin
     else
       i := RandomLeft(0, 4);
 
-    WriteLn GetDebugLn('Logout', 'Rating the game with ' + ToStr(ERSRating(i)) + ' stars before logging out.');
-    Self.Ratings[i].Enable();
+    stars := ERSRating(i);
+    WriteLn GetDebugLn('Logout', 'Rating the game with ' + ToStr(stars) + ' stars before logging out.');
+    Self.Rate(stars);
   end;
 
   if Keyboard.LastKey = EKeyCode.RETURN then
@@ -158,4 +162,3 @@ end;
 
 var
   Logout: TRSLogout;
-

osrs/interfaces/gametabs/worldswitcher.simba

@@ -7,7 +7,41 @@ switcher in the {ref}`Logout` gametab.
 {$INCLUDE_ONCE SRLT/osrs.simba}
 
 type
+(*
+(ERSWorldSwitcherButton)=
+## Enum ERSWorldSwitcherButton
+```pascal
+ERSWorldSwitcherButton = enum(CONFIGURE, CLOSE, LOGOUT);
+```
+Enum representing the world switcher buttons.
+*)
   ERSWorldSwitcherButton = enum(CONFIGURE, CLOSE, LOGOUT);
+
+  TRSWorld = record
+    Number: Integer;
+    Bounds: TBox;
+  end;
+  TRSWorldArray = array of TRSWorld;
+
+procedure ShowOnClient(worlds: TRSWorldArray); overload;
+var
+  img: TImage;
+  i: Integer;
+begin
+  img := TImage.CreateFromTarget();
+
+  img.DrawColor := $FFFFFF;
+  for i := 0 to High(worlds) do
+  begin
+    WriteLn worlds[i].Number;
+    img.DrawBox(worlds[i].Bounds);
+  end;
+
+  img.Show();
+  img.Free();
+end;
+
+type
 (*
 (TRSWorldSwitcher)=
 ## type TRSWorldSwitcher
@@ -154,7 +188,56 @@ begin
   Result := OCR.RecognizeNumber(Self.CurrentWorldBounds, RSFonts.BOLD, [RSColors.TEXT_ORANGE], 0);
 end;
 
+function TRSWorldSwitcher.GetWorlds(): TRSWorldArray;
+var
+  tpa: TPointArray;
+  atpa: T2DPointArray;
+  weights: TIntegerArray;
+  world: TRSWorld;
+begin
+  tpa := Target.FindColor(Self.SILVER, 0, Self.Scroll.Area) +
+         Target.FindColor(Self.YELLOW, 0, Self.Scroll.Area);
+
+  atpa := tpa.Cluster(5, 1.5);
+  for tpa in atpa do
+    with tpa.Bounds() do
+    begin
+      if Height <> 10 then Continue;
+
+      world.Number := OCR.RecognizeNumber([X1-3, Y1-2, X2+3, Y2+2], RSFonts.PLAIN_12, [Self.SILVER, Self.YELLOW], 0);
+      if world.Number = -1 then Continue;
+
+      world.Bounds := [Self.Scroll.Area.X1, Y1-2, Self.Scroll.Area.X2, Y2+3];
+
+      weights += Y1;
+      Result += World;
+    end;
 
+  Result.Sort(weights, True);
+end;
+
+function TRSWorldSwitcher.FindWorld(number: Integer; out world: TRSWorld): Boolean;
 var
-  WorldSwitcher: TRSWorldSwitcher;
+  tpa: TPointArray;
+  atpa: T2DPointArray;
+begin
+  tpa := Target.FindColor(Self.SILVER, 0, Self.Scroll.Area) +
+         Target.FindColor(Self.YELLOW, 0, Self.Scroll.Area);
 
+  atpa := tpa.Cluster(5, 1.5);
+  for tpa in atpa do
+    with tpa.Bounds() do
+    begin
+      if Height <> 10 then Continue;
+
+      world.Number := OCR.RecognizeNumber([X1-3, Y1-2, X2+3, Y2+2], RSFonts.PLAIN_12, [Self.SILVER, Self.YELLOW], 0);
+      if world.Number <> number then Continue;
+
+      world.Bounds := [Self.Scroll.Area.X1, Y1-2, Self.Scroll.Area.X2, Y2+3];
+      Exit(True);
+    end;
+end;
+
+
+var
+  WorldSwitcher: TRSWorldSwitcher;

osrs/interfaces/mainscreen/bank.simba

@@ -58,6 +58,10 @@ Record responsible to handle the bank interface.
     DynamicButtons: array [ERSBankDynamicButtons] of TRSButton;
     ButtonsOffset: Integer;
 
+    JagexAccountAd: record
+      NotNow, MoreInfo: TBox;
+    end;
+
     Cache: record
       Quantity: Integer;
       Items: TStringMap<TBankPosition>;
@@ -148,6 +152,12 @@ begin
   Self.SlotsArea.X2 := Self.Bounds.X2 - 63;
   Self.SlotsArea.Y2 := Self.Bounds.Y2 - 44;
 
+  with Self.SlotsArea.Center.Offset(0,-1) do
+    Self.JagexAccountAd.NotNow := [X-120, Y+43, X-49, Y+66];
+
+  with Self.SlotsArea.Center.Offset(0,-1) do
+    Self.JagexAccountAd.MoreInfo := [X+39, Y+43, X+108, Y+66];
+
   Self.Incenerator.X1 := Self.Bounds.X1 + 5;
   Self.Incenerator.Y1 := Self.Bounds.Y2 - 113;
   Self.Incenerator.X2 := Self.Bounds.X1 + 51;
@@ -233,6 +243,45 @@ begin
     Self.DynamicButtons[i].Bounds := Self.DynamicButtons[i].Bounds.Offset([offset, 0]);
 end;
 
+
+(*
+## Bank.HasJagexAccountAd
+```pascal
+function TRSBank.HasJagexAccountAd(): Boolean;
+```
+Returns true if the bank has the jagex account ad pop-up.
+This only ever shows up on non jagex accounts and tries to buy you in with bank space.
+
+Example:
+```pascal
+WriteLn Bank.HasJagexAccountAd();
+```
+*)
+function TRSBank.HasJagexAccountAd(): Boolean;
+begin
+  Result := (Target.CountColor($0000FF, 0, Self.JagexAccountAd.NotNow) = 98) and
+            (Target.CountColor($0DC10D, 0, Self.JagexAccountAd.MoreInfo) = 112);
+end;
+
+(*
+## Bank.CloseJagexAccountAd
+```pascal
+function TRSBank.CloseJagexAccountAd(): Boolean;
+```
+Attempts to close the jagex account advert. Returns true on success.
+
+Example:
+```pascal
+WriteLn Bank.CloseJagexAccountAd();
+```
+*)
+function TRSBank.CloseJagexAccountAd(): Boolean;
+begin
+  Mouse.Click(Self.JagexAccountAd.NotNow, EMouseButton.LEFT);
+  Result := SleepUntil(not Self.HasJagexAccountAd(), 50, 600);
+end;
+
+
 (*
 ## Bank.IsOpen
 ```pascal
@@ -257,7 +306,12 @@ begin
 
   if Result then
   begin
-    if tpa = [] then Exit;
+    if tpa = [] then
+    begin
+      if not Self.HasJagexAccountAd() then Exit;
+      if not Self.CloseJagexAccountAd() then Exit;
+      Exit(Self.IsOpen()); //ad closed, restart
+    end;
 
     offset := tpa.First.X;
     offset -= Self.Bounds.X1+244;