Merge pull request #192 from FFXIV-CombatReborn/Drakengard

Arena fixes for Tower at Paradigms Breach, WIP for Knave of Hearts

BossMod/Modules/Shadowbringers/Alliance/A31KnaveofHearts/A31KnaveofHearts.cs

@@ -1,4 +1,21 @@
 namespace BossMod.Shadowbringers.Alliance.A31KnaveofHearts;
 
+class Roar(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Roar));
+
+class ColossalImpact6(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ColossalImpact6), new AOEShapeRect(61, 10));
+class ColossalImpact7(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ColossalImpact7), new AOEShapeRect(61, 10));
+class ColossalImpact8(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ColossalImpact8), new AOEShapeRect(61, 10));
+class ColossalImpactLeft(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ColossalImpactLeft), new AOEShapeRect(90, 61, -10, DirectionOffset: -90.Degrees()));
+class ColossalImpactRight(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ColossalImpactRight), new AOEShapeRect(90, 61, -10, DirectionOffset: 90.Degrees()));
+class ColossalImpactMiddle(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ColossalImpactMiddle), new AOEShapeRect(61, 10));
+
+class MagicArtilleryBeta2(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.MagicArtilleryBeta2), 3);
+class MagicArtilleryAlpha2(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.MagicArtilleryAlpha2), 5);
+class LightLeap2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LightLeap2), 25);
+class BoxSpawn(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BoxSpawn), new AOEShapeRect(8, 4));
+class MagicBarrage(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MagicBarrage), new AOEShapeRect(61, 2.5f));
+class Lunge(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.Lunge), 60, stopAtWall: true, kind: Kind.DirForward);
+class Energy(BossModule module) : Components.PersistentVoidzone(module, 1, m => m.Enemies(OID.Energy).Where(z => z.EventState != 7));
+
 [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "The Combat Reborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 779, NameID = 9955)]
-public class A31KnaveofHearts(WorldState ws, Actor primary) : BossModule(ws, primary, new(-800, -750), new ArenaBoundsCircle(30));
+public class A31KnaveofHearts(WorldState ws, Actor primary) : BossModule(ws, primary, new(-800, -724.4f), new ArenaBoundsSquare(29.5f));

BossMod/Modules/Shadowbringers/Alliance/A31KnaveofHearts/A31KnaveofHeartsEnums.cs

@@ -20,11 +20,10 @@ public enum AID : uint
     BalancedEdge = 23791, // Ally2B->self, 2.0s cast, range 5 circle
     WhirlingAssault = 23792, // Ally2B->self, 2.0s cast, range 40 width 4 rect
 
-    ColossalImpact1 = 24231, // Boss/CopiedKnave->self, 8.0s cast, range 61 width 20 rect
-
-    ColossalImpact2 = 24228, // Boss/CopiedKnave->self, 7.0s cast, single-target
-    ColossalImpact3 = 24229, // Helper->self, 8.0s cast, range 61 width 20 rect
-    ColossalImpact4 = 24230, // Helper->self, 8.0s cast, range 61 width 20 rect
+    ColossalImpact1 = 24228, // Boss/CopiedKnave->self, 7.0s cast, single-target
+    ColossalImpactLeft = 24229, // Helper->self, 8.0s cast, range 61 width 20 rect // left
+    ColossalImpactRight = 24230, // Helper->self, 8.0s cast, range 61 width 20 rect // right
+    ColossalImpactMiddle = 24231, // Boss/CopiedKnave->self, 8.0s cast, range 61 width 20 rect // middle
 
     ColossalImpact5 = 23805, // Boss->self, 8.5s cast, single-target
 
@@ -34,18 +33,23 @@ public enum AID : uint
 
     MagicArtilleryBeta1 = 24242, // Boss->self, 3.0s cast, single-target
     MagicArtilleryBeta2 = 24243, // Helper->player, 5.0s cast, range 3 circle
-    Replicate = 24233, // Boss->self, 3.0s cast, single-target
+
+    MagicArtilleryAlpha1 = 24234, // Boss->self, 3.0s cast, single-target
+    MagicArtilleryAlpha2 = 24235, // Helper->players, 6.0s cast, range 5 circle
+
     StackingTheDeck1 = 24816, // CopiedKnave->self, 6.0s cast, single-target
     StackingTheDeck2 = 23801, // Boss->self, 6.0s cast, single-target
+
+    LightLeap1 = 24238, // Boss->self, 7.0s cast, single-target
+    LightLeap2 = 24239, // Helper->location, 8.5s cast, range 40 circle
+
+    Replicate = 24233, // Boss->self, 3.0s cast, single-target
     Spheroids = 24232, // Boss->self, 4.0s cast, single-target
     KnavishBullets = 24237, // Spheroid->self, no cast, single-target
-    MagicArtilleryAlpha1 = 24234, // Boss->self, 3.0s cast, single-target
     Burst = 24244, // Energy->player, no cast, single-target
-    MagicArtilleryAlpha2 = 24235, // Helper->players, 6.0s cast, range 5 circle
-    LightLeap1 = 24238, // Boss->self, 7.0s cast, single-target
-    LightLeap2 = 24239, // Helper->location, 8.5s cast, range 40 circle
-    UnknownAbiltiy = 24240, // Helper->self, 4.0s cast, range 8 width 8 rect
-    Lunge = 24241, // Boss/CopiedKnave->self, 8.0s cast, range 61 width 60 rect
+    BoxSpawn = 24240, // Helper->self, 4.0s cast, range 8 width 8 rect
+
+    Lunge = 24241, // Boss/CopiedKnave->self, 8.0s cast, range 61 width 60 rect // knockback 60 dirforward
     MagicBarrage = 24236, // Spheroid->self, 6.0s cast, range 61 width 5 rect
 }
 

