Merge pull request #969 from FFXIV-CombatReborn/starboy

Fix for PCT PvP Star Prism action, added more cycling options for new command

Author: LTS-FFXIV

RotationSolver.Basic/Data/CycleType.cs

@@ -17,6 +17,12 @@ public enum CycleType : byte
     [Description("Cycle between each Auto, Manual, and Off")]
     CycleAllAuto,
 
+    /// <summary>
+    /// Cycle between Auto and Off
+    /// </summary>
+    [Description("Cycle between Auto and Off")]
+    CycleAuto,
+
     /// <summary>
     /// Cycle between Manual and Off
     /// </summary>

RotationSolver.Basic/Data/DTRType.cs

@@ -17,6 +17,12 @@ public enum DTRType : byte
     [Description("Cycle between each Auto, Manual, and Off")]
     DTRAllAuto,
 
+    /// <summary>
+    /// Cycle between Auto and Off
+    /// </summary>
+    [Description("Cycle between Auto and Off")]
+    DTRAuto,
+
     /// <summary>
     /// Cycle between Manual and Off
     /// </summary>

RotationSolver.Basic/Rotations/Basic/PictomancerRotation.cs

@@ -980,7 +980,7 @@ static partial void ModifyTemperaGrassaPvP(ref ActionSetting setting)
 
     static partial void ModifyStarPrismPvP(ref ActionSetting setting)
     {
-        setting.StatusNeed = [StatusID.StarPrism];
+        setting.StatusNeed = [StatusID.Starstruck_4118];
         setting.MPOverride = () => 0;
         setting.StatusProvide = [StatusID.StarPrism];
         setting.CreateConfig = () => new ActionConfig()

RotationSolver/Commands/RSCommands_OtherCommand.cs

@@ -53,6 +53,10 @@ private static void ExecuteCycleCommand()
         {
             CycleStateWithAllTargetTypes();
         }
+        else if (Service.Config.CycleType == CycleType.CycleAuto)
+        {
+            CycleStateAuto();
+        }
         else if (Service.Config.CycleType == CycleType.CycleManual)
         {
             CycleStateManual();

RotationSolver/Commands/RSCommands_StateSpecialCommand.cs

@@ -100,6 +100,26 @@ public static void CycleStateManualAuto()
             DoStateCommandType(StateCommandType.Manual);
         }
 
+        public static void CycleStateAuto()
+        {
+            // If currently Off, go to Auto
+            if (!DataCenter.State)
+            {
+                DoStateCommandType(StateCommandType.Auto);
+                return;
+            }
+
+            // If currently in Auto mode, turn Off
+            if (DataCenter.State)
+            {
+                DoStateCommandType(StateCommandType.Off);
+                return;
+            }
+
+            // If currently On but not Auto, switch to Auto
+            DoStateCommandType(StateCommandType.Manual);
+        }
+
         public static void CycleStateManual()
         {
             // If currently Off, go to Manual

RotationSolver/Updaters/MiscUpdater.cs

@@ -60,6 +60,10 @@ internal static void UpdateEntry()
                 {
                     _dtrEntry.OnClick = _ => RSCommands.CycleStateWithAllTargetTypes();
                 }
+                else if (Service.Config.DTRType == DTRType.DTRAuto)
+                {
+                    _dtrEntry.OnClick = _ => RSCommands.CycleStateAuto();
+                }
                 else if (Service.Config.DTRType == DTRType.DTRManual)
                 {
                     _dtrEntry.OnClick = _ => RSCommands.CycleStateManual();