1.5.0.72: [PUSH]

* Meisui/Tenri priority fixed and DWaD to Meisui added.
* Monk's Draconic Leap feature now properly syncs below level 50 when you don't have a form.
* Raise Hard Target Lockout Feature added.

XIVComboExpanded/Combos/All.cs

@@ -3,6 +3,7 @@
 using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Game.ClientState.JobGauge.Enums;
 using Dalamud.Game.ClientState.JobGauge.Types;
+using Lumina.Excel.Sheets;
 using Microsoft.VisualBasic;
 
 namespace XIVComboExpandedestPlugin.Combos
@@ -52,6 +53,7 @@ public const uint
         public static class Buffs
         {
             public const ushort
+                Raise = 148,
                 Swiftcast = 167,
                 EurekaMoment = 2765,
                 Troubadour = 1934,
@@ -105,6 +107,22 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
         }
     }
 
+    internal class AllRaiseHardLockoutFeature : CustomCombo
+    {
+        protected override CustomComboPreset Preset => CustomComboPreset.AllRaiseHardLockoutFeature;
+
+        protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level)
+        {
+            if (actionID == All.Raise || actionID == All.Resurrection || actionID == All.Ascend || actionID == All.Verraise || actionID == All.Egeiro || actionID == All.AngelWhisper)
+            {
+                if (TargetHasEffectAny(All.Buffs.Raise))
+                    return LocalPlayer?.ClassJob.RowId == SMN.JobID ? SCH.Physick : SMN.Physick;
+            }
+
+            return actionID;
+        }
+    }
+
     internal class AllIsleSprintFeature : CustomCombo
     {
         protected override CustomComboPreset Preset => CustomComboPreset.AllIsleSprintFeature;

XIVComboExpanded/Combos/MNK.cs

@@ -377,6 +377,8 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                 return MNK.DragonKick;
             }
 
+            if (level < MNK.Levels.DragonKick) return MNK.Bootshine;
+
             return actionID;
         }
     }

XIVComboExpanded/Combos/NIN.cs

@@ -268,6 +268,16 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
         }
     }
 
