emergency fix for merge, triangles are back baybee and steelclaw fix

FFXIV-CombatReborn · Mar 30, 2024 · 9950500 · 9950500
1 parent 50fd701
commit 9950500
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/BossMod/BossModule/AOEShapes.cs b/BossMod/BossModule/AOEShapes.cs
@@ -231,8 +231,9 @@ private IEnumerable<WPos> ContourPoints(WPos origin, Angle rotation, float offse
         yield return origin + dx1 + dy2;
     }
 }
+
 public class AOEShapeTriangle : AOEShape
-    {
+ {
         public float SideLength;
         public Angle DirectionOffset;
 
@@ -287,4 +288,4 @@ public override Func<WPos, float> Distance(WPos origin, Angle rotation)
             return (p1, p2, p3);
         }
     }
-}
+
diff --git a/BossMod/BossModule/ArenaBounds.cs b/BossMod/BossModule/ArenaBounds.cs
@@ -270,4 +270,3 @@ public override WDir ClampToBounds(WDir offset, float scale = 1)
             return new WDir(0, 0); // Placeholder to indicate that clamping logic is needed
         }
     }
-}
diff --git a/BossMod/Modules/Endwalker/DeepDungeons/EurekaOrthos/Floors61-70/DD70Aeturna.cs b/BossMod/Modules/Endwalker/DeepDungeons/EurekaOrthos/Floors61-70/DD70Aeturna.cs
@@ -1,6 +1,5 @@
 // CONTRIB: made by legendoficeman, changes by Malediktus
-using System.Collections.Generic;
-using System.Linq;
+using BossMod;
 
 namespace BossMod.Endwalker.DeepDungeons.EurekaOrthos.Floors61to70.DD30Aeturna
 {
@@ -40,12 +39,9 @@ public enum TetherID : uint
         FerocityTetherStretch = 57, // Boss->player
     };
 
-    class SteelClaw : Components.SingleTargetCast
+    class SteelClaw : Components.SingleTargetDelayableCast
     {
-        public SteelClaw() : base(ActionID.MakeSpell(AID.SteelClaw))
-        {
-            EndsOnCastEvent = true;
-        }
+        public SteelClaw() : base(ActionID.MakeSpell(AID.SteelClaw)) { }
     }
 
     class FerocityGood : Components.BaitAwayTethers  //TODO: consider generalizing stretched tethers?
-Original file line number
+Diff line change
@@ Expand Up @@
                 return new WDir(0, 0); // Placeholder to indicate that clamping logic is needed
             }
         }
-    }