extra filters

FFXIV-CombatReborn · Nov 28, 2024 · 2569b7f · 2569b7f
1 parent 7277b91
commit 2569b7f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/BossMod/Data/Actor.cs b/BossMod/Data/Actor.cs
@@ -107,9 +107,8 @@ public sealed class Actor(ulong instanceID, uint oid, int spawnIndex, string nam
     public Angle Rotation => PosRot.W.Radians();
     public bool Omnidirectional => Utils.CharacterIsOmnidirectional(OID);
     public bool IsDeadOrDestroyed => IsDead || IsDestroyed;
-    public static readonly Actor FakeActor = new(0, 0, -1, "dummy", 0, ActorType.None, Class.None, 0, new(100, 0, 100, 0));
 
-    private static readonly HashSet<uint> ignoreNPC = [0x2EFE, 0x418F, 0x464E, 0x4697]; // friendly NPCs that should not count as party members
+    private static readonly HashSet<uint> ignoreNPC = [0x2C11, 0x2C0F, 0x2C10, 0x2C0E, 0x2C12, 0x2EFE, 0x418F, 0x464E, 0x4697]; // friendly NPCs that should not count as party members
     public bool IsFriendlyNPC => Type == ActorType.Enemy && IsAlly && IsTargetable && !ignoreNPC.Contains(OID);
 
     public ActorStatus? FindStatus(uint sid)

diff --git a/BossMod/Modules/Endwalker/Savage/P12S1Athena/Palladion.cs b/BossMod/Modules/Endwalker/Savage/P12S1Athena/Palladion.cs
@@ -170,7 +170,7 @@ public override IEnumerable<AOEInstance> ActiveAOEs(int slot, Actor actor)
 class PalladionWhiteFlame : Components.GenericBaitAway
 {
     private readonly Palladion? _palladion;
-
+    public static readonly Actor FakeActor = new(0, 0, -1, "dummy", 0, ActorType.None, Class.None, 0, new(100, 0, 100, 0));
     private static readonly AOEShapeRect _shape = new(100, 2);
 
     public PalladionWhiteFlame(BossModule module) : base(module)
@@ -184,7 +184,7 @@ public override void Update()
         CurrentBaits.Clear();
         if (_palladion != null && _palladion.NumBaitsDone < _palladion.NumBaitsAssigned && _palladion.BaitOrder[_palladion.NumBaitsDone])
             foreach (var t in Raid.WithoutSlot().SortedByRange(Module.Center).Take(2))
-                CurrentBaits.Add(new(Actor.FakeActor, t, _shape));
+                CurrentBaits.Add(new(FakeActor, t, _shape));
     }
 
     public override void AddHints(int slot, Actor actor, TextHints hints)

diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D09GrandCosmos/D093Lugus.cs b/BossMod/Modules/Shadowbringers/Dungeon/D09GrandCosmos/D093Lugus.cs
@@ -92,7 +92,7 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme
             return;
         var forbidden = new List<Func<WPos, float>>();
         foreach (var h in _furniture)
-            forbidden.Add(ShapeDistance.InvertedCircle(h.Position, h.HitboxRadius));
+            forbidden.Add(ShapeDistance.InvertedCircle(h.Position, h.HitboxRadius - 0.5f));
         if (forbidden.Count > 0)
             hints.AddForbiddenZone(p => forbidden.Max(f => f(p)));
     }

diff --git a/BossMod/Modules/Stormblood/Dungeon/D05CastrumAbania/D051MagnaRoader.cs b/BossMod/Modules/Stormblood/Dungeon/D05CastrumAbania/D051MagnaRoader.cs
@@ -62,7 +62,7 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme
 
     public override void AddGlobalHints(GlobalHints hints)
     {
-        if (Module.Enemies(OID.MarkXLIIIMiniCannon).Any(x => x.IsTargetable) && _aoe.ActiveAOEs(default, Actor.FakeActor).Any())
+        if (Module.Enemies(OID.MarkXLIIIMiniCannon).Any(x => x.IsTargetable) && _aoe.ActiveAOEs(default, Raid.Player()!).Any())
             hints.Add("Use the turrets to stun the boss!");
     }