fix: add a warning on target in target condition.

ArchiDog1998 · Nov 4, 2023 · bcc1433 · bcc1433
1 parent 16ad53e
commit bcc1433
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 10 deletions.
diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json
@@ -1,4 +1,4 @@
 {
-  "ClickingCount": 51182,
+  "ClickingCount": 51481,
   "SaidUsers": []
 }
diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs b/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs
@@ -297,7 +297,7 @@ public override bool CanUse(out IAction act, CanUseOption option = CanUseOption.
         ActionOption.DutyAction | ActionOption.Friendly)
     {
         StatusProvide = new StatusID[] { StatusID.LostSpellforge },
-        ActionCheck = (b, m) => Target?.HasStatus(false, StatusID.MagicalAversion) ?? false,
+        ActionCheck = (b, m) => LostSpellforge.Target?.HasStatus(false, StatusID.MagicalAversion) ?? false,
         ChoiceTarget = (targets, mustUse) => targets.FirstOrDefault(t => (Job)t.ClassJob.Id switch
         {
             Job.WAR
@@ -326,7 +326,7 @@ or Job.RDM
         ActionOption.DutyAction | ActionOption.Friendly)
     {
         StatusProvide = new StatusID[] { StatusID.LostSteelsting },
-        ActionCheck = (b, m) => Target?.HasStatus(false, StatusID.PhysicalAversion) ?? false,
+        ActionCheck = (b, m) => LostSteelsting.Target?.HasStatus(false, StatusID.PhysicalAversion) ?? false,
         ChoiceTarget = (targets, mustUse) => targets.FirstOrDefault(t => (Job)t.ClassJob.Id switch
         {
             Job.WHM
@@ -354,7 +354,7 @@ or Job.RDM
         ActionOption.DutyAction | ActionOption.Friendly)
     {
         StatusProvide = new StatusID[] { StatusID.LostRampage },
-        ActionCheck = (b, m) => Target?.HasStatus(false, StatusID.PhysicalAversion) ?? false,
+        ActionCheck = (b, m) => LostRampage.Target?.HasStatus(false, StatusID.PhysicalAversion) ?? false,
     };
 
     /// <summary>
@@ -364,7 +364,7 @@ or Job.RDM
         ActionOption.DutyAction | ActionOption.Friendly)
     {
         StatusProvide = new StatusID[] { StatusID.LostBurst },
-        ActionCheck = (b, m) => Target?.HasStatus(false, StatusID.MagicalAversion) ?? false,
+        ActionCheck = (b, m) => LostBurst.Target?.HasStatus(false, StatusID.MagicalAversion) ?? false,
     };
 
     /// <summary>
@@ -466,7 +466,8 @@ or Job.RDM
     public static IBaseAction PvP_StandardIssueElixir { get; } = new BaseAction(ActionID.PvP_StandardIssueElixir, ActionOption.Heal)
     {
         ActionCheck = (t, m) => !HasHostilesInMaxRange
-            && (t.CurrentMp <= t.MaxMp / 3 || t.CurrentHp <= t.MaxHp / 3),
+            && (t.CurrentMp <= t.MaxMp / 3 || t.CurrentHp <= t.MaxHp / 3)
+            && !IsLastAction(ActionID.PvP_StandardIssueElixir),
     };
 
     /// <summary>

diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Medicine.cs b/RotationSolver.Basic/Rotations/CustomRotation_Medicine.cs
@@ -122,7 +122,9 @@ protected bool UseBurstMedicine(out IAction act, bool clippingCheck = true)
     {
         act = null;
 
+#pragma warning disable CS0618 // Type or member is obsolete
         if (!(Target?.IsDummy() ?? false) && !DataCenter.IsInHighEndDuty) return false;
+#pragma warning restore CS0618 // Type or member is obsolete
 
         return MedicineType switch
         {

diff --git a/RotationSolver.Basic/Rotations/CustomRotation_OtherInfo.cs b/RotationSolver.Basic/Rotations/CustomRotation_OtherInfo.cs
@@ -126,7 +126,9 @@ public abstract partial class CustomRotation
     #region Target
     /// <summary>
     /// The player's target.
+    /// <br>WARNING: You'd better not use it. Because this target isn't the action's target. Try to use <see cref="IBaseAction.Target"/> instead after using <seealso cref="IBaseAction.CanUse(out IAction, CanUseOption, byte, byte)"/></br>
     /// </summary>
+    [Obsolete("You'd better not use it. More information in summary.")]
     protected static BattleChara Target => Svc.Targets.Target is BattleChara b ? b : Player;
 
     /// <summary>

diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json
@@ -584,6 +584,7 @@
   "ConfigWindow_Condition_RotationNullWarning": "Rotation is null, please login or switch the job!",
   "ConfigWindow_Condition_NoItemsWarning": "There are no items!",
   "ConfigWindow_Condition_ConditionName": "Condition Name",
-  "ConfigWindow_Condition_TeritoryName": "Teritory Name",
-  "ConfigWindow_Condition_DutyName": "Duty Name"
+  "ConfigWindow_Condition_TerritoryName": "Territory Name",
+  "ConfigWindow_Condition_DutyName": "Duty Name",
+  "ConfigWindow_Condition_TargetWarning": "You'd better not use it. Because this target isn't the action's target. Try to pick it from action."
 }
diff --git a/RotationSolver/Localization/Strings.cs b/RotationSolver/Localization/Strings.cs
@@ -814,7 +814,8 @@ internal class Strings
 
     public string ConfigWindow_Condition_ConditionName { get; set; } = "Condition Name";
 
-    public string ConfigWindow_Condition_TeritoryName { get; set; } = "Teritory Name";
+    public string ConfigWindow_Condition_TerritoryName { get; set; } = "Territory Name";
 
     public string ConfigWindow_Condition_DutyName { get; set; } = "Duty Name";
+    public string ConfigWindow_Condition_TargetWarning { get; set; } = "You'd better not use it. Because this target isn't the action's target. Try to pick it from action.";
 }
diff --git a/RotationSolver/UI/ConditionDrawer.cs b/RotationSolver/UI/ConditionDrawer.cs
@@ -1022,6 +1022,12 @@ void DrawStatusIcon()
                 }
                 break;
         }
+
+        if (targetCondition._action == null && targetCondition.IsTarget)
+        {
+            using var style = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
+            ImGui.TextWrapped(LocalizationManager.RightLang.ConfigWindow_Condition_TargetWarning);
+        }
     }
 
     private static string[] _territoryNames = null;
@@ -1062,7 +1068,7 @@ private static void DrawAfter(this TerritoryCondition territoryCondition, ICusto
                 TerritoryNames, i => i.ToString(), i =>
                 {
                     territoryCondition.Name = i;
-                }, LocalizationManager.RightLang.ConfigWindow_Condition_TeritoryName);
+                }, LocalizationManager.RightLang.ConfigWindow_Condition_TerritoryName);
                 break;
 
             case TerritoryConditionType.DutyName: