Merge pull request #465 from FFXIV-CombatReborn/mergeWIP

small jeuno improvements
FFXIV-CombatReborn · Nov 25, 2024 · 7168907 · 7168907
2 parents 741314d + 8ac0e91
commit 7168907
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/BossMod/Modules/Dawntrail/Alliance/A11Prishe/A11PrisheStates.cs b/BossMod/Modules/Dawntrail/Alliance/A11Prishe/A11PrisheStates.cs
@@ -13,6 +13,7 @@ public A11PrisheStates(BossModule module) : base(module)
             .ActivateOnEnter<BanishStorm>()
             .ActivateOnEnter<Explosion>()
             .ActivateOnEnter<KnuckleSandwich>()
+            .ActivateOnEnter<AsuranFists>()
             .ActivateOnEnter<AuroralUppercut>()
             .ActivateOnEnter<Holy>()
             .ActivateOnEnter<NullifyingDropkick>();

diff --git a/BossMod/Modules/Dawntrail/Alliance/A12Fafnir/A12FafnirStates.cs b/BossMod/Modules/Dawntrail/Alliance/A12Fafnir/A12FafnirStates.cs
@@ -25,6 +25,7 @@ public A12FafnirStates(BossModule module) : base(module)
             .ActivateOnEnter<HorridRoarSpread>()
             .ActivateOnEnter<AbsoluteTerror>()
             .ActivateOnEnter<HurricaneWingRaidwide>()
+            .ActivateOnEnter<HurricaneWingRW>()
             .ActivateOnEnter<WingedTerror>();
     }
     // private void SinglePhase(uint id)

diff --git a/BossMod/Modules/Dawntrail/Alliance/A13ArkAngels/A13ArkAngels.cs b/BossMod/Modules/Dawntrail/Alliance/A13ArkAngels/A13ArkAngels.cs
@@ -16,7 +16,7 @@ class TachiGekko(BossModule module) : Components.CastGaze(module, ActionID.MakeS
 class TachiKasha(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TachiKasha), new AOEShapeCircle(4));
 class TachiYukikaze(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TachiYukikaze), new AOEShapeRect(50, 2.5f));
 class ConcertedDissolution(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ConcertedDissolution), new AOEShapeCone(40, 15.Degrees()));
-class LightsChain(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.LightsChain), new AOEShapeDonut(5, 40));
+class LightsChain(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.LightsChain), new AOEShapeDonut(4, 40));
 class DivineDominion(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DivineDominion), new AOEShapeCircle(6));
 class CrossReaver(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.CrossReaverAOE), new AOEShapeCross(50, 6));
 class Holy(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Holy));

diff --git a/BossMod/Modules/Dawntrail/Alliance/A13ArkAngels/A13ArkAngelsEnums.cs b/BossMod/Modules/Dawntrail/Alliance/A13ArkAngels/A13ArkAngelsEnums.cs
@@ -43,7 +43,7 @@ public enum AID : uint
     TachiGekkoVisual = 41366, // TachiGekkoHelper->self, 7.0s cast, range 50 circle, visual (???)
     TachiKasha = 41083, // Helper->self, 12.0s cast, range 4+16 circle, out
     ConcertedDissolution = 41084, // Helper->self, 6.0s cast, range 40 30-degree cone
-    LightsChain = 41085, // Helper->self, 8.0s cast, range 5-40 donut
+    LightsChain = 41085, // Helper->self, 8.0s cast, range 4-40 donut
     Meteor = 41098, // BossTT->self, 11.0s cast, single-target, interruptible ???
     MeteorAOE = 41099, // Helper->location, no cast, range 100 circle
 

diff --git a/BossMod/Modules/Dawntrail/Alliance/A13ArkAngels/ArenaChange.cs b/BossMod/Modules/Dawntrail/Alliance/A13ArkAngels/ArenaChange.cs
@@ -8,13 +8,13 @@ class ArenaChange(BossModule module) : Components.GenericAOEs(module)
     public override IEnumerable<AOEInstance> ActiveAOEs(int slot, Actor actor) => Utils.ZeroOrOne(_aoe);
     public override void OnCastStarted(Actor caster, ActorCastInfo spell)
     {
-        if ((AID)spell.Action.ID == AID.DecisiveBattleMR)
-            _aoe = new(donut, Arena.Center, default, Module.CastFinishAt(spell, 3.4f));
+        if ((AID)spell.Action.ID == AID.Cloudsplitter)
+            _aoe = new(donut, Arena.Center, default, Module.CastFinishAt(spell, 1.5f));
     }
 
     public override void OnEventEnvControl(byte index, uint state)
     {
-        if (state == 0x00200001 && index == 0x1F)
+        if (state == 0x00020001 && index == 0x00)
         {
             Arena.Bounds = A13ArkAngels.DefaultBounds;
             _aoe = null;

diff --git a/BossMod/Modules/Dawntrail/Alliance/A13ArkAngels/ArroganceIncarnate.cs b/BossMod/Modules/Dawntrail/Alliance/A13ArkAngels/ArroganceIncarnate.cs
@@ -1,6 +1,6 @@
 namespace BossMod.Dawntrail.Alliance.A13ArkAngels;
 
-class ArroganceIncarnate(BossModule module) : Components.StackWithIcon(module, (uint)IconID.ArroganceIncarnate, ActionID.MakeSpell(AID.ArroganceIncarnateAOE), 6, 5.8f, 8)
+class ArroganceIncarnate(BossModule module) : Components.StackWithIcon(module, (uint)IconID.ArroganceIncarnate, ActionID.MakeSpell(AID.ArroganceIncarnateAOE), 6, 5.8f, 8, 24)
 {
     public override void OnCastStarted(Actor caster, ActorCastInfo spell)
     {

diff --git a/BossMod/Modules/Dawntrail/Alliance/A13ArkAngels/Dragonfall.cs b/BossMod/Modules/Dawntrail/Alliance/A13ArkAngels/Dragonfall.cs
@@ -1,6 +1,6 @@
 namespace BossMod.Dawntrail.Alliance.A13ArkAngels;
 
-class Dragonfall(BossModule module) : Components.UniformStackSpread(module, 6, 0, 8)
+class Dragonfall(BossModule module) : Components.UniformStackSpread(module, 6, 0, 8, 8)
 {
     public int NumCasts;