Merge pull request #124 from FFXIV-CombatReborn/NugetyCarbuncleinPVP

LTS-FFXIV · web-flow · commit 2abcbe247a53 · 2024-07-22T00:46:49.000-05:00
Nuget bump, re-enable carbuncle on summoner, and re-enable PVP rotations
diff --git a/BasicRotations/Magical/PCT_Default.cs b/BasicRotations/Magical/PCT_Default.cs
@@ -14,8 +14,6 @@ public sealed class PCT_Default : PictomancerRotation
         IAction act;
         if (!InCombat)
         {
-
-
             if (!CreatureMotifDrawn)
             {
                 if (PomMotifPvE.CanUse(out act) && CreatureMotifPvE.AdjustedID == PomMotifPvE.ID) return act;
@@ -58,16 +56,13 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
     protected override bool AttackAbility(IAction nextGCD, out IAction? act)
     {
 
-
-
         if (Player.HasStatus(true, StatusID.StarryMuse))
         {
             if (Player.HasStatus(true, StatusID.SubtractiveSpectrum) && !Player.HasStatus(true, StatusID.SubtractivePalette))
             {
                 if (SubtractivePalettePvE.CanUse(out act)) return true;
             }
 
-
             if (CreatureMotifDrawn)
             {
                 if (FangedMusePvE.CanUse(out act, skipCastingCheck: true, skipStatusProvideCheck: true, skipComboCheck: true, skipAoeCheck: true, usedUp: true) && CreatureMotifDrawn && LivingMusePvE.AdjustedID == FangedMusePvE.ID) return true;
@@ -147,8 +142,6 @@ protected override bool GeneralGCD(out IAction? act)
             if (HolyInWhitePvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true) && Paint > 0) return true;
         }
 
-        
-
         if (HammerStampPvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true) && Player.HasStatus(true, StatusID.HammerTime) && InCombat) return true;
 
         if (!InCombat)
@@ -210,24 +203,13 @@ protected override bool GeneralGCD(out IAction? act)
             if (HammerMotifPvE.CanUse(out act)) return true;
         }
 
-        
-
-
-
-
-        
-
         //white paint over cap protection
         if (Paint == 5)
         {
             if (CometInBlackPvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true) && Paint > 0 && Player.HasStatus(true, StatusID.MonochromeTones)) return true;
             if (HolyInWhitePvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true) && Paint > 0) return true;
         }
 
