From 99505008469ecbd1280849e4f779cc001f06ba6c Mon Sep 17 00:00:00 2001 From: LTS-FFXIV <127939494+LTS-FFXIV@users.noreply.github.com> Date: Fri, 29 Mar 2024 19:39:22 -0500 Subject: [PATCH] emergency fix for merge, triangles are back baybee and steelclaw fix --- BossMod/BossModule/AOEShapes.cs | 5 +++-- BossMod/BossModule/ArenaBounds.cs | 1 - .../EurekaOrthos/Floors61-70/DD70Aeturna.cs | 10 +++------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/BossMod/BossModule/AOEShapes.cs b/BossMod/BossModule/AOEShapes.cs index 4363217f86..b828512812 100644 --- a/BossMod/BossModule/AOEShapes.cs +++ b/BossMod/BossModule/AOEShapes.cs @@ -231,8 +231,9 @@ private IEnumerable 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 Distance(WPos origin, Angle rotation) return (p1, p2, p3); } } -} + diff --git a/BossMod/BossModule/ArenaBounds.cs b/BossMod/BossModule/ArenaBounds.cs index 0a8a778d67..579d2b8828 100644 --- 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 index 3ccf9f2650..fa5744a464 100644 --- 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?