feat: experimental but working webwalking with teleports

Teleports need to be manually added for now

Author: Torwent

osrs/position/map/mapdebugger.simba

@@ -76,8 +76,14 @@ begin
       if Self.Path <> [] then
       begin
         for i := 0 to High(Self.Path)-1 do
-          tpa += TPointArray.CreateFromLine(Self.Path[i].Node, Self.Path[i+1].Node);
-        canvas.DrawPoints(tpa, $FF0000);
+        begin
+          tpa := TPointArray.CreateFromLine(Self.Path[i].Node, Self.Path[i+1].Node);
+          case Self.Path[i+1].Typ of
+            EGraphNode.TELEPORT: canvas.DrawPoints(tpa.Grow(1), $3388FF);
+            else canvas.DrawPoints(tpa, $FF0000);
+          end;
+        end;
+
       end;
     end;
   end;
@@ -101,7 +107,7 @@ begin
   Self.Coordinate.Caption := Format('[%d, %d]', [g.X, g.Y]);
 
   Self.Path := [];
-  if (shift = [ELazShiftStates.Shift]) and (Self.Selected > -1) then
+  if (ELazShiftStates.Shift in shift) and (Self.Selected > -1) then
   begin
     i := Self.Graph.Nodes.NearestIndex(pt);
 

osrs/position/map/webgraph_callbacks.simba

@@ -29,10 +29,19 @@ begin
   case chunk of
     [49,54]:
     begin
-      if Achievements.Diaries.GetLevel(ERSAchievementDiary.VARROCK) > 1 then
-        graph^.AddTeleport([8565, 36522], @Self.TeleportGrandExchange);
+      if Stats.GetLevel(ERSSkill.MAGIC) < 25 then
+        Exit;
+      if Achievements.Diaries.GetLevel(ERSAchievementDiary.VARROCK) < 2 then
+        Exit;
+
+      //graph^.AddTeleport([8565, 36522], @Self.TeleportGrandExchange);
+    end;
+    [50,53]:
+    begin
+      if Stats.GetLevel(ERSSkill.MAGIC) < 25 then
+        Exit;
+      graph^.AddTeleport([8752, 36716], @Self.TeleportVarrock);
     end;
-    [50,53]: graph^.AddTeleport([8752, 36716], @Self.TeleportVarrock);
   end;
 end;
 

osrs/walker.simba

@@ -850,6 +850,12 @@ begin
   //Self._Path += path.First;
   for i := 0 to High(path)-1 do
   begin
+    if path[i+1].Typ = EGraphNode.TELEPORT then
+    begin
+      Self._Path += path[i+1];
+      Continue;
+    end;
+
     line := TPointArray.CreateFromLine(path[i].Node, path[i+1].Node);
 
     if path[i].Typ <> EGraphNode.NORMAL then
@@ -889,8 +895,16 @@ begin
   previous := index;
 
   nearest := Self._Path.NearestIndex(me);
+
   Self._Index := nearest;
 
+  if Self._Path[Self._Index].Typ = EGraphNode.TELEPORT then
+  begin
+    index := Self._Index;
+    Self._Node := EGraphNode.TELEPORT;
+    Exit(nearest > previous);
+  end;
+
   while (nearest < High(Self._Path)) and not Self.IsWalkable(Self._Path[nearest+1].Node, me, tmp, angle) do
     Inc(nearest);
 
@@ -977,7 +991,7 @@ Walker.WalkPath([[100,100],[120,120],[140,140],[160,160],[180,180]]);
 function TRSWalker.WalkPath(path: TGraphNodeArray; minDist: Integer = 0; debug: Boolean = False): Boolean;
 var
   me: TPoint;
-  idx, fails: Integer;
+  i, idx, fails: Integer;
   radians: Double;
 begin
   Self._WalkPathSetup(path);

utils/webgraph.simba

@@ -26,13 +26,15 @@ Enum representing the type of nodes in a `TWebGraph`.
     BLOCKED
   );
 
+  TGraphNodeHandler = function (): Boolean  of object;
+
   TGraphNode = record
     Node: TPoint;
     Typ: EGraphNode;
-    Handle: function (): Boolean of object;
+    Handle: TGraphNodeHandler;
   end;
 
-function TGraphNode.Create(pt: TPoint; typ: EGraphNode = EGraphNode.NORMAL; handle: function (): Boolean  of object = nil): TGraphNode; static;
+function TGraphNode.Create(pt: TPoint; typ: EGraphNode = EGraphNode.NORMAL; handle: TGraphNodeHandler  = nil): TGraphNode; static;
 begin
   Result.Node := pt;
   Result.Typ := typ;
@@ -216,9 +218,11 @@ begin
         node.Indices := current.Indices + pathIdx;
 
         hyp := Hypot(p.X-q.X, p.Y-q.Y);
-        node.Score := current.Score + hyp + (hyp*Random()*Rnd-Rnd/2);
-        if Self.Nodes[pathIdx].Typ <> EGraphNode.NORMAL then
-          node.Score += 10;
+        case Self.Nodes[pathIdx].Typ of
+          EGraphNode.NORMAL: node.Score := current.Score + hyp + (hyp*Random()*rnd-rnd/2) + 1;
+          EGraphNode.TELEPORT, EGraphNode.FAIRYRING: node.Score := current.Score + hyp*0.9 + 5;
+          else node.Score := current.Score + hyp + (hyp*Random()*rnd-rnd/2) + 10;
+        end;
         queue += node;
       end;
     end;
@@ -409,7 +413,7 @@ begin
 end;
 
 
-procedure TWebGraph.AddLink(a, b: TPoint; typ: EGraphNode; handle: function (): Boolean of object);
+procedure TWebGraph.AddLink(a, b: TPoint; typ: EGraphNode; handle: TGraphNodeHandler);
 var
   i, j, n: Integer;
   tpa: TPointArray;
@@ -447,7 +451,7 @@ begin
   end;
 end;
 
-procedure TWebGraph.AddLink(a, b: TPoint; typ: EGraphNode; handleA, handleB: function (): Boolean of object); overload;
+procedure TWebGraph.AddLink(a, b: TPoint; typ: EGraphNode; handleA, handleB: TGraphNodeHandler); overload;
 var
   i, j, n: Integer;
   tpa: TPointArray;
@@ -485,7 +489,7 @@ begin
   end;
 end;
 
-procedure TWebGraph.AddLink(pt, a, b: TPoint; typ: EGraphNode; handle: function (): Boolean of object); overload;
+procedure TWebGraph.AddLink(pt, a, b: TPoint; typ: EGraphNode; handle: TGraphNodeHandler); overload;
 var
   i, j, n: Integer;
   tpa: TPointArray;
@@ -521,7 +525,7 @@ begin
   Self.Nodes[i] := TGraphNode.Create(pt, typ, @handle);
 end;
 
-procedure TWebGraph.AddTeleport(pt: TPoint; handle: function (): Boolean of object);
+procedure TWebGraph.AddTeleport(pt: TPoint; handle: TGraphNodeHandler);
 var
   i, j, n: Integer;
   tpa: TPointArray;