Merge pull request #952 from FFXIV-CombatReborn/mergeWIP

further cleanup

Author: CarnifexOptimus

BossMod/BossModule/ArenaBounds.cs

@@ -172,17 +172,18 @@ private Pathfinding.Map BuildMap()
 }
 
 // if rotation is 0, half-width is along X and half-height is along Z
-public record class ArenaBoundsRect(float HalfWidth, float HalfHeight, Angle Rotation = default, float MapResolution = 0.5f, bool AllowObstacleMap = false) : ArenaBounds(Math.Max(HalfWidth, HalfHeight), MapResolution, Rotation != default ? CalculateScaleFactor(Rotation) : 1, AllowObstacleMap)
+public record class ArenaBoundsRect(float HalfWidth, float HalfHeight, Angle Rotation = default, float MapResolution = 0.5f, bool AllowObstacleMap = false) : ArenaBounds(Math.Max(HalfWidth, HalfHeight), MapResolution, Rotation != default ? CalculateScaleFactor(Rotation) : 1f, AllowObstacleMap)
 {
     private Pathfinding.Map? _cachedMap;
     public readonly WDir Orientation = Rotation.ToDirection();
+
     private static float CalculateScaleFactor(Angle Rotation)
     {
         var (sin, cos) = MathF.SinCos(Rotation.Rad);
         return Math.Abs(cos) + Math.Abs(sin);
     }
 
-    protected override PolygonClipper.Operand BuildClipPoly() => new((ReadOnlySpan<WDir>)CurveApprox.Rect(Orientation, HalfWidth, HalfHeight));
+    protected override PolygonClipper.Operand BuildClipPoly() => new(CurveApprox.Rect(Orientation, HalfWidth, HalfHeight));
     public override void PathfindMap(Pathfinding.Map map, WPos center) => map.Init(_cachedMap ??= BuildMap(), center);
     private Pathfinding.Map BuildMap()
     {
@@ -218,6 +219,8 @@ public sealed record class ArenaBoundsSquare(float Radius, Angle Rotation = defa
 // for creating complex bounds by using arrays of shapes
 // first array contains platforms that will be united, second optional array contains shapes that will be subtracted
 // for convenience third array will optionally perform additional unions at the end
+// offset shrinks the pathfinding map only, for example if the edges of the arena are deadly and floating point errors cause the AI to fall of the map or problems like that
+// AdjustForHitbox adjusts both the visible map and the pathfinding map
 public sealed record class ArenaBoundsCustom : ArenaBounds
 {
     private Pathfinding.Map? _cachedMap;
@@ -315,6 +318,17 @@ private static (WPos Center, float HalfWidth, float HalfHeight, float Radius, Re
         }
 
         return (center, halfWidth, halfHeight, Math.Max(maxDistX, maxDistZ), combinedPoly);
+
+        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(default);
+            }
+            return polygons;
+        }
     }
 
     protected override PolygonClipper.Operand BuildClipPoly() => new(Polygon);
@@ -368,34 +382,6 @@ public override WDir ClampToBounds(WDir offset)
     private Pathfinding.Map BuildMap()
     {
         var polygon = offset != default ? Polygon.Offset(offset) : Polygon;
-        if (HalfHeight == default) // calculate bounding box if not already done by ArenaBoundsCustom to reduce amount of point in polygon tests
-        {
-            float minX = float.MaxValue, maxX = float.MinValue, minZ = float.MaxValue, maxZ = float.MinValue;
-            var parts = polygon.Parts;
-            var count = parts.Count;
-            for (var i = 0; i < count; ++i)
-            {
-                var part = parts[i];
-                var exterior = part.Exterior;
-                var len = exterior.Length;
-                for (var j = 0; j < len; ++j)
-                {
-                    var vertex = exterior[j];
-                    var vertexX = vertex.X;
-                    var vertexZ = vertex.Z;
-                    if (vertex.X < minX)
-                        minX = vertexX;
-                    if (vertex.X > maxX)
-                        maxX = vertexX;
-                    if (vertex.Z < minZ)
-                        minZ = vertexZ;
-                    if (vertex.Z > maxZ)
-                        maxZ = vertexZ;
-                }
-            }
-            HalfWidth = (maxX - minX) * 0.5f;
-            HalfHeight = (maxZ - minZ) * 0.5f;
-        }
         var map = new Pathfinding.Map(MapResolution, default, HalfWidth, HalfHeight);
         var pixels = map.PixelMaxG;
         var width = map.Width;
@@ -409,10 +395,10 @@ private Pathfinding.Map BuildMap()
 
         WDir[] sampleOffsets =
         [
-        new(-halfSample, -halfSample),
-        new(-halfSample,  halfSample),
-        new(halfSample, -halfSample),
-        new(halfSample, halfSample)
+            new(-halfSample, -halfSample),
+            new(-halfSample,  halfSample),
+            new(halfSample, -halfSample),
+            new(halfSample, halfSample)
         ];
 
         var dx = new WDir(resolution, default);
@@ -425,9 +411,12 @@ private Pathfinding.Map BuildMap()
             var posY = startPos + y * dy;
             for (var x = 0; x < width; ++x)
             {
-                ref var pixel = ref pixels[rowOffset + x];
-                if (pixel == -1f)
+                var offset = rowOffset + x;
+
+                if (pixels[offset] == -1f)
+                {
                     continue;
+                }
                 var pos = posY + x * dx;
 
                 var relativeCenter = new WDir(pos.X, pos.Z);
@@ -441,7 +430,7 @@ private Pathfinding.Map BuildMap()
                         break;
                     }
                 }
-                pixel = allInside ? float.MaxValue : -1f;
+                pixels[offset] = allInside ? float.MaxValue : -1f;
             }
         });
 