-
-
-
-
         ///123 combo stuff with moving checks
         if (!IsMoving)
         {
@@ -247,7 +229,6 @@ protected override bool GeneralGCD(out IAction? act)
             ///single target
             ///
 
-
             if (ThunderInMagentaPvE.CanUse(out act) && Player.HasStatus(true, StatusID.SubtractivePalette) && Player.HasStatus(true, StatusID.AetherhuesIi)) return true;
             if (StoneInYellowPvE.CanUse(out act) && Player.HasStatus(true, StatusID.SubtractivePalette) && Player.HasStatus(true, StatusID.Aetherhues)) return true;
             if (BlizzardInCyanPvE.CanUse(out act) && Player.HasStatus(true, StatusID.SubtractivePalette)) return true;
diff --git a/BasicRotations/Magical/SMN_Default.cs b/BasicRotations/Magical/SMN_Default.cs
@@ -114,8 +114,7 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
 	#region GCD Logic
 	protected override bool GeneralGCD(out IAction? act)
 	{
-		
-		//if (SummonCarbunclePvE.CanUse(out act)) return true;
+		if (SummonCarbunclePvE.CanUse(out act)) return true;
 		
 		if (SummonBahamutPvE.CanUse(out act)) return true;
 		if ((Player.HasStatus(false, StatusID.SearingLight) || SearingLightPvE.Cooldown.IsCoolingDown) && SummonBahamutPvE.CanUse(out act)) return true;
diff --git a/BasicRotations/PVPRotations/Healer/AST_Default.PVP.cs b/BasicRotations/PVPRotations/Healer/AST_Default.PVP.cs
@@ -2,7 +2,7 @@
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/DefaultRotations/PVPRotations/Healer/AST_Default.PVP.cs")]
-[Api(1)]
+[Api(2)]
 public class AST_DefaultPVP : AstrologianRotation
 {
     [RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Healer/SCH_Default.PVP.cs b/BasicRotations/PVPRotations/Healer/SCH_Default.PVP.cs
@@ -2,7 +2,7 @@
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/DefaultRotations/PVPRotations/Healer/SCH_Default.PVP.cs")]
-[Api(1)]
+[Api(2)]
 public class SCH_DefaultPVP : ScholarRotation
 {
     [RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Healer/SGE_Default.PVP.cs b/BasicRotations/PVPRotations/Healer/SGE_Default.PVP.cs
@@ -2,7 +2,7 @@
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/DefaultRotations/PVPRotations/Healer/SGE_Default.PVP.cs")]
-[Api(1)]
+[Api(2)]
 public class SGE_DefaultPVP : SageRotation
 {
     [RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Healer/WHM_Default.PVP.cs b/BasicRotations/PVPRotations/Healer/WHM_Default.PVP.cs
@@ -2,7 +2,7 @@ namespace DefaultRotations.Healer;
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/DefaultRotations/PVPRotations/Healer/WHM_Default.PVP.cs")]
-[Api(1)]
+[Api(2)]
 public class WHM_DefaultPVP : WhiteMageRotation
 {
     [RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Magical/BLM_Default.PVP.cs b/BasicRotations/PVPRotations/Magical/BLM_Default.PVP.cs
@@ -2,7 +2,7 @@
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/DefaultRotations/PVPRotations/Magical/BLM_Default.PVP.cs")]
-[Api(1)]
+[Api(2)]
 public class BLM_DefaultPVP : BlackMageRotation
 {
     [RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Magical/RDM_Default.PvP.cs b/BasicRotations/PVPRotations/Magical/RDM_Default.PvP.cs
@@ -2,7 +2,7 @@
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/DefaultRotations/PVPRotations/Magical/RDM_Default.PVP.cs")]
-[Api(1)]
+[Api(2)]
 public class RDM_DefaultPvP : RedMageRotation
 {
     [RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Magical/SMN_Default.PVP.cs b/BasicRotations/PVPRotations/Magical/SMN_Default.PVP.cs
@@ -2,7 +2,7 @@
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/DefaultRotations/PVPRotations/Magical/SMN_Default.PVP.cs")]
-[Api(1)]
+[Api(2)]
 public class SMN_DefaultPvP : SummonerRotation
 {
     [RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Melee/DRG_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/DRG_Default.PVP.cs
@@ -2,7 +2,7 @@
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/DRG_Default.PvP.cs")]
-[Api(1)]
+[Api(2)]
 public sealed class DRG_DefaultPvP : DragoonRotation
 {
     [RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Melee/MNK_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/MNK_Default.PVP.cs
@@ -2,7 +2,7 @@
 
 [Rotation("Default", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/DefaultRotations/PVPRotations/Melee/MNK_Default.PVP.cs")]
-[Api(1)]
+[Api(2)]
 public sealed class MNK_DefaultPvP : MonkRotation
 {
     [RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Melee/NIN_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/NIN_Default.PVP.cs
@@ -2,7 +2,7 @@
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/NIN_Default.PvP.cs")]
-[Api(1)]
+[Api(2)]
 public sealed class NIN_DefaultPvP : NinjaRotation
 {
     [RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Melee/RPR_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/RPR_Default.PVP.cs
@@ -2,7 +2,7 @@
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/RPR_Default.PvP.cs")]
-[Api(1)]
+[Api(2)]
 public sealed class RPR_DefaultPvP : ReaperRotation
 {
     [RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Melee/SAM_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/SAM_Default.PVP.cs
@@ -2,7 +2,7 @@
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/SAM_Default.PvP.cs")]
-[Api(1)]
+[Api(2)]
 public sealed class SAM_DefaultPvP : SamuraiRotation
 {
     [RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Ranged/DNC_Default.PVP.cs b/BasicRotations/PVPRotations/Ranged/DNC_Default.PVP.cs
@@ -2,7 +2,7 @@
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/DefaultRotations/PVPRotations/Ranged/DNC_Default.PvP.cs")]
-[Api(1)]
+[Api(2)]
 public sealed class DNC_DefaultPvP : DancerRotation
 {
     [RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Tank/DRK_Default.PVP.cs b/BasicRotations/PVPRotations/Tank/DRK_Default.PVP.cs
@@ -2,7 +2,7 @@ namespace DefaultRotations.Tank;
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/DRK_Default.PvP.cs")]
-[Api(1)]
+[Api(2)]
 public sealed class DRK_DefaultPvP : DarkKnightRotation
 {
     [RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Tank/GNB_Default.PVP.cs b/BasicRotations/PVPRotations/Tank/GNB_Default.PVP.cs
@@ -2,7 +2,7 @@
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/GNB_Default.PvP.cs")]
-[Api(1)]
+[Api(2)]
 public sealed class GNB_DefaultPvP : GunbreakerRotation
 {
     [RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Tank/PLD_Default.PVP.cs b/BasicRotations/PVPRotations/Tank/PLD_Default.PVP.cs
@@ -2,7 +2,7 @@
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/PLD_Default.PvP.cs")]
-[Api(1)]
+[Api(2)]
 public sealed class PLD_DefaultPvP : PaladinRotation
 {
     [RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Tank/WAR_Default.PVP.cs b/BasicRotations/PVPRotations/Tank/WAR_Default.PVP.cs
@@ -2,7 +2,7 @@
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/WAR_Default.PvP.cs")]
-[Api(1)]
+[Api(2)]
 public sealed class WAR_DefaultPvP : WarriorRotation
 {
     [RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/RebornRotations.csproj b/BasicRotations/RebornRotations.csproj
@@ -9,7 +9,7 @@
     <None Remove="Duty\PVPRotations\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="RotationSolverReborn.Basic" Version="7.0.1.10" />
+    <PackageReference Include="RotationSolverReborn.Basic" Version="7.0.1.19" />
   </ItemGroup>
   <ItemGroup>
 	  <Reference Include="Dalamud">

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,6 @@ public sealed class PCT_Default : PictomancerRotation`
`14`	`14`	`IAction act;`
`15`	`15`	`if (!InCombat)`
`16`	`16`	`{`
`17`		`-`
`18`		`-`
`19`	`17`	`if (!CreatureMotifDrawn)`
`20`	`18`	`{`
`21`	`19`	`if (PomMotifPvE.CanUse(out act) && CreatureMotifPvE.AdjustedID == PomMotifPvE.ID) return act;`
`@@ -58,16 +56,13 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)`
`58`	`56`	`protected override bool AttackAbility(IAction nextGCD, out IAction? act)`
`59`	`57`	`{`
`60`	`58`
`61`		`-`
`62`		`-`
`63`	`59`	`if (Player.HasStatus(true, StatusID.StarryMuse))`
`64`	`60`	`{`
`65`	`61`	`if (Player.HasStatus(true, StatusID.SubtractiveSpectrum) && !Player.HasStatus(true, StatusID.SubtractivePalette))`
`66`	`62`	`{`
`67`	`63`	`if (SubtractivePalettePvE.CanUse(out act)) return true;`
`68`	`64`	`}`
`69`	`65`
`70`		`-`
`71`	`66`	`if (CreatureMotifDrawn)`
`72`	`67`	`{`
`73`	`68`	`if (FangedMusePvE.CanUse(out act, skipCastingCheck: true, skipStatusProvideCheck: true, skipComboCheck: true, skipAoeCheck: true, usedUp: true) && CreatureMotifDrawn && LivingMusePvE.AdjustedID == FangedMusePvE.ID) return true;`
`@@ -147,8 +142,6 @@ protected override bool GeneralGCD(out IAction? act)`
`147`	`142`	`if (HolyInWhitePvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true) && Paint > 0) return true;`
`148`	`143`	`}`
`149`	`144`
`150`		`-`
`151`		`-`
`152`	`145`	`if (HammerStampPvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true) && Player.HasStatus(true, StatusID.HammerTime) && InCombat) return true;`
`153`	`146`
`154`	`147`	`if (!InCombat)`
`@@ -210,24 +203,13 @@ protected override bool GeneralGCD(out IAction? act)`
`210`	`203`	`if (HammerMotifPvE.CanUse(out act)) return true;`
`211`	`204`	`}`
`212`	`205`
`213`		`-`
`214`		`-`
`215`		`-`
`216`		`-`
`217`		`-`
`218`		`-`
`219`		`-`
`220`	`206`	`//white paint over cap protection`
`221`	`207`	`if (Paint == 5)`
`222`	`208`	`{`
`223`	`209`	`if (CometInBlackPvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true) && Paint > 0 && Player.HasStatus(true, StatusID.MonochromeTones)) return true;`
`224`	`210`	`if (HolyInWhitePvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true) && Paint > 0) return true;`
`225`	`211`	`}`
`226`	`212`
`227`		`-`
`228`		`-`
`229`		`-`
`230`		`-`
`231`	`213`	`///123 combo stuff with moving checks`
`232`	`214`	`if (!IsMoving)`
`233`	`215`	`{`
`@@ -247,7 +229,6 @@ protected override bool GeneralGCD(out IAction? act)`
`247`	`229`	`///single target`
`248`	`230`	`///`
`249`	`231`
`250`		`-`
`251`	`232`	`if (ThunderInMagentaPvE.CanUse(out act) && Player.HasStatus(true, StatusID.SubtractivePalette) && Player.HasStatus(true, StatusID.AetherhuesIi)) return true;`
`252`	`233`	`if (StoneInYellowPvE.CanUse(out act) && Player.HasStatus(true, StatusID.SubtractivePalette) && Player.HasStatus(true, StatusID.Aetherhues)) return true;`
`253`	`234`	`if (BlizzardInCyanPvE.CanUse(out act) && Player.HasStatus(true, StatusID.SubtractivePalette)) return true;`
Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,7 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)`
`114`	`114`	`#region GCD Logic`
`115`	`115`	`protected override bool GeneralGCD(out IAction? act)`
`116`	`116`	`{`
`117`		`-`
`118`		`- //if (SummonCarbunclePvE.CanUse(out act)) return true;`
	`117`	`+ if (SummonCarbunclePvE.CanUse(out act)) return true;`
`119`	`118`
`120`	`119`	`if (SummonBahamutPvE.CanUse(out act)) return true;`
`121`	`120`	`if ((Player.HasStatus(false, StatusID.SearingLight) \|\| SearingLightPvE.Cooldown.IsCoolingDown) && SummonBahamutPvE.CanUse(out act)) return true;`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`[Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]`
`4`	`4`	`[SourceCode(Path = "main/DefaultRotations/PVPRotations/Healer/AST_Default.PVP.cs")]`
`5`		`-[Api(1)]`
	`5`	`+[Api(2)]`
`6`	`6`	`public class AST_DefaultPVP : AstrologianRotation`
`7`	`7`	`{`
`8`	`8`	`[RotationConfig(CombatType.PvP, Name = "Sprint")]`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ namespace DefaultRotations.Healer;`
`2`	`2`
`3`	`3`	`[Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]`
`4`	`4`	`[SourceCode(Path = "main/DefaultRotations/PVPRotations/Healer/WHM_Default.PVP.cs")]`
`5`		`-[Api(1)]`
	`5`	`+[Api(2)]`
`6`	`6`	`public class WHM_DefaultPVP : WhiteMageRotation`
`7`	`7`	`{`
`8`	`8`	`[RotationConfig(CombatType.PvP, Name = "Sprint")]`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`[Rotation("Default", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]`
`4`	`4`	`[SourceCode(Path = "main/DefaultRotations/PVPRotations/Melee/MNK_Default.PVP.cs")]`
`5`		`-[Api(1)]`
	`5`	`+[Api(2)]`
`6`	`6`	`public sealed class MNK_DefaultPvP : MonkRotation`
`7`	`7`	`{`
`8`	`8`	`[RotationConfig(CombatType.PvP, Name = "Sprint")]`