3.2.0.37

44451516 · Oct 18, 2024 · 0162486 · 0162486
1 parent b9cc23c
commit 0162486
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/XIVSlothComboX/Combos/PvE/RPR.cs b/XIVSlothComboX/Combos/PvE/RPR.cs
@@ -388,10 +388,18 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                             }
 
                             //Gluttony/Bloodstalk
-                            if (gauge.Soul >= 50 && !HasEffect(Buffs.夜游魂Enshrouded) && !HasEffect(Buffs.妖异之镰SoulReaver) && !HasEffect(Buffs.处刑人Executioner) && !HasEffect(Buffs.死亡祭品ImmortalSacrifice) && !HasEffect(Buffs.IdealHost) && !HasEffect(Buffs.完人预备PerfectioParata) && (GetCooldownRemainingTime(神秘环ArcaneCircle) > GCD * 3 || !LevelChecked(神秘环ArcaneCircle)) && !JobHelpers.RPR.RPRHelpers.IsComboExpiring(3))
+                            if (gauge.Soul >= 50 
+                                && !HasEffect(Buffs.夜游魂Enshrouded)
+                                && !HasEffect(Buffs.妖异之镰SoulReaver) 
+                                && !HasEffect(Buffs.处刑人Executioner) 
+                                && !HasEffect(Buffs.死亡祭品ImmortalSacrifice)
+                                && !HasEffect(Buffs.IdealHost) 
+                                && !HasEffect(Buffs.完人预备PerfectioParata) 
+                                && (GetCooldownRemainingTime(神秘环ArcaneCircle) > GCD * 3 || !LevelChecked(神秘环ArcaneCircle)) 
+                                && !JobHelpers.RPR.RPRHelpers.IsComboExpiring(3))
                             {
                                 //Gluttony
-                                if (IsEnabled(CustomComboPreset.RPR_ST_Gluttony) && !JustUsed(完人Perfectio) && ActionReady(暴食Gluttony))
+                                if (IsEnabled(CustomComboPreset.RPR_ST_Gluttony)  && ActionReady(暴食Gluttony))
                                 {
                                     if (IsEnabled(CustomComboPreset.RPR_ST_TrueNorthDynamic) && trueNorthReady)
                                         return All.TrueNorth;

diff --git a/XIVSlothComboX/XIVSlothComboX.csproj b/XIVSlothComboX/XIVSlothComboX.csproj
@@ -4,7 +4,7 @@
 	<PropertyGroup>
 		<Authors>Team Sloth</Authors>
 		<Company>-</Company>
-		<Version>3.2.0.36</Version>
+		<Version>3.2.0.37</Version>
 		<!-- This is the version that will be used when pushing to the repo.-->
 		<Description>XIVCombo for lazy players</Description>
 		<Copyright>Copyleft attick 2021 thanks attick UwU</Copyright>

diff --git a/release/XIVSlothComboX/latest.zip b/release/XIVSlothComboX/latest.zip
diff --git a/release/pluginmaster.json b/release/pluginmaster.json
@@ -5,7 +5,7 @@
     "Punchline": "Condenses combos and mutually exclusive abilities onto a single button - and then some.",
     "Description": "Condenses combos and mutually exclusive abilities onto a single button - and then some.",
     "InternalName": "XIVSlothComboX",
-    "AssemblyVersion": "3.2.0.36",
+    "AssemblyVersion": "3.2.0.37",
     "Changelog": "更新内容看更新日志",
     "RepoUrl": "https://github.com/44451516/XIVSlothCombo/",
     "ApplicableVersion": "any",