Skip to content

Commit

Permalink
Merge pull request #282 from FFXIV-CombatReborn/Base2.0
Browse files Browse the repository at this point in the history
every class hit with base update, fix bard dot, low level VPR compatibility, false clicks, and default AOE setings for most?all?some? abiltites
  • Loading branch information
LTS-FFXIV authored Jul 29, 2024
2 parents 412115b + 1fa6164 commit bfd8609
Show file tree
Hide file tree
Showing 25 changed files with 1,236 additions and 534 deletions.
46 changes: 20 additions & 26 deletions RotationSolver.Basic/Rotations/Basic/AstrologianRotation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ static partial void ModifyCombustPvE(ref ActionSetting setting)
static partial void ModifyLightspeedPvE(ref ActionSetting setting)
{
setting.StatusProvide = [StatusID.Lightspeed];
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
TimeToKill = 10,
};
Expand All @@ -64,7 +64,7 @@ static partial void ModifyLightspeedPvE(ref ActionSetting setting)
static partial void ModifyHeliosPvE(ref ActionSetting setting)
{
setting.IsFriendly = true;
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand Down Expand Up @@ -174,19 +174,19 @@ static partial void ModifyAspectedHeliosPvE(ref ActionSetting setting)
setting.StatusProvide = [StatusID.AspectedHelios];
setting.UnlockedByQuestID = 67551;
setting.IsFriendly = true;
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
}

static partial void ModifyGravityPvE(ref ActionSetting setting)
{
setting.CreateConfig = () => new()
setting.UnlockedByQuestID = 67553;
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 3,
};
setting.UnlockedByQuestID = 67553;
}

static partial void ModifyCombustIiPvE(ref ActionSetting setting)
Expand All @@ -209,9 +209,6 @@ static partial void ModifyDivinationPvE(ref ActionSetting setting)
setting.CreateConfig = () => new()
{
TimeToKill = 10,
};
setting.CreateConfig = () => new()
{
AoeCount = 1,
};
}
Expand All @@ -226,7 +223,7 @@ static partial void ModifyCollectiveUnconsciousPvE(ref ActionSetting setting)
setting.TargetStatusProvide = [StatusID.CollectiveUnconscious, StatusID.WheelOfFortune];
setting.UnlockedByQuestID = 67560;
setting.IsFriendly = true;
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand All @@ -237,7 +234,7 @@ static partial void ModifyCelestialOppositionPvE(ref ActionSetting setting)
setting.TargetStatusProvide = [StatusID.Opposition];
setting.UnlockedByQuestID = 67561;
setting.IsFriendly = true;
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand All @@ -246,20 +243,17 @@ static partial void ModifyCelestialOppositionPvE(ref ActionSetting setting)
static partial void ModifyEarthlyStarPvE(ref ActionSetting setting)
{
setting.StatusProvide = [StatusID.EarthlyDominance, StatusID.GiantDominance];
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
TimeToKill = 10,
};
setting.CreateConfig = () => new()
{
AoeCount = 1,
};
}

