Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

orbornne arena corrections and new SIDs #60

Merged
merged 1 commit into from
Apr 26, 2024
Merged

orbornne arena corrections and new SIDs #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BossMod/Modules/Stormblood/Alliance/A31Mustadio/A31Mustadio.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) { }
}
1 change: 1 addition & 0 deletions BossMod/Modules/Stormblood/Alliance/A32Agrias/A32AgriasEnums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions BossMod/Modules/Stormblood/Alliance/A33ThunderGod/A33ThunderGodEnums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions BossMod/Modules/Stormblood/Alliance/A34UltimaP1/A34UltimaP1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)) { }
[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)) { }
2 changes: 1 addition & 1 deletion BossMod/Modules/Stormblood/Alliance/A35UltimaP2/A35UltimaP2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)) { }
public class A35UltimaP2(WorldState ws, Actor primary) : BossModule(ws, primary, new ArenaBoundsSquare(new(600, -600), 40)) { }
2 changes: 2 additions & 0 deletions BossMod/Modules/Stormblood/Alliance/A35UltimaP2/A35UltimaP2Enums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down