[PUSH] 2.0.0.10 - VPR/GNB/RPR/PLD update/additions

only my own god can judge me
MKhayle · Aug 13, 2024 · 0878ee4 · 0878ee4
1 parent c2a18b1
commit 0878ee4
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 30 deletions.
diff --git a/XIVComboExpanded/Attributes/CustomComboInfoAttribute.cs b/XIVComboExpanded/Attributes/CustomComboInfoAttribute.cs
@@ -65,13 +65,13 @@ public static string JobIDToName(byte key)
         return key switch
         {
             0 => "Adventurer",
-            1 => "Gladiator",
-            2 => "Pugilist",
-            3 => "Marauder",
-            4 => "Lancer",
-            5 => "Archer",
-            6 => "Conjurer",
-            7 => "Thaumaturge",
+            1 => "Paladin",
+            2 => "Monk",
+            3 => "Warrior",
+            4 => "Dragoon",
+            5 => "Bard",
+            6 => "White Mage",
+            7 => "Black Mage",
             8 => "Disciples of the Hand",
             9 => "Disciples of the Hand",
             10 => "Disciples of the Hand",
@@ -90,10 +90,10 @@ public static string JobIDToName(byte key)
             23 => "Bard",
             24 => "White Mage",
             25 => "Black Mage",
-            26 => "Arcanist",
+            26 => "Summoner", // Arcanist
             27 => "Summoner",
             28 => "Scholar",
-            29 => "Rogue",
+            29 => "Ninja",
             30 => "Ninja",
             31 => "Machinist",
             32 => "Dark Knight",
@@ -109,7 +109,7 @@ public static string JobIDToName(byte key)
             42 => "Pictomancer",
             DOH.JobID => "Disciples of the Hand",
             DOL.JobID => "Disciples of the Land",
-            _ => "Unknown",
+            _ => "Adventurer",
         };
     }
 

