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

Commit

Permalink
fix: change all job's description.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed Feb 21, 2023
1 parent 9da2af3 commit 7525a57
Show file tree
Hide file tree
Showing 34 changed files with 242 additions and 346 deletions.
12 changes: 2 additions & 10 deletions RotationSolver/Data/StatusID.cs
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,6 @@ internal enum StatusID : ushort
/// </summary>
Dia = 1871,
#endregion
///// <summary>
///// 即刻咏唱
///// </summary>
//Swiftcast1 = 1325,

///// <summary>
///// 即刻咏唱
///// </summary>
//Swiftcast2 = 1987,

/// <summary>
/// 即刻咏唱
Expand Down Expand Up @@ -1106,7 +1097,6 @@ internal enum StatusID : ushort
/// </summary>
AuspiciousTrance = 2497,


/// <summary>
/// 致死腐烂毒素
/// </summary>
Expand All @@ -1122,4 +1112,6 @@ internal enum StatusID : ushort
IceSpikesInvincible = 198,

CircleOfPower = 738,

Aetherpact = 1223,
}
22 changes: 21 additions & 1 deletion RotationSolver/Rotations/Basic/BLM_Base.cs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ public override bool CanUse(out IAction act, bool mustUse = false, bool emptyOrS
}
}


/// <summary>
/// 闪雷
/// </summary>
Expand Down Expand Up @@ -310,5 +309,26 @@ private protected override void UpdateInfo()
}
base.UpdateInfo();
}

[RotationDesc(ActionID.Manaward)]
private protected sealed override bool DefenseSingleGCD(out IAction act)
{
if (Manaward.CanUse(out act)) return true;
return base.DefenseSingleGCD(out act);
}

[RotationDesc(ActionID.Addle)]
private protected override bool DefenceAreaAbility(byte abilitiesRemaining, out IAction act)
{
if (Addle.CanUse(out act)) return true;
return false;
}

[RotationDesc(ActionID.AetherialManipulation)]
private protected sealed override bool MoveForwardGCD(out IAction act)
{
if (AetherialManipulation.CanUse(out act, mustUse: true)) return true;
return base.MoveForwardGCD(out act);
}
}
}
15 changes: 15 additions & 0 deletions RotationSolver/Rotations/Basic/BRD_Base.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Dalamud.Game.ClientState.JobGauge.Types;
using RotationSolver.Actions;
using RotationSolver.Actions.BaseAction;
using RotationSolver.Attributes;
using RotationSolver.Commands;
using RotationSolver.Data;
using RotationSolver.Helpers;
Expand Down Expand Up @@ -216,4 +217,18 @@ private protected override bool EmergencyAbility(byte abilityRemain, IAction nex
}
return base.EmergencyAbility(abilityRemain, nextGCD, out act);
}

[RotationDesc(ActionID.Troubadour)]
private protected sealed override bool DefenceAreaAbility(byte abilitiesRemaining, out IAction act)
{
if (Troubadour.CanUse(out act)) return true;
return false;
}

[RotationDesc(ActionID.NaturesMinne)]
private protected sealed override bool HealSingleAbility(byte abilitiesRemaining, out IAction act)
{
if (NaturesMinne.CanUse(out act)) return true;
return false;
}
}
17 changes: 17 additions & 0 deletions RotationSolver/Rotations/Basic/DNC_Base.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Dalamud.Game.ClientState.JobGauge.Types;
using RotationSolver.Actions;
using RotationSolver.Actions.BaseAction;
using RotationSolver.Attributes;
using RotationSolver.Data;
using RotationSolver.Helpers;
using System.Linq;
Expand Down Expand Up @@ -309,9 +310,25 @@ protected static bool ExcutionStepGCD(out IAction act)
return false;
}

[RotationDesc(ActionID.EnAvant)]
private protected sealed override bool MoveForwardAbility(byte abilitiesRemaining, out IAction act)
{
if (EnAvant.CanUse(out act, emptyOrSkipCombo: true)) return true;
return false;
}

