update BLM DRG MCH AST

44451516 · Nov 30, 2023 · 7ee8c5c · 7ee8c5c
1 parent 9fe352d
commit 7ee8c5c
Show file tree

Hide file tree

Showing 17 changed files with 4,605 additions and 3,017 deletions.
diff --git a/XIVSlothCombo/Combos/CustomComboPreset.cs b/XIVSlothCombo/Combos/CustomComboPreset.cs
diff --git a/XIVSlothCombo/Combos/JobHelpers/BLM.cs b/XIVSlothCombo/Combos/JobHelpers/BLM.cs
diff --git a/XIVSlothCombo/Combos/JobHelpers/DRG.cs b/XIVSlothCombo/Combos/JobHelpers/DRG.cs
diff --git a/XIVSlothCombo/Combos/JobHelpers/MCH.cs b/XIVSlothCombo/Combos/JobHelpers/MCH.cs
diff --git a/XIVSlothCombo/Combos/JobHelpers/NIN.cs b/XIVSlothCombo/Combos/JobHelpers/NIN.cs
@@ -8,7 +8,7 @@
 
 namespace XIVSlothCombo.Combos.JobHelpers
 {
-    internal class NIN
+    internal class  NIN
     {
         internal class MudraCasting : PvE.NIN
         {

diff --git a/XIVSlothCombo/Combos/PvE/BLM.cs b/XIVSlothCombo/Combos/PvE/BLM.cs
diff --git a/XIVSlothCombo/Combos/PvE/DRG.cs b/XIVSlothCombo/Combos/PvE/DRG.cs
diff --git a/XIVSlothCombo/Combos/PvE/MCH.cs b/XIVSlothCombo/Combos/PvE/MCH.cs
diff --git a/XIVSlothCombo/CustomCombo/Functions/Config.cs b/XIVSlothCombo/CustomCombo/Functions/Config.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Linq;
 using XIVSlothCombo.Core;
+using XIVSlothCombo.Services;
 
 namespace XIVSlothCombo.CustomComboNS.Functions
 {
@@ -43,8 +45,29 @@ internal class UserBoolArray : UserData
     {
         public UserBoolArray(string v) : base(v) { }
         public int Count => PluginConfiguration.GetCustomBoolArrayValue(this.pName).Length;
-        public bool this[int index] => PluginConfiguration.GetCustomBoolArrayValue(this.pName)[index];
         public static implicit operator bool[](UserBoolArray o) => PluginConfiguration.GetCustomBoolArrayValue(o.pName);
+        public bool this[int index]
+        {
+            get
+            {
+                if (index >= this.Count)
+                {
+                    var array = PluginConfiguration.GetCustomBoolArrayValue(this.pName);
+                    Array.Resize(ref array, index + 1);
+                    array[index] = false;
+                    PluginConfiguration.SetCustomBoolArrayValue(this.pName, array);
+                    Service.Configuration.Save();
+                }
+                return PluginConfiguration.GetCustomBoolArrayValue(this.pName)[index];
+            }
+        }
+
+        public bool All(Func<bool, bool> predicate)
+        {
+            var array = PluginConfiguration.GetCustomBoolArrayValue(this.pName);
+            return array.All(predicate);
+
+        }
     }
 
 }
diff --git a/XIVSlothCombo/Data/ActionWatching.cs b/XIVSlothCombo/Data/ActionWatching.cs
@@ -104,30 +104,29 @@ private unsafe static void SendActionDetour(long targetObjectId, byte actionType
         private unsafe static void CheckForChangedTarget(uint actionId, ref long targetObjectId)
         {
             if (actionId is AST.Balance or AST.Bole or AST.Ewer or AST.Arrow or AST.Spire or AST.Spear &&
-                AST.AST_QuickTargetCards.SelectedRandomMember is not null &&
-                !OutOfRange(actionId, (GameObject*)Service.ClientState.LocalPlayer.Address, (GameObject*)AST.AST_QuickTargetCards.SelectedRandomMember.Address))
+                Combos.JobHelpers.AST.AST_QuickTargetCards.SelectedRandomMember is not null &&
+                !OutOfRange(actionId, (GameObject*)Service.ClientState.LocalPlayer.Address, (GameObject*)Combos.JobHelpers.AST.AST_QuickTargetCards.SelectedRandomMember.Address))
             {
                 int targetOptions = AST.Config.AST_QuickTarget_Override;
 
                 switch (targetOptions)
                 {
                     case 0:
-                        targetObjectId = AST.AST_QuickTargetCards.SelectedRandomMember.ObjectId;
+                        targetObjectId = Combos.JobHelpers.AST.AST_QuickTargetCards.SelectedRandomMember.ObjectId;
                         break;
                     case 1:
-                        if (Service.ClientState.LocalPlayer.TargetObject is not null)
+                        if (CustomComboFunctions.HasFriendlyTarget())
                             targetObjectId = Service.ClientState.LocalPlayer.TargetObject.ObjectId;
                         else
-                            targetObjectId = AST.AST_QuickTargetCards.SelectedRandomMember.ObjectId;
+                            targetObjectId = Combos.JobHelpers.AST.AST_QuickTargetCards.SelectedRandomMember.ObjectId;
                         break;
                     case 2:
                         if (CustomComboFunctions.GetHealTarget(true, true) is not null)
                             targetObjectId = CustomComboFunctions.GetHealTarget(true, true).ObjectId;
                         else
-                            targetObjectId = AST.AST_QuickTargetCards.SelectedRandomMember.ObjectId;
+                            targetObjectId = Combos.JobHelpers.AST.AST_QuickTargetCards.SelectedRandomMember.ObjectId;
                         break;
                 }
-
             }
         }
 

diff --git a/XIVSlothCombo/Translatezh/Translatezh_CN.cs b/XIVSlothCombo/Translatezh/Translatezh_CN.cs
@@ -746,14 +746,14 @@ public class Translatezh_CN
         {"Adds True North to the main combo right before positionals if you aren't in the correct position for their bonuses.","等待翻译"},
         #endregion
         #region NINJA
-        {"Simple Mode - Single Target","下忍模式 - 单目标"},
+        {"Simple Mode - Single Target","简单模式 - 单目标"},
         {"Replaces Spinning Edge with a one-button full single target rotation.\nThis is the ideal option for newcomers to the job.","将双刃旋替换为一键单目标连击。\n一键输出，下忍的理想之选。"},
         {"Balance Opener Option","平衡起手"},
         {"Starts with the Balance opener.\nDoes pre-pull first, if you enter combat before hiding the opener will fail.\nLikewise, moving during TCJ will cause the opener to fail too.\nRequires you to be out of combat with majority of your cooldowns available for it to work.",
         "平衡起手开场。\n战斗前需要做一定准备，如果你在隐遁就前进入了战斗，起手爆发将会失败。\n相同的，如果你在天地人期间移动，也会导致起手失败。\n需要你退出战斗，并且所有技能冷却完毕，它才能正常工作。"},
-        {"Simple Mode - AoE","下忍模式 - AoE"},
+        {"Simple Mode - AoE","简单模式 - AoE"},
         {"Turns Death Blossom into a one-button full AoE rotation.","将血雨飞花替换为一键AOE连击"},
-        {"Advanced Mode - Single Target","上忍模式 - 单目标"},
+        {"Advanced Mode - Single Target","高级模式 - 单目标"},
         {"Replace Spinning Edge with a one-button full single target rotation.\nThese features are ideal if you want to customize the rotation.","将双刃旋替换为一键单目标连击。\n自定义循环，上忍的理想之选。"},
         {"Throwing Dagger Uptime Option","飞刀 选项"},
         {"Adds Throwing Dagger to Advanced Mode if out of melee range.","如果在近战攻击距离以外，将飞刀加入循环。"},
@@ -814,7 +814,7 @@ public class Translatezh_CN
         {"Adds Shade Shift to Advanced Mode.","将 残影 加入一键循环"},
         {"Bloodbath Option","浴血 选项"},
         {"Adds Bloodbath to Advanced Mode.","将 浴血 加入一键循环"},
-        {"Advanced Mode - AoE","上忍模式 - AoE"},
+        {"Advanced Mode - AoE","高级模式 - AoE"},
         {"Replace Death Blossom with a one-button full AoE rotation.\nThese features are ideal if you want to customize the rotation.","将血雨飞花替换为一键群体连击。\n自定义循环，上忍的理想之选。"},
         {"Adds Assassinate/Dream Within a Dream to Advanced Mode.","将 断绝/梦幻三段 加入一键循环"},
         {"Use Katon","使用 火遁"},

diff --git a/XIVSlothCombo/Window/ConfigWindow.cs b/XIVSlothCombo/Window/ConfigWindow.cs
@@ -131,11 +131,11 @@ public void DrawConfig()
 
         private unsafe void DrawTargetHelper()
         {
-            if (AST.AST_QuickTargetCards.SelectedRandomMember is not null)
+            if (Combos.JobHelpers.AST.AST_QuickTargetCards.SelectedRandomMember is not null)
             {
                 for (int i = 1; i <= 8; i++)
                 {
-                    if (CustomComboFunctions.GetPartySlot(i) == AST.AST_QuickTargetCards.SelectedRandomMember)
+                    if (CustomComboFunctions.GetPartySlot(i) == Combos.JobHelpers.AST.AST_QuickTargetCards.SelectedRandomMember)
                     {
                         IntPtr partyPTR = Service.GameGui.GetAddonByName("_PartyList", 1);
                         if (partyPTR == IntPtr.Zero)