feat(TRSWalker): Doorhandler should be working

- Removed TRSMinimap.GetCompassAngle()` in favour of `TRSMinimap.CompassRadians` and `TRSMinimap.CompassDegrees` read properties

Author: Torwent

osrs/antiban/antibantasks.simba

@@ -83,16 +83,16 @@ end;
 procedure TAntiban.SmallCameraRotation();
 begin
   WriteLn GetDebugLn('Antiban', 'Small camera rotation');
-  Minimap.SetCompassAngle(Minimap.GetCompassAngle() + Random(-15,15));
+  Minimap.SetCompassAngle(Minimap.CompassDegrees + Random(-15,15));
 end;
 
 procedure TAntiban.LargeCameraRotation();
 begin
   WriteLn GetDebugLn('Antiban', 'Large camera rotation');
 
   case RandomBoolean(0.5) of
-    True:  Minimap.SetCompassAngle(Minimap.GetCompassAngle() - GaussRand(30, 360));
-    False: Minimap.SetCompassAngle(Minimap.GetCompassAngle() + GaussRand(30, 360));
+    True:  Minimap.SetCompassAngle(Minimap.CompassDegrees - GaussRand(30, 360));
+    False: Minimap.SetCompassAngle(Minimap.CompassDegrees + GaussRand(30, 360));
   end;
 end;
 
@@ -506,7 +506,7 @@ var
 begin
   dots := Minimap.GetDots(dotType);
   if dots.Length < 1 then Exit;
-  a := Minimap.GetCompassAngle(False);
+  a := Minimap.CompassRadians;
   repeat
     Inc(tries);
     rDot := dots[Random(Low(dots),High(dots))];

osrs/interfaces/mainscreen/mainscreen.simba

@@ -475,7 +475,8 @@ begin
   if Self.IsUpText(strings) then
   begin
     Mouse.Click(EMouseButton.LEFT);
-    Exit(Self.RedClicked());
+    if Self.RedClicked() then
+      Exit(True);
   end;
 
   if ChooseOption.Select(strings) then

osrs/interfaces/minimap.simba

@@ -226,69 +226,22 @@ end;
 
 
 (*
-## Minimap.GetCompassAngle
+## Minimap.CompassRadians
 ```pascal
-function TRSMinimap.GetCompassAngle(asDegrees: Boolean = True): Single;
+property TRSMinimap.CompassRadians: Single;
 ```
-Returns the minimap compass angle either in radians or degrees.
-By default, degrees are used.
+Returns the minimap compass angle as radians.
 
 Credits: [slacky](https://slacky.one/)
 
 Example:
 ```pascal
-WriteLn Minimap.GetCompassAngle();
+WriteLn Minimap.CompassRadians;
 ```
-
 If you are not sure what the compass refers to, it refers to this:
 ```{figure} ../../images/compass.png
 ```
 *)
-function TRSMinimap.GetCompassAngle(asDegrees: Boolean = True): Single;
-var
-  center: TPoint;
-  bounds: TBox;
-  north,south,west,east: TPoint;
-  Nclr, dials, southArr, westArr, eastArr: TPointArray;
-  n,w,e,s,x,y: Single;
-begin
-  center := Self.Compass.Circle.Center;
-  bounds := Self.Compass.Circle.Bounds;
-
-  dials := Target.FindColor($26259C,  12, bounds);
-  Nclr  := Target.FindColor($1D2931, 0.6, bounds);
-
-  dials := dials.ExtractDist(center, 10, 20);
-  north := Nclr.ExtractDist(center, 0,20).Mean();
-
-  southArr := dials.ExtractDist(north, 21, 50);
-  south    := southArr.FurthestPoint(center);
-
-  dials  := dials.Difference(southArr);
-
-  for dials in dials.Cluster(3) do
-    if CrossProduct(dials.Mean(), north, south) > 0 then
-      westArr := dials
-    else
-      eastArr := dials;
-
-  west := westArr.FurthestPoint(eastArr.Mean()); //late edit: Should not this be middle, not eastarr.mean
-  east := eastArr.FurthestPoint(westArr.Mean()); //late edit: Should not this be middle, not westarr.mean
-
-  n := ArcTan2(north.y-center.y, north.x-center.x) + HALF_PI;
-  s := ArcTan2(south.y-center.y, south.x-center.x) - HALF_PI;
-  w := ArcTan2(west.y-center.y, west.x-center.x)+PI;
-  e := ArcTan2(east.y-center.y, east.x-center.x);
-
-  x := Cos(s) + Cos(e) + Cos(w) + Cos(n);
-  y := Sin(s) + Sin(e) + Sin(w) + Sin(n);
-
-  Result := ArcTan2(y/4, x/4);
-  if Result < 0 then Result := Result + PI*2;
-
-  if asDegrees then Result := RadToDeg(Result);
-end;
-
 property TRSMinimap.CompassRadians: Single;
 var
   center: TPoint;
@@ -335,13 +288,29 @@ begin
     Result := Result + TAU;
 end;
 
+(*
+## Minimap.CompassDegrees
+```pascal
+property TRSMinimap.CompassDegrees: Single;
+```
+Returns the minimap compass angle as radians.
+
+Credits: [slacky](https://slacky.one/)
+
+Example:
+```pascal
+WriteLn Minimap.CompassDegrees;
+```
+If you are not sure what the compass refers to, it refers to this:
+```{figure} ../../images/compass.png
+```
+*)
 property TRSMinimap.CompassDegrees: Single;
 begin
   Result := RadToDeg(Self.CompassRadians);
 end;
 
 
-
 (*
 ## Minimap.SetCompassAngle
 ```pascal
@@ -373,10 +342,10 @@ begin
   timeout := Time() + RandomMean(6000, 8000);
 
   repeat
-    remaining := Round(DeltaAngle(Self.GetCompassAngle(), degrees));
+    remaining := Round(DeltaAngle(Self.CompassDegrees, degrees));
     if Abs(remaining) <= accuracy then Exit(True);
 
-    pixels := Round(Abs(DeltaAngle(Self.GetCompassAngle(), degrees)) * DEG_PER_PIXEL);
+    pixels := Round(Abs(DeltaAngle(Self.CompassDegrees, degrees)) * DEG_PER_PIXEL);
     left2right := InRange(remaining, 1, 180) or (remaining < -180);
 
     if left2right then
@@ -404,11 +373,10 @@ begin
   until Time() > timeout;
 
   WriteLn GetDebugLn('Minimap', 'SetCompassAngle timed out.', ELogLevel.WARN);
-  //TODO:
-  //if not RSClient.IsLoggedIn() then
-  //  Login.LoginPlayer()
-  //else
-  //  Self.DebugLn('Make sure the setting "Middle mouse button controls the camera" is enabled in the game settings.');
+  if not RSClient.IsLoggedIn() then
+    Login.DoLogin()
+  else
+    WriteLn GetDebugLn('Minimap', 'Make sure the setting "Middle mouse button controls the camera" is enabled in the game settings.', ELogLevel.WARN);
 end;
 
 function TRSMinimap.SetCompassAngle(degrees: Single): Boolean;
@@ -897,7 +865,7 @@ var
   img, clean: TImage;
   center: TPoint;
 begin
-  if angle = $FFFF then angle := Self.GetCompassAngle(False);
+  if angle = $FFFF then angle := Self.CompassRadians;
 
   if radius = -1 then
     radius := Self.Radius;

osrs/interfaces/mm2ms.simba

@@ -166,7 +166,7 @@ var
   i: Integer;
 begin
   if (angle = $FFFF) then
-    angle := Self.GetCompassAngle(False);
+    angle := Self.CompassRadians;
 
   SetLength(vectors, Length(points));
 
@@ -182,7 +182,7 @@ end;
 
 function TRSMinimap.Point2MS(pt: TPoint; angle: Single = $FFFF): TPoint;
 begin
