Merge pull request #637 from FFXIV-CombatReborn/moreBase

SMN Base fixes, core system fixes and cleanup

Author: LTS-FFXIV

RotationSolver.Basic/Configuration/OtherConfiguration.cs

@@ -220,17 +220,30 @@ private static void Save<T>(T value, string name)
 
     private static void SavePath<T>(T value, string path)
     {
-        try
+        int retryCount = 3;
+        int delay = 1000; // 1 second delay
+
+        for (int i = 0; i < retryCount; i++)
         {
-            File.WriteAllText(path,
-            JsonConvert.SerializeObject(value, Formatting.Indented, new JsonSerializerSettings()
+            try
             {
-                TypeNameHandling = TypeNameHandling.None,
-            }));
-        }
-        catch (Exception ex)
-        {
-            Svc.Log.Warning(ex, $"Failed to save the file to {path}");
+                File.WriteAllText(path,
+                JsonConvert.SerializeObject(value, Formatting.Indented, new JsonSerializerSettings()
+                {
+                    TypeNameHandling = TypeNameHandling.None,
+                }));
+                return; // Exit the method if successful
+            }
+            catch (IOException ex) when (i < retryCount - 1)
+            {
+                Svc.Log.Warning(ex, $"Failed to save the file to {path}. Retrying in {delay}ms...");
+                Thread.Sleep(delay); // Wait before retrying
+            }
+            catch (Exception ex)
+            {
+                Svc.Log.Warning(ex, $"Failed to save the file to {path}");
+                return; // Exit the method if an unexpected exception occurs
+            }
         }
     }
 

RotationSolver.Basic/Helpers/PriorityTargetHelper.cs

@@ -5,7 +5,7 @@ namespace RotationSolver.Basic.Helpers
 {
     internal class PriorityTargetHelper
     {
-        private static readonly string FilePath = "PriorityId.json";
+        private static readonly string FilePath = "PrioTargetId.json";
 
         // List of OIDs (DataId)
         private static HashSet<uint> priorityOids = LoadPriorityOids();

RotationSolver.Basic/Helpers/ReflectionHelper.cs

@@ -15,10 +15,8 @@ internal static PropertyInfo[] GetStaticProperties<T>(this Type? type)
         {
             if (type == null) return Array.Empty<PropertyInfo>();
 
-            var properties = type.GetRuntimeProperties()
+            var properties = type.GetProperties(BindingFlags.Static | BindingFlags.Public)
                                  .Where(prop => typeof(T).IsAssignableFrom(prop.PropertyType)
-                                            && prop.GetMethod is MethodInfo methodInfo
-                                            && methodInfo.IsPublic && methodInfo.IsStatic
                                             && prop.GetCustomAttribute<ObsoleteAttribute>() == null)
                                  .ToArray();
 
@@ -35,7 +33,7 @@ internal static IEnumerable<MethodInfo> GetAllMethodInfo(this Type? type)
         {
             if (type == null) return Enumerable.Empty<MethodInfo>();
 
-            var methods = type.GetRuntimeMethods()
+            var methods = type.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic)
                               .Where(method => !method.IsConstructor)
                               .ToArray();
 
@@ -51,8 +49,10 @@ internal static IEnumerable<MethodInfo> GetAllMethodInfo(this Type? type)
         /// <returns>The property information if found, otherwise null.</returns>
         internal static PropertyInfo? GetPropertyInfo(this Type type, string name)
         {
-            var property = type.GetRuntimeProperties()
-                               .FirstOrDefault(prop => prop.Name == name && prop.GetMethod is MethodInfo methodInfo && methodInfo.IsStatic);
+            if (type == null) throw new ArgumentNullException(nameof(type));
+            if (string.IsNullOrEmpty(name)) throw new ArgumentException("Property name cannot be null or empty", nameof(name));
+
+            var property = type.GetProperty(name, BindingFlags.Static | BindingFlags.Public);
 
             return property ?? type.BaseType?.GetPropertyInfo(name);
         }
@@ -66,9 +66,9 @@ internal static IEnumerable<MethodInfo> GetAllMethodInfo(this Type? type)
         internal static MethodInfo? GetMethodInfo(this Type? type, string name)
         {
             if (type == null) return null;
+            if (string.IsNullOrEmpty(name)) throw new ArgumentException("Method name cannot be null or empty", nameof(name));
 
-            var method = type.GetRuntimeMethods()
-                             .FirstOrDefault(m => m.Name == name && m.IsStatic && !m.IsConstructor && m.ReturnType == typeof(bool));
+            var method = type.GetMethod(name, BindingFlags.Static | BindingFlags.Public);
 
             return method ?? type.BaseType?.GetMethodInfo(name);
         }

RotationSolver.Basic/Rotations/Basic/SummonerRotation.cs

@@ -1,4 +1,4 @@
-using Dalamud.Interface.Colors;
+using Dalamud.Interface.Colors;
 
 namespace RotationSolver.Basic.Rotations.Basic;
 
@@ -128,7 +128,7 @@ protected static bool AttunmentTimeEndAfterGCD(uint gcdCount = 0, float offset =
     private static bool HasSummon => DataCenter.HasPet && SummonTimeEndAfterGCD();
     #endregion
 
-    #region PvE Actions Unassignable
+    #region PvE Actions Unassignable Status
 
     /// <summary>
     /// 
@@ -457,6 +457,10 @@ static partial void ModifyNecrotizePvE(ref ActionSetting setting)
     static partial void ModifySearingFlashPvE(ref ActionSetting setting)
     {
         setting.StatusNeed = [StatusID.RubysGlimmer];
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
     }
 
     static partial void ModifyLuxSolarisPvE(ref ActionSetting setting)
@@ -474,11 +478,32 @@ static partial void ModifyAstralImpulsePvE(ref ActionSetting setting)
     static partial void ModifyAstralFlarePvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => AstralFlarePvEReady;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 3,
+        };
     }
 
     static partial void ModifyDeathflarePvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => InBahamut;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
+    }
+
+    static partial void ModifyWyrmwavePvE(ref ActionSetting setting)
+    {
+        
+    }
+
+    static partial void ModifyAkhMornPvE(ref ActionSetting setting)
+    {
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
     }
 
     static partial void ModifyRubyRitePvE(ref ActionSetting setting)
@@ -521,6 +546,24 @@ static partial void ModifyEnkindlePhoenixPvE(ref ActionSetting setting)
         setting.ActionCheck = () => EnkindlePhoenixPvEReady;
     }
 
