fix: replaced the action id.

ArchiDog1998 · Jan 19, 2024 · 501c272 · 501c272
1 parent 69184dc
commit 501c272
Show file tree

Hide file tree

Showing 32 changed files with 169 additions and 2,328 deletions.
diff --git a/DefaultRotations/Healer/SCH_Default.cs b/DefaultRotations/Healer/SCH_Default.cs
@@ -32,7 +32,7 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction act)
         foreach (var item in PartyMembers)
         {
             if (item.GetHealthRatio() < 0.9) continue;
-            if (item.HasStatus(true, StatusID.Aetherpact))
+            if (item.HasStatus(true, StatusID.FeyUnion_1223))
             {
                 act = Aetherpact;
                 return true;
@@ -79,7 +79,7 @@ protected override bool HealSingleGCD(out IAction act)
     protected override bool HealSingleAbility(out IAction act)
     {
         //判断是否有人有线
-        var haveLink = PartyMembers.Any(p => p.HasStatus(true, StatusID.Aetherpact));
+        var haveLink = PartyMembers.Any(p => p.HasStatus(true, StatusID.FeyUnion_1223));
 
         //以太契约
         if (Aetherpact.CanUse(out act) && FairyGauge >= 70 && !haveLink) return true;

diff --git a/DefaultRotations/Healer/WHM_Default.cs b/DefaultRotations/Healer/WHM_Default.cs
@@ -102,7 +102,7 @@ protected override bool HealAreaGCD(out IAction act)
     {
         if (AfflatusRapture.CanUse(out act)) return true;
 
-        int hasMedica2 = PartyMembers.Count((n) => n.HasStatus(true, StatusID.Medica2));
+        int hasMedica2 = PartyMembers.Count((n) => n.HasStatus(true, StatusID.MedicaIi));
 
         if (Medica2.CanUse(out act) && hasMedica2 < PartyMembers.Count() / 2 && !IsLastAction(true, Medica2)) return true;
 

diff --git a/DefaultRotations/Magical/BLM_Default.cs b/DefaultRotations/Magical/BLM_Default.cs
@@ -305,7 +305,7 @@ private static bool AddThunder(out IAction act, uint gcdCount = 3)
 
         //So long for thunder.
         if (Thunder.CanUse(out _) && !Thunder.Target.WillStatusEndGCD(gcdCount, 0, true,
-            StatusID.Thunder, StatusID.Thunder2, StatusID.Thunder3, StatusID.Thunder4))
+            StatusID.Thunder, StatusID.ThunderIi, StatusID.ThunderIii, StatusID.ThunderIv))
             return false;
 
         if (Thunder2.CanUse(out act)) return true;

diff --git a/DefaultRotations/Magical/BLU_Default.cs b/DefaultRotations/Magical/BLU_Default.cs
@@ -59,7 +59,7 @@ protected override bool GeneralGCD(out IAction act)
             return false;
         }
         //穿甲散弹
-        if (Player.HasStatus(true, StatusID.SurpanakhaFury))
+        if (Player.HasStatus(true, StatusID.SurpanakhasFury))
         {
             if (Surpanakha.CanUse(out act, CanUseOption.MustUse | CanUseOption.EmptyOrSkipCombo)) return true;
         }

diff --git a/DefaultRotations/Magical/RDM_Default.cs b/DefaultRotations/Magical/RDM_Default.cs
@@ -52,9 +52,9 @@ protected override IAction CountDownAction(float remainTime)
             && VerthunderStartUp.CanUse(out var act, CanUseOption.EmptyOrSkipCombo)) return act;
 
         //Remove Swift
-        StatusHelper.StatusOff(StatusID.DualCast);
+        StatusHelper.StatusOff(StatusID.Dualcast);
         StatusHelper.StatusOff(StatusID.Acceleration);
-        StatusHelper.StatusOff(StatusID.SwiftCast);
+        StatusHelper.StatusOff(StatusID.Swiftcast);
 
         return base.CountDownAction(remainTime);
     }

diff --git a/DefaultRotations/Magical/SMN_Default.cs b/DefaultRotations/Magical/SMN_Default.cs
@@ -55,7 +55,7 @@ protected override bool GeneralGCD(out IAction act)
 
         //毁4
         if (IsMoving && (Player.HasStatus(true, StatusID.GarudasFavor) || InIfrit)
-            && !Player.HasStatus(true, StatusID.SwiftCast) && !InBahamut && !InPhoenix
+            && !Player.HasStatus(true, StatusID.Swiftcast) && !InBahamut && !InPhoenix
             && RuinIV.CanUse(out act, CanUseOption.MustUse)) return true;
 
         //召唤蛮神
@@ -89,7 +89,7 @@ protected override bool GeneralGCD(out IAction act)
                 break;
         }
         if (SummonTimeEndAfterGCD() && AttunmentTimeEndAfterGCD() &&
-            !Player.HasStatus(true, StatusID.SwiftCast) && !InBahamut && !InPhoenix &&
+            !Player.HasStatus(true, StatusID.Swiftcast) && !InBahamut && !InPhoenix &&
             RuinIV.CanUse(out act, CanUseOption.MustUse)) return true;
         //迸裂三灾
         if (Outburst.CanUse(out act)) return true;

diff --git a/DefaultRotations/Melee/MNK_Default.cs b/DefaultRotations/Melee/MNK_Default.cs
@@ -67,7 +67,7 @@ protected override bool GeneralGCD(out IAction act)
         if (PerfectBalanceActions(out act)) return true;
 
 
-        if (Player.HasStatus(true, StatusID.CoerlForm))
+        if (Player.HasStatus(true, StatusID.CoeurlForm))
         {
             if (CoerlForm(out act)) return true;
         }