[RotationDesc(ActionID.CuringWaltz, ActionID.Improvisation)]
private protected sealed override bool HealAreaAbility(byte abilitiesRemaining, out IAction act)
{
if (CuringWaltz.CanUse(out act, emptyOrSkipCombo: true)) return true;
if (Improvisation.CanUse(out act, emptyOrSkipCombo: true)) return true;
return false;
}

[RotationDesc(ActionID.ShieldSamba)]
private protected sealed override bool DefenceAreaAbility(byte abilitiesRemaining, out IAction act)
{
if (ShieldSamba.CanUse(out act, emptyOrSkipCombo: true)) return true;
return false;
}
}
8 changes: 5 additions & 3 deletions RotationSolver/Rotations/Basic/DRK_Base.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
using Dalamud.Game.ClientState.Objects.Types;
using RotationSolver.Actions;
using RotationSolver.Actions.BaseAction;
using RotationSolver.Attributes;
using RotationSolver.Data;
using RotationSolver.Helpers;

namespace RotationSolver.Rotations.Basic;
internal abstract class DRK_Base : CustomRotation.CustomRotation
{
private static DRKGauge JobGauge => Service.JobGauges.Get<DRKGauge>();
protected static ushort DarksideTimeRemaining => JobGauge.DarksideTimeRemaining;
private static float DarksideTimeRemaining => JobGauge.DarksideTimeRemaining / 1000f;
/// <summary>
/// 暗血
/// </summary>
Expand All @@ -27,7 +28,7 @@ internal abstract class DRK_Base : CustomRotation.CustomRotation
/// <returns></returns>
protected static bool DarkSideEndAfter(float time)
{
return EndAfter(JobGauge.DarksideTimeRemaining / 1000f, time);
return EndAfter(DarksideTimeRemaining, time);
}

/// <summary>
Expand All @@ -38,7 +39,7 @@ protected static bool DarkSideEndAfter(float time)
/// <returns></returns>
protected static bool DarkSideEndAfterGCD(uint gctCount = 0, uint abilityCount = 0)
{
return EndAfterGCD(JobGauge.DarksideTimeRemaining / 1000f, gctCount, abilityCount);
return EndAfterGCD(DarksideTimeRemaining, gctCount, abilityCount);
}

public sealed override ClassJobID[] JobIDs => new ClassJobID[] { ClassJobID.DarkKnight };
Expand Down Expand Up @@ -216,6 +217,7 @@ private protected override bool EmergencyAbility(byte abilitiesRemaining, IActio
return base.EmergencyAbility(abilitiesRemaining, nextGCD, out act);
}

[RotationDesc(ActionID.Plunge)]
private protected sealed override bool MoveForwardAbility(byte abilitiesRemaining, out IAction act)
{
if (Plunge.CanUse(out act, emptyOrSkipCombo: true)) return true;
Expand Down
4 changes: 2 additions & 2 deletions RotationSolver/Rotations/Basic/GNB_Base.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Dalamud.Game.ClientState.Objects.Types;
using RotationSolver.Actions;
using RotationSolver.Actions.BaseAction;
using RotationSolver.Attributes;
using RotationSolver.Data;
using RotationSolver.Helpers;

Expand Down Expand Up @@ -230,14 +231,13 @@ internal abstract class GNB_Base : CustomRotation.CustomRotation

private protected override bool EmergencyAbility(byte abilitiesRemaining, IAction nextGCD, out IAction act)
{
//超火流星 如果谢不够了。
if (Superbolide.CanUse(out act) && BaseAction.TankBreakOtherCheck(JobIDs[0], Superbolide.Target)) return true;
return base.EmergencyAbility(abilitiesRemaining, nextGCD, out act);
}

[RotationDesc(ActionID.RoughDivide)]
private protected sealed override bool MoveForwardAbility(byte abilitiesRemaining, out IAction act)
{
//突进
if (RoughDivide.CanUse(out act, emptyOrSkipCombo: true)) return true;
return false;
}
Expand Down
9 changes: 9 additions & 0 deletions RotationSolver/Rotations/Basic/MCH_Base.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Dalamud.Game.ClientState.JobGauge.Types;
using RotationSolver.Actions;
using RotationSolver.Actions.BaseAction;
using RotationSolver.Attributes;
using RotationSolver.Data;
using RotationSolver.Helpers;

Expand Down Expand Up @@ -176,4 +177,12 @@ protected static bool OverheatedEndAfterGCD(uint gctCount = 0, uint abilityCount
};

public static IBaseAction Dismantle { get; } = new BaseAction(ActionID.Dismantle, true, isTimeline: true);

[RotationDesc(ActionID.Tactician, ActionID.Dismantle)]
private protected sealed override bool DefenceAreaAbility(byte abilitiesRemaining, out IAction act)
{
if (Tactician.CanUse(out act, mustUse: true)) return true;
if (Dismantle.CanUse(out act, mustUse: true)) return true;
return false;
}
}
14 changes: 14 additions & 0 deletions RotationSolver/Rotations/Basic/MNK_Base.cs
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,18 @@ private protected sealed override bool DefenceAreaAbility(byte abilitiesRemainin
if (Feint.CanUse(out act)) return true;
return false;
}

[RotationDesc(ActionID.Mantra)]
private protected sealed override bool HealAreaAbility(byte abilitiesRemaining, out IAction act)
{
if (Mantra.CanUse(out act)) return true;
return false;
}

[RotationDesc(ActionID.RiddleofEarth)]
private protected sealed override bool DefenceSingleAbility(byte abilitiesRemaining, out IAction act)
{
if (RiddleofEarth.CanUse(out act, emptyOrSkipCombo: true)) return true;
return false;
}
}
8 changes: 8 additions & 0 deletions RotationSolver/Rotations/Basic/NIN_Base.cs
Original file line number Diff line number Diff line change
Expand Up @@ -321,4 +321,12 @@ private protected sealed override bool DefenceAreaAbility(byte abilitiesRemainin
if (Feint.CanUse(out act)) return true;
return false;
}