+    static partial void ModifyEverlastingFlightPvE(ref ActionSetting setting)
+    {
+        
+    }
+
+    static partial void ModifyScarletFlamePvE(ref ActionSetting setting)
+    {
+
+    }
+
+    static partial void ModifyRevelationPvE(ref ActionSetting setting)
+    {
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
+    }
+
     static partial void ModifyRubyCatastrophePvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => RubyCatastrophePvEReady;
@@ -540,21 +583,37 @@ static partial void ModifyCrimsonCyclonePvE(ref ActionSetting setting)
     {
         setting.StatusProvide = [StatusID.CrimsonStrikeReady_4403];
         setting.ActionCheck = () => CrimsonCyclonePvEReady;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
     }
 
     static partial void ModifyCrimsonStrikePvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => CrimsonStrikePvEReady;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
     }
 
     static partial void ModifyMountainBusterPvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => MountainBusterPvEReady;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
     }
 
     static partial void ModifySlipstreamPvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => SlipstreamPvEReady;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
     }
 
     static partial void ModifySummonSolarBahamutPvE(ref ActionSetting setting)
@@ -569,15 +628,42 @@ static partial void ModifyUmbralImpulsePvE(ref ActionSetting setting)
         setting.ActionCheck = () => UmbralImpulsePvEReady;
     }
 
+    static partial void ModifyUmbralFlarePvE(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => UmbralFlarePvEReady;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 3,
+        };
+    }
+    
     static partial void ModifySunflarePvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => InSolarBahamut;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
     }
 
     static partial void ModifyEnkindleSolarBahamutPvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => EnkindleSolarBahamutPvEReady;
     }
+
+    static partial void ModifyLuxwavePvE(ref ActionSetting setting)
+    {
+        
+    }
+
+    static partial void ModifyExodusPvE(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => InSolarBahamut;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
+    }
     #endregion
 
     #region PvP Actions