diff --git a/XIVComboExpanded/Combos/PLD.cs b/XIVComboExpanded/Combos/PLD.cs
@@ -470,7 +470,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
     {
         if (actionID == PLD.ShieldBash)
         {
-            if (level < PLD.Levels.ShieldBash || IsCooldownUsable(ADV.LowBlow))
+            if (level < PLD.Levels.ShieldBash || (IsCooldownUsable(ADV.LowBlow) && CanUseAction(ADV.LowBlow)))
                 return ADV.LowBlow;
         }
 

diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs
@@ -2264,7 +2264,7 @@ public enum CustomComboPreset
     [IconsCombo([VPR.HindstingStrike, VPR.HindsbaneFang, VPR.FlanksbaneFang, VPR.FlankstingStrike, UTL.Idea, UTL.Blank, VPR.JaggedMaw, VPR.BloodiedMaw, UTL.Idea])]
     [AccessibilityCustomCombo]
     [CustomComboInfo("Auto Fang/Bite", "Replace Steel Fangs/Reaving Fangs and Steel Maw/Reaving Maw with whichever of the two available 3rd combo hits is currently empowered. Only affects the third combo hit.\n\nNOTE: This means that, for example, rather than Steel Fangs having Hindsting Strike and Reaving Fangs having Hindsbane Fang, both will have whichever of those two is currently empowered.  If neither is empowered, they'll have whatever they normally have for the 3rd combo hit.", VPR.JobID)]
-    ViperAutoFangBiteFeature = 4125,
+    ViperAutoFangBiteFeature = 4128,
 
     [SectionCombo("Standard Combos")]
     [IconsCombo([VPR.SteelFangs, VPR.ReavingFangs, UTL.ArrowLeft, VPR.DeathRattle, UTL.Blank, VPR.SteelMaw, VPR.ReavingMaw, UTL.ArrowLeft, VPR.LastLash])]
@@ -2344,68 +2344,68 @@ public enum CustomComboPreset
     [CustomComboInfo("Merge Serpent's Tail onto Twinfang/Twinblood Feature", "Merge all Serpent's Tail abilities onto Twinfang/Twinblood.", VPR.JobID)]
     ViperMergeTwinsSerpentFeature = 4112,
 
-    [SectionCombo("One-Button Combos")]
+    [SectionCombo("Alternative Playstyle")]
     [IconsCombo([VPR.SteelFangs, UTL.ArrowLeft, VPR.ReavingFangs, VPR.HuntersSting, VPR.SwiftskinsSting, VPR.FlanksbaneFang, VPR.FlankstingStrike, VPR.HindsbaneFang, VPR.HindstingStrike])]
     [SecretCustomCombo]
     [ConflictingCombos(ViperAutoSteelReavingFeature)]
     [CustomComboInfo("Viper PvP Style Main Combo", "Condenses the main combo to a single button, like PvP.\nThe combo detects buffs to prioritize skills.\nThe default combo ender is Hindsting Strike, configurable below.", VPR.JobID)]
     ViperPvPMainComboFeature = 4113,
 
-    [SectionCombo("One-Button Combos")]
+    [SectionCombo("Alternative Playstyle")]
     [SecretCustomCombo]
     [ConflictingCombos(ViperPvPMainComboStartFlankstingFeature, ViperPvPMainComboStartHindsbaneFeature)]
     [ParentCombo(ViperPvPMainComboFeature)]
     [CustomComboInfo("PvP Combo Start Flanksbane Fang", "With no buffs, end first combo with Flanksbane Fang.", VPR.JobID)]
     ViperPvPMainComboStartFlanksbaneFeature = 4114,
 
-    [SectionCombo("One-Button Combos")]
+    [SectionCombo("Alternative Playstyle")]
     [SecretCustomCombo]
     [ConflictingCombos(ViperPvPMainComboStartFlanksbaneFeature, ViperPvPMainComboStartHindsbaneFeature)]
     [ParentCombo(ViperPvPMainComboFeature)]
     [CustomComboInfo("PvP Combo Start Flanksting Strike", "With no buffs, end first combo with Flanksting Strike.", VPR.JobID)]
     ViperPvPMainComboStartFlankstingFeature = 4115,
 
-    [SectionCombo("One-Button Combos")]
+    [SectionCombo("Alternative Playstyle")]
     [SecretCustomCombo]
     [ConflictingCombos(ViperPvPMainComboStartFlanksbaneFeature, ViperPvPMainComboStartFlankstingFeature)]
     [ParentCombo(ViperPvPMainComboFeature)]
     [CustomComboInfo("PvP Combo Start Hindsbane Fang", "With no buffs, end first combo with Hindsbane Fang.", VPR.JobID)]
     ViperPvPMainComboStartHindsbaneFeature = 4116,
 
-    [SectionCombo("One-Button Combos")]
+    [SectionCombo("Alternative Playstyle")]
     [SecretCustomCombo]
     [IconsCombo([VPR.SteelMaw, UTL.ArrowLeft, VPR.ReavingMaw, VPR.HuntersBite, VPR.SwiftskinsBite, VPR.JaggedMaw, VPR.BloodiedMaw])]
     [CustomComboInfo("Viper PvP Style AoE Combo", "Condenses the main combo to a single button, like PvP.\nStarts with Reaving Maw by default, configurable below.", VPR.JobID)]
     ViperPvPAoEFeature = 4117,
 
-    [SectionCombo("One-Button Combos")]
+    [SectionCombo("Alternative Playstyle")]
     [SecretCustomCombo]
     [ParentCombo(ViperPvPAoEFeature)]
     [CustomComboInfo("PvP AoE Combo Start Bloodied Maw", "With no buffs, end first combo with Bloodied Maw.", VPR.JobID)]
     ViperPvPMainComboAoEStartBloodiedFeature = 4118,
 
-    [SectionCombo("One-Button Combos")]
+    [SectionCombo("Alternative Playstyle")]
     [IconsCombo([VPR.Vicewinder, UTL.ArrowLeft, VPR.SwiftskinsCoil, VPR.HuntersCoil])]
     [ExpandedCustomCombo]
     [ConflictingCombos(ViperAutoViceSTFeature)]
     [CustomComboInfo("Viper PvP Style Winder Combo", "Condenses the Vicewinder combo to a single button, like PvP.\nStarts with Swiftskin's Coil (rear positional) by default.\n\nNOTE: Does not include the Twinfang and Twinblood weaves unless the 'Twin Coil Feature' under 'Vice Combos' is also enabled.", VPR.JobID)]
     ViperPvPWinderComboFeature = 4119,
 
-    [SectionCombo("One-Button Combos")]
+    [SectionCombo("Alternative Playstyle")]
     [IconsCombo([VPR.Vicewinder, UTL.ArrowLeft, VPR.HuntersCoil, VPR.SwiftskinsCoil])]
     [ExpandedCustomCombo]
     [ParentCombo(ViperPvPWinderComboFeature)]
     [CustomComboInfo("Start with Hunter's Coil", "Start with Hunter's Coil (flank positional) instead.", VPR.JobID)]
     ViperPvPWinderComboStartHuntersFeature = 4120,
 
-    [SectionCombo("One-Button Combos")]
+    [SectionCombo("Alternative Playstyle")]
     [IconsCombo([VPR.VicePit, UTL.ArrowLeft, VPR.SwiftskinsDen, VPR.HuntersDen])]
     [ExpandedCustomCombo]
     [ConflictingCombos(ViperAutoViceAoEFeature)]
     [CustomComboInfo("Viper PvP Style Pit Combo", "Condenses the Vicepit combo to a single button, like PvP.\nStarts with Swiftskin's Den by default.\n\nNOTE: Does not include the Twinfang and Twinblood weaves unless the 'Twin Coil Feature' under 'Vice Combos' is also enabled.", VPR.JobID)]
     ViperPvPPitComboFeature = 4121,
 
-    [SectionCombo("One-Button Combos")]
+    [SectionCombo("Alternative Playstyle")]
     [IconsCombo([VPR.VicePit, UTL.ArrowLeft, VPR.HuntersDen, VPR.SwiftskinsDen])]
     [ExpandedCustomCombo]
     [ParentCombo(ViperPvPPitComboFeature)]

diff --git a/XIVComboExpanded/Interface/Changelog.cs b/XIVComboExpanded/Interface/Changelog.cs
@@ -15,10 +15,22 @@ public static Dictionary<string, string[]> GetChangelog()
                     {
                         "v2.0.0.10",
                         [
-                            "Rewrote RPR features and logic, combining many prior ones and updating interactions. @kaedys",
-                            "Implemented RPR automatic Soul Slice feature. @kaedys",
-                            "Removed Sacrificium Priority and Soulsow on Shadow of Death features. @kaedys",
-                            "Updated the order in which actions are used outside Fight or Flight when using the Paladin FoF Optimize feature. See issue #418 for reasoning.  @kaedys",
+                            "Fixed an issue with classes not being properly recognized as jobs and being auto-selected by the auto-selection setting.\nGrab your job stones!",
+                            "Updated the order in which actions are used outside Fight or Flight when using the Paladin FoF Optimize feature. \nSee issue #418 for reasoning by @kaedys.",
+                            "Fixed PLD's One-Stop Stun Button locking Shield Bash into an unusable Low Blow when abilities are disabled (like in Deep Dungeons)\nFurther checks will be added for Deep Dungeons compatibility.",
+                            "Rewrote RPR features and logic, combining many prior ones and updating interactions by @kaedys.",
+                            "Implemented RPR automatic Soul Slice featureby @kaedys.",
+                            "Removed Sacrificium Priority and Soulsow on Shadow of Death features by @kaedys.",
+                            "Added VPR's Auto Fang/Bite feature by @kaedys.",
+                            "Added VPR's Serpent's Ire on Reawaken by @aldros-ffxi.",
+                            "Added VPR's Uncoiled Fury to Writhing Snap by @aldros-ffxi.",
+                            "Restored VPR's PvP Style Main Combo by @aldros-ffxi.",
+                            "Restored VPR's PvP Combo Start Flanksbane Fang by @aldros-ffxi.",
+                            "Restored VPR's PvP Combo Start Flanksting Strike by @aldros-ffxi.",
+                            "Restored VPR's PvP Combo Start Hindsbane Fang by @aldros-ffxi.",
+                            "Restored VPR's PvP AoE Combo Start Bloodied Maw by @aldros-ffxi.",
+                            "Added GNB's Burst Strike into Gnashing Fang feature by @aldros-ffxi.",
+                            "Added GNB's Burst Strike into Danger Zone feature by @aldros-ffxi.",
                         ]
                     },
                     {

diff --git a/XIVComboExpanded/Interface/ConfigWindow.cs b/XIVComboExpanded/Interface/ConfigWindow.cs
@@ -96,6 +96,15 @@ public override void Draw()
 
             if (ImGui.BeginTabItem("Combos"))
             {
+                // This is cursed. I'm lazy. Don't judge me. Or do. I don't care. It's imgui anyway.
+                if (!(Service.Configuration.CurrentJobTab is "Adventurer" or "Disciples of the Land" or "Paladin" or "Monk" or "Warrior" or "Dragoon" or "Bard" or "White Mage"
+                    or "Black Mage" or "Summoner" or "Scholar" or "Ninja" or "Machinist" or "Dark Knight" or "Astrologian"
+                    or "Samurai" or "Red Mage" or "Gunbreaker" or "Dancer" or "Reaper" or "Sage" or "Viper" or "Pictomancer"))
+                {
+                    Service.Configuration.CurrentJobTab = "Adventurer";
+                    Service.Configuration.Save();
+                }
+
                 float scale = 1f;
                 if (Service.Configuration.BigJobIcons)
                     scale = 1.5f;
@@ -115,9 +124,7 @@ public override void Draw()
 
                         foreach (var jobName in this.groupedPresets.Keys)
                         {
-                            if ((jobName == "Adventurer"
-                                || jobName == "Disciples of the Land"
-                                || jobName == "Sage") && !Service.Configuration.EnableExpandedCombos)
+                            if ((jobName is "Adventurer" or "Disciples of the Land" or "Sage") && !Service.Configuration.EnableExpandedCombos)
                             {
                             }
                             else

diff --git a/XIVComboExpanded/XIVComboExpanded.csproj b/XIVComboExpanded/XIVComboExpanded.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors>attick, daemitus, Khayle</Authors>
     <Company>-</Company>
-    <Version>2.0.0.9</Version>
+    <Version>2.0.0.10</Version>
     <Description>This plugin condenses combos and mutually exclusive abilities onto a single button.</Description>
     <Copyright>Copyleft attick 2020 baybeeee</Copyright>
     <PackageProjectUrl>https://github.com/daemitus/XIVComboPlugin</PackageProjectUrl>