Merge pull request #566 from FFXIV-CombatReborn/mergeWIP

code analyzer fix
FFXIV-CombatReborn · Jan 20, 2025 · d0809b0 · d0809b0
2 parents 489583a + 837177b
commit d0809b0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/BossMod/Modules/Dawntrail/Quest/MSQ/TakingAStand.cs b/BossMod/Modules/Dawntrail/Quest/MSQ/TakingAStand.cs
@@ -183,7 +183,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell)
     }
     public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints)
     {
-        if (Sources(slot, actor).Count() == 0)
+        if (!Sources(slot, actor).Any())
             return;
 
         var source = Sources(slot, actor).First();

diff --git a/BossMod/Modules/Endwalker/Quest/AsTheHeavensBurn/P2TerminusLacerator.cs b/BossMod/Modules/Endwalker/Quest/AsTheHeavensBurn/P2TerminusLacerator.cs
@@ -31,12 +31,12 @@ public enum AID : uint
     Explosion = 27026 // Meteorite->self, 3.0s cast, range 6 circle
 }
 
-class TheBlackDeath(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.TheBlackDeath), new AOEShapeCone(25, 60.Degrees()), activeWhileCasting: false);
+class TheBlackDeath(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.TheBlackDeath), new AOEShapeCone(25, 60.Degrees()), (uint)OID.Boss, activeWhileCasting: false);
 class Burst(BossModule module) : Components.CastTowers(module, ActionID.MakeSpell(AID.Burst), 5);
 class DeadlyImpact(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DeadlyImpact), 10, 6);
 class BlackStar(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.BlackStar));
 class DeadlyImpact1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DeadlyImpact1), 8);
-class DeadlyImpact2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DeadlyImpact), 10);
+class DeadlyImpact2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DeadlyImpact2), 10);
 class Explosion(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Explosion), 6);
 class Meteor(BossModule module) : Components.GenericLineOfSightAOE(module, default, 40, safeInsideHitbox: false)
 {

diff --git a/BossMod/Modules/Endwalker/Quest/AsTheHeavensBurn/P3TerminusLacerator.cs b/BossMod/Modules/Endwalker/Quest/AsTheHeavensBurn/P3TerminusLacerator.cs
@@ -38,8 +38,8 @@ public enum AID : uint
     ForceOfLoathing = 27031 // TerminusVanquisher->self, no cast, range 10 120-degree cone
 }
 
-class TheBlackDeath(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.TheBlackDeath), new AOEShapeCone(25, 60.Degrees()), activeWhileCasting: false);
-class ForceOfLoathing(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.ForceOfLoathing), new AOEShapeCone(10, 60.Degrees()), activeWhileCasting: false);
+class TheBlackDeath(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.TheBlackDeath), new AOEShapeCone(25, 60.Degrees()), (uint)OID.Boss, activeWhileCasting: false);
+class ForceOfLoathing(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.ForceOfLoathing), new AOEShapeCone(10, 60.Degrees()), (uint)OID.TerminusVanquisher, activeWhileCasting: false);
 class DeadlyImpact(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DeadlyImpact), 10, 6);
 class BlackStar(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.BlackStar));