BossMod/Modules/Shadowbringers/Alliance/A31KnaveofHearts/A31KnaveofHeartsStates.cs

@@ -4,6 +4,20 @@ class A31KnaveofHeartsStates : StateMachineBuilder
 {
     public A31KnaveofHeartsStates(BossModule module) : base(module)
     {
-        TrivialPhase();
+        TrivialPhase()
+            .ActivateOnEnter<Roar>()
+            .ActivateOnEnter<ColossalImpactLeft>()
+            .ActivateOnEnter<ColossalImpactRight>()
+            .ActivateOnEnter<ColossalImpactMiddle>()
+            .ActivateOnEnter<ColossalImpact6>()
+            .ActivateOnEnter<ColossalImpact7>()
+            .ActivateOnEnter<ColossalImpact8>()
+            .ActivateOnEnter<MagicArtilleryBeta2>()
+            .ActivateOnEnter<MagicArtilleryAlpha2>()
+            .ActivateOnEnter<Energy>()
+            .ActivateOnEnter<LightLeap2>()
+            .ActivateOnEnter<BoxSpawn>()
+            .ActivateOnEnter<MagicBarrage>()
+            .ActivateOnEnter<Lunge>();
     }
 }

BossMod/Modules/Shadowbringers/Alliance/A32HanselGretel/A32HanselGretel.cs

@@ -1,7 +1,7 @@
 namespace BossMod.Shadowbringers.Alliance.A32HanselGretel;
 
 [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "The Combat Reborn Team", PrimaryActorOID = (uint)OID.Gretel, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 779, NameID = 9990)]