@@ -457,29 +446,26 @@ private static RelSimplifiedComplexPolygon CombinePolygons(RelSimplifiedComplexP
 
         var unionLen = unionPolygons.Length;
         for (var i = 0; i < unionLen; ++i)
+        {
             operandUnion.AddPolygon(unionPolygons[i]);
+        }
         var differenceLen = differencePolygons.Length;
         for (var i = 0; i < differenceLen; ++i)
+        {
             operandDifference.AddPolygon(differencePolygons[i]);
+        }
         var secUnionLen = secondUnionPolygons.Length;
         for (var i = 0; i < secUnionLen; ++i)
+        {
             operandSecondUnion.AddPolygon(secondUnionPolygons[i]);
+        }
 
         var combinedShape = clipper.Difference(operandUnion, operandDifference);
         if (secUnionLen != 0)
+        {
             combinedShape = clipper.Union(new PolygonClipper.Operand(combinedShape), operandSecondUnion);
+        }
 
         return combinedShape;
     }
-
-    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(default);
-        }
-        return polygons;
-    }
 }

BossMod/Data/Actor.cs

@@ -274,14 +274,15 @@ public int PendingMPDifference
     // if expirationForPredicted is not null, search pending first, and return one if found; in that case only low byte of extra will be set
     public ActorStatus? FindStatus(uint sid, DateTime? expirationForPending = null)
     {
+        var sid_ = sid;
         if (expirationForPending != null)
         {
             var statusesP = CollectionsMarshal.AsSpan(PendingStatuses);
             var lenP = statusesP.Length;
             for (var i = 0; i < lenP; ++i)
             {
                 ref var s = ref statusesP[i];
-                if (s.StatusId == sid)
+                if (s.StatusId == sid_)
                 {
                     return new(sid, s.ExtraLo, expirationForPending.Value, s.Effect.SourceInstanceID);
                 }
@@ -291,7 +292,7 @@ public int PendingMPDifference
         for (var i = 0; i < len; ++i)
         {
             ref var s = ref Statuses[i];
-            if (s.ID == sid)
+            if (s.ID == sid_)
             {
                 return s;
             }
@@ -301,24 +302,25 @@ public int PendingMPDifference
 
     public ActorStatus? FindStatus(uint sid, ulong source, DateTime? expirationForPending = null)
     {
+        var sid_ = sid;
         if (expirationForPending != null)
         {
             var statusesP = CollectionsMarshal.AsSpan(PendingStatuses);
             var lenP = statusesP.Length;
             for (var i = 0; i < lenP; ++i)
             {
                 ref var s = ref statusesP[i];
-                if (s.StatusId == sid && s.Effect.SourceInstanceID == source)
+                if (s.StatusId == sid_ && s.Effect.SourceInstanceID == source)
                 {
-                    return new(sid, s.ExtraLo, expirationForPending.Value, s.Effect.SourceInstanceID);
+                    return new(sid_, s.ExtraLo, expirationForPending.Value, s.Effect.SourceInstanceID);
                 }
             }
         }
         var len = Statuses.Length;
         for (var i = 0; i < len; ++i)
         {
             ref var s = ref Statuses[i];
-            if (s.ID == sid && s.SourceID == source)
+            if (s.ID == sid_ && s.SourceID == source)
             {
                 return s;
             }

BossMod/Data/ActorEnumeration.cs

@@ -48,12 +48,6 @@ public static IEnumerable<Actor> Exclude(this IEnumerable<Actor> range, IEnumera
         return range.Where(x => !actorSet.Contains(x));
     }
 
-    public static IEnumerable<(int, Actor)> Exclude(this IEnumerable<(int, Actor)> range, IEnumerable<Actor> actors)
-    {
-        var actorSet = new HashSet<Actor>(actors);
-        return range.WhereActor(x => !actorSet.Contains(x));
-    }
-
     // select actors that have their corresponding bit in mask set
     public static IEnumerable<(int, Actor)> IncludedInMask(this IEnumerable<(int, Actor)> range, BitMask mask)
     {
@@ -115,21 +109,6 @@ public static List<Actor> InShape(this IEnumerable<Actor> range, AOEShape shape,
         return result;
     }
 
-    public static List<(int, Actor)> InShape(this IEnumerable<(int, Actor)> range, AOEShape shape, Actor origin)
-    {
-        List<(int, Actor)> result = [];
-
-        foreach (var tuple in range)
-        {
-            if (shape.Check(tuple.Item2.Position, origin))
-            {
-                result.Add(tuple);
-            }
-        }
-
-        return result;
-    }
-
     public static List<Actor> InShape(this IEnumerable<Actor> range, AOEShape shape, WPos origin, Angle rotation)
     {
         List<Actor> result = [];
@@ -278,64 +257,4 @@ public static (int match, int mismatch) CountByCondition(this IEnumerable<Actor>
         }
         return (match, mismatch);
     }
-
-    // find the centroid of actor positions
-    public static WPos PositionCentroid(this IEnumerable<Actor> range)
-    {
-        WDir sum = default;
-        int count = 0;
-        foreach (var a in range)
-        {
-            sum += a.Position.ToWDir();
-            ++count;
-        }
-        if (count > 0)
-            sum /= count;
-        return sum.ToWPos();
-    }
-
-    public static (int, Actor)[] ExcludedFromMask(this List<(int, Actor)> range, BitMask mask)
-    {
-        var count = range.Count;
-        var result = new List<(int, Actor)>(count);
-        for (var i = 0; i < count; ++i)
-        {
-            var indexActor = range[i];
-            if (!mask[indexActor.Item1])
-            {
-                result.Add(indexActor);
-            }
-        }
-        return [.. result];
-    }
-
-    public static (int, Actor)[] WhereSlot(this List<(int, Actor)> range, Func<int, bool> predicate)
-    {
-        var count = range.Count;
-        var result = new List<(int, Actor)>(count);
-        for (var i = 0; i < count; ++i)
-        {
-            var indexActor = range[i];
-            if (predicate(indexActor.Item1))
-            {
-                result.Add(indexActor);
-            }
-        }
-        return [.. result];
-    }
-
-    public static (int, Actor)[] InRadius(this List<(int, Actor)> range, WPos origin, float radius)
-    {
-        var count = range.Count;
-        var result = new List<(int, Actor)>(count);
-        for (var i = 0; i < count; ++i)
-        {
-            var indexActor = range[i];
-            if (indexActor.Item2.Position.InCircle(origin, radius))
-            {
-                result.Add(indexActor);
-            }
-        }
-        return [.. result];
-    }
 }

BossMod/Framework/WorldStateGameSync.cs

@@ -398,7 +398,9 @@ private unsafe void UpdateActor(GameObject* obj, int index, Actor? act)
                     var dur = Math.Min(Math.Abs(s.RemainingTime), 100000);
                     ActorStatus curStatus = new(s.StatusId, s.Param, _ws.CurrentTime.AddSeconds(dur), SanitizedObjectID(s.SourceObject));
                     UpdateActorStatus(act, i, ref curStatus);
+                    continue;
                 }
+                _ws.Execute(new ActorState.OpStatus(instanceID, i, default));
             }
         }
 

BossMod/Modules/Dawntrail/Raid/M05NDancingGreen/M05NDancingGreen.cs

@@ -1,7 +1,7 @@
 namespace BossMod.Dawntrail.Raid.M05NDancingGreen;
 
 sealed class DoTheHustle(BossModule module) : Components.SimpleAOEGroups(module, [(uint)AID.DoTheHustle1, (uint)AID.DoTheHustle2], new AOEShapeCone(50f, 90f.Degrees()));
-sealed class DeepCut(BossModule module) : Components.BaitAwayIcon(module, new AOEShapeCone(60, 22.5f.Degrees()), (uint)IconID.DeepCut, (uint)AID.DeepCut, 5f, tankbuster: true, damageType: AIHints.PredictedDamageType.Tankbuster);
+sealed class DeepCut(BossModule module) : Components.BaitAwayIcon(module, new AOEShapeCone(60f, 22.5f.Degrees()), (uint)IconID.DeepCut, (uint)AID.DeepCut, 5f, tankbuster: true, damageType: AIHints.PredictedDamageType.Tankbuster);
 sealed class FullBeat(BossModule module) : Components.StackWithCastTargets(module, (uint)AID.FullBeat, 6f, 8, 8);
 sealed class CelebrateGoodTimesDiscoInfernalLetsPose(BossModule module) : Components.RaidwideCasts(module, [(uint)AID.CelebrateGoodTimes, (uint)AID.DiscoInfernal,
 (uint)AID.LetsPose1, (uint)AID.LetsPose2]);

BossMod/Modules/Dawntrail/Raid/M05NDancingGreen/M05NDancingGreenEnums.cs

@@ -10,7 +10,7 @@ public enum OID : uint
 
 public enum AID : uint
 {
-    AutoAttack = 872, // Boss->player, no cast, single-target
+    AutoAttack = 44484, // Boss->player, no cast, single-target
     Teleport = 42693, // Boss->location, no cast, single-target
 
     DoTheHustle1 = 42697, // Boss->self, 5.0s cast, range 50 180-degree cone