merge fixes

FFXIV-CombatReborn · Nov 16, 2024 · 6f2eb18 · 6f2eb18
1 parent ffdd7a0
commit 6f2eb18
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/BossMod/AI/AIManager.cs b/BossMod/AI/AIManager.cs
@@ -6,7 +6,7 @@
 
 namespace BossMod.AI;
 
-sealed class AIManager(RotationModuleManager autorot, ActionManagerEx amex, MovementOverride movement) : IDisposable
+sealed class AIManager : IDisposable
 {
     public static AIManager? Instance;
     public readonly RotationModuleManager Autorot;

diff --git a/BossMod/Modules/Dawntrail/Extreme/Ex3QueenEternal/Ex3QueenEternal.cs b/BossMod/Modules/Dawntrail/Extreme/Ex3QueenEternal/Ex3QueenEternal.cs
@@ -4,7 +4,7 @@ class ProsecutionOfWar(BossModule module) : Components.TankSwap(module, ActionID
 class DyingMemory(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.DyingMemory));
 class DyingMemoryLast(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.DyingMemoryLast));
 
-[ModuleInfo(BossModuleInfo.Maturity.Contributed, Contributors = "veyn, Malediktus", PlanLevel = 100, PrimaryActorOID = (uint)OID.BossP1, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 1017, NameID = 13029)]
+[ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "veyn, Malediktus", PrimaryActorOID = (uint)OID.BossP1, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 1017, NameID = 13029, PlanLevel = 100)]
 public class Ex3QueenEternal(WorldState ws, Actor primary) : BossModule(ws, primary, ArenaCenter, NormalBounds)
 {
     public static readonly WPos ArenaCenter = Trial.T03QueenEternal.T03QueenEternal.ArenaCenter;

diff --git a/BossMod/Modules/Dawntrail/Unreal/Un1Byakko/Intermission.cs b/BossMod/Modules/Dawntrail/Unreal/Un1Byakko/Intermission.cs
@@ -10,7 +10,7 @@ public VoiceOfThunder(BossModule module) : base(module, 2, m => m.Enemies(OID.Ar
     public override void AddHints(int slot, Actor actor, TextHints hints)
     {
         if (Sources(Module).Any(x => !Shape.Check(actor.Position, x)))
-            hints.Add("Touch the balls!");
+            hints.Add("Touch the orbs!");
     }
 }
 

diff --git a/BossMod/Modules/Dawntrail/Unreal/Un1Byakko/Un1Byakko.cs b/BossMod/Modules/Dawntrail/Unreal/Un1Byakko/Un1Byakko.cs
@@ -9,8 +9,8 @@ class WhiteHerald(BossModule module) : Components.SpreadFromIcon(module, (uint)I
 class DistantClap(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DistantClap), new AOEShapeDonut(4, 25));
 class SweepTheLegBoss(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SweepTheLegBoss), new AOEShapeCone(28.3f, 135.Degrees()));
 
-[ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 1007, NameID = 7092, PlanLevel = 100)]
-public class Un1Byakko(WorldState ws, Actor primary) : BossModule(ws, primary, new(0, 0), new ArenaBoundsCircle(20))
+[ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "veyn", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 1007, NameID = 7092, PlanLevel = 100)]
+public class Un1Byakko(WorldState ws, Actor primary) : BossModule(ws, primary, default, new ArenaBoundsCircle(20))
 {
     private Actor? _hakutei;
     public Actor? Boss() => PrimaryActor;
@@ -25,7 +25,7 @@ protected override void UpdateModule()
 
     protected override void DrawEnemies(int pcSlot, Actor pc)
     {
-        Arena.Actor(PrimaryActor, ArenaColor.Enemy);
-        Arena.Actor(_hakutei, ArenaColor.Enemy);
+        Arena.Actor(PrimaryActor);
+        Arena.Actor(_hakutei);
     }
 }
diff --git a/BossMod/Modules/Dawntrail/Unreal/Un1Byakko/Un1ByakkoEnums.cs b/BossMod/Modules/Dawntrail/Unreal/Un1Byakko/Un1ByakkoEnums.cs
@@ -32,6 +32,7 @@ public enum AID : uint
     UnrelentingAnguish = 39950, // Boss->self, 3.0s cast, single-target, visual (orbs)
     UnrelentingAnguishAratama = 39958, // AratamaForce->self, no cast, range 2 circle, orb explosion
     OminousWind = 39948, // Boss->self, no cast, single-target, apply bubbles
+    OminousWindAOE = 39949, // Helper->self, no cast, range 6 circle
     FireAndLightningBoss = 39930, // Boss->self, 4.0s cast, range 50+R width 20 rect
 
     DanceOfTheIncomplete = 39924, // Boss->self, no cast, single-target, visual (split off tiger)

diff --git a/BossMod/Modules/Dawntrail/Unreal/Un1Byakko/UnrelentingAnguish.cs b/BossMod/Modules/Dawntrail/Unreal/Un1Byakko/UnrelentingAnguish.cs
@@ -1,6 +1,6 @@
 namespace BossMod.Dawntrail.Unreal.Un1Byakko;
 
-class UnrelentingAnguish(BossModule module) : Components.PersistentVoidzone(module, 2, m => m.Enemies(OID.AratamaForce).Where(z => !z.IsDead), 1);
+class UnrelentingAnguish(BossModule module) : Components.PersistentVoidzone(module, 2, m => m.Enemies(OID.AratamaForce).Where(z => !z.IsDead), 2);
 
 // TODO: show something
 class OminousWind(BossModule module) : BossComponent(module)