diff --git a/RotationSolver.Basic/Rotations/Basic/BLM_Base.cs b/RotationSolver.Basic/Rotations/Basic/BLM_Base.cs index d6e54ec10..0b826dae5 100644 --- a/RotationSolver.Basic/Rotations/Basic/BLM_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/BLM_Base.cs @@ -173,7 +173,7 @@ public override bool CanUse(out IAction act, bool mustUse = false, bool emptyOrS /// /// 激情咏唱 /// - public static IBaseAction Sharpcast { get; } = new BaseAction(ActionID.SharpCast) + public static IBaseAction SharpCast { get; } = new BaseAction(ActionID.SharpCast) { StatusProvide = new[] { StatusID.SharpCast }, ActionCheck = b => HasHostilesInRange, @@ -182,7 +182,7 @@ public override bool CanUse(out IAction act, bool mustUse = false, bool emptyOrS /// /// 三连咏唱 /// - public static IBaseAction Triplecast { get; } = new BaseAction(ActionID.TripleCast) + public static IBaseAction TripleCast { get; } = new BaseAction(ActionID.TripleCast) { StatusProvide = Swiftcast.StatusProvide, }; @@ -190,7 +190,7 @@ public override bool CanUse(out IAction act, bool mustUse = false, bool emptyOrS /// /// 黑魔纹 /// - public static IBaseAction Leylines { get; } = new BaseAction(ActionID.LeyLines, true, shouldEndSpecial: true) + public static IBaseAction LeyLines { get; } = new BaseAction(ActionID.LeyLines, true, shouldEndSpecial: true) { StatusProvide = new[] { StatusID.LeyLines, }, }; @@ -200,7 +200,7 @@ public override bool CanUse(out IAction act, bool mustUse = false, bool emptyOrS /// public static IBaseAction BetweenTheLines { get; } = new BaseAction(ActionID.BetweenTheLines, true, shouldEndSpecial: true) { - StatusNeed = Leylines.StatusProvide, + StatusNeed = LeyLines.StatusProvide, }; /// diff --git a/RotationSolver.Basic/Rotations/Basic/BLU_Base.cs b/RotationSolver.Basic/Rotations/Basic/BLU_Base.cs index c581ed328..c41df0f9a 100644 --- a/RotationSolver.Basic/Rotations/Basic/BLU_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/BLU_Base.cs @@ -104,7 +104,7 @@ public override bool CanUse(out IAction act, bool mustUse = false, bool emptyOrS /// /// 苦闷之歌 /// - public static IBLUAction SongofTorment { get; } = new BLUAction(ActionID.SongOfTorment, BLUActionType.Magical, isEot: true) + public static IBLUAction SongOfTorment { get; } = new BLUAction(ActionID.SongOfTorment, BLUActionType.Magical, isEot: true) { TargetStatus = new[] { StatusID.Bleeding } }; @@ -141,7 +141,7 @@ public override bool CanUse(out IAction act, bool mustUse = false, bool emptyOrS /// /// 斗灵弹 /// - public static IBLUAction TheRoseofDestruction { get; } = new BLUAction(ActionID.TheRoseOfDestruction, BLUActionType.Magical); + public static IBLUAction TheRoseOfDestruction { get; } = new BLUAction(ActionID.TheRoseOfDestruction, BLUActionType.Magical); /// /// 马特拉魔术 @@ -182,7 +182,7 @@ public override bool CanUse(out IAction act, bool mustUse = false, bool emptyOrS /// /// 平原震裂 /// - public static IBLUAction Plaincracker { get; } = new BLUAction(ActionID.PlainCracker, BLUActionType.Magical); + public static IBLUAction PlainCracker { get; } = new BLUAction(ActionID.PlainCracker, BLUActionType.Magical); /// /// 诡异视线 @@ -330,7 +330,7 @@ public override bool CanUse(out IAction act, bool mustUse = false, bool emptyOrS /// /// 水脉诅咒 /// - public static IBLUAction MaledictionofWater { get; } = new BLUAction(ActionID.MaledictionOfWater, BLUActionType.Magical); + public static IBLUAction MaledictionOfWater { get; } = new BLUAction(ActionID.MaledictionOfWater, BLUActionType.Magical); /// /// 陆行鸟陨石 @@ -340,7 +340,7 @@ public override bool CanUse(out IAction act, bool mustUse = false, bool emptyOrS /// /// 月下彼岸花 /// - public static IBLUAction Nightbloom { get; } = new BLUAction(ActionID.NightBloom, BLUActionType.Magical); + public static IBLUAction NightBloom { get; } = new BLUAction(ActionID.NightBloom, BLUActionType.Magical); /// /// 玄天武水壁 @@ -414,7 +414,7 @@ public override bool CanUse(out IAction act, bool mustUse = false, bool emptyOrS /// /// 4星吨 /// - public static IBLUAction Weight4tonze { get; } = new BLUAction(ActionID.Weight4Tonze, BLUActionType.Physical); + public static IBLUAction Weight4Tonze { get; } = new BLUAction(ActionID.Weight4Tonze, BLUActionType.Physical); /// /// 千针刺 @@ -494,7 +494,7 @@ public override bool CanUse(out IAction act, bool mustUse = false, bool emptyOrS /// /// 自爆 /// - public static IBLUAction Selfdestruct { get; } = new BLUAction(ActionID.SelfDestruct, BLUActionType.None) + public static IBLUAction SelfDestruct { get; } = new BLUAction(ActionID.SelfDestruct, BLUActionType.None) { ActionCheck = b => !Player.HasStatus(true, StatusID.BrushWithDeath), }; @@ -537,7 +537,7 @@ public override bool CanUse(out IAction act, bool mustUse = false, bool emptyOrS /// /// 超振动 /// - public static IBLUAction Ultravibration { get; } = new BLUAction(ActionID.UltraVibration, BLUActionType.None); + public static IBLUAction UltraVibration { get; } = new BLUAction(ActionID.UltraVibration, BLUActionType.None); /// /// 鬼宿脚 @@ -555,7 +555,7 @@ public override bool CanUse(out IAction act, bool mustUse = false, bool emptyOrS /// /// 水神的面纱 /// - public static IBLUAction VeiloftheWhorl { get; } = new BLUAction(ActionID.VeilOfTheWhorl, BLUActionType.None, true); + public static IBLUAction VeilOfTheWhorl { get; } = new BLUAction(ActionID.VeilOfTheWhorl, BLUActionType.None, true); /// /// 超硬化 @@ -603,7 +603,6 @@ public override bool CanUse(out IAction act, bool mustUse = false, bool emptyOrS }; #endregion - #region 辅助 /// /// 油性分泌物 @@ -621,7 +620,7 @@ public override bool CanUse(out IAction act, bool mustUse = false, bool emptyOrS /// /// 破防 /// - public static IBLUAction Offguard { get; } = new BLUAction(ActionID.OffGuard, BLUActionType.None, true); + public static IBLUAction OffGuard { get; } = new BLUAction(ActionID.OffGuard, BLUActionType.None, true); /// /// 强力守护 diff --git a/RotationSolver.Basic/Rotations/Basic/BRD_Base.cs b/RotationSolver.Basic/Rotations/Basic/BRD_Base.cs index 060b564f1..4a89e82cd 100644 --- a/RotationSolver.Basic/Rotations/Basic/BRD_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/BRD_Base.cs @@ -75,7 +75,7 @@ public abstract class BRD_Base : CustomRotation /// /// ��ʴ�� /// - public static IBaseAction Windbite { get; } = new BaseAction(ActionID.WindBite, isEot: true) + public static IBaseAction WindBite { get; } = new BaseAction(ActionID.WindBite, isEot: true) { TargetStatus = new[] { StatusID.WindBite, StatusID.StormBite } }; @@ -85,8 +85,8 @@ public abstract class BRD_Base : CustomRotation /// public static IBaseAction IronJaws { get; } = new BaseAction(ActionID.IronJaws, isEot: true) { - TargetStatus = VenomousBite.TargetStatus.Union(Windbite.TargetStatus).ToArray(), - ActionCheck = b => b.HasStatus(true, VenomousBite.TargetStatus) & b.HasStatus(true, Windbite.TargetStatus), + TargetStatus = VenomousBite.TargetStatus.Union(WindBite.TargetStatus).ToArray(), + ActionCheck = b => b.HasStatus(true, VenomousBite.TargetStatus) & b.HasStatus(true, WindBite.TargetStatus), }; /// diff --git a/RotationSolver.Basic/Rotations/Basic/DNC_Base.cs b/RotationSolver.Basic/Rotations/Basic/DNC_Base.cs index 9d5de767b..bf780999d 100644 --- a/RotationSolver.Basic/Rotations/Basic/DNC_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/DNC_Base.cs @@ -59,7 +59,7 @@ public abstract class DNC_Base : CustomRotation /// /// ׹��Ȫ /// - public static IBaseAction Fountainfall { get; } = new BaseAction(ActionID.FountainFall) + public static IBaseAction FountainFall { get; } = new BaseAction(ActionID.FountainFall) { StatusNeed = new[] { StatusID.SilkenFlow, StatusID.SilkenFlow2 } }; @@ -84,7 +84,7 @@ public abstract class DNC_Base : CustomRotation /// /// ������ /// - public static IBaseAction Bladeshower { get; } = new BaseAction(ActionID.BladeShower) + public static IBaseAction BladeShower { get; } = new BaseAction(ActionID.BladeShower) { StatusProvide = Fountain.StatusProvide, }; @@ -100,10 +100,10 @@ public abstract class DNC_Base : CustomRotation /// /// ��Ѫ�� /// - public static IBaseAction Bloodshower { get; } = new BaseAction(ActionID.BloodShower) + public static IBaseAction BloodShower { get; } = new BaseAction(ActionID.BloodShower) { AOECount = 2, - StatusNeed = Fountainfall.StatusNeed, + StatusNeed = FountainFall.StatusNeed, }; /// @@ -143,7 +143,7 @@ public abstract class DNC_Base : CustomRotation /// /// ������ /// - public static IBaseAction StarfallDance { get; } = new BaseAction(ActionID.StarFallDance) + public static IBaseAction StarFallDance { get; } = new BaseAction(ActionID.StarFallDance) { StatusNeed = new[] { StatusID.FlourishingStarfall }, }; @@ -298,7 +298,7 @@ public abstract class DNC_Base : CustomRotation /// /// /// - protected static bool ExcutionStepGCD(out IAction act) + protected static bool ExecuteStepGCD(out IAction act) { act = null; if (!Player.HasStatus(true, StatusID.StandardStep, StatusID.TechnicalStep)) return false; diff --git a/RotationSolver.Basic/Rotations/Basic/DRG_Base.cs b/RotationSolver.Basic/Rotations/Basic/DRG_Base.cs index 738d3af89..875425041 100644 --- a/RotationSolver.Basic/Rotations/Basic/DRG_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/DRG_Base.cs @@ -93,12 +93,12 @@ public abstract class DRG_Base : CustomRotation /// /// ����� /// - public static IBaseAction SpineshatterDive { get; } = new BaseAction(ActionID.SpineShatterDive); + public static IBaseAction SpineShatterDive { get; } = new BaseAction(ActionID.SpineShatterDive); /// /// ���׳� /// - public static IBaseAction DragonfireDive { get; } = new BaseAction(ActionID.DragonFireDive); + public static IBaseAction DragonFireDive { get; } = new BaseAction(ActionID.DragonFireDive); /// /// ��Ծ @@ -140,7 +140,7 @@ public abstract class DRG_Base : CustomRotation /// /// ׹�dz� /// - public static IBaseAction Stardiver { get; } = new BaseAction(ActionID.StarDiver) + public static IBaseAction StarDiver { get; } = new BaseAction(ActionID.StarDiver) { ActionCheck = b => JobGauge.IsLOTDActive, }; diff --git a/RotationSolver.Basic/Rotations/Basic/DRK_Base.cs b/RotationSolver.Basic/Rotations/Basic/DRK_Base.cs index 660c18014..3b223c64a 100644 --- a/RotationSolver.Basic/Rotations/Basic/DRK_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/DRK_Base.cs @@ -13,7 +13,7 @@ public abstract class DRK_Base : CustomRotation public override MedicineType MedicineType => MedicineType.Strength; - private static float DarksideTimeRemaining => JobGauge.DarksideTimeRemaining / 1000f; + private static float DarkSideTimeRemaining => JobGauge.DarksideTimeRemaining / 1000f; /// /// 暗血 /// @@ -31,7 +31,7 @@ public abstract class DRK_Base : CustomRotation /// protected static bool DarkSideEndAfter(float time) { - return EndAfter(DarksideTimeRemaining, time); + return EndAfter(DarkSideTimeRemaining, time); } /// @@ -42,7 +42,7 @@ protected static bool DarkSideEndAfter(float time) /// protected static bool DarkSideEndAfterGCD(uint gctCount = 0, uint abilityCount = 0) { - return EndAfterGCD(DarksideTimeRemaining, gctCount, abilityCount); + return EndAfterGCD(DarkSideTimeRemaining, gctCount, abilityCount); } public sealed override ClassJobID[] JobIDs => new ClassJobID[] { ClassJobID.DarkKnight }; @@ -85,12 +85,12 @@ protected static bool DarkSideEndAfterGCD(uint gctCount = 0, uint abilityCount = /// /// 暗黑波动 /// - public static IBaseAction FloodofDarkness { get; } = new BaseAction(ActionID.FloodOfDarkness); + public static IBaseAction FloodOfDarkness { get; } = new BaseAction(ActionID.FloodOfDarkness); /// /// 暗黑锋 /// - public static IBaseAction EdgeofDarkness { get; } = new BaseAction(ActionID.EdgeOfDarkness); + public static IBaseAction EdgeOfDarkness { get; } = new BaseAction(ActionID.EdgeOfDarkness); /// /// 嗜血 @@ -145,7 +145,7 @@ protected static bool DarkSideEndAfterGCD(uint gctCount = 0, uint abilityCount = /// /// 血溅 /// - public static IBaseAction Bloodspiller { get; } = new BaseAction(ActionID.BloodSpiller) + public static IBaseAction BloodSpiller { get; } = new BaseAction(ActionID.BloodSpiller) { ActionCheck = b => JobGauge.Blood >= 50 || Player.HasStatus(true, StatusID.Delirium), }; @@ -155,7 +155,7 @@ protected static bool DarkSideEndAfterGCD(uint gctCount = 0, uint abilityCount = /// public static IBaseAction Quietus { get; } = new BaseAction(ActionID.Quietus) { - ActionCheck = Bloodspiller.ActionCheck, + ActionCheck = BloodSpiller.ActionCheck, }; /// diff --git a/RotationSolver.Basic/Rotations/Basic/GNB_Base.cs b/RotationSolver.Basic/Rotations/Basic/GNB_Base.cs index 41ee141eb..2f0c27182 100644 --- a/RotationSolver.Basic/Rotations/Basic/GNB_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/GNB_Base.cs @@ -120,7 +120,7 @@ public abstract class GNB_Base : CustomRotation /// /// �������� /// - public static IBaseAction Superbolide { get; } = new BaseAction(ActionID.SuperBolide, true, isTimeline: true); + public static IBaseAction SuperBolide { get; } = new BaseAction(ActionID.SuperBolide, true, isTimeline: true); /// /// ������ @@ -151,12 +151,12 @@ public abstract class GNB_Base : CustomRotation /// /// ��֮�� /// - public static IBaseAction HeartofLight { get; } = new BaseAction(ActionID.HeartOfLight, true, isTimeline: true); + public static IBaseAction HeartOfLight { get; } = new BaseAction(ActionID.HeartOfLight, true, isTimeline: true); /// /// ʯ֮�� /// - public static IBaseAction HeartofStone { get; } = new BaseAction(ActionID.HeartOfStone, true, isTimeline: true) + public static IBaseAction HeartOfStone { get; } = new BaseAction(ActionID.HeartOfStone, true, isTimeline: true) { ChoiceTarget = TargetFilter.FindAttackedTarget, }; @@ -172,7 +172,7 @@ public abstract class GNB_Base : CustomRotation /// /// Ѫ�� /// - public static IBaseAction Bloodfest { get; } = new BaseAction(ActionID.BloodFest, true) + public static IBaseAction BloodFest { get; } = new BaseAction(ActionID.BloodFest, true) { ActionCheck = b => MaxAmmo - JobGauge.Ammo > 1, }; @@ -236,7 +236,7 @@ public abstract class GNB_Base : CustomRotation protected override bool EmergencyAbility(byte abilitiesRemaining, IAction nextGCD, out IAction act) { - if (Superbolide.CanUse(out act) && BaseAction.TankBreakOtherCheck(JobIDs[0])) return true; + if (SuperBolide.CanUse(out act) && BaseAction.TankBreakOtherCheck(JobIDs[0])) return true; return base.EmergencyAbility(abilitiesRemaining, nextGCD, out act); } diff --git a/RotationSolver.Basic/Rotations/Basic/MCH_Base.cs b/RotationSolver.Basic/Rotations/Basic/MCH_Base.cs index 995e96ad5..2a7bca03b 100644 --- a/RotationSolver.Basic/Rotations/Basic/MCH_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/MCH_Base.cs @@ -118,7 +118,7 @@ protected static bool OverheatedEndAfterGCD(uint gctCount = 0, uint abilityCount /// /// 毒菌冲击 /// - public static IBaseAction Bioblaster { get; } = new BaseAction(ActionID.BioBlaster, isEot: true); + public static IBaseAction BioBlaster { get; } = new BaseAction(ActionID.BioBlaster, isEot: true); /// /// 整备 diff --git a/RotationSolver.Basic/Rotations/Basic/NIN_Base.cs b/RotationSolver.Basic/Rotations/Basic/NIN_Base.cs index 52954264d..0dec1e5fe 100644 --- a/RotationSolver.Basic/Rotations/Basic/NIN_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/NIN_Base.cs @@ -221,7 +221,7 @@ internal NinAction(ActionID actionID, params IBaseAction[] ninjutsus) /// /// 梦幻三段 /// - public static IBaseAction DreamWithinaDream { get; } = new BaseAction(ActionID.DreamWithInADream); + public static IBaseAction DreamWithinADream { get; } = new BaseAction(ActionID.DreamWithInADream); /// /// 风魔手里剑天 diff --git a/RotationSolver.Basic/Rotations/Basic/PLD_Base.cs b/RotationSolver.Basic/Rotations/Basic/PLD_Base.cs index f01e74d3d..791936427 100644 --- a/RotationSolver.Basic/Rotations/Basic/PLD_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/PLD_Base.cs @@ -59,7 +59,7 @@ public abstract class PLD_Base : CustomRotation /// /// սŮ��֮ŭ(��Ȩ��) /// - public static IBaseAction RageofHalone { get; } = new BaseAction(ActionID.RageOfHalone); + public static IBaseAction RageOfHalone { get; } = new BaseAction(ActionID.RageOfHalone); /// /// Ͷ�� @@ -73,7 +73,7 @@ public abstract class PLD_Base : CustomRotation /// /// ս�ӷ�Ӧ /// - public static IBaseAction FightorFlight { get; } = new BaseAction(ActionID.FightOrFlight, true); + public static IBaseAction FightOrFlight { get; } = new BaseAction(ActionID.FightOrFlight, true); /// /// ȫʴն @@ -97,7 +97,7 @@ public abstract class PLD_Base : CustomRotation /// /// ������ת /// - public static IBaseAction CircleofScorn { get; } = new BaseAction(ActionID.CircleOfScorn); + public static IBaseAction CircleOfScorn { get; } = new BaseAction(ActionID.CircleOfScorn); /// /// ���֮�� @@ -171,7 +171,7 @@ public abstract class PLD_Base : CustomRotation /// /// ��װ���� /// - public static IBaseAction PassageofArms { get; } = new BaseAction(ActionID.PassageOfArms, true, isTimeline: true); + public static IBaseAction PassageOfArms { get; } = new BaseAction(ActionID.PassageOfArms, true, isTimeline: true); /// /// ���� diff --git a/RotationSolver.Basic/Rotations/Basic/RDM_Base.cs b/RotationSolver.Basic/Rotations/Basic/RDM_Base.cs index eaaf7fcb5..acdd12a1f 100644 --- a/RotationSolver.Basic/Rotations/Basic/RDM_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/RDM_Base.cs @@ -67,7 +67,7 @@ public abstract class RDM_Base : CustomRotation /// /// �̱���� /// - public static IBaseAction CorpsAcorps { get; } = new BaseAction(ActionID.CorpsACorps, shouldEndSpecial: true) + public static IBaseAction CorpsACorps { get; } = new BaseAction(ActionID.CorpsACorps, shouldEndSpecial: true) { ChoiceTarget = TargetFilter.FindTargetForMoving, }; @@ -231,7 +231,7 @@ protected sealed override bool HealSingleGCD(out IAction act) [RotationDesc(ActionID.CorpsACorps)] protected sealed override bool MoveForwardAbility(byte abilitiesRemaining, out IAction act, bool recordTarget = true) { - if (CorpsAcorps.CanUse(out act, emptyOrSkipCombo: true, recordTarget: recordTarget)) return true; + if (CorpsACorps.CanUse(out act, emptyOrSkipCombo: true, recordTarget: recordTarget)) return true; return false; } diff --git a/RotationSolver.Basic/Rotations/Basic/RPR_Base.cs b/RotationSolver.Basic/Rotations/Basic/RPR_Base.cs index 64dcd2375..560c3254c 100644 --- a/RotationSolver.Basic/Rotations/Basic/RPR_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/RPR_Base.cs @@ -80,7 +80,7 @@ internal PRPAction(ActionID actionID, bool isFriendly = false, bool shouldEndSpe /// /// 死亡之影 /// - public static IBaseAction ShadowofDeath { get; } = new BaseAction(ActionID.ShadowOfDeath, isEot: true) + public static IBaseAction ShadowOfDeath { get; } = new BaseAction(ActionID.ShadowOfDeath, isEot: true) { TargetStatus = new[] { StatusID.DeathsDesign }, ActionCheck = b => !SoulReaver, @@ -114,10 +114,10 @@ internal PRPAction(ActionID actionID, bool isFriendly = false, bool shouldEndSpe /// /// 死亡之涡 /// - public static IBaseAction WhorlofDeath { get; } = new BaseAction(ActionID.WhorlOfDeath, isEot: true) + public static IBaseAction WhorlOfDeath { get; } = new BaseAction(ActionID.WhorlOfDeath, isEot: true) { TargetStatus = new[] { StatusID.DeathsDesign }, - ActionCheck = ShadowofDeath.ActionCheck, + ActionCheck = ShadowOfDeath.ActionCheck, }; /// @@ -291,7 +291,7 @@ internal PRPAction(ActionID actionID, bool isFriendly = false, bool shouldEndSpe /// /// 播魂种 /// - public static IBaseAction Soulsow { get; } = new BaseAction(ActionID.SoulSow) + public static IBaseAction SoulSow { get; } = new BaseAction(ActionID.SoulSow) { StatusProvide = new[] { StatusID.SoulSow }, ActionCheck = b => !InCombat, diff --git a/RotationSolver.Basic/Rotations/Basic/SCH_Base.cs b/RotationSolver.Basic/Rotations/Basic/SCH_Base.cs index c56ce46a2..364a75aec 100644 --- a/RotationSolver.Basic/Rotations/Basic/SCH_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/SCH_Base.cs @@ -136,7 +136,7 @@ public abstract class SCH_Base : CustomRotation /// /// 破阵法 /// - public static IBaseAction ArtofWar { get; } = new BaseAction(ActionID.ArtOfWar);//裂阵法 25866 + public static IBaseAction ArtOfWar { get; } = new BaseAction(ActionID.ArtOfWar);//裂阵法 25866 #endregion #region 仙女 /// diff --git a/RotationSolver.Basic/Rotations/Basic/SMN_Base.cs b/RotationSolver.Basic/Rotations/Basic/SMN_Base.cs index 483b11b94..de705cc32 100644 --- a/RotationSolver.Basic/Rotations/Basic/SMN_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/SMN_Base.cs @@ -148,7 +148,7 @@ protected static bool SummonTimeEndAfter(float time) /// /// 以太蓄能 龙神附体 /// - public static IBaseAction Aethercharge { get; } = new BaseAction(ActionID.AetherCharge) + public static IBaseAction AetherCharge { get; } = new BaseAction(ActionID.AetherCharge) { ActionCheck = b => InCombat && HaveSummon }; @@ -173,7 +173,7 @@ protected static bool SummonTimeEndAfter(float time) /// /// 死星核爆 /// - public static IBaseAction Deathflare { get; } = new BaseAction(ActionID.DeathFlare) + public static IBaseAction DeathFlare { get; } = new BaseAction(ActionID.DeathFlare) { ActionCheck = b => InBahamut, }; @@ -214,7 +214,6 @@ protected static bool SummonTimeEndAfter(float time) { StatusNeed = new[] { StatusID.GarudasFavor }, }; - #endregion #region 基础技能 /// @@ -283,7 +282,7 @@ protected static bool SummonTimeEndAfter(float time) /// /// 痛苦核爆 /// - public static IBaseAction Painflare { get; } = new BaseAction(ActionID.PainFlare) + public static IBaseAction PainFlare { get; } = new BaseAction(ActionID.PainFlare) { ActionCheck = b => HasAetherflowStacks }; diff --git a/RotationSolver.Basic/Rotations/Basic/WAR_Base.cs b/RotationSolver.Basic/Rotations/Basic/WAR_Base.cs index 93c38c278..7116e9eed 100644 --- a/RotationSolver.Basic/Rotations/Basic/WAR_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/WAR_Base.cs @@ -129,7 +129,7 @@ public abstract class WAR_Base : CustomRotation /// /// ս�� /// - public static IBaseAction ThrillofBattle { get; } = new BaseAction(ActionID.ThrillOfBattle, true, isTimeline: true); + public static IBaseAction ThrillOfBattle { get; } = new BaseAction(ActionID.ThrillOfBattle, true, isTimeline: true); /// /// ̩Ȼ���� diff --git a/RotationSolver.Basic/Rotations/Basic/WHM_Base.cs b/RotationSolver.Basic/Rotations/Basic/WHM_Base.cs index 3b035051c..dd227dbfa 100644 --- a/RotationSolver.Basic/Rotations/Basic/WHM_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/WHM_Base.cs @@ -142,7 +142,7 @@ protected static bool LilyAfterGCD(uint gctCount = 0, uint abilityCount = 0) /// /// 礼仪之铃 /// - public static IBaseAction LiturgyoftheBell { get; } = new BaseAction(ActionID.LiturgyOfTheBell, true, isTimeline: true); + public static IBaseAction LiturgyOfTheBell { get; } = new BaseAction(ActionID.LiturgyOfTheBell, true, isTimeline: true); #endregion #region 输出 /// diff --git a/RotationSolver.Default/Healer/SCH_Default.cs b/RotationSolver.Default/Healer/SCH_Default.cs index 27458a345..f8eb1c9b7 100644 --- a/RotationSolver.Default/Healer/SCH_Default.cs +++ b/RotationSolver.Default/Healer/SCH_Default.cs @@ -49,7 +49,7 @@ protected override bool GeneralGCD(out IAction act) if (Bio.CanUse(out act)) return true; //AOE - if (ArtofWar.CanUse(out act)) return true; + if (ArtOfWar.CanUse(out act)) return true; //Single if (Ruin.CanUse(out act)) return true; diff --git a/RotationSolver.Default/Healer/WHM_Default.cs b/RotationSolver.Default/Healer/WHM_Default.cs index 8168a46ea..d6d1f1888 100644 --- a/RotationSolver.Default/Healer/WHM_Default.cs +++ b/RotationSolver.Default/Healer/WHM_Default.cs @@ -154,7 +154,7 @@ protected override bool DefenseAreaAbility(byte abilitiesRemaining, out IAction if (Temperance.CanUse(out act)) return true; //礼仪之铃 - if (LiturgyoftheBell.CanUse(out act)) return true; + if (LiturgyOfTheBell.CanUse(out act)) return true; return false; } diff --git a/RotationSolver.Default/Magical/BLM_Default.cs b/RotationSolver.Default/Magical/BLM_Default.cs index 39be7b157..aee90e018 100644 --- a/RotationSolver.Default/Magical/BLM_Default.cs +++ b/RotationSolver.Default/Magical/BLM_Default.cs @@ -29,8 +29,8 @@ private static bool NeedToTransposeGoIce(bool usedOne) var count = PolyglotStacks; if (count == compare++) return false; if (count == compare++ && !EnchinaEndAfterGCD(2)) return false; - if (count >= compare && (HasFire || Swiftcast.WillHaveOneChargeGCD(2) || Triplecast.WillHaveOneChargeGCD(2))) return true; - if (!HasFire && !Swiftcast.WillHaveOneChargeGCD(2) && !Triplecast.CanUse(out _, gcdCountForAbility: 8)) return false; + if (count >= compare && (HasFire || Swiftcast.WillHaveOneChargeGCD(2) || TripleCast.WillHaveOneChargeGCD(2))) return true; + if (!HasFire && !Swiftcast.WillHaveOneChargeGCD(2) && !TripleCast.CanUse(out _, gcdCountForAbility: 8)) return false; return true; } @@ -47,7 +47,7 @@ protected override IAction CountDownAction(float remainTime) { if (Fire3.CanUse(out act)) return act; } - if (remainTime <= 12 && Sharpcast.CanUse(out act, emptyOrSkipCombo: true)) return act; + if (remainTime <= 12 && SharpCast.CanUse(out act, emptyOrSkipCombo: true)) return act; return base.CountDownAction(remainTime); } @@ -60,16 +60,16 @@ protected override bool AttackAbility(byte abilitiesRemaining, out IAction act) && !IsLastGCD(ActionID.Paradox)) { if (Swiftcast.CanUse(out act)) return true; - if (Triplecast.CanUse(out act, emptyOrSkipCombo: true)) return true; + if (TripleCast.CanUse(out act, emptyOrSkipCombo: true)) return true; } if (UmbralIceStacks < 3 && LucidDreaming.CanUse(out act)) return true; - if (Sharpcast.CanUse(out act, emptyOrSkipCombo: true)) return true; + if (SharpCast.CanUse(out act, emptyOrSkipCombo: true)) return true; } if (InAstralFire) { - if (!CombatElapsedLess(6) && CombatElapsedLess(9) && Leylines.CanUse(out act)) return true; - if (Triplecast.CanUse(out act, gcdCountForAbility: 5)) return true; + if (!CombatElapsedLess(6) && CombatElapsedLess(9) && LeyLines.CanUse(out act)) return true; + if (TripleCast.CanUse(out act, gcdCountForAbility: 5)) return true; } if (Amplifier.CanUse(out act)) return true; return false; @@ -103,7 +103,7 @@ protected override bool GeneralGCD(out IAction act) if (InFireOrIce(out act, out var mustGo)) return true; if (mustGo) return false; //Triplecast for moving. - if (IsMoving && HasHostilesInRange && Triplecast.CanUse(out act, emptyOrSkipCombo: true)) return true; + if (IsMoving && HasHostilesInRange && TripleCast.CanUse(out act, emptyOrSkipCombo: true)) return true; if (AddElementBase(out act)) return true; if (Scathe.CanUse(out act)) return true; @@ -261,7 +261,7 @@ private static bool DoFire(out IAction act) if (AddThunder(out act, 0)) return true; } - if (Triplecast.CanUse(out act)) return true; + if (TripleCast.CanUse(out act)) return true; if (AddThunder(out act, 0) && Player.WillStatusEndGCD(1, 0, true, StatusID.Thundercloud)) return true; @@ -358,7 +358,7 @@ private bool MaintainStatus(out IAction act) protected override bool HealSingleAbility(byte abilitiesRemaining, out IAction act) { if (BetweenTheLines.CanUse(out act)) return true; - if (Leylines.CanUse(out act, mustUse: true)) return true; + if (LeyLines.CanUse(out act, mustUse: true)) return true; return base.HealSingleAbility(abilitiesRemaining, out act); } diff --git a/RotationSolver.Default/Magical/BLU_Default.cs b/RotationSolver.Default/Magical/BLU_Default.cs index c5883be39..410101059 100644 --- a/RotationSolver.Default/Magical/BLU_Default.cs +++ b/RotationSolver.Default/Magical/BLU_Default.cs @@ -44,7 +44,7 @@ protected override bool AttackAbility(byte abilitiesRemaining, out IAction act) protected override bool EmergencyAbility(byte abilitiesRemaining, IAction nextGCD, out IAction act) { - if (nextGCD.IsTheSameTo(false, Selfdestruct, FinalSting)) + if (nextGCD.IsTheSameTo(false, SelfDestruct, FinalSting)) { if (Swiftcast.CanUse(out act)) return true; } @@ -128,7 +128,7 @@ private bool DBlueBreak(out IAction act) //哔哩哔哩 if (!Player.HasStatus(true, StatusID.Tingling) && Tingle.CanUse(out act, mustUse: true)) return true; - if (Offguard.CanUse(out act)) return true; + if (OffGuard.CanUse(out act)) return true; //鱼叉 if (TripleTrident.CanUse(out act, mustUse: true)) return true; } @@ -137,7 +137,7 @@ private bool DBlueBreak(out IAction act) { if (Whistle.CanUse(out act)) return true; //破防 - if (Offguard.CanUse(out act)) return true; + if (OffGuard.CanUse(out act)) return true; //哔哩哔哩 if (Tingle.CanUse(out act)) return true; } @@ -148,7 +148,7 @@ private bool DBlueBreak(out IAction act) if (!Player.HasStatus(true, StatusID.WaxingNocturne)) return false; //月下彼岸花 - if (Nightbloom.CanUse(out act, mustUse: true)) return true; + if (NightBloom.CanUse(out act, mustUse: true)) return true; //地火喷发 if (Eruption.CanUse(out act, mustUse: true)) return true; //马特拉魔术 @@ -229,7 +229,7 @@ private bool CanUseFinalSting(out IAction act) if (AllOnSlot(Whistle, MoonFlute, FinalSting, BasicInstinct)) { //破防 - if (Player.HasStatus(true, StatusID.WaxingNocturne) && Offguard.CanUse(out act)) return true; + if (Player.HasStatus(true, StatusID.WaxingNocturne) && OffGuard.CanUse(out act)) return true; if ((float)Target.CurrentHp / Target.MaxHp > FinalStingHP) return false; if (Whistle.CanUse(out act)) return true; @@ -254,13 +254,13 @@ private bool SingleGCD(out IAction act) if (QuickLevel && StickyTongue.CanUse(out act)) return true; //苦闷之歌 - if (AllOnSlot(Bristle, SongofTorment) && SongofTorment.CanUse(out _)) + if (AllOnSlot(Bristle, SongOfTorment) && SongOfTorment.CanUse(out _)) { //怒发冲冠 if (Bristle.CanUse(out act)) return true; - if (SongofTorment.CanUse(out act)) return true; + if (SongOfTorment.CanUse(out act)) return true; } - if (SongofTorment.CanUse(out act)) return true; + if (SongOfTorment.CanUse(out act)) return true; //复仇冲击 if (RevengeBlast.CanUse(out act)) return true; @@ -363,7 +363,7 @@ private bool AreaGCD(out IAction act) //怒视 if (Glower.CanUse(out act)) return true; //平原震裂 - if (Plaincracker.CanUse(out act)) return true; + if (PlainCracker.CanUse(out act)) return true; //诡异视线 if (TheLook.CanUse(out act)) return true; //喷墨 @@ -380,10 +380,10 @@ private bool AreaGCD(out IAction act) if (MustardBomb.CanUse(out act)) return true; if (AetherialSpark.CanUse(out act)) return true; - if (MaledictionofWater.CanUse(out act)) return true; + if (MaledictionOfWater.CanUse(out act)) return true; if (FlyingFrenzy.CanUse(out act)) return true; if (DrillCannons.CanUse(out act)) return true; - if (Weight4tonze.CanUse(out act)) return true; + if (Weight4Tonze.CanUse(out act)) return true; if (Needles1000.CanUse(out act)) return true; if (Kaltstrahl.CanUse(out act)) return true; if (PeripheralSynthesis.CanUse(out act)) return true; @@ -410,7 +410,7 @@ private bool PrimalSpell(out IAction act) if (DivineCataract.CanUse(out act)) return true; //斗灵弹 - if (TheRoseofDestruction.CanUse(out act)) return true; + if (TheRoseOfDestruction.CanUse(out act)) return true; //渔叉三段 if (InBurst && !MoonFluteBreak && TripleTrident.CanUse(out act)) return true; @@ -423,7 +423,7 @@ private bool PrimalSpell(out IAction act) //if (MagicHammer.ShouldUse(out act)) return true; //月下彼岸花 - if (InBurst && !MoonFluteBreak && Nightbloom.CanUse(out act, mustUse: SingleAOE)) return true; + if (InBurst && !MoonFluteBreak && NightBloom.CanUse(out act, mustUse: SingleAOE)) return true; //如意大旋风 if (InBurst && !MoonFluteBreak && BothEnds.CanUse(out act, mustUse: SingleAOE)) return true; diff --git a/RotationSolver.Default/Magical/RDM_Default.cs b/RotationSolver.Default/Magical/RDM_Default.cs index a692965fb..66b5c8499 100644 --- a/RotationSolver.Default/Magical/RDM_Default.cs +++ b/RotationSolver.Default/Magical/RDM_Default.cs @@ -152,7 +152,7 @@ protected override bool AttackAbility(byte abilitiesRemaining, out IAction act) if (Fleche.CanUse(out act)) return true; if (Engagement.CanUse(out act, emptyOrSkipCombo: true)) return true; - if (CorpsAcorps.CanUse(out act, mustUse: true) && !IsMoving) return true; + if (CorpsACorps.CanUse(out act, mustUse: true) && !IsMoving) return true; return false; } diff --git a/RotationSolver.Default/Magical/SMN_Default.cs b/RotationSolver.Default/Magical/SMN_Default.cs index 10ccd5759..de952384c 100644 --- a/RotationSolver.Default/Magical/SMN_Default.cs +++ b/RotationSolver.Default/Magical/SMN_Default.cs @@ -46,7 +46,7 @@ protected override bool GeneralGCD(out IAction act) //龙神不死鸟 if ((Player.HasStatus(false, StatusID.SearingLight) || SearingLight.IsCoolingDown) && SummonBahamut.CanUse(out act)) return true; - if (!SummonBahamut.EnoughLevel && HasHostilesInRange && Aethercharge.CanUse(out act)) return true; + if (!SummonBahamut.EnoughLevel && HasHostilesInRange && AetherCharge.CanUse(out act)) return true; //毁4 if (IsMoving && (Player.HasStatus(true, StatusID.GarudasFavor) || InIfrit) @@ -105,7 +105,7 @@ protected override bool AttackAbility(byte abilitiesRemaining, out IAction act) //龙神不死鸟迸发 if ((InBahamut && SummonBahamut.ElapsedOneChargeAfterGCD(3) || InPhoenix || IsTargetBoss && IsTargetDying) && EnkindleBahamut.CanUse(out act, mustUse: true)) return true; //死星核爆 - if ((SummonBahamut.ElapsedOneChargeAfterGCD(3) || IsTargetBoss && IsTargetDying) && Deathflare.CanUse(out act, mustUse: true)) return true; + if ((SummonBahamut.ElapsedOneChargeAfterGCD(3) || IsTargetBoss && IsTargetDying) && DeathFlare.CanUse(out act, mustUse: true)) return true; //苏生之炎 if (Rekindle.CanUse(out act, mustUse: true)) return true; //山崩 @@ -113,7 +113,7 @@ protected override bool AttackAbility(byte abilitiesRemaining, out IAction act) //痛苦核爆 if ((Player.HasStatus(false, StatusID.SearingLight) && InBahamut && (SummonBahamut.ElapsedOneChargeAfterGCD(3) || !EnergyDrain.IsCoolingDown) || - !SearingLight.EnoughLevel || IsTargetBoss && IsTargetDying) && Painflare.CanUse(out act)) return true; + !SearingLight.EnoughLevel || IsTargetBoss && IsTargetDying) && PainFlare.CanUse(out act)) return true; //溃烂爆发 if ((Player.HasStatus(false, StatusID.SearingLight) && InBahamut && (SummonBahamut.ElapsedOneChargeAfterGCD(3) || !EnergyDrain.IsCoolingDown) || !SearingLight.EnoughLevel || IsTargetBoss && IsTargetDying) && Fester.CanUse(out act)) return true; diff --git a/RotationSolver.Default/Melee/DRG_Default.cs b/RotationSolver.Default/Melee/DRG_Default.cs index f9d5a2948..81e5bc1b3 100644 --- a/RotationSolver.Default/Melee/DRG_Default.cs +++ b/RotationSolver.Default/Melee/DRG_Default.cs @@ -19,8 +19,8 @@ protected override bool MoveForwardAbility(byte abilityRemain, out IAction act, { if (abilityRemain > 1) { - if (SpineshatterDive.CanUse(out act, emptyOrSkipCombo: true, recordTarget: recordTarget)) return true; - if (DragonfireDive.CanUse(out act, mustUse: true, emptyOrSkipCombo: true, recordTarget: recordTarget)) return true; + if (SpineShatterDive.CanUse(out act, emptyOrSkipCombo: true, recordTarget: recordTarget)) return true; + if (DragonFireDive.CanUse(out act, mustUse: true, emptyOrSkipCombo: true, recordTarget: recordTarget)) return true; } act = null; @@ -60,7 +60,7 @@ protected override bool AttackAbility(byte abilitiesRemaining, out IAction act) if (Nastrond.CanUse(out act, mustUse: true)) return true; //׹�dz� - if (Stardiver.CanUse(out act, mustUse: true)) return true; + if (StarDiver.CanUse(out act, mustUse: true)) return true; //���� if (HighJump.EnoughLevel) @@ -76,17 +76,17 @@ protected override bool AttackAbility(byte abilitiesRemaining, out IAction act) if (Geirskogul.CanUse(out act, mustUse: true)) return true; //����� - if (SpineshatterDive.CanUse(out act, emptyOrSkipCombo: true)) + if (SpineShatterDive.CanUse(out act, emptyOrSkipCombo: true)) { if (Player.HasStatus(true, StatusID.LanceCharge) && LanceCharge.ElapsedOneChargeAfterGCD(3)) return true; } - if (Player.HasStatus(true, StatusID.PowerSurge) && SpineshatterDive.CurrentCharges != 1 && SpineshatterDive.CanUse(out act)) return true; + if (Player.HasStatus(true, StatusID.PowerSurge) && SpineShatterDive.CurrentCharges != 1 && SpineShatterDive.CanUse(out act)) return true; //����� if (MirageDive.CanUse(out act)) return true; //���׳� - if (DragonfireDive.CanUse(out act, mustUse: true)) + if (DragonFireDive.CanUse(out act, mustUse: true)) { if (Player.HasStatus(true, StatusID.LanceCharge) && LanceCharge.ElapsedOneChargeAfterGCD(3)) return true; } diff --git a/RotationSolver.Default/Melee/NIN_Default.cs b/RotationSolver.Default/Melee/NIN_Default.cs index 30d62aacd..c1c2ced2f 100644 --- a/RotationSolver.Default/Melee/NIN_Default.cs +++ b/RotationSolver.Default/Melee/NIN_Default.cs @@ -305,13 +305,13 @@ protected override bool AttackAbility(byte abilitiesRemaining, out IAction act) if (HellfrogMedium.CanUse(out act)) return true; if (Bhavacakra.CanUse(out act)) return true; - if (!DreamWithinaDream.EnoughLevel) + if (!DreamWithinADream.EnoughLevel) { if (Assassinate.CanUse(out act)) return true; } else { - if (DreamWithinaDream.CanUse(out act)) return true; + if (DreamWithinADream.CanUse(out act)) return true; } return false; } diff --git a/RotationSolver.Default/Melee/RPR_Default.cs b/RotationSolver.Default/Melee/RPR_Default.cs index dca1918fc..db8a15b61 100644 --- a/RotationSolver.Default/Melee/RPR_Default.cs +++ b/RotationSolver.Default/Melee/RPR_Default.cs @@ -15,7 +15,7 @@ protected override IRotationConfigSet CreateConfiguration() protected override IAction CountDownAction(float remainTime) { //倒数收获月 - if (remainTime <= 30 && Soulsow.CanUse(out _)) return Soulsow; + if (remainTime <= 30 && SoulSow.CanUse(out _)) return SoulSow; //提前2s勾刃 if (remainTime <= Harpe.CastTime + Service.Config.CountDownAhead && Harpe.CanUse(out _)) return Harpe; @@ -25,11 +25,11 @@ protected override IAction CountDownAction(float remainTime) protected override bool GeneralGCD(out IAction act) { //非战斗收获月 - if (Soulsow.CanUse(out act)) return true; + if (SoulSow.CanUse(out act)) return true; //上Debuff - if (WhorlofDeath.CanUse(out act)) return true; - if (ShadowofDeath.CanUse(out act)) return true; + if (WhorlOfDeath.CanUse(out act)) return true; + if (ShadowOfDeath.CanUse(out act)) return true; //补蓝 if (SoulReaver) @@ -49,14 +49,14 @@ protected override bool GeneralGCD(out IAction act) if (Enshrouded) { //补DoT - if (ShadowofDeath.CanUse(out act)) return true; + if (ShadowOfDeath.CanUse(out act)) return true; if (LemureShroud > 1) { if (Configs.GetBool("EnshroudPooling") && PlentifulHarvest.EnoughLevel && ArcaneCircle.WillHaveOneCharge(9) && (LemureShroud == 4 && Target.WillStatusEnd(30, true, StatusID.DeathsDesign) || LemureShroud == 3 && Target.WillStatusEnd(50, true, StatusID.DeathsDesign))) //双附体窗口期 { - if (ShadowofDeath.CanUse(out act, mustUse: true)) return true; + if (ShadowOfDeath.CanUse(out act, mustUse: true)) return true; } //夜游魂衣-虚无/交错收割 阴冷收割 @@ -81,7 +81,7 @@ protected override bool GeneralGCD(out IAction act) //跑机制来不及读条？补个buff混一下 else { - if (ShadowofDeath.CanUse(out act, mustUse: IsMoving)) return true; + if (ShadowOfDeath.CanUse(out act, mustUse: IsMoving)) return true; } } else diff --git a/RotationSolver.Default/Ranged/BRD_Default.cs b/RotationSolver.Default/Ranged/BRD_Default.cs index d57989f47..2943794ca 100644 --- a/RotationSolver.Default/Ranged/BRD_Default.cs +++ b/RotationSolver.Default/Ranged/BRD_Default.cs @@ -45,7 +45,7 @@ protected override bool GeneralGCD(out IAction act) if (QuickNock.CanUse(out act)) return true; //上毒 - if (Windbite.CanUse(out act)) return true; + if (WindBite.CanUse(out act)) return true; if (VenomousBite.CanUse(out act)) return true; //直线射击 @@ -60,7 +60,7 @@ protected override bool GeneralGCD(out IAction act) protected override bool EmergencyAbility(byte abilitiesRemaining, IAction nextGCD, out IAction act) { //如果接下来要上毒或者要直线射击，那算了。 - if (nextGCD.IsTheSameTo(true, StraitShoot, VenomousBite, Windbite, IronJaws)) + if (nextGCD.IsTheSameTo(true, StraitShoot, VenomousBite, WindBite, IronJaws)) { return base.EmergencyAbility(abilitiesRemaining, nextGCD, out act); } diff --git a/RotationSolver.Default/Ranged/DNC_Default.cs b/RotationSolver.Default/Ranged/DNC_Default.cs index c50d68724..031b2cdf4 100644 --- a/RotationSolver.Default/Ranged/DNC_Default.cs +++ b/RotationSolver.Default/Ranged/DNC_Default.cs @@ -12,7 +12,7 @@ protected override IAction CountDownAction(float remainTime) if (remainTime <= 15) { if (StandardStep.CanUse(out var act, mustUse: true)) return act; - if (ExcutionStepGCD(out act)) return act; + if (ExecuteStepGCD(out act)) return act; } return base.CountDownAction(remainTime); } @@ -67,7 +67,7 @@ protected override bool GeneralGCD(out IAction act) if (FinishStepGCD(out act)) return true; //ִ���貽 - if (ExcutionStepGCD(out act)) return true; + if (ExecuteStepGCD(out act)) return true; //�����貽 if (InBurst && InCombat && TechnicalStep.CanUse(out act, mustUse: true)) return true; @@ -97,20 +97,20 @@ bool AttackGCD(out IAction act, bool breaking) if (Tillana.CanUse(out act, mustUse: true)) return true; //������ - if (StarfallDance.CanUse(out act, mustUse: true)) return true; + if (StarFallDance.CanUse(out act, mustUse: true)) return true; //ʹ�ñ�׼�貽 if (UseStandardStep(out act)) return true; //����AOE - if (Bloodshower.CanUse(out act)) return true; - if (Fountainfall.CanUse(out act)) return true; + if (BloodShower.CanUse(out act)) return true; + if (FountainFall.CanUse(out act)) return true; //�������� if (RisingWindmill.CanUse(out act)) return true; if (ReverseCascade.CanUse(out act)) return true; //����AOE - if (Bladeshower.CanUse(out act)) return true; + if (BladeShower.CanUse(out act)) return true; if (Windmill.CanUse(out act)) return true; //�������� if (Fountain.CanUse(out act)) return true; diff --git a/RotationSolver.Default/Ranged/MCH_Default.cs b/RotationSolver.Default/Ranged/MCH_Default.cs index 93e00564f..8846480ef 100644 --- a/RotationSolver.Default/Ranged/MCH_Default.cs +++ b/RotationSolver.Default/Ranged/MCH_Default.cs @@ -33,7 +33,7 @@ protected override bool GeneralGCD(out IAction act) //群体常规GCD //AOE,毒菌冲击 - if (Bioblaster.CanUse(out act)) return true; + if (BioBlaster.CanUse(out act)) return true; if (ChainSaw.CanUse(out act)) return true; if (IsOverheated && AutoCrossbow.CanUse(out act)) return true; if (SpreadShot.CanUse(out act)) return true; diff --git a/RotationSolver.Default/Tank/DRK_Default.cs b/RotationSolver.Default/Tank/DRK_Default.cs index ccd3f19b4..870c26689 100644 --- a/RotationSolver.Default/Tank/DRK_Default.cs +++ b/RotationSolver.Default/Tank/DRK_Default.cs @@ -110,7 +110,7 @@ protected override bool GeneralGCD(out IAction act) if (UseBlood) { if (Quietus.CanUse(out act)) return true; - if (Bloodspiller.CanUse(out act)) return true; + if (BloodSpiller.CanUse(out act)) return true; } //AOE @@ -132,8 +132,8 @@ protected override bool AttackAbility(byte abilitiesRemaining, out IAction act) { if (CheckDarkSide) { - if (FloodofDarkness.CanUse(out act)) return true; - if (EdgeofDarkness.CanUse(out act)) return true; + if (FloodOfDarkness.CanUse(out act)) return true; + if (EdgeOfDarkness.CanUse(out act)) return true; } if (InBurst) diff --git a/RotationSolver.Default/Tank/GNB_Default.cs b/RotationSolver.Default/Tank/GNB_Default.cs index f3e9e1fa1..9fe28741d 100644 --- a/RotationSolver.Default/Tank/GNB_Default.cs +++ b/RotationSolver.Default/Tank/GNB_Default.cs @@ -77,7 +77,7 @@ protected override bool AttackAbility(byte abilitiesRemaining, out IAction act) if (Hypervelocity.CanUse(out act)) return true; //Ѫ�� - if (GnashingFang.IsCoolingDown && Bloodfest.CanUse(out act)) return true; + if (GnashingFang.IsCoolingDown && BloodFest.CanUse(out act)) return true; //��㹥��,�ַ�ն if (Player.HasStatus(true, StatusID.NoMercy) && RoughDivide.CanUse(out act, mustUse: true)) return true; @@ -89,7 +89,7 @@ protected override bool AttackAbility(byte abilitiesRemaining, out IAction act) [RotationDesc(ActionID.HeartOfLight, ActionID.Reprisal)] protected override bool DefenseAreaAbility(byte abilitiesRemaining, out IAction act) { - if (HeartofLight.CanUse(out act, emptyOrSkipCombo: true)) return true; + if (HeartOfLight.CanUse(out act, emptyOrSkipCombo: true)) return true; if (Reprisal.CanUse(out act, mustUse: true)) return true; return false; } @@ -109,7 +109,7 @@ protected override bool DefenseSingleAbility(byte abilitiesRemaining, out IActio if (Camouflage.CanUse(out act)) return true; } //10 - if (HeartofStone.CanUse(out act)) return true; + if (HeartOfStone.CanUse(out act)) return true; if (Reprisal.CanUse(out act)) return true; @@ -136,7 +136,7 @@ private bool CanUseNoMercy(out IAction act) if (BurstStrike.EnoughLevel) { //4GCD�����ж� - if (IsLastGCD((ActionID)KeenEdge.ID) && Ammo == 1 && !GnashingFang.IsCoolingDown && !Bloodfest.IsCoolingDown) return true; + if (IsLastGCD((ActionID)KeenEdge.ID) && Ammo == 1 && !GnashingFang.IsCoolingDown && !BloodFest.IsCoolingDown) return true; //3�������� else if (Ammo == (Level >= 88 ? 3 : 2)) return true; @@ -167,10 +167,10 @@ private bool CanUseGnashingFang(out IAction act) if (Ammo == 3 && IsLastGCD((ActionID)BrutalShell.ID) && NoMercy.WillHaveOneCharge(3)) return true; //1����Ѫ������ȴ���� - if (Ammo == 1 && !NoMercy.WillHaveOneCharge(55) && Bloodfest.WillHaveOneCharge(5)) return true; + if (Ammo == 1 && !NoMercy.WillHaveOneCharge(55) && BloodFest.WillHaveOneCharge(5)) return true; //4GCD���������ж� - if (Ammo == 1 && !NoMercy.WillHaveOneCharge(55) && (!Bloodfest.IsCoolingDown && Bloodfest.EnoughLevel || !Bloodfest.EnoughLevel)) return true; + if (Ammo == 1 && !NoMercy.WillHaveOneCharge(55) && (!BloodFest.IsCoolingDown && BloodFest.EnoughLevel || !BloodFest.EnoughLevel)) return true; } return false; } @@ -220,7 +220,7 @@ private bool CanUseDoubleDown(out IAction act) if (SonicBreak.IsCoolingDown && Player.HasStatus(true, StatusID.NoMercy)) return true; //2������������ж�,��ǰʹ�ñ��� - if (Player.HasStatus(true, StatusID.NoMercy) && !NoMercy.WillHaveOneCharge(55) && Bloodfest.WillHaveOneCharge(5)) return true; + if (Player.HasStatus(true, StatusID.NoMercy) && !NoMercy.WillHaveOneCharge(55) && BloodFest.WillHaveOneCharge(5)) return true; } return false; @@ -249,7 +249,7 @@ private bool CanUseBurstStrike(out IAction act) //�������ֹ��� if (IsLastGCD((ActionID)BrutalShell.ID) && (Ammo == (Level >= 88 ? 3 : 2) || - Bloodfest.WillHaveOneCharge(6) && Ammo <= 2 && !NoMercy.WillHaveOneCharge(10) && Bloodfest.EnoughLevel)) return true; + BloodFest.WillHaveOneCharge(6) && Ammo <= 2 && !NoMercy.WillHaveOneCharge(10) && BloodFest.EnoughLevel)) return true; } return false; diff --git a/RotationSolver.Default/Tank/PLD_Default.cs b/RotationSolver.Default/Tank/PLD_Default.cs index 85a6f44b9..f57f6d142 100644 --- a/RotationSolver.Default/Tank/PLD_Default.cs +++ b/RotationSolver.Default/Tank/PLD_Default.cs @@ -37,11 +37,11 @@ protected override bool AttackAbility(byte abilitiesRemaining, out IAction act) if (abilitiesRemaining == 1 && InCombat) { if (UseBurstMedicine(out act)) return true; - if (InBurst && !CombatElapsedLess(5) && FightorFlight.CanUse(out act)) return true; + if (InBurst && !CombatElapsedLess(5) && FightOrFlight.CanUse(out act)) return true; } if (CombatElapsedLess(8)) return false; - if (CircleofScorn.CanUse(out act, mustUse: true)) return true; + if (CircleOfScorn.CanUse(out act, mustUse: true)) return true; if (Expiacion.CanUse(out act, mustUse: true)) return true; if (SpiritsWithin.CanUse(out act, mustUse: true)) return true; @@ -75,15 +75,15 @@ protected override bool GeneralGCD(out IAction act) //Single if (!CombatElapsedLess(8) && HasFightOrFlight && GoringBlade.CanUse(out act)) return true; // Dot - if (!FightorFlight.WillHaveOneChargeGCD(2)) + if (!FightOrFlight.WillHaveOneChargeGCD(2)) { - if (!FightorFlight.WillHaveOneChargeGCD(6) && + if (!FightOrFlight.WillHaveOneChargeGCD(6) && HasDivineMight && HolySpirit.CanUse(out act)) return true; - if (RageofHalone.CanUse(out act)) return true; + if (RageOfHalone.CanUse(out act)) return true; if (Atonement.CanUse(out act)) return true; } //123 - if (RageofHalone.CanUse(out act)) return true; + if (RageOfHalone.CanUse(out act)) return true; if (RiotBlade.CanUse(out act)) return true; if (FastBlade.CanUse(out act)) return true; @@ -109,7 +109,7 @@ protected override bool DefenseAreaAbility(byte abilitiesRemaining, out IAction [RotationDesc(ActionID.PassageOfArms)] protected override bool HealAreaAbility(byte abilitiesRemaining, out IAction act) { - if (PassageofArms.CanUse(out act)) return true; + if (PassageOfArms.CanUse(out act)) return true; return base.HealAreaAbility(abilitiesRemaining, out act); } diff --git a/RotationSolver.Default/Tank/WAR_Default.cs b/RotationSolver.Default/Tank/WAR_Default.cs index 4aeb40399..9a5164ca6 100644 --- a/RotationSolver.Default/Tank/WAR_Default.cs +++ b/RotationSolver.Default/Tank/WAR_Default.cs @@ -85,7 +85,7 @@ protected override bool AttackAbility(byte abilitiesRemaining, out IAction act) if (Player.GetHealthRatio() < 0.6f) { - if (ThrillofBattle.CanUse(out act)) return true; + if (ThrillOfBattle.CanUse(out act)) return true; if (Equilibrium.CanUse(out act)) return true; } diff --git a/RotationSolver.Extra/Magical/BLU_Extra.cs b/RotationSolver.Extra/Magical/BLU_Extra.cs index cac2dc97d..900b140ff 100644 --- a/RotationSolver.Extra/Magical/BLU_Extra.cs +++ b/RotationSolver.Extra/Magical/BLU_Extra.cs @@ -27,7 +27,7 @@ protected override bool GeneralGCD(out IAction act) if (!Player.HasStatus(true, StatusID.Tingling) && Tingle.CanUse(out act, mustUse: true)) return true; - if (Offguard.CanUse(out act)) return true; + if (OffGuard.CanUse(out act)) return true; if (TripleTrident.CanUse(out act, mustUse: true)) return true; } diff --git a/RotationSolver.Old/Melee/NIN_Old.cs b/RotationSolver.Old/Melee/NIN_Old.cs index 5bc6b727f..c446bd3dc 100644 --- a/RotationSolver.Old/Melee/NIN_Old.cs +++ b/RotationSolver.Old/Melee/NIN_Old.cs @@ -304,13 +304,13 @@ protected override bool AttackAbility(byte abilitiesRemaining, out IAction act) if (HellfrogMedium.CanUse(out act)) return true; if (Bhavacakra.CanUse(out act)) return true; - if (!DreamWithinaDream.EnoughLevel) + if (!DreamWithinADream.EnoughLevel) { if (Assassinate.CanUse(out act)) return true; } else { - if (DreamWithinaDream.CanUse(out act)) return true; + if (DreamWithinADream.CanUse(out act)) return true; } return false; }