add query to fate location

Jaksuhn · Apr 24, 2024 · 124436b · 124436b
1 parent 2ba6a18
commit 124436b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 11 deletions.
diff --git a/Automaton/Features/Achievements/DateWithDestiny.cs b/Automaton/Features/Achievements/DateWithDestiny.cs
@@ -12,7 +12,6 @@
 using FFXIVClientStructs.FFXIV.Client.Game;
 using FFXIVClientStructs.FFXIV.Client.Game.Fate;
 using FFXIVClientStructs.FFXIV.Client.Game.UI;
-using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using ImGuiNET;
 using Lumina.Excel.GeneratedSheets;
 using System;
@@ -131,7 +130,7 @@ private ushort FateID
         var fates = GetFates();
         if (fates != null)
             foreach (var fate in fates)
-                ImGui.TextUnformatted($"{fate.Name} @ {fate.Position} {Vector3.DistanceSquared(fate.Position, Svc.ClientState.LocalPlayer.Position)} {fate.Progress}% {fate.TimeRemaining}");
+                ImGui.TextUnformatted($"{fate.Name} @ {fate.Position} {fate.Progress}% {fate.TimeRemaining}");
         ImGui.TextUnformatted($"Unfiltered FATEs:");
         foreach (var fate in Svc.Fates)
         {
@@ -249,7 +248,8 @@ private unsafe void OnUpdate(IFramework framework)
                 {
                     Svc.Log.Debug("Have Yokai minion equipped but not in appropiate zone. Teleporting");
                     step = "Swapping zones";
-                    Telepo.Instance()->Teleport(CoordinatesHelper.GetZoneMainAetheryte((uint)zones.First()), 0);
+                    if (!Svc.Condition[ConditionFlag.Casting])
+                        Telepo.Instance()->Teleport(CoordinatesHelper.GetZoneMainAetheryte((uint)zones.First()), 0);
                     return;
                 }
             }
@@ -308,8 +308,9 @@ private unsafe Vector3 GetRandomPointInFate(ushort fateID)
     {
         var fate = FateManager.Instance()->GetFateById(fateID);
         var angle = random.NextDouble() * 2 * Math.PI;
-        var randomPoint = new Vector3((float)(fate->Radius / 2 * Math.Cos(angle)), fate->Location.Y, (float)(fate->Radius / 2 * Math.Sin(angle)));
-        return navmesh.NearestPoint(randomPoint, 5, 5);
+        var randomPoint = new Vector3((float)(fate->Location.X + (fate->Radius / 2 * Math.Cos(angle))), fate->Location.Y, (float)(fate->Location.Z + (fate->Radius / 2 * Math.Sin(angle))));
+        var point = navmesh.NearestPoint(randomPoint, 5, 5);
+        return (Vector3)(point != null ? point : fate->Location);
     }
 
     private void SyncFate(ushort value)

diff --git a/Automaton/Features/Debugging/FateDebug.cs b/Automaton/Features/Debugging/FateDebug.cs
@@ -3,6 +3,7 @@
 using ECommons.DalamudServices;
 using FFXIVClientStructs.FFXIV.Client.Game.Fate;
 using ImGuiNET;
+using System;
 using System.Linq;
 using System.Numerics;
 
@@ -12,6 +13,8 @@ internal unsafe class FateDebug : DebugHelper
     public override string Name => $"{nameof(FateDebug).Replace("Debug", "")} Debugging";
 
     FateManager* fm = FateManager.Instance();
+    NavmeshIPC navmesh = new();
+    Random random = new();
 
     public override void Draw()
     {
@@ -33,10 +36,20 @@ public override void Draw()
         foreach (var fate in active)
         {
             ImGui.Text($"[{fate}] {fm->GetFateById(fate)->Name} ({fm->GetFateById(fate)->Duration}) {fm->GetFateById(fate)->Progress}%% <{fm->GetFateById(fate)->State}>");
-            ImGui.SameLine();
-            var loc = fm->GetFateById(fate)->Location;
-            var cmd = $"/vnavmesh moveto {loc.X} {loc.Y} {loc.Z}";
-            Svc.Log.Info($"executing command {cmd}");
         }
+
+        if (ImGui.Button("Get Random Point"))
+        {
+            Svc.Log.Info(GetRandomPointInFate(Svc.Fates.First().FateId).ToString());
+        }
+    }
+
+    private unsafe Vector3 GetRandomPointInFate(ushort fateID)
+    {
+        var fate = FateManager.Instance()->GetFateById(fateID);
+        var angle = random.NextDouble() * 2 * Math.PI;
+        var randomPoint = new Vector3((float)(fate->Location.X + (fate->Radius / 2 * Math.Cos(angle))), fate->Location.Y, (float)(fate->Location.Z + (fate->Radius / 2 * Math.Sin(angle))));
+        var x = navmesh.NearestPoint(randomPoint, 5, 5);
+        return (Vector3)(x != null ? x : Vector3.Zero);
     }
 }
diff --git a/Automaton/IPC/vnavmeshIPC.cs b/Automaton/IPC/vnavmeshIPC.cs
@@ -22,6 +22,6 @@ internal class NavmeshIPC
     [EzIPC("Path.%m")] public readonly Action Stop;
     [EzIPC("Path.%m")] public readonly Func<bool> IsRunning;
 
-    [EzIPC("Query.Mesh.%m")] public readonly Func<Vector3, float, float, Vector3> NearestPoint;
-    [EzIPC("Query.Mesh.%m")] public readonly Func<Vector3, float, bool, Vector3> PointOnFloor;
+    [EzIPC("Query.Mesh.%m")] public readonly Func<Vector3, float, float, Vector3?> NearestPoint;
+    [EzIPC("Query.Mesh.%m")] public readonly Func<Vector3, float, bool, Vector3?> PointOnFloor;
 }