Merge pull request #149 from FFXIV-CombatReborn/mergeWIP2

A Father First tiny changes
FFXIV-CombatReborn · Jul 1, 2024 · 558488c · 558488c
2 parents 8388918 + 56ffbab
commit 558488c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/BossMod/Modules/Dawntrail/Quests/MSQ/AFatherFirst.cs b/BossMod/Modules/Dawntrail/Quests/MSQ/AFatherFirst.cs
@@ -79,7 +79,10 @@ public override IEnumerable<AOEInstance> ActiveAOEs(int slot, Actor actor)
     public override void OnCastStarted(Actor caster, ActorCastInfo spell)
     {
         if ((AID)spell.Action.ID is AID.DualBlows1 or AID.DualBlows2 or AID.DualBlows3 or AID.DualBlows4)
+        {
             _aoes.Add(new(cone, caster.Position, spell.Rotation, spell.NPCFinishAt));
+            _aoes.SortBy(x => x.Activation);
+        }
         if ((AID)spell.Action.ID is AID.SteeledStrike1 or AID.SteeledStrike2)
             _aoes.Add(new(cross, caster.Position, spell.Rotation, spell.NPCFinishAt));
     }
@@ -107,7 +110,7 @@ public override IEnumerable<AOEInstance> ActiveAOEs(int slot, Actor actor)
                 yield return new(_aoes[i].Shape, _aoes[i].Origin, default, _aoes[i].Activation, ArenaColor.Danger);
         if (_aoes.Count > 9)
             for (var i = 9; i < _aoes.Count; ++i)
-                yield return new(_aoes[i].Shape, _aoes[i].Origin, default, _aoes[i].Activation, Risky: false);
+                yield return new(_aoes[i].Shape, _aoes[i].Origin, default, _aoes[i].Activation);
     }
 
     public override void OnCastStarted(Actor caster, ActorCastInfo spell)
@@ -125,7 +128,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell)
     }
 }
 
-class BrawlEnder(BossModule module) : Components.Knockback(module)
+class BrawlEnder(BossModule module) : Components.Knockback(module, stopAtWall: true)
 {
     private DateTime activation;
 
@@ -135,6 +138,8 @@ public override IEnumerable<Source> Sources(int slot, Actor actor)
             yield return new(actor.Position, 20, activation, default, actor.Rotation, Kind.DirForward);
     }
 
+    public override bool DestinationUnsafe(int slot, Actor actor, WPos pos) => Module.FindComponent<FireVoidzone>()?.ActiveAOEs(slot, actor).Any(z => z.Shape.Check(pos, z.Origin, z.Rotation)) ?? false;
+
     public override void OnCastStarted(Actor caster, ActorCastInfo spell)
     {
         if ((AID)spell.Action.ID == AID.BrawlEnder)