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

Commit

Permalink
Merge pull request #57 from FFXIV-CombatReborn/Moar-Standard-is-good
Browse files Browse the repository at this point in the history
More Standardization plus DRK Unmend
  • Loading branch information
Toshi authored Apr 24, 2024
2 parents 93ff38d + 04931ac commit e415ed5
Show file tree
Hide file tree
Showing 43 changed files with 45 additions and 63 deletions.
2 changes: 1 addition & 1 deletion BasicRotations/Healer/AST_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Healer;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58")]
[SourceCode(Path = "main/DefaultRotations/Healer/AST_Default.cs")]
[Api(1)]
public sealed class AST_Default : AstrologianRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Healer/SCH_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Healer;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58")]
[SourceCode(Path = "main/DefaultRotations/Healer/SCH_Default.cs")]
[Api(1)]
public sealed class SCH_Default : ScholarRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Healer/SGE_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Healer;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58")]
[SourceCode(Path = "main/DefaultRotations/Healer/SGE_Default.cs")]
[Api(1)]
public sealed class SGE_Default : SageRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Healer/WHM_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Healer;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58")]
[SourceCode(Path = "main/DefaultRotations/Healer/WHM_Default.cs")]
[Api(1)]
public sealed class WHM_Default :WhiteMageRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Limited Jobs/BLU_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Magical;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58")]
[SourceCode(Path = "main/DefaultRotations/Limited Jobs/BLU_Default.cs")]
[Api(1)]
public sealed class Blue_Default : BlueMageRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Limited Jobs/BSM_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//namespace DefaultRotations.Ranged;

//[Rotation("LTS's Default", CombatType.PvE, GameVersion = "7.0")]
//[Rotation("Default", CombatType.PvE, GameVersion = "7.0")]
//[SourceCode(Path = "main/DefaultRotations/Limited Jobs/BSM_Default.cs")]
//[Api(1)]
//public sealed class BSM_Default : BeastmasterRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Magical/BLM_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Magical;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58")]
[SourceCode(Path = "main/DefaultRotations/Magical/BLM_Default.cs")]
[Api(1)]
public class BLM_Default : BlackMageRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Magical/PTM_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*namespace DefaultRotations.Magical;
[Rotation("LTS's Default", CombatType.PvE, GameVersion = "7.0")]
[Rotation("Default", CombatType.PvE, GameVersion = "7.0")]
[SourceCode(Path = "main/DefaultRotations/Magical/PTM_Default.cs")]
[Api(1)]
public sealed class PTM_Default : PictomancerRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Magical/RDM_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Magical;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58")]
[SourceCode(Path = "main/DefaultRotations/Magical/RDM_Default.cs")]
[Api(1)]
public sealed class RDM_Default : RedMageRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Magical/SMN_Default.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace DefaultRotations.Magical;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58")]
[SourceCode(Path = "main/DefaultRotations/Magical/SMN_Default.cs")]
[Api(1)]
public sealed class SMN_Default : SummonerRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Melee/DRG_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Melee;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58")]
[SourceCode(Path = "main/DefaultRotations/Melee/DRG_Default.cs")]
[Api(1)]

Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Melee/MNK_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Melee;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58", Description = "Uses Lunar Solar Opener from The Balance")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58", Description = "Uses Lunar Solar Opener from The Balance")]
[SourceCode(Path = "main/DefaultRotations/Melee/MNK_Default.cs")]
[Api(1)]
public sealed class MNK_Default : MonkRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Melee/NIN_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Melee;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58")]
[SourceCode(Path = "main/DefaultRotations/Melee/NIN_Default.cs")]
[Api(1)]
public sealed class NIN_Default : NinjaRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Melee/RPR_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Melee;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58", Description = "Additonal contributions to this rotation thanks to Toshi!")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58", Description = "Additonal contributions to this rotation thanks to Toshi!")]
[SourceCode(Path = "main/DefaultRotations/Melee/RPR_Default.cs")]
[Api(1)]
public sealed class RPR_Default : ReaperRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Melee/SAM_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Melee;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58")]
[SourceCode(Path = "main/DefaultRotations/Melee/SAM_Default.cs")]
[Api(1)]
public sealed class SAM_Default : SamuraiRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Melee/VPR_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*namespace DefaultRotations.Melee;
[Rotation("LTS's Default", CombatType.PvE, GameVersion = "7.0")]
[Rotation("Default", CombatType.PvE, GameVersion = "7.0")]
[SourceCode(Path = "main/DefaultRotations/Melee/VPR_Default.cs")]
[Api(1)]
public sealed class VPR_Default : ViperRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Healer/AST_Default.PVP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Healer;

