Merge pull request #45 from FFXIV-CombatReborn/manual-mode-rework

Manual mode rework
FFXIV-CombatReborn · Apr 1, 2024 · a33337f · a33337f
2 parents 367f158 + 3099283
commit a33337f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 47 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -19,15 +19,6 @@ jobs:
           $tag = "${{ github.ref }}" -replace 'refs/tags/', ''
 
           "tag=$tag" | Out-File -Append -FilePath $Env:GITHUB_ENV
-
-          if ($tag -match "-test$") {
-              $branch = "testing"
-              $tag = $tag -replace '-test$', ''
-          } else {
-              $branch = "latest"
-          }
-
-          "branch=$branch" | Out-File -Append -FilePath $Env:GITHUB_ENV
           
       - name: Set up .NET
         uses: actions/setup-dotnet@v1
@@ -53,9 +44,4 @@ jobs:
         with:
           files: ./build/RotationSolver.zip
           token: ${{ secrets.GITHUB_TOKEN }}
-          draft: false
-          make_latest: ${{ env.branch == 'latest' }}
-          prerelease: ${{ env.branch == 'testing' }}
-
-
 
diff --git a/RotationSolver.Basic/Actions/ActionTargetInfo.cs b/RotationSolver.Basic/Actions/ActionTargetInfo.cs
@@ -30,11 +30,15 @@ public struct ActionTargetInfo(IBaseAction action)
     /// </summary>
     public readonly bool IsSingleTarget => action.Action.CastType == 1;
     /// <summary>
-    /// Is this action target are.
+    /// Is this action target area.
     /// </summary>
-
     public readonly bool IsTargetArea => action.Action.TargetArea;
 
+    /// <summary>
+    /// Is this action friendly.
+    /// </summary>
+    public readonly bool IsTargetFriendly => action.Setting.IsFriendly;
+
     private static bool NoAOE
     {
         get
@@ -66,6 +70,11 @@ private readonly IEnumerable<BattleChara> GetCanTargets(bool skipStatusProvideCh
             objs.Add(obj);
         }
 
+        if (DataCenter.IsManual && !IsTargetFriendly)
+        {
+            return objs.Where(CanUseTo).Where(InViewTarget).Where(action.Setting.CanTarget).Where(o => o.Address == Svc.Targets.Target.Address);
+        }
+
         return objs.Where(CanUseTo).Where(InViewTarget).Where(action.Setting.CanTarget);
     }
 
@@ -226,40 +235,9 @@ private readonly bool CheckTimeToKill(GameObject gameObject)
         {
             return FindTargetArea(canTargets, canAffects, range, player);
         }
-        else if (DataCenter.IsManual)
-        {
-            var t = Svc.Targets.Target as BattleChara;
-
-            if (t == null || !action.Setting.CanTarget(t)) return null;
-
-            if (type == TargetType.Move)
-            {
-                return null;
-            }
-            else if (IsSingleTarget)
-            {
-                if (CanUseTo(t) && CheckStatus(t, skipStatusProvideCheck) && t.DistanceToPlayer() <= range)
-                {
-                    return new(t, [.. GetAffects(t, canAffects)], t.Position);
-                }
-            }
-            else if (!NoAOE)
-            {
-                var effects = GetAffects(t, canAffects).ToArray();
-                if (effects.Length >= action.Config.AoeCount || skipAoeCheck)
-                {
-                    return new(t, effects, t.Position);
-                }
-            }
-            return null;
-        }
 
         var targets = GetMostCanTargetObjects(canTargets, canAffects,
             skipAoeCheck ? 0 : action.Config.AoeCount);
-        if (type == TargetType.BeAttacked && !action.Setting.IsFriendly)
-        {
-            type = TargetType.Big;
-        }
         var target = FindTargetByType(targets, type, action.Config.AutoHealRatio, action.Setting.SpecialType);
         if (target == null) return null;