Merge pull request #974 from FFXIV-CombatReborn/mergeWIP

fix Mica, make lighter note prediction better, show Statice config fo…

Author: CarnifexOptimus

BossMod/Modules/Dawntrail/FATE/MicaTheMagicalMu.cs

@@ -86,7 +86,7 @@ sealed class Draw(BossModule module) : Components.GenericAOEs(module)
         module.Enemies((uint)OID.Card6),
     ];
     private AOEInstance[] _aoes = [];
-    private int cachedIndex = -1;
+    private readonly List<int> cachedCardIndices = new(2);
 
     private static readonly AOEShapeRect _shape = new(20f, 7f);
 
@@ -126,7 +126,7 @@ public override void OnCastStarted(Actor caster, ActorCastInfo spell)
                 {
                     for (var i = 0; i < 5; ++i)
                     {
-                        ref var aoe = ref _aoes[0];
+                        ref var aoe = ref _aoes[i];
                         aoe.Activation = activation;
                         aoe.Risky = true;
                     }
@@ -137,13 +137,9 @@ public override void OnCastStarted(Actor caster, ActorCastInfo spell)
 
     private void AddAOEs(int safeZoneIndex)
     {
-        if (safeZoneIndex < 0)
-        {
-            return;
-        }
         if (_aoes.Length != 0)
         {
-            cachedIndex = safeZoneIndex;
+            cachedCardIndices.Add(safeZoneIndex);
             return;
         }
         _aoes = new AOEInstance[5];
@@ -167,8 +163,11 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell)
         if (spell.Action.ID == (uint)AID.CardTrickAOEFake)
         {
             _aoes = [];
-            AddAOEs(cachedIndex);
-            cachedIndex = -1;
+            if (cachedCardIndices.Count != 0)
+            {
+                AddAOEs(cachedCardIndices[0]);
+                cachedCardIndices.RemoveAt(0);
+            }
         }
     }
 }

BossMod/Modules/Endwalker/Alliance/A14Naldthal/FarAboveDeepBelow.cs

@@ -92,16 +92,20 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell)
         if (spell.Action.ID is (uint)AID.DeepestPitFirst or (uint)AID.DeepestPitRest)
         {
             var count = _aoes.Count;
+            var aoes = CollectionsMarshal.AsSpan(_aoes);
+            var id = caster.InstanceID;
             for (var i = 0; i < count; ++i)
             {
-                if (_aoes[i].ActorID == caster.InstanceID)
+                if (aoes[i].ActorID == id)
                 {
                     _aoes.RemoveAt(i);
                     break;
                 }
             }
-            if (count == 0)
+            if (_aoes.Count == 0)
+            {
                 _targets.Clear();
+            }
         }
     }
 

BossMod/Modules/Endwalker/Criterion/C03AAI/C033Statice/C033Statice.cs

@@ -12,7 +12,7 @@ class SFaerieRing(BossModule module) : FaerieRing(module, (uint)AID.SFaerieRing)
 
 public abstract class C033Statice(WorldState ws, Actor primary) : BossModule(ws, primary, new(-200f, default), new ArenaBoundsCircle(20f));
 
-[ModuleInfo(BossModuleInfo.Maturity.Verified, PrimaryActorOID = (uint)OID.NBoss, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 979, NameID = 12506, SortOrder = 9, PlanLevel = 90)]
+[ModuleInfo(BossModuleInfo.Maturity.Verified, PrimaryActorOID = (uint)OID.NBoss, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 979, NameID = 12506, SortOrder = 9, PlanLevel = 90, ConfigType = typeof(C033SStaticeConfig))]
 public class C033NStatice(WorldState ws, Actor primary) : C033Statice(ws, primary);
 
 [ModuleInfo(BossModuleInfo.Maturity.Verified, PrimaryActorOID = (uint)OID.SBoss, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 980, NameID = 12506, SortOrder = 9, PlanLevel = 90)]

BossMod/Modules/Shadowbringers/Alliance/A35FalseIdol/LighterNote.cs

@@ -71,7 +71,7 @@ public override void Update()
         {
             var c = casters[i];
             var cc = c.caster;
-            if (cc.LastFrameMovement == default) // remove hints only when the marker stopped moving
+            if (cc.LastFrameMovementVec4 == default) // remove hints only when the marker stopped moving
             {
                 casters.RemoveAt(i);
                 if (casters.Count == 0)
@@ -125,22 +125,28 @@ public override void Update()
         {
             var c = casters[i];
             var cc = c.caster;
-            if (cc.LastFrameMovement == default) // add exaflare only when the marker stopped moving
+            if (cc.LastFrameMovementVec4 != default) // add exaflare only when all markers stopped moving
             {
-                var center = Arena.Center;
-                WDir[] dirs = c.isNorthSouth ? [new(default, 1f), new(default, -1f)] : [new(1f, default), new(-1f, default)];
-                for (var j = 0; j < 2; ++j)
+                return;
+            }
+        }
+        for (var i = count; i >= 0; --i)
+        {
+            var c = casters[i];
+            var cc = c.caster;
+            var center = Arena.Center;
+            WDir[] dirs = c.isNorthSouth ? [new(default, 1f), new(default, -1f)] : [new(1f, default), new(-1f, default)];
+            for (var j = 0; j < 2; ++j)
+            {
+                var intersect = (int)Intersect.RayAABB(cc.Position - center, dirs[j], 27f, 27f); // exaflare is allowed to go upto 27y away from center
+                var maxexplosions = intersect / 6;
+                if (j == 0)
                 {
-                    var intersect = (int)Intersect.RayAABB(cc.Position - center, dirs[j], 27f, 27f); // exaflare is allowed to go upto 27y away from center
-                    var maxexplosions = intersect / 6;
-                    if (j == 0)
-                    {
-                        maxexplosions += 1;
-                    }
-                    Lines.Add(new(cc.Position + (j == 0 ? default : 6f) * dirs[j], 6f * dirs[j], j != 0 ? activation : activation.AddSeconds(1.1d), 1.1d, maxexplosions, 9));
+                    maxexplosions += 1;
                 }
-                casters.RemoveAt(i);
+                Lines.Add(new(cc.Position + (j == 0 ? default : 6f) * dirs[j], 6f * dirs[j], j != 0 ? activation : activation.AddSeconds(1.1d), 1.1d, maxexplosions, 9));
             }
+            casters.RemoveAt(i);
         }
         base.Update();
     }
@@ -154,7 +160,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell)
             for (var i = 0; i < count; ++i)
             {
                 var line = Lines[i];
-                if (line.Next.AlmostEqual(pos, 0.1f))
+                if (line.Next.AlmostEqual(pos, 0.05f))
                 {
                     AdvanceLine(line, pos);
                     if (line.ExplosionsLeft == 0)