Merge pull request #935 from FFXIV-CombatReborn/mergeWIP

small necron improvement

Author: CarnifexOptimus

BossMod/Framework/Utils.cs

@@ -312,7 +312,7 @@ public static Func<TIn, TOut> Memoize<TIn, TOut>(this Func<TIn, TOut> func) wher
     public static void RotateList<T>(List<T> list, int startIndex)
     {
         var count = list.Count;
-        if (count == 0 || startIndex == 0 || startIndex % count == 0)
+        if (count <= 1 || startIndex == 0 || startIndex % count == 0)
         {
             return;
         }

BossMod/Modules/Dawntrail/Extreme/Ex5Necron/Ex5NecronStates.cs

@@ -64,7 +64,7 @@ private void Phase3(uint id)
         MementoMori(id + 0x70000u, 7.3f);
         ColdGripExistentialDread(id + 0x80000u, 4.7f);
         GrandCross(id + 0x90000u, 11.6f);
-        Targetable(id + 0xA0000u, true, 19.7f, "Enrage");
+        Targetable(id + 0xA0000u, false, 19.7f, "Enrage");
     }
 
     private void BlueShockwave(uint id, float delay)

BossMod/Modules/Dawntrail/Extreme/Ex5Necron/Intermission.cs

@@ -1,5 +1,3 @@
-using BossMod.Dawntrail.Dungeon.D11MesoTerminal.D112FourHeadsmen;
-
 namespace BossMod.Dawntrail.Extreme.Ex5Necron;
 
 sealed class FearOfDeathAOE2(BossModule module) : Components.SimpleAOEs(module, (uint)AID.FearOfDeathAOE2, 3f);
@@ -116,7 +114,7 @@ public override void DrawArenaBackground(int pcSlot, Actor pc)
                 }
             }
         }
-        else if (Arena.Bounds.Radius < 18f)
+        else if (Arena.Bounds.Radius == 17.5f)
         {
             Arena.Bounds = new ArenaBoundsRect(18f, 15f);
             Arena.Center = Ex5Necron.ArenaCenter;

BossMod/Modules/Dawntrail/Extreme/Ex5Necron/Invitation.cs

@@ -6,7 +6,16 @@ sealed class Invitation(BossModule module) : Components.GenericAOEs(module)
     private static readonly AOEShapeRect rect = new(36f, 5f);
     public bool Show = true;
 
-    public override ReadOnlySpan<AOEInstance> ActiveAOEs(int slot, Actor actor) => Show ? CollectionsMarshal.AsSpan(_aoes) : [];
+    public override ReadOnlySpan<AOEInstance> ActiveAOEs(int slot, Actor actor)
+    {
+        var count = _aoes.Count;
+        if (!Show || count == 0)
+        {
+            return [];
+        }
+        var max = count > 2 ? 2 : count;
+        return CollectionsMarshal.AsSpan(_aoes)[..max];
+    }
 
     public override void OnTethered(Actor source, ActorTetherInfo tether)
     {

BossMod/Modules/Dawntrail/Extreme/Ex5Necron/MassMacabre.cs

@@ -35,7 +35,7 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell)
 
     public override void OnEventEnvControl(byte index, uint state)
     {
-        if (state == 0x00020001u && numAdded < 6) // if players leave a tower state 20001 triggers again, so we need a counter
+        if (state == 0x00020001u && numAdded < 8) // if players leave a tower state 20001 triggers again, so we need a counter
         {
             (var pos, var minSoakers) = index switch
             {

BossMod/Modules/Dawntrail/Savage/M07SBruteAbombinator/M07SBruteAbombinatorStates.cs

@@ -32,7 +32,7 @@ private void SinglePhase(uint id)
         Slaminator(id + 0x120000u, 6.7f);
         StoneRingerBrutalSmash(id + 0x130000u, 4.2f);
         BrutalImpact(id + 0x140000u, 4.1f, 7.7f, 8);
-        SimpleState(id + 0x150000u, 24.7f, "Enrage");
+        Targetable(id + 0x150000u, false, 19.7f, "Enrage");
     }
 
     private void BrutalImpact(uint id, float delay1, float delay2, int numcasts)