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

Commit

Permalink
Merge pull request #197 from FFXIV-CombatReborn/SCHVPR
Browse files Browse the repository at this point in the history 
SCH post 90 support, VPR status timers exposed as settings
  • Loading branch information
@LTS-FFXIV
LTS-FFXIV authored Aug 27, 2024
2 parents 9f1bd9c + 4f2d438 commit 4c63d94
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 51 deletions.
108 changes: 62 additions & 46 deletions BasicRotations/Healer/SCH_Default.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ public sealed class SCH_Default : ScholarRotation
[RotationConfig(CombatType.PvE, Name = "Give Adloquium/Galvanize to Tank during Countdown (Requires above enabled)")]
public bool GiveT { get; set; } = false;

[RotationConfig(CombatType.PvE, Name = "Use Sacred Soil while moving")]
public bool SacredMove { get; set; } = false;

[Range(0, 1, ConfigUnitType.Percent)]
[RotationConfig(CombatType.PvE, Name = "Remove Aetherpact to conserve resources if party member is above this percentage")]
public float AetherpactRemove { get; set; } = 0.9f;
Expand Down Expand Up @@ -46,50 +49,6 @@ public sealed class SCH_Default : ScholarRotation
}
#endregion

#region GCD Logic
[RotationDesc(ActionID.SuccorPvE)]
protected override bool HealAreaGCD(out IAction? act)
{
if (SuccorPvE.CanUse(out act)) return true;

return base.HealAreaGCD(out act);
}

[RotationDesc(ActionID.AdloquiumPvE, ActionID.PhysickPvE)]
protected override bool HealSingleGCD(out IAction? act)
{
if (AdloquiumPvE.CanUse(out act)) return true;
if (PhysickPvE.CanUse(out act)) return true;

return base.HealSingleGCD(out act);
}

[RotationDesc(ActionID.SuccorPvE)]
protected override bool DefenseAreaGCD(out IAction? act)
{
if (SuccorPvE.CanUse(out act)) return true;
return base.DefenseAreaGCD(out act);
}

protected override bool GeneralGCD(out IAction? act)
{
if (SummonEosPvE.CanUse(out act)) return true;
if (BioPvE.CanUse(out act) && AllHostileTargets.Where(p => p.DistanceToPlayer() < 5).Count() < 4) return true;

//AOE
if (ArtOfWarPvE.CanUse(out act)) return true;

//Single
if (RuinPvE.CanUse(out act)) return true;
if (RuinIiPvE.CanUse(out act)) return true;

//Add dot.
if (BioPvE.CanUse(out act, skipStatusProvideCheck: true)) return true;

return base.GeneralGCD(out act);
}
#endregion

