From 615306e200b88a72a0586a2a55dc647ff931f644 Mon Sep 17 00:00:00 2001 From: LTS-FFXIV <127939494+LTS-FFXIV@users.noreply.github.com> Date: Sat, 20 Apr 2024 23:56:27 -0500 Subject: [PATCH 1/2] Headstone and Ozma test arenas using ArenaBoundsUnion --- .../Heavensward/Alliance/A23Headstone/A23Headstone.cs | 5 ++++- BossMod/Modules/Heavensward/Alliance/A24Ozma/A24Ozma.cs | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/BossMod/Modules/Heavensward/Alliance/A23Headstone/A23Headstone.cs b/BossMod/Modules/Heavensward/Alliance/A23Headstone/A23Headstone.cs index b7af97c8e1..b616815dfd 100644 --- 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(-171, 225), 20), new ArenaBoundsCircle(new(-152, 252), 20), new ArenaBoundsCircle(new(-184, 197), 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 index 6e639d8827..0a8552496a 100644 --- a/BossMod/Modules/Heavensward/Alliance/A24Ozma/A24Ozma.cs +++ b/BossMod/Modules/Heavensward/Alliance/A24Ozma/A24Ozma.cs @@ -1,7 +1,8 @@ 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), 20, 30), +new ArenaBoundsRect(new(260, -420), 5, 15, 240.Degrees()), new ArenaBoundsRect(new(280, -385), 5, 15, 180.Degrees()), new ArenaBoundsRect(new(300, -420), 5, 15, 110.Degrees())])) { protected override void DrawEnemies(int pcSlot, Actor pc) { From 6ced8c062e9bdcf0adc4a7ed83d78cd2c4aa4cc8 Mon Sep 17 00:00:00 2001 From: LTS-FFXIV <127939494+LTS-FFXIV@users.noreply.github.com> Date: Sun, 21 Apr 2024 07:34:17 -0500 Subject: [PATCH 2/2] Ozma and Headstone Arena fixes --- .../Heavensward/Alliance/A23Headstone/A23Headstone.cs | 2 +- BossMod/Modules/Heavensward/Alliance/A24Ozma/A24Ozma.cs | 8 ++++++-- .../Foray/DelubrumReginae/Normal/DRN6Queen/DRN6Queen.cs | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/BossMod/Modules/Heavensward/Alliance/A23Headstone/A23Headstone.cs b/BossMod/Modules/Heavensward/Alliance/A23Headstone/A23Headstone.cs index b616815dfd..f704e77f40 100644 --- a/BossMod/Modules/Heavensward/Alliance/A23Headstone/A23Headstone.cs +++ b/BossMod/Modules/Heavensward/Alliance/A23Headstone/A23Headstone.cs @@ -3,7 +3,7 @@ [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "CombatReborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 168, NameID = 4868)] class A23Headstone(WorldState ws, Actor primary) : BossModule(ws, primary, new ArenaBoundsUnion([ - new ArenaBoundsCircle(new(-171, 225), 20), new ArenaBoundsCircle(new(-152, 252), 20), new ArenaBoundsCircle(new(-184, 197), 20)])) + 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 index 0a8552496a..79c61dd23a 100644 --- a/BossMod/Modules/Heavensward/Alliance/A24Ozma/A24Ozma.cs +++ b/BossMod/Modules/Heavensward/Alliance/A24Ozma/A24Ozma.cs @@ -1,8 +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 ArenaBoundsUnion([new ArenaBoundsDonut(new(280, -410), 20, 30), -new ArenaBoundsRect(new(260, -420), 5, 15, 240.Degrees()), new ArenaBoundsRect(new(280, -385), 5, 15, 180.Degrees()), new ArenaBoundsRect(new(300, -420), 5, 15, 110.Degrees())])) + +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 index 93618bd84a..35688ddc23 100644 --- 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));