-  if (angle = $FFFF) then angle := Self.GetCompassAngle(False);
+  if (angle = $FFFF) then angle := Self.CompassRadians;
   with Self.Normalize(pt, angle) do
     Result := MM2MS.Run([[X, Y, 0]], angle)[0];
 end;
@@ -192,7 +192,7 @@ var
   tpa: TPointArray;
 begin
   if angle = $FFFF then
-    angle := Self.GetCompassAngle(False);
+    angle := Self.CompassRadians;
   for tpa in atpa do
     Result += Self.Points2MS(tpa, angle);
 end;
@@ -246,7 +246,7 @@ end;
 
 function TRSMinimap.Point2MSQuad(pt: TPoint; size: TVector2 = [1,1]; angle: Single = $FFFF): TQuad;
 begin
-  if angle = $FFFF then angle := Self.GetCompassAngle(False);
+  if angle = $FFFF then angle := Self.CompassRadians;
   Result := Self.Vector2MSQuad(pt.ToVec3(), angle, size);
 end;
 
@@ -303,7 +303,7 @@ end;
 
 function TRSMinimap.Point2MSCuboid(pt: TPoint; size: TVector3; angle: Single = $FFFF): TCuboid;
 begin
-  if angle = $FFFF then angle := Self.GetCompassAngle(False);
+  if angle = $FFFF then angle := Self.CompassRadians;
   Result := Self.Vector2MSCuboid(pt.ToVec3(), size, angle);
 end;
 
@@ -644,7 +644,7 @@ var
   angle: Single;
   tpa: TPointArray;
 begin
-  angle := Self.GetCompassAngle(False);
+  angle := Self.CompassRadians;
 
   img := Target.GetImage();
   img.DrawColor := $00FF00;
