fix(TRSObject): tweaks

It didn't make sense that `TRSObject.Walker^.ActionUpText` was tracking the action uptext even when walker was not being used at all, this commit changes that for both TRSObject and TRSEntity

Author: Torwent

osrs/miscform.simba

@@ -55,7 +55,6 @@ end;
 
 procedure TMiscFormHelper.SetupLoginPanel(parent: TLazComponent);
 var
-  panel: TLazPanel;
   info: TLazLabel;
   btn: TLazButton;
 begin
@@ -82,7 +81,6 @@ end;
 
 procedure TMiscFormHelper.SetupClientPanel(parent: TLazComponent);
 var
-  panel: TLazPanel;
   info: TLazLabel;
   btn: TLazButton;
 begin

osrs/position/map/entities.simba

@@ -155,7 +155,6 @@ begin
   for i := 0 to High(unique) do
   begin
     best := GetBestColor(EColorSpace.HSL, unique[i]);
-    WriteLn best;
     Result.Finder.Colors += [best.Color, best.Tolerance*1.5, EColorSpace.HSL, [best.Mods[0]*1.5, best.Mods[1]*1.5, best.Mods[2]*1.5]];
   end;
 
@@ -395,12 +394,12 @@ end;
 (*
 ## TRSEntity._UpTextCheck
 ```pascal
-function TRSEntity._UpTextCheck(out shouldExit: Boolean): Boolean;
+function TRSEntity._UpTextCheck(out shouldExit: Boolean; action: TStringArray): Boolean;
 ```
 Internal TRSEntity helper method that is used by all hovering methods.
 You probably don't need to use this directly.
 *)
-function TRSEntity._UpTextCheck(out shouldExit: Boolean): Boolean;
+function TRSEntity._UpTextCheck(out shouldExit: Boolean; action: TStringArray): Boolean;
 var
   text: String;
 begin
@@ -414,7 +413,7 @@ begin
 
   text := MainScreen.UpText;
 
-  if text.Contains('>') and not Self.Walker^.ActionUpText.Contains(['>']) then
+  if text.Contains('>') and not action.Contains(['>']) then
   begin
     ChooseOption.Close();
     Exit;
@@ -429,19 +428,19 @@ end;
 (*
 ## TRSEntity._HoverHelper
 ```pascal
-function TRSEntity._HoverHelper(attempts: Integer; trackTarget: Boolean): Boolean;
+function TRSEntity._HoverHelper(action: TStringArray; attempts: Integer): Boolean;
 ```
 Internal helper method used to hover a TRSEntity target.
 You should not use this directly.
 *)
-function TRSEntity._HoverHelper(attempts: Integer): Boolean;
+function TRSEntity._HoverHelper(action: TStringArray; attempts: Integer): Boolean;
 var
   shouldExit: Boolean;
   attempt, i: Integer;
   atpa: T2DPointArray;
   coordinates, tpa: TPointArray;
 begin
-  Result := Self._UpTextCheck(shouldExit);
+  Result := Self._UpTextCheck(shouldExit, action);
   if shouldExit then Exit;
 
   for attempt := 0 to attempts do
@@ -475,14 +474,14 @@ end;
 (*
 ## TRSEntity._WalkHoverHelper
 ```pascal
-function TRSEntity._WalkHoverHelper(attempts: Integer; trackTarget: Boolean): Boolean;
+function TRSEntity._WalkHoverHelper(action: TStringArray; attempts: Integer): Boolean;
 ```
 Internal helper method used to walk and hover a TRSEntity target.
 You should not use this directly.
 
 This is responsible for deciding wether we should walk to a TRSEntity target or not before attempting to hover it.
 *)
-function TRSEntity._WalkHoverHelper(attempts: Integer): Boolean;
+function TRSEntity._WalkHoverHelper(action: TStringArray; attempts: Integer): Boolean;
 var
   shouldExit: Boolean;
   attempt, i: Integer;
@@ -491,7 +490,7 @@ var
   path: TGraphNodeArray;
   me, closest: TPoint;
 begin
-  Result := Self._UpTextCheck(shouldExit) or Self.Walker^.RedClicked;
+  Result := Self._UpTextCheck(shouldExit, action) or Self.Walker^.RedClicked;
   if shouldExit then Exit;
 
   for attempt := 0 to attempts do
@@ -577,9 +576,6 @@ This is what's responsible for deciding if we click a target we are hovering or
 *)
 function TRSEntity._ClickHelper(leftClick: Boolean): Boolean;
 begin
-  Self.Walker^.TargetUpText := [];
-  Self.Walker^.ActionUpText := [];
-
   if Self.Walker^.RedClicked then
   begin
     Self.Walker^.RedClicked := False;
@@ -612,9 +608,6 @@ This is what is responsible for deciding if we just left click a target we are h
 *)
 function TRSEntity._SelectHelper(action: TStringArray): Boolean;
 begin
-  Self.Walker^.TargetUpText := [];
-  Self.Walker^.ActionUpText := [];
-
   if Self.Walker^.RedClicked then
   begin
     Self.Walker^.RedClicked := False;
