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

Add OIDs for Menenius module and fix red mine detonation #351

Merged
merged 2 commits into from
May 5, 2024
+9 −2
Merged

Add OIDs for Menenius module and fix red mine detonation #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3d0d98
Add OIDs for Menenius module
sourpuh May 2, 2024
29b2a05
Fix Menenius mine detonation
sourpuh May 4, 2024
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
9 changes: 8 additions & 1 deletion BossMod/Modules/Shadowbringers/Foray/Duel/Duel5Menenius/Duel5MeneniusEnums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
namespace BossMod.Shadowbringers.Foray.Duel.Duel5Menenius;

public enum OID : uint
{
Boss = 0x31C4,
Helper = 0x233C,
}

public enum AID : uint
{
AutoAttack = 6497,
Expand All @@ -9,8 +15,9 @@ public enum AID : uint
ActivateBlueMine = 23888,
DetonateBlueMine = 23890,
ActivateRedMine = 23889,
DetonateRedMine = 0x5D41,
DetonateRedMine = 23891,
IndiscriminateDetonation = 23892,
Explosion = 23873,
GigaTempest = 23875,
GigaTempestLargeStart = 0x5D44,
GigaTempestLargeMove = 0x5D46,
Expand Down
2 changes: 1 addition & 1 deletion BossMod/Modules/Shadowbringers/Foray/Duel/Duel5Menenius/RedHiddenMines.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell)
{
_mines.Add(new(_shapeTrigger, caster.Position, Color: ArenaColor.Trap));
}
if ((AID)spell.Action.ID is AID.DetonateRedMine)
if ((AID)spell.Action.ID is AID.DetonateRedMine or AID.Explosion)
{
_mines.RemoveAll(t => t.Origin.AlmostEqual(caster.Position, 1));
}
Expand Down
Loading