diff --git a/BossMod/Modules/Events/FF15Collab/Garuda.cs b/BossMod/Modules/Events/FF15Collab/Garuda.cs index 23f2f328d2..142148d45c 100644 --- a/BossMod/Modules/Events/FF15Collab/Garuda.cs +++ b/BossMod/Modules/Events/FF15Collab/Garuda.cs @@ -1,3 +1,4 @@ +// CONTRIB: made by malediktus, not checked using System; using System.Linq; @@ -21,7 +22,7 @@ public enum AID : uint unknown = 14588, // Helper->Noctis, no cast, single-target MiniSupercell = 14612, // Boss->self, 5,0s cast, range 45 width 6 rect, line stack, knockback 50, away from source GravitationalForce = 14614, // Boss->self, 3,5s cast, single-target - GravitationalForce2= 14615, // Helper->location, 3,5s cast, range 5 circle + GravitationalForce2 = 14615, // Helper->location, 3,5s cast, range 5 circle Vortex = 14677, // Helper->self, no cast, range 50 circle Vortex2 = 14620, // Helper->self, no cast, range 50 circle Vortex3 = 14622, // Helper->self, no cast, range 50 circle @@ -65,7 +66,7 @@ public override void OnCastFinished(BossModule module, Actor caster, ActorCastIn if ((AID)spell.Action.ID == AID.Microburst) casting = false; } - + public override void AddGlobalHints(BossModule module, GlobalHints hints) { if (casting) @@ -96,9 +97,9 @@ public override void OnCastFinished(BossModule module, Actor caster, ActorCastIn base.OnCastFinished(module, caster, spell); if ((AID)spell.Action.ID == AID.MistralShriek) casting = false; - done = module.WorldState.CurrentTime; + done = module.WorldState.CurrentTime; } - + public override void AddGlobalHints(BossModule module, GlobalHints hints) { if (casting) @@ -107,11 +108,11 @@ public override void AddGlobalHints(BossModule module, GlobalHints hints) public override void AddAIHints(BossModule module, int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.AddAIHints(module, slot, actor, assignment, hints); - if (casting) - hints.PlannedActions.Add((ActionID.MakeSpell(AID.warpstrike), module.Enemies(OID.Monolith).Where(p => !p.Position.AlmostEqual(module.PrimaryActor.Position, 5)).FirstOrDefault()!, 1, false)); - if (module.WorldState.CurrentTime > done && module.WorldState.CurrentTime < done.AddSeconds(2)) - hints.PlannedActions.Add((ActionID.MakeSpell(AID.warpstrike), module.PrimaryActor, 1, false)); + base.AddAIHints(module, slot, actor, assignment, hints); + if (casting) + hints.PlannedActions.Add((ActionID.MakeSpell(AID.warpstrike), module.Enemies(OID.Monolith).Where(p => !p.Position.AlmostEqual(module.PrimaryActor.Position, 5)).FirstOrDefault()!, 1, false)); + if (module.WorldState.CurrentTime > done && module.WorldState.CurrentTime < done.AddSeconds(2)) + hints.PlannedActions.Add((ActionID.MakeSpell(AID.warpstrike), module.PrimaryActor, 1, false)); } } @@ -137,17 +138,21 @@ class MiniSupercell : Components.SelfTargetedAOEs //ugly hack to make a line sta class MiniSupercell2 : Components.StackWithCastTargets { public MiniSupercell2() : base(ActionID.MakeSpell(AID.MiniSupercell), 1.2f) { } + public override void DrawArenaForeground(BossModule module, int pcSlot, Actor pc, MiniArena arena) { } + public override void OnCastStarted(BossModule module, Actor caster, ActorCastInfo spell) { if ((AID)spell.Action.ID == AID.MiniSupercell) AddStack(module.Enemies(OID.Noctis).FirstOrDefault()!); } + public override void OnCastFinished(BossModule module, Actor caster, ActorCastInfo spell) { if ((AID)spell.Action.ID == AID.MiniSupercell) Stacks.Clear(); } + public override void AddHints(BossModule module, int slot, Actor actor, TextHints hints, MovementHints? movementHints) { if (module.FindComponent()!.ActiveAOEs(module, slot, actor) != null && Stacks.Count > 0) @@ -209,4 +214,4 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Object); } } -} \ No newline at end of file +} diff --git a/BossMod/Modules/Events/FF15Collab/Iseultalon.cs b/BossMod/Modules/Events/FF15Collab/Iseultalon.cs index 1aa531382c..0291eced6c 100644 --- a/BossMod/Modules/Events/FF15Collab/Iseultalon.cs +++ b/BossMod/Modules/Events/FF15Collab/Iseultalon.cs @@ -1,3 +1,4 @@ +// CONTRIB: made by malediktus, not checked using System; using System.Collections.Generic; @@ -100,7 +101,7 @@ public Stomp() : base(ActionID.MakeSpell(AID.Stomp)) { } class DeathRay : Components.SelfTargetedAOEs { - public DeathRay() : base(ActionID.MakeSpell(AID.DeathRay2), new AOEShapeRect(40, 1)) + public DeathRay() : base(ActionID.MakeSpell(AID.DeathRay2), new AOEShapeRect(40, 1)) { Color = ArenaColor.Danger; } @@ -167,4 +168,4 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } } -} \ No newline at end of file +} diff --git a/BossMod/Modules/Events/FF15Collab/MA-x.cs b/BossMod/Modules/Events/FF15Collab/MA-x.cs index 9eb4dba64d..6844eeec3c 100644 --- a/BossMod/Modules/Events/FF15Collab/MA-x.cs +++ b/BossMod/Modules/Events/FF15Collab/MA-x.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; - +// CONTRIB: made by malediktus, not checked namespace BossMod.Events.FF15Collab.MAx { public enum OID : uint @@ -61,4 +59,4 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Object); } } -} \ No newline at end of file +}