diff --git a/DefaultRotations/Melee/RPR_Default.cs b/DefaultRotations/Melee/RPR_Default.cs
@@ -149,12 +149,12 @@ protected override bool AttackAbility(out IAction act)
             if (LemuresSlice.CanUse(out act, CanUseOption.EmptyOrSkipCombo)) return true;
         }
 
-        if (PlentifulHarvest.EnoughLevel && !Player.HasStatus(true, StatusID.ImmortalSacrifice) && !Player.HasStatus(true, StatusID.BloodSownCircle) || !PlentifulHarvest.EnoughLevel)
+        if (PlentifulHarvest.EnoughLevel && !Player.HasStatus(true, StatusID.ImmortalSacrifice) && !Player.HasStatus(true, StatusID.BloodsownCircle_2972) || !PlentifulHarvest.EnoughLevel)
         {
             if (Gluttony.CanUse(out act, CanUseOption.MustUse)) return true;
         }
 
-        if (!Player.HasStatus(true, StatusID.BloodSownCircle) && !Player.HasStatus(true, StatusID.ImmortalSacrifice) && (Gluttony.EnoughLevel && !Gluttony.WillHaveOneChargeGCD(4) || !Gluttony.EnoughLevel || Soul == 100))
+        if (!Player.HasStatus(true, StatusID.BloodsownCircle_2972) && !Player.HasStatus(true, StatusID.ImmortalSacrifice) && (Gluttony.EnoughLevel && !Gluttony.WillHaveOneChargeGCD(4) || !Gluttony.EnoughLevel || Soul == 100))
         {
             if (GrimSwathe.CanUse(out act)) return true;
             if (BloodStalk.CanUse(out act)) return true;

diff --git a/DefaultRotations/Ranged/BRD_Default.cs b/DefaultRotations/Ranged/BRD_Default.cs
@@ -109,7 +109,7 @@ protected override bool AttackAbility(out IAction act)
 
         if (WanderersMinuet.CanUse(out act, CanUseOption.OnLastAbility))
         {
-            if (SongEndAfter(ARMYRemainTime) && (Song != Song.NONE || Player.HasStatus(true, StatusID.ArmyEthos))) return true;
+            if (SongEndAfter(ARMYRemainTime) && (Song != Song.NONE || Player.HasStatus(true, StatusID.ArmysEthos))) return true;
         }
 
         if (Song != Song.NONE && EmpyrealArrow.CanUse(out act)) return true;

diff --git a/DefaultRotations/Ranged/DNC_Default.cs b/DefaultRotations/Ranged/DNC_Default.cs
@@ -70,7 +70,7 @@ protected override bool AttackAbility(out IAction act)
 
     protected override bool GeneralGCD(out IAction act)
     {
-        if (!InCombat && !Player.HasStatus(true, StatusID.ClosedPosition1) && ClosedPosition.CanUse(out act)) return true;
+        if (!InCombat && !Player.HasStatus(true, StatusID.ClosedPosition) && ClosedPosition.CanUse(out act)) return true;
 
         if (DanceFinishGCD(out act)) return true;
         if (ExecuteStepGCD(out act)) return true;
@@ -126,11 +126,11 @@ private static bool UseClosedPosition(out IAction act)
     {
         if (!ClosedPosition.CanUse(out act)) return false;
 
-        if (InCombat && Player.HasStatus(true, StatusID.ClosedPosition1))
+        if (InCombat && Player.HasStatus(true, StatusID.ClosedPosition))
         {
             foreach (var friend in PartyMembers)
             {
-                if (friend.HasStatus(true, StatusID.ClosedPosition2))
+                if (friend.HasStatus(true, StatusID.ClosedPosition_2026))
                 {
                     if (ClosedPosition.Target != friend) return true;
                     break;

diff --git a/DefaultRotations/Tank/DRK_Default.cs b/DefaultRotations/Tank/DRK_Default.cs
@@ -33,7 +33,7 @@ private bool CheckDarkSide
 
             if (CombatLess) return false;
 
-            if ((InTwoMIsBurst() && HasDarkArts) || (HasDarkArts && Player.HasStatus(true, StatusID.TheBlackestNight)) || (HasDarkArts && DarkSideEndAfterGCD(3))) return true;
+            if ((InTwoMIsBurst() && HasDarkArts) || (HasDarkArts && Player.HasStatus(true, StatusID.BlackestNight)) || (HasDarkArts && DarkSideEndAfterGCD(3))) return true;
 
             if ((InTwoMIsBurst() && BloodWeapon.IsCoolingDown && LivingShadow.IsCoolingDown && SaltedEarth.IsCoolingDown && ShadowBringer.CurrentCharges == 0 && CarveAndSpit.IsCoolingDown  && SaltandDarkness.IsCoolingDown)) return true;
 
@@ -128,7 +128,7 @@ protected override bool DefenseSingleAbility(out IAction act)
     {
         act = null;
 
-        if (Player.HasStatus(true, StatusID.TheBlackestNight)) return false;
+        if (Player.HasStatus(true, StatusID.BlackestNight)) return false;
 
         //10
         if (Oblation.CanUse(out act, CanUseOption.EmptyOrSkipCombo | CanUseOption.OnLastAbility)) return true;

diff --git a/RotationSolver.Basic/Actions/BaseAction_Target.cs b/RotationSolver.Basic/Actions/BaseAction_Target.cs
@@ -124,7 +124,7 @@ public bool FindTarget(bool mustUse, byte aoeCount, out BattleChara target, out
         else if (IsTargetArea)
         {
             target = player;
-            affectedTargets = Array.Empty<BattleChara>();
+            affectedTargets = [];
             return TargetArea(range, mustUse, aoeCount, player);
         }
         else if (_action.CanTargetParty && _action.CanTargetHostile)