static partial void ModifyStellarDetonationPvE(ref ActionSetting setting)
{
setting.StatusNeed = [StatusID.GiantDominance];
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand All @@ -279,7 +273,7 @@ static partial void ModifyLordOfCrownsPvE(ref ActionSetting setting)
{
setting.ActionCheck = () => DrawnCard.All(card => card == CardType.NONE) && DrawnCrownCard == CardType.LORD;
setting.IsFriendly = false;
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand All @@ -289,7 +283,7 @@ static partial void ModifyLadyOfCrownsPvE(ref ActionSetting setting)
{
setting.ActionCheck = () => DrawnCard.All(card => card == CardType.NONE) && DrawnCrownCard == CardType.LADY;
setting.IsFriendly = true;
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand All @@ -315,7 +309,7 @@ static partial void ModifyHoroscopePvE(ref ActionSetting setting)
{
setting.TargetStatusProvide = [StatusID.Horoscope];
setting.IsFriendly = true;
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand All @@ -325,15 +319,15 @@ static partial void ModifyHoroscopePvE_16558(ref ActionSetting setting)
{
setting.StatusNeed = [StatusID.Horoscope];
setting.IsFriendly = true;
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
}

static partial void ModifyNeutralSectPvE(ref ActionSetting setting)
{
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
TimeToKill = 15,
};
Expand All @@ -348,7 +342,7 @@ static partial void ModifyFallMaleficPvE(ref ActionSetting setting)

static partial void ModifyGravityIiPvE(ref ActionSetting setting)
{
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 3,
};
Expand All @@ -364,7 +358,7 @@ static partial void ModifyMacrocosmosPvE(ref ActionSetting setting)
{
setting.TargetStatusProvide = [StatusID.Macrocosmos];
setting.StatusProvide = [StatusID.Macrocosmos];
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand All @@ -374,7 +368,7 @@ static partial void ModifyMicrocosmosPvE(ref ActionSetting setting)
{
setting.StatusNeed = [StatusID.Macrocosmos];
setting.IsFriendly = true;
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand All @@ -383,7 +377,7 @@ static partial void ModifyMicrocosmosPvE(ref ActionSetting setting)
static partial void ModifyOraclePvE(ref ActionSetting setting)
{
setting.StatusNeed = [StatusID.Divining];
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand All @@ -393,7 +387,7 @@ static partial void ModifyHeliosConjunctionPvE(ref ActionSetting setting)
{
setting.StatusProvide = [StatusID.HeliosConjunction];
setting.IsFriendly = true;
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand All @@ -403,7 +397,7 @@ static partial void ModifySunSignPvE(ref ActionSetting setting)
{
setting.StatusNeed = [StatusID.Suntouched];
setting.IsFriendly = true;
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand Down
35 changes: 14 additions & 21 deletions RotationSolver.Basic/Rotations/Basic/BardRotation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ static partial void ModifyRepellingShotPvE(ref ActionSetting setting)
static partial void ModifyQuickNockPvE(ref ActionSetting setting)
{
setting.StatusProvide = [StatusID.HawksEye_3861];
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 3,
};
Expand All @@ -101,7 +101,7 @@ static partial void ModifyQuickNockPvE(ref ActionSetting setting)
static partial void ModifyWideVolleyPvE(ref ActionSetting setting)
{
setting.StatusNeed = [StatusID.HawksEye_3861];
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 3,
};
Expand Down Expand Up @@ -131,7 +131,6 @@ static partial void ModifyTheWardensPaeanPvE(ref ActionSetting setting)
static partial void ModifyBarragePvE(ref ActionSetting setting)
{
setting.StatusProvide = [StatusID.Barrage, StatusID.ResonantArrowReady];
setting.UnlockedByQuestID = 68430;
}

static partial void ModifyArmysPaeonPvE(ref ActionSetting setting)
Expand All @@ -145,7 +144,7 @@ static partial void ModifyArmysPaeonPvE(ref ActionSetting setting)
static partial void ModifyRainOfDeathPvE(ref ActionSetting setting)
{
setting.UnlockedByQuestID = 66624;
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 3,
};
Expand All @@ -155,12 +154,9 @@ static partial void ModifyBattleVoicePvE(ref ActionSetting setting)
{
setting.StatusProvide = [StatusID.BattleVoice];
setting.UnlockedByQuestID = 66626;
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
TimeToKill = 10,
};
setting.CreateConfig = () => new()
{
AoeCount = 1,
};
}
Expand All @@ -176,7 +172,7 @@ static partial void ModifyTheWanderersMinuetPvE(ref ActionSetting setting)
static partial void ModifyPitchPerfectPvE(ref ActionSetting setting)
{
setting.ActionCheck = () => Song == Song.WANDERER && Repertoire > 0;
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand Down Expand Up @@ -209,7 +205,7 @@ static partial void ModifyTroubadourPvE(ref ActionSetting setting)
{
setting.StatusFromSelf = false;
setting.StatusProvide = StatusHelper.RangePhysicalDefense;
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand All @@ -230,7 +226,7 @@ static partial void ModifyStormbitePvE(ref ActionSetting setting)
static partial void ModifyNaturesMinnePvE(ref ActionSetting setting)
{
setting.StatusProvide = [StatusID.NaturesMinne];
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand All @@ -245,7 +241,7 @@ static partial void ModifyRefulgentArrowPvE(ref ActionSetting setting)
static partial void ModifyShadowbitePvE(ref ActionSetting setting)
{
setting.StatusNeed = [StatusID.HawksEye_3861, StatusID.Barrage];
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 3,
};
Expand All @@ -260,7 +256,7 @@ static partial void ModifyApexArrowPvE(ref ActionSetting setting)
{
setting.StatusProvide = [StatusID.BlastArrowReady];
setting.ActionCheck = () => SoulVoice >= 20;
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand All @@ -269,7 +265,7 @@ static partial void ModifyApexArrowPvE(ref ActionSetting setting)
static partial void ModifyLadonsbitePvE(ref ActionSetting setting)
{
setting.StatusProvide = [StatusID.HawksEye_3861];
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 3,
};
Expand All @@ -278,7 +274,7 @@ static partial void ModifyLadonsbitePvE(ref ActionSetting setting)
static partial void ModifyBlastArrowPvE(ref ActionSetting setting)
{
setting.StatusNeed = [StatusID.BlastArrowReady];
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand All @@ -288,12 +284,9 @@ static partial void ModifyRadiantFinalePvE(ref ActionSetting setting)
{
setting.ActionCheck = () => JobGauge.Coda.Any(s => s != Song.NONE);
setting.StatusProvide = [StatusID.RadiantEncoreReady];
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
TimeToKill = 10,
};
setting.CreateConfig = () => new()
{
AoeCount = 1,
};
}
Expand All @@ -306,7 +299,7 @@ static partial void ModifyHeartbreakShotPvE(ref ActionSetting setting)
static partial void ModifyResonantArrowPvE(ref ActionSetting setting)
{
setting.StatusNeed = [StatusID.ResonantArrowReady];
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand All @@ -315,7 +308,7 @@ static partial void ModifyResonantArrowPvE(ref ActionSetting setting)
static partial void ModifyRadiantEncorePvE(ref ActionSetting setting)
{
setting.StatusNeed = [StatusID.RadiantEncoreReady];
setting.CreateConfig = () => new()
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 1,
};
Expand Down
Loading

0 comments on commit bfd8609

Please sign in to comment.