merge fix

FFXIV-CombatReborn · Nov 20, 2024 · e1e8dba · e1e8dba
1 parent da065f5
commit e1e8dba
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/BossMod/Modules/Dawntrail/Unreal/Un1Byakko/Un1Byakko.cs b/BossMod/Modules/Dawntrail/Unreal/Un1Byakko/Un1Byakko.cs
@@ -10,7 +10,7 @@ class WhiteHerald(BossModule module) : Components.SpreadFromIcon(module, (uint)I
 class SweepTheLegBoss(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SweepTheLegBoss), new AOEShapeCone(28.3f, 135.Degrees()));
 
 [ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "veyn, Malediktus", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 1007, NameID = 7092, PlanLevel = 100)]
-public class Un1Byakko(WorldState ws, Actor primary) : BossModule(ws, primary, default, DefaultBounds)
+public class Un1Byakko(WorldState ws, Actor primary) : BossModule(ws, primary, default, NormalBounds)
 {
     public static readonly ArenaBoundsComplex NormalBounds = new([new Polygon(default, 19.5f, 48)]);
     public static readonly ArenaBoundsComplex IntermissionBounds = new([new Polygon(default, 15, 48)]);

diff --git a/BossMod/Modules/Dawntrail/Unreal/Un1Byakko/Un1ByakkoStates.cs b/BossMod/Modules/Dawntrail/Unreal/Un1Byakko/Un1ByakkoStates.cs
@@ -151,7 +151,6 @@ private void Intermission(uint id, float delay)
         ActorCast(id + 0x10, _module.Hakutei, AID.RoarOfThunder, 4.4f, 20, true, "Add enrage") // note: pretty large variance here
             .ActivateOnEnter<VoiceOfThunder>()
             .DeactivateOnExit<VoiceOfThunder>()
-            .OnExit(() => _module.Arena.Bounds = Un1Byakko.FreeFallBounds)
             .SetHint(StateMachine.StateHint.Raidwide | StateMachine.StateHint.DowntimeStart);
         ComponentCondition<Intermission>(id + 0x12, 5.7f, comp => comp.Active)
             .ActivateOnEnter<Intermission>()
@@ -163,7 +162,6 @@ private void Intermission(uint id, float delay)
             .ActivateOnEnter<ImperialGuard>();
         ComponentCondition<ImperialGuard>(id + 0x22, 12, comp => comp.NumCasts > 1, "Line 2");
         ComponentCondition<IntermissionSweepTheLeg>(id + 0x23, 13.6f, comp => comp.NumCasts > 1, "Donut 2")
-            .OnExit(() => _module.Arena.Bounds = Un1Byakko.DefaultBounds)
             .DeactivateOnExit<IntermissionOrbAratama>()
             .DeactivateOnExit<IntermissionSweepTheLeg>();
         ComponentCondition<ImperialGuard>(id + 0x24, 3.4f, comp => comp.NumCasts > 2, "Line 3")