[RotationDesc(ActionID.ShadeShift)]
private protected override bool DefenceSingleAbility(byte abilitiesRemaining, out IAction act)
{
if (ShadeShift.CanUse(out act)) return true;

return false;
}
}
5 changes: 3 additions & 2 deletions RotationSolver/Rotations/Basic/PLD_Base.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Dalamud.Game.ClientState.JobGauge.Types;
using RotationSolver.Actions;
using RotationSolver.Actions.BaseAction;
using RotationSolver.Attributes;
using RotationSolver.Data;
using RotationSolver.Helpers;
using RotationSolver.Updaters;
Expand Down Expand Up @@ -208,16 +209,16 @@ private protected override bool EmergencyAbility(byte abilitiesRemaining, IActio
return base.EmergencyAbility(abilitiesRemaining, nextGCD, out act);
}

[RotationDesc(ActionID.Intervene)]
private protected sealed override bool MoveForwardAbility(byte abilitiesRemaining, out IAction act)
{
//调停
if (Intervene.CanUse(out act, emptyOrSkipCombo: true)) return true;
return false;
}

[RotationDesc(ActionID.Clemency)]
private protected sealed override bool HealSingleGCD(out IAction act)
{
//深仁厚泽
if (Clemency.CanUse(out act)) return true;
return false;
}
Expand Down
11 changes: 11 additions & 0 deletions RotationSolver/Rotations/Basic/RDM_Base.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Dalamud.Game.ClientState.JobGauge.Types;
using RotationSolver.Actions;
using RotationSolver.Actions.BaseAction;
using RotationSolver.Attributes;
using RotationSolver.Data;
using RotationSolver.Helpers;
using RotationSolver.Updaters;
Expand Down Expand Up @@ -218,15 +219,25 @@ internal abstract class RDM_Base : CustomRotation.CustomRotation
ComboIdsNot = new[] { ActionID.Riposte, ActionID.Zwerchhau, ActionID.Scorch, ActionID.Verflare, ActionID.Verholy },
};

[RotationDesc(ActionID.Vercure)]
private protected sealed override bool HealSingleGCD(out IAction act)
{
if (Vercure.CanUse(out act, mustUse: true)) return true;
return false;
}

[RotationDesc(ActionID.CorpsAcorps)]
private protected sealed override bool MoveForwardAbility(byte abilitiesRemaining, out IAction act)
{
if (CorpsAcorps.CanUse(out act, emptyOrSkipCombo: true)) return true;
return false;
}

