Merge branch 'awgil:master' into lab

awgil · Feb 6, 2025 · 7e23381 · 7e23381
2 parents 3fc7b5c + 5cd4fbf
commit 7e23381
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/BossMod/Modules/Dawntrail/Ultimate/FRU/FRUStates.cs b/BossMod/Modules/Dawntrail/Ultimate/FRU/FRUStates.cs
@@ -277,6 +277,7 @@ private void P2DiamondDust(uint id, float delay)
             .DeactivateOnExit<P2SinboundHoly>();
         ComponentCondition<P2ShiningArmor>(id + 0x80, 3.7f, comp => comp.NumCasts > 0, "Gaze")
             .ExecOnEnter<P2TwinStillnessSilence>(comp => comp.EnableAIHints())
+            .ExecOnEnter<P2SinboundHolyVoidzone>(comp => comp.AIHintsEnabled = false)
             .DeactivateOnExit<P2ShiningArmor>();
         ComponentCondition<P2TwinStillnessSilence>(id + 0x90, 3.0f, comp => comp.AOEs.Count > 0);
         ComponentCondition<P2TwinStillnessSilence>(id + 0x91, 3.5f, comp => comp.NumCasts > 0, "Front/back");

diff --git a/BossMod/Modules/Dawntrail/Ultimate/FRU/P2DiamondDust.cs b/BossMod/Modules/Dawntrail/Ultimate/FRU/P2DiamondDust.cs
@@ -340,7 +340,16 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell)
     }
 }
 
-class P2SinboundHolyVoidzone(BossModule module) : Components.PersistentVoidzone(module, 6, m => m.Enemies(OID.SinboundHolyVoidzone).Where(z => z.EventState != 7));
+class P2SinboundHolyVoidzone(BossModule module) : Components.PersistentVoidzone(module, 6, m => m.Enemies(OID.SinboundHolyVoidzone).Where(z => z.EventState != 7))
+{
+    public bool AIHintsEnabled = true;
+
+    public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints)
+    {
+        if (AIHintsEnabled)
+            base.AddAIHints(slot, actor, assignment, hints);
+    }
+}
 
 class P2ShiningArmor(BossModule module) : Components.GenericGaze(module, ActionID.MakeSpell(AID.ShiningArmor))
 {