Merge pull request #52 from FFXIV-CombatReborn/OzmaArenaUnion

Ozma arena union
FFXIV-CombatReborn · Apr 21, 2024 · dfdb819 · dfdb819
2 parents 6a09887 + 6ced8c0
commit dfdb819
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/BossMod/Modules/Heavensward/Alliance/A23Headstone/A23Headstone.cs b/BossMod/Modules/Heavensward/Alliance/A23Headstone/A23Headstone.cs
@@ -1,7 +1,10 @@
 namespace BossMod.Heavensward.Alliance.A23Headstone;
 
 [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "CombatReborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 168, NameID = 4868)]
-public class A23Headstone(WorldState ws, Actor primary) : BossModule(ws, primary, new ArenaBoundsCircle(new(-160, 220), 40))
+
+class A23Headstone(WorldState ws, Actor primary) : BossModule(ws, primary, new ArenaBoundsUnion([
+    new ArenaBoundsCircle(new(-168, 225), 20), new ArenaBoundsCircle(new(-152.53f, 252.76f), 20), new ArenaBoundsCircle(new(-184.63f, 197.09f), 20)]))
+
 {
     protected override void DrawEnemies(int pcSlot, Actor pc)
     {

diff --git a/BossMod/Modules/Heavensward/Alliance/A24Ozma/A24Ozma.cs b/BossMod/Modules/Heavensward/Alliance/A24Ozma/A24Ozma.cs
@@ -1,7 +1,12 @@
 namespace BossMod.Heavensward.Alliance.A24Ozma;
 
 [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "CombatReborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 168, NameID = 4896)]
-public class A24Ozma(WorldState ws, Actor primary) : BossModule(ws, primary, new ArenaBoundsCircle(new(280, -410), 30))
+
+public class A24Ozma(WorldState ws, Actor primary) : BossModule(ws, primary, new ArenaBoundsUnion([new ArenaBoundsDonut(new(280, -410), 18, 25),
+        new ArenaBoundsRect(new(280, -386), 5, 12), //center
+        new ArenaBoundsRect(new(260, -422), 5, 12, -120.Degrees()),
+        new ArenaBoundsRect(new(300, -422), 5, 12, 120.Degrees())]))
+
 {
     protected override void DrawEnemies(int pcSlot, Actor pc)
     {

diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN6Queen/DRN6Queen.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN6Queen/DRN6Queen.cs
@@ -9,4 +9,4 @@ class GodsSaveTheQueen(BossModule module) : Components.CastCounter(module, Actio
 class PawnOff(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PawnOffReal), new AOEShapeCircle(20));
 
 [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "CombatReborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 760, NameID = 9863)]
-public class DRN6Queen(WorldState ws, Actor primary) : BossModule(ws, primary, new ArenaBoundsSquare(new(-272, -415), 25)); // note: arena swaps between circle and square
+public class DRN6Queen(WorldState ws, Actor primary) : BossModule(ws, primary, new ArenaBoundsSquare(new(-272, -415), 25)); // note: arena swaps between circle and square ArenaBoundsCircle(new(-272, -415), 25));