[Rotation("LTS's PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Healer/AST_Default.PVP.cs")]
[Api(1)]
public class AST_DefaultPVP : AstrologianRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Healer/SCH_Default.PVP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Healer;

[Rotation("LTS's PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Healer/SCH_Default.PVP.cs")]
[Api(1)]
public class SCH_DefaultPVP : ScholarRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Healer/SGE_Default.PVP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Healer;

[Rotation("LTS's PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Healer/SGE_Default.PVP.cs")]
[Api(1)]
public class SGE_DefaultPVP : SageRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Healer/WHM_Default.PVP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Healer;

[Rotation("LTS's PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Healer/WHM_Default.PVP.cs")]
[Api(1)]
public class WHM_DefaultPVP : WhiteMageRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Magical/BLM_Default.PVP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Magical;

[Rotation("LTS's PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Magical/BLM_Default.PVP.cs")]
[Api(1)]
public class BLM_DefaultPVP : BlackMageRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Magical/RDM_Default.PvP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Magical;

[Rotation("LTS's PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Magical/RDM_Default.PVP.cs")]
[Api(1)]
public class RDM_DefaultPvP : RedMageRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Magical/SMN_Default.PVP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Magical;

[Rotation("LTS's PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Magical/SMN_Default.PVP.cs")]
[Api(1)]
public class SMN_DefaultPvP : SummonerRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Melee/DRG_Default.PVP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Melee;

[Rotation("LTS's PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/DRG_Default.PvP.cs")]
[Api(1)]
public sealed class DRG_DefaultPvP : DragoonRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Melee/MNK_Default.PVP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Melee;

