Merge pull request #944 from FFXIV-CombatReborn/mergeWIP

Faithbound Kirin module, improved Necron Aetherblight hint

Author: CarnifexOptimus

BossMod/Autorotation/MiscAI/AutoPull.cs

@@ -5,7 +5,7 @@ namespace BossMod.Autorotation.MiscAI;
 // TODO this module is now useless and has been merged with AutoFarm, but some plugins still use it, like Questionable (rip)
 public sealed class AutoPull(RotationModuleManager manager, Actor player) : RotationModule(manager, player)
 {
-    public enum Track { QuestBattle, DeepDungeon, EpicEcho, Hunt }
+    public enum Track { QuestBattle, DeepDungeon, EpicEcho, Hunt, TreasureHunt }
 
     public static RotationModuleDefinition Definition()
     {
@@ -15,7 +15,7 @@ public static RotationModuleDefinition Definition()
         def.AbilityTrack(Track.DeepDungeon, "Automatically attack deep dungeon bosses when solo");
         def.AbilityTrack(Track.EpicEcho, "Automatically attack all targets if the Epic Echo status is present (i.e. when unsynced)");
         def.AbilityTrack(Track.Hunt, "Automatically attack hunt marks once they are below 95% HP");
-
+        def.AbilityTrack(Track.TreasureHunt, "Automatically attack treasure hunt bosses");
         return def;
     }
 
@@ -37,11 +37,14 @@ public override void Execute(StrategyValues strategy, Actor? primaryTarget, floa
         if (strategy.Enabled(Track.QuestBattle))
             enabled |= Bossmods.ActiveModule?.Info?.Category == BossModuleInfo.Category.Quest;
 
+        if (strategy.Enabled(Track.TreasureHunt))
+            enabled |= Bossmods.ActiveModule?.Info?.Category == BossModuleInfo.Category.TreasureHunt;
+
         if (strategy.Enabled(Track.DeepDungeon))
             enabled |= Bossmods.ActiveModule?.Info?.Category == BossModuleInfo.Category.DeepDungeon && World.Party.WithoutSlot().Length == 1;
 
         if (strategy.Enabled(Track.EpicEcho))
-            enabled |= Player.Statuses.Any(s => s.ID == 2734);
+            enabled |= Player.Statuses.Any(s => s.ID == 2734u);
 
         if (enabled)
         {

BossMod/BossModule/ArenaBounds.cs

@@ -385,30 +385,30 @@ public sealed record class ArenaBoundsComplex : ArenaBoundsCustom
     public readonly WPos Center;
     public bool IsCircle; // can be used by gaze component for gazes outside of the arena
 
-    public ArenaBoundsComplex(Shape[] UnionShapes, Shape[]? DifferenceShapes = null, Shape[]? AdditionalShapes = null, float MapResolution = 0.5f, float ScaleFactor = 1f, bool AllowObstacleMap = false, float Offset = default)
-        : base(BuildBounds(UnionShapes, DifferenceShapes, AdditionalShapes, MapResolution, ScaleFactor, AllowObstacleMap, Offset, out var center, out var halfWidth, out var halfHeight))
+    public ArenaBoundsComplex(Shape[] UnionShapes, Shape[]? DifferenceShapes = null, Shape[]? AdditionalShapes = null, float MapResolution = 0.5f, float ScaleFactor = 1f, bool AllowObstacleMap = false, float Offset = default, bool AdjustForHitbox = false)
+        : base(BuildBounds(UnionShapes, DifferenceShapes, AdditionalShapes, MapResolution, ScaleFactor, AllowObstacleMap, Offset, AdjustForHitbox, out var center, out var halfWidth, out var halfHeight))
     {
         Center = center;
         HalfWidth = halfWidth + Offset;
         HalfHeight = halfHeight + Offset;
     }
 
-    private static ArenaBoundsCustom BuildBounds(Shape[] unionShapes, Shape[]? differenceShapes, Shape[]? additionalShapes, float mapResolution, float scalefactor, bool allowObstacleMap, float offset, out WPos center, out float halfWidth, out float halfHeight)
+    private static ArenaBoundsCustom BuildBounds(Shape[] unionShapes, Shape[]? differenceShapes, Shape[]? additionalShapes, float mapResolution, float scalefactor, bool allowObstacleMap, float offset, bool adjustForHitbox, out WPos center, out float halfWidth, out float halfHeight)
     {
-        var properties = CalculatePolygonProperties(unionShapes, differenceShapes ?? [], additionalShapes ?? []);
+        var properties = CalculatePolygonProperties(unionShapes, differenceShapes ?? [], additionalShapes ?? [], adjustForHitbox);
         center = properties.Center;
         halfWidth = properties.HalfWidth;
         halfHeight = properties.HalfHeight;
-        return new(scalefactor == 1 ? properties.Radius : properties.Radius / scalefactor, properties.Poly, mapResolution, scalefactor, allowObstacleMap, offset);
+        return new(scalefactor == 1f ? properties.Radius : properties.Radius / scalefactor, properties.Poly, mapResolution, scalefactor, allowObstacleMap, offset);
     }
 
-    private static (WPos Center, float HalfWidth, float HalfHeight, float Radius, RelSimplifiedComplexPolygon Poly) CalculatePolygonProperties(Shape[] unionShapes, Shape[] differenceShapes, Shape[] additionalShapes)
+    private static (WPos Center, float HalfWidth, float HalfHeight, float Radius, RelSimplifiedComplexPolygon Poly) CalculatePolygonProperties(Shape[] unionShapes, Shape[] differenceShapes, Shape[] additionalShapes, bool adjustForHitbox)
     {
         var unionPolygons = ParseShapes(unionShapes);
         var differencePolygons = ParseShapes(differenceShapes);
         var additionalPolygons = ParseShapes(additionalShapes);
-
-        var combinedPoly = CombinePolygons(unionPolygons, differencePolygons, additionalPolygons);
+        var combine = CombinePolygons(unionPolygons, differencePolygons, additionalPolygons);
+        var combinedPoly = adjustForHitbox ? combine.Offset(-0.5f, Clipper2Lib.JoinType.Round) : combine;
 
         float minX = float.MaxValue, maxX = float.MinValue, minZ = float.MaxValue, maxZ = float.MinValue;
         var combined = combinedPoly.Parts;
@@ -440,9 +440,20 @@ private static (WPos Center, float HalfWidth, float HalfHeight, float Radius, Re
         var maxDistZ = Math.Max(Math.Abs(maxZ - centerZ), Math.Abs(minZ - centerZ));
         var halfWidth = (maxX - minX) * 0.5f;
         var halfHeight = (maxZ - minZ) * 0.5f;
+        var dir = center.ToWDir();
+
+        for (var i = 0; i < countCombined; ++i)
+        {
+            var verts = CollectionsMarshal.AsSpan(combined[i].Vertices);
+            var len = verts.Length;
+            for (var j = 0; j < len; ++j)
+            {
+                ref var vert = ref verts[j];
+                vert -= dir;
+            }
+        }
 
-        var combinedPolyCentered = CombinePolygons(ParseShapes(unionShapes, center), ParseShapes(differenceShapes, center), ParseShapes(additionalShapes, center));
-        return (center, halfWidth, halfHeight, Math.Max(maxDistX, maxDistZ), combinedPolyCentered);
+        return (center, halfWidth, halfHeight, Math.Max(maxDistX, maxDistZ), combinedPoly);
     }
 
     private static RelSimplifiedComplexPolygon CombinePolygons(RelSimplifiedComplexPolygon[] unionPolygons, RelSimplifiedComplexPolygon[] differencePolygons, RelSimplifiedComplexPolygon[] secondUnionPolygons)
@@ -469,13 +480,13 @@ private static RelSimplifiedComplexPolygon CombinePolygons(RelSimplifiedComplexP
         return combinedShape;
     }
 
-    private static RelSimplifiedComplexPolygon[] ParseShapes(Shape[] shapes, WPos center = default)
+    private static RelSimplifiedComplexPolygon[] ParseShapes(Shape[] shapes)
     {
         var lenght = shapes.Length;
         var polygons = new RelSimplifiedComplexPolygon[lenght];
         for (var i = 0; i < lenght; ++i)
         {
-            polygons[i] = shapes[i].ToPolygon(center);
+            polygons[i] = shapes[i].ToPolygon(default);
         }
         return polygons;
     }

BossMod/Components/ConcentricAOEs.cs

@@ -15,41 +15,44 @@ public struct Sequence
 
     public readonly AOEShape[] Shapes = shapes;
     public readonly List<Sequence> Sequences = [];
+    protected readonly List<AOEInstance> _aoes = [];
+    protected int lastVersion, lastCount;
 
-    public override ReadOnlySpan<AOEInstance> ActiveAOEs(int slot, Actor actor)
+    public override ReadOnlySpan<AOEInstance> ActiveAOEs(int slot, Actor actor) => CollectionsMarshal.AsSpan(_aoes);
+
+    public override void Update()
     {
         var count = Sequences.Count;
-        if (count == 0)
+        if (lastCount != count || lastVersion != NumCasts)
         {
-            return [];
-        }
-        var aoes = new AOEInstance[count];
-        var time = WorldState.CurrentTime;
-        var sequences = CollectionsMarshal.AsSpan(Sequences);
-
-        for (var i = 0; i < count; ++i)
-        {
-            ref var s = ref sequences[i];
-            var risky = true;
-            var act = s.NextActivation;
-            if (RiskyWithSecondsLeft != default)
-            {
-                risky = act.AddSeconds(-RiskyWithSecondsLeft) <= time;
-            }
-            if (!showall)
-            {
-                aoes[i] = new(Shapes[s.NumCastsDone], s.Origin, s.Rotation, act, risky: risky);
-            }
-            else
+            var time = WorldState.CurrentTime;
+            var sequences = CollectionsMarshal.AsSpan(Sequences);
+            _aoes.Clear();
+            for (var i = 0; i < count; ++i)
             {
-                var len = Shapes.Length;
-                for (var j = s.NumCastsDone; j < len; ++j)
+                ref var s = ref sequences[i];
+                var risky = true;
+                var act = s.NextActivation;
+                if (RiskyWithSecondsLeft != default)
+                {
+                    risky = act.AddSeconds(-RiskyWithSecondsLeft) <= time;
+                }
+                if (!showall)
+                {
+                    _aoes.Add(new(Shapes[s.NumCastsDone], s.Origin, s.Rotation, act, risky: risky));
+                }
+                else
                 {
-                    aoes[i] = new(Shapes[j], s.Origin, s.Rotation, act, risky: risky);
+                    var len = Shapes.Length;
+                    for (var j = s.NumCastsDone; j < len; ++j)
+                    {
+                        _aoes.Add(new(Shapes[j], s.Origin, s.Rotation, act, risky: risky));
+                    }
                 }
             }
+            lastCount = count;
+            lastVersion = NumCasts;
         }
-        return aoes;
     }
 
     public void AddSequence(WPos origin, DateTime activation = default, Angle rotation = default) => Sequences.Add(new() { Origin = origin, Rotation = rotation, NextActivation = activation });

BossMod/Components/Exaflare.cs

@@ -18,34 +18,40 @@ public sealed class Line(WPos next, WDir advance, DateTime nextExplosion, double
     public uint ImminentColor = Colors.Danger;
     public uint FutureColor = Colors.AOE;
     public readonly List<Line> Lines = [];
+    protected AOEInstance[] _aoes = [];
+    protected int currentVersion, lastVersion, lastCount;
 
     public bool Active => Lines.Count != 0;
 
     public Exaflare(BossModule module, float radius, uint aid = default) : this(module, new AOEShapeCircle(radius), aid) { }
 
-    public override ReadOnlySpan<AOEInstance> ActiveAOEs(int slot, Actor actor)
+    public override ReadOnlySpan<AOEInstance> ActiveAOEs(int slot, Actor actor) => _aoes;
+
+    public override void Update()
     {
         var linesCount = Lines.Count;
-        if (linesCount == 0)
-            return [];
-        var futureAOEs = FutureAOEs(linesCount);
-        var imminentAOEs = ImminentAOEs(linesCount);
-        var futureCount = futureAOEs.Count;
-        var imminentCount = imminentAOEs.Length;
-
-        var aoes = new AOEInstance[futureCount + imminentCount];
-        for (var i = 0; i < futureCount; ++i)
+        if (lastCount != linesCount || currentVersion != lastVersion)
         {
-            var aoe = futureAOEs[i];
-            aoes[i] = new(Shape, aoe.Item1, aoe.Item3, aoe.Item2, FutureColor);
-        }
+            var futureAOEs = CollectionsMarshal.AsSpan(FutureAOEs(linesCount));
+            var imminentAOEs = ImminentAOEs(linesCount);
+            var futureLen = futureAOEs.Length;
+            var imminentLen = imminentAOEs.Length;
 
-        for (var i = 0; i < imminentCount; ++i)
-        {
-            var aoe = imminentAOEs[i];
-            aoes[futureCount + i] = new(Shape, aoe.Item1, aoe.Item3, aoe.Item2, ImminentColor);
+            _aoes = new AOEInstance[futureLen + imminentLen];
+            for (var i = 0; i < futureLen; ++i)
+            {
+                ref var aoe = ref futureAOEs[i];
+                _aoes[i] = new(Shape, aoe.Item1, aoe.Item3, aoe.Item2, FutureColor);
+            }
+
+            for (var i = 0; i < imminentLen; ++i)
+            {
+                ref var aoe = ref imminentAOEs[i];
+                _aoes[futureLen + i] = new(Shape, aoe.Item1, aoe.Item3, aoe.Item2, ImminentColor);
+            }
+            lastCount = linesCount;
+            lastVersion = currentVersion;
         }
-        return aoes;
     }
 
     protected (WPos, DateTime, Angle)[] ImminentAOEs(int count)
@@ -87,6 +93,7 @@ protected void AdvanceLine(Line l, WPos pos)
         l.Next = pos + l.Advance;
         l.NextExplosion = WorldState.FutureTime(l.TimeToMove);
         --l.ExplosionsLeft;
+        ++currentVersion;
     }
 }
 

BossMod/Components/UnavoidableDamage.cs

@@ -180,21 +180,43 @@ public class SingleTargetInstant(BossModule module, uint aid, double delay = def
     public override void AddGlobalHints(GlobalHints hints)
     {
         if (Targets.Count != 0 && Hint.Length != 0)
+        {
             hints.Add(Hint);
+        }
     }
 
     public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints)
     {
-        foreach (var t in Targets)
+        var count = Targets.Count;
+        if (count == 0)
+        {
+            return;
+        }
+        var targets = CollectionsMarshal.AsSpan(Targets);
+        for (var i = 0; i < count; ++i)
+        {
+            ref var t = ref targets[i];
             hints.AddPredictedDamage(new BitMask().WithBit(t.slot), t.activation, damageType);
+        }
     }
 
     public override void OnEventCast(Actor caster, ActorCastEvent spell)
     {
         if (spell.Action.ID == WatchedAction)
         {
             ++NumCasts;
-            Targets.RemoveAll(t => t.instanceID == spell.MainTargetID);
+            var targets = CollectionsMarshal.AsSpan(Targets);
+            var len = targets.Length;
+            var id = spell.MainTargetID;
+            for (var i = 0; i < len; ++i)
+            {
+                ref var t = ref targets[i];
+                if (t.instanceID == id)
+                {
+                    Targets.RemoveAt(i);
+                    return;
+                }
+            }
         }
     }
 }
@@ -269,7 +291,18 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell)
             if (id == AIDs[i])
             {
                 ++NumCasts;
-                Targets.RemoveAll(t => t.instanceID == spell.MainTargetID);
+                var targets = CollectionsMarshal.AsSpan(Targets);
+                var lenT = targets.Length;
+                var tid = spell.MainTargetID;
+                for (var j = 0; j < lenT; ++j)
+                {
+                    ref var t = ref targets[j];
+                    if (t.instanceID == tid)
+                    {
+                        Targets.RemoveAt(j);
+                        return;
+                    }
+                }
             }
         }
     }

