Merge pull request #351 from sourpuh/master

Add OIDs for Menenius module and fix red mine detonation
awgil · May 5, 2024 · ae0b601 · ae0b601
2 parents c09e7f2 + 29b2a05
commit ae0b601
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/BossMod/Modules/Shadowbringers/Foray/Duel/Duel5Menenius/Duel5MeneniusEnums.cs b/BossMod/Modules/Shadowbringers/Foray/Duel/Duel5Menenius/Duel5MeneniusEnums.cs
@@ -1,5 +1,11 @@
 namespace BossMod.Shadowbringers.Foray.Duel.Duel5Menenius;
 
+public enum OID : uint
+{
+    Boss = 0x31C4,
+    Helper = 0x233C,
+}
+
 public enum AID : uint
 {
     AutoAttack = 6497,
@@ -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,

diff --git a/BossMod/Modules/Shadowbringers/Foray/Duel/Duel5Menenius/RedHiddenMines.cs b/BossMod/Modules/Shadowbringers/Foray/Duel/Duel5Menenius/RedHiddenMines.cs
@@ -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));
         }