[Rotation("LTS's Default", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Melee/MNK_Default.PVP.cs")]
[Api(1)]
public sealed class MNK_DefaultPvP : MonkRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Melee/NIN_Default.PVP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Melee;

[Rotation("LTS's PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/NIN_Default.PvP.cs")]
[Api(1)]
public sealed class NIN_DefaultPvP : NinjaRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Melee/RPR_Default.PVP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Melee;

[Rotation("LTS's PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/RPR_Default.PvP.cs")]
[Api(1)]
public sealed class RPR_DefaultPvP : ReaperRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Melee/SAM_Default.PVP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Melee;

[Rotation("LTS's PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/SAM_Default.PvP.cs")]
[Api(1)]
public sealed class SAM_DefaultPvP : SamuraiRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Ranged/BRD_Default.PVP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Ranged;

[Rotation("LTS's PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Ranged/BRD_Default.PvP.cs")]
[Api(1)]
public sealed class BRD_DefaultPvP : BardRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Ranged/DNC_Default.PVP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Ranged;

[Rotation("LTS's PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Ranged/DNC_Default.PvP.cs")]
[Api(1)]
public sealed class DNC_DefaultPvP : DancerRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Ranged/MCH_Default.PvP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Ranged;

[Rotation("LTS's PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Ranged/MCH_Default.PvP.cs")]
[Api(1)]
public sealed class MCH_DefaultPvP : MachinistRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Tank/DRK_Default.PVP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Tank;

[Rotation("LTS's PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/DRK_Default.PvP.cs")]
[Api(1)]
public sealed class DRK_DefaultPvP : DarkKnightRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Tank/GNB_Default.PVP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Tank;

[Rotation("LTS's PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/GNB_Default.PvP.cs")]
[Api(1)]
public sealed class GNB_DefaultPvP : GunbreakerRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Tank/PLD_Default.PVP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Tank;

[Rotation("LTS's PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/PLD_Default.PvP.cs")]
[Api(1)]
public sealed class PLD_DefaultPvP : PaladinRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/PVPRotations/Tank/WAR_Default.PVP.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Tank;

[Rotation("LTS's PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[Rotation("Default PVP", CombatType.PvP, GameVersion = "6.58", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/WAR_Default.PvP.cs")]
[Api(1)]
public sealed class WAR_DefaultPvP : WarriorRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Ranged/BRD_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Ranged;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58",
[Rotation("Default", CombatType.PvE, GameVersion = "6.58",
Description = "Please make sure that the three song times add up to 120 seconds, Wanderers default first song for now.")]
[SourceCode(Path = "main/DefaultRotations/Ranged/BRD_Default.cs")]
[Api(1)]
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Ranged/DNC_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Ranged;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58", Description = "Additonal contributions to this rotation thanks to Toshi!")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58", Description = "Additonal contributions to this rotation thanks to Toshi!")]
[SourceCode(Path = "main/DefaultRotations/Ranged/DNC_Default.cs")]
[Api(1)]
public sealed class DNC_Default : DancerRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Ranged/MCH_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Ranged;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58", Description = "Additonal contributions to this rotation thanks to Toshi!")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58", Description = "Additonal contributions to this rotation thanks to Toshi!")]
[SourceCode(Path = "main/DefaultRotations/Ranged/MCH_Default.cs")]
[Api(1)]
public sealed class MCH_Default : MachinistRotation
Expand Down
24 changes: 3 additions & 21 deletions BasicRotations/Tank/DRK_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Tank;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58")]
[SourceCode(Path = "main/DefaultRotations/Tank/DRK_Balance.cs")]
[Api(1)]
public sealed class DRK_Default : DarkKnightRotation
Expand All @@ -22,10 +22,6 @@ public sealed class DRK_Default : DarkKnightRotation
{
if (ProvokePvE.CanUse(out _)) return ProvokePvE;
}
//else
//{
// if (Unmend.CanUse(out var act1)) return act1;
//}
}
if (remainTime <= 2 && UseBurstMedicine(out var act)) return act;
if (remainTime <= 3 && TheBlackestNightPvE.CanUse(out act)) return act;
Expand All @@ -40,22 +36,9 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
{
if (base.EmergencyAbility(nextGCD, out act)) return true;

//if ((InCombat && CombatElapsedLess(2) || DataCenter.TimeSinceLastAction.TotalSeconds >= 10) && nextGCD.IsTheSameTo(false, HardSlash, SyphonStrike, Souleater, BloodSpiller, Unmend))
//if ((InCombat && CombatElapsedLess(2) || DataCenter.TimeSinceLastAction.TotalSeconds >= 10) && Target != null && Target.IsNPCEnemy() && NumberOfHostilesIn(25) == 1)
if ((InCombat && CombatElapsedLess(2) || TimeSinceLastAction.TotalSeconds >= 10))
{
//int[] numbers = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
//foreach (int number in numbers)
//{
// if (BloodWeapon.IsCoolingDown)
// {
// break;
// }

// BloodWeapon.CanUse(out act, CanUseOption.MustUse);
//}
if (BloodWeaponPvE.CanUse(out act, skipAoeCheck: true)) return true;

}

return base.EmergencyAbility(nextGCD, out act);
Expand Down Expand Up @@ -103,7 +86,6 @@ protected override bool DefenseSingleAbility(IAction nextGCD, out IAction? act)

protected override bool AttackAbility(IAction nextGCD, out IAction? act)
{
//if (InCombat && CombatElapsedLess(2) && BloodWeapon.CanUse(out act)) return true;
if (CheckDarkSide)
{
if (FloodOfDarknessPvE.CanUse(out act)) return true;
Expand Down Expand Up @@ -166,12 +148,12 @@ protected override bool GeneralGCD(out IAction? act)
if (StalwartSoulPvE.CanUse(out act)) return true;
if (UnleashPvE.CanUse(out act)) return true;

//单体
//Single Target
if (SouleaterPvE.CanUse(out act)) return true;
if (SyphonStrikePvE.CanUse(out act)) return true;
if (HardSlashPvE.CanUse(out act)) return true;

if (BloodWeaponPvE.Cooldown.IsCoolingDown && !Player.HasStatus(true, StatusID.BloodWeapon) && UnmendPvE.CanUse(out act)) return true;
if (UnmendPvE.CanUse(out act)) return true;

return base.GeneralGCD(out act);
}
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Tank/GNB_Default.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace DefaultRotations.Tank;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58")]
[SourceCode(Path = "main/DefaultRotations/Tank/GNB_Default.cs")]
[Api(1)]
public sealed class GNB_Default : GunbreakerRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Tank/PLD_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Tank;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58")]
[SourceCode(Path = "main/DefaultRotations/Tank/PLD_Default.cs")]
[Api(1)]
public class PLD_Default : PaladinRotation
Expand Down
2 changes: 1 addition & 1 deletion BasicRotations/Tank/WAR_Default.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DefaultRotations.Tank;

[Rotation("LTS's Default", CombatType.PvE, GameVersion = "6.58")]
[Rotation("Default", CombatType.PvE, GameVersion = "6.58")]
[SourceCode(Path = "main/DefaultRotations/Tank/WAR_Default.cs")]
[Api(1)]
public sealed class WAR_Default : WarriorRotation
Expand Down
Loading

0 comments on commit e415ed5

Please sign in to comment.