Skip to content
This repository has been archived by the owner on Nov 23, 2024. It is now read-only.

Commit

Permalink
Nuget bump, re-enable carbuncle on summoner, and re-enable PVP rotations
Browse files Browse the repository at this point in the history
  • Loading branch information
@LTS-FFXIV
LTS-FFXIV committed Jul 22, 2024
1 parent f6bbd71 commit 6283db0
Show file tree
Hide file tree
Showing 20 changed files with 19 additions and 39 deletions.
19 changes: 0 additions & 19 deletions BasicRotations/Magical/PCT_Default.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
{
Expand All @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions BasicRotations/Magical/SMN_Default.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Healer/AST_Default.PVP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Healer/SCH_Default.PVP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Healer/SGE_Default.PVP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Healer/WHM_Default.PVP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Magical/BLM_Default.PVP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Magical/RDM_Default.PvP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Magical/SMN_Default.PVP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Melee/DRG_Default.PVP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Melee/MNK_Default.PVP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Melee/NIN_Default.PVP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Melee/RPR_Default.PVP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Melee/SAM_Default.PVP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Ranged/DNC_Default.PVP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Tank/DRK_Default.PVP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Tank/GNB_Default.PVP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Tank/PLD_Default.PVP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Tank/WAR_Default.PVP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/RebornRotations.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down

0 comments on commit 6283db0

Please sign in to comment.