Skip to content

Commit

Permalink
Merge branch 'merge' into mergeWIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@CarnifexOptimus
CarnifexOptimus committed Dec 7, 2024
2 parents bcec222 + 335cf1a commit 05be92b
Show file tree
Hide file tree
Showing 10 changed files with 1,395 additions and 400 deletions.
38 changes: 37 additions & 1 deletion BossMod/ActionQueue/ClassShared.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

public enum AID : uint
{
#region PvE
None = 0,
Sprint = 3,

Expand Down Expand Up @@ -60,11 +61,22 @@ public enum AID : uint
AethericSiphon = 9102,
Shatterstone = 9823,
Deflect = 10006,
DeflectVeryEasy = 18863
DeflectVeryEasy = 18863,
#endregion

#region PvP
Elixir = 29055,
Recuperate = 29711,
Purify = 29056,
Guard = 29054,
//Guard = 29735,
SprintPvP = 29057,
#endregion
}

public enum SID : uint
{
#region PvE
None = 0,

// Tank
Expand All @@ -81,12 +93,27 @@ public enum SID : uint
Addle = 1203, // applied by Addle to target
Swiftcast = 167, // applied by Swiftcast to self
Raise = 148, // applied by Raise to target
#endregion

#region PvP
SprintPvP = 1342,
Guard = 3054,
Silence = 1347,
Bind = 1345,
StunPvP = 1343,
HalfAsleep = 3022,
Sleep = 1348,
DeepFreeze = 3219,
Heavy = 1344,
Unguarded = 3021,
#endregion
}