@@ -702,7 +702,6 @@ begin
   end;
 end.
 ```
-
 ```{figure} ../../images/mm2ms_playerbox.gif
 ```
 *)
@@ -714,7 +713,7 @@ begin
   if MM2MS.PlayerBoxes[Options.GetZoomLevel()] <> [] then
     Exit(MM2MS.PlayerBoxes[Options.GetZoomLevel()]);
 
-  compassAngle := Minimap.GetCompassAngle(False);
+  compassAngle := Minimap.CompassRadians;
 
   vectors := [
     Minimap.Center.Offset(-2,0).ToVec3(9).Rotate(-compassAngle, Minimap.Center),

osrs/position/house/house.simba

@@ -238,7 +238,7 @@ var
 begin
   Self.Similarity := 0;
 
-  angle := Minimap.GetCompassAngle(False);
+  angle := Minimap.CompassRadians;
   clean := Minimap.GetCleanImage(angle, Self.Sample.Radius);
   results := Self.ScaledSearch(clean);
 
@@ -328,7 +328,7 @@ begin
   img.DrawImage(map, [10, 20]);
   with cleanMinimap.Center do
     if RSClient.Mode = ERSMode.FIXED then
-      p := Point(X, Y).Offset(0, 8).Rotate(-Minimap.GetCompassAngle(False), [X,Y]);
+      p := Point(X, Y).Offset(0, 8).Rotate(-Minimap.CompassRadians, [X,Y]);
 
   cleanMinimap.DrawColor := $FFFFFF;
   cleanMinimap.DrawBoxFilled([p.X - 1, p.Y - 1, p.X + 1, p.Y + 1]);

osrs/position/imagemap.simba

@@ -174,7 +174,7 @@ var
 begin
   Self.Similarity := 0;
 
-  angle := Minimap.GetCompassAngle(False);
+  angle := Minimap.CompassRadians;
   clean := Minimap.GetCleanImage(angle, Self.Sample.Radius);
   results := Self.ScaledSearch(clean);
 
@@ -265,9 +265,9 @@ begin
   with cleanMinimap.Center do
   begin
     if RSClient.Mode = ERSMode.FIXED then
-      p := Point(X, Y).Offset(0, 8).Rotate(-Minimap.GetCompassAngle(False), [X,Y])
+      p := Point(X, Y).Offset(0, 8).Rotate(-Minimap.CompassRadians, [X,Y])
     else
-      p := Point(X, Y).Offset(2, 1).Rotate(-Minimap.GetCompassAngle(False), [X,Y]);
+      p := Point(X, Y).Offset(2, 1).Rotate(-Minimap.CompassRadians, [X,Y]);
   end;
 
   cleanMinimap.DrawColor := $FFFFFF;

osrs/position/map/entities.simba

@@ -162,7 +162,7 @@ var
   weights: TDoubleArray;
 begin
   coordinates := [];
-  if angle = $FFFF then angle := Minimap.GetCompassAngle(False);
+  if angle = $FFFF then angle := Minimap.CompassRadians;
 
   h := Self.Walker^.Height(me);
 
@@ -351,7 +351,7 @@ begin
 
     if attempt <> (attempts - 1) then Continue;
 
-    angle := Minimap.GetCompassAngle();
+    angle := Minimap.CompassDegrees;
     Minimap.SetCompassAngle(angle-50, angle+50);
   end;
 end;
@@ -423,7 +423,7 @@ begin
       Continue;
     end;
 
-    Minimap.SetCompassAngle(Minimap.GetCompassAngle(), 50);
+    Minimap.SetCompassAngle(Minimap.CompassDegrees, 50);
   end;
 end;
 
@@ -734,7 +734,7 @@ var
   coordinates: TPointArray;
 begin
   me := entity.Walker^.Position();
-  filters := entity.Walker^.FiltersToMM(me, entity.Filter, Minimap.GetCompassAngle(False));
+  filters := entity.Walker^.FiltersToMM(me, entity.Filter, Minimap.CompassRadians);
 
   for filter in filters do
   begin

osrs/position/map/map.simba

@@ -285,7 +285,7 @@ begin
   Self.Region := [];
   Self.Similarity := 0;
 
-  angle := Minimap.GetCompassAngle(False);
+  angle := Minimap.CompassRadians;
   clean := Minimap.GetCleanImage(angle, Self.Sample.Radius);
   results := Self.ScaledSearch(clean);
 
@@ -442,7 +442,7 @@ begin
     ' - Plane   : ' + ToStr(Self.Region.Plane),
     ' - Local   : ' + _BoxStr(Self.Region.Region),
     ' - Original: ' + _BoxStr(Self.Region.Original),
-    ' - Compass: '  + ToStr(Minimap.GetCompassAngle()),
+    ' - Compass: '  + ToStr(Minimap.CompassDegrees),
     '',
     'Certainty: '    + ToStr(Round(Self.Similarity, 3)),
     'Time: '         + ToStr(Round(time)) + ' ms'
@@ -462,9 +462,9 @@ begin
   with cleanMinimap.Center do
   begin
     if RSClient.Mode = ERSMode.FIXED then
-      p := Point(X, Y).Offset(0, 8).Rotate(-Minimap.GetCompassAngle(False), [X,Y])
+      p := Point(X, Y).Offset(0, 8).Rotate(-Minimap.CompassRadians, [X,Y])
     else
-      p := Point(X, Y).Offset(2, 1).Rotate(-Minimap.GetCompassAngle(False), [X,Y]);
+      p := Point(X, Y).Offset(2, 1).Rotate(-Minimap.CompassRadians, [X,Y]);
   end;
 
   cleanMinimap.DrawColor := $FFFFFF;
@@ -525,7 +525,7 @@ var
   angle, h: Single;
   img: TImage;
 begin
-  angle := Minimap.GetCompassAngle(False);
+  angle := Minimap.CompassRadians;
 
   img := Target.GetImage();
   img.DrawColor := $00FF00;
@@ -577,7 +577,7 @@ var
   currLoc: TPoint;
   arr: TPointArray;
 begin
-  if angle = $FFFF then angle := Minimap.GetCompassAngle(False);
+  if angle = $FFFF then angle := Minimap.CompassRadians;
   vector := Self.Walker.Point2MMVec(me, pt, angle);
   pt := vector.ToPoint();