From 7f3967d9e66a0c3fd9765343ddd58bca0830afb9 Mon Sep 17 00:00:00 2001 From: LTS-FFXIV <127939494+LTS-FFXIV@users.noreply.github.com> Date: Fri, 26 Apr 2024 14:13:02 -0500 Subject: [PATCH] orbornne arena corrections and new SIDs --- .../Stormblood/Alliance/A31Mustadio/A31Mustadio.cs | 2 +- .../Stormblood/Alliance/A32Agrias/A32AgriasEnums.cs | 1 + .../Alliance/A33ThunderGod/A33ThunderGodEnums.cs | 8 +++++--- .../Stormblood/Alliance/A34UltimaP1/A34UltimaP1.cs | 6 +++--- .../Stormblood/Alliance/A35UltimaP2/A35UltimaP2.cs | 2 +- .../Stormblood/Alliance/A35UltimaP2/A35UltimaP2Enums.cs | 2 ++ 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/BossMod/Modules/Stormblood/Alliance/A31Mustadio/A31Mustadio.cs b/BossMod/Modules/Stormblood/Alliance/A31Mustadio/A31Mustadio.cs index aa7b6199e9..d40e6af885 100644 --- a/BossMod/Modules/Stormblood/Alliance/A31Mustadio/A31Mustadio.cs +++ b/BossMod/Modules/Stormblood/Alliance/A31Mustadio/A31Mustadio.cs @@ -3,5 +3,5 @@ [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "CombatReborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 636, NameID = 7915)] // 7919 public class A31Mustadio : BossModule { - public A31Mustadio(WorldState ws, Actor primary) : base(ws, primary, new ArenaBoundsCircle(new(600, 290), 30)) { } + public A31Mustadio(WorldState ws, Actor primary) : base(ws, primary, new ArenaBoundsSquare(new(600, 290), 40)) { } } \ No newline at end of file diff --git a/BossMod/Modules/Stormblood/Alliance/A32Agrias/A32AgriasEnums.cs b/BossMod/Modules/Stormblood/Alliance/A32Agrias/A32AgriasEnums.cs index b5e6f047a1..9802453edd 100644 --- a/BossMod/Modules/Stormblood/Alliance/A32Agrias/A32AgriasEnums.cs +++ b/BossMod/Modules/Stormblood/Alliance/A32Agrias/A32AgriasEnums.cs @@ -60,6 +60,7 @@ public enum SID : uint VulnerabilityDown = 350, // none->EmblazonedShield/SwordKnight, extra=0x0 VulnerabilityUp = 202, // Boss/SwordKnight->player, extra=0x1/0x6/0x5/0x2/0x3/0x7 Weakness = 43, // none->player, extra=0x0 + FleetFooted = 2932, // none->player, extra=0x32 } public enum IconID : uint diff --git a/BossMod/Modules/Stormblood/Alliance/A33ThunderGod/A33ThunderGodEnums.cs b/BossMod/Modules/Stormblood/Alliance/A33ThunderGod/A33ThunderGodEnums.cs index d7cec48af4..bc7bf2dd34 100644 --- a/BossMod/Modules/Stormblood/Alliance/A33ThunderGod/A33ThunderGodEnums.cs +++ b/BossMod/Modules/Stormblood/Alliance/A33ThunderGod/A33ThunderGodEnums.cs @@ -61,9 +61,11 @@ public enum AID : uint TGHolySword1 = 14153, // Boss->self, 6.0s cast, single-target TGHolySword2 = 14154, // Boss->self, 6.0s cast, single-target - TGHolySword3 = 14157, // Boss->self, 8.0s cast, single-target - TGHolySword4 = 14159, // Boss->self, 6.0s cast, single-target - TGHolySword5 = 14160, // Boss->self, 6.0s cast, single-target + TGHolySword3 = 14156, // Boss->self, 8.0s cast, single-target + TGHolySword4 = 14157, // Boss->self, 8.0s cast, single-target + TGHolySword5 = 14159, // Boss->self, 6.0s cast, single-target + TGHolySword6 = 14160, // Boss->self, 6.0s cast, single-target + Unknown1 = 14059, // Helper->self, no cast, single-target Unknown2 = 14372, // Helper->self, no cast, single-target diff --git a/BossMod/Modules/Stormblood/Alliance/A34UltimaP1/A34UltimaP1.cs b/BossMod/Modules/Stormblood/Alliance/A34UltimaP1/A34UltimaP1.cs index a565515ac1..60b534d7de 100644 --- a/BossMod/Modules/Stormblood/Alliance/A34UltimaP1/A34UltimaP1.cs +++ b/BossMod/Modules/Stormblood/Alliance/A34UltimaP1/A34UltimaP1.cs @@ -1,4 +1,4 @@ -namespace BossMod.Stormblood.Alliance.A34Ultima; +namespace BossMod.Stormblood.Alliance.A34UltimaP1; -[ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "CombatReborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 636, NameID = 7657)] //7909 7657 -public class A34UltimaP1(WorldState ws, Actor primary) : BossModule(ws, primary, new ArenaBoundsCircle(new(600, -630), 30)) { } \ No newline at end of file +[ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "CombatReborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 636, NameID = 7909)] //7909 7657 +public class A34UltimaP1(WorldState ws, Actor primary) : BossModule(ws, primary, new ArenaBoundsSquare(new(600, -600), 40)) { } \ No newline at end of file diff --git a/BossMod/Modules/Stormblood/Alliance/A35UltimaP2/A35UltimaP2.cs b/BossMod/Modules/Stormblood/Alliance/A35UltimaP2/A35UltimaP2.cs index 27d35df918..7ef2b61a85 100644 --- a/BossMod/Modules/Stormblood/Alliance/A35UltimaP2/A35UltimaP2.cs +++ b/BossMod/Modules/Stormblood/Alliance/A35UltimaP2/A35UltimaP2.cs @@ -1,4 +1,4 @@ namespace BossMod.Stormblood.Alliance.A35UltimaP2; [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "CombatReborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 636, NameID = 7909)] //7909 7657 -public class A35UltimaP2(WorldState ws, Actor primary) : BossModule(ws, primary, new ArenaBoundsCircle(new(600, -630), 30)) { } \ No newline at end of file +public class A35UltimaP2(WorldState ws, Actor primary) : BossModule(ws, primary, new ArenaBoundsSquare(new(600, -600), 40)) { } \ No newline at end of file diff --git a/BossMod/Modules/Stormblood/Alliance/A35UltimaP2/A35UltimaP2Enums.cs b/BossMod/Modules/Stormblood/Alliance/A35UltimaP2/A35UltimaP2Enums.cs index c948a3f2e1..08f9b53c20 100644 --- a/BossMod/Modules/Stormblood/Alliance/A35UltimaP2/A35UltimaP2Enums.cs +++ b/BossMod/Modules/Stormblood/Alliance/A35UltimaP2/A35UltimaP2Enums.cs @@ -30,6 +30,8 @@ public enum AID : uint Embrace3 = 14522, // Helper->self, no cast, range 7 circle FlareIV = 14493, // Helper->players, 5.5s cast, range 80 circle + UltimateFlare = 14525, // Dominion2->location, no cast, range 80 circle + GrandCross1 = 14510, // 2639->self, 4.0s cast, range 60 width 15 cross GrandCross2 = 14536, // Boss->self, 3.0s cast, single-target