Merge pull request #492 from ArchiDog1998/main

RP

Directory.Build.props

@@ -3,7 +3,7 @@
 		<TargetFramework>net7.0-windows</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Authors>ArchiTed</Authors>
-		<Version>3.4.9</Version>
+		<Version>3.4.10</Version>
 		<PlatformTarget>x64</PlatformTarget>
 		<Platforms>AnyCPU</Platforms>
 

Resources/HostileCastingArea.json

@@ -471,5 +471,6 @@
   29870,
   7822,
   8915,
-  13708
+  13708,
+  12618
 ]

Resources/RotationSolverRecord.json

@@ -1,4 +1,4 @@
 {
-  "ClickingCount": 54546,
+  "ClickingCount": 54988,
   "SaidUsers": []
 }

RotationSolver.Basic/Configuration/Configs.cs

@@ -435,7 +435,7 @@ public enum PluginConfigFloat : byte
     [Default(0.4f, 0f, 0.7f)] CountDownAhead,
 
     [Default(24f, 0f, 90f)] MoveTargetAngle,
-    [Default(60f, 10f, 1800f)] BossTimeToKill,
+    [Default(90f, 10f, 1800f)] BossTimeToKill,
     [Default(10f, 0f, 60f)] DyingTimeToKill,
 
     [Default(16f, 9.6f, 96f)] CooldownFontSize,

RotationSolver.Basic/Data/ActionID.cs

@@ -1831,6 +1831,61 @@ public enum ActionID : uint
     /// 
     /// </summary>
     Dismantle = 2887,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_BlastCharge = 29402,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_Scattergun = 29404,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_Drill = 29405,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_Wildfire = 29409,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_BishopAutoTurret = 29412,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_Analysis = 29414,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_MarksmansSpite = 29415,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_HeatBlast = 29403,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_Bioblaster = 29406,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_AirAnchor = 29407,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_ChainSaw = 29408,
     #endregion
 
     #region MNK
@@ -3244,6 +3299,71 @@ public enum ActionID : uint
     /// 
     /// </summary>
     Slipstream = 25837,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_Ruin3 = 29664,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_AstralImpulse = 29665,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_EnkindleBahamut = 29674,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_FountainOfFire = 29666,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_EnkindlePhoenix = 29679,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_CrimsonCyclone = 29667,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_CrimsonStrike = 29668,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_Slipstream = 29669,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_RadiantAegis = 29670,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_MountainBuster = 29671,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_Fester = 29672,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_SummonBahamut = 29673,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_SummonPhoenix = 29678,
     #endregion
 
     #region WAR

RotationSolver.Basic/Data/StatusID.cs

@@ -1476,4 +1476,49 @@ public enum StatusID : ushort
     /// 
     /// </summary>
     PvP_Repertoire = 3137,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_DrillPrimed = 3150,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_BioblasterPrimed = 3151,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_AirAnchorPrimed = 3152,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_ChainSawPrimed = 3153,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_Overheat = 3149,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_Analysis = 3158,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_FirebirdTrance = 3229,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_DreadwyrmTrance = 3228,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    PvP_Sprint = 1342,
 }

RotationSolver.Basic/Helpers/ObjectHelper.cs

@@ -159,7 +159,8 @@ public static bool IsBoss(this BattleChara obj)
         if (obj == null) return false;
         if (obj.IsDummy() && !Service.Config.GetValue(Configuration.PluginConfigBool.ShowTargetTimeToKill)) return true;
 
-        return obj.GetObjectNPC()?.Rank is 2 or 6;
+        return obj.GetTimeToKill(true) >= Service.Config.GetValue(Configuration.PluginConfigFloat.BossTimeToKill)
+            || obj.GetObjectNPC()?.Rank is 1 or 2 /*or 4*/ or 6;
     }
 
     /// <summary>

RotationSolver.Basic/Rotations/Basic/MCH_Base.cs

@@ -286,6 +286,82 @@ protected static bool OverheatedEndAfterGCD(uint gctCount = 0, float offset = 0)
     public static IBaseTrait MarksmansMastery { get; } = new BaseTrait(517);
     #endregion
 
+    #region PvP
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_BlastCharge { get; } = new BaseAction(ActionID.PvP_BlastCharge);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_Scattergun { get; } = new BaseAction(ActionID.PvP_Scattergun);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_Drill { get; } = new BaseAction(ActionID.PvP_Drill)
+    {
+        StatusNeed = new StatusID[] { StatusID.PvP_DrillPrimed },
+    };
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_Wildfire { get; } = new BaseAction(ActionID.PvP_Wildfire);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_BishopAutoTurret { get; } = new BaseAction(ActionID.PvP_BishopAutoTurret);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_Analysis { get; } = new BaseAction(ActionID.PvP_Analysis);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_MarksmansSpite { get; } = new BaseAction(ActionID.PvP_MarksmansSpite)
+    {
+        ActionCheck = (t, m) => LimitBreakLevel >= 1,
+    };
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_HeatBlast { get; } = new BaseAction(ActionID.PvP_HeatBlast)
+    {
+        StatusNeed = new StatusID[] { StatusID.PvP_Overheat },
+    };
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_Bioblaster { get; } = new BaseAction(ActionID.PvP_Bioblaster)
+    {
+        StatusNeed = new StatusID[] { StatusID.PvP_BioblasterPrimed },
+    };
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_AirAnchor { get; } = new BaseAction(ActionID.PvP_AirAnchor)
+    {
+        StatusNeed = new StatusID[] { StatusID.PvP_AirAnchorPrimed },
+    };
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_ChainSaw { get; } = new BaseAction(ActionID.PvP_ChainSaw)
+    {
+        StatusNeed = new StatusID[] { StatusID.PvP_ChainSawPrimed },
+    };
+
+    #endregion
     /// <summary>
     /// 
     /// </summary>

RotationSolver.Basic/Rotations/Basic/SMN_Base.cs

@@ -457,6 +457,80 @@ public override void DisplayStatus()
     public static IBaseTrait ElementalMastery { get; } = new BaseTrait(503);
     #endregion
 
+    #region PVP
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_Ruin3 { get; } = new BaseAction(ActionID.PvP_Ruin3);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_CrimsonCyclone { get; } = new BaseAction(ActionID.PvP_CrimsonCyclone);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_CrimsonStrike { get; } = new BaseAction(ActionID.PvP_CrimsonStrike);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_Slipstream { get; } = new BaseAction(ActionID.PvP_Slipstream);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_RadiantAegis { get; } = new BaseAction(ActionID.PvP_RadiantAegis);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_MountainBuster { get; } = new BaseAction(ActionID.PvP_MountainBuster);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_Fester { get; } = new BaseAction(ActionID.PvP_Fester);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_SummonBahamut { get; } = new BaseAction(ActionID.PvP_SummonBahamut)
+    {
+        ActionCheck = (t, m) => LimitBreakLevel >= 1,
+    };
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_SummonPhoenix { get; } = new BaseAction(ActionID.PvP_SummonPhoenix)
+    {
+        ActionCheck = (t, m) => LimitBreakLevel >= 1,
+    };
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_AstralImpulse { get; } = new BaseAction(ActionID.PvP_AstralImpulse);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_FountainOfFire { get; } = new BaseAction(ActionID.PvP_FountainOfFire);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_EnkindleBahamut { get; } = new BaseAction(ActionID.PvP_EnkindleBahamut);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction PvP_EnkindlePhoenix { get; } = new BaseAction(ActionID.PvP_EnkindlePhoenix);
+
+    #endregion
+
     /// <summary>
     /// 
     /// </summary>