fix(AsyncMouse): read notes

remove all async mouse interactions that the async mouse is not stopped within the same function

Author: Torwent

osrs/antiban/antibantasks.simba

@@ -48,7 +48,7 @@ begin
     pt := Mouse.Position.Random(-350, 350);
   until Mouse.Position.DistanceTo(pt) > 50;
 
-  AsyncMouse.Move(pt);
+  Mouse.Move(pt);
 end;
 
 procedure TAntiban.LargeRandomMouse();

osrs/interfaces/gametabs/magic.simba

@@ -207,37 +207,23 @@ WriteLn Magic.CloseInfo();
 function TRSMagic.CloseInfo(): Boolean;
 var
   destination: TPoint;
-  timeout: UInt64;
 begin
   destination := GameTab.Bounds.Expand(10).NearestEdge(Target.MouseXY);
-  AsyncMouse.Move(destination);
 
-  timeout := Time() + 3000;
-
-  while Self.InfoIsOpen() or (Time() > timeout) do
-    Sleep(20, 100, ERandomDir.LEFT);
-
-  AsyncMouse.Stop();
-
-  Result := not Self.InfoIsOpen();
+  ASyncMouse.Move(destination);
+  Result := SleepUntil(not Self.InfoIsOpen(), 35, 3000);
+  ASyncMouse.Stop();
 end;
 
-function TRSMagic.CloseInfo({$H-}spell: ERSSpell): Boolean; overload; {$H+}
+function TRSMagic.CloseInfo(spell: ERSSpell): Boolean; overload;
 var
   destination: TPoint;
-  timeout: UInt64;
 begin
-  destination := GameTab.Bounds.Expand(10).NearestEdge(Target.MouseXY);
-  AsyncMouse.Move(destination);
-
-  timeout := Time() + 3000;
-
-  while Self.InfoIsOpen() or (Time() > timeout) do
-    Sleep(20, 100, ERandomDir.LEFT);
-
-  AsyncMouse.Stop();
+  destination := Self.SpellCache[spell].Box.RandomPointCenter();
 
-  Result := not Self.InfoIsOpen();
+  ASyncMouse.Move(destination);
+  Result := SleepUntil(not Self.InfoIsOpen(), 35, 3000);
+  ASyncMouse.Stop();
 end;
 
 

osrs/interfaces/gametabs/prayer.simba

@@ -152,22 +152,15 @@ WriteLn Prayer.CloseInfo();
 function TRSPrayer.CloseInfo(): Boolean;
 var
   destination: TPoint;
-  timeout: UInt64;
 begin
-  if not Self.InfoIsOpen then
+  if not Self.InfoIsOpen() then
     Exit(True);
 
   destination := GameTab.Bounds.Expand(10).NearestEdge(Target.MouseXY);
-  AsyncMouse.Move(destination);
-
-  timeout := Time() + 3000;
-
-  while Self.InfoIsOpen() or (Time() > timeout) do
-    Sleep(20, 100, ERandomDir.LEFT);
 
+  AsyncMouse.Move(destination);
+  Result := SleepUntil(not Self.InfoIsOpen(), 35, 3000);
   AsyncMouse.Stop();
-
-  Result := not Self.InfoIsOpen();
 end;
 
 (*

osrs/interfaces/mainscreen/bank.simba

@@ -768,9 +768,10 @@ begin
     Exit(True);
 
   boxes := Self.Incenerator.Invert(Self.Bounds).SortFrom(Target.MouseXY);
-  AsyncMouse.Move(boxes[RandomLeft(0, High(boxes))].RandomPoint());
+
+  ASyncMouse.Move(boxes[RandomLeft(0, High(boxes))].RandomPoint());
   Result := SleepUntil(not Self.InceneratorTooltipVisible(), 100, 1000);
-  AsyncMouse.Stop();
+  ASyncMouse.Stop();
 end;
 
 

osrs/interfaces/setup.simba

@@ -132,7 +132,7 @@ begin
 
   Mouse.Setup();
   Keyboard.Setup();
-  AsyncMouse := new TASyncMouse(Target);
+  ASyncMouse := new TASyncMouse(Target);
 
   RSCacheParser.Setup();
 

osrs/position/map/entities.simba

@@ -471,7 +471,7 @@ begin
   for attempt := 0 to attempts do
   begin
     if not Self.FindFrom(me, atpa) then Continue;
-    AsyncMouse.Move(atpa.Random().Random());
+    Mouse.Move(atpa.Random().Random());
     Exit(True);
   end;
 end;

osrs/position/map/objects.simba

@@ -433,7 +433,7 @@ function TRSObject.PreHover(me: TPoint; attempts: Integer = 2): Boolean;
 ```
 To understand what this does it's recommended to read {ref}`RSObject.FindFrom`.
 
-This method basically uses {ref}`RSObject.FindFrom` and asynchronously moves the
+This method basically uses {ref}`RSObject.FindFrom` and moves the
 mouse to one of the matches.
 *)
 function TRSObject.PreHover(me: TPoint; attempts: Integer = 2): Boolean;
@@ -444,7 +444,7 @@ begin
   for attempt := 0 to attempts do
   begin
     if not Self.FindFrom(me, atpa) then Continue;
-    AsyncMouse.Move(atpa.Random().Random());
+    Mouse.Move(atpa.Random().Random());
     Exit(True);
   end;
 end;

utils/input/mouse.simba

@@ -539,7 +539,7 @@ Global {ref}`TMouse` variable.
   Mouse: TMouse;
 
 (*
-## AsyncMouse variable
-Global {ref}`TAsyncMouse` variable.
+## ASyncMouse variable
+Global {ref}`TASyncMouse` variable.
 *)
-  AsyncMouse: TASyncMouse;
+  ASyncMouse: TASyncMouse;