Merge pull request #22 from LTS-FFXIV/LTS-FFXIV-Beautys-Wicked-Wiles2…

…-Electric-Boogaloo Lakshmi, default config, and configwindow fix
Jaksuhn · Jan 25, 2024 · 885e9ec · 885e9ec
2 parents de10a21 + 870d5e2
commit 885e9ec
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/Resources/HostileCastingArea.json b/Resources/HostileCastingArea.json
@@ -62,10 +62,13 @@
   8028,
   8039,
   8367,
+  8521,
   8581,
+  9349,
   9414,
   9416,
   9523,
+  9568,
   9660,
   9665,
   9670,
@@ -79,6 +82,7 @@
   9828,
   9841,
   9869,
+  9990,
   10086,
   10097,
   10284,
@@ -481,4 +485,4 @@
   30288,
   28907,
   24189
-]
+]
diff --git a/Resources/PriorityStatus.json b/Resources/PriorityStatus.json
@@ -1,3 +1,4 @@
 [
   944
-]
+  1290
+]
diff --git a/RotationSolver.Basic/Data/ActionID.cs b/RotationSolver.Basic/Data/ActionID.cs
@@ -5278,5 +5278,14 @@ public enum ActionID : uint
     /// </summary>
     LostSeraphStrike = 22354,
 
+    #endregion    #endregion
+
+    #region Duty Actions
+
+    /// <summary>
+    /// 
+    /// </summary>
+    Vril = 8517, /// ReAction also listing 9345, but that might be for normal mode, found 8517 doing Extreme through RS debug
+
     #endregion
 }
diff --git a/RotationSolver.Basic/Data/StatusID.cs b/RotationSolver.Basic/Data/StatusID.cs
@@ -2179,5 +2179,14 @@ public enum StatusID : ushort
 
     #endregion WHM_PvP
 
+    #region Duty_Action
+
+    /// <summary>
+    ///
+    /// </summary>
+    Vril = 1290,
+
+    #endregion Duty_Action
+
     #endregion
 }
diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs
@@ -1774,7 +1774,7 @@ private static void DrawList()
     private static readonly CollapsingHeaderGroup _idsHeader = new(new()
     {
         { () => LocalizationManager.RightLang.ConfigWindow_List_Statuses, DrawListStatuses},
-        { () => Service.Config.GetValue(PluginConfigBool.UseDefenseAbility) ? LocalizationManager.RightLang.ConfigWindow_List_Actions : string.Empty, DrawListActions},
+        { () => LocalizationManager.RightLang.ConfigWindow_List_Actions, DrawListActions},
         { () => LocalizationManager.RightLang.ConfigWindow_List_Territories, DrawListTerritories},
     });
     private static void DrawListStatuses()