[RotationDesc(ActionID.Addle, ActionID.MagickBarrier)]
private protected sealed override bool DefenceAreaAbility(byte abilitiesRemaining, out IAction act)
{
if (Addle.CanUse(out act)) return true;
if (MagickBarrier.CanUse(out act, mustUse: true)) return true;
return false;
}
}
11 changes: 11 additions & 0 deletions RotationSolver/Rotations/Basic/RPR_Base.cs
Original file line number Diff line number Diff line change
Expand Up @@ -325,4 +325,15 @@ private protected sealed override bool DefenceAreaAbility(byte abilitiesRemainin
act = null;
return false;
}

[RotationDesc(ActionID.ArcaneCrest)]
private protected override bool DefenceSingleAbility(byte abilitiesRemaining, out IAction act)
{
if (!SoulReaver && !Enshrouded)
{
if (ArcaneCrest.CanUse(out act)) return true;
}

return base.DefenceSingleAbility(abilitiesRemaining, out act);
}
}
7 changes: 7 additions & 0 deletions RotationSolver/Rotations/Basic/SAM_Base.cs
Original file line number Diff line number Diff line change
Expand Up @@ -295,4 +295,11 @@ private protected sealed override bool DefenceAreaAbility(byte abilitiesRemainin
if (Feint.CanUse(out act)) return true;
return false;
}

[RotationDesc(ActionID.ThirdEye)]
private protected override bool DefenceSingleAbility(byte abilitiesRemaining, out IAction act)
{
if (ThirdEye.CanUse(out act)) return true;
return false;
}
}
22 changes: 22 additions & 0 deletions RotationSolver/Rotations/Basic/SMN_Base.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Dalamud.Game.ClientState.JobGauge.Types;
using RotationSolver.Actions;
using RotationSolver.Actions.BaseAction;
using RotationSolver.Attributes;
using RotationSolver.Data;
using RotationSolver.Updaters;

Expand Down Expand Up @@ -294,4 +295,25 @@ protected static bool SummonTimeEndAfter(float time)
/// 医术
/// </summary>
public static IBaseAction Physick { get; } = new BaseAction(ActionID.Physick, true);

[RotationDesc(ActionID.RadiantAegis)]
private protected sealed override bool DefenceSingleAbility(byte abilitiesRemaining, out IAction act)
{
if (RadiantAegis.CanUse(out act)) return true;
return false;
}

[RotationDesc(ActionID.Physick)]
private protected override bool HealSingleGCD(out IAction act)
{
if (Physick.CanUse(out act)) return true;
return false;
}

[RotationDesc(ActionID.Addle)]
private protected override bool DefenceAreaAbility(byte abilitiesRemaining, out IAction act)
{
if (Addle.CanUse(out act)) return true;
return false;
}
}
3 changes: 2 additions & 1 deletion RotationSolver/Rotations/Basic/WAR_Base.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Dalamud.Game.ClientState.JobGauge.Types;
using RotationSolver.Actions;
using RotationSolver.Actions.BaseAction;
using RotationSolver.Attributes;
using RotationSolver.Data;
using RotationSolver.Helpers;

Expand Down Expand Up @@ -184,9 +185,9 @@ private protected override bool EmergencyAbility(byte abilitiesRemaining, IActio
return base.EmergencyAbility(abilitiesRemaining, nextGCD, out act);
}

[RotationDesc(ActionID.Onslaught)]
private protected sealed override bool MoveForwardAbility(byte abilitiesRemaining, out IAction act)
{
//突进
if (Onslaught.CanUse(out act, emptyOrSkipCombo: true)) return true;
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion RotationSolver/Rotations/Healer/AST/AST_Default.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ private protected override IAction CountDownAction(float remainTime)
return base.CountDownAction(remainTime);
}

[RotationDesc(ActionID.CelestialIntersection, ActionID.Exaltation)]
[RotationDesc("Another test please.", ActionID.CelestialIntersection, ActionID.Exaltation)]
private protected override bool DefenceSingleAbility(byte abilitiesRemaining, out IAction act)
{
//天星交错
Expand Down
Loading

0 comments on commit 7525a57

Please sign in to comment.