fix: add sight check for action target.

ArchiDog1998 · May 26, 2023 · 6bb38be · 6bb38be
1 parent f3e14cd
commit 6bb38be
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/RotationSolver.Basic/Actions/BaseAction_Target.cs b/RotationSolver.Basic/Actions/BaseAction_Target.cs
@@ -481,8 +481,8 @@ public unsafe bool CanUseTo(BattleChara tar)
 
         if (!ActionManager.CanUseActionOnTarget(AdjustedID, tarAddress)) return false;
 
-        var point = Player.Object.Position;
-        var tarPt = tar.Position;
+        var point = Player.Object.Position + Vector3.UnitY * Player.GameObject->Height;
+        var tarPt = tar.Position + Vector3.UnitY * tar.GetAddress()->Height;
         var direction = tarPt - point;
         if(BGCollisionModule.Raycast(point, direction, out var _, direction.Length())) return false;
 

diff --git a/RotationSolver/UI/OverlayWindow.cs b/RotationSolver/UI/OverlayWindow.cs
@@ -127,21 +127,19 @@ private static void DrawTarget(BattleChara tar, uint color, float radius, out Ve
     const int COUNT = 20;
     private static void DrawPositional()
     {
-        //if (!Player.Object.IsJobCategory(JobRole.Tank)
-        //    && !Player.Object.IsJobCategory(JobRole.Melee)) return;
+        if (!Player.Object.IsJobCategory(JobRole.Tank)
+            && !Player.Object.IsJobCategory(JobRole.Melee)) return;
 
-        //var target = ActionUpdater.NextGCDAction?.Target?.IsNPCEnemy() ?? false
-        //    ? ActionUpdater.NextGCDAction.Target
-        //    : Svc.Targets.Target?.IsNPCEnemy() ?? false
-        //    ? Svc.Targets.Target
-        //    : null;
-
-        var target = Player.Object;
+        var target = ActionUpdater.NextGCDAction?.Target?.IsNPCEnemy() ?? false
+            ? ActionUpdater.NextGCDAction.Target
+            : Svc.Targets.Target?.IsNPCEnemy() ?? false
+            ? Svc.Targets.Target
+            : null;
 
         if (target == null) return;
 
-        //if (ActionUpdater.NextGCDAction != null
-        //    && !ActionUpdater.NextGCDAction.IsSingleTarget) return;
+        if (ActionUpdater.NextGCDAction != null
+            && !ActionUpdater.NextGCDAction.IsSingleTarget) return;
 
         Vector3 pPosition = target.Position;
 

diff --git a/RotationSolver/UI/RotationConfigWindow_Debug.cs b/RotationSolver/UI/RotationConfigWindow_Debug.cs
@@ -10,6 +10,7 @@ internal partial class RotationConfigWindow
     private void DrawDebugTab()
     {
         if (!Player.Available) return;
+
         var str = SocialUpdater.EncryptString(Player.Object);
         ImGui.SetNextItemWidth(ImGui.CalcTextSize(str).X + 10);
         ImGui.InputText("That is your HASH", ref str, 100);
@@ -98,6 +99,7 @@ private unsafe void DrawTargetData()
     {
         if(Svc.Targets.Target != null)
         {
+            ImGui.Text("Height: " + Svc.Targets.Target.GetAddress()->Height.ToString());
             ImGui.Text("Kind: " + Svc.Targets.Target.GetObjectKind().ToString());
             ImGui.Text("SubKind: " + Svc.Targets.Target.GetBattleNPCSubKind().ToString());
             var owner = Svc.Objects.SearchById(Svc.Targets.Target.OwnerId);

diff --git a/RotationSolver/Updaters/MajorUpdater.cs b/RotationSolver/Updaters/MajorUpdater.cs
@@ -42,7 +42,7 @@ private static void FrameworkUpdate(Framework framework)
                 bool newValue = Svc.Condition[(ConditionFlag)indexs[i]];
                 if (_values.TryGetValue(i, out bool value) && value != newValue && indexs[i] != 48 && indexs[i] != 27)
                 {
-                    Svc.Toasts.ShowQuest(indexs[i].ToString() + " " + key + ": " + newValue.ToString());
+                    //Svc.Toasts.ShowQuest(indexs[i].ToString() + " " + key + ": " + newValue.ToString());
                 }
                 _values[i] = newValue;
             }