fix: add some bad status, drg mnk low levels patched.

ArchiDog1998 · Jan 23, 2023 · 9f90915 · 9f90915
1 parent 0812c97
commit 9f90915
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/RotationSolver/Helpers/ConfigurationHelper.cs b/RotationSolver/Helpers/ConfigurationHelper.cs
@@ -33,9 +33,11 @@ public record LocationInfo(EnemyPositional Loc, byte[] Tags);
 
     public static readonly uint[] BadStatus = new uint[]
     {
-        579, //状态限制
-        573, //没学会
-        572, //一些额外条件未满足
+        581, //Unable to use.
+        579, //Between Area
+        574, //Job
+        573, //没学会 ?
+        572, //一些额外条件未满足 ?
     };
 
     public static readonly VirtualKey[] Keys = new VirtualKey[] { VirtualKey.CONTROL, VirtualKey.SHIFT, VirtualKey.MENU };

diff --git a/RotationSolver/Properties/AssemblyInfo.cs b/RotationSolver/Properties/AssemblyInfo.cs
@@ -4,8 +4,8 @@
 [assembly: AssemblyCompany("-")]
 [assembly: AssemblyConfiguration("Release")]
 [assembly: AssemblyDescription("Based on the pve combat information in one frame, find the best action.")]
-[assembly: AssemblyFileVersion("1.1.0")]
-[assembly: AssemblyInformationalVersion("1.1.0")]
+[assembly: AssemblyFileVersion("1.2.0")]
+[assembly: AssemblyInformationalVersion("1.2.0")]
 [assembly: TargetPlatform("Windows7.0")]
 [assembly: SupportedOSPlatform("Windows7.0")]
-[assembly: AssemblyVersion("1.1.0")]
+[assembly: AssemblyVersion("1.2.0")]
diff --git a/RotationSolver/Rotations/Melee/DRG/DRG_Default.cs b/RotationSolver/Rotations/Melee/DRG/DRG_Default.cs
@@ -130,17 +130,16 @@ private protected override bool GeneralGCD(out IAction act)
             if (WheelingThrust.CanUse(out act)) return true;
         }
 
+        if (FullThrust.CanUse(out act)) return true;
+        if (ChaosThrust.CanUse(out act)) return true;
+
         //看看是否需要续Buff
-        if (!Player.WillStatusEndGCD(5, 0, true, StatusID.PowerSurge))
-        {
-            if (FullThrust.CanUse(out act)) return true;
-            if (VorpalThrust.CanUse(out act)) return true;
-            if (ChaosThrust.CanUse(out act)) return true;
-        }
-        else
+        if (Player.WillStatusEndGCD(5, 0, true, StatusID.PowerSurge))
         {
             if (Disembowel.CanUse(out act)) return true;
         }
+
+        if (VorpalThrust.CanUse(out act)) return true;
         if (TrueThrust.CanUse(out act)) return true;
 
         if (RSCommands.SpecialType == SpecialCommandType.MoveForward && MoveForwardAbility(1, out act)) return true;

diff --git a/RotationSolver/Rotations/Melee/MNK/MNK_Default.cs b/RotationSolver/Rotations/Melee/MNK/MNK_Default.cs
@@ -144,6 +144,10 @@ private protected override bool GeneralGCD(out IAction act)
             if (OpoOpoForm(out act)) return true;
         }
 
+        if (CoerlForm(out act)) return true;
+        if (RaptorForm(out act)) return true;
+        if (OpoOpoForm(out act)) return true;
+
         if (RSCommands.SpecialType == SpecialCommandType.MoveForward && MoveForwardAbility(1, out act)) return true;
         if (Chakra < 5 && Meditation.CanUse(out act)) return true;
         if (Configs.GetBool("AutoFormShift") && FormShift.CanUse(out act)) return true;

diff --git a/pluginmaster.json b/pluginmaster.json
@@ -16,7 +16,7 @@
     ],
     "IsHide": false,
     "InternalName": "RotationSolver",
-    "AssemblyVersion": "1.1.0",
+    "AssemblyVersion": "1.2.0",
     "IsTestingExclusive": false,
     "RepoUrl": "https://github.com/ArchiDog1998/RotationSolver",
     "ApplicableVersion": "any",