BossMod/Modules/Dawntrail/Alliance/A13ArkAngels/Rampage.cs

@@ -3,22 +3,16 @@ namespace BossMod.Dawntrail.Alliance.A13ArkAngels;
 sealed class Rampage(BossModule module) : Components.GenericAOEs(module)
 {
     public readonly List<AOEInstance> AOEs = new(5);
-
     private static readonly AOEShapeCircle _shapeLast = new(20f);
 
-    public override ReadOnlySpan<AOEInstance> ActiveAOEs(int slot, Actor actor)
+    public override ReadOnlySpan<AOEInstance> ActiveAOEs(int slot, Actor actor) => CollectionsMarshal.AsSpan(AOEs);
+
+    public override void Update()
     {
-        var count = AOEs.Count;
-        if (count == 0)
-            return [];
-        Span<AOEInstance> aoes = new AOEInstance[count];
-        var color = Colors.Danger;
-        for (var i = 0; i < count; ++i)
+        if (AOEs.Count > 1)
         {
-            var aoe = AOEs[i];
-            aoes[i] = i == 0 ? count > 1 ? aoe with { Color = color } : aoe : aoe;
+            AOEs.Ref(0).Color = Colors.Danger;
         }
-        return aoes;
     }
 
     public override void OnCastStarted(Actor caster, ActorCastInfo spell)
@@ -27,10 +21,10 @@ public override void OnCastStarted(Actor caster, ActorCastInfo spell)
         {
             case (uint)AID.RampagePreviewCharge:
                 var toDest = spell.LocXZ - caster.Position;
-                AOEs.Add(new(new AOEShapeRect(toDest.Length(), 5f), caster.Position, Angle.FromDirection(toDest), Module.CastFinishAt(spell, 5.1f + 0.2f * AOEs.Count)));
+                AOEs.Add(new(new AOEShapeRect(toDest.Length(), 5f), caster.Position, Angle.FromDirection(toDest), Module.CastFinishAt(spell, 5.1d + 0.2d * AOEs.Count)));
                 break;
             case (uint)AID.RampagePreviewLast:
-                AOEs.Add(new(_shapeLast, spell.LocXZ, default, Module.CastFinishAt(spell, 6.3f)));
+                AOEs.Add(new(_shapeLast, spell.LocXZ, default, Module.CastFinishAt(spell, 6.3d)));
                 break;
         }
     }