+    internal class NinjaDWaDMeisuiFeature : CustomCombo
+    {
+        protected override CustomComboPreset Preset => CustomComboPreset.NinjaDWaDMeisuiFeature;
+
+        protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level)
+        {
+            return HasEffect(NIN.Buffs.ShadowWalker) || !CanUseAction(OriginalHook(NIN.DreamWithinADream)) ? NIN.Meisui : actionID;
+        }
+    }
+
     internal class NinjaHideMugFeature : CustomCombo
     {
         protected override CustomComboPreset Preset => CustomComboPreset.NinjaHideMugFeature;
@@ -348,9 +358,6 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
         {
             if (actionID == NIN.TenChiJin)
             {
-                if (OriginalHook(NIN.TenChiJin) != NIN.TenChiJin)
-                    return OriginalHook(NIN.TenChiJin);
-
                 if (HasEffect(NIN.Buffs.ShadowWalker))
                     return NIN.Meisui;
 

XIVComboExpanded/CustomComboPreset.cs

@@ -11,14 +11,18 @@ public enum CustomComboPreset
         // ====================================================================================
         #region MULTIPLE CLASSES/DOL
 
-        // Latest enum: 9014
+        // Latest enum: 9015
 
         [OrderedEnum]
         [CustomComboInfo("Raise to Swiftcast Feature", "Replaces the respective raise on RDM/SMN/SCH/WHM/AST/SGE/BLU with Swiftcast when it is off cooldown (and Dualcast isn't up).", All.JobID, All.Raise, All.Resurrection, All.Ascend, All.Verraise, All.Egeiro, All.AngelWhisper)]
         AllSwiftcastFeature = 9001,
 
         [OrderedEnum]
-        [CustomComboInfo("Isle Sprint", "Replaces Sprint with Isle Sprint while you're in your Island Sanctuary.\nBecause apparently this hasn't been updated in SimpleTweaks after two months.", All.JobID, All.Sprint)]
+        [CustomComboInfo("Raise Hard Target Lockout", "Replaces the respective raise on RDM/SMN/SCH/WHM/AST/SGE/BLU with a useless action when hard targeting a corpse that already has a raise effect on it.", All.JobID, All.Raise, All.Resurrection, All.Ascend, All.Verraise, All.Egeiro, All.AngelWhisper)]
+        AllRaiseHardLockoutFeature = 9015,
+
+        [OrderedEnum]
+        [CustomComboInfo("Isle Sprint", "Replaces Sprint with Isle Sprint while you're in your Island Sanctuary.\nBecause sometimes SimpleTweaks doesn't have this.", All.JobID, All.Sprint)]
         AllIsleSprintFeature = 9014,
 
         [OrderedEnum]
@@ -775,7 +779,7 @@ public enum CustomComboPreset
         // ====================================================================================
         #region NINJA
 
-        // last used: 3024
+        // last used: 3025
 
         [OrderedEnum]
         [CustomComboInfo("Aeolian Edge Combo", "Replace Aeolian Edge with its combo chain.", NIN.JobID, NIN.AeolianEdge)]
@@ -814,9 +818,15 @@ public enum CustomComboPreset
         NinjaKassatsuDWaDFeature = 3015,
 
         [OrderedEnum]
+        [ConflictingCombos(NinjaDWaDMeisuiFeature)]
         [CustomComboInfo("Dream Within a Dream to Kunai's Bane", "Replaces Dream Within a Dream with Kunai's Bane/Trick Attack while Suiton or Hidden is active.", NIN.JobID, NIN.DreamWithinADream)]
         NinjaDWaDTrickFeature = 3019,
 
+        [OrderedEnum]
+        [ConflictingCombos(NinjaDWaDTrickFeature)]
+        [CustomComboInfo("Dream Within a Dream to Meisui", "Replaces Dream Within a Dream with Meisui while Suiton is active.", NIN.JobID, NIN.DreamWithinADream)]
+        NinjaDWaDMeisuiFeature = 3025,
+
         [OrderedEnum]
         [CustomComboInfo("Ten Chi Jin to Meisui", "Replaces Ten Chi Jin (the move) with Meisui while Suiton is up.", NIN.JobID, NIN.TenChiJin)]
         NinjaTCJMeisuiFeature = 3005,

XIVComboExpanded/XIVComboExpanded.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors>attick, daemitus, alymphocyte, grammernatzi</Authors>
     <Company>-</Company>
-    <Version>1.5.0.72</Version>
+    <Version>1.5.0.73</Version>
     <Description>This plugin condenses combos and mutually exclusive abilities onto a single button.</Description>
     <Copyright>Copyaaaaaaaaaaaa</Copyright>
     <PackageProjectUrl>https://github.com/grammernatzi/XIVComboPluginExpandedest</PackageProjectUrl>

XIVComboExpanded/XIVComboExpandedest.json

@@ -6,7 +6,12 @@
   "RepoUrl": "https://github.com/Grammernatzi/XIVComboPluginExpandedest",
   "IconUrl": "https://raw.githubusercontent.com/grammernatzi/XIVComboPluginExpandedest/master/res/icon.png",
   "ImageUrls": [],
-  "Changelog": "1.5.0.72:
+  "Changelog": "1.5.0.73:
+    * Meisui/Tenri priority fixed and DWaD to Meisui added.
+    * Monk's Draconic Leap feature now properly syncs below level 50 when you don't have a form.
+    * Raise Hard Target Lockout Feature added.
+
+    1.5.0.72:
     * Double Down features now account for its new cost.
     * New option for Royal Authority to Atonement where it will only activate if you are about to overwrite Sword Oath in your combo.
     * Empyreal Arrow will no longer turn into Pitch Perfect under any circumstances.