-public class A32HanselGretel(WorldState ws, Actor primary) : BossModule(ws, primary, new(-800, -950), new ArenaBoundsCircle(30))
+public class A32HanselGretel(WorldState ws, Actor primary) : BossModule(ws, primary, new(-800, -951), new ArenaBoundsCircle(25))
 {
     private Actor? _hansel;
 

BossMod/Modules/Shadowbringers/Alliance/A33TrashFight/A33TrashFight.cs

@@ -0,0 +1,4 @@
+namespace BossMod.Shadowbringers.Alliance.A33TrashFight;
+
+//[ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "The Combat Reborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 779, NameID = 9920)]
+//public class A33TrashFight(WorldState ws, Actor primary) : BossModule(ws, primary, new(755, -749), new ArenaBoundsCircle(24.9f));

BossMod/Modules/Shadowbringers/Alliance/A33TrashFight/A33TrashFightEnums.cs

@@ -0,0 +1 @@
+namespace BossMod.Shadowbringers.Alliance.A33TrashFight;

BossMod/Modules/Shadowbringers/Alliance/A33TrashFight/A33TrashFightStates.cs

@@ -0,0 +1 @@
+namespace BossMod.Shadowbringers.Alliance.A33TrashFight;

BossMod/Modules/Shadowbringers/Alliance/A34RedGirlP1/A34RedGirlP1.cs

@@ -0,0 +1,4 @@
+namespace BossMod.Shadowbringers.Alliance.A34RedGirlP1;
+
+[ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "The Combat Reborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 779, NameID = 9920)]
+public class A34RedGirlP1(WorldState ws, Actor primary) : BossModule(ws, primary, new(845, -851), new ArenaBoundsRect(19, 20));

BossMod/Modules/Shadowbringers/Alliance/A33RedGirlP1/A33RedGirlP1Enums.cs → BossMod/Modules/Shadowbringers/Alliance/A34RedGirlP1/A34RedGirlP1Enums.cs

@@ -1,4 +1,4 @@
-namespace BossMod.Shadowbringers.Alliance.A33RedGirlP1;
+namespace BossMod.Shadowbringers.Alliance.A34RedGirlP1;
 
 public enum OID : uint
 {

BossMod/Modules/Shadowbringers/Alliance/A34RedGirlP1/A34RedGirlP1States.cs

@@ -0,0 +1,9 @@
+namespace BossMod.Shadowbringers.Alliance.A34RedGirlP1;
+
+class A34RedGirlP1States : StateMachineBuilder
+{
+    public A34RedGirlP1States(BossModule module) : base(module)
+    {
+        TrivialPhase();
+    }
+}

BossMod/Modules/Shadowbringers/Alliance/A34RedGirlP2/A34RedGirlP2.cs

@@ -1,4 +1,4 @@
 namespace BossMod.Shadowbringers.Alliance.A34RedGirlP2;
 
 [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "The Combat Reborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 779, NameID = 9950)]
-public class A34RedGirlP2(WorldState ws, Actor primary) : BossModule(ws, primary, new(845, -850), new ArenaBoundsCircle(20));
+public class A34RedGirlP2(WorldState ws, Actor primary) : BossModule(ws, primary, new(845, -851), new ArenaBoundsRect(19, 20));

BossMod/Modules/Shadowbringers/Alliance/A35XunZiMengZi/A35XunZiMengZi.cs

@@ -1,7 +1,7 @@
 namespace BossMod.Shadowbringers.Alliance.A35XunZiMengZi;
 
 [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "The Combat Reborn Team", PrimaryActorOID = (uint)OID.XunZi, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 779, NameID = 9921)]
-public class A35XunZiMengZi(WorldState ws, Actor primary) : BossModule(ws, primary, new(800, 800), new ArenaBoundsSquare(20))
+public class A35XunZiMengZi(WorldState ws, Actor primary) : BossModule(ws, primary, new(800, 800), new ArenaBoundsSquare(25))
 {
     private Actor? _mengZi;
 

BossMod/Modules/Shadowbringers/Alliance/A36FalseIdol/A36FalseIdol.cs

@@ -1,4 +1,4 @@
 namespace BossMod.Shadowbringers.Alliance.A36FalseIdol;
 
 [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "The Combat Reborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 779, NameID = 9948)]
-public class A36FalseIdol(WorldState ws, Actor primary) : BossModule(ws, primary, new(-700, -725), new ArenaBoundsCircle(30));
+public class A36FalseIdol(WorldState ws, Actor primary) : BossModule(ws, primary, new(-700, -700), new ArenaBoundsSquare(25));

BossMod/Modules/Shadowbringers/Alliance/A37HerInfloresence/A37HerInfloresence.cs

@@ -1,4 +1,4 @@
 namespace BossMod.Shadowbringers.Alliance.A37HerInfloresence;
 
 [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "The Combat Reborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 779, NameID = 9949)]
-public class A37HerInfloresence(WorldState ws, Actor primary) : BossModule(ws, primary, new(-700, -725), new ArenaBoundsCircle(30));
+public class A37HerInfloresence(WorldState ws, Actor primary) : BossModule(ws, primary, new(-700, -700), new ArenaBoundsSquare(25));