@@ -41,7 +35,9 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell)
         {
             ++NumCasts;
             if (AOEs.Count != 0)
+            {
                 AOEs.RemoveAt(0);
+            }
         }
     }
 }

BossMod/Modules/Dawntrail/Alliance/A14ShadowLord/A14ShadowLord.cs

@@ -3,7 +3,7 @@
 sealed class Teleport(BossModule module) : Components.CastCounter(module, (uint)AID.Teleport);
 sealed class TeraSlash(BossModule module) : Components.CastCounter(module, (uint)AID.TeraSlash);
 sealed class DoomArc(BossModule module) : Components.RaidwideCast(module, (uint)AID.DoomArc);
-sealed class UnbridledRage(BossModule module) : Components.BaitAwayIcon(module, new AOEShapeRect(100f, 4f), (uint)IconID.UnbridledRage, (uint)AID.UnbridledRageAOE, 5.9f);
+sealed class UnbridledRage(BossModule module) : Components.BaitAwayIcon(module, new AOEShapeRect(100f, 4f), (uint)IconID.UnbridledRage, (uint)AID.UnbridledRageAOE, 5.9d);
 sealed class DarkNova(BossModule module) : Components.SpreadFromCastTargets(module, (uint)AID.DarkNova, 6f);
 
 [ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "The Combat Reborn Team (Malediktus, LTS)", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 1015, NameID = 13653, SortOrder = 8, PlanLevel = 100)]