public sealed class Definitions : IDisposable
{
public Definitions(ActionDefinitions d)
{
#region PvE
d.RegisterSpell(AID.Sprint);

// Tank
Expand Down Expand Up @@ -145,6 +172,15 @@ public Definitions(ActionDefinitions d)
d.RegisterSpell(AID.Shatterstone);
d.RegisterSpell(AID.Deflect);
d.RegisterSpell(AID.DeflectVeryEasy);
#endregion

#region PvP
d.RegisterSpell(AID.Elixir);
d.RegisterSpell(AID.Recuperate);
d.RegisterSpell(AID.Purify);
d.RegisterSpell(AID.Guard);
d.RegisterSpell(AID.SprintPvP);
#endregion

Customize(d);
}
Expand Down
88 changes: 88 additions & 0 deletions BossMod/ActionQueue/Tanks/GNB.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

public enum AID : uint
{
#region PvE
None = 0,
Sprint = ClassShared.AID.Sprint,

Expand Down Expand Up @@ -55,6 +56,38 @@ public enum AID : uint
Reprisal = ClassShared.AID.Reprisal, // L22, instant, 60.0s CD (group 44), range 0, AOE 5 circle, targets=self
ArmsLength = ClassShared.AID.ArmsLength, // L32, instant, 120.0s CD (group 48), range 0, single-target, targets=self
Shirk = ClassShared.AID.Shirk, // L48, instant, 120.0s CD (group 49), range 25, single-target, targets=party
#endregion

#region PvP
KeenEdgePvP = 29098, // instant, GCD, range 3, single-target, targets=hostile
BrutalShellPvP = 29099, // instant, GCD, range 3, single-target, targets=hostile
SolidBarrelPvP = 29100, // instant, GCD, range 3, single-target, targets=hostile
BurstStrikePvP = 29101, // instant, GCD, range 5, single-target, targets=hostile
GnashingFangPvP = 29102, // instant, GCD, range 5, single-target, targets=hostile
FatedCirclePvP = 41511, // instant, GCD, range 0, AOE 5, targets=self
ContinuationPvP = 29106, // instant, oGCD, range 5, single-target, targets=hostile
RoughDividePvP = 29123, // instant, oGCD, range 20, single-target, targets=hostile
BlastingZonePvP = 29128, // instant, oGCD, range 5, single-target, targets=hostile
HeartOfCorundumPvP = 41443, // instant, oGCD, range 20, single-target, targets=party
SavageClawPvP = 29103, // instant, GCD, range 5, single-target, targets=hostile
WickedTalonPvP = 29104, // instant, GCD, range 5, single-target, targets=hostile
HypervelocityPvP = 29107, // instant, oGCD, range 5, single-target, targets=hostile
FatedBrandPvP = 41442, // instant, oGCD, range 5, single-target, targets=hostile
JugularRipPvP = 29108, // instant, oGCD, range 5, single-target, targets=hostile
AbdomenTearPvP = 29109, // instant, oGCD, range 5, single-target, targets=hostile
EyeGougePvP = 29110, // instant, oGCD, range 5, single-target, targets=hostile

//LBs
RelentlessRushPvP = 29130,
TerminalTriggerPvP = 29131,

//Shared
Elixir = ClassShared.AID.Elixir,
Recuperate = ClassShared.AID.Recuperate,
Purify = ClassShared.AID.Purify,
Guard = ClassShared.AID.Guard,
SprintPvP = ClassShared.AID.SprintPvP
#endregion
}

public enum TraitID : uint
Expand All @@ -77,6 +110,7 @@ public enum TraitID : uint
// TODO: regenerate
public enum SID : uint
{
#region PvE
None = 0,
BrutalShell = 1898, // applied by Brutal Shell to self
NoMercy = 1831, // applied by No Mercy to self
Expand Down Expand Up @@ -105,6 +139,36 @@ public enum SID : uint

//Shared
Reprisal = ClassShared.SID.Reprisal, // applied by Reprisal to target
#endregion PvE

#region PvP
ReadyToBlastPvP = 3041, // applied by Burst Strike to self
ReadyToRazePvP = 4293, // applied by Fated Circle to self
ReadyToRipPvP = 2002, // applied by Gnashing Fang to self
ReadyToTearPvP = 2003, // applied by Savage Claw to self
ReadyToGougePvP = 2004, // applied by Wicked Talon to self
NebulaPvP = 3051, // applied by Nebula to self
NoMercyPvP = 3042, // applied by No Mercy to self
HeartOfCorundumPvP = 4295, // applied by Heart of Corundum to self
CatharsisOfCorundumPvP = 4296, // applied by Heart of Corundum to self
RelentlessRushPvP = 3052,

//Shared
Elixir = ClassShared.AID.Elixir,
Recuperate = ClassShared.AID.Recuperate,
Purify = ClassShared.AID.Purify,
Guard = ClassShared.AID.Guard,
SprintPvP = ClassShared.AID.SprintPvP,
Silence = ClassShared.SID.Silence,
Bind = ClassShared.SID.Bind,
StunPvP = ClassShared.SID.StunPvP,
HalfAsleep = ClassShared.SID.HalfAsleep,
Sleep = ClassShared.SID.Sleep,
DeepFreeze = ClassShared.SID.DeepFreeze,
Heavy = ClassShared.SID.Heavy,
Unguarded = ClassShared.SID.Unguarded,

#endregion
}

public sealed class Definitions : IDisposable
Expand All @@ -113,6 +177,7 @@ public sealed class Definitions : IDisposable

public Definitions(ActionDefinitions d)
{
#region PvE
d.RegisterSpell(AID.GunmetalSoul, instantAnimLock: 3.86f);
d.RegisterSpell(AID.KeenEdge);
d.RegisterSpell(AID.NoMercy);
Expand Down Expand Up @@ -151,6 +216,29 @@ public Definitions(ActionDefinitions d)
d.RegisterSpell(AID.ReignOfBeasts);
d.RegisterSpell(AID.NobleBlood);
d.RegisterSpell(AID.LionHeart);
#endregion

#region PvP
d.RegisterSpell(AID.KeenEdgePvP);
d.RegisterSpell(AID.BrutalShellPvP);
d.RegisterSpell(AID.SolidBarrelPvP);
d.RegisterSpell(AID.BurstStrikePvP);
d.RegisterSpell(AID.GnashingFangPvP);
d.RegisterSpell(AID.SavageClawPvP);
d.RegisterSpell(AID.WickedTalonPvP);
d.RegisterSpell(AID.AbdomenTearPvP);
d.RegisterSpell(AID.JugularRipPvP);
d.RegisterSpell(AID.EyeGougePvP);
d.RegisterSpell(AID.ContinuationPvP);
d.RegisterSpell(AID.FatedCirclePvP);
d.RegisterSpell(AID.BlastingZonePvP);
d.RegisterSpell(AID.HeartOfCorundumPvP);
d.RegisterSpell(AID.HypervelocityPvP);
d.RegisterSpell(AID.FatedBrandPvP);
d.RegisterSpell(AID.RoughDividePvP);
d.RegisterSpell(AID.RelentlessRushPvP);
d.RegisterSpell(AID.TerminalTriggerPvP);
#endregion

Customize(d);
}
Expand Down
Loading

0 comments on commit 05be92b

Please sign in to comment.