@@ -634,18 +627,16 @@ end;
 (*
 ## TRSEntity.Hover
 ```pascal
-function TRSEntity.Hover(attempts: Integer = 2; trackTarget: Boolean = TRSEntity.TrackTarget): Boolean;
+function TRSEntity.Hover(action: TStringArray = []; attempts: Integer = 2): Boolean;
 ```
 Method used to hover a TRSEntity target if it's found on the mainscreen.
-It can update the target position while the mouse moves with **trackTarget**.
 
 Example:
 ```pascal
-RSW.WebWalk(WaspWeb.LOCATION_VARROCK);
-RSObjects.GEBank.Hover(); //Be in GE with a walker setup there.
+//TODO...
 ```
 *)
-function TRSEntity.Hover(attempts: Integer = 2): Boolean;
+function TRSEntity.Hover(action: TStringArray = []; attempts: Integer = 2): Boolean;
 begin
   if ChooseOption.IsOpen() then
   begin
@@ -662,25 +653,22 @@ begin
   //TODO:
   //if not Self.Walker^.MakePointVisible(Self.Coordinates) then Exit;
 
-  Result := Self._HoverHelper(attempts);
+  Result := Self._HoverHelper(action, attempts);
 end;
 
 (*
 ## TRSEntity.WalkHover
 ```pascal
-function TRSEntity.WalkHover(attempts: Integer = 2; trackTarget: Boolean = TRSEntity.TrackTarget): Boolean;
+function TRSEntity.WalkHover(action: TStringArray = []; attempts: Integer = 2): Boolean;
 ```
 Method used to walk and hover a TRSEntity target if it's found on the mainscreen after walking.
-It can update the target position while the mouse moves with **trackTarget**.
 
 Example:
 ```pascal
-//Be in varrock with a varrock map loaded.
-RSW.WebWalk(WaspWeb.LOCATION_VARROCK);
-RSObjects.GEBank.WalkHover();
+//TODO...
 ```
 *)
-function TRSEntity.WalkHover(attempts: Integer = 2): Boolean;
+function TRSEntity.WalkHover(action: TStringArray = []; attempts: Integer = 2): Boolean;
 var
   me, closest: TPoint;
   path: TGraphNodeArray;
@@ -693,9 +681,6 @@ begin
     ChooseOption.Close();
   end;
 
-  if Self.UpText <> [] then
-    Self.Walker^.TargetUpText := Copy(Self.UpText);
-
   me :=  Self.Walker^.Position();
   closest := Self.Walker^.GetClosestPoint(me, Self.Coordinates, path);
 
@@ -708,17 +693,25 @@ begin
     hasPath := True;
   end;
 
+  Self.Walker^.TargetUpText := Copy(Self.UpText);
+  Self.Walker^.ActionUpText := action;
+
+  try
   // check if doors need to be passed to reach target
-  if hasPath or Self.Walker^.WebGraph^.WalkableClusters.InSameTPA(me, closest) then
-  begin
-    if not Self.Walker^.MakePointVisible(closest) and not Self.Walker^.WebWalkEx(me, closest, 30, 0.15) then
+    if hasPath or Self.Walker^.WebGraph^.WalkableClusters.InSameTPA(me, closest) then
+    begin
+      if not Self.Walker^.MakePointVisible(closest) and not Self.Walker^.WebWalkEx(me, closest, 30, 0.15) then
+        Exit;
+    end
+    else
+    if not Self.Walker^.WebWalk(closest, 30, 0.15) then
       Exit;
-  end
-  else
-  if not Self.Walker^.WebWalk(closest, 30, 0.15) then
-    Exit;
 
-  Result := Self._WalkHoverHelper(attempts);
+    Result := Self._WalkHoverHelper(action, attempts);
+  finally
+    Self.Walker^.TargetUpText := [];
+    Self.Walker^.ActionUpText := [];
+  end;
 end;
 
 
@@ -737,7 +730,7 @@ WriteLn RSObjects.GEBank.Click();
 *)
 function TRSEntity.Click(leftClick: Boolean = True; attempts: Integer = 2): Boolean;
 begin
-  Result := Self.Hover(attempts) and Self._ClickHelper(leftClick);
+  Result := Self.Hover([], attempts) and Self._ClickHelper(leftClick);
 end;
 
 (*
@@ -749,9 +742,7 @@ Method used to select an option on a TRSEntity target if it's found on the mains
 *)
 function TRSEntity.Interact(action: TStringArray; attempts: Integer = 2): Boolean;
 begin
-  Self.Walker^.ActionUpText := action;
-  Result := Self.Hover(attempts) and Self._SelectHelper(action);
-  Self.Walker^.ActionUpText := [];
+  Result := Self.Hover(action, attempts) and Self._SelectHelper(action);
 end;
 
 (*
@@ -774,8 +765,7 @@ begin
   if Self.Coordinates = [] then
     raise GetDebugLn('TRSEntity', 'FindFrom requires the object to have coordinates.');
 
-  Result := Self.WalkHover(attempts) and Self._ClickHelper(leftClick);
-  Self.Walker^.TargetUpText := [];
+  Result := Self.WalkHover([], attempts) and Self._ClickHelper(leftClick);
 end;
 
 (*
@@ -792,12 +782,7 @@ begin
   if Self.Coordinates = [] then
     raise GetDebugLn('TRSEntity', 'FindFrom requires the object to have coordinates.');
 
-  Self.Walker^.ActionUpText := action;
-
-  Result := Self.WalkHover(attempts) and Self._SelectHelper(action);
-
-  Self.Walker^.TargetUpText := [];
-  Self.Walker^.ActionUpText := [];
+  Result := Self.WalkHover(action, attempts) and Self._SelectHelper(action);
 end;