Skip to content

Commit

Permalink
Tank goal zones fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@Akechi-kun
Akechi-kun committed Feb 9, 2025
1 parent 0b2aae2 commit e08c1ba
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion BossMod/Autorotation/Standard/akechi/AkechiTools.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ protected bool CanWeave(AID aid, int extraGCDs = 0, float extraFixedDelay = 0)
/// </summary>
/// <param name="track">The user's picked strategy's option <b>Track</b>, retrieved from module's enums and definitions. (e.g. <b>strategy.Option(Track.NoMercy)</b>)</param>
/// <returns></returns>
protected Actor? TargetChoice(StrategyValues.OptionRef track) => ResolveTargetOverride(track.Value); //Resolves the target choice based on the strategy
protected Actor? TargetChoice(StrategyValues.OptionRef track) => ResolveTargetOverride(track.Value);

/// <summary>Targeting function for indicating when or not <b>AOE Circle</b> abilities should be used based on targets nearby.</summary>
/// <param name="range">The range of the <b>AOE Circle</b> ability, or radius from center of Player; this should be adjusted accordingly to user's module specific to job's abilities.</param>
Expand Down
4 changes: 2 additions & 2 deletions BossMod/Autorotation/Standard/akechi/Tank/AkechiDRK.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,12 +387,12 @@ bloodStrat is BloodStrategy.ForceQuietus ? GCDPriority.ForcedGCD

#region AI
var goalST = primaryTarget?.Actor != null ? Hints.GoalSingleTarget(primaryTarget!.Actor, 3) : null; //Set goal for single target
var goalAOE = primaryTarget?.Actor != null ? Hints.GoalAOECircle(5) : null; //Set goal for AOE
var goalAOE = Hints.GoalAOECircle(3); //Set goal for AOE
var goal = strategy.Option(SharedTrack.AOE).As<AOEStrategy>() switch //Set goal based on AOE strategy
{
AOEStrategy.ForceST => goalST, //if forced single target
AOEStrategy.ForceAOE => goalAOE, //if forced AOE
_ => goalST != null && goalAOE != null ? Hints.GoalCombined(goalST, goalAOE, 2) : goalAOE //otherwise, combine goals
_ => goalST != null ? Hints.GoalCombined(goalST, goalAOE, 3) : goalAOE //otherwise, combine goals
};
if (goal != null) //if goal is set
Hints.GoalZones.Add(goal); //add goal to zones
Expand Down
12 changes: 6 additions & 6 deletions BossMod/Autorotation/Standard/akechi/Tank/AkechiGNB.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,14 +459,14 @@ reignStrat is ReignStrategy.ForceLion

#region AI
var goalST = primaryTarget?.Actor != null ? Hints.GoalSingleTarget(primaryTarget!.Actor, 3) : null; //Set goal for single target
var goalAOE = primaryTarget?.Actor != null ? Hints.GoalAOECircle(5) : null; //Set goal for AOE
var goal = AOEStrategy switch //Set goal based on AOE strategy
var goalAOE = Hints.GoalAOECircle(3); //Set goal for AOE
var goal = strategy.Option(Track.AOE).As<AOEStrategy>() switch //Set goal based on AOE strategy
{
AOEStrategy.ForceSTwithO => goalST, //if forced single target
AOEStrategy.ForceSTwithoutO => goalST, //if forced single target
AOEStrategy.ForceSTwithO => goalST, //if forced 123 combo
AOEStrategy.ForceAOEwithoutO => goalAOE, //if forced buffs combo
AOEStrategy.ForceAOEwithO => goalAOE, //if forced AOE action
_ => goalST != null && goalAOE != null ? Hints.GoalCombined(goalST, goalAOE, 2) : goalAOE //otherwise, combine goals
AOEStrategy.ForceAOEwithO => goalAOE, //if forced single target
AOEStrategy.ForceAOEwithoutO => goalAOE, //if forced single target
_ => goalST != null ? Hints.GoalCombined(goalST, goalAOE, 3) : goalAOE //otherwise, combine goals
};
if (goal != null) //if goal is set
Hints.GoalZones.Add(goal); //add goal to zones
Expand Down
6 changes: 3 additions & 3 deletions BossMod/Autorotation/Standard/akechi/Tank/AkechiPLD.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,12 +386,12 @@ gbStrat is GCDStrategy.Force

#region AI
var goalST = primaryTarget?.Actor != null ? Hints.GoalSingleTarget(primaryTarget!.Actor, 3) : null; //Set goal for single target
var goalAOE = primaryTarget?.Actor != null ? Hints.GoalAOECircle(5) : null; //Set goal for AOE
var goalAOE = Hints.GoalAOECircle(3); //Set goal for AOE
var goal = strategy.Option(Track.AOE).As<AOEStrategy>() switch //Set goal based on AOE strategy
{
AOEStrategy.ForceST => goalST, //if forced single target
AOEStrategy.ForceAOE => goalAOE, //if forced AOE
_ => goalST != null && goalAOE != null ? Hints.GoalCombined(goalST, goalAOE, 2) : goalAOE //otherwise, combine goals
AOEStrategy.ForceAOE => goalAOE, //if forced single target
_ => goalST != null ? Hints.GoalCombined(goalST, goalAOE, 3) : goalAOE //otherwise, combine goals
};
if (goal != null) //if goal is set
Hints.GoalZones.Add(goal); //add goal to zones
Expand Down
4 changes: 2 additions & 2 deletions BossMod/Autorotation/Standard/akechi/Tank/AkechiWAR.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,12 +490,12 @@ bgStrat is GaugeStrategy.ForceAOE

#region AI
var goalST = primaryTarget?.Actor != null ? Hints.GoalSingleTarget(primaryTarget!.Actor, 3) : null; //Set goal for single target
var goalAOE = primaryTarget?.Actor != null ? Hints.GoalAOECircle(5) : null; //Set goal for AOE
var goalAOE = Hints.GoalAOECircle(3); //Set goal for AOE
var goal = strategy.Option(SharedTrack.AOE).As<AOEStrategy>() switch //Set goal based on AOE strategy
{
AOEStrategy.ForceST => goalST, //if forced single target
AOEStrategy.ForceAOE => goalAOE, //if forced AOE
_ => goalST != null && goalAOE != null ? Hints.GoalCombined(goalST, goalAOE, 2) : goalAOE //otherwise, combine goals
_ => goalST != null ? Hints.GoalCombined(goalST, goalAOE, 3) : goalAOE //otherwise, combine goals
};
if (goal != null) //if goal is set
Hints.GoalZones.Add(goal); //add goal to zones
Expand Down

0 comments on commit e08c1ba

Please sign in to comment.