#region oGCD Logic
protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
{
Expand All @@ -115,6 +74,8 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
[RotationDesc(ActionID.SummonSeraphPvE, ActionID.ConsolationPvE, ActionID.WhisperingDawnPvE, ActionID.SacredSoilPvE, ActionID.IndomitabilityPvE)]
protected override bool HealAreaAbility(IAction nextGCD, out IAction? act)
{
if (AccessionPvE.CanUse(out act)) return true;
if (ConcitationPvE.CanUse(out act)) return true;
if (WhisperingDawnPvE_16537.Cooldown.ElapsedOneChargeAfterGCD(1) || FeyIlluminationPvE_16538.Cooldown.ElapsedOneChargeAfterGCD(1) || FeyBlessingPvE.Cooldown.ElapsedOneChargeAfterGCD(1))
{
if (SummonSeraphPvE.CanUse(out act)) return true;
Expand All @@ -133,10 +94,10 @@ protected override bool HealAreaAbility(IAction nextGCD, out IAction? act)
protected override bool HealSingleAbility(IAction nextGCD, out IAction? act)
{
var haveLink = PartyMembers.Any(p => p.HasStatus(true, StatusID.FeyUnion_1223));
if (ManifestationPvE.CanUse(out act)) return true;

if (AetherpactPvE.CanUse(out act) && FairyGauge >= 70 && !haveLink) return true;
if (ProtractionPvE.CanUse(out act)) return true;
if (SacredSoilPvE.CanUse(out act)) return true;
if (ExcogitationPvE.CanUse(out act)) return true;
if (LustratePvE.CanUse(out act)) return true;
if (AetherpactPvE.CanUse(out act) && !haveLink) return true;
Expand All @@ -147,6 +108,8 @@ protected override bool HealSingleAbility(IAction nextGCD, out IAction? act)
[RotationDesc(ActionID.FeyIlluminationPvE, ActionID.ExpedientPvE, ActionID.SummonSeraphPvE, ActionID.ConsolationPvE, ActionID.SacredSoilPvE)]
protected override bool DefenseAreaAbility(IAction nextGCD, out IAction? act)
{
if (SeraphismPvE.CanUse(out act)) return true;

if (FeyIlluminationPvE_16538.CanUse(out act)) return true;
if (ExpedientPvE.CanUse(out act)) return true;

Expand All @@ -155,7 +118,7 @@ protected override bool DefenseAreaAbility(IAction nextGCD, out IAction? act)
if (SummonSeraphPvE.CanUse(out act)) return true;
}
if (ConsolationPvE.CanUse(out act, usedUp: true)) return true;
if (SacredSoilPvE.CanUse(out act)) return true;
if (((!SacredMove && !IsMoving) || SacredMove) && SacredSoilPvE.CanUse(out act)) return true;

return base.DefenseAreaAbility(nextGCD, out act);
}
Expand All @@ -167,8 +130,16 @@ protected override bool DefenseSingleAbility(IAction nextGCD, out IAction? act)
return base.DefenseSingleAbility(nextGCD, out act);
}

[RotationDesc(ActionID.ExpedientPvE)]
protected override bool SpeedAbility(IAction nextGCD, out IAction? act)
{
if (InCombat && ExpedientPvE.CanUse(out act, usedUp: true)) return true;
return base.SpeedAbility(nextGCD, out act);
}

protected override bool AttackAbility(IAction nextGCD, out IAction? act)
{
if (BanefulImpactionPvE.CanUse(out act)) return true;
if (IsBurst)
{
if (ChainStratagemPvE.CanUse(out act)) return true;
Expand All @@ -186,6 +157,51 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
}
#endregion

#region GCD Logic
[RotationDesc(ActionID.SuccorPvE)]
protected override bool HealAreaGCD(out IAction? act)
{
if (SuccorPvE.CanUse(out act)) return true;

return base.HealAreaGCD(out act);
}

[RotationDesc(ActionID.AdloquiumPvE, ActionID.PhysickPvE)]
protected override bool HealSingleGCD(out IAction? act)
{
if (AdloquiumPvE.CanUse(out act)) return true;
if (PhysickPvE.CanUse(out act)) return true;

return base.HealSingleGCD(out act);
}

[RotationDesc(ActionID.SuccorPvE)]
protected override bool DefenseAreaGCD(out IAction? act)
{
if (SuccorPvE.CanUse(out act)) return true;
return base.DefenseAreaGCD(out act);
}

protected override bool GeneralGCD(out IAction? act)
{
if (SummonEosPvE.CanUse(out act)) return true;
if (BioPvE.CanUse(out act) && AllHostileTargets.Where(p => p.DistanceToPlayer() < 5).Count() < 4) return true;

//AOE
if (ArtOfWarIiPvE.CanUse(out act)) return true;
if (ArtOfWarPvE.CanUse(out act)) return true;

//Single
if (RuinPvE.CanUse(out act)) return true;
if (RuinIiPvE.CanUse(out act)) return true;

//Add dot while moving.
if (BioPvE.CanUse(out act, skipStatusProvideCheck: true)) return true;

return base.GeneralGCD(out act);
}
#endregion

#region Extra Methods
public override bool CanHealSingleSpell => base.CanHealSingleSpell && (GCDHeal || PartyMembers.GetJobCategory(JobRole.Healer).Count() < 2);
public override bool CanHealAreaSpell => base.CanHealAreaSpell && (GCDHeal || PartyMembers.GetJobCategory(JobRole.Healer).Count() < 2);
Expand Down
16 changes: 12 additions & 4 deletions BasicRotations/Melee/VPR_Default.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ public sealed class VPR_Default : ViperRotation
[RotationConfig(CombatType.PvE, Name = "How many charges of Uncoiled Fury needs to be at before be used inside of melee (Ignores burst, leave at 3 to hold charges for out of melee uptime or burst only)")]
public int MaxUncoiledStacksUser { get; set; } = 3;

[Range(1, 30, ConfigUnitType.None, 1)]
[RotationConfig(CombatType.PvE, Name = "How long on the status time for Swift needs to be to allow reawaken use (setting this too low can lead to dropping buff)")]
public int SwiftTimer { get; set; } = 10;

[Range(1, 30, ConfigUnitType.None, 1)]
[RotationConfig(CombatType.PvE, Name = "How long on the status time for Hunt needs to be to allow reawaken use (setting this too low can lead to dropping buff)")]
public int HuntersTimer { get; set; } = 10;

[Range(0, 120, ConfigUnitType.None, 5)]
[RotationConfig(CombatType.PvE, Name = "How long has to pass on Serpents Ire's cooldown before the rotation starts pooling gauge for burst. Leave this alone if you dont know what youre doing. (Will still use Reawaken if you reach cap regardless of timer)")]
public int ReawakenDelayTimer { get; set; } = 75;
Expand Down Expand Up @@ -84,12 +92,12 @@ protected override bool GeneralGCD(out IAction? act)
if (FirstGenerationPvE.CanUse(out act)) return true;


if (SwiftTime > 10 &&
HuntersTime > 10 &&
if (SwiftTime > SwiftTimer &&
HuntersTime > HuntersTimer &&
!HasHunterVenom && !HasSwiftVenom &&
!HasPoisedBlood && !HasPoisedFang && SerpentsIrePvE.EnoughLevel && (!SerpentsIrePvE.Cooldown.ElapsedAfter(ReawakenDelayTimer) || SerpentOffering == 100) ||
SwiftTime > 10 &&
HuntersTime > 10 &&
SwiftTime > SwiftTimer &&
HuntersTime > HuntersTimer &&
!HasHunterVenom && !HasSwiftVenom &&
!HasPoisedBlood && !HasPoisedFang && !SerpentsIrePvE.EnoughLevel)
{
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 @@ -16,7 +16,7 @@
<Compile Include="Duty\EmanationDefault" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="RotationSolverReborn.Basic" Version="7.0.5.30" />
<PackageReference Include="RotationSolverReborn.Basic" Version="7.0.5.33" />
</ItemGroup>
<ItemGroup>
<Reference Include="Dalamud">
Expand Down

0 comments on commit 4c63d94

Please sign in to comment.