diff --git a/BossMod/Components/GenericAOEs.cs b/BossMod/Components/GenericAOEs.cs index 8a5aa6da2f..369c7da1a6 100644 --- a/BossMod/Components/GenericAOEs.cs +++ b/BossMod/Components/GenericAOEs.cs @@ -48,7 +48,20 @@ public class SelfTargetedAOEs(BossModule module, ActionID aid, AOEShape shape, i public float RiskyAfterSeconds = riskyAfterSeconds; // can be used to delay risky status of AOEs, so AI waits longer to dodge, if 0 it will just use the bool Risky public readonly List Casters = []; - public IEnumerable ActiveCasters => Casters.Take(MaxCasts); + public List ActiveCasters + { + get + { + var count = Casters.Count; + var max = count > MaxCasts ? MaxCasts : count; + List result = new(max); + for (var i = 0; i < max; ++i) + { + result.Add(Casters[i]); + } + return result; + } + } public override IEnumerable ActiveAOEs(int slot, Actor actor) { @@ -86,7 +99,20 @@ public class SelfTargetedLegacyRotationAOEs(BossModule module, ActionID aid, AOE public int MaxCasts = maxCasts; // used for staggered aoes, when showing all active would be pointless public readonly List Casters = []; - public IEnumerable ActiveCasters => Casters.Take(MaxCasts); + public List ActiveCasters + { + get + { + var count = Casters.Count; + var max = count > MaxCasts ? MaxCasts : count; + List result = new(max); + for (var i = 0; i < max; ++i) + { + result.Add(Casters[i]); + } + return result; + } + } public override IEnumerable ActiveAOEs(int slot, Actor actor) => ActiveCasters.Select(c => new AOEInstance(Shape, c.Position, c.Rotation, Module.CastFinishAt(c.CastInfo))); @@ -103,10 +129,10 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) } } -// location-targeted circle aoe that happens at the end of the cast -public class LocationTargetedAOEs(BossModule module, ActionID aid, AOEShape shape, int maxCasts = int.MaxValue, float riskyWithSecondsLeft = 0, bool targetIsLocation = false) : GenericAOEs(module, aid) +// For simple AOEs, formerly known as LocationTargetedAOEs, that happens at the end of the cast +public class SimpleAOEs(BossModule module, ActionID aid, AOEShape shape, int maxCasts = int.MaxValue, float riskyWithSecondsLeft = 0, bool targetIsLocation = false) : GenericAOEs(module, aid) { - public LocationTargetedAOEs(BossModule module, ActionID aid, float radius, float riskyWithSecondsLeft = 0, int maxCasts = int.MaxValue, bool targetIsLocation = false) : this(module, aid, new AOEShapeCircle(radius), maxCasts, riskyWithSecondsLeft, targetIsLocation) { } + public SimpleAOEs(BossModule module, ActionID aid, float radius, float riskyWithSecondsLeft = 0, int maxCasts = int.MaxValue, bool targetIsLocation = false) : this(module, aid, new AOEShapeCircle(radius), maxCasts, riskyWithSecondsLeft, targetIsLocation) { } public readonly AOEShape Shape = shape; public readonly int MaxCasts = maxCasts; // used for staggered aoes, when showing all active would be pointless public uint Color; // can be customized if needed @@ -115,19 +141,36 @@ public class LocationTargetedAOEs(BossModule module, ActionID aid, AOEShape shap public readonly float RiskyWithSecondsLeft = riskyWithSecondsLeft; // can be used to delay risky status of AOEs, so AI waits longer to dodge, if 0 it will just use the bool Risky public readonly List Casters = []; - public IEnumerable ActiveCasters => Casters.Take(MaxCasts); + + public List ActiveCasters + { + get + { + var count = Casters.Count; + var max = count > MaxCasts ? MaxCasts : count; + List result = new(max); + for (var i = 0; i < max; ++i) + { + result.Add(Casters[i]); + } + return result; + } + } public override IEnumerable ActiveAOEs(int slot, Actor actor) { var count = Casters.Count; if (count == 0) - yield break; + return []; var time = WorldState.CurrentTime; - for (var i = 0; i < (count > MaxCasts ? MaxCasts : count); ++i) + var max = count > MaxCasts ? MaxCasts : count; + List result = new(max); + for (var i = 0; i < max; ++i) { var caster = Casters[i]; - yield return RiskyWithSecondsLeft == 0 ? caster : caster with { Risky = caster.Activation.AddSeconds(-RiskyWithSecondsLeft) <= time }; + result.Add(RiskyWithSecondsLeft == 0 ? caster : caster with { Risky = caster.Activation.AddSeconds(-RiskyWithSecondsLeft) <= time }); } + return result; } public override void OnCastStarted(Actor caster, ActorCastInfo spell) diff --git a/BossMod/Modules/Dawntrail/Alliance/A10Trash/A10Aquarius.cs b/BossMod/Modules/Dawntrail/Alliance/A10Trash/A10Aquarius.cs index 87c361d7c9..edf9a65f32 100644 --- a/BossMod/Modules/Dawntrail/Alliance/A10Trash/A10Aquarius.cs +++ b/BossMod/Modules/Dawntrail/Alliance/A10Trash/A10Aquarius.cs @@ -29,8 +29,8 @@ public enum AID : uint Agaricus = 41661 // DeathCap->self, 3.0s cast, range 5 circle } -class CursedSphere(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.CursedSphere), 3); -class WaterIII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.WaterIII), 7); +class CursedSphere(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.CursedSphere), 3); +class WaterIII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.WaterIII), 7); class BubbleShower(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BubbleShower), new AOEShapeCone(6, 30.Degrees())); class Scoop(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Scoop), new AOEShapeCone(15, 60.Degrees())); class Agaricus(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Agaricus), new AOEShapeCircle(5)); diff --git a/BossMod/Modules/Dawntrail/Alliance/A10Trash/A10Despot.cs b/BossMod/Modules/Dawntrail/Alliance/A10Trash/A10Despot.cs index 26d271e7f7..e22ed92f24 100644 --- a/BossMod/Modules/Dawntrail/Alliance/A10Trash/A10Despot.cs +++ b/BossMod/Modules/Dawntrail/Alliance/A10Trash/A10Despot.cs @@ -22,7 +22,7 @@ public enum AID : uint PanzerfaustRepeats = 41353 // Boss->player, no cast, single-target, knockback 10, apply concussion } -class IsleDrop(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.IsleDrop), 6); +class IsleDrop(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.IsleDrop), 6); class WingCutter(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.WingCutter), new AOEShapeCone(6, 60.Degrees())); class PanzerfaustHint(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.Panzerfaust), showNameInHint: true); class Panzerfaust(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Panzerfaust)); diff --git a/BossMod/Modules/Dawntrail/Alliance/A10Trash/A10Groundskeeper.cs b/BossMod/Modules/Dawntrail/Alliance/A10Trash/A10Groundskeeper.cs index d14ac351ea..a41c78c1c3 100644 --- a/BossMod/Modules/Dawntrail/Alliance/A10Trash/A10Groundskeeper.cs +++ b/BossMod/Modules/Dawntrail/Alliance/A10Trash/A10Groundskeeper.cs @@ -16,7 +16,7 @@ public enum AID : uint DoubleRay = 41668 // Sprinkler->player, no cast, single-target } -class IsleDrop(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.IsleDrop), 6); +class IsleDrop(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.IsleDrop), 6); class MysteriousLight(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.MysteriousLight)); public class A10GroundskeeperStates : StateMachineBuilder diff --git a/BossMod/Modules/Dawntrail/Alliance/A10Trash/A10VanguardPathfinder.cs b/BossMod/Modules/Dawntrail/Alliance/A10Trash/A10VanguardPathfinder.cs index e1ed9dd43c..d0c60a0b81 100644 --- a/BossMod/Modules/Dawntrail/Alliance/A10Trash/A10VanguardPathfinder.cs +++ b/BossMod/Modules/Dawntrail/Alliance/A10Trash/A10VanguardPathfinder.cs @@ -18,8 +18,8 @@ public enum AID : uint GoblinRush = 41654 // Boss->players, no cast, single-target } -class BombToss(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BombToss), 3); -class Seismostomp(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Seismostomp), 5); +class BombToss(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BombToss), 3); +class Seismostomp(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Seismostomp), 5); public class A10VanguardPathfinderStates : StateMachineBuilder { diff --git a/BossMod/Modules/Dawntrail/Alliance/A12Fafnir/HurricaneWing.cs b/BossMod/Modules/Dawntrail/Alliance/A12Fafnir/HurricaneWing.cs index a18d70df4b..df4d6533d4 100644 --- a/BossMod/Modules/Dawntrail/Alliance/A12Fafnir/HurricaneWing.cs +++ b/BossMod/Modules/Dawntrail/Alliance/A12Fafnir/HurricaneWing.cs @@ -133,7 +133,7 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme } } -class HorridRoarPuddle(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HorridRoarPuddle), 4) +class HorridRoarPuddle(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HorridRoarPuddle), 4) { public override bool KeepOnPhaseChange => true; } diff --git a/BossMod/Modules/Dawntrail/Chaotic/Ch01CloudOfDarkness/EvilSeed.cs b/BossMod/Modules/Dawntrail/Chaotic/Ch01CloudOfDarkness/EvilSeed.cs index 456bb5e88a..64e20cc7d0 100644 --- a/BossMod/Modules/Dawntrail/Chaotic/Ch01CloudOfDarkness/EvilSeed.cs +++ b/BossMod/Modules/Dawntrail/Chaotic/Ch01CloudOfDarkness/EvilSeed.cs @@ -17,7 +17,7 @@ public override void OnEventIcon(Actor actor, uint iconID, ulong targetID) } } -class EvilSeedAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.EvilSeedAOE), 5); +class EvilSeedAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.EvilSeedAOE), 5); class EvilSeedVoidzone(BossModule module) : Components.PersistentVoidzone(module, 5, module => module.Enemies(OID.EvilSeed).Where(z => z.EventState != 7)); diff --git a/BossMod/Modules/Dawntrail/Dungeon/D01Ihuykatumu/D013Apollyon.cs b/BossMod/Modules/Dawntrail/Dungeon/D01Ihuykatumu/D013Apollyon.cs index c90fdaf022..3e87e29001 100644 --- a/BossMod/Modules/Dawntrail/Dungeon/D01Ihuykatumu/D013Apollyon.cs +++ b/BossMod/Modules/Dawntrail/Dungeon/D01Ihuykatumu/D013Apollyon.cs @@ -56,7 +56,7 @@ class Whirlwind(BossModule module) : Components.PersistentVoidzone(module, 4.5f, class Blade(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Blade)); class HighWind(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.HighWind)); class BladesOfFamine(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BladesOfFamine), new AOEShapeRect(50, 6)); -class Levinsickle(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Levinsickle), 4); +class Levinsickle(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Levinsickle), 4); class LevinsickleSpark(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 4, ActionID.MakeSpell(AID.LevinsickleSpark), m => m.Enemies(OID.LightningVoidzone).Where(z => z.EventState != 7), 0.7f); class WingOfLightning(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.WingOfLightning), new AOEShapeCone(40, 22.5f.Degrees()), 8); diff --git a/BossMod/Modules/Dawntrail/Dungeon/D03SkydeepCenote/D033Maulskull.cs b/BossMod/Modules/Dawntrail/Dungeon/D03SkydeepCenote/D033Maulskull.cs index 7caf4a5eb9..1842bb4ee3 100644 --- a/BossMod/Modules/Dawntrail/Dungeon/D03SkydeepCenote/D033Maulskull.cs +++ b/BossMod/Modules/Dawntrail/Dungeon/D03SkydeepCenote/D033Maulskull.cs @@ -234,7 +234,7 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme } } -class Landing(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Landing), 8); +class Landing(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Landing), 8); abstract class DeepThunder(BossModule module, AID aid) : Components.CastTowers(module, ActionID.MakeSpell(aid), 6, 4, 4); class DeepThunder1(BossModule module) : DeepThunder(module, AID.DeepThunderTower1); diff --git a/BossMod/Modules/Dawntrail/Dungeon/D04Vanguard/D041CommanderR8.cs b/BossMod/Modules/Dawntrail/Dungeon/D04Vanguard/D041CommanderR8.cs index 2d8d0f5bcf..6eb9aab2cf 100644 --- a/BossMod/Modules/Dawntrail/Dungeon/D04Vanguard/D041CommanderR8.cs +++ b/BossMod/Modules/Dawntrail/Dungeon/D04Vanguard/D041CommanderR8.cs @@ -162,7 +162,7 @@ class EnhancedMobility3(BossModule module) : EnhancedMobility(module, AID.Enhanc class EnhancedMobility4(BossModule module) : EnhancedMobility(module, AID.EnhancedMobility4); class Rush(BossModule module) : Components.ChargeAOEs(module, ActionID.MakeSpell(AID.Rush), 2.5f); -class AerialOffensive(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AerialOffensive), 14, maxCasts: 4); +class AerialOffensive(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AerialOffensive), 14, maxCasts: 4); class Electrosurge(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.Electrosurge), 5); class D041CommanderR8States : StateMachineBuilder diff --git a/BossMod/Modules/Dawntrail/Dungeon/D04Vanguard/D042Protector.cs b/BossMod/Modules/Dawntrail/Dungeon/D04Vanguard/D042Protector.cs index 5c4532f3ca..3c0753202a 100644 --- a/BossMod/Modules/Dawntrail/Dungeon/D04Vanguard/D042Protector.cs +++ b/BossMod/Modules/Dawntrail/Dungeon/D04Vanguard/D042Protector.cs @@ -208,7 +208,7 @@ public override IEnumerable ActiveAOEs(int slot, Actor actor) } } -class Shock(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Shock), 3); +class Shock(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Shock), 3); class HomingCannon(BossModule module) : Components.GenericAOEs(module) { @@ -241,7 +241,7 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) } } -class Bombardment(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Bombardment), 5); +class Bombardment(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Bombardment), 5); abstract class Electrowhirl(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCircle(6)); class Electrowhirl1(BossModule module) : Electrowhirl(module, AID.Electrowhirl1); diff --git a/BossMod/Modules/Dawntrail/Dungeon/D05Origenics/D050OrigenicsAerostat.cs b/BossMod/Modules/Dawntrail/Dungeon/D05Origenics/D050OrigenicsAerostat.cs index a99d73faf9..cb1d433fdc 100644 --- a/BossMod/Modules/Dawntrail/Dungeon/D05Origenics/D050OrigenicsAerostat.cs +++ b/BossMod/Modules/Dawntrail/Dungeon/D05Origenics/D050OrigenicsAerostat.cs @@ -21,7 +21,7 @@ public enum AID : uint } class IncendiaryCircle(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.IncendiaryCircle), new AOEShapeDonut(3, 12)); -class GrenadoShot(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GrenadoShot), 5); +class GrenadoShot(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GrenadoShot), 5); class D050OrigenicsAerostatStates : StateMachineBuilder { diff --git a/BossMod/Modules/Dawntrail/Dungeon/D05Origenics/D051Herpekaris.cs b/BossMod/Modules/Dawntrail/Dungeon/D05Origenics/D051Herpekaris.cs index fe43e9f888..f5b5df1a51 100644 --- a/BossMod/Modules/Dawntrail/Dungeon/D05Origenics/D051Herpekaris.cs +++ b/BossMod/Modules/Dawntrail/Dungeon/D05Origenics/D051Herpekaris.cs @@ -45,7 +45,7 @@ class ConvulsiveCrush(BossModule module) : Components.SingleTargetDelayableCast( class PoisonHeartSpread(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.PoisonHeartSpread), 5); class PoisonHeartVoidzone(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 2, ActionID.MakeSpell(AID.PoisonHeartVoidzone), m => m.Enemies(OID.PoisonVoidzone).Where(z => z.EventState != 7), 0.9f); -class PodBurst(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 6); +class PodBurst(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 6); class PodBurst1(BossModule module) : PodBurst(module, AID.PodBurst1); class PodBurst2(BossModule module) : PodBurst(module, AID.PodBurst2); diff --git a/BossMod/Modules/Dawntrail/Dungeon/D05Origenics/D053Ambrose.cs b/BossMod/Modules/Dawntrail/Dungeon/D05Origenics/D053Ambrose.cs index 0625c2addd..c6bc547f53 100644 --- a/BossMod/Modules/Dawntrail/Dungeon/D05Origenics/D053Ambrose.cs +++ b/BossMod/Modules/Dawntrail/Dungeon/D05Origenics/D053Ambrose.cs @@ -231,7 +231,7 @@ public override void AddHints(int slot, Actor actor, TextHints hints) } } -class Electrolance(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Electrolance), 22); +class Electrolance(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Electrolance), 22); class WhorlOfTheMind(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.WhorlOfTheMind), 5); class Rush(BossModule module) : Components.GenericAOEs(module) diff --git a/BossMod/Modules/Dawntrail/Dungeon/D06Alexandria/D062Amalgam.cs b/BossMod/Modules/Dawntrail/Dungeon/D06Alexandria/D062Amalgam.cs index 638871e1bd..7229376204 100644 --- a/BossMod/Modules/Dawntrail/Dungeon/D06Alexandria/D062Amalgam.cs +++ b/BossMod/Modules/Dawntrail/Dungeon/D06Alexandria/D062Amalgam.cs @@ -69,7 +69,7 @@ class Disassembly(BossModule module) : Components.RaidwideCast(module, ActionID. class SupercellMatrix2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SupercellMatrix2), new AOEShapeRect(55, 4)); class StaticSpark(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.StaticSpark), 6); class Amalgamight(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Amalgamight)); -class Voltburst(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Voltburst), 6); +class Voltburst(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Voltburst), 6); class Superbolt(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.Superbolt), 6, 4, 4); class TernaryCharge(BossModule module) : Components.ConcentricAOEs(module, _shapes) diff --git a/BossMod/Modules/Dawntrail/Dungeon/D07TenderValley/D072Anthracite.cs b/BossMod/Modules/Dawntrail/Dungeon/D07TenderValley/D072Anthracite.cs index 2115503e79..5bee004afd 100644 --- a/BossMod/Modules/Dawntrail/Dungeon/D07TenderValley/D072Anthracite.cs +++ b/BossMod/Modules/Dawntrail/Dungeon/D07TenderValley/D072Anthracite.cs @@ -40,7 +40,7 @@ public enum AID : uint ChimneySmack = 38468, // Helper->player, 5.0s cast, single-target, tankbuster } -class Anthrabomb(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 10); +class Anthrabomb(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 10); class Anthrabomb1(BossModule module) : Anthrabomb(module, AID.Anthrabomb1); class Anthrabomb2(BossModule module) : Anthrabomb(module, AID.Anthrabomb2); diff --git a/BossMod/Modules/Dawntrail/Dungeon/D07TenderValley/D073YokHuyAttestant.cs b/BossMod/Modules/Dawntrail/Dungeon/D07TenderValley/D073YokHuyAttestant.cs index 600686d21b..449292da0d 100644 --- a/BossMod/Modules/Dawntrail/Dungeon/D07TenderValley/D073YokHuyAttestant.cs +++ b/BossMod/Modules/Dawntrail/Dungeon/D07TenderValley/D073YokHuyAttestant.cs @@ -30,7 +30,7 @@ public enum TetherID : uint class TectonicShift(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TectonicShift), new AOEShapeCircle(8)); class BoulderToss(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.BoulderToss)); -class SunToss(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SunToss), 6); +class SunToss(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SunToss), 6); class AncientWrath(BossModule module) : Components.GenericAOEs(module) { diff --git a/BossMod/Modules/Dawntrail/Dungeon/D07TenderValley/D074GreatestSerpentOfTural.cs b/BossMod/Modules/Dawntrail/Dungeon/D07TenderValley/D074GreatestSerpentOfTural.cs index 511fb39028..082d5b02be 100644 --- a/BossMod/Modules/Dawntrail/Dungeon/D07TenderValley/D074GreatestSerpentOfTural.cs +++ b/BossMod/Modules/Dawntrail/Dungeon/D07TenderValley/D074GreatestSerpentOfTural.cs @@ -177,7 +177,7 @@ class GreatestLabyrinthRaidwide(BossModule module) : Components.RaidwideCast(mod class GreatestFloodRaidwide(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.GreatestFlood)); class ExaltedWobble(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ExaltedWobble), new AOEShapeCircle(9)); class MisplacedMystery(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MisplacedMystery), new AOEShapeRect(25.5f, 2.5f, 25.5f)); -class GreatTorrent(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GreatTorrentAOE), 6, maxCasts: 10); +class GreatTorrent(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GreatTorrentAOE), 6, maxCasts: 10); class GreatTorrentSpread(BossModule module) : Components.SpreadFromIcon(module, (uint)IconID.Spreadmarker, ActionID.MakeSpell(AID.GreatTorrentSpread), 6, 5.1f); class D074GreatestSerpentOfTuralStates : StateMachineBuilder diff --git a/BossMod/Modules/Dawntrail/Dungeon/D09YuweyawataFieldStation/D091LindblumZaghnal.cs b/BossMod/Modules/Dawntrail/Dungeon/D09YuweyawataFieldStation/D091LindblumZaghnal.cs index 9126ab697a..c2a5a35431 100644 --- a/BossMod/Modules/Dawntrail/Dungeon/D09YuweyawataFieldStation/D091LindblumZaghnal.cs +++ b/BossMod/Modules/Dawntrail/Dungeon/D09YuweyawataFieldStation/D091LindblumZaghnal.cs @@ -72,7 +72,7 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) class LineVoltage1(BossModule module) : LineVoltage(module, AID.LineVoltageNarrow1, 1); class LineVoltage2(BossModule module) : LineVoltage(module, AID.LineVoltageNarrow2, 2, AID.LineVoltageWide1, AID.LineVoltageWide2); -class LightningBolt(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LightningBolt), 6); +class LightningBolt(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LightningBolt), 6); class LightningStorm(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.LightningStorm), 5); class ElectricalOverload(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.ElectricalOverload)); class SparkingFissure(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.SparkingFissure)); diff --git a/BossMod/Modules/Dawntrail/Dungeon/D09YuweyawataFieldStation/D093Lunipyati.cs b/BossMod/Modules/Dawntrail/Dungeon/D09YuweyawataFieldStation/D093Lunipyati.cs index 3d2f6bcd23..7d4f4bc5d1 100644 --- a/BossMod/Modules/Dawntrail/Dungeon/D09YuweyawataFieldStation/D093Lunipyati.cs +++ b/BossMod/Modules/Dawntrail/Dungeon/D09YuweyawataFieldStation/D093Lunipyati.cs @@ -132,7 +132,7 @@ class JaggedEdge(BossModule module) : Components.SpreadFromCastTargets(module, A class TuraliStoneIV(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.TuraliStoneIV), 6, 4, 4); class LeporineLoaf(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.LeporineLoaf)); class BeastlyRoarRaidwide(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.BeastlyRoar)); -class BeastlyRoar(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BeastlyRoar), 25); +class BeastlyRoar(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BeastlyRoar), 25); class SonicHowl(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.SonicHowl)); class Slabber(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Slabber)); diff --git a/BossMod/Modules/Dawntrail/Dungeon/D09YuweyawataFieldStation/D90ForestWoolback.cs b/BossMod/Modules/Dawntrail/Dungeon/D09YuweyawataFieldStation/D90ForestWoolback.cs index 9158cbd445..488a1219e0 100644 --- a/BossMod/Modules/Dawntrail/Dungeon/D09YuweyawataFieldStation/D90ForestWoolback.cs +++ b/BossMod/Modules/Dawntrail/Dungeon/D09YuweyawataFieldStation/D90ForestWoolback.cs @@ -17,7 +17,7 @@ public enum AID : uint } class SweepingGouge(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SweepingGouge), new AOEShapeCone(9, 45.Degrees())); -class Thunderball(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Thunderball), 8); +class Thunderball(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Thunderball), 8); class D90ForestWoolbackStates : StateMachineBuilder { diff --git a/BossMod/Modules/Dawntrail/Dungeon/D09YuweyawataFieldStation/D90StationSpecter.cs b/BossMod/Modules/Dawntrail/Dungeon/D09YuweyawataFieldStation/D90StationSpecter.cs index c42e438e44..53df4df956 100644 --- a/BossMod/Modules/Dawntrail/Dungeon/D09YuweyawataFieldStation/D90StationSpecter.cs +++ b/BossMod/Modules/Dawntrail/Dungeon/D09YuweyawataFieldStation/D90StationSpecter.cs @@ -20,7 +20,7 @@ public enum AID : uint } class GlassPunch(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GlassPunch), new AOEShapeCone(7, 60.Degrees())); -class Catapult(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Catapult), 6); +class Catapult(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Catapult), 6); class D90StationSpecterStates : StateMachineBuilder { diff --git a/BossMod/Modules/Dawntrail/Extreme/Ex1Valigarmanda/Ruinfall.cs b/BossMod/Modules/Dawntrail/Extreme/Ex1Valigarmanda/Ruinfall.cs index 70f3a2fe77..694297affc 100644 --- a/BossMod/Modules/Dawntrail/Extreme/Ex1Valigarmanda/Ruinfall.cs +++ b/BossMod/Modules/Dawntrail/Extreme/Ex1Valigarmanda/Ruinfall.cs @@ -16,4 +16,4 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) } class RuinfallKnockback(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.RuinfallKnockback), 25, kind: Kind.DirForward); -class RuinfallAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RuinfallAOE), 6); +class RuinfallAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RuinfallAOE), 6); diff --git a/BossMod/Modules/Dawntrail/Extreme/Ex1Valigarmanda/Stance.cs b/BossMod/Modules/Dawntrail/Extreme/Ex1Valigarmanda/Stance.cs index f67f26d0f1..a3c5663ca8 100644 --- a/BossMod/Modules/Dawntrail/Extreme/Ex1Valigarmanda/Stance.cs +++ b/BossMod/Modules/Dawntrail/Extreme/Ex1Valigarmanda/Stance.cs @@ -69,4 +69,4 @@ public override void OnActorCreated(Actor actor) } } -class CracklingCataclysm(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.CracklingCataclysm), 6); +class CracklingCataclysm(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.CracklingCataclysm), 6); diff --git a/BossMod/Modules/Dawntrail/Extreme/Ex1Valigarmanda/VolcanicDrop.cs b/BossMod/Modules/Dawntrail/Extreme/Ex1Valigarmanda/VolcanicDrop.cs index 2abe868962..8c897104a2 100644 --- a/BossMod/Modules/Dawntrail/Extreme/Ex1Valigarmanda/VolcanicDrop.cs +++ b/BossMod/Modules/Dawntrail/Extreme/Ex1Valigarmanda/VolcanicDrop.cs @@ -22,4 +22,4 @@ public override void OnEventEnvControl(byte index, uint state) } } -class VolcanicDropPuddle(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.VolcanicDropPuddle), 2); +class VolcanicDropPuddle(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.VolcanicDropPuddle), 2); diff --git a/BossMod/Modules/Dawntrail/Extreme/Ex3QueenEternal/AbsoluteAuthority.cs b/BossMod/Modules/Dawntrail/Extreme/Ex3QueenEternal/AbsoluteAuthority.cs index 1730e7d294..af07686e4a 100644 --- a/BossMod/Modules/Dawntrail/Extreme/Ex3QueenEternal/AbsoluteAuthority.cs +++ b/BossMod/Modules/Dawntrail/Extreme/Ex3QueenEternal/AbsoluteAuthority.cs @@ -1,6 +1,6 @@ namespace BossMod.Dawntrail.Extreme.Ex3QueenEternal; -class AbsoluteAuthorityPuddles(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AbsoluteAuthorityPuddlesAOE), 8); +class AbsoluteAuthorityPuddles(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AbsoluteAuthorityPuddlesAOE), 8); class AbsoluteAuthorityExpansionBoot(BossModule module) : Components.UniformStackSpread(module, 6, 15, 4, alwaysShowSpreads: true) // TODO: verify falloff { diff --git a/BossMod/Modules/Dawntrail/FATE/MicaTheMagicalMu.cs b/BossMod/Modules/Dawntrail/FATE/MicaTheMagicalMu.cs index 648c6a08bd..c74bbfa9e2 100644 --- a/BossMod/Modules/Dawntrail/FATE/MicaTheMagicalMu.cs +++ b/BossMod/Modules/Dawntrail/FATE/MicaTheMagicalMu.cs @@ -243,7 +243,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) } class MagicalHat(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TwinkleToss), new AOEShapeRect(21, 2.5f, 21), 4); -class Shimmerstorm(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ShimmerstormAOE), 6); +class Shimmerstorm(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ShimmerstormAOE), 6); class Shimmerstrike(BossModule module) : Components.BaitAwayCast(module, ActionID.MakeSpell(AID.ShimmerstrikeAOE), new AOEShapeCircle(6), true); class SparkOfImagination(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.SparkOfImaginationAOE)); diff --git a/BossMod/Modules/Dawntrail/FATE/TheSerpentlordSeethes/Ttokrrone.cs b/BossMod/Modules/Dawntrail/FATE/TheSerpentlordSeethes/Ttokrrone.cs index e38bf9f8ae..a47e275b7a 100644 --- a/BossMod/Modules/Dawntrail/FATE/TheSerpentlordSeethes/Ttokrrone.cs +++ b/BossMod/Modules/Dawntrail/FATE/TheSerpentlordSeethes/Ttokrrone.cs @@ -76,7 +76,7 @@ public enum AID : uint RightwardSandspoutDDVisual = 37325 // Boss->self, no cast, single-target } -class Devour(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Devour), 8); +class Devour(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Devour), 8); class Touchdown(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Touchdown)); class TtokrroneStates : StateMachineBuilder diff --git a/BossMod/Modules/Dawntrail/Hunt/RankA/CatsEye.cs b/BossMod/Modules/Dawntrail/Hunt/RankA/CatsEye.cs index b25de06ce7..29d567e1e9 100644 --- a/BossMod/Modules/Dawntrail/Hunt/RankA/CatsEye.cs +++ b/BossMod/Modules/Dawntrail/Hunt/RankA/CatsEye.cs @@ -17,9 +17,9 @@ public enum AID : uint BloodshotGaze2 = 39668, // Boss->players, 5.0s cast, range 8 circle, inverted. } -class CatsEye1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.CatsEye1), 40); +class CatsEye1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.CatsEye1), 40); -class CatsEye2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.CatsEye2), 40); +class CatsEye2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.CatsEye2), 40); class CatsEye1Gaze(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.CatsEye1)) { diff --git a/BossMod/Modules/Dawntrail/Hunt/RankA/Heshuala.cs b/BossMod/Modules/Dawntrail/Hunt/RankA/Heshuala.cs index af1ace68e8..93f2ea748e 100644 --- a/BossMod/Modules/Dawntrail/Hunt/RankA/Heshuala.cs +++ b/BossMod/Modules/Dawntrail/Hunt/RankA/Heshuala.cs @@ -117,7 +117,7 @@ public override void Update() } } -class LightningBolt(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LightningBolt), 5); +class LightningBolt(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LightningBolt), 5); class ElectricalOverload(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.ElectricalOverload)); class HeshualaStates : StateMachineBuilder diff --git a/BossMod/Modules/Dawntrail/Hunt/RankA/Keheniheyamewi.cs b/BossMod/Modules/Dawntrail/Hunt/RankA/Keheniheyamewi.cs index c3297a2d7c..c2498c00cd 100644 --- a/BossMod/Modules/Dawntrail/Hunt/RankA/Keheniheyamewi.cs +++ b/BossMod/Modules/Dawntrail/Hunt/RankA/Keheniheyamewi.cs @@ -146,7 +146,7 @@ public override void AddHints(int slot, Actor actor, TextHints hints) } class MalignantMucus(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.MalignantMucus)); -class PoisonMucus(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.PoisonMucus), 6); +class PoisonMucus(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.PoisonMucus), 6); class KeheniheyamewiStates : StateMachineBuilder { diff --git a/BossMod/Modules/Dawntrail/Hunt/RankA/SallyTheSweeper.cs b/BossMod/Modules/Dawntrail/Hunt/RankA/SallyTheSweeper.cs index cb3b1d8d8e..af2680d065 100644 --- a/BossMod/Modules/Dawntrail/Hunt/RankA/SallyTheSweeper.cs +++ b/BossMod/Modules/Dawntrail/Hunt/RankA/SallyTheSweeper.cs @@ -22,7 +22,7 @@ public enum AID : uint ReverseCode2 = 38459, // Boss->self, 5.0s cast } -class TargetedAdvance(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TargetedAdvance), 18); +class TargetedAdvance(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TargetedAdvance), 18); class CodeExecution(BossModule module) : Components.GenericAOEs(module) { diff --git a/BossMod/Modules/Dawntrail/Hunt/RankS/CrystalIncarnation.cs b/BossMod/Modules/Dawntrail/Hunt/RankS/CrystalIncarnation.cs index f82f51f0c9..d36a8486a9 100644 --- a/BossMod/Modules/Dawntrail/Hunt/RankS/CrystalIncarnation.cs +++ b/BossMod/Modules/Dawntrail/Hunt/RankS/CrystalIncarnation.cs @@ -12,7 +12,7 @@ public enum AID : uint BlizzardII = 39624 // Boss->self, 5.0s cast, range 40 45-degree cone } -class FireII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FireII), 5); +class FireII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FireII), 5); class BlizzardII(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BlizzardII), new AOEShapeCone(40, 22.5f.Degrees())); class CrystalIncarnationStates : StateMachineBuilder diff --git a/BossMod/Modules/Dawntrail/Hunt/RankS/TheForecaster.cs b/BossMod/Modules/Dawntrail/Hunt/RankS/TheForecaster.cs index 0994898eaa..28970bd1fc 100644 --- a/BossMod/Modules/Dawntrail/Hunt/RankS/TheForecaster.cs +++ b/BossMod/Modules/Dawntrail/Hunt/RankS/TheForecaster.cs @@ -37,7 +37,7 @@ public enum AID : uint ClimateChangeStatusEffect = 39133 // Boss->self, no cast, single-target } -class FloodConditions(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FloodConditions), 6); +class FloodConditions(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FloodConditions), 6); class GaleForceWinds(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GaleForceWinds), new AOEShapeRect(40, 20)); class Hyperelectricity(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Hyperelectricity), new AOEShapeCircle(10)); class WildfireConditions(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.WildfireConditions), new AOEShapeDonut(5, 40)); diff --git a/BossMod/Modules/Dawntrail/Quest/JobQuests/Pictomancer/MindOverManor.cs b/BossMod/Modules/Dawntrail/Quest/JobQuests/Pictomancer/MindOverManor.cs index 85815cf027..be128bf51c 100644 --- a/BossMod/Modules/Dawntrail/Quest/JobQuests/Pictomancer/MindOverManor.cs +++ b/BossMod/Modules/Dawntrail/Quest/JobQuests/Pictomancer/MindOverManor.cs @@ -20,7 +20,7 @@ public enum AID : uint class JitteringGlare(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.JitteringGlare), new AOEShapeCone(40, 15.Degrees())); class GyratingGlare(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.GyratingGlare)); -abstract class Rubble(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 10); +abstract class Rubble(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 10); class RubbleRouse(BossModule module) : Rubble(module, AID.RubbleRouse); class RockAndRefrain1(BossModule module) : Rubble(module, AID.RockAndRefrain1); class RockAndRefrain2(BossModule module) : Rubble(module, AID.RockAndRefrain2); diff --git a/BossMod/Modules/Dawntrail/Quest/JobQuests/Pictomancer/SomewhereOnlySheKnows/FlightOfTheGriffin.cs b/BossMod/Modules/Dawntrail/Quest/JobQuests/Pictomancer/SomewhereOnlySheKnows/FlightOfTheGriffin.cs index bd0a291801..4aee2cb844 100644 --- a/BossMod/Modules/Dawntrail/Quest/JobQuests/Pictomancer/SomewhereOnlySheKnows/FlightOfTheGriffin.cs +++ b/BossMod/Modules/Dawntrail/Quest/JobQuests/Pictomancer/SomewhereOnlySheKnows/FlightOfTheGriffin.cs @@ -17,7 +17,7 @@ public enum AID : uint FervidPulse = 37521, // Boss->self, 5.0s cast, range 50 width 14 cross } -class SwoopingFrenzy(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SwoopingFrenzy), 12); +class SwoopingFrenzy(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SwoopingFrenzy), 12); class Feathercut(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Feathercut), new AOEShapeRect(10, 2.5f)); class FrigidPulse(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.FrigidPulse), new AOEShapeDonut(12, 60)); class FervidPulse(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.FervidPulse), new AOEShapeCross(50, 7)); diff --git a/BossMod/Modules/Dawntrail/Quest/JobQuests/Viper/VengeanceOfTheViper.cs b/BossMod/Modules/Dawntrail/Quest/JobQuests/Viper/VengeanceOfTheViper.cs index 257e92ff76..27ab979d49 100644 --- a/BossMod/Modules/Dawntrail/Quest/JobQuests/Viper/VengeanceOfTheViper.cs +++ b/BossMod/Modules/Dawntrail/Quest/JobQuests/Viper/VengeanceOfTheViper.cs @@ -53,7 +53,7 @@ public enum AID : uint class Razorwind(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.Razorwind), 7, 2, 2); class Explosion(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Explosion), new AOEShapeCircle(15)); -class SwoopingFrenzy1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SwoopingFrenzy1), 15); +class SwoopingFrenzy1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SwoopingFrenzy1), 15); class SwoopingFrenzy2(BossModule module) : Components.GenericAOEs(module) { private readonly List _aoes = []; @@ -74,7 +74,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) } } -class BrutalStroke(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BrutalStroke), 25); +class BrutalStroke(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BrutalStroke), 25); class CatchingChaos(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.CatchingChaos)); class Galeripper(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Galeripper), new AOEShapeCone(60, 45.Degrees())); diff --git a/BossMod/Modules/Dawntrail/Quest/MSQ/AFatherFirst.cs b/BossMod/Modules/Dawntrail/Quest/MSQ/AFatherFirst.cs index b036f9204d..48c43e79db 100644 --- a/BossMod/Modules/Dawntrail/Quest/MSQ/AFatherFirst.cs +++ b/BossMod/Modules/Dawntrail/Quest/MSQ/AFatherFirst.cs @@ -163,7 +163,7 @@ class FancyBladework(BossModule module) : Components.RaidwideCast(module, Action class GloryBlaze(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GloryBlaze), new AOEShapeRect(40, 3)); class BattleBreaker(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.BattleBreaker)); -abstract class MorningStars(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 4); +abstract class MorningStars(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 4); class MorningStars1(BossModule module) : MorningStars(module, AID.MorningStars1); class MorningStars2(BossModule module) : MorningStars(module, AID.MorningStars2); diff --git a/BossMod/Modules/Dawntrail/Quest/MSQ/TakingAStand.cs b/BossMod/Modules/Dawntrail/Quest/MSQ/TakingAStand.cs index 4e6e776d29..8671236103 100644 --- a/BossMod/Modules/Dawntrail/Quest/MSQ/TakingAStand.cs +++ b/BossMod/Modules/Dawntrail/Quest/MSQ/TakingAStand.cs @@ -190,9 +190,9 @@ class Roar2(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSp class RunThrough1(BossModule module) : RunThrough(module, AID.RunThrough1); class RunThrough2(BossModule module) : RunThrough(module, AID.RunThrough2); -class Fireflood(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Fireflood), 18); -class TuraliStoneIII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TuraliStoneIII), 4); -class TuraliQuake(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TuraliQuake), 9, maxCasts: 5); +class Fireflood(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Fireflood), 18); +class TuraliStoneIII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TuraliStoneIII), 4); +class TuraliQuake(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TuraliQuake), 9, maxCasts: 5); class TakingAStandStates : StateMachineBuilder { diff --git a/BossMod/Modules/Dawntrail/Quest/MSQ/TheFeatOfBrotherhood.cs b/BossMod/Modules/Dawntrail/Quest/MSQ/TheFeatOfBrotherhood.cs index a6e6b19110..3a4ef2e703 100644 --- a/BossMod/Modules/Dawntrail/Quest/MSQ/TheFeatOfBrotherhood.cs +++ b/BossMod/Modules/Dawntrail/Quest/MSQ/TheFeatOfBrotherhood.cs @@ -211,7 +211,7 @@ class RoaringStar(BossModule module) : Components.RaidwideCast(module, ActionID. class CoiledStrike(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.CoiledStrike), new AOEShapeCone(30, 75.Degrees())); class Burn(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Burn), new AOEShapeRect(46, 2.5f), 8); class FallenStar(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.FallenStar), 6); -class FirstLight(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FirstLight), 6); +class FirstLight(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FirstLight), 6); class InnerWake(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.InnerWake), new AOEShapeCircle(10)); class OuterWake(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.OuterWake), new AOEShapeDonut(6, 40)); class BattleBreaker(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.BattleBreaker)); diff --git a/BossMod/Modules/Dawntrail/Quest/MSQ/TheProtectorAndTheDestroyer/E2Gwyddrud.cs b/BossMod/Modules/Dawntrail/Quest/MSQ/TheProtectorAndTheDestroyer/E2Gwyddrud.cs index 46e11efa71..548941cf7f 100644 --- a/BossMod/Modules/Dawntrail/Quest/MSQ/TheProtectorAndTheDestroyer/E2Gwyddrud.cs +++ b/BossMod/Modules/Dawntrail/Quest/MSQ/TheProtectorAndTheDestroyer/E2Gwyddrud.cs @@ -150,7 +150,7 @@ public override IEnumerable ActiveAOEs(int slot, Actor actor) } } -class RoaringBolt(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RoaringBolt), 6); +class RoaringBolt(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RoaringBolt), 6); class UntamedCurrentSpread(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.UntamedCurrentSpread), 5); class UntamedCurrentStack(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.UntamedCurrentStack), 6); diff --git a/BossMod/Modules/Dawntrail/Quest/MSQ/TheWarmthOfTheFamily/Tturuhhetso.cs b/BossMod/Modules/Dawntrail/Quest/MSQ/TheWarmthOfTheFamily/Tturuhhetso.cs index dab088e2cd..f2aa29fc4f 100644 --- a/BossMod/Modules/Dawntrail/Quest/MSQ/TheWarmthOfTheFamily/Tturuhhetso.cs +++ b/BossMod/Modules/Dawntrail/Quest/MSQ/TheWarmthOfTheFamily/Tturuhhetso.cs @@ -81,7 +81,7 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme } class SearingSwell(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SearingSwell), new AOEShapeCone(40, 22.5f.Degrees())); -class Ensnare(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Ensnare), 6); +class Ensnare(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Ensnare), 6); class TriceraSnare(BossModule module) : Components.SpreadFromIcon(module, (uint)IconID.Spreadmarker, ActionID.MakeSpell(AID.TriceraSnare), 6, 4.7f) { public override void OnEventDirectorUpdate(uint updateID, uint param1, uint param2, uint param3, uint param4) diff --git a/BossMod/Modules/Dawntrail/Quest/RoleQuests/AHunterTrue.cs b/BossMod/Modules/Dawntrail/Quest/RoleQuests/AHunterTrue.cs index ad8d6d11c6..ae022a4ec4 100644 --- a/BossMod/Modules/Dawntrail/Quest/RoleQuests/AHunterTrue.cs +++ b/BossMod/Modules/Dawntrail/Quest/RoleQuests/AHunterTrue.cs @@ -86,7 +86,7 @@ class RushBait(BossModule module) : Components.BaitAwayChargeTether(module, 4, 8 class RushLineStack(BossModule module) : Components.LineStack(module, ActionID.MakeSpell(AID.RushLineStackMarker), ActionID.MakeSpell(AID.RushLineStack), 4.9f, markerIsFinalTarget: false); class Trample(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Trample), new AOEShapeCircle(15)); -class FallingDusk(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FallingDusk), 15) +class FallingDusk(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FallingDusk), 15) { public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { diff --git a/BossMod/Modules/Dawntrail/Quest/RoleQuests/HeroesAndPretenders.cs b/BossMod/Modules/Dawntrail/Quest/RoleQuests/HeroesAndPretenders.cs index beb660a259..a43667b886 100644 --- a/BossMod/Modules/Dawntrail/Quest/RoleQuests/HeroesAndPretenders.cs +++ b/BossMod/Modules/Dawntrail/Quest/RoleQuests/HeroesAndPretenders.cs @@ -37,8 +37,8 @@ public enum AID : uint Visual = 37473 // Boss->self, no cast, single-target } -class FledglingFury(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FledglingFury), 4); -class PromisedFall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.PromisedFall), 13); +class FledglingFury(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FledglingFury), 4); +class PromisedFall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.PromisedFall), 13); class GoldDust(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.GoldDust), 8, 2, 2); class AcidRain(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.AcidRain), 8); class UnboundArrow(BossModule module) : Components.BaitAwayCast(module, ActionID.MakeSpell(AID.UnboundArrow), new AOEShapeCircle(5), true) diff --git a/BossMod/Modules/Dawntrail/Raid/M02NHoneyBLovely/M02NHoneyBLovely.cs b/BossMod/Modules/Dawntrail/Raid/M02NHoneyBLovely/M02NHoneyBLovely.cs index bb7acd0241..6c28cea087 100644 --- a/BossMod/Modules/Dawntrail/Raid/M02NHoneyBLovely/M02NHoneyBLovely.cs +++ b/BossMod/Modules/Dawntrail/Raid/M02NHoneyBLovely/M02NHoneyBLovely.cs @@ -38,9 +38,9 @@ public override IEnumerable ActiveAOEs(int slot, Actor actor) } class BlindingLove2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BlindingLove2), new AOEShapeRect(50, 4)); -class HeartStruck1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeartStruck1), 4); -class HeartStruck2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeartStruck2), 6); -class HeartStruck3(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeartStruck3), 10, maxCasts: 8); +class HeartStruck1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeartStruck1), 4); +class HeartStruck2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeartStruck2), 6); +class HeartStruck3(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeartStruck3), 10, maxCasts: 8); class Fracture(BossModule module) : Components.CastTowers(module, ActionID.MakeSpell(AID.Fracture), 4) { diff --git a/BossMod/Modules/Dawntrail/Raid/M04NWickedThunder/M04NWickedThunder.cs b/BossMod/Modules/Dawntrail/Raid/M04NWickedThunder/M04NWickedThunder.cs index dae3da8f04..c0d628d1d0 100644 --- a/BossMod/Modules/Dawntrail/Raid/M04NWickedThunder/M04NWickedThunder.cs +++ b/BossMod/Modules/Dawntrail/Raid/M04NWickedThunder/M04NWickedThunder.cs @@ -13,7 +13,7 @@ class WickedBolt(BossModule module) : Components.StackWithIcon(module, (uint)Ico class SoaringSoulpress(BossModule module) : Components.StackWithIcon(module, (uint)IconID.SoaringSoulpress, ActionID.MakeSpell(AID.SoaringSoulpress), 6, 5.4f, 8, 8); class WrathOfZeus(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.WrathOfZeus)); class BewitchingFlight(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BewitchingFlight), new AOEShapeRect(40, 2.5f)); -class Thunderslam(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Thunderslam), 5); +class Thunderslam(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Thunderslam), 5); class Thunderstorm(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.Thunderstorm), 6); [ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "The Combat Reborn Team (Malediktus, LTS)", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 991, NameID = 13057)] diff --git a/BossMod/Modules/Dawntrail/Savage/M02SHoneyBLovely/HoneyBLiveBeat.cs b/BossMod/Modules/Dawntrail/Savage/M02SHoneyBLovely/HoneyBLiveBeat.cs index 7fe58fc8e7..b2864f99e6 100644 --- a/BossMod/Modules/Dawntrail/Savage/M02SHoneyBLovely/HoneyBLiveBeat.cs +++ b/BossMod/Modules/Dawntrail/Savage/M02SHoneyBLovely/HoneyBLiveBeat.cs @@ -101,7 +101,7 @@ public Fracture3(BossModule module) : base(module) } class Loveseeker(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.LoveseekerAOE), new AOEShapeCircle(10)); -class HeartStruck(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeartStruck), 6); +class HeartStruck(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeartStruck), 6); class Heartsore(BossModule module) : Components.SpreadFromIcon(module, (uint)IconID.Heartsore, ActionID.MakeSpell(AID.Heartsore), 6, 7.1f); class SweetheartsS(BossModule module) : Raid.M02NHoneyBLovely.Sweethearts(module, (uint)OID.Sweetheart, (uint)AID.SweetheartTouch); diff --git a/BossMod/Modules/Dawntrail/Savage/M04SWickedThunder/TwilightSabbath.cs b/BossMod/Modules/Dawntrail/Savage/M04SWickedThunder/TwilightSabbath.cs index 1735234338..5eac88b746 100644 --- a/BossMod/Modules/Dawntrail/Savage/M04SWickedThunder/TwilightSabbath.cs +++ b/BossMod/Modules/Dawntrail/Savage/M04SWickedThunder/TwilightSabbath.cs @@ -1,6 +1,6 @@ namespace BossMod.Dawntrail.Savage.M04SWickedThunder; -class WickedFire(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.WickedFireAOE), 10); +class WickedFire(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.WickedFireAOE), 10); class TwilightSabbath(BossModule module) : Components.GenericAOEs(module) { diff --git a/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/BullApollyon.cs b/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/BullApollyon.cs index fa84ab6648..854a722731 100644 --- a/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/BullApollyon.cs +++ b/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/BullApollyon.cs @@ -65,10 +65,10 @@ class CrossfireBlade1(BossModule module) : Crosses(module, AID.CrossfireBlade1); class CrossfireBlade2(BossModule module) : Crosses(module, AID.CrossfireBlade2); class BlazingBreath(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BlazingBreath), new AOEShapeRect(44, 5)); -class BlazingBlast(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BlazingBlast), 6); +class BlazingBlast(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BlazingBlast), 6); class Spin(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Spin), new AOEShapeCircle(11)); -class RottenSpores(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RottenSpores), 6); +class RottenSpores(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RottenSpores), 6); abstract class Mandragoras(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCircle(7)); class PluckAndPrune(BossModule module) : Mandragoras(module, AID.PluckAndPrune); diff --git a/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/GoldenMolter.cs b/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/GoldenMolter.cs index 338e618bc5..2aab69adba 100644 --- a/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/GoldenMolter.cs +++ b/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/GoldenMolter.cs @@ -98,7 +98,7 @@ public override void OnStatusLose(Actor actor, ActorStatus status) } class GoldenGall(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GoldenGall), new AOEShapeCone(40, 90.Degrees())); -class GoldenRadiance(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GoldenRadiance), 5); +class GoldenRadiance(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GoldenRadiance), 5); class BlindingLight(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.BlindingLight), 6); class AetherialLight(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AetherialLight), new AOEShapeCone(40, 30.Degrees()), 4) @@ -132,7 +132,7 @@ public override void OnActorCreated(Actor actor) } class Spin(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Spin), new AOEShapeCircle(11)); -class RottenSpores(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RottenSpores), 6); +class RottenSpores(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RottenSpores), 6); abstract class Mandragoras(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCircle(7)); class PluckAndPrune(BossModule module) : Mandragoras(module, AID.PluckAndPrune); diff --git a/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/Room1.cs b/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/Room1.cs index 5e1967ddac..ba315362ee 100644 --- a/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/Room1.cs +++ b/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/Room1.cs @@ -57,14 +57,14 @@ public enum AID : uint class NepenthicPlunge(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.NepenthicPlunge), new AOEShapeCone(10, 45.Degrees())); class CreepingHush(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.CreepingHush), new AOEShapeCone(12, 60.Degrees())); class Ovation(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Ovation), new AOEShapeRect(14, 2)); -class BestialFire(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BestialFire), 5); +class BestialFire(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BestialFire), 5); class HeadButt(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.HeadButt), new AOEShapeCone(6, 60.Degrees())); class AetherialBlast(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AetherialBlast), new AOEShapeRect(20, 2)); class Envenomate(BossModule module) : Components.BaitAwayChargeCast(module, ActionID.MakeSpell(AID.Envenomate), 1.5f); class SyrupSpout(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SyrupSpout), new AOEShapeCone(10, 60.Degrees())); class SpinningAttack(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SpinningAttack), new AOEShapeRect(10, 2)); -abstract class CircleLoc6(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 6); +abstract class CircleLoc6(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 6); class IsleDrop(BossModule module) : CircleLoc6(module, AID.IsleDrop); class RottenSpores(BossModule module) : CircleLoc6(module, AID.RottenSpores); diff --git a/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/Room2.cs b/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/Room2.cs index 46dd7be9c1..1faa6edcfc 100644 --- a/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/Room2.cs +++ b/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/Room2.cs @@ -56,7 +56,7 @@ public enum AID : uint class GravelShower(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GravelShower), new AOEShapeRect(10, 2)); class Flatten(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Flatten), new AOEShapeCone(8, 45.Degrees())); class PollenCorona(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PollenCorona), new AOEShapeCircle(8)); -class WaterIII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.WaterIII), 8); +class WaterIII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.WaterIII), 8); abstract class Cone1045(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCone(10, 45.Degrees())); class Dissever(BossModule module) : Cone1045(module, AID.Dissever); @@ -66,7 +66,7 @@ class NepenthicPlunge(BossModule module) : Cone1045(module, AID.NepenthicPlunge) class DoubleSmash(BossModule module) : Cone1060(module, AID.DoubleSmash); class CriticalBite(BossModule module) : Cone1060(module, AID.CriticalBite); -abstract class CircleLoc6(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 6); +abstract class CircleLoc6(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 6); class Tornado(BossModule module) : CircleLoc6(module, AID.Tornado); class TornadicSerenade(BossModule module) : CircleLoc6(module, AID.TornadicSerenade); class RottenSpores(BossModule module) : CircleLoc6(module, AID.RottenSpores); diff --git a/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/Room3.cs b/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/Room3.cs index f948dbde81..31cedfa1cd 100644 --- a/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/Room3.cs +++ b/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/Room3.cs @@ -56,17 +56,17 @@ public enum AID : uint class Wingbeat(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Wingbeat), new AOEShapeCone(18, 30.Degrees())); class Feathercut(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Feathercut), new AOEShapeRect(40, 4)); -class GoldDust(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GoldDust), 8); +class GoldDust(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GoldDust), 8); class BloodyCaress(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BloodyCaress), new AOEShapeCone(12, 60.Degrees())); class SwiftSough(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SwiftSough), new AOEShapeCone(13, 30.Degrees())); class FireBreak(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.FireBreak), new AOEShapeCone(8, 45.Degrees())); -abstract class CircleLoc6(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 6); +abstract class CircleLoc6(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 6); class Tornado(BossModule module) : CircleLoc6(module, AID.Tornado); class Incubus(BossModule module) : CircleLoc6(module, AID.Incubus); class RottenSpores(BossModule module) : CircleLoc6(module, AID.RottenSpores); -abstract class CircleLoc5(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 5); +abstract class CircleLoc5(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 5); class FireII(BossModule module) : CircleLoc5(module, AID.FireII); class BitterNectar(BossModule module) : CircleLoc5(module, AID.BitterNectar); diff --git a/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/Room4.cs b/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/Room4.cs index 02712da308..e6442e490d 100644 --- a/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/Room4.cs +++ b/BossMod/Modules/Dawntrail/TreasureHunt/CenoteJaJaGural/Room4.cs @@ -48,7 +48,7 @@ public enum AID : uint Telega = 9630 // BonusAdds->self, no cast, single-target, bonus adds disappear } -abstract class CircleLoc6(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 6); +abstract class CircleLoc6(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 6); class Lumisphere(BossModule module) : CircleLoc6(module, AID.Lumisphere); class Tornado(BossModule module) : CircleLoc6(module, AID.Tornado); class RootsOfAtopy(BossModule module) : CircleLoc6(module, AID.RootsOfAtopy); diff --git a/BossMod/Modules/Dawntrail/Trial/T01Valigarmanda/T01Valigarmanda.cs b/BossMod/Modules/Dawntrail/Trial/T01Valigarmanda/T01Valigarmanda.cs index e8ade0ff35..b1f4daf75d 100644 --- a/BossMod/Modules/Dawntrail/Trial/T01Valigarmanda/T01Valigarmanda.cs +++ b/BossMod/Modules/Dawntrail/Trial/T01Valigarmanda/T01Valigarmanda.cs @@ -48,7 +48,7 @@ class Tulidisaster1(BossModule module) : Tulidisaster(module, AID.Tulidisaster1, class Tulidisaster2(BossModule module) : Tulidisaster(module, AID.Tulidisaster2, 11.6f); class Tulidisaster3(BossModule module) : Tulidisaster(module, AID.Tulidisaster3, 19.6f); -class Eruption(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Eruption), 6); +class Eruption(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Eruption), 6); class IceTalon(BossModule module) : Components.BaitAwayIcon(module, new AOEShapeCircle(6), (uint)IconID.Tankbuster, ActionID.MakeSpell(AID.IceTalon), 5, true) { public override void AddGlobalHints(GlobalHints hints) diff --git a/BossMod/Modules/Dawntrail/Trial/T01Valigarmanda/ThunderPlatform.cs b/BossMod/Modules/Dawntrail/Trial/T01Valigarmanda/ThunderPlatform.cs index 2b1a8b00f1..5dd024c49e 100644 --- a/BossMod/Modules/Dawntrail/Trial/T01Valigarmanda/ThunderPlatform.cs +++ b/BossMod/Modules/Dawntrail/Trial/T01Valigarmanda/ThunderPlatform.cs @@ -106,4 +106,4 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) } } -class BlightedBolt2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BlightedBolt2), 7); \ No newline at end of file +class BlightedBolt2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BlightedBolt2), 7); \ No newline at end of file diff --git a/BossMod/Modules/Dawntrail/Ultimate/FRU/FRU.cs b/BossMod/Modules/Dawntrail/Ultimate/FRU/FRU.cs index ac17b8fcd8..40bb19bd94 100644 --- a/BossMod/Modules/Dawntrail/Ultimate/FRU/FRU.cs +++ b/BossMod/Modules/Dawntrail/Ultimate/FRU/FRU.cs @@ -5,7 +5,7 @@ class P2CrystalOfLight(BossModule module) : Components.Adds(module, (uint)OID.Cr class P3Junction(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.Junction)); class P3BlackHalo(BossModule module) : Components.CastSharedTankbuster(module, ActionID.MakeSpell(AID.BlackHalo), new AOEShapeCone(60, 45.Degrees())); // TODO: verify angle -abstract class P4HallowedWings(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeRect(80, 20)); +abstract class P4HallowedWings(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), new AOEShapeRect(80, 20)); class P4HallowedWingsL(BossModule module) : P4HallowedWings(module, AID.HallowedWingsL); class P4HallowedWingsR(BossModule module) : P4HallowedWings(module, AID.HallowedWingsR); diff --git a/BossMod/Modules/Dawntrail/Ultimate/FRU/P2AbsoluteZero.cs b/BossMod/Modules/Dawntrail/Ultimate/FRU/P2AbsoluteZero.cs index 7e3790a245..7fdd1a7166 100644 --- a/BossMod/Modules/Dawntrail/Ultimate/FRU/P2AbsoluteZero.cs +++ b/BossMod/Modules/Dawntrail/Ultimate/FRU/P2AbsoluteZero.cs @@ -13,5 +13,5 @@ public override IEnumerable Sources(int slot, Actor actor) } class P2SinboundBlizzard(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SinboundBlizzardAOE), new AOEShapeCone(50, 10.Degrees())); -class P2HiemalStorm(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HiemalStormAOE), 7); +class P2HiemalStorm(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HiemalStormAOE), 7); class P2HiemalRay(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 4, ActionID.MakeSpell(AID.HiemalRay), module => module.Enemies(OID.HiemalRayVoidzone).Where(z => z.EventState != 7), 0.7f); diff --git a/BossMod/Modules/Endwalker/Alliance/A10RhalgrEmissary/A10RhalgrEmissary.cs b/BossMod/Modules/Endwalker/Alliance/A10RhalgrEmissary/A10RhalgrEmissary.cs index 9c6d95b8f3..25b0ce8fb5 100644 --- a/BossMod/Modules/Endwalker/Alliance/A10RhalgrEmissary/A10RhalgrEmissary.cs +++ b/BossMod/Modules/Endwalker/Alliance/A10RhalgrEmissary/A10RhalgrEmissary.cs @@ -1,7 +1,7 @@ namespace BossMod.Endwalker.Alliance.A10RhalgrEmissary; class DestructiveStatic(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DestructiveStatic), new AOEShapeCone(50, 90.Degrees())); -class LightningBolt(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LightningBoltAOE), 6); +class LightningBolt(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LightningBoltAOE), 6); class BoltsFromTheBlue(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.BoltsFromTheBlueAOE)); class DestructiveStrike(BossModule module) : Components.BaitAwayCast(module, ActionID.MakeSpell(AID.DestructiveStrike), new AOEShapeCone(13, 60.Degrees())); // TODO: verify angle diff --git a/BossMod/Modules/Endwalker/Alliance/A11Byregot/ByregotStrike.cs b/BossMod/Modules/Endwalker/Alliance/A11Byregot/ByregotStrike.cs index ba6a121811..2edbd74f02 100644 --- a/BossMod/Modules/Endwalker/Alliance/A11Byregot/ByregotStrike.cs +++ b/BossMod/Modules/Endwalker/Alliance/A11Byregot/ByregotStrike.cs @@ -1,7 +1,7 @@ namespace BossMod.Endwalker.Alliance.A11Byregot; -class ByregotStrikeJump(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ByregotStrikeJump), 8); -class ByregotStrikeJumpCone(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ByregotStrikeJumpCone), 8); +class ByregotStrikeJump(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ByregotStrikeJump), 8); +class ByregotStrikeJumpCone(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ByregotStrikeJumpCone), 8); class ByregotStrikeKnockback(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.ByregotStrikeKnockback), 18); class ByregotStrikeCone(BossModule module) : Components.GenericAOEs(module) diff --git a/BossMod/Modules/Endwalker/Alliance/A12Rhalgr/A12Rhalgr.cs b/BossMod/Modules/Endwalker/Alliance/A12Rhalgr/A12Rhalgr.cs index c5be7be694..d12768f3db 100644 --- a/BossMod/Modules/Endwalker/Alliance/A12Rhalgr/A12Rhalgr.cs +++ b/BossMod/Modules/Endwalker/Alliance/A12Rhalgr/A12Rhalgr.cs @@ -1,7 +1,7 @@ namespace BossMod.Endwalker.Alliance.A12Rhalgr; class DestructiveBolt(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.DestructiveBoltAOE), 3); -class StrikingMeteor(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.StrikingMeteor), 6); +class StrikingMeteor(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.StrikingMeteor), 6); class BronzeLightning(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BronzeLightning), new AOEShapeCone(50, 22.5f.Degrees()), 4); [ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "Malediktus", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 866, NameID = 11273, SortOrder = 3)] diff --git a/BossMod/Modules/Endwalker/Alliance/A13Azeyma/A13Azeyma.cs b/BossMod/Modules/Endwalker/Alliance/A13Azeyma/A13Azeyma.cs index 2ff4997a52..67c4ebc373 100644 --- a/BossMod/Modules/Endwalker/Alliance/A13Azeyma/A13Azeyma.cs +++ b/BossMod/Modules/Endwalker/Alliance/A13Azeyma/A13Azeyma.cs @@ -4,7 +4,7 @@ class WardensWarmth(BossModule module) : Components.SpreadFromCastTargets(module class FleetingSpark(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.FleetingSpark), new AOEShapeCone(60, 135.Degrees())); class SolarFold(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SolarFoldAOE), new AOEShapeCross(30, 5)); class Sunbeam(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Sunbeam), new AOEShapeCircle(9), 14); -class SublimeSunset(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SublimeSunsetAOE), 40); // TODO: check falloff +class SublimeSunset(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SublimeSunsetAOE), 40); // TODO: check falloff [ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "Malediktus", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 866, NameID = 11277, SortOrder = 5)] public class A13Azeyma(WorldState ws, Actor primary) : BossModule(ws, primary, NormalCenter, NormalBounds) diff --git a/BossMod/Modules/Endwalker/Alliance/A21Nophica/A21Nophica.cs b/BossMod/Modules/Endwalker/Alliance/A21Nophica/A21Nophica.cs index 74c777600e..fcaf954457 100644 --- a/BossMod/Modules/Endwalker/Alliance/A21Nophica/A21Nophica.cs +++ b/BossMod/Modules/Endwalker/Alliance/A21Nophica/A21Nophica.cs @@ -28,7 +28,7 @@ class FloralHaze(BossModule module) : Components.StatusDrivenForcedMarch(module, class SummerShade(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SummerShade), new AOEShapeDonut(12, 40)); class SpringFlowers(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SpringFlowers), new AOEShapeCircle(12)); class ReapersGale(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ReapersGaleAOE), new AOEShapeRect(36, 4, 36), 9); -class Landwaker(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LandwakerAOE), 10); +class Landwaker(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LandwakerAOE), 10); class Furrow(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.Furrow), 6, 8); class HeavensEarth(BossModule module) : Components.BaitAwayCast(module, ActionID.MakeSpell(AID.HeavensEarthAOE), new AOEShapeCircle(5), true); diff --git a/BossMod/Modules/Endwalker/Alliance/A30Trash/A30Trash1.cs b/BossMod/Modules/Endwalker/Alliance/A30Trash/A30Trash1.cs index 96f82e34ca..3d8b6e399d 100644 --- a/BossMod/Modules/Endwalker/Alliance/A30Trash/A30Trash1.cs +++ b/BossMod/Modules/Endwalker/Alliance/A30Trash/A30Trash1.cs @@ -22,7 +22,7 @@ public enum AID : uint DivineBurst = 35441 // DivineSprite->self, no cast, range 40 circle, raidwide when Divine Sprite dies } -class WaterIII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.WaterIII), 8); +class WaterIII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.WaterIII), 8); abstract class PelagicCleaver(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCone(40, 30.Degrees())); class PelagicCleaver1(BossModule module) : PelagicCleaver(module, AID.PelagicCleaver1); diff --git a/BossMod/Modules/Endwalker/Alliance/A32Llymlaen/A32Llymlaen.cs b/BossMod/Modules/Endwalker/Alliance/A32Llymlaen/A32Llymlaen.cs index fd33bc302e..73fc891607 100644 --- a/BossMod/Modules/Endwalker/Alliance/A32Llymlaen/A32Llymlaen.cs +++ b/BossMod/Modules/Endwalker/Alliance/A32Llymlaen/A32Llymlaen.cs @@ -3,9 +3,9 @@ class WindRose(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.WindRose), new AOEShapeCircle(12)); class SeafoamSpiral(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SeafoamSpiral), new AOEShapeDonut(6, 70)); class DeepDiveNormal(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.DeepDiveNormal), 6, 8); -class Stormwhorl(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Stormwhorl), 6); +class Stormwhorl(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Stormwhorl), 6); class Stormwinds(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.Stormwinds), 6); -class Maelstrom(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Maelstrom), 6); +class Maelstrom(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Maelstrom), 6); class Godsbane(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.GodsbaneAOE)); class DeepDiveHardWater(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.DeepDiveHardWater), 6); diff --git a/BossMod/Modules/Endwalker/Alliance/A33Oschon/A33Oschon.cs b/BossMod/Modules/Endwalker/Alliance/A33Oschon/A33Oschon.cs index d047660536..d80f50e9cc 100644 --- a/BossMod/Modules/Endwalker/Alliance/A33Oschon/A33Oschon.cs +++ b/BossMod/Modules/Endwalker/Alliance/A33Oschon/A33Oschon.cs @@ -11,14 +11,14 @@ class P1SoaringMinuet1(BossModule module) : SoaringMinuet(module, AID.SoaringMin class P1SoaringMinuet2(BossModule module) : SoaringMinuet(module, AID.SoaringMinuet2); class P1Arrow(BossModule module) : Components.BaitAwayCast(module, ActionID.MakeSpell(AID.ArrowP1AOE), new AOEShapeCircle(6), true); -class P1Downhill(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DownhillP1AOE), 6); +class P1Downhill(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DownhillP1AOE), 6); class P2MovingMountains(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.MovingMountains)); class P2PeakPeril(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.PeakPeril)); class P2Shockwave(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.Shockwave)); class P2SuddenDownpour(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.P2SuddenDownpourAOE)); -class P2PitonPull(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.PitonPullAOE), 22); -class P2Altitude(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AltitudeAOE), 6); +class P2PitonPull(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.PitonPullAOE), 22); +class P2Altitude(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AltitudeAOE), 6); class P2Arrow(BossModule module) : Components.BaitAwayCast(module, ActionID.MakeSpell(AID.ArrowP2AOE), new AOEShapeCircle(10), true); [ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "Malediktus, LTS", PrimaryActorOID = (uint)OID.BossP1, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 962, NameID = 11300, SortOrder = 4)] diff --git a/BossMod/Modules/Endwalker/Alliance/A33Oschon/P2ArrowTrail.cs b/BossMod/Modules/Endwalker/Alliance/A33Oschon/P2ArrowTrail.cs index 1b7a028333..85a4fa095b 100644 --- a/BossMod/Modules/Endwalker/Alliance/A33Oschon/P2ArrowTrail.cs +++ b/BossMod/Modules/Endwalker/Alliance/A33Oschon/P2ArrowTrail.cs @@ -24,4 +24,4 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) } } -class P2DownhillArrowTrailDownhill(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ArrowTrailDownhill), 6); +class P2DownhillArrowTrailDownhill(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ArrowTrailDownhill), 6); diff --git a/BossMod/Modules/Endwalker/Alliance/A33Oschon/P2WanderingVolley.cs b/BossMod/Modules/Endwalker/Alliance/A33Oschon/P2WanderingVolley.cs index e9e51458ef..c5cc30e224 100644 --- a/BossMod/Modules/Endwalker/Alliance/A33Oschon/P2WanderingVolley.cs +++ b/BossMod/Modules/Endwalker/Alliance/A33Oschon/P2WanderingVolley.cs @@ -1,6 +1,6 @@ namespace BossMod.Endwalker.Alliance.A33Oschon; -class P2WanderingVolleyDownhill(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.WanderingVolleyDownhillAOE), 8); +class P2WanderingVolleyDownhill(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.WanderingVolleyDownhillAOE), 8); class P2WanderingVolleyKnockback(BossModule module) : Components.Knockback(module) { diff --git a/BossMod/Modules/Endwalker/Alliance/A34Eulogia/ByregotStrike.cs b/BossMod/Modules/Endwalker/Alliance/A34Eulogia/ByregotStrike.cs index 82ec109c10..e22a88c3fd 100644 --- a/BossMod/Modules/Endwalker/Alliance/A34Eulogia/ByregotStrike.cs +++ b/BossMod/Modules/Endwalker/Alliance/A34Eulogia/ByregotStrike.cs @@ -1,5 +1,5 @@ namespace BossMod.Endwalker.Alliance.A34Eulogia; -class ByregotStrikeJump(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ByregotStrike), 8); +class ByregotStrikeJump(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ByregotStrike), 8); class ByregotStrikeKnockback(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.ByregotStrikeKnockback), 20); class ByregotStrikeCone(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ByregotStrikeAOE), new AOEShapeCone(90, 22.5f.Degrees())); diff --git a/BossMod/Modules/Endwalker/Criterion/C01ASS/C010Trash/C010Dryad.cs b/BossMod/Modules/Endwalker/Criterion/C01ASS/C010Trash/C010Dryad.cs index 89d1376786..7ca9ace07b 100644 --- a/BossMod/Modules/Endwalker/Criterion/C01ASS/C010Trash/C010Dryad.cs +++ b/BossMod/Modules/Endwalker/Criterion/C01ASS/C010Trash/C010Dryad.cs @@ -25,11 +25,11 @@ public enum AID : uint class NArborealStorm(BossModule module) : ArborealStorm(module, AID.NArborealStorm); class SArborealStorm(BossModule module) : ArborealStorm(module, AID.SArborealStorm); -abstract class AcornBomb(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 6); +abstract class AcornBomb(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 6); class NAcornBomb(BossModule module) : AcornBomb(module, AID.NAcornBomb); class SAcornBomb(BossModule module) : AcornBomb(module, AID.SAcornBomb); -abstract class GelidGale(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 6); +abstract class GelidGale(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 6); class NGelidGale(BossModule module) : GelidGale(module, AID.NGelidGale); class SGelidGale(BossModule module) : GelidGale(module, AID.SGelidGale); diff --git a/BossMod/Modules/Endwalker/Criterion/C01ASS/C013Shadowcaster/C013Shadowcaster.cs b/BossMod/Modules/Endwalker/Criterion/C01ASS/C013Shadowcaster/C013Shadowcaster.cs index 0aff78edbf..299782a033 100644 --- a/BossMod/Modules/Endwalker/Criterion/C01ASS/C013Shadowcaster/C013Shadowcaster.cs +++ b/BossMod/Modules/Endwalker/Criterion/C01ASS/C013Shadowcaster/C013Shadowcaster.cs @@ -4,7 +4,7 @@ class NFiresteelFracture(BossModule module) : FiresteelFracture(module, AID.NFiresteelFracture); class SFiresteelFracture(BossModule module) : FiresteelFracture(module, AID.SFiresteelFracture); -abstract class PureFire(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 6); +abstract class PureFire(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 6); class NPureFire(BossModule module) : PureFire(module, AID.NPureFireAOE); class SPureFire(BossModule module) : PureFire(module, AID.SPureFireAOE); diff --git a/BossMod/Modules/Endwalker/Criterion/C02AMR/C020Trash/C020Fuko.cs b/BossMod/Modules/Endwalker/Criterion/C02AMR/C020Trash/C020Fuko.cs index 3f8cd8c2ac..1114e93e8f 100644 --- a/BossMod/Modules/Endwalker/Criterion/C02AMR/C020Trash/C020Fuko.cs +++ b/BossMod/Modules/Endwalker/Criterion/C02AMR/C020Trash/C020Fuko.cs @@ -1,6 +1,6 @@ namespace BossMod.Endwalker.VariantCriterion.C02AMR.C020Trash1; -abstract class Tornado(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 6); +abstract class Tornado(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 6); class NTornado(BossModule module) : Tornado(module, AID.NTornado); class STornado(BossModule module) : Tornado(module, AID.STornado); diff --git a/BossMod/Modules/Endwalker/Criterion/C02AMR/C021Shishio/LightningBolt.cs b/BossMod/Modules/Endwalker/Criterion/C02AMR/C021Shishio/LightningBolt.cs index 785795e71b..62271b7603 100644 --- a/BossMod/Modules/Endwalker/Criterion/C02AMR/C021Shishio/LightningBolt.cs +++ b/BossMod/Modules/Endwalker/Criterion/C02AMR/C021Shishio/LightningBolt.cs @@ -1,6 +1,6 @@ namespace BossMod.Endwalker.VariantCriterion.C02AMR.C021Shishio; -abstract class LightningBolt(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 6); +abstract class LightningBolt(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 6); class NLightningBolt(BossModule module) : LightningBolt(module, AID.NLightningBoltAOE); class SLightningBolt(BossModule module) : LightningBolt(module, AID.SLightningBoltAOE); diff --git a/BossMod/Modules/Endwalker/Criterion/C03AAI/C030Trash/C030Islekeeper.cs b/BossMod/Modules/Endwalker/Criterion/C03AAI/C030Trash/C030Islekeeper.cs index d604053ff3..b3d7c6613c 100644 --- a/BossMod/Modules/Endwalker/Criterion/C03AAI/C030Trash/C030Islekeeper.cs +++ b/BossMod/Modules/Endwalker/Criterion/C03AAI/C030Trash/C030Islekeeper.cs @@ -4,7 +4,7 @@ abstract class GravityForce(BossModule module, AID aid) : Components.StackWithCa class NGravityForce(BossModule module) : GravityForce(module, AID.NGravityForce); class SGravityForce(BossModule module) : GravityForce(module, AID.SGravityForce); -abstract class IsleDrop(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 6); +abstract class IsleDrop(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 6); class NIsleDrop(BossModule module) : IsleDrop(module, AID.NIsleDrop); class SIsleDrop(BossModule module) : IsleDrop(module, AID.SIsleDrop); diff --git a/BossMod/Modules/Endwalker/Criterion/C03AAI/C030Trash/C030Kiwakin.cs b/BossMod/Modules/Endwalker/Criterion/C03AAI/C030Trash/C030Kiwakin.cs index 29894121e6..d88f848567 100644 --- a/BossMod/Modules/Endwalker/Criterion/C03AAI/C030Trash/C030Kiwakin.cs +++ b/BossMod/Modules/Endwalker/Criterion/C03AAI/C030Trash/C030Kiwakin.cs @@ -10,7 +10,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) } } -abstract class TailScrew(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 4); +abstract class TailScrew(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 4); class NTailScrew(BossModule module) : TailScrew(module, AID.NTailScrew); class STailScrew(BossModule module) : TailScrew(module, AID.STailScrew); diff --git a/BossMod/Modules/Endwalker/Criterion/C03AAI/C031Ketuduke/C031Ketuduke.cs b/BossMod/Modules/Endwalker/Criterion/C03AAI/C031Ketuduke/C031Ketuduke.cs index 69deb941c6..602949e902 100644 --- a/BossMod/Modules/Endwalker/Criterion/C03AAI/C031Ketuduke/C031Ketuduke.cs +++ b/BossMod/Modules/Endwalker/Criterion/C03AAI/C031Ketuduke/C031Ketuduke.cs @@ -10,7 +10,7 @@ class SBubbleNet1(BossModule module) : BubbleNet(module, AID.SBubbleNet1AOE); class NBubbleNet2(BossModule module) : BubbleNet(module, AID.NBubbleNet2AOE); class SBubbleNet2(BossModule module) : BubbleNet(module, AID.SBubbleNet2AOE); -abstract class Hydrobomb(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 5); +abstract class Hydrobomb(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 5); class NHydrobomb(BossModule module) : Hydrobomb(module, AID.NHydrobombAOE); class SHydrobomb(BossModule module) : Hydrobomb(module, AID.SHydrobombAOE); diff --git a/BossMod/Modules/Endwalker/Criterion/C03AAI/C032Lala/ArcanePoint.cs b/BossMod/Modules/Endwalker/Criterion/C03AAI/C032Lala/ArcanePoint.cs index 75fc9622b5..2be9bc4a8b 100644 --- a/BossMod/Modules/Endwalker/Criterion/C03AAI/C032Lala/ArcanePoint.cs +++ b/BossMod/Modules/Endwalker/Criterion/C03AAI/C032Lala/ArcanePoint.cs @@ -55,6 +55,6 @@ abstract class ExplosiveTheorem(BossModule module, AID aid) : Components.SpreadF class NExplosiveTheorem(BossModule module) : ExplosiveTheorem(module, AID.NExplosiveTheoremAOE); class SExplosiveTheorem(BossModule module) : ExplosiveTheorem(module, AID.SExplosiveTheoremAOE); -abstract class TelluricTheorem(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 8); +abstract class TelluricTheorem(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 8); class NTelluricTheorem(BossModule module) : TelluricTheorem(module, AID.NTelluricTheorem); class STelluricTheorem(BossModule module) : TelluricTheorem(module, AID.STelluricTheorem); diff --git a/BossMod/Modules/Endwalker/DeepDungeon/EurekaOrthos/DD30TiamatsClone.cs b/BossMod/Modules/Endwalker/DeepDungeon/EurekaOrthos/DD30TiamatsClone.cs index 48a956f433..545b706143 100644 --- a/BossMod/Modules/Endwalker/DeepDungeon/EurekaOrthos/DD30TiamatsClone.cs +++ b/BossMod/Modules/Endwalker/DeepDungeon/EurekaOrthos/DD30TiamatsClone.cs @@ -28,7 +28,7 @@ public enum IconID : uint } class WheiMorn(BossModule module) : Components.StandardChasingAOEs(module, new AOEShapeCircle(6), ActionID.MakeSpell(AID.WheiMornFirst), ActionID.MakeSpell(AID.WheiMornRest), 6, 2, 5, true, (uint)IconID.ChasingAOE); -class DarkMegaflare(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DarkMegaflare), 6); +class DarkMegaflare(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DarkMegaflare), 6); class DarkWyrm(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeRect(40, 8)); class DarkWyrmwing(BossModule module) : DarkWyrm(module, AID.DarkWyrmwing); diff --git a/BossMod/Modules/Endwalker/DeepDungeon/EurekaOrthos/DD40TwintaniasClone.cs b/BossMod/Modules/Endwalker/DeepDungeon/EurekaOrthos/DD40TwintaniasClone.cs index 9d3e565508..03e4ca7f2b 100644 --- a/BossMod/Modules/Endwalker/DeepDungeon/EurekaOrthos/DD40TwintaniasClone.cs +++ b/BossMod/Modules/Endwalker/DeepDungeon/EurekaOrthos/DD40TwintaniasClone.cs @@ -24,7 +24,7 @@ public enum AID : uint class Twister(BossModule module) : Components.CastTwister(module, 1, (uint)OID.Twister, ActionID.MakeSpell(AID.TwisterVisual), 0.4f, 0.25f); class BitingWind(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 5, ActionID.MakeSpell(AID.BitingWind), m => m.Enemies(OID.BitingWind).Where(z => z.EventState != 7), 0.9f); -class MeracydianSquall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MeracydianSquall), 5); +class MeracydianSquall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MeracydianSquall), 5); class TwistersHint(BossModule module, AID aid) : Components.CastHint(module, ActionID.MakeSpell(aid), "Twisters soon, get moving!"); class Twisters1(BossModule module) : TwistersHint(module, AID.TwisterVisual); diff --git a/BossMod/Modules/Endwalker/DeepDungeon/EurekaOrthos/DD90Administrator.cs b/BossMod/Modules/Endwalker/DeepDungeon/EurekaOrthos/DD90Administrator.cs index f05e2e123a..cf9f13bc4f 100644 --- a/BossMod/Modules/Endwalker/DeepDungeon/EurekaOrthos/DD90Administrator.cs +++ b/BossMod/Modules/Endwalker/DeepDungeon/EurekaOrthos/DD90Administrator.cs @@ -137,7 +137,7 @@ public override IEnumerable ActiveAOEs(int slot, Actor actor) class AetherLaserLine2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AetherochemicalLaserLine2), new AOEShapeRect(40, 2.5f)); class AetherLaserCone(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AetherochemicalLaserCone2), new AOEShapeCone(50, 60.Degrees())); -class HomingLasers(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HomingLaser), 6); +class HomingLasers(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HomingLaser), 6); class Laserstream(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Laserstream)); class DD90AdministratorStates : StateMachineBuilder diff --git a/BossMod/Modules/Endwalker/Dungeon/D01TowerOfZot/D013MagusSisters.cs b/BossMod/Modules/Endwalker/Dungeon/D01TowerOfZot/D013MagusSisters.cs index 569d88bfb4..1c8050c267 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D01TowerOfZot/D013MagusSisters.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D01TowerOfZot/D013MagusSisters.cs @@ -133,8 +133,8 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme class IsitvaSiddhi(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.IsitvaSiddhi)); class Samsara(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Samsara)); -class DeltaThunderIII1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DeltaThunderIII1), 3); -class DeltaThunderIII2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DeltaThunderIII2), 5); +class DeltaThunderIII1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DeltaThunderIII1), 3); +class DeltaThunderIII2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DeltaThunderIII2), 5); class DeltaThunderIII3(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DeltaThunderIII3), new AOEShapeRect(40, 5)); class DeltaThunderIII4(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.DeltaThunderIII4), 5, 4, 4); class DeltaBlizzardIII1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DeltaBlizzardIII1), new AOEShapeCone(40.5f, 10.Degrees())); diff --git a/BossMod/Modules/Endwalker/Dungeon/D02TowerOfBabil/D022Lugae.cs b/BossMod/Modules/Endwalker/Dungeon/D02TowerOfBabil/D022Lugae.cs index 65b78893fe..ad133ccac6 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D02TowerOfBabil/D022Lugae.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D02TowerOfBabil/D022Lugae.cs @@ -93,7 +93,7 @@ public override void AddHints(int slot, Actor actor, TextHints hints) class ThermalSuppression(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.ThermalSuppression)); class MightyRay(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MagitekRay), new AOEShapeRect(50, 3)); class Explosion(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Explosion), new AOEShapeCross(40, 4)); -class SurfaceMissile(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SurfaceMissile), 6); +class SurfaceMissile(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SurfaceMissile), 6); class D022LugaeStates : StateMachineBuilder { diff --git a/BossMod/Modules/Endwalker/Dungeon/D03Vanaspati/D033Svarbhanu.cs b/BossMod/Modules/Endwalker/Dungeon/D03Vanaspati/D033Svarbhanu.cs index e96fde509a..adc1a1843b 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D03Vanaspati/D033Svarbhanu.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D03Vanaspati/D033Svarbhanu.cs @@ -113,7 +113,7 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme } class CosmicKissSpread(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.CosmicKissSpread), 6); -class CosmicKissCircle(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.CosmicKissCircle), 6); +class CosmicKissCircle(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.CosmicKissCircle), 6); class CosmicKissRect(BossModule module) : Components.GenericAOEs(module) { diff --git a/BossMod/Modules/Endwalker/Dungeon/D04KtisisHyperboreia/D043Hermes.cs b/BossMod/Modules/Endwalker/Dungeon/D04KtisisHyperboreia/D043Hermes.cs index 162206296c..f41907c15f 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D04KtisisHyperboreia/D043Hermes.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D04KtisisHyperboreia/D043Hermes.cs @@ -85,7 +85,7 @@ public override void AddGlobalHints(GlobalHints hints) } } -class TrueTornadoAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TrueTornadoAOE), 4); +class TrueTornadoAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TrueTornadoAOE), 4); class TrueAeroFirst(BossModule module) : Components.GenericBaitAway(module) { @@ -102,7 +102,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) class TrueAeroRepeat(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TrueAeroRepeat), new AOEShapeRect(40, 3)); class TrueAeroII2(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.TrueAeroII2), 6); -class TrueAeroII3(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TrueAeroII3), 6); +class TrueAeroII3(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TrueAeroII3), 6); class TrueAeroIV1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TrueAeroIV1), new AOEShapeRect(50, 5)); class TrueAeroIV3(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TrueAeroIV3), new AOEShapeRect(50, 5), 4); diff --git a/BossMod/Modules/Endwalker/Dungeon/D05Aitiascope/D051Livia.cs b/BossMod/Modules/Endwalker/Dungeon/D05Aitiascope/D051Livia.cs index 6f123edd59..69ee7bc808 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D05Aitiascope/D051Livia.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D05Aitiascope/D051Livia.cs @@ -82,7 +82,7 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) class Disparagement(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Disparagement), new AOEShapeCone(40, 60.Degrees())); class IgnisOdi(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.IgnisOdi), 6, 4, 4); -class IgnisAmoris(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.IgnisAmoris), 6); +class IgnisAmoris(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.IgnisAmoris), 6); class Frustration(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Frustration)); class D051LiviaStates : StateMachineBuilder diff --git a/BossMod/Modules/Endwalker/Dungeon/D05Aitiascope/D053Amon.cs b/BossMod/Modules/Endwalker/Dungeon/D05Aitiascope/D053Amon.cs index 17d873ff4e..3f276b349b 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D05Aitiascope/D053Amon.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D05Aitiascope/D053Amon.cs @@ -55,10 +55,10 @@ public override void OnEventEnvControl(byte index, uint state) } class Epode(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Epode), new AOEShapeRect(35, 6, 35)); -class EruptionForte(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.EruptionForte), 8); +class EruptionForte(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.EruptionForte), 8); class LeftFiragaForte(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.LeftFiragaForte), new AOEShapeRect(40, 40, DirectionOffset: 90.Degrees())); class RightFiragaForte(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RightFiragaForte), new AOEShapeRect(40, 40, DirectionOffset: -90.Degrees())); -class ThundagaForte1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ThundagaForte1), 15); +class ThundagaForte1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ThundagaForte1), 15); class DarkForte(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.DarkForte)); class Entracte(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Entracte)); class DreamsOfIce(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DreamsOfIce), new AOEShapeCircle(6)); diff --git a/BossMod/Modules/Endwalker/Dungeon/D06DeadEnds/D061CausticGrebuloff.cs b/BossMod/Modules/Endwalker/Dungeon/D06DeadEnds/D061CausticGrebuloff.cs index 523afde16f..343da6ec97 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D06DeadEnds/D061CausticGrebuloff.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D06DeadEnds/D061CausticGrebuloff.cs @@ -187,7 +187,7 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme class Befoulment(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.Befoulment), 6); class BlightedWater(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.BlightedWater), 6, 4, 4); -class CoughUpAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.CoughUpAOE), 6); +class CoughUpAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.CoughUpAOE), 6); class WaveOfNausea(BossModule module) : Components.GenericAOEs(module) { diff --git a/BossMod/Modules/Endwalker/Dungeon/D07Smileton/D072Frameworker.cs b/BossMod/Modules/Endwalker/Dungeon/D07Smileton/D072Frameworker.cs index ddb7084fd1..b9bf5d5763 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D07Smileton/D072Frameworker.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D07Smileton/D072Frameworker.cs @@ -35,8 +35,8 @@ public enum TetherID : uint class OmnidimensionalOnslaughtAOE(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.OmnidimensionalOnslaughtAOE), new AOEShapeCone(40, 22.5f.Degrees())); -class LeapForward1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LeapForward1), 15); -class LeapForward2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LeapForward2), 15); +class LeapForward1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LeapForward1), 15); +class LeapForward2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LeapForward2), 15); //class SteelBeam(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.SteelBeam)); class CircularSaw(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.CircularSaw)); diff --git a/BossMod/Modules/Endwalker/Dungeon/D07Smileton/D073BigCheese.cs b/BossMod/Modules/Endwalker/Dungeon/D07Smileton/D073BigCheese.cs index 1a4c6a2499..2b2f162c84 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D07Smileton/D073BigCheese.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D07Smileton/D073BigCheese.cs @@ -53,7 +53,7 @@ class ElectricArc(BossModule module) : Components.StackWithCastTargets(module, A class Excavated(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Excavated), new AOEShapeCircle(8)); -class IronKiss(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.IronKiss), 16); +class IronKiss(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.IronKiss), 16); class PiercingMissile(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.PiercingMissile)); diff --git a/BossMod/Modules/Endwalker/Dungeon/D10FellCourt/D103Scarmiglione.cs b/BossMod/Modules/Endwalker/Dungeon/D10FellCourt/D103Scarmiglione.cs index 0379aec61c..98e77bc71d 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D10FellCourt/D103Scarmiglione.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D10FellCourt/D103Scarmiglione.cs @@ -76,7 +76,7 @@ class VacuumWave(BossModule module) : Components.KnockbackFromCastTarget(module, class BlightedBedevilment(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BlightedBedevilment), new AOEShapeCircle(9)); class BlightedBladework2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BlightedBladework2), new AOEShapeCircle(25)); class Nox(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Nox), new AOEShapeCircle(10)); -class RottenRampage2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RottenRampage2), 6); +class RottenRampage2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RottenRampage2), 6); class BlightedSweep(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BlightedSweep), new AOEShapeCone(40, 90.Degrees())); class CursedEcho(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.CursedEcho)); class VoidGravity(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.VoidGravity), 6, 4, 4); diff --git a/BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D110AlbusGriffin.cs b/BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D110AlbusGriffin.cs index dfa9f2604f..21f0215e2b 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D110AlbusGriffin.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D110AlbusGriffin.cs @@ -22,7 +22,7 @@ public enum AID : uint class WindsOfWinter(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.WindsOfWinter)); class WindsOfWinterStunHint(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.WindsOfWinter), false, true); class GoldenTalons(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GoldenTalons), new AOEShapeCone(8, 45.Degrees())); -class Freefall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Freefall), 8); +class Freefall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Freefall), 8); class D110AlbusGriffinStates : StateMachineBuilder { diff --git a/BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D111Albion.cs b/BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D111Albion.cs index 3844b9a88d..bc4f711379 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D111Albion.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D111Albion.cs @@ -185,7 +185,7 @@ public record struct Stampede(bool Active, WPos Position, Angle Rotation, List Beasts = Beasts; } -class Icebreaker(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Icebreaker), 17, targetIsLocation: true); +class Icebreaker(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Icebreaker), 17, targetIsLocation: true); class IcyThroes(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCircle(6)); class IcyThroes1(BossModule module) : IcyThroes(module, AID.IcyThroes1); @@ -194,7 +194,7 @@ class IcyThroes2(BossModule module) : IcyThroes(module, AID.IcyThroes2); class IcyThroesSpread(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.IcyThroesSpread), 6); class KnockOnIce(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.KnockOnIce), new AOEShapeCircle(5)); -abstract class Slam(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeRect(80, 10)); +abstract class Slam(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), new AOEShapeRect(80, 10)); class RightSlam(BossModule module) : Slam(module, AID.RightSlam); class LeftSlam(BossModule module) : Slam(module, AID.LeftSlam); diff --git a/BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D112GalateaMagna.cs b/BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D112GalateaMagna.cs index 6993b764b8..ec6351d60f 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D112GalateaMagna.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D112GalateaMagna.cs @@ -238,7 +238,7 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme } } -class SoulScythe(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SoulScythe), 18); +class SoulScythe(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SoulScythe), 18); class D112GalateaMagnaStates : StateMachineBuilder { diff --git a/BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D113Cagnazzo.cs b/BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D113Cagnazzo.cs index 27b231f11e..30d68a649a 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D113Cagnazzo.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D113Cagnazzo.cs @@ -188,7 +188,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) } } -class Hydrovent(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hydrovent), 6); +class Hydrovent(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hydrovent), 6); class NeapTide(BossModule module) : Components.SpreadFromIcon(module, (uint)IconID.Spreadmarker, ActionID.MakeSpell(AID.NeapTide), 6, 5); class SpringTideHydroFall(BossModule module) : Components.UniformStackSpread(module, 6, 0, 4) // both use the same icon diff --git a/BossMod/Modules/Endwalker/Dungeon/D12Aetherfont/D120HaamCrystal.cs b/BossMod/Modules/Endwalker/Dungeon/D12Aetherfont/D120HaamCrystal.cs index 38f8607f74..240263dff6 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D12Aetherfont/D120HaamCrystal.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D12Aetherfont/D120HaamCrystal.cs @@ -17,7 +17,7 @@ public enum AID : uint } class HardHead(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.HardHead), new AOEShapeCone(12, 60.Degrees())); -class EarthenHeart(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.EarthenHeart), 6); +class EarthenHeart(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.EarthenHeart), 6); class D120HaamCrystalStates : StateMachineBuilder { diff --git a/BossMod/Modules/Endwalker/Dungeon/D12Aetherfont/D120HaamOtodus.cs b/BossMod/Modules/Endwalker/Dungeon/D12Aetherfont/D120HaamOtodus.cs index 575eeb6655..8947cfac18 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D12Aetherfont/D120HaamOtodus.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D12Aetherfont/D120HaamOtodus.cs @@ -19,7 +19,7 @@ public enum AID : uint Icestorm = 33991, // Boss->self, 3.0s cast, range 16 90-degree cone } -class AquaticLance(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AquaticLance), 8); +class AquaticLance(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AquaticLance), 8); class Icestorm(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Icestorm), new AOEShapeCone(16, 45.Degrees())); class D120HaamOtodusStates : StateMachineBuilder diff --git a/BossMod/Modules/Endwalker/Dungeon/D12Aetherfont/D122Arkas.cs b/BossMod/Modules/Endwalker/Dungeon/D12Aetherfont/D122Arkas.cs index e23be8b3f4..7f33239309 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D12Aetherfont/D122Arkas.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D12Aetherfont/D122Arkas.cs @@ -161,7 +161,7 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) class ElectricEruption(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.ElectricEruption)); -class Leaps(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 10); +class Leaps(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 10); class Electrify(BossModule module) : Leaps(module, AID.Electrify); class LightningLeap1(BossModule module) : Leaps(module, AID.LightningLeap1); class LightningLeap2(BossModule module) : Leaps(module, AID.LightningLeap2); @@ -169,7 +169,7 @@ class LightningRampage1(BossModule module) : Leaps(module, AID.LightningRampage1 class LightningRampage2(BossModule module) : Leaps(module, AID.LightningRampage2); class RipperClaw(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.RipperClaw)); -class Shock(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Shock), 6); +class Shock(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Shock), 6); class SpinningClaw(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SpinningClaw), new AOEShapeCircle(10)); class BattleCry1(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.BattleCry1)); class BattleCry2(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.BattleCry2)); diff --git a/BossMod/Modules/Endwalker/Dungeon/D13LunarSubterrane/D132DamcyanAntlion.cs b/BossMod/Modules/Endwalker/Dungeon/D13LunarSubterrane/D132DamcyanAntlion.cs index b03c259036..822958ca1b 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D13LunarSubterrane/D132DamcyanAntlion.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D13LunarSubterrane/D132DamcyanAntlion.cs @@ -94,7 +94,7 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme class EarthenGeyser(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.EarthenGeyser), 10, 4, 4); class QuicksandVoidzone(BossModule module) : Components.PersistentVoidzone(module, 10, m => m.Enemies(OID.QuicksandVoidzone).Where(z => z.EventState != 7)); -class PoundSand(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.PoundSand), 12); +class PoundSand(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.PoundSand), 12); class AntlionMarch(BossModule module) : Components.GenericAOEs(module) { diff --git a/BossMod/Modules/Endwalker/Extreme/Ex1Zodiark/Ex1Zodiark.cs b/BossMod/Modules/Endwalker/Extreme/Ex1Zodiark/Ex1Zodiark.cs index 4bc67759b8..6c85d18582 100644 --- a/BossMod/Modules/Endwalker/Extreme/Ex1Zodiark/Ex1Zodiark.cs +++ b/BossMod/Modules/Endwalker/Extreme/Ex1Zodiark/Ex1Zodiark.cs @@ -3,7 +3,7 @@ // simple component tracking raidwide cast at the end of intermission public class Apomnemoneumata(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.ApomnemoneumataNormal)); -public class Phlegethon(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.PhlegetonAOE), 5); +public class Phlegethon(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.PhlegetonAOE), 5); [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 803, NameID = 10456, PlanLevel = 90)] public class Ex1Zodiark(WorldState ws, Actor primary) : BossModule(ws, primary, new(100, 100), new ArenaBoundsSquare(20)); diff --git a/BossMod/Modules/Endwalker/Extreme/Ex4Barbariccia/Ex4Barbariccia.cs b/BossMod/Modules/Endwalker/Extreme/Ex4Barbariccia/Ex4Barbariccia.cs index 8b77db82b9..477cd670c0 100644 --- a/BossMod/Modules/Endwalker/Extreme/Ex4Barbariccia/Ex4Barbariccia.cs +++ b/BossMod/Modules/Endwalker/Extreme/Ex4Barbariccia/Ex4Barbariccia.cs @@ -10,7 +10,7 @@ class Catabasis(BossModule module) : Components.CastCounter(module, ActionID.Mak class WarningGale(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.WarningGale), new AOEShapeCircle(6)); class WindingGaleCharge(BossModule module) : Components.ChargeAOEs(module, ActionID.MakeSpell(AID.WindingGaleCharge), 2); class BoulderBreak(BossModule module) : Components.CastSharedTankbuster(module, ActionID.MakeSpell(AID.BoulderBreak), 5); -class Boulder(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Boulder), 10); +class Boulder(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Boulder), 10); class BrittleBoulder(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.BrittleBoulder), 5); class TornadoChainInner(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TornadoChainInner), new AOEShapeCircle(11)); class TornadoChainOuter(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TornadoChainOuter), new AOEShapeDonut(11, 20)); @@ -22,7 +22,7 @@ class BlowAwayRaidwide(BossModule module) : Components.CastCounter(module, Actio class ImpactKnockback(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.ImpactKnockback), 6); class BlusteryRuler(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BlusteryRuler), new AOEShapeCircle(6)); class DryBlowsRaidwide(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.DryBlowsRaidwide)); -class DryBlowsPuddle(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DryBlowsPuddle), 3); +class DryBlowsPuddle(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DryBlowsPuddle), 3); class IronOut(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.IronOutAOE)); [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 871, NameID = 11398)] diff --git a/BossMod/Modules/Endwalker/Extreme/Ex4Barbariccia/Ex4BarbaricciaStates.cs b/BossMod/Modules/Endwalker/Extreme/Ex4Barbariccia/Ex4BarbaricciaStates.cs index 9fd856f579..efa6a04272 100644 --- a/BossMod/Modules/Endwalker/Extreme/Ex4Barbariccia/Ex4BarbaricciaStates.cs +++ b/BossMod/Modules/Endwalker/Extreme/Ex4Barbariccia/Ex4BarbaricciaStates.cs @@ -152,46 +152,46 @@ private void SavageBarberyHairRaid(uint id, float delay, bool fast = false) private void WindingGaleBoulderBreak(uint id, float delay) { - ComponentCondition(id, delay, comp => comp.ActiveCasters.Any()) + ComponentCondition(id, delay, comp => comp.ActiveCasters.Count != 0) .ActivateOnEnter(); ComponentCondition(id + 1, 0.8f, comp => comp.Active) .ActivateOnEnter(); - ComponentCondition(id + 2, 4.2f, comp => comp.NumCasts > 0, "Spirals") + ComponentCondition(id + 2, 4.2f, comp => comp.NumCasts != 0, "Spirals") .ActivateOnEnter() .DeactivateOnExit() .DeactivateOnExit(); - ComponentCondition(id + 3, 0.8f, comp => comp.NumCasts > 0, "Shared tankbuster") + ComponentCondition(id + 3, 0.8f, comp => comp.NumCasts != 0, "Shared tankbuster") .DeactivateOnExit(); - ComponentCondition(id + 0x10, 2.8f, comp => comp.Casters.Count > 0) + ComponentCondition(id + 0x10, 2.8f, comp => comp.Casters.Count != 0) .ActivateOnEnter(); ComponentCondition(id + 0x11, 2, comp => comp.Casters.Count > 6); ComponentCondition(id + 0x12, 0.5f, comp => comp.Casters.Count <= 6); ComponentCondition(id + 0x13, 2, comp => comp.Casters.Count == 0) .DeactivateOnExit(); - ComponentCondition(id + 0x20, 1.5f, comp => comp.ActiveCasters.Any()) + ComponentCondition(id + 0x20, 1.5f, comp => comp.ActiveCasters.Count != 0) .ActivateOnEnter(); - ComponentCondition(id + 0x21, 1.1f, comp => comp.Casters.Count > 0, "Bait") + ComponentCondition(id + 0x21, 1.1f, comp => comp.Casters.Count != 0, "Bait") .ActivateOnEnter() .ActivateOnEnter(); - ComponentCondition(id + 0x22, 3, comp => comp.NumFinishedSpreads > 0, "Spread") + ComponentCondition(id + 0x22, 3, comp => comp.NumFinishedSpreads != 0, "Spread") .ActivateOnEnter() .DeactivateOnExit(); ComponentCondition(id + 0x30, 0.2f, comp => comp.Active) .ActivateOnEnter(); - ComponentCondition(id + 0x31, 0.4f, comp => comp.ActiveCasters.Any()) + ComponentCondition(id + 0x31, 0.4f, comp => comp.ActiveCasters.Count != 0) .ActivateOnEnter(); - ComponentCondition(id + 0x32, 0.2f, comp => comp.NumCasts > 0, "Spirals") + ComponentCondition(id + 0x32, 0.2f, comp => comp.NumCasts != 0, "Spirals") .DeactivateOnExit() .DeactivateOnExit(); - ComponentCondition(id + 0x33, 0.2f, comp => comp.NumCasts > 0) + ComponentCondition(id + 0x33, 0.2f, comp => comp.NumCasts != 0) .DeactivateOnExit(); - ComponentCondition(id + 0x40, 3.6f, comp => comp.NumCasts > 0, "Out") + ComponentCondition(id + 0x40, 3.6f, comp => comp.NumCasts != 0, "Out") .DeactivateOnExit(); - ComponentCondition(id + 0x41, 2.5f, comp => comp.NumCasts > 0, "In") + ComponentCondition(id + 0x41, 2.5f, comp => comp.NumCasts != 0, "In") .ActivateOnEnter() .DeactivateOnExit(); @@ -201,11 +201,11 @@ private void WindingGaleBoulderBreak(uint id, float delay) private void BlowAwayImpactBoldBoulderTrample(uint id, float delay) { - ComponentCondition(id, delay, comp => comp.NumCasts > 0) + ComponentCondition(id, delay, comp => comp.NumCasts != 0) .ActivateOnEnter() .DeactivateOnExit() .SetHint(StateMachine.StateHint.Raidwide); - ComponentCondition(id + 1, 1.7f, comp => comp.ActiveCasters.Any(), "Bait 1") + ComponentCondition(id + 1, 1.7f, comp => comp.ActiveCasters.Count != 0, "Bait 1") .ActivateOnEnter(); ComponentCondition(id + 2, 0.7f, comp => comp.HavePendingRushes) .ActivateOnEnter(); @@ -223,14 +223,14 @@ private void BlowAwayImpactBoldBoulderTrample(uint id, float delay) // +8.4s: rush 4 finish // +9.3s: puddles 4 finish - ComponentCondition(id + 0x100, 7.7f, comp => comp.ActiveCasters.Any()) + ComponentCondition(id + 0x100, 7.7f, comp => comp.ActiveCasters.Count != 0) .ActivateOnEnter(); ComponentCondition(id + 0x110, 0.7f, comp => comp.NumCasts >= 4, "Charges") .ActivateOnEnter() .DeactivateOnExit(); - ComponentCondition(id + 0x120, 0.3f, comp => comp.Stacks.Count > 0) + ComponentCondition(id + 0x120, 0.3f, comp => comp.Stacks.Count != 0) .ActivateOnEnter(); - ComponentCondition(id + 0x130, 0.6f, comp => !comp.ActiveCasters.Any()) + ComponentCondition(id + 0x130, 0.6f, comp => comp.ActiveCasters.Count == 0) .DeactivateOnExit(); ComponentCondition(id + 0x200, 4.7f, comp => comp.NumCasts > 0, "Knockback") .DeactivateOnExit() @@ -242,11 +242,11 @@ private void BlowAwayImpactBoldBoulderTrample(uint id, float delay) private void BlowAwayBoulders(uint id, float delay) { - ComponentCondition(id, delay, comp => comp.NumCasts > 0) + ComponentCondition(id, delay, comp => comp.NumCasts != 0) .ActivateOnEnter() .DeactivateOnExit() .SetHint(StateMachine.StateHint.Raidwide); - ComponentCondition(id + 1, 1.7f, comp => comp.ActiveCasters.Any(), "Bait 1") + ComponentCondition(id + 1, 1.7f, comp => comp.ActiveCasters.Count != 0, "Bait 1") .ActivateOnEnter(); // +2.0s: puddles 2 bait // +4.0s: puddles 1 finish + 3 bait @@ -257,14 +257,14 @@ private void BlowAwayBoulders(uint id, float delay) ComponentCondition(id + 0x100, 8.4f, comp => comp.HavePendingRushes) .ActivateOnEnter(); - ComponentCondition(id + 0x110, 1.1f, comp => comp.Casters.Count > 0, "Bait center") + ComponentCondition(id + 0x110, 1.1f, comp => comp.Casters.Count != 0, "Bait center") .ActivateOnEnter(); ComponentCondition(id + 0x120, 2.5f, comp => comp.NumCasts >= 1, "Charge 1") .ActivateOnEnter() .DeactivateOnExit(); ComponentCondition(id + 0x130, 0.5f, comp => !comp.Active, "Spread") .DeactivateOnExit(); - ComponentCondition(id + 0x140, 1, comp => comp.NumCasts > 0) + ComponentCondition(id + 0x140, 1, comp => comp.NumCasts != 0) .DeactivateOnExit(); ComponentCondition(id + 0x150, 3.6f, comp => comp.NumCasts >= 4, "Charge 4") .DeactivateOnExit(); @@ -274,17 +274,17 @@ private void TeasingTangles1(uint id, float delay) { Cast(id, AID.TeasingTangles1, delay, 4) .ActivateOnEnter(); - ComponentCondition(id + 2, 0.6f, comp => comp.NumCasts > 0, "Tangles 1 start"); - ComponentCondition(id + 0x10, 0.6f, comp => comp.NumTethers > 0); + ComponentCondition(id + 2, 0.6f, comp => comp.NumCasts != 0, "Tangles 1 start"); + ComponentCondition(id + 0x10, 0.6f, comp => comp.NumTethers != 0); ComponentCondition(id + 0x20, 2.8f, comp => comp.Active) .ActivateOnEnter(); Cast(id + 0x30, AID.SecretBreeze, 4.5f, 3) .ActivateOnEnter(); ComponentCondition(id + 0x40, 0.5f, comp => !comp.Active, "Stack/spread") .DeactivateOnExit(); - ComponentCondition(id + 0x50, 0.5f, comp => comp.NumCasts > 0, "Cones") + ComponentCondition(id + 0x50, 0.5f, comp => comp.NumCasts != 0, "Cones") .DeactivateOnExit(); - ComponentCondition(id + 0x60, 2, comp => comp.NumCasts > 0, "Proteans") + ComponentCondition(id + 0x60, 2, comp => comp.NumCasts != 0, "Proteans") .ActivateOnEnter() .DeactivateOnExit(); ComponentCondition(id + 0x70, 3.2f, comp => comp.NumTethers == 0, "Tangles 1 end") @@ -302,11 +302,11 @@ private void TeasingTangles2(uint id, float delay) ComponentCondition(id + 4, 1.7f, comp => comp.NumCasts >= 4, "Charge 4") .DeactivateOnExit(); - ComponentCondition(id + 0x10, 0.4f, comp => comp.ActiveCasters.Any()) + ComponentCondition(id + 0x10, 0.4f, comp => comp.ActiveCasters.Count != 0) .ActivateOnEnter(); - ComponentCondition(id + 0x20, 0.8f, comp => comp.NumCasts > 0, "Tangles 2 start"); - ComponentCondition(id + 0x21, 0.5f, comp => comp.NumTethers > 0); - ComponentCondition(id + 0x30, 3.7f, comp => !comp.ActiveCasters.Any()) + ComponentCondition(id + 0x20, 0.8f, comp => comp.NumCasts != 0, "Tangles 2 start"); + ComponentCondition(id + 0x21, 0.5f, comp => comp.NumTethers != 0); + ComponentCondition(id + 0x30, 3.7f, comp => comp.ActiveCasters.Count == 0) .DeactivateOnExit(); ComponentCondition(id + 0x40, 2.8f, comp => comp.NumCasts > 0) @@ -314,14 +314,14 @@ private void TeasingTangles2(uint id, float delay) .DeactivateOnExit() .SetHint(StateMachine.StateHint.Raidwide); - ComponentCondition(id + 0x50, 7.6f, comp => comp.ActiveCasters.Any()) + ComponentCondition(id + 0x50, 7.6f, comp => comp.ActiveCasters.Count != 0) .ActivateOnEnter() .ActivateOnEnter(); ComponentCondition(id + 0x51, 0.3f, comp => comp.Active) .ActivateOnEnter(); - ComponentCondition(id + 0x52, 3.7f, comp => comp.NumCasts > 0, "Out") + ComponentCondition(id + 0x52, 3.7f, comp => comp.NumCasts != 0, "Out") .DeactivateOnExit(); - ComponentCondition(id + 0x53, 2.5f, comp => comp.NumCasts > 0, "In") + ComponentCondition(id + 0x53, 2.5f, comp => comp.NumCasts != 0, "In") .ActivateOnEnter() .DeactivateOnExit(); ComponentCondition(id + 0x54, 1.8f, comp => !comp.Active, "Stack in pairs") @@ -338,9 +338,9 @@ private void EntanglementSecretBreeze(uint id, float delay) Cast(id + 0x10, AID.SecretBreeze, 6.5f, 3) .ActivateOnEnter(); - ComponentCondition(id + 0x12, 1, comp => comp.NumCasts > 0, "Cones") + ComponentCondition(id + 0x12, 1, comp => comp.NumCasts != 0, "Cones") .DeactivateOnExit(); - ComponentCondition(id + 0x13, 2, comp => comp.NumCasts > 0, "Proteans") + ComponentCondition(id + 0x13, 2, comp => comp.NumCasts != 0, "Proteans") .ActivateOnEnter() .DeactivateOnExit(); } @@ -359,18 +359,18 @@ private void EntanglementUpbraid(uint id, float delay) private void TornadoChainImpactHairSpray(uint id, float delay) { - ComponentCondition(id, delay, comp => comp.ActiveCasters.Any()) + ComponentCondition(id, delay, comp => comp.ActiveCasters.Count != 0) .ActivateOnEnter(); ComponentCondition(id + 1, 3.9f, comp => comp.Active) .ActivateOnEnter(); - ComponentCondition(id + 2, 0.1f, comp => comp.NumCasts > 0, "Out") + ComponentCondition(id + 2, 0.1f, comp => comp.NumCasts != 0, "Out") .DeactivateOnExit(); - ComponentCondition(id + 0x10, 2.5f, comp => comp.NumCasts > 0, "In") + ComponentCondition(id + 0x10, 2.5f, comp => comp.NumCasts != 0, "In") .ActivateOnEnter() .ActivateOnEnter() // starts ~0.2s after out finishes .ActivateOnEnter() .DeactivateOnExit(); - ComponentCondition(id + 0x20, 3.9f, comp => comp.NumCasts > 0, "Knockback") + ComponentCondition(id + 0x20, 3.9f, comp => comp.NumCasts != 0, "Knockback") .DeactivateOnExit() .DeactivateOnExit(); ComponentCondition(id + 0x21, 1.5f, comp => !comp.Active, "Spread") @@ -387,53 +387,53 @@ private void BrutalRushDryBlowsBoulderBreakWindingGale(uint id, float delay) ComponentCondition(id + 3, 1.7f, comp => comp.NumCasts >= 3); ComponentCondition(id + 4, 1.7f, comp => comp.NumCasts >= 4, "Charge 4") .DeactivateOnExit(); - ComponentCondition(id + 5, 1, comp => comp.NumCasts > 0) + ComponentCondition(id + 5, 1, comp => comp.NumCasts != 0) .DeactivateOnExit(); - ComponentCondition(id + 0x10, 3.1f, comp => comp.NumCasts > 0) + ComponentCondition(id + 0x10, 3.1f, comp => comp.NumCasts != 0) .ActivateOnEnter() .DeactivateOnExit() .SetHint(StateMachine.StateHint.Raidwide); - ComponentCondition(id + 0x20, 5.6f, comp => comp.ActiveCasters.Any()) + ComponentCondition(id + 0x20, 5.6f, comp => comp.ActiveCasters.Count != 0) .ActivateOnEnter() .ActivateOnEnter(); - ComponentCondition(id + 0x21, 4, comp => comp.NumCasts > 0, "Out") + ComponentCondition(id + 0x21, 4, comp => comp.NumCasts != 0, "Out") .DeactivateOnExit(); - ComponentCondition(id + 0x22, 2.5f, comp => comp.NumCasts > 0, "In") + ComponentCondition(id + 0x22, 2.5f, comp => comp.NumCasts != 0, "In") .ActivateOnEnter() // <0.1s after out .ActivateOnEnter() .DeactivateOnExit(); - ComponentCondition(id + 0x23, 2.5f, comp => comp.NumCasts > 0, "Shared tankbuster") + ComponentCondition(id + 0x23, 2.5f, comp => comp.NumCasts != 0, "Shared tankbuster") .DeactivateOnExit() .DeactivateOnExit(); - ComponentCondition(id + 0x30, 0.3f, comp => comp.ActiveCasters.Any()) + ComponentCondition(id + 0x30, 0.3f, comp => comp.ActiveCasters.Count != 0) .ActivateOnEnter(); - ComponentCondition(id + 0x31, 5, comp => comp.NumCasts > 0, "Spirals") + ComponentCondition(id + 0x31, 5, comp => comp.NumCasts != 0, "Spirals") .ActivateOnEnter() .DeactivateOnExit() .DeactivateOnExit(); - ComponentCondition(id + 0x40, 3.7f, comp => comp.Casters.Count > 0) + ComponentCondition(id + 0x40, 3.7f, comp => comp.Casters.Count != 0) .ActivateOnEnter(); // tornado chain starts at the same time ComponentCondition(id + 0x41, 2, comp => comp.Casters.Count > 6) .ActivateOnEnter(); ComponentCondition(id + 0x42, 0.5f, comp => comp.Casters.Count <= 6); - ComponentCondition(id + 0x43, 1.5f, comp => comp.NumCasts > 0, "Out") + ComponentCondition(id + 0x43, 1.5f, comp => comp.NumCasts != 0, "Out") .DeactivateOnExit(); ComponentCondition(id + 0x44, 0.5f, comp => comp.Casters.Count == 0) .ActivateOnEnter() .DeactivateOnExit(); - ComponentCondition(id + 0x50, 1.8f, comp => comp.ActiveCasters.Any()) + ComponentCondition(id + 0x50, 1.8f, comp => comp.ActiveCasters.Count != 0) .ActivateOnEnter(); - ComponentCondition(id + 0x51, 0.2f, comp => comp.NumCasts > 0, "In") + ComponentCondition(id + 0x51, 0.2f, comp => comp.NumCasts != 0, "In") .ActivateOnEnter() .DeactivateOnExit(); - ComponentCondition(id + 0x52, 1.6f, comp => comp.Stacks.Count > 0) + ComponentCondition(id + 0x52, 1.6f, comp => comp.Stacks.Count != 0) .ActivateOnEnter(); - ComponentCondition(id + 0x53, 3.2f, comp => comp.NumCasts > 0, "Spirals") + ComponentCondition(id + 0x53, 3.2f, comp => comp.NumCasts != 0, "Spirals") .DeactivateOnExit() .DeactivateOnExit(); ComponentCondition(id + 0x54, 2.7f, comp => comp.Stacks.Count == 0, "Stack"); diff --git a/BossMod/Modules/Endwalker/Extreme/Ex5Rubicante/Flamesent.cs b/BossMod/Modules/Endwalker/Extreme/Ex5Rubicante/Flamesent.cs index 45efeace4a..d42286a0ab 100644 --- a/BossMod/Modules/Endwalker/Extreme/Ex5Rubicante/Flamesent.cs +++ b/BossMod/Modules/Endwalker/Extreme/Ex5Rubicante/Flamesent.cs @@ -7,4 +7,4 @@ class FlamesentNC(BossModule module) : Components.Adds(module, (uint)OID.Flamese class GhastlyTorch(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.GhastlyTorch)); class ShatteringHeatAdd(BossModule module) : Components.TankbusterTether(module, ActionID.MakeSpell(AID.ShatteringHeatAdd), (uint)TetherID.ShatteringHeatAdd, 3); class GhastlyWind(BossModule module) : Components.BaitAwayTethers(module, new AOEShapeCone(40, 15.Degrees()), (uint)TetherID.GhastlyWind, ActionID.MakeSpell(AID.GhastlyWind)); // TODO: verify angle -class GhastlyFlame(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GhastlyFlameAOE), 5); +class GhastlyFlame(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GhastlyFlameAOE), 5); diff --git a/BossMod/Modules/Endwalker/Extreme/Ex6Golbez/Ex6Golbez.cs b/BossMod/Modules/Endwalker/Extreme/Ex6Golbez/Ex6Golbez.cs index bb4f2006ca..ca1d6fdc5a 100644 --- a/BossMod/Modules/Endwalker/Extreme/Ex6Golbez/Ex6Golbez.cs +++ b/BossMod/Modules/Endwalker/Extreme/Ex6Golbez/Ex6Golbez.cs @@ -1,7 +1,7 @@ namespace BossMod.Endwalker.Extreme.Ex6Golbez; class Terrastorm(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TerrastormAOE), new AOEShapeCircle(16)); -class LingeringSpark(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LingeringSparkAOE), 5); +class LingeringSpark(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LingeringSparkAOE), 5); class PhasesOfTheBladeFront(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PhasesOfTheBlade), new AOEShapeCone(22, 90.Degrees())); class PhasesOfTheBladeBack(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PhasesOfTheBladeBack), new AOEShapeCone(22, 90.Degrees())); class PhasesOfTheShadowFront(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PhasesOfTheShadow), new AOEShapeCone(22, 90.Degrees())); diff --git a/BossMod/Modules/Endwalker/Extreme/Ex7Zeromus/Ex7Zeromus.cs b/BossMod/Modules/Endwalker/Extreme/Ex7Zeromus/Ex7Zeromus.cs index 5bd8243948..0616526a5c 100644 --- a/BossMod/Modules/Endwalker/Extreme/Ex7Zeromus/Ex7Zeromus.cs +++ b/BossMod/Modules/Endwalker/Extreme/Ex7Zeromus/Ex7Zeromus.cs @@ -1,9 +1,9 @@ namespace BossMod.Endwalker.Extreme.Ex7Zeromus; class AbyssalEchoes(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AbyssalEchoes), new AOEShapeCircle(12), 5); -class BigBangPuddle(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BigBangAOE), 5); +class BigBangPuddle(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BigBangAOE), 5); class BigBangSpread(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.BigBangSpread), 5); -class BigCrunchPuddle(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BigCrunchAOE), 5); +class BigCrunchPuddle(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BigCrunchAOE), 5); class BigCrunchSpread(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.BigCrunchSpread), 5); [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 965, NameID = 12586, PlanLevel = 90)] diff --git a/BossMod/Modules/Endwalker/Extreme/Ex7Zeromus/Nostalgia.cs b/BossMod/Modules/Endwalker/Extreme/Ex7Zeromus/Nostalgia.cs index 92de04e1fc..f43eb03486 100644 --- a/BossMod/Modules/Endwalker/Extreme/Ex7Zeromus/Nostalgia.cs +++ b/BossMod/Modules/Endwalker/Extreme/Ex7Zeromus/Nostalgia.cs @@ -1,6 +1,6 @@ namespace BossMod.Endwalker.Extreme.Ex7Zeromus; -class NostalgiaDimensionalSurge(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.NostalgiaDimensionalSurge), 5); +class NostalgiaDimensionalSurge(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.NostalgiaDimensionalSurge), 5); class Nostalgia(BossModule module) : Components.CastCounter(module, default) { diff --git a/BossMod/Modules/Endwalker/FATE/Chi.cs b/BossMod/Modules/Endwalker/FATE/Chi.cs index 10a42d1f0b..8a90b59672 100644 --- a/BossMod/Modules/Endwalker/FATE/Chi.cs +++ b/BossMod/Modules/Endwalker/FATE/Chi.cs @@ -267,7 +267,7 @@ public override void AddGlobalHints(GlobalHints hints) } class MissileShower(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.MissileShower), "Raidwide x2"); -class ThermobaricExplosive(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ThermobaricExplosive2), 25); +class ThermobaricExplosive(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ThermobaricExplosive2), 25); abstract class AssaultCarapaceRect(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeRect(60, 16, 60)); class AssaultCarapace1(BossModule module) : AssaultCarapaceRect(module, AID.AssaultCarapace1); @@ -281,7 +281,7 @@ class ForeArms2(BossModule module) : Cleave(module, AID.ForeArms2); class RearGuns1(BossModule module) : Cleave(module, AID.RearGuns1); class RearGuns2(BossModule module) : Cleave(module, AID.RearGuns2); -class FreeFallBombs(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FreeFallBombs2), 6); +class FreeFallBombs(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FreeFallBombs2), 6); class ChiStates : StateMachineBuilder { diff --git a/BossMod/Modules/Endwalker/FATE/Daivadipa.cs b/BossMod/Modules/Endwalker/FATE/Daivadipa.cs index 47f5f7f20f..fd1d09188e 100644 --- a/BossMod/Modules/Endwalker/FATE/Daivadipa.cs +++ b/BossMod/Modules/Endwalker/FATE/Daivadipa.cs @@ -147,7 +147,7 @@ class RightwardParasu(BossModule module) : Cleave(module, AID.RightwardParasu); class ErrantAkasa(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ErrantAkasa), new AOEShapeCone(60, 45.Degrees())); class CosmicWeave(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.CosmicWeave), new AOEShapeCircle(18)); class KarmicFlames(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.KarmicFlames), new AOEShapeCircle(20)); -class YawningHells(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.YawningHells), 8); +class YawningHells(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.YawningHells), 8); class InfernalRedemption(BossModule module) : Components.RaidwideCastDelay(module, ActionID.MakeSpell(AID.InfernalRedemptionVisual), ActionID.MakeSpell(AID.InfernalRedemption), 1); class DivineCall(BossModule module) : Components.StatusDrivenForcedMarch(module, 2, (uint)SID.ForwardMarch, (uint)SID.AboutFace, (uint)SID.LeftFace, (uint)SID.RightFace) diff --git a/BossMod/Modules/Endwalker/Hunt/RankA/Aegeiros.cs b/BossMod/Modules/Endwalker/Hunt/RankA/Aegeiros.cs index 7aa90c603f..3adc941887 100644 --- a/BossMod/Modules/Endwalker/Hunt/RankA/Aegeiros.cs +++ b/BossMod/Modules/Endwalker/Hunt/RankA/Aegeiros.cs @@ -45,7 +45,7 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) } } -class Snowball(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Snowball), 8); +class Snowball(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Snowball), 8); class Canopy(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Canopy), new AOEShapeCone(12, 60.Degrees()), activeWhileCasting: false); class BackhandBlow(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BackhandBlow), new AOEShapeCone(12, 60.Degrees())); diff --git a/BossMod/Modules/Endwalker/Hunt/RankA/FanAil.cs b/BossMod/Modules/Endwalker/Hunt/RankA/FanAil.cs index 326e38f11a..4ecb91521a 100644 --- a/BossMod/Modules/Endwalker/Hunt/RankA/FanAil.cs +++ b/BossMod/Modules/Endwalker/Hunt/RankA/FanAil.cs @@ -20,7 +20,7 @@ public enum AID : uint // TODO: ok, this needs investigation... class Divebomb(BossModule module) : Components.SelfTargetedLegacyRotationAOEs(module, ActionID.MakeSpell(AID.Divebomb), new AOEShapeRect(30, 5.5f)); -class LiquidHell(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LiquidHell), 6); +class LiquidHell(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LiquidHell), 6); class Plummet(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Plummet), new AOEShapeCone(8, 45.Degrees())); class DeathSentence(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.DeathSentence)); class CycloneWing(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.CycloneWing)); diff --git a/BossMod/Modules/Endwalker/Hunt/RankA/MoussePrincess.cs b/BossMod/Modules/Endwalker/Hunt/RankA/MoussePrincess.cs index 0ee5f63097..ac4c6eea43 100644 --- a/BossMod/Modules/Endwalker/Hunt/RankA/MoussePrincess.cs +++ b/BossMod/Modules/Endwalker/Hunt/RankA/MoussePrincess.cs @@ -72,7 +72,7 @@ private Angle ThrenodyDirection() class WhimsyAlaMode(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.WhimsyAlaMode), "Select direction"); class AmorphicFlail(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AmorphicFlail), new AOEShapeCircle(9)); -class PrincessCacophony(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.PrincessCacophony), 12); +class PrincessCacophony(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.PrincessCacophony), 12); class Banish(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Banish)); class MoussePrincessStates : StateMachineBuilder diff --git a/BossMod/Modules/Endwalker/Hunt/RankA/Yilan.cs b/BossMod/Modules/Endwalker/Hunt/RankA/Yilan.cs index fd53d4cc10..6f41a52c04 100644 --- a/BossMod/Modules/Endwalker/Hunt/RankA/Yilan.cs +++ b/BossMod/Modules/Endwalker/Hunt/RankA/Yilan.cs @@ -67,7 +67,7 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) } class Devour(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.Devour), "Harmless unless you got minimized by the previous mechanic"); -class BogBomb(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BogBomb), 6); +class BogBomb(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BogBomb), 6); class BrackishRain(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BrackishRain), new AOEShapeCone(10, 45.Degrees())); class YilanStates : StateMachineBuilder diff --git a/BossMod/Modules/Endwalker/Hunt/RankS/Armstrong.cs b/BossMod/Modules/Endwalker/Hunt/RankS/Armstrong.cs index 6c4f0b7a4c..aafe6ac009 100644 --- a/BossMod/Modules/Endwalker/Hunt/RankS/Armstrong.cs +++ b/BossMod/Modules/Endwalker/Hunt/RankS/Armstrong.cs @@ -62,7 +62,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) } } -class AcceleratedLanding(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AcceleratedLanding), 6); +class AcceleratedLanding(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AcceleratedLanding), 6); class CalculatedCombustion(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.CalculatedCombustion)); class Pummel(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Pummel)); class SoporificGas(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SoporificGas), new AOEShapeCircle(12)); diff --git a/BossMod/Modules/Endwalker/Hunt/RankS/Burfurlur.cs b/BossMod/Modules/Endwalker/Hunt/RankS/Burfurlur.cs index 9bc52239ff..deae0fa8f6 100644 --- a/BossMod/Modules/Endwalker/Hunt/RankS/Burfurlur.cs +++ b/BossMod/Modules/Endwalker/Hunt/RankS/Burfurlur.cs @@ -70,7 +70,7 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) } class Uppercut(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Uppercut), new AOEShapeCone(15, 60.Degrees())); -class RottenSpores(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RottenSpores), 6); +class RottenSpores(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RottenSpores), 6); class BurfurlurStates : StateMachineBuilder { diff --git a/BossMod/Modules/Endwalker/Hunt/RankS/KerShroud.cs b/BossMod/Modules/Endwalker/Hunt/RankS/KerShroud.cs index ca48c02f69..9508091fcf 100644 --- a/BossMod/Modules/Endwalker/Hunt/RankS/KerShroud.cs +++ b/BossMod/Modules/Endwalker/Hunt/RankS/KerShroud.cs @@ -12,7 +12,7 @@ public enum AID : uint EntropicFlame = 27724, // Boss->self, 4.0s cast, range 60 width 8 rect } -class AccursedPox(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AccursedPox), 8); +class AccursedPox(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AccursedPox), 8); class EntropicFlame(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.EntropicFlame), new AOEShapeRect(60, 4)); diff --git a/BossMod/Modules/Endwalker/Quest/MSQ/Endwalker/Endwalker.cs b/BossMod/Modules/Endwalker/Quest/MSQ/Endwalker/Endwalker.cs index 3fda264470..8fdb25364f 100644 --- a/BossMod/Modules/Endwalker/Quest/MSQ/Endwalker/Endwalker.cs +++ b/BossMod/Modules/Endwalker/Quest/MSQ/Endwalker/Endwalker.cs @@ -38,7 +38,7 @@ public EndwalkerStates(Endwalker module) : base(module) } } -class Megaflare(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Megaflare), 6); +class Megaflare(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Megaflare), 6); class Puddles(BossModule module) : Components.PersistentInvertibleVoidzoneByCast(module, 5, m => m.Enemies(OID.Puddles).Where(e => e.EventState != 7), ActionID.MakeSpell(AID.Hellfire)); class JudgementBolt(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.JudgementBoltVisual)); class Hellfire(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.HellfireVisual)); @@ -56,7 +56,7 @@ class NineNightsAvatar : Components.SelfTargetedAOEs public override IEnumerable ActiveAOEs(int slot, Actor actor) => ActiveCasters.Select((c, i) => new AOEInstance(Shape, c.Position, c.CastInfo!.Rotation, Module.CastFinishAt(c.CastInfo), i < 2 ? Colors.Danger : Colors.AOE)); } -class VeilAsunder(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.VeilAsunderHelper), 6); +class VeilAsunder(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.VeilAsunderHelper), 6); class MortalCoil(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MortalCoilVisual), new AOEShapeDonut(8, 20)); class DiamondDust(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.DiamondDustVisual), "Raidwide. Turns floor to ice."); class DeadGaze(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.DeadGazeVisual)); diff --git a/BossMod/Modules/Endwalker/Quest/MSQ/WorthyOfHisBack.cs b/BossMod/Modules/Endwalker/Quest/MSQ/WorthyOfHisBack.cs index f29146b6ca..8e65828fa7 100644 --- a/BossMod/Modules/Endwalker/Quest/MSQ/WorthyOfHisBack.cs +++ b/BossMod/Modules/Endwalker/Quest/MSQ/WorthyOfHisBack.cs @@ -230,8 +230,8 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme hints.ActionsToExecute.Push(action, actor, ActionQueue.Priority.High); } } -class TrueStoneIV(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TrueStoneIV), 10, maxCasts: 7); -class EnomotosSmall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.EnomotosSmall), 4); +class TrueStoneIV(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TrueStoneIV), 10, maxCasts: 7); +class EnomotosSmall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.EnomotosSmall), 4); class Adds(BossModule module) : Components.AddsMulti(module, [(uint)OID.Thelema, (uint)OID.ThelemaAgape]) { diff --git a/BossMod/Modules/Endwalker/Savage/P10SPandaemonium/EntanglingWeb.cs b/BossMod/Modules/Endwalker/Savage/P10SPandaemonium/EntanglingWeb.cs index f5a191db05..dd8747b3d2 100644 --- a/BossMod/Modules/Endwalker/Savage/P10SPandaemonium/EntanglingWeb.cs +++ b/BossMod/Modules/Endwalker/Savage/P10SPandaemonium/EntanglingWeb.cs @@ -1,6 +1,6 @@ namespace BossMod.Endwalker.Savage.P10SPandaemonium; -class EntanglingWebAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.EntanglingWebAOE), 5); +class EntanglingWebAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.EntanglingWebAOE), 5); class EntanglingWebHints(BossModule module) : BossComponent(module) { diff --git a/BossMod/Modules/Endwalker/Savage/P12S2PallasAthena/CaloricTheory.cs b/BossMod/Modules/Endwalker/Savage/P12S2PallasAthena/CaloricTheory.cs index 83f60b7655..9baca3c7a3 100644 --- a/BossMod/Modules/Endwalker/Savage/P12S2PallasAthena/CaloricTheory.cs +++ b/BossMod/Modules/Endwalker/Savage/P12S2PallasAthena/CaloricTheory.cs @@ -166,4 +166,4 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) } } -class EntropicExcess(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.EntropicExcess), 7); +class EntropicExcess(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.EntropicExcess), 7); diff --git a/BossMod/Modules/Endwalker/Savage/P12S2PallasAthena/Ekpyrosis.cs b/BossMod/Modules/Endwalker/Savage/P12S2PallasAthena/Ekpyrosis.cs index d6cd36173a..fed2edffb4 100644 --- a/BossMod/Modules/Endwalker/Savage/P12S2PallasAthena/Ekpyrosis.cs +++ b/BossMod/Modules/Endwalker/Savage/P12S2PallasAthena/Ekpyrosis.cs @@ -1,6 +1,6 @@ namespace BossMod.Endwalker.Savage.P12S2PallasAthena; -class EkpyrosisProximityV(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.EkpyrosisProximityV), 19); // TODO: verify falloff +class EkpyrosisProximityV(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.EkpyrosisProximityV), 19); // TODO: verify falloff class EkpyrosisProximityH(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.EkpyrosisProximityH), new AOEShapeCircle(19)); // TODO: verify falloff class EkpyrosisExaflare(BossModule module) : Components.Exaflare(module, 6) diff --git a/BossMod/Modules/Endwalker/Savage/P2SHippokampos/P2S.cs b/BossMod/Modules/Endwalker/Savage/P2SHippokampos/P2S.cs index e09cb23e08..9d2397a132 100644 --- a/BossMod/Modules/Endwalker/Savage/P2SHippokampos/P2S.cs +++ b/BossMod/Modules/Endwalker/Savage/P2SHippokampos/P2S.cs @@ -1,7 +1,7 @@ namespace BossMod.Endwalker.Savage.P2SHippokampos; class DoubledImpact(BossModule module) : Components.CastSharedTankbuster(module, ActionID.MakeSpell(AID.DoubledImpact), 6); -class SewageEruption(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SewageEruptionAOE), 6); +class SewageEruption(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SewageEruptionAOE), 6); [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 811, NameID = 10348, PlanLevel = 90)] public class P2S(WorldState ws, Actor primary) : BossModule(ws, primary, new(100, 100), new ArenaBoundsSquare(20)); diff --git a/BossMod/Modules/Endwalker/Savage/P3SPhoinix/P3S.cs b/BossMod/Modules/Endwalker/Savage/P3SPhoinix/P3S.cs index b1525cd3d8..256bcdcb52 100644 --- a/BossMod/Modules/Endwalker/Savage/P3SPhoinix/P3S.cs +++ b/BossMod/Modules/Endwalker/Savage/P3SPhoinix/P3S.cs @@ -2,7 +2,7 @@ class HeatOfCondemnation(BossModule module) : Components.TankbusterTether(module, ActionID.MakeSpell(AID.HeatOfCondemnationAOE), (uint)TetherID.HeatOfCondemnation, 6); class TrailOfCondemnationAOE(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TrailOfCondemnationAOE), new AOEShapeRect(40, 7.5f)); -class SearingBreeze(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SearingBreezeAOE), 6); +class SearingBreeze(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SearingBreezeAOE), 6); abstract class Cinderwing(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCone(60, 90.Degrees())); class LeftCinderwing(BossModule module) : Cinderwing(module, AID.LeftCinderwing); diff --git a/BossMod/Modules/Endwalker/Savage/P5SProtoCarbuncle/VenomSquallSurge.cs b/BossMod/Modules/Endwalker/Savage/P5SProtoCarbuncle/VenomSquallSurge.cs index 9467058925..deca7b3a56 100644 --- a/BossMod/Modules/Endwalker/Savage/P5SProtoCarbuncle/VenomSquallSurge.cs +++ b/BossMod/Modules/Endwalker/Savage/P5SProtoCarbuncle/VenomSquallSurge.cs @@ -1,6 +1,6 @@ namespace BossMod.Endwalker.Savage.P5SProtoCarbuncle; -class VenomDrops(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.VenomDrops), 5); +class VenomDrops(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.VenomDrops), 5); class VenomSquallSurge(BossModule module) : BossComponent(module) { diff --git a/BossMod/Modules/Endwalker/Savage/P6SHegemone/P6S.cs b/BossMod/Modules/Endwalker/Savage/P6SHegemone/P6S.cs index 2bb8c1b64b..c39eba8315 100644 --- a/BossMod/Modules/Endwalker/Savage/P6SHegemone/P6S.cs +++ b/BossMod/Modules/Endwalker/Savage/P6SHegemone/P6S.cs @@ -1,7 +1,7 @@ namespace BossMod.Endwalker.Savage.P6SHegemone; class UnholyDarkness(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.UnholyDarknessAOE), 6, 8, 8); -class DarkDome(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DarkDomeAOE), 5); +class DarkDome(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DarkDomeAOE), 5); class DarkAshes(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.DarkAshesAOE), 6); class DarkSphere(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.DarkSphereAOE), 10); diff --git a/BossMod/Modules/Endwalker/Savage/P8S1Hephaistos/P8S1.cs b/BossMod/Modules/Endwalker/Savage/P8S1Hephaistos/P8S1.cs index 3ba3a3884f..0abffbd9ed 100644 --- a/BossMod/Modules/Endwalker/Savage/P8S1Hephaistos/P8S1.cs +++ b/BossMod/Modules/Endwalker/Savage/P8S1Hephaistos/P8S1.cs @@ -1,7 +1,7 @@ namespace BossMod.Endwalker.Savage.P8S1Hephaistos; class VolcanicTorches(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TorchFlame), new AOEShapeRect(5, 5, 5)); -class AbyssalFires(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AbyssalFires), 15); // TODO: verify falloff +class AbyssalFires(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AbyssalFires), 15); // TODO: verify falloff [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 884, NameID = 11399, SortOrder = 1, PlanLevel = 90)] public class P8S1(WorldState ws, Actor primary) : BossModule(ws, primary, new(100, 100), new ArenaBoundsSquare(20)); diff --git a/BossMod/Modules/Endwalker/Savage/P8S2Hephaistos/LimitlessDesolation.cs b/BossMod/Modules/Endwalker/Savage/P8S2Hephaistos/LimitlessDesolation.cs index bdfa6d53f7..3f306d0f59 100644 --- a/BossMod/Modules/Endwalker/Savage/P8S2Hephaistos/LimitlessDesolation.cs +++ b/BossMod/Modules/Endwalker/Savage/P8S2Hephaistos/LimitlessDesolation.cs @@ -106,4 +106,4 @@ public override void OnEventEnvControl(byte index, uint state) } } -class LimitlessDesolationTyrantsFlare(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TyrantsFlareLimitless), 8); +class LimitlessDesolationTyrantsFlare(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TyrantsFlareLimitless), 8); diff --git a/BossMod/Modules/Endwalker/Savage/P8S2Hephaistos/P8S2.cs b/BossMod/Modules/Endwalker/Savage/P8S2Hephaistos/P8S2.cs index ed5afc58c0..610ee0b043 100644 --- a/BossMod/Modules/Endwalker/Savage/P8S2Hephaistos/P8S2.cs +++ b/BossMod/Modules/Endwalker/Savage/P8S2Hephaistos/P8S2.cs @@ -1,6 +1,6 @@ namespace BossMod.Endwalker.Savage.P8S2; -class TyrantsFlare(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TyrantsFlareAOE), 6); +class TyrantsFlare(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TyrantsFlareAOE), 6); // TODO: autoattack component // TODO: HC components diff --git a/BossMod/Modules/Endwalker/Savage/P9SKokytos/ArchaicRockbreaker.cs b/BossMod/Modules/Endwalker/Savage/P9SKokytos/ArchaicRockbreaker.cs index 58ce2448df..5104175a62 100644 --- a/BossMod/Modules/Endwalker/Savage/P9SKokytos/ArchaicRockbreaker.cs +++ b/BossMod/Modules/Endwalker/Savage/P9SKokytos/ArchaicRockbreaker.cs @@ -1,6 +1,6 @@ namespace BossMod.Endwalker.Savage.P9SKokytos; -class ArchaicRockbreakerCenter(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ArchaicRockbreakerCenter), 6); +class ArchaicRockbreakerCenter(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ArchaicRockbreakerCenter), 6); class ArchaicRockbreakerShockwave(BossModule module) : Components.Knockback(module, ActionID.MakeSpell(AID.ArchaicRockbreakerShockwave), true) { @@ -40,7 +40,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) } } -class ArchaicRockbreakerLine(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ArchaicRockbreakerLine), 8, maxCasts: 8); +class ArchaicRockbreakerLine(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ArchaicRockbreakerLine), 8, maxCasts: 8); class ArchaicRockbreakerCombination(BossModule module) : Components.GenericAOEs(module) { diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheExcitatron6000/LuckyFace.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheExcitatron6000/LuckyFace.cs index 761f1f88cd..bf4bb106f3 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheExcitatron6000/LuckyFace.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheExcitatron6000/LuckyFace.cs @@ -72,7 +72,7 @@ class QuakeInYourBootsCircle(BossModule module) : QuakeCircle(module, AID.QuakeI class QuakeInYourBootsDonut(BossModule module) : QuakeDonut(module, AID.QuakeInYourBootsDonut); class QuakeMeAwayDonut(BossModule module) : QuakeDonut(module, AID.QuakeMeAwayDonut); -class HeartOnFireII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeartOnFireII), 6); +class HeartOnFireII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeartOnFireII), 6); class HeartOnFireIV(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.HeartOnFireIV)); class HeartOnFireIII(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.HeartOnFireIII), 6); class TempersFlare(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.TempersFlare)); diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouAcheloios.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouAcheloios.cs index ace542f23a..89de8a50f2 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouAcheloios.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouAcheloios.cs @@ -128,7 +128,7 @@ private void InitIfReady(Actor source) } class VolcanicHowl(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.VolcanicHowl)); -class Earthbreak(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Earthbreak), 5); +class Earthbreak(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Earthbreak), 5); class DeadlyHold(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.DeadlyHold)); class TailSwing(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TailSwing), new AOEShapeCircle(13)); class CriticalBite(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.CriticalBite), new AOEShapeCone(10, 60.Degrees())); @@ -140,7 +140,7 @@ class HeirloomScream(BossModule module) : Mandragoras(module, AID.HeirloomScream class PungentPirouette(BossModule module) : Mandragoras(module, AID.PungentPirouette); class Pollen(BossModule module) : Mandragoras(module, AID.Pollen); -class HeavySmash(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); +class HeavySmash(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); class GymnasiouAcheloiosStates : StateMachineBuilder { diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouLeon.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouLeon.cs index 4ba2a46070..2c058dc273 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouLeon.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouLeon.cs @@ -43,7 +43,7 @@ class FlareStar(BossModule module) : Circles(module, AID.FlareStar); class MarkOfTheBeast(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MarkOfTheBeast), new AOEShapeCone(8, 60.Degrees())); class Pounce(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Pounce)); -class MagmaChamber(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MagmaChamber), 8); +class MagmaChamber(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MagmaChamber), 8); abstract class Mandragoras(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCircle(7)); class PluckAndPrune(BossModule module) : Mandragoras(module, AID.PluckAndPrune); @@ -52,7 +52,7 @@ class HeirloomScream(BossModule module) : Mandragoras(module, AID.HeirloomScream class PungentPirouette(BossModule module) : Mandragoras(module, AID.PungentPirouette); class Pollen(BossModule module) : Mandragoras(module, AID.Pollen); -class HeavySmash(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); +class HeavySmash(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); class GymnasiouLeonStates : StateMachineBuilder { diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMandragoras.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMandragoras.cs index bae3fcdefc..8342b47316 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMandragoras.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMandragoras.cs @@ -30,7 +30,7 @@ public enum AID : uint class Ram(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Ram)); class SaibaiMandragora(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.SaibaiMandragora), "Calls adds"); -class LeafDagger(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LeafDagger), 3); +class LeafDagger(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LeafDagger), 3); abstract class Mandragoras(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCircle(7)); class PluckAndPrune(BossModule module) : Mandragoras(module, AID.PluckAndPrune); diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMegakantha.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMegakantha.cs index 94b9537a99..dd1048e46a 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMegakantha.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMegakantha.cs @@ -41,7 +41,7 @@ public enum AID : uint Telega = 9630 // Mandragoras/Lyssa/Lampas->self, no cast, single-target, bonus add disappear } -class SludgeBomb(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SludgeBomb2), 8); +class SludgeBomb(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SludgeBomb2), 8); class RustlingWind(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RustlingWind), new AOEShapeRect(15, 2)); class AcidMist(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AcidMist), new AOEShapeCircle(6)); class OdiousAir(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.OdiousAir), new AOEShapeCone(12, 60.Degrees())); @@ -84,7 +84,7 @@ class HeirloomScream(BossModule module) : Mandragoras(module, AID.HeirloomScream class PungentPirouette(BossModule module) : Mandragoras(module, AID.PungentPirouette); class Pollen(BossModule module) : Mandragoras(module, AID.Pollen); -class HeavySmash(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); +class HeavySmash(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); class GymnasiouMegakanthaStates : StateMachineBuilder { diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMeganereis.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMeganereis.cs index e9bde39a52..97a01b4b8c 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMeganereis.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMeganereis.cs @@ -65,8 +65,8 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme } } -class Hydrobomb(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hydrobomb), 10); -class Waterspout(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Waterspout), 8); +class Hydrobomb(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hydrobomb), 10); +class Waterspout(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Waterspout), 8); class Hydrocannon(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Hydrocannon), new AOEShapeRect(17, 1.5f)); class Hydrocannon2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Hydrocannon2), new AOEShapeRect(27, 3)); class FallingWater(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.FallingWater), 8); @@ -79,7 +79,7 @@ class HeirloomScream(BossModule module) : Mandragoras(module, AID.HeirloomScream class PungentPirouette(BossModule module) : Mandragoras(module, AID.PungentPirouette); class Pollen(BossModule module) : Mandragoras(module, AID.Pollen); -class HeavySmash(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); +class HeavySmash(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); class GymnasiouMeganereisStates : StateMachineBuilder { diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouPithekos.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouPithekos.cs index 140c8c1757..542ee9da79 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouPithekos.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouPithekos.cs @@ -44,7 +44,7 @@ public enum IconID : uint class Spark(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Spark), new AOEShapeDonut(14, 30)); class SweepingGouge(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.SweepingGouge)); -class Thundercall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Thundercall), 3); +class Thundercall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Thundercall), 3); class Thundercall2(BossModule module) : Components.GenericBaitAway(module) { @@ -78,8 +78,8 @@ public override void AddHints(int slot, Actor actor, TextHints hints) } } -class RockThrow(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RockThrow), 6); -class LightningBolt(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LightningBolt), 6); +class RockThrow(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RockThrow), 6); +class LightningBolt(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LightningBolt), 6); class ThunderIV(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ThunderIV), new AOEShapeCircle(18)); abstract class Mandragoras(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCircle(7)); @@ -89,7 +89,7 @@ class HeirloomScream(BossModule module) : Mandragoras(module, AID.HeirloomScream class PungentPirouette(BossModule module) : Mandragoras(module, AID.PungentPirouette); class Pollen(BossModule module) : Mandragoras(module, AID.Pollen); -class HeavySmash(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); +class HeavySmash(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); class GymnasiouPithekosStates : StateMachineBuilder { diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouSatyros.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouSatyros.cs index 8611351f21..02b3a77c9b 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouSatyros.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouSatyros.cs @@ -31,12 +31,12 @@ public enum AID : uint } class StormWing(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.StormWing), new AOEShapeCone(40, 45.Degrees())); -class FlashGale(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FlashGale), 6); +class FlashGale(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FlashGale), 6); class WindCutter(BossModule module) : Components.PersistentVoidzone(module, 4, m => m.Enemies(OID.StormsGrip)); class Wingblow(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Wingblow), new AOEShapeCircle(15)); class DreadDive(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.DreadDive)); -class HeavySmash(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); +class HeavySmash(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); class GymnasiouSatyrosStates : StateMachineBuilder { diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouSphinx.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouSphinx.cs index 24e37ffdac..9f16728cc2 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouSphinx.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouSphinx.cs @@ -48,7 +48,7 @@ class Scratch(BossModule module) : Components.SingleTargetCast(module, ActionID. class MoltingPlumage(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.MoltingPlumage)); class AlpineDraft(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AlpineDraft), new AOEShapeRect(45, 2.5f)); class FeatherRain(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.FeatherRain), 6); -class AeroII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AeroII), 4); +class AeroII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AeroII), 4); abstract class Mandragoras(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCircle(7)); class PluckAndPrune(BossModule module) : Mandragoras(module, AID.PluckAndPrune); @@ -57,7 +57,7 @@ class HeirloomScream(BossModule module) : Mandragoras(module, AID.HeirloomScream class PungentPirouette(BossModule module) : Mandragoras(module, AID.PungentPirouette); class Pollen(BossModule module) : Mandragoras(module, AID.Pollen); -class HeavySmash(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); +class HeavySmash(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); class GymnasiouSphinxStates : StateMachineBuilder { diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouStyphnolobion.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouStyphnolobion.cs index 45b2000f76..14c8444811 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouStyphnolobion.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouStyphnolobion.cs @@ -41,7 +41,7 @@ public enum AID : uint class Rake(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Rake)); class Tiiimbeeer(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Tiiimbeeer)); -class StoneIII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.StoneIII2), 6); +class StoneIII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.StoneIII2), 6); class EarthShaker(BossModule module) : Components.BaitAwayCast(module, ActionID.MakeSpell(AID.EarthShaker2), new AOEShapeCone(60, 15.Degrees()), endsOnCastEvent: true); class EarthQuaker(BossModule module) : Components.ConcentricAOEs(module, _shapes) @@ -76,7 +76,7 @@ class HeirloomScream(BossModule module) : Mandragoras(module, AID.HeirloomScream class PungentPirouette(BossModule module) : Mandragoras(module, AID.PungentPirouette); class Pollen(BossModule module) : Mandragoras(module, AID.Pollen); -class HeavySmash(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); +class HeavySmash(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); class GymnasiouStyphnolobionStates : StateMachineBuilder { diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouTigris.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouTigris.cs index d807f0c0b4..328e97660a 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouTigris.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouTigris.cs @@ -34,7 +34,7 @@ public enum AID : uint class AbsoluteZero(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AbsoluteZero), new AOEShapeCone(45, 45.Degrees())); class FrumiousJaws(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.FrumiousJaws)); -class BlizzardIII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BlizzardIII), 6); +class BlizzardIII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BlizzardIII), 6); class Eyeshine(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.Eyeshine)); class CatchingClaws(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.CatchingClaws), new AOEShapeCone(12, 45.Degrees())); @@ -45,7 +45,7 @@ class HeirloomScream(BossModule module) : Mandragoras(module, AID.HeirloomScream class PungentPirouette(BossModule module) : Mandragoras(module, AID.PungentPirouette); class Pollen(BossModule module) : Mandragoras(module, AID.Pollen); -class HeavySmash(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); +class HeavySmash(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); class GymnasiouTigrisStates : StateMachineBuilder { diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/LampasChrysine.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/LampasChrysine.cs index 465d6a2239..e974238933 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/LampasChrysine.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/LampasChrysine.cs @@ -22,7 +22,7 @@ public enum AID : uint Telega = 9630 // GymnasiouLampas->self, no cast, single-target, bonus loot add despawn } -class Shine(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Shine2), 5); +class Shine(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Shine2), 5); class AetherialLight(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AetherialLight2), new AOEShapeCone(40, 30.Degrees()), 4) { diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/LyssaChrysine.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/LyssaChrysine.cs index 3d6555b82c..9e713c15e8 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/LyssaChrysine.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/LyssaChrysine.cs @@ -32,8 +32,8 @@ public enum AID : uint Telega = 9630 // GymnasiouLyssa/Lampas->self, no cast, single-target, bonus add disappear } -class HeavySmash2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeavySmash2), 6); -class FrigidStone(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FrigidStone), 5); +class HeavySmash2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeavySmash2), 6); +class FrigidStone(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FrigidStone), 5); class FrigidNeedle(BossModule module) : Components.ConcentricAOEs(module, _shapes) { diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/Narkissos.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/Narkissos.cs index a05beccbbc..5dc27d500f 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/Narkissos.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/Narkissos.cs @@ -45,7 +45,7 @@ class Brainstorm(BossModule module) : Components.StatusDrivenForcedMarch(module, class FetchingFulgence(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.FetchingFulgence)); class Lash(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Lash)); -class PotentPerfume(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.PotentPerfume), 8); +class PotentPerfume(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.PotentPerfume), 8); class SapShowerTendrilsHint(BossModule module) : BossComponent(module) { @@ -79,7 +79,7 @@ public override void AddGlobalHints(GlobalHints hints) } } -class SapShower : Components.LocationTargetedAOEs +class SapShower : Components.SimpleAOEs { public SapShower(BossModule module) : base(module, ActionID.MakeSpell(AID.SapShower), 8) { @@ -93,7 +93,7 @@ class RockHard(BossModule module) : Components.SpreadFromCastTargets(module, Act class BeguilingGasTM(BossModule module) : Components.TemporaryMisdirection(module, ActionID.MakeSpell(AID.BeguilingGas)); class BeguilingGas(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.BeguilingGas)); -class HeavySmash(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); +class HeavySmash(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeavySmash), 6); class NarkissosStates : StateMachineBuilder { diff --git a/BossMod/Modules/Endwalker/Ultimate/DSW1/PureOfHeart.cs b/BossMod/Modules/Endwalker/Ultimate/DSW1/PureOfHeart.cs index f33d58960f..08f5e9ea43 100644 --- a/BossMod/Modules/Endwalker/Ultimate/DSW1/PureOfHeart.cs +++ b/BossMod/Modules/Endwalker/Ultimate/DSW1/PureOfHeart.cs @@ -60,4 +60,4 @@ public override void OnStatusLose(Actor actor, ActorStatus status) } } -class PureOfHeartSkyblind(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Skyblind), 3); +class PureOfHeartSkyblind(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Skyblind), 3); diff --git a/BossMod/Modules/Endwalker/Ultimate/DSW2/P2SanctityOfTheWard2.cs b/BossMod/Modules/Endwalker/Ultimate/DSW2/P2SanctityOfTheWard2.cs index 647dfb2619..3a545c1a27 100644 --- a/BossMod/Modules/Endwalker/Ultimate/DSW2/P2SanctityOfTheWard2.cs +++ b/BossMod/Modules/Endwalker/Ultimate/DSW2/P2SanctityOfTheWard2.cs @@ -1,6 +1,6 @@ namespace BossMod.Endwalker.Ultimate.DSW2; -class P2SanctityOfTheWard2HeavensStakeCircles(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeavensStakeAOE), 7); +class P2SanctityOfTheWard2HeavensStakeCircles(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeavensStakeAOE), 7); class P2SanctityOfTheWard2HeavensStakeDonut(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.HeavensStakeDonut), new AOEShapeDonut(15, 30)); class P2SanctityOfTheWard2VoidzoneFire(BossModule module) : Components.PersistentVoidzone(module, 7, m => m.Enemies(OID.VoidzoneFire).Where(z => z.EventState != 7)); class P2SanctityOfTheWard2VoidzoneIce(BossModule module) : Components.PersistentVoidzone(module, 7, m => m.Enemies(OID.VoidzoneIce).Where(z => z.EventState != 7)); diff --git a/BossMod/Modules/Endwalker/Ultimate/DSW2/P2StrengthOfTheWard2.cs b/BossMod/Modules/Endwalker/Ultimate/DSW2/P2StrengthOfTheWard2.cs index f03a9942e5..f8f91a829b 100644 --- a/BossMod/Modules/Endwalker/Ultimate/DSW2/P2StrengthOfTheWard2.cs +++ b/BossMod/Modules/Endwalker/Ultimate/DSW2/P2StrengthOfTheWard2.cs @@ -94,7 +94,7 @@ private IEnumerable EnumSafeSpots(Actor player) } // growing voidzones -class P2StrengthOfTheWard2Voidzones(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DimensionalCollapseAOE), 9); +class P2StrengthOfTheWard2Voidzones(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DimensionalCollapseAOE), 9); // charges on tethered targets class P2StrengthOfTheWard2Charges(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.HolyShieldBash)) diff --git a/BossMod/Modules/Endwalker/Ultimate/DSW2/P5WrathOfTheHeavens.cs b/BossMod/Modules/Endwalker/Ultimate/DSW2/P5WrathOfTheHeavens.cs index 3efaec690e..8415a84df9 100644 --- a/BossMod/Modules/Endwalker/Ultimate/DSW2/P5WrathOfTheHeavens.cs +++ b/BossMod/Modules/Endwalker/Ultimate/DSW2/P5WrathOfTheHeavens.cs @@ -170,7 +170,7 @@ private WPos SafeSpot() class P5WrathOfTheHeavensLiquidHeaven(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 6, ActionID.MakeSpell(AID.LiquidHeaven), m => m.Enemies(OID.VoidzoneLiquidHeaven).Where(z => z.EventState != 7), 1.1f); // TODO: detect baiter -class P5WrathOfTheHeavensAltarFlare(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AltarFlareAOE), 8); +class P5WrathOfTheHeavensAltarFlare(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AltarFlareAOE), 8); class P5WrathOfTheHeavensEmptyDimension(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.EmptyDimension), new AOEShapeDonut(6, 70)) { diff --git a/BossMod/Modules/Endwalker/Ultimate/TOP/P1Pantokrator.cs b/BossMod/Modules/Endwalker/Ultimate/TOP/P1Pantokrator.cs index bed7a8c5ff..3ae87113ad 100644 --- a/BossMod/Modules/Endwalker/Ultimate/TOP/P1Pantokrator.cs +++ b/BossMod/Modules/Endwalker/Ultimate/TOP/P1Pantokrator.cs @@ -1,6 +1,6 @@ namespace BossMod.Endwalker.Ultimate.TOP; -class P1BallisticImpact(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BallisticImpact), 5); +class P1BallisticImpact(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BallisticImpact), 5); class P1FlameThrower(BossModule module) : Components.GenericAOEs(module) { diff --git a/BossMod/Modules/Endwalker/Ultimate/TOP/P5Delta.cs b/BossMod/Modules/Endwalker/Ultimate/TOP/P5Delta.cs index 96a45aea12..3b8d8a4ce8 100644 --- a/BossMod/Modules/Endwalker/Ultimate/TOP/P5Delta.cs +++ b/BossMod/Modules/Endwalker/Ultimate/TOP/P5Delta.cs @@ -375,7 +375,7 @@ public override void OnActorPlayActionTimelineEvent(Actor actor, ushort id) } } -class P5DeltaExplosion(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DeltaExplosion), 3) +class P5DeltaExplosion(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DeltaExplosion), 3) { private readonly P5Delta? _delta = module.FindComponent(); diff --git a/BossMod/Modules/Endwalker/Unreal/Un1Ultima/TitanIfrit.cs b/BossMod/Modules/Endwalker/Unreal/Un1Ultima/TitanIfrit.cs index 869cb3cc31..713bc43057 100644 --- a/BossMod/Modules/Endwalker/Unreal/Un1Ultima/TitanIfrit.cs +++ b/BossMod/Modules/Endwalker/Unreal/Un1Ultima/TitanIfrit.cs @@ -3,7 +3,7 @@ // both phases use radiant plumes class TitanIfrit(BossModule module) : BossComponent(module) { - private readonly List<(Actor, AOEShapeCircle)> _activeLocationTargetedAOEs = []; + private readonly List<(Actor, AOEShapeCircle)> _activeSimpleAOEs = []; private readonly List _crimsonCyclone = []; private static readonly AOEShapeCircle _aoeRadiantPlume = new(8); @@ -13,13 +13,13 @@ class TitanIfrit(BossModule module) : BossComponent(module) public override void AddHints(int slot, Actor actor, TextHints hints) { - if (_activeLocationTargetedAOEs.Any(e => e.Item2.Check(actor.Position, e.Item1.CastInfo!.LocXZ)) || _crimsonCyclone.Any(a => _aoeCrimsonCyclone.Check(actor.Position, a))) + if (_activeSimpleAOEs.Any(e => e.Item2.Check(actor.Position, e.Item1.CastInfo!.LocXZ)) || _crimsonCyclone.Any(a => _aoeCrimsonCyclone.Check(actor.Position, a))) hints.Add("GTFO from aoe!"); } public override void DrawArenaBackground(int pcSlot, Actor pc) { - foreach (var (a, aoe) in _activeLocationTargetedAOEs) + foreach (var (a, aoe) in _activeSimpleAOEs) aoe.Draw(Arena, a.CastInfo!.LocXZ); foreach (var a in _crimsonCyclone) _aoeCrimsonCyclone.Draw(Arena, a); @@ -30,13 +30,13 @@ public override void OnCastStarted(Actor caster, ActorCastInfo spell) switch ((AID)spell.Action.ID) { case AID.RadiantPlume: - _activeLocationTargetedAOEs.Add((caster, _aoeRadiantPlume)); + _activeSimpleAOEs.Add((caster, _aoeRadiantPlume)); break; case AID.WeightOfTheLand: - _activeLocationTargetedAOEs.Add((caster, _aoeWeightOfLand)); + _activeSimpleAOEs.Add((caster, _aoeWeightOfLand)); break; case AID.Eruption: - _activeLocationTargetedAOEs.Add((caster, _aoeEruption)); + _activeSimpleAOEs.Add((caster, _aoeEruption)); break; case AID.CrimsonCyclone: _crimsonCyclone.Add(caster); @@ -51,7 +51,7 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) case AID.RadiantPlume: case AID.WeightOfTheLand: case AID.Eruption: - _activeLocationTargetedAOEs.RemoveAll(e => e.Item1 == caster); + _activeSimpleAOEs.RemoveAll(e => e.Item1 == caster); break; case AID.CrimsonCyclone: _crimsonCyclone.Remove(caster); diff --git a/BossMod/Modules/Endwalker/Unreal/Un3Sophia/Un3Sophia.cs b/BossMod/Modules/Endwalker/Unreal/Un3Sophia/Un3Sophia.cs index f8f88183bc..cd1fd9c9c5 100644 --- a/BossMod/Modules/Endwalker/Unreal/Un3Sophia/Un3Sophia.cs +++ b/BossMod/Modules/Endwalker/Unreal/Un3Sophia/Un3Sophia.cs @@ -11,8 +11,8 @@ class Onrush(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Onrush), new AOEShapeRect(55, 8, 5)); class Gnosis(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.Gnosis), 25); class Cintamani(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.Cintamani)); // note: ~4.2s before first cast boss gets model state 5 -class QuasarProximity1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.QuasarProximity1), 15); -class QuasarProximity2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.QuasarProximity2), 15); // TODO: reconsider distance +class QuasarProximity1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.QuasarProximity1), 15); +class QuasarProximity2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.QuasarProximity2), 15); // TODO: reconsider distance [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.RemovedUnreal, GroupID = 926, NameID = 5199, PlanLevel = 90)] public class Un3Sophia(WorldState ws, Actor primary) : BossModule(ws, primary, new(0, 0), new ArenaBoundsRect(20, 15)); diff --git a/BossMod/Modules/Endwalker/Unreal/Un4Zurvan/P2Adds.cs b/BossMod/Modules/Endwalker/Unreal/Un4Zurvan/P2Adds.cs index ac982dbb1c..6b4533656f 100644 --- a/BossMod/Modules/Endwalker/Unreal/Un4Zurvan/P2Adds.cs +++ b/BossMod/Modules/Endwalker/Unreal/Un4Zurvan/P2Adds.cs @@ -5,5 +5,5 @@ class P2ExecratedWit(BossModule module) : Components.Adds(module, (uint)OID.Exec class P2ExecratedWile(BossModule module) : Components.Adds(module, (uint)OID.ExecratedWile); // low-priority add (casts fear, then magical autos) class P2ExecratedThew(BossModule module) : Components.Adds(module, (uint)OID.ExecratedThew); // small add -class P2Comet(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Comet), 4); +class P2Comet(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Comet), 4); class P2MeracydianFear(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.MeracydianFear)); diff --git a/BossMod/Modules/Endwalker/Unreal/Un4Zurvan/Un4Zurvan.cs b/BossMod/Modules/Endwalker/Unreal/Un4Zurvan/Un4Zurvan.cs index 1c0905c0cf..3f4cd579e1 100644 --- a/BossMod/Modules/Endwalker/Unreal/Un4Zurvan/Un4Zurvan.cs +++ b/BossMod/Modules/Endwalker/Unreal/Un4Zurvan/Un4Zurvan.cs @@ -1,14 +1,14 @@ namespace BossMod.Endwalker.Unreal.Un4Zurvan; class P1MetalCutter(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.MetalCutterP1), new AOEShapeCone(37.44f, 45.Degrees()), (uint)OID.BossP1); -class P1FlareStar(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FlareStarAOE), 6); +class P1FlareStar(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FlareStarAOE), 6); class P1Purge(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.Purge)); class P2MetalCutter(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.MetalCutterP2), new AOEShapeCone(37.44f, 45.Degrees()), (uint)OID.BossP2); class P2IcyVoidzone(BossModule module) : Components.PersistentVoidzone(module, 5, m => m.Enemies(OID.IcyVoidzone).Where(z => z.EventState != 7)); class P2BitingHalberd(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BitingHalberd), new AOEShapeCone(55.27f, 135.Degrees())); class P2TailEnd(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TailEnd), new AOEShapeCircle(15)); class P2Ciclicle(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Ciclicle), new AOEShapeDonut(10, 20)); // TODO: verify inner radius -class P2SouthernCross(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SouthernCrossAOE), 6); +class P2SouthernCross(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SouthernCrossAOE), 6); class P2SouthernCrossVoidzone(BossModule module) : Components.PersistentVoidzone(module, 6, m => m.Enemies(OID.SouthernCrossVoidzone).Where(z => z.EventState != 7)); class P2WaveCannon(BossModule module) : Components.BaitAwayCast(module, ActionID.MakeSpell(AID.WaveCannonSolo), new AOEShapeRect(55.27f, 5)); class P2TyrfingFire(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.TyrfingFire), new AOEShapeCircle(5), (uint)OID.BossP2, originAtTarget: true); diff --git a/BossMod/Modules/Endwalker/Unreal/Un5Thordan/Intermission3.cs b/BossMod/Modules/Endwalker/Unreal/Un5Thordan/Intermission3.cs index 1877c085c4..3156ba4d04 100644 --- a/BossMod/Modules/Endwalker/Unreal/Un5Thordan/Intermission3.cs +++ b/BossMod/Modules/Endwalker/Unreal/Un5Thordan/Intermission3.cs @@ -17,7 +17,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) class HiemalStormVoidzone(BossModule module) : Components.PersistentVoidzone(module, 6, m => m.Enemies(OID.HiemalStorm).Where(x => x.EventState != 7)); class SpiralPierce(BossModule module) : Components.BaitAwayTethers(module, new AOEShapeRect(50, 6), (uint)TetherID.SpiralPierce, ActionID.MakeSpell(AID.SpiralPierce)); -class DimensionalCollapse(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DimensionalCollapseAOE), 9); +class DimensionalCollapse(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DimensionalCollapseAOE), 9); class FaithUnmoving(BossModule module) : Components.Knockback(module, ActionID.MakeSpell(AID.FaithUnmoving), true) { diff --git a/BossMod/Modules/Endwalker/Unreal/Un5Thordan/Un5Thordan.cs b/BossMod/Modules/Endwalker/Unreal/Un5Thordan/Un5Thordan.cs index e7da180f49..ea417d625f 100644 --- a/BossMod/Modules/Endwalker/Unreal/Un5Thordan/Un5Thordan.cs +++ b/BossMod/Modules/Endwalker/Unreal/Un5Thordan/Un5Thordan.cs @@ -1,12 +1,12 @@ namespace BossMod.Endwalker.Unreal.Un5Thordan; class AscalonsMight(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.AscalonsMight), new AOEShapeCone(11.8f, 45.Degrees())); -class Meteorain(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MeteorainAOE), 6); +class Meteorain(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MeteorainAOE), 6); class AscalonsMercy(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AscalonsMercy), new AOEShapeCone(34.8f, 10.Degrees())); class AscalonsMercyHelper(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AscalonsMercyAOE), new AOEShapeCone(34.5f, 10.Degrees())); class DragonsRage(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.DragonsRage), 6, 8, 8); class LightningStorm(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.LightningStormAOE), 5); -class Heavensflame(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeavensflameAOE), 6); +class Heavensflame(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeavensflameAOE), 6); class Conviction(BossModule module) : Components.CastTowers(module, ActionID.MakeSpell(AID.ConvictionAOE), 3); class BurningChains(BossModule module) : Components.Chains(module, (uint)TetherID.BurningChains, ActionID.MakeSpell(AID.HolyChain)); class SerZephirin(BossModule module) : Components.Adds(module, (uint)OID.Zephirin); diff --git a/BossMod/Modules/Endwalker/Variant/V01SS/V011Geryon/V011Geryon.cs b/BossMod/Modules/Endwalker/Variant/V01SS/V011Geryon/V011Geryon.cs index ea3c787f94..00da05edb1 100644 --- a/BossMod/Modules/Endwalker/Variant/V01SS/V011Geryon/V011Geryon.cs +++ b/BossMod/Modules/Endwalker/Variant/V01SS/V011Geryon/V011Geryon.cs @@ -13,7 +13,7 @@ class ColossalCharge2(BossModule module) : Components.ChargeAOEs(module, ActionI class ColossalSwing(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ColossalSwing), new AOEShapeCone(60, 180.Degrees())); class SubterraneanShudder(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.SubterraneanShudder)); -class RunawaySludge(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RunawaySludge), 9); +class RunawaySludge(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RunawaySludge), 9); class Shockwave(BossModule module) : Components.Knockback(module) { diff --git a/BossMod/Modules/Endwalker/Variant/V01SS/V012Silkie/V012Silkie.cs b/BossMod/Modules/Endwalker/Variant/V01SS/V012Silkie/V012Silkie.cs index 9562ca99db..c7795e4f34 100644 --- a/BossMod/Modules/Endwalker/Variant/V01SS/V012Silkie/V012Silkie.cs +++ b/BossMod/Modules/Endwalker/Variant/V01SS/V012Silkie/V012Silkie.cs @@ -13,10 +13,10 @@ class TotalWash(BossModule module) : Components.RaidwideCast(module, ActionID.Ma class ChillingDuster3(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ChillingDuster3), new AOEShapeCross(60, 5)); class SlipperySoap(BossModule module) : Components.ChargeAOEs(module, ActionID.MakeSpell(AID.SlipperySoap), 5); -class SpotRemover2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SpotRemover2), 5); +class SpotRemover2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SpotRemover2), 5); -class PuffAndTumble1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.PuffAndTumble1), 4); -class PuffAndTumble2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.PuffAndTumble2), 4); +class PuffAndTumble1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.PuffAndTumble1), 4); +class PuffAndTumble2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.PuffAndTumble2), 4); class SqueakyCleanAOE1E(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SqueakyCleanAOE1E), new AOEShapeCone(60, 45.Degrees())); class SqueakyCleanAOE2E(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SqueakyCleanAOE2E), new AOEShapeCone(60, 45.Degrees())); diff --git a/BossMod/Modules/Endwalker/Variant/V01SS/V013Gladiator/V013Gladiator.cs b/BossMod/Modules/Endwalker/Variant/V01SS/V013Gladiator/V013Gladiator.cs index f9913afde7..613189382b 100644 --- a/BossMod/Modules/Endwalker/Variant/V01SS/V013Gladiator/V013Gladiator.cs +++ b/BossMod/Modules/Endwalker/Variant/V01SS/V013Gladiator/V013Gladiator.cs @@ -9,7 +9,7 @@ namespace BossMod.Endwalker.VariantCriterion.V01SS.V013Gladiator; class MightySmite(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.MightySmite)); -class BitingWindBad(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BitingWindBad), 4); +class BitingWindBad(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BitingWindBad), 4); class ShatteringSteel(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.ShatteringSteel), "Get in bigger Whirlwind to dodge"); class ViperPoisonPatterns(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 6, ActionID.MakeSpell(AID.BitingWindBad), m => m.Enemies(OID.WhirlwindBad).Where(z => z.EventState != 7), 0); diff --git a/BossMod/Modules/Endwalker/Variant/V02MR/V021Yozakura/V021Yozakura.cs b/BossMod/Modules/Endwalker/Variant/V02MR/V021Yozakura/V021Yozakura.cs index 7728995366..f25f087226 100644 --- a/BossMod/Modules/Endwalker/Variant/V02MR/V021Yozakura/V021Yozakura.cs +++ b/BossMod/Modules/Endwalker/Variant/V02MR/V021Yozakura/V021Yozakura.cs @@ -5,7 +5,7 @@ class GloryNeverlasting(BossModule module) : Components.SingleTargetDelayableCas class ArtOfTheWindblossom(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ArtOfTheWindblossom), new AOEShapeDonut(5, 60)); class KugeRantsui(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.KugeRantsui)); class OkaRanman(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.OkaRanman)); -class LevinblossomStrike(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LevinblossomStrike), 3); +class LevinblossomStrike(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LevinblossomStrike), 3); class DriftingPetals(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.DriftingPetals), 15, ignoreImmunes: true) { public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) @@ -29,10 +29,10 @@ public override bool DestinationUnsafe(int slot, Actor actor, WPos pos) => (Modu } class Mudrain(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 5, ActionID.MakeSpell(AID.Mudrain), module => module.Enemies(OID.MudVoidzone).Where(z => z.EventState != 7), 0.7f); -class Icebloom(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Icebloom), 6); +class Icebloom(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Icebloom), 6); class Shadowflight(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Shadowflight), new AOEShapeRect(10, 3)); class MudPie(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MudPie), new AOEShapeRect(60, 3)); -class FireblossomFlare(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FireblossomFlare), 6); +class FireblossomFlare(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FireblossomFlare), 6); class ArtOfTheFluff1(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.ArtOfTheFluff1)); class ArtOfTheFluff2(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.ArtOfTheFluff2)); class TatamiGaeshi(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TatamiGaeshi), new AOEShapeRect(40, 5)); diff --git a/BossMod/Modules/Endwalker/Variant/V02MR/V022Moko/Spiritflames.cs b/BossMod/Modules/Endwalker/Variant/V02MR/V022Moko/Spiritflames.cs index 7fdf0dc86c..6d9fb225f3 100644 --- a/BossMod/Modules/Endwalker/Variant/V02MR/V022Moko/Spiritflames.cs +++ b/BossMod/Modules/Endwalker/Variant/V02MR/V022Moko/Spiritflames.cs @@ -1,6 +1,6 @@ namespace BossMod.Endwalker.VariantCriterion.V02MR.V022Moko; -class Spiritflame(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Spiritflame), 6); +class Spiritflame(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Spiritflame), 6); class Spiritflames(BossModule module) : Components.GenericAOEs(module) { private const float Radius = 2.4f; diff --git a/BossMod/Modules/Endwalker/Variant/V02MR/V022Moko/V022Moko.cs b/BossMod/Modules/Endwalker/Variant/V02MR/V022Moko/V022Moko.cs index 5ac74a49b5..2223088652 100644 --- a/BossMod/Modules/Endwalker/Variant/V02MR/V022Moko/V022Moko.cs +++ b/BossMod/Modules/Endwalker/Variant/V02MR/V022Moko/V022Moko.cs @@ -3,8 +3,8 @@ namespace BossMod.Endwalker.VariantCriterion.V02MR.V022Moko; class AzureAuspice(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AzureAuspice), new AOEShapeDonut(6, 60)); class BoundlessAzure(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BoundlessAzure), new AOEShapeRect(30, 5, 30)); class KenkiRelease(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.KenkiRelease)); -class IronRain(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.IronRain), 10); -class Unsheathing(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Unsheathing), 3); +class IronRain(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.IronRain), 10); +class Unsheathing(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Unsheathing), 3); class VeilSever(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.VeilSever), new AOEShapeRect(40, 2.5f)); class ScarletAuspice(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ScarletAuspice), new AOEShapeCircle(6)); class MoonlessNight(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.MoonlessNight)); @@ -23,7 +23,7 @@ public override IEnumerable ActiveAOEs(int slot, Actor actor) } } -class GhastlyGrasp(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GhastlyGrasp), 5); +class GhastlyGrasp(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GhastlyGrasp), 5); [ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "The Combat Reborn Team (Malediktus, LTS)", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 945, NameID = 12357, SortOrder = 2)] public class V022MokoOtherPaths(WorldState ws, Actor primary) : BossModule(ws, primary, ArenaChange.ArenaCenter, ArenaChange.StartingBounds); diff --git a/BossMod/Modules/Endwalker/Variant/V02MR/V023Gorai/V023Gorai.cs b/BossMod/Modules/Endwalker/Variant/V02MR/V023Gorai/V023Gorai.cs index 3604595888..446468f824 100644 --- a/BossMod/Modules/Endwalker/Variant/V02MR/V023Gorai/V023Gorai.cs +++ b/BossMod/Modules/Endwalker/Variant/V02MR/V023Gorai/V023Gorai.cs @@ -1,7 +1,7 @@ namespace BossMod.Endwalker.VariantCriterion.V02MR.V023Gorai; class Unenlightenment(BossModule module) : Components.RaidwideCastDelay(module, ActionID.MakeSpell(AID.Unenlightenment), ActionID.MakeSpell(AID.UnenlightenmentAOE), 0.5f); -class SpikeOfFlameAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SpikeOfFlameAOE), 5); +class SpikeOfFlameAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SpikeOfFlameAOE), 5); class StringSnap(BossModule module) : Components.ConcentricAOEs(module, _shapes) { @@ -39,7 +39,7 @@ public override void AddGlobalHints(GlobalHints hints) } class PureShock(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.PureShock)); -class HumbleHammer(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HumbleHammer), 3); +class HumbleHammer(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HumbleHammer), 3); class FightingSpirits(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.FightingSpirits)); class BiwaBreaker(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.BiwaBreakerFirst), "Raidwide x5"); diff --git a/BossMod/Modules/Endwalker/Variant/V02MR/V024Shishio/FocusedTremor.cs b/BossMod/Modules/Endwalker/Variant/V02MR/V024Shishio/FocusedTremor.cs index e769e2ab2b..aaf9b61026 100644 --- a/BossMod/Modules/Endwalker/Variant/V02MR/V024Shishio/FocusedTremor.cs +++ b/BossMod/Modules/Endwalker/Variant/V02MR/V024Shishio/FocusedTremor.cs @@ -14,7 +14,7 @@ public override IEnumerable ActiveAOEs(int slot, Actor actor) if (_aoe == default) yield break; - var isCasterActive = _yokiUzu.ActiveCasters.Any(); + var isCasterActive = _yokiUzu.ActiveCasters.Count != 0; var firstAOEActivation = _yokiUzu.ActiveAOEs(slot, actor).FirstOrDefault().Activation; var sixFulmsUnderStatus = actor.FindStatus(SID.SixFulmsUnder); var expireAt = sixFulmsUnderStatus?.ExpireAt ?? DateTime.MaxValue; diff --git a/BossMod/Modules/Endwalker/Variant/V02MR/V024Shishio/V024Shishio.cs b/BossMod/Modules/Endwalker/Variant/V02MR/V024Shishio/V024Shishio.cs index cacc4313ca..c55247bd93 100644 --- a/BossMod/Modules/Endwalker/Variant/V02MR/V024Shishio/V024Shishio.cs +++ b/BossMod/Modules/Endwalker/Variant/V02MR/V024Shishio/V024Shishio.cs @@ -18,7 +18,7 @@ class CloudToCloud1(BossModule module) : CloudToCloud(module, AID.CloudToCloud1, class CloudToCloud2(BossModule module) : CloudToCloud(module, AID.CloudToCloud2, 3, 4); class CloudToCloud3(BossModule module) : CloudToCloud(module, AID.CloudToCloud3, 6, 2); -class Thunder(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 6); +class Thunder(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 6); class ThunderOnefold(BossModule module) : Thunder(module, AID.ThunderOnefold); class ThunderTwofold(BossModule module) : Thunder(module, AID.ThunderTwofold); class ThunderThreefold(BossModule module) : Thunder(module, AID.ThunderThreefold); @@ -39,7 +39,7 @@ class UnsagelySpin(BossModule module) : Circles(module, AID.UnsagelySpin); class Yoki(BossModule module) : Circles(module, AID.Yoki); class Rush(BossModule module) : Components.ChargeAOEs(module, ActionID.MakeSpell(AID.Rush), 4); -class Vasoconstrictor(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Vasoconstrictor), 5); +class Vasoconstrictor(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Vasoconstrictor), 5); class Swipe(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCone(40, 90.Degrees())); class RightSwipe(BossModule module) : Swipe(module, AID.RightSwipe); diff --git a/BossMod/Modules/Endwalker/Variant/V02MR/V025Enenra/V025Enenra.cs b/BossMod/Modules/Endwalker/Variant/V02MR/V025Enenra/V025Enenra.cs index 617a43d033..61f83e653f 100644 --- a/BossMod/Modules/Endwalker/Variant/V02MR/V025Enenra/V025Enenra.cs +++ b/BossMod/Modules/Endwalker/Variant/V02MR/V025Enenra/V025Enenra.cs @@ -1,7 +1,7 @@ namespace BossMod.Endwalker.VariantCriterion.V02MR.V025Enenra; class PipeCleaner(BossModule module) : Components.BaitAwayTethers(module, new AOEShapeRect(60, 5), (uint)TetherID.PipeCleaner); -class Uplift(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Uplift), 6); +class Uplift(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Uplift), 6); class Snuff(BossModule module) : Components.BaitAwayCast(module, ActionID.MakeSpell(AID.Snuff), new AOEShapeCircle(6), true) { public override void AddGlobalHints(GlobalHints hints) diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage04GentlemanPreferSwords/Stage04Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage04GentlemanPreferSwords/Stage04Act2.cs index bc09e0e965..cf99158d5e 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage04GentlemanPreferSwords/Stage04Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage04GentlemanPreferSwords/Stage04Act2.cs @@ -17,7 +17,7 @@ public enum AID : uint } class GrandStrike(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GrandStrike), new AOEShapeRect(77.5f, 2)); -class MagitekRay(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MagitekRay), 6); +class MagitekRay(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MagitekRay), 6); class MagitekField(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.MagitekField)); class Hints(BossModule module) : BossComponent(module) diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage08BombedyOfErrors/Stage08Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage08BombedyOfErrors/Stage08Act2.cs index 3acab69dad..6ff24a25c7 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage08BombedyOfErrors/Stage08Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage08BombedyOfErrors/Stage08Act2.cs @@ -16,7 +16,7 @@ public enum AID : uint Burst = 14680, // 270B->self, 6.0s cast, range 50 circle } -class Sap(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Sap), 8); +class Sap(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Sap), 8); class Burst(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.Burst)); class Selfdetonations(BossModule module) : BossComponent(module) diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage09ToKillAMockingslime/Stage09.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage09ToKillAMockingslime/Stage09.cs index 6ac69b3a96..cdc4bfd61a 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage09ToKillAMockingslime/Stage09.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage09ToKillAMockingslime/Stage09.cs @@ -27,7 +27,7 @@ public enum AID : uint class GoldenTongue(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.GoldenTongue)); class DarkVoidzone(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 4, ActionID.MakeSpell(AID.Dark), m => m.Enemies(OID.DarkVoidzone).Where(e => e.EventState != 7), 1); -class Dark(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Dark), 5); +class Dark(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Dark), 5); class Hints(BossModule module) : BossComponent(module) { diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage10ALittleKnightMusic/Stage10.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage10ALittleKnightMusic/Stage10.cs index 198b55c426..889f3cd794 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage10ALittleKnightMusic/Stage10.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage10ALittleKnightMusic/Stage10.cs @@ -25,7 +25,7 @@ public enum AID : uint class IronJustice3(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.IronJustice3), new AOEShapeCone(10, 60.Degrees())); class IronJustice4(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.IronJustice4), new AOEShapeCone(10.5f, 60.Degrees())); class BlackNebula(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.BlackNebula)); -class Cloudcover1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Cloudcover1), 6); +class Cloudcover1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Cloudcover1), 6); class KingsWill1(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.KingsWill)); class KingsWill2(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.KingsWill2)); class KingsWill3(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.KingsWill3)); diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage13BeautyAndABeast/Stage13Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage13BeautyAndABeast/Stage13Act2.cs index c2205b64cc..d396c26305 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage13BeautyAndABeast/Stage13Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage13BeautyAndABeast/Stage13Act2.cs @@ -25,9 +25,9 @@ public enum AID : uint BloodRain = 14882, // 26F8->location, 3.0s cast, range 50 circle } -class VoidFireII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.VoidFireII), 5); -class VoidFireIV(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.VoidFireIV), 10); -class VoidFireIV3(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.VoidFireIV3), 6); +class VoidFireII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.VoidFireII), 5); +class VoidFireIV(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.VoidFireIV), 10); +class VoidFireIV3(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.VoidFireIV3), 6); class VoidAero(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.VoidAero), new AOEShapeRect(42, 4)); class DarkSabbath(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.DarkSabbath)); class DarkMist(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DarkMist), new AOEShapeCircle(10)); diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage18MidsummerNightsExplosion/Stage18Act1.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage18MidsummerNightsExplosion/Stage18Act1.cs index 18c4945f6a..9b752a7861 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage18MidsummerNightsExplosion/Stage18Act1.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage18MidsummerNightsExplosion/Stage18Act1.cs @@ -17,7 +17,7 @@ public enum AID : uint } class Explosion(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Explosion), new AOEShapeCircle(10)); -class Fireball(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Fireball), 6); +class Fireball(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Fireball), 6); class RipperClaw(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RipperClaw), new AOEShapeCone(8, 45.Degrees())); class TailSmash(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TailSmash), new AOEShapeCone(15, 45.Degrees())); diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage18MidsummerNightsExplosion/Stage18Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage18MidsummerNightsExplosion/Stage18Act2.cs index be12730750..d76611df23 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage18MidsummerNightsExplosion/Stage18Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage18MidsummerNightsExplosion/Stage18Act2.cs @@ -17,7 +17,7 @@ public enum AID : uint } class Explosion(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Explosion), new AOEShapeCircle(10)); -class Fireball(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Fireball), 6); +class Fireball(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Fireball), 6); class RipperClaw(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RipperClaw), new AOEShapeCone(8, 45.Degrees())); class TailSmash(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TailSmash), new AOEShapeCone(15, 45.Degrees())); diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage20MissTyphon/Stage20Act1.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage20MissTyphon/Stage20Act1.cs index ed32da07bc..6d5ca6924f 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage20MissTyphon/Stage20Act1.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage20MissTyphon/Stage20Act1.cs @@ -13,7 +13,7 @@ public enum AID : uint Fireball2 = 14707, // 272A->player, no cast, range 8 circle, 3 casts after snort } -class Fireball(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Fireball), 8); +class Fireball(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Fireball), 8); class Snort(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.Snort), "Use Diamondback!"); class SnortKB(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.Snort), 30, kind: Kind.AwayFromOrigin, stopAtWall: true); // knockback actually delayed by 0.7s diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage20MissTyphon/Stage20Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage20MissTyphon/Stage20Act2.cs index 0a6b313a43..0ed887caf4 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage20MissTyphon/Stage20Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage20MissTyphon/Stage20Act2.cs @@ -17,8 +17,8 @@ public enum AID : uint class AquaBreath(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AquaBreath), new AOEShapeCone(13.1f, 45.Degrees())); class Megavolt(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Megavolt), new AOEShapeCircle(11.1f)); -class Waterspout(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Waterspout), 4); -class LightningBolt(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LightningBolt), 3); +class Waterspout(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Waterspout), 4); +class LightningBolt(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LightningBolt), 3); class ImpSong(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.ImpSong)); class Hints(BossModule module) : BossComponent(module) diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage20MissTyphon/Stage20Act3.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage20MissTyphon/Stage20Act3.cs index 6b3d7ec799..d60edbfeec 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage20MissTyphon/Stage20Act3.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage20MissTyphon/Stage20Act3.cs @@ -26,7 +26,7 @@ public enum AID : uint class Tentacle(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Tentacle), new AOEShapeCircle(8)); class Wallop(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Wallop), new AOEShapeRect(57.2f, 5)); class WallopKB(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.Wallop), 20, kind: Kind.AwayFromOrigin); //knockback actually delayed by 0.8s -class Fireball(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Fireball), 8); +class Fireball(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Fireball), 8); class ImpSong(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.ImpSong), showNameInHint: true); class Snort(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.Snort), "Use Diamondback!"); class SnortKB(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.Snort), 30, kind: Kind.AwayFromOrigin); //knockback actually delayed by 0.7s diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage21ChimeraOnAHotTinRoof/Stage21Act1.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage21ChimeraOnAHotTinRoof/Stage21Act1.cs index 8b4e674989..e721063b43 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage21ChimeraOnAHotTinRoof/Stage21Act1.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage21ChimeraOnAHotTinRoof/Stage21Act1.cs @@ -12,7 +12,7 @@ public enum AID : uint Icefall = 15064, // Boss->location, 2.5s cast, range 5 circle } -class Icefall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Icefall), 5); +class Icefall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Icefall), 5); class VoidBlizzard(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.VoidBlizzard)); class Hints(BossModule module) : BossComponent(module) diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage21ChimeraOnAHotTinRoof/Stage21Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage21ChimeraOnAHotTinRoof/Stage21Act2.cs index 947eff18ed..552017ad88 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage21ChimeraOnAHotTinRoof/Stage21Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage21ChimeraOnAHotTinRoof/Stage21Act2.cs @@ -23,7 +23,7 @@ class TheRamsKeeper(BossModule module) : Components.PersistentVoidzoneAtCastTarg class TheRamsKeeperHint(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.TheRamsKeeper)); class TheRamsVoice(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TheRamsVoice), new AOEShapeCircle(9)); class TheDragonsVoice(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TheDragonsVoice), new AOEShapeDonut(8, 30)); -class Icefall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Icefall), 5); +class Icefall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Icefall), 5); class VoidBlizzard(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.VoidBlizzard)); class Hints(BossModule module) : BossComponent(module) diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage22HereComesTheBoom/Stage22Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage22HereComesTheBoom/Stage22Act2.cs index b6dcae60e7..74678a5750 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage22HereComesTheBoom/Stage22Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage22HereComesTheBoom/Stage22Act2.cs @@ -21,8 +21,8 @@ public enum AID : uint Burst = 14904, // Boss->self, 20.0s cast, range 50 circle } -class Sap(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Sap), 8); -class Sap2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Sap2), 8); +class Sap(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Sap), 8); +class Sap2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Sap2), 8); class ScaldingScolding(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ScaldingScolding), new AOEShapeCone(11.75f, 60.Degrees())); class Flashthoom(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Flashthoom), new AOEShapeCircle(7.2f)); class Ignition(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Ignition), "Wipe if Grenade is not killed yet, otherwise Raidwide"); diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage23BehemothsAndBroomsticks/Stage23.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage23BehemothsAndBroomsticks/Stage23.cs index 9a23147281..15c62df544 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage23BehemothsAndBroomsticks/Stage23.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage23BehemothsAndBroomsticks/Stage23.cs @@ -18,10 +18,10 @@ public enum AID : uint EclipticMeteor = 15257, // Boss->location, 10.0s cast, range 50 circle } -class Charybdis(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Charybdis), 6); +class Charybdis(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Charybdis), 6); class Maelstrom(BossModule module) : Components.PersistentVoidzone(module, 8, m => m.Enemies(OID.Maelstrom)); class Trounce(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Trounce), new AOEShapeCone(55.8f, 30.Degrees())); -class Comet(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Comet2), 10); +class Comet(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Comet2), 10); class EclipticMeteor(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.EclipticMeteor), "Use Diamondback!"); class Hints(BossModule module) : BossComponent(module) diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act1.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act1.cs index 8af85984d7..a15ba2c0f1 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act1.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act1.cs @@ -15,7 +15,7 @@ public enum AID : uint LightningSpark = 15318, // Boss->player, 6.0s cast, single-target } -class Starstorm(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Starstorm), 5); +class Starstorm(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Starstorm), 5); class RagingAxe(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RagingAxe), new AOEShapeCone(5, 45.Degrees())); class LightningSpark(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.LightningSpark)); diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act2.cs index bcf5ef5b1d..b36c28f605 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act2.cs @@ -20,8 +20,8 @@ public enum AID : uint Silence = 15321, // 2736->player, 5.0s cast, single-target } -class Starstorm(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Starstorm), 5); -class Mechanogravity(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Mechanogravity), 6); +class Starstorm(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Starstorm), 5); +class Mechanogravity(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Mechanogravity), 6); class RagingAxe(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RagingAxe), new AOEShapeCone(5, 45.Degrees())); class CondensedLibra(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.CondensedLibra), "Use Diamondback!"); class TripleHit(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.TripleHit), "Use Diamondback!"); diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act3.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act3.cs index 3f90c39578..52bea81bc7 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act3.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act3.cs @@ -20,7 +20,7 @@ public enum AID : uint SelfDetonate = 15329, // 273A->player, 3.0s cast, single-target } -class MagicHammer(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MagicHammer), 8); +class MagicHammer(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MagicHammer), 8); class PageTear(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PageTear), new AOEShapeCone(8, 45.Degrees())); class VacuumBlade(BossModule module) : Components.GenericAOEs(module) diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage25DirtyRottenAzulmagia/Stage25Act3.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage25DirtyRottenAzulmagia/Stage25Act3.cs index 9ea29172b5..774ac7a5d0 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage25DirtyRottenAzulmagia/Stage25Act3.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage25DirtyRottenAzulmagia/Stage25Act3.cs @@ -66,7 +66,7 @@ public override void AddHints(int slot, Actor actor, TextHints hints) class TheRamsVoice(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TheRamsVoice), new AOEShapeCircle(8)); class TheDragonsVoice(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TheDragonsVoice), new AOEShapeDonut(6, 30)); class Maelstrom(BossModule module) : Components.PersistentVoidzone(module, 8, m => m.Enemies(OID.Maelstrom)); -class Meteor(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Meteor), 15); +class Meteor(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Meteor), 15); class MeteorVoidzone(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 10, ActionID.MakeSpell(AID.Meteor), m => m.Enemies(OID.LavaVoidzone).Where(z => z.EventState != 7), 1.2f); class Hints(BossModule module) : BossComponent(module) diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage26PapaMia/Stage26Act1.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage26PapaMia/Stage26Act1.cs index 7a792152f1..e883c0c92d 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage26PapaMia/Stage26Act1.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage26PapaMia/Stage26Act1.cs @@ -21,7 +21,7 @@ public enum SID : uint Windburn = 269, // Boss->player, extra=0x0 } -class Gust(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Gust), 3); +class Gust(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Gust), 3); class AlternatePlumage(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.AlternatePlumage), "Prepare to dispel buff"); class CaberToss(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.CaberToss)); diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage26PapaMia/Stage26Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage26PapaMia/Stage26Act2.cs index 0816f8f27d..3c08cc6847 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage26PapaMia/Stage26Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage26PapaMia/Stage26Act2.cs @@ -56,7 +56,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) public override bool DestinationUnsafe(int slot, Actor actor, WPos pos) => (Module.FindComponent()?.ActiveAOEs(slot, actor).Any(z => z.Shape.Check(pos, z.Origin, z.Rotation)) ?? false) || !Module.InBounds(pos); } -class VoidThunderII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.VoidThunderII), 4); +class VoidThunderII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.VoidThunderII), 4); class RawInstinct(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.RawInstinct), "Prepare to dispel buff"); class VoidThunderIII(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.VoidThunderIII), "Raidwide + Electrocution"); class BodyBlow(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.BodyBlow), "Soft Tankbuster"); diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage27LockUpYourSnorters/Stage27.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage27LockUpYourSnorters/Stage27.cs index 1cd595014c..afaa6aef18 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage27LockUpYourSnorters/Stage27.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage27LockUpYourSnorters/Stage27.cs @@ -19,7 +19,7 @@ public enum AID : uint MassiveExplosion = 19261, // 2CEC->self, no cast, range 60 circle, wipe, failed to destroy Magitek Explosive in time } -class Fireball(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Fireball), 8); +class Fireball(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Fireball), 8); class Snort(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.Snort), 15, stopAtWall: true); class Fungah(BossModule module) : Components.Knockback(module, stopAtWall: true) diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage28DangerousWhenDead/Stage28.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage28DangerousWhenDead/Stage28.cs index fba2ef6987..9c341060da 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage28DangerousWhenDead/Stage28.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage28DangerousWhenDead/Stage28.cs @@ -55,12 +55,12 @@ public enum SID : uint class DoomImpending(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.DoomImpending), "Heal to full before cast ends!"); class MarchOfTheDraugar(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.MarchOfTheDraugar), "Summons adds! (Kill with fire!)"); class NecrobaneVoidzone(BossModule module) : Components.PersistentInvertibleVoidzoneByCast(module, 6, m => m.Enemies(OID.NecrobaneVoidzone).Where(z => z.EventState != 7), ActionID.MakeSpell(AID.MegaDeath)); -class Necrobane(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Necrobane), 6); +class Necrobane(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Necrobane), 6); class HelblarShriek(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.HelblarShriek)); class FuneralPyre(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.FuneralPyre)); -class Catapult(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Catapult), 6); -class VengefulSoul(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.VengefulSoul), 6); -class BilrostSquall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BilrostSquall), 10); +class Catapult(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Catapult), 6); +class VengefulSoul(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.VengefulSoul), 6); +class BilrostSquall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BilrostSquall), 10); class Cackle(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.Cackle)); class Brainstorm(BossModule module) : Components.StatusDrivenForcedMarch(module, 2, (uint)SID.ForwardMarch, (uint)SID.AboutFace, (uint)SID.LeftFace, (uint)SID.RightFace) diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage29RedFraughtAndBlue/Stage29Act1.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage29RedFraughtAndBlue/Stage29Act1.cs index fd1063e3f5..4f300e6547 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage29RedFraughtAndBlue/Stage29Act1.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage29RedFraughtAndBlue/Stage29Act1.cs @@ -33,12 +33,12 @@ public enum SID : uint class FluidSwing(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.FluidSwing)); class FluidSwingKnockback(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.FluidSwing), 50, kind: Kind.DirForward); -class SeaOfFlames(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SeaOfFlames), 6); -class FireII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FireII), 5); -class PillarOfFlame(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.PillarOfFlame), 8); -class PillarOfFlame2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.PillarOfFlame2), 8); +class SeaOfFlames(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SeaOfFlames), 6); +class FireII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FireII), 5); +class PillarOfFlame(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.PillarOfFlame), 8); +class PillarOfFlame2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.PillarOfFlame2), 8); class Rush(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.Rush), "GTFO from boss! (Distance based charge)"); -class FlareStar(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FlareStar), 10); +class FlareStar(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FlareStar), 10); class FireBlast(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.FireBlast), new AOEShapeRect(74, 2)); class PyreticHint(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.Pyretic), "Pyretic, stop everything! Dodge the AOE after it runs out."); diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage29RedFraughtAndBlue/Stage29Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage29RedFraughtAndBlue/Stage29Act2.cs index a4f362fcae..69234cdba2 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage29RedFraughtAndBlue/Stage29Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage29RedFraughtAndBlue/Stage29Act2.cs @@ -78,7 +78,7 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) } class Unwind(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Unwind), new AOEShapeCircle(10)); -class FluidBall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FluidBall), 5); +class FluidBall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FluidBall), 5); class FluidConvectionDynamic(BossModule module) : Components.GenericAOEs(module) { diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage30TheCatchOfTheSiegfried/Stage30Act1.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage30TheCatchOfTheSiegfried/Stage30Act1.cs index d31cd3aad6..2466d6dca0 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage30TheCatchOfTheSiegfried/Stage30Act1.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage30TheCatchOfTheSiegfried/Stage30Act1.cs @@ -28,8 +28,8 @@ public enum SID : uint } class MagicDrain(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.MagicDrain), "Reflect magic damage for 30s"); -class HyperdriveFirst(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HyperdriveFirst), 5); -class HyperdriveRest(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HyperdriveRest), 5); +class HyperdriveFirst(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HyperdriveFirst), 5); +class HyperdriveRest(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HyperdriveRest), 5); class AnkleGraze(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.AnkleGraze), "Applies bind, prepare to use Excuviation!"); class RubberBullet(BossModule module) : Components.Knockback(module) diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage30TheCatchOfTheSiegfried/Stage30Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage30TheCatchOfTheSiegfried/Stage30Act2.cs index fb4cdafce0..acd0dea5e7 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage30TheCatchOfTheSiegfried/Stage30Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage30TheCatchOfTheSiegfried/Stage30Act2.cs @@ -31,11 +31,11 @@ class Swiftsteel(BossModule module) : Components.KnockbackFromCastTarget(module, public override bool DestinationUnsafe(int slot, Actor actor, WPos pos) => (Module.FindComponent()?.ActiveAOEs(slot, actor).Any(z => z.Shape.Check(pos, z.Origin, z.Rotation)) ?? false) || (Module.FindComponent()?.ActiveAOEs(slot, actor).Any(z => z.Shape.Check(pos, z.Origin, z.Rotation)) ?? false) || !Module.InBounds(pos); } -class Swiftsteel2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Swiftsteel2), 4); +class Swiftsteel2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Swiftsteel2), 4); class Swiftsteel3(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Swiftsteel3), new AOEShapeDonut(8, 20)); class Sparksteel1(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 5, ActionID.MakeSpell(AID.Sparksteel1), m => m.Enemies(OID.FireVoidzone).Where(e => e.EventState != 7), 0.8f); -public class Sparksteel2 : Components.LocationTargetedAOEs +public class Sparksteel2 : Components.SimpleAOEs { public Sparksteel2(BossModule module) : base(module, ActionID.MakeSpell(AID.Sparksteel2), 8) { @@ -43,7 +43,7 @@ public Sparksteel2(BossModule module) : base(module, ActionID.MakeSpell(AID.Spar } } -class Sparksteel3(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Sparksteel3), 8) +class Sparksteel3(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Sparksteel3), 8) { public override void OnCastFinished(Actor caster, ActorCastInfo spell) { diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage30TheCatchOfTheSiegfried/Stage30Act3.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage30TheCatchOfTheSiegfried/Stage30Act3.cs index c184e08b66..63c7148353 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage30TheCatchOfTheSiegfried/Stage30Act3.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage30TheCatchOfTheSiegfried/Stage30Act3.cs @@ -44,8 +44,8 @@ public enum SID : uint } class MagicDrain(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.MagicDrain), "Reflect magic damage for 30s"); -class HyperdriveFirst(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HyperdriveFirst), 5); -class HyperdriveRest(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HyperdriveRest), 5); +class HyperdriveFirst(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HyperdriveFirst), 5); +class HyperdriveRest(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HyperdriveRest), 5); class AnkleGraze(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.AnkleGraze), "Applies bind, prepare to use Excuviation!"); class LawOfTheTorch(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.LawOfTheTorch), new AOEShapeCone(34, 10.Degrees())); class LawOfTheTorch2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.LawOfTheTorch2), new AOEShapeCone(34, 10.Degrees())); @@ -54,11 +54,11 @@ class Swiftsteel(BossModule module) : Components.KnockbackFromCastTarget(module, public override bool DestinationUnsafe(int slot, Actor actor, WPos pos) => (Module.FindComponent()?.ActiveAOEs(slot, actor).Any(z => z.Shape.Check(pos, z.Origin, z.Rotation)) ?? false) || (Module.FindComponent()?.ActiveAOEs(slot, actor).Any(z => z.Shape.Check(pos, z.Origin, z.Rotation)) ?? false) || !Module.InBounds(pos); } -class Swiftsteel2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Swiftsteel2), 4); +class Swiftsteel2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Swiftsteel2), 4); class Swiftsteel3(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Swiftsteel3), new AOEShapeDonut(8, 20)); class Sparksteel1(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 5, ActionID.MakeSpell(AID.Sparksteel1), m => m.Enemies(OID.FireVoidzone).Where(e => e.EventState != 7), 0.8f); -public class Sparksteel2 : Components.LocationTargetedAOEs +public class Sparksteel2 : Components.SimpleAOEs { public Sparksteel2(BossModule module) : base(module, ActionID.MakeSpell(AID.Sparksteel2), 8) { @@ -66,7 +66,7 @@ public Sparksteel2(BossModule module) : base(module, ActionID.MakeSpell(AID.Spar } } -class Sparksteel3(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Sparksteel3), 8) +class Sparksteel3(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Sparksteel3), 8) { public override void OnCastFinished(Actor caster, ActorCastInfo spell) { diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage31AnythingGogos/Stage31Act1.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage31AnythingGogos/Stage31Act1.cs index dbff6dddbc..d86f696840 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage31AnythingGogos/Stage31Act1.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage31AnythingGogos/Stage31Act1.cs @@ -41,8 +41,8 @@ public enum SID : uint } class Mimic(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.Mimic), "Stop attacking when cast ends"); -class MimickedSap1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MimickedSap1), 8); -class MimickedSap2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MimickedSap3), 8); +class MimickedSap1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MimickedSap1), 8); +class MimickedSap2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MimickedSap3), 8); class MimickedDoomImpending(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.MimickedDoomImpending), "Heal to full before cast ends!"); class MimickedProteanWave(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MimickedProteanWave2), new AOEShapeCone(50, 15.Degrees())); class MimickedFireBlast(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MimickedFireBlast2), new AOEShapeRect(70.5f, 2)); diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage31AnythingGogos/Stage31Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage31AnythingGogos/Stage31Act2.cs index ea1e82c026..27c98d473c 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage31AnythingGogos/Stage31Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage31AnythingGogos/Stage31Act2.cs @@ -39,15 +39,15 @@ public enum SID : uint Heavy = 1107, // Helper->player, extra=0x50 } -class Charybdis(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Charybdis), 8); +class Charybdis(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Charybdis), 8); class Maelstrom(BossModule module) : Components.PersistentVoidzone(module, 8, m => m.Enemies(OID.Maelstrom)); class GogoFlare(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.GogoFlare)); class GogoHoly(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.GogoHoly)); -class GogoMeteor1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GogoMeteor1), 5); -class GogoMeteor2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GogoMeteor2), 16); -class GogoMeteor3(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GogoMeteor3), 8); -class GogoMeteor4(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GogoMeteor4), 8); -class GogoMeteor5(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GogoMeteor5), 16); +class GogoMeteor1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GogoMeteor1), 5); +class GogoMeteor2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GogoMeteor2), 16); +class GogoMeteor3(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GogoMeteor3), 8); +class GogoMeteor4(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GogoMeteor4), 8); +class GogoMeteor5(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GogoMeteor5), 16); class GogoMeteorBig(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.GogoMeteor6), "Use Diamondback!"); class Icestorm(BossModule module) : Components.RaidwideCastDelay(module, ActionID.MakeSpell(AID.Icestorm), ActionID.MakeSpell(AID.Icestorm2), 0.9f, "Raidwide + Frostbite + Heavy"); class ThunderIII(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 6, ActionID.MakeSpell(AID.GogoThunderIII), m => m.Enemies(OID.Voidzone).Where(e => e.EventState != 7), 0.8f); diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage32AGoldenOpportunity/Stage32Act1.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage32AGoldenOpportunity/Stage32Act1.cs index 896b2a936a..fc6f8acce1 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage32AGoldenOpportunity/Stage32Act1.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage32AGoldenOpportunity/Stage32Act1.cs @@ -40,8 +40,8 @@ public enum SID : uint } class SlimySummon(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.SlimySummon), "Prepare to kill add ASAP"); -class GoldorFireIII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GoldorFireIII2), 8); -class GoldorFireIII2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GoldorFireIII3), 8); +class GoldorFireIII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GoldorFireIII2), 8); +class GoldorFireIII2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GoldorFireIII3), 8); class GoldorBlast(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GoldorBlast), new AOEShapeRect(60, 5)); class Rupture(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.Rupture), "Kill slime ASAP! (The Ram's Voice + Ultravibration)", true); @@ -80,7 +80,7 @@ class GoldorAeroIIIRaidwide(BossModule module) : Components.RaidwideCast(module, class Burn(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Burn), new AOEShapeCircle(10)); class GoldorGravity(BossModule module) : Components.RaidwideCastDelay(module, ActionID.MakeSpell(AID.GoldorGravity), ActionID.MakeSpell(AID.GoldorGravity2), 0.8f, "Dmg + Heavy debuff"); class GoldorThunderIII(BossModule module) : Components.RaidwideCastDelay(module, ActionID.MakeSpell(AID.GoldorThunderIIIVisual), ActionID.MakeSpell(AID.GoldorThunderIII1), 0.8f, "Prepare to cleanse Electrocution"); -class GoldorThunderIII2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GoldorThunderIII2), 6); +class GoldorThunderIII2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GoldorThunderIII2), 6); class GoldorBlizzardIII(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.GoldorBlizzardIIIVisual)); class Hints2(BossModule module) : BossComponent(module) diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage32AGoldenOpportunity/Stage32Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage32AGoldenOpportunity/Stage32Act2.cs index 75b23f8e88..cf0af9ebc0 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage32AGoldenOpportunity/Stage32Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage32AGoldenOpportunity/Stage32Act2.cs @@ -46,7 +46,7 @@ public enum SID : uint MagicResistance = 3621 // none->Boss, extra=0x0 } -class GoldorFireIII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GoldorFireIII), 8); +class GoldorFireIII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GoldorFireIII), 8); class GoldorBlast(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GoldorBlast), new AOEShapeRect(60, 5)); class GoldenCross(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GoldenCross), new AOEShapeCross(100, 3.5f)); @@ -142,7 +142,7 @@ class GoldorRushRaidwide(BossModule module) : Components.RaidwideCast(module, Ac class TwentyFourCaratInhale(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.TwentyFourCaratInhale), 30, kind: Kind.TowardsOrigin); class GoldorGravity(BossModule module) : Components.RaidwideCastDelay(module, ActionID.MakeSpell(AID.GoldorGravity), ActionID.MakeSpell(AID.GoldorGravity2), 0.8f, "Dmg + Heavy debuff"); class GoldorThunderIII(BossModule module) : Components.RaidwideCastDelay(module, ActionID.MakeSpell(AID.GoldorThunderIIIVisual), ActionID.MakeSpell(AID.GoldorThunderIII1), 0.8f, "Prepare to cleanse Electrocution"); -class GoldorThunderIII2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GoldorThunderIII2), 6); +class GoldorThunderIII2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GoldorThunderIII2), 6); class GoldorBlizzardIII(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.GoldorBlizzardIIIVisual)); class Hints(BossModule module) : BossComponent(module) diff --git a/BossMod/Modules/Global/PVP/HiddenGorge/GoblinMercenary.cs b/BossMod/Modules/Global/PVP/HiddenGorge/GoblinMercenary.cs index 4df44bfb1d..56c54d768e 100644 --- a/BossMod/Modules/Global/PVP/HiddenGorge/GoblinMercenary.cs +++ b/BossMod/Modules/Global/PVP/HiddenGorge/GoblinMercenary.cs @@ -124,7 +124,7 @@ private void InitIfReady(Actor source) } } -class IronKiss(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.IronKiss), 7); +class IronKiss(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.IronKiss), 7); class GoblinMercenaryStates : StateMachineBuilder { diff --git a/BossMod/Modules/Global/Quest/FF15Collab/MA-x.cs b/BossMod/Modules/Global/Quest/FF15Collab/MA-x.cs index 0aae0ead18..08c135b668 100644 --- a/BossMod/Modules/Global/Quest/FF15Collab/MA-x.cs +++ b/BossMod/Modules/Global/Quest/FF15Collab/MA-x.cs @@ -22,7 +22,7 @@ public enum AID : uint class Chainsaw(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Chainsaw), new AOEShapeCone(10, 45.Degrees())); class Shock(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Shock), new AOEShapeCircle(10)); -class MagitekMissile(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MagitekMissile2), 5); +class MagitekMissile(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MagitekMissile2), 5); class MAxStates : StateMachineBuilder { diff --git a/BossMod/Modules/Global/Quest/FF16Collab/InfernalShadow.cs b/BossMod/Modules/Global/Quest/FF16Collab/InfernalShadow.cs index c123dfbdd4..c826bdfe97 100644 --- a/BossMod/Modules/Global/Quest/FF16Collab/InfernalShadow.cs +++ b/BossMod/Modules/Global/Quest/FF16Collab/InfernalShadow.cs @@ -68,7 +68,7 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) class FieryRampageCircle(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.FieryRampageCircleReal), new AOEShapeCircle(16)); class FieryRampageRaidwide(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.FieryRampageRaidwideReal), "Time your dodge correctly"); class Pyrosault(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PyrosaultReal), new AOEShapeCircle(10)); -class Fireball(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FireballReal), 6); +class Fireball(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FireballReal), 6); class CrimsonRush(BossModule module) : Components.ChargeAOEs(module, ActionID.MakeSpell(AID.CrimsonRushReal), 10); class CrimsonStreak(BossModule module) : Components.GenericAOEs(module) @@ -99,7 +99,7 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) } } -class Eruption(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.EruptionReal), 8); +class Eruption(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.EruptionReal), 8); class Eruption2(BossModule module) : Components.GenericAOEs(module) { diff --git a/BossMod/Modules/Heavensward/Alliance/A11Cetus/A11Cetus.cs b/BossMod/Modules/Heavensward/Alliance/A11Cetus/A11Cetus.cs index 4134b83dc9..320f6a3a6b 100644 --- a/BossMod/Modules/Heavensward/Alliance/A11Cetus/A11Cetus.cs +++ b/BossMod/Modules/Heavensward/Alliance/A11Cetus/A11Cetus.cs @@ -1,7 +1,7 @@ namespace BossMod.Heavensward.Alliance.A11Cetus; class ElectricSwipe(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ElectricSwipe), new AOEShapeCone(25, 30.Degrees())); -class BodySlam(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BodySlam), 10); +class BodySlam(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BodySlam), 10); class Immersion(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Immersion)); class ElectricWhorl(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ElectricWhorl), new AOEShapeDonut(7, 60)); class ExpulsionAOE(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Expulsion), new AOEShapeCircle(14)); diff --git a/BossMod/Modules/Heavensward/Alliance/A14Echidna/A14Echidna.cs b/BossMod/Modules/Heavensward/Alliance/A14Echidna/A14Echidna.cs index 89e5f6c6b7..6db278d91a 100644 --- a/BossMod/Modules/Heavensward/Alliance/A14Echidna/A14Echidna.cs +++ b/BossMod/Modules/Heavensward/Alliance/A14Echidna/A14Echidna.cs @@ -8,9 +8,9 @@ class AbyssalReaperKnockback(BossModule module) : Components.KnockbackFromCastTa class Petrifaction1(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.Petrifaction1)); class Petrifaction2(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.Petrifaction2)); class Gehenna(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Gehenna)); -class BloodyHarvest(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BloodyHarvest), 12); +class BloodyHarvest(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BloodyHarvest), 12); class Deathstrike(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Deathstrike), new AOEShapeRect(62, 3)); -class FlameWreath(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FlameWreath), 18); +class FlameWreath(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FlameWreath), 18); class SerpentineStrike(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SerpentineStrike), new AOEShapeCircle(20)); [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "The Combat Reborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 120, NameID = 4631)] diff --git a/BossMod/Modules/Heavensward/Alliance/A22Forgall/A22Forgall.cs b/BossMod/Modules/Heavensward/Alliance/A22Forgall/A22Forgall.cs index a66ef7ddca..6d681036b1 100644 --- a/BossMod/Modules/Heavensward/Alliance/A22Forgall/A22Forgall.cs +++ b/BossMod/Modules/Heavensward/Alliance/A22Forgall/A22Forgall.cs @@ -2,7 +2,7 @@ class BrandOfTheFallen(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.BrandOfTheFallen), 6, 8); class MegiddoFlame2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MegiddoFlame2), new AOEShapeRect(50, 4)); -class DarkEruption2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DarkEruption2), 6); +class DarkEruption2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DarkEruption2), 6); class MortalRay(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MortalRay), new AOEShapeCone(20, 22.5f.Degrees())); class Mow(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Mow), new AOEShapeCone(13.8f, 60.Degrees())); diff --git a/BossMod/Modules/Heavensward/Alliance/A25Calofisteri/A25Calofisteri.cs b/BossMod/Modules/Heavensward/Alliance/A25Calofisteri/A25Calofisteri.cs index 25e7fc6659..2fc73be8d9 100644 --- a/BossMod/Modules/Heavensward/Alliance/A25Calofisteri/A25Calofisteri.cs +++ b/BossMod/Modules/Heavensward/Alliance/A25Calofisteri/A25Calofisteri.cs @@ -2,8 +2,8 @@ class AuraBurst(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.AuraBurst)); class DepthCharge(BossModule module) : Components.ChargeAOEs(module, ActionID.MakeSpell(AID.DepthCharge), 5); -class Extension2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Extension2), 6); -class FeintParticleBeam1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FeintParticleBeam1), 3); +class Extension2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Extension2), 6); +class FeintParticleBeam1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FeintParticleBeam1), 3); class Penetration(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.Penetration), 50, kind: Kind.TowardsOrigin); class Graft(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Graft), new AOEShapeCircle(5)); class Haircut1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Haircut1), new AOEShapeCone(25.5f, 90.Degrees())); diff --git a/BossMod/Modules/Heavensward/Alliance/A32FerdiadHollow/A32FerdiadHollow.cs b/BossMod/Modules/Heavensward/Alliance/A32FerdiadHollow/A32FerdiadHollow.cs index 496b49bff4..792c3bff91 100644 --- a/BossMod/Modules/Heavensward/Alliance/A32FerdiadHollow/A32FerdiadHollow.cs +++ b/BossMod/Modules/Heavensward/Alliance/A32FerdiadHollow/A32FerdiadHollow.cs @@ -2,7 +2,7 @@ class Blackbolt(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.Blackbolt), 6, 8); -class Blackfire2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Blackfire2), 7); // expanding aoe circle +class Blackfire2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Blackfire2), 7); // expanding aoe circle class JestersJig1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.JestersJig1), new AOEShapeCircle(9)); diff --git a/BossMod/Modules/Heavensward/Alliance/A33ProtoUltima/A33ProtoUltima.cs b/BossMod/Modules/Heavensward/Alliance/A33ProtoUltima/A33ProtoUltima.cs index 66a60d884b..40b1c07ef6 100644 --- a/BossMod/Modules/Heavensward/Alliance/A33ProtoUltima/A33ProtoUltima.cs +++ b/BossMod/Modules/Heavensward/Alliance/A33ProtoUltima/A33ProtoUltima.cs @@ -11,7 +11,7 @@ class AetherochemicalFlare(BossModule module) : Components.RaidwideCast(module, class Rotoswipe(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Rotoswipe), new AOEShapeCone(11, 60.Degrees())); -class WreckingBall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.WreckingBall), 8); +class WreckingBall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.WreckingBall), 8); [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "The Combat Reborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 220, NameID = 3780)] public class A33ProtoUltima(WorldState ws, Actor primary) : BossModule(ws, primary, new(-350, -50), new ArenaBoundsCircle(30)) diff --git a/BossMod/Modules/Heavensward/Alliance/A34Scathach/A34Scathach.cs b/BossMod/Modules/Heavensward/Alliance/A34Scathach/A34Scathach.cs index e48ee8c5f2..0252eb3fcb 100644 --- a/BossMod/Modules/Heavensward/Alliance/A34Scathach/A34Scathach.cs +++ b/BossMod/Modules/Heavensward/Alliance/A34Scathach/A34Scathach.cs @@ -4,7 +4,7 @@ class ThirtyThorns4(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ThirtyThorns4), new AOEShapeCircle(8)); class ThirtySouls(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.ThirtySouls)); class ThirtyArrows2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ThirtyArrows2), new AOEShapeRect(35, 4)); -class ThirtyArrows1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ThirtyArrows1), 8); +class ThirtyArrows1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ThirtyArrows1), 8); class TheDragonsVoice(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TheDragonsVoice), new AOEShapeCircle(30)); class Shadespin2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Shadespin2), new AOEShapeCone(30, 45.Degrees())); diff --git a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD100NybethObdilord.cs b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD100NybethObdilord.cs index 1bf86ea315..8e299d2191 100644 --- a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD100NybethObdilord.cs +++ b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD100NybethObdilord.cs @@ -23,7 +23,7 @@ public enum AID : uint } class Abyss(BossModule module) : Components.BaitAwayCast(module, ActionID.MakeSpell(AID.Abyss), new AOEShapeCircle(6), true); -class Catapult(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Catapult), 6); +class Catapult(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Catapult), 6); class CorseAdds(BossModule module) : Components.AddsMulti(module, [(uint)OID.BicephalicCorse, (uint)OID.GiantCorse, (uint)OID.IronCorse]); class Doom(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Doom), new AOEShapeCone(47.4f, 60.Degrees())); class Shackle(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Shackle), new AOEShapeRect(52.4f, 4, 0)); diff --git a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD10PalaceDeathgaze.cs b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD10PalaceDeathgaze.cs index 69356990c3..321483f0e4 100644 --- a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD10PalaceDeathgaze.cs +++ b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD10PalaceDeathgaze.cs @@ -18,7 +18,7 @@ public enum AID : uint class AeroBlast(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.AeroBlast)); class Bombination(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Bombination), new AOEShapeCircle(12)); -class Lumisphere(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Lumisphere), 6); +class Lumisphere(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Lumisphere), 6); class Stormwind(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Stormwind), new AOEShapeCone(18, 45.Degrees())); class DD10PalaceDeathgazeStates : StateMachineBuilder diff --git a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD110Alicanto.cs b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD110Alicanto.cs index f5c6b5acfb..0d06bc885d 100644 --- a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD110Alicanto.cs +++ b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD110Alicanto.cs @@ -17,7 +17,7 @@ public enum AID : uint class AeroBlast(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.AeroBlast)); class Bombination(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Bombination), new AOEShapeCircle(12)); -class Lumisphere(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Lumisphere), 6); +class Lumisphere(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Lumisphere), 6); class Stormwind(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Stormwind), new AOEShapeCone(18, 45.Degrees())); class DD110AlicantoStates : StateMachineBuilder diff --git a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD120Kirtimukha.cs b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD120Kirtimukha.cs index bebcc3b057..3447acb13d 100644 --- a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD120Kirtimukha.cs +++ b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD120Kirtimukha.cs @@ -34,7 +34,7 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme } class BloodyCaress(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.BloodyCaress), new AOEShapeCone(11.6f, 60.Degrees()), activeWhileCasting: false); class FinalSting(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.FinalSting), "Final sting is being cast! \nKill the add or take 98% of your hp!"); -class GoldDust(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GoldDust), 8); +class GoldDust(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GoldDust), 8); class Leafstorm(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Leafstorm)); class RottenStench(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RottenStench), new AOEShapeRect(47.6f, 6)); diff --git a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD140AhPuch.cs b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD140AhPuch.cs index f1fe45599a..1cad423891 100644 --- a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD140AhPuch.cs +++ b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD140AhPuch.cs @@ -31,8 +31,8 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme }; } } -class AccursedPox(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AccursedPox), 8); -class AncientEruption(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AncientEruption), 4); +class AccursedPox(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AccursedPox), 8); +class AncientEruption(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AncientEruption), 4); class AncientEruptionZone(BossModule module) : Components.PersistentInvertibleVoidzone(module, 4, m => m.Enemies(OID.AccursedPoxVoidZone).Where(z => z.EventState != 7)); class EntropicFlame(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.EntropicFlame), new AOEShapeRect(53.8f, 4)); class Scream(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Scream), "Raidwide + Fear, Adds need to be dead by now"); diff --git a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD150Tisiphone.cs b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD150Tisiphone.cs index ba6de63476..87f61186b3 100644 --- a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD150Tisiphone.cs +++ b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD150Tisiphone.cs @@ -31,10 +31,10 @@ class BossAdds(BossModule module) : Components.AddsMulti(module, [(uint)OID.Fana class Desolation(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Desolation), new AOEShapeRect(57.3f, 3)); class FatalAllure(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.FatalAllure), "Boss is life stealing from the succubus"); class SweetSteel(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SweetSteel), new AOEShapeCone(7, 45.Degrees())); -class TerrorEye(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TerrorEye), 6); +class TerrorEye(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TerrorEye), 6); class VoidAero(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.VoidAero), new AOEShapeRect(42.3f, 4)); -class VoidFireII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.VoidFireII), 5); -class VoidFireIV(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.VoidFireIV), 10); +class VoidFireII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.VoidFireII), 5); +class VoidFireIV(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.VoidFireIV), 10); class ZombieGrab(BossModule module) : Components.PersistentVoidzone(module, 2, m => m.Enemies(OID.FanaticZombie)); // Future note to Ice(self): Not entirely sure if I'm happy with this per se? It shows to essentially stay away from the zombies but, maybe a better hint when I can think of one // TODO: Add a switch to target the zombie that is currently attached to you. Missing the status effect that it gives when caught. diff --git a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD170Yulunggu.cs b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD170Yulunggu.cs index 5f76df03ca..e6975cabb4 100644 --- a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD170Yulunggu.cs +++ b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD170Yulunggu.cs @@ -41,7 +41,7 @@ public override void AddHints(int slot, Actor actor, TextHints hints) class Drench(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Drench), new AOEShapeCone(15.75f, 45.Degrees()), activeWhileCasting: false); -class Electrogenesis(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Electrogenesis), 8); +class Electrogenesis(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Electrogenesis), 8); class DD170YulungguStates : StateMachineBuilder { diff --git a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD180Dendainsonne.cs b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD180Dendainsonne.cs index eb11f70188..2ae15cc08c 100644 --- a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD180Dendainsonne.cs +++ b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD180Dendainsonne.cs @@ -18,7 +18,7 @@ public enum AID : uint Trounce = 7165, // Boss->self, 2.5s cast, range 40+R 60-degree cone } -class Charybdis(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.CharybdisCast), 6); +class Charybdis(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.CharybdisCast), 6); class Maelstrom(BossModule module) : Components.PersistentVoidzone(module, 10, m => m.Enemies(OID.TornadoVoidZones)); class Trounce(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Trounce), new AOEShapeCone(51.6f, 30.Degrees())); class EclipticMeteor(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.EclipticMeteor), "Kill him before he kills you! 80% max HP damage incoming!"); diff --git a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD190TheGodfather.cs b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD190TheGodfather.cs index d075ef727a..ea48946b69 100644 --- a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD190TheGodfather.cs +++ b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD190TheGodfather.cs @@ -24,7 +24,7 @@ public enum AID : uint //spawn locations for stun bomb are as follows: 1:(-288.626, -300.256) 2:(-297.465, -297.525) 3:(-288.837, -305.537) 4:(-309.132, -303.739) 5:(-298.355, -293.630) 6:(-301.954, -314.289) 7:(-299.119, -297.563) class BossAdds(BossModule module) : Components.AddsMulti(module, [(uint)OID.LavaBomb, (uint)OID.RemedyBomb]); class Flashthoom(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Flashthoom), new AOEShapeCircle(7.2f)); -class Sap(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Sap), 8); +class Sap(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Sap), 8); class ScaldingScoldingCleave(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.ScaldingScolding), new AOEShapeCone(11.75f, 45.Degrees()), activeWhileCasting: false); class RemedyBombEnrage(BossModule module) : BossComponent(module) diff --git a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD20Spurge.cs b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD20Spurge.cs index 3d5684ea7b..7daf3b289b 100644 --- a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD20Spurge.cs +++ b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD20Spurge.cs @@ -34,7 +34,7 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme } class AcidMist(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AcidMist), new AOEShapeCircle(9.6f)); class BloodyCaress(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.BloodyCaress), new AOEShapeCone(11.6f, 60.Degrees()), activeWhileCasting: false); -class GoldDust(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GoldDust), 8); +class GoldDust(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GoldDust), 8); class Leafstorm(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Leafstorm)); class RottenStench(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RottenStench), new AOEShapeRect(47.6f, 6)); diff --git a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD40Ixtab.cs b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD40Ixtab.cs index 27562c21b7..cf48783fde 100644 --- a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD40Ixtab.cs +++ b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD40Ixtab.cs @@ -32,8 +32,8 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme }; } } -class AccursedPox(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AccursedPox), 8); -class AncientEruption(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AncientEruption), 4); +class AccursedPox(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AccursedPox), 8); +class AncientEruption(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AncientEruption), 4); class AncientEruptionZone(BossModule module) : Components.PersistentInvertibleVoidzone(module, 4, m => m.Enemies(OID.AccursedPoxVoidZone).Where(z => z.EventState != 7)); class EntropicFlame(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.EntropicFlame), new AOEShapeRect(53.8f, 4)); class Scream(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Scream), "Raidwide + Fear, Adds need to be dead by now"); diff --git a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD50EddaBlackbosom.cs b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD50EddaBlackbosom.cs index daa86cf232..d22f081e80 100644 --- a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD50EddaBlackbosom.cs +++ b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD50EddaBlackbosom.cs @@ -34,7 +34,7 @@ class DarkHarvest(BossModule module) : Components.SingleTargetCast(module, Actio class Desolation(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Desolation), new AOEShapeRect(57.3f, 3)); class InHeathCircle(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.InHealthCircle), new AOEShapeCircle(16)); class InHeathDonut(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.InHealthDonut), new AOEShapeDonut(2.5f, 50)); -class TerrorEye(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TerrorEye), 6); +class TerrorEye(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TerrorEye), 6); class DD50EddaBlackbosomStates : StateMachineBuilder { diff --git a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD70Yaquaru.cs b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD70Yaquaru.cs index ff31a8a086..453680f841 100644 --- a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD70Yaquaru.cs +++ b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD70Yaquaru.cs @@ -79,7 +79,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) } } -class Electrogenesis(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Electrogenesis), 8); +class Electrogenesis(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Electrogenesis), 8); class DD70TaquaruStates : StateMachineBuilder { diff --git a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD80Gudanna.cs b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD80Gudanna.cs index 22c0d73914..ceeb9da6a8 100644 --- a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD80Gudanna.cs +++ b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD80Gudanna.cs @@ -18,7 +18,7 @@ public enum AID : uint Trounce = 7098, // Boss->self, 2.5s cast, range 40+R 60-degree cone } -class Charybdis(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Charybdis), 6); +class Charybdis(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Charybdis), 6); class Maelstrom(BossModule module) : Components.PersistentVoidzone(module, 10, m => m.Enemies(OID.Tornado)); class Trounce(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Trounce), new AOEShapeCone(51.6f, 30.Degrees())); class EclipticMeteor(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.EclipticMeteor), "Kill him before he kills you! 80% max HP damage incoming!"); diff --git a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD90TheGodmother.cs b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD90TheGodmother.cs index 3ed74c6c03..bbc93f01c3 100644 --- a/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD90TheGodmother.cs +++ b/BossMod/Modules/Heavensward/DeepDungeon/PalaceOfTheDead/DD90TheGodmother.cs @@ -24,7 +24,7 @@ class Burst(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSp // future thing to do: maybe add a tether between bomb/boss to show it needs to show the aoe needs to explode on them. . . class HypothermalCombustion(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.HypothermalCombustion), new AOEShapeCircle(7.2f)); class MassiveBurst(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.MassiveBurst), "Knock the Giddy bomb into the boss and let it explode on the boss. \n or else take 99% damage!"); -class Sap(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Sap), 8); +class Sap(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Sap), 8); class ScaldingScolding(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.ScaldingScolding), new AOEShapeCone(11.75f, 45.Degrees())) { private readonly MassiveBurst _raidwide1 = module.FindComponent()!; @@ -32,19 +32,19 @@ class Sap(BossModule module) : Components.LocationTargetedAOEs(module, ActionID. public override void AddHints(int slot, Actor actor, TextHints hints) { - if (!_raidwide1.Active && !_locationaoe1.ActiveCasters.Any()) + if (!_raidwide1.Active && _locationaoe1.ActiveCasters.Count == 0) base.AddHints(slot, actor, hints); } public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - if (!_raidwide1.Active && !_locationaoe1.ActiveCasters.Any()) + if (!_raidwide1.Active && _locationaoe1.ActiveCasters.Count == 0) base.AddAIHints(slot, actor, assignment, hints); } public override void DrawArenaForeground(int pcSlot, Actor pc) { - if (!_raidwide1.Active && !_locationaoe1.ActiveCasters.Any()) + if (!_raidwide1.Active && _locationaoe1.ActiveCasters.Count == 0) base.DrawArenaForeground(pcSlot, pc); } } diff --git a/BossMod/Modules/Heavensward/Dungeon/D02SohmAl/D021Raskovnik.cs b/BossMod/Modules/Heavensward/Dungeon/D02SohmAl/D021Raskovnik.cs index 8661bd9d3e..c6207ad689 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D02SohmAl/D021Raskovnik.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D02SohmAl/D021Raskovnik.cs @@ -29,7 +29,7 @@ public enum IconID : uint class Leafstorm(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Leafstorm)); class Phytobeam(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Phytobeam), new AOEShapeRect(48.68f, 6)); -class AcidRain(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AcidRain), 6); +class AcidRain(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AcidRain), 6); class FloralTap(BossModule module) : Components.BaitAwayIcon(module, new AOEShapeCone(48.68f, 22.5f.Degrees()), (uint)IconID.FloralTap, ActionID.MakeSpell(AID.FloralTrap), 8.5f); class FlowerDevour(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.FlowerDevour), new AOEShapeCircle(8)); class BloodyCaress(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.BloodyCaress), new AOEShapeCone(11.68f, 60.Degrees())); diff --git a/BossMod/Modules/Heavensward/Dungeon/D02SohmAl/D023Tioman.cs b/BossMod/Modules/Heavensward/Dungeon/D02SohmAl/D023Tioman.cs index 1ac6d896fa..8bc63b4c15 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D02SohmAl/D023Tioman.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D02SohmAl/D023Tioman.cs @@ -94,11 +94,11 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) } class DarkStar(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.DarkStar)); -class ChaosBlastCircle(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ChaosBlastCircle), 2); +class ChaosBlastCircle(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ChaosBlastCircle), 2); class ChaosBlastRect(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ChaosBlastRect), new AOEShapeRect(50.5f, 2)); class AbyssicBuster(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.AbyssicBuster), new AOEShapeCone(31.84f, 45.Degrees())); -class Comet(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Comet), 4); -class Heavensfall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Heavensfall2), 5); +class Comet(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Comet), 4); +class Heavensfall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Heavensfall2), 5); class D023TiomanStates : StateMachineBuilder { diff --git a/BossMod/Modules/Heavensward/Dungeon/D03Aery/D031Rangda.cs b/BossMod/Modules/Heavensward/Dungeon/D03Aery/D031Rangda.cs index 9f1f05e960..5ea28421b9 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D03Aery/D031Rangda.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D03Aery/D031Rangda.cs @@ -86,7 +86,7 @@ public override void DrawArenaForeground(int pcSlot, Actor pc) } class ElectricCachexia(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ElectricCachexia), new AOEShapeDonut(8, 60)); -class LightningBolt(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LightningBolt), 3); +class LightningBolt(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LightningBolt), 3); class D031RangdaStates : StateMachineBuilder { diff --git a/BossMod/Modules/Heavensward/Dungeon/D03Aery/D032Gyascutus.cs b/BossMod/Modules/Heavensward/Dungeon/D03Aery/D032Gyascutus.cs index 399db34679..c61d8df07c 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D03Aery/D032Gyascutus.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D03Aery/D032Gyascutus.cs @@ -47,7 +47,7 @@ public override void OnEventEnvControl(byte index, uint state) } class ProximityPyre(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ProximityPyre), new AOEShapeCircle(12)); -class Burst(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Burst), 10); +class Burst(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Burst), 10); class CripplingBlow(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.CripplingBlow)); class DeafeningBellow(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.DeafeningBellow)); class AshenOuroboros(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AshenOuroboros), new AOEShapeDonut(11, 20)); diff --git a/BossMod/Modules/Heavensward/Dungeon/D03Aery/D033Nidhogg.cs b/BossMod/Modules/Heavensward/Dungeon/D03Aery/D033Nidhogg.cs index f6c5909b0b..0175f47374 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D03Aery/D033Nidhogg.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D03Aery/D033Nidhogg.cs @@ -101,7 +101,7 @@ class DeafeningBellow(BossModule module) : Components.RaidwideCast(module, Actio class HotWing(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.HotWing), new AOEShapeRect(34, 34, -4)); class Cauterize(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Cauterize), new AOEShapeRect(80, 11)); class HorridRoarSpread(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.HorridRoarSpread), 6); -class HorridRoar(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HorridRoar), 6); +class HorridRoar(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HorridRoar), 6); class HorridBlaze(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.HorridBlaze), 6, 4, 4); class Massacre(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Massacre)); class TheScarletPrice(BossModule module) : Components.SingleTargetDelayableCast(module, ActionID.MakeSpell(AID.TheScarletPrice)); diff --git a/BossMod/Modules/Heavensward/Dungeon/D04TheVault/D043SerCharibert.cs b/BossMod/Modules/Heavensward/Dungeon/D04TheVault/D043SerCharibert.cs index 1cf13b55a8..57984aac82 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D04TheVault/D043SerCharibert.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D04TheVault/D043SerCharibert.cs @@ -46,7 +46,7 @@ class BlackKnightsTour(BossModule module) : KnightsTour(module, AID.BlackKnights class AltarPyre(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.AltarPyre)); -class HeavensflameAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeavensflameAOE), 5); +class HeavensflameAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeavensflameAOE), 5); class HolyChain(BossModule module) : Components.Chains(module, (uint)TetherID.HolyChain, ActionID.MakeSpell(AID.HolyChainPlayerTether)); class TurretTour(BossModule module) : Components.PersistentVoidzone(module, 2, m => m.Enemies(OID.DawnKnight).Concat(m.Enemies(OID.DuskKnight)).Where(x => x.ModelState.ModelState == 8), 10); class TurretTourHint(BossModule module) : Components.PersistentVoidzone(module, 2, m => m.Enemies(OID.DawnKnight).Concat(m.Enemies(OID.DuskKnight)).Where(x => x.ModelState.ModelState != 8 && !x.Position.AlmostEqual(module.Center, 10)), 3); diff --git a/BossMod/Modules/Heavensward/Dungeon/D05GreatGubalLibrary/D053TheEverlivingBibliotaph.cs b/BossMod/Modules/Heavensward/Dungeon/D05GreatGubalLibrary/D053TheEverlivingBibliotaph.cs index eeb1a809e4..ff9b12a42b 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D05GreatGubalLibrary/D053TheEverlivingBibliotaph.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D05GreatGubalLibrary/D053TheEverlivingBibliotaph.cs @@ -91,7 +91,7 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) class DeepDarkness(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DeepDarkness), new AOEShapeDonut(12, 25)); class MagicBurst(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MagicBurst), new AOEShapeCircle(15)); -class VoidBlizzardIIIAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.VoidBlizzardIIIAOE), 5); +class VoidBlizzardIIIAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.VoidBlizzardIIIAOE), 5); class AbyssalSwing(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.AbyssalSwing), new AOEShapeCone(7.5f, 45.Degrees()), (uint)OID.Biblioklept); class AbyssalCharge(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AbyssalCharge), new AOEShapeRect(41, 2)); diff --git a/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D060BiocultureNode.cs b/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D060BiocultureNode.cs index 52fe2aa7f2..8f3b320592 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D060BiocultureNode.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D060BiocultureNode.cs @@ -68,7 +68,7 @@ class MarrowDrain3(BossModule module) : MarrowDrain(module, AID.MarrowDrain3); class TheRamsVoice(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TheRamsVoice), new AOEShapeCircle(9.7f)); class Sideswipe(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Sideswipe), new AOEShapeCone(9, 45.Degrees())); -class Gust(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Gust), 3); +class Gust(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Gust), 3); class D060BiocultureNodeStates : StateMachineBuilder { diff --git a/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D060FacilityDreadnaught.cs b/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D060FacilityDreadnaught.cs index 7361c09324..6b34c900bf 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D060FacilityDreadnaught.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D060FacilityDreadnaught.cs @@ -17,7 +17,7 @@ public enum AID : uint class Rotoswipe(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Rotoswipe), new AOEShapeCone(11, 60.Degrees())); class AutoCannons(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AutoCannons), new AOEShapeRect(42.4f, 2.5f)); -class WreckingBall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.WreckingBall), 8); +class WreckingBall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.WreckingBall), 8); class D060FacilityDreadnaughtStates : StateMachineBuilder { diff --git a/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D061Regula.cs b/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D061Regula.cs index b6eda8e3d4..dd35797a7f 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D061Regula.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D061Regula.cs @@ -34,7 +34,7 @@ public enum TetherID : uint } class SelfDetonate(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.SelfDetonate)); -class AetherochemicalGrenado(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AetherochemicalGrenado), 8); +class AetherochemicalGrenado(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AetherochemicalGrenado), 8); class AetherochemicalLaser(BossModule module) : Components.BaitAwayTethers(module, new AOEShapeRect(50, 2), (uint)TetherID.BaitAway, ActionID.MakeSpell(AID.AetherochemicalLaser)); class AetherochemicalLaserAOE(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AetherochemicalLaser), new AOEShapeRect(50, 2)); diff --git a/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D062Harmachis.cs b/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D062Harmachis.cs index f8218c3555..1853a0d751 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D062Harmachis.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D062Harmachis.cs @@ -45,7 +45,7 @@ public enum IconID : uint Stack = 93 // player } -class Paradox(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Paradox), 5); +class Paradox(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Paradox), 5); class Petrifaction(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.Petrifaction)); class Ka(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Ka), new AOEShapeCone(45, 30.Degrees())); class GaseousBomb(BossModule module) : Components.StackWithIcon(module, (uint)IconID.Stack, ActionID.MakeSpell(AID.GaseousBomb), 5, 4.1f, 4, 4); diff --git a/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D064AscianPrime.cs b/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D064AscianPrime.cs index 9944d9aac2..ecdb92d0af 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D064AscianPrime.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D06AetherochemicalResearchFacility/D064AscianPrime.cs @@ -134,7 +134,7 @@ public override void AddGlobalHints(GlobalHints hints) } } -class AncientEruption(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AncientEruption), 5); +class AncientEruption(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AncientEruption), 5); abstract class ChillingCross(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCross(40, 2.5f)); class ChillingCross1(BossModule module) : ChillingCross(module, AID.ChillingCross1); diff --git a/BossMod/Modules/Heavensward/Dungeon/D11Antitower/D111ZuroRoggo.cs b/BossMod/Modules/Heavensward/Dungeon/D11Antitower/D111ZuroRoggo.cs index d54dbe58df..b7309361bf 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D11Antitower/D111ZuroRoggo.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D11Antitower/D111ZuroRoggo.cs @@ -34,7 +34,7 @@ public enum SID : uint Concussion = 3513 // Boss->player, extra=0xF43 } -abstract class WaterBomb(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 6); +abstract class WaterBomb(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 6); class WaterBomb1(BossModule module) : WaterBomb(module, AID.WaterBomb1); class WaterBomb2(BossModule module) : WaterBomb(module, AID.WaterBomb2); class WaterBomb3(BossModule module) : WaterBomb(module, AID.WaterBomb3); diff --git a/BossMod/Modules/Heavensward/Dungeon/D13SohrKhai/D0130BlizzardDragon.cs b/BossMod/Modules/Heavensward/Dungeon/D13SohrKhai/D0130BlizzardDragon.cs index 0fca25d777..a78b0d25b1 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D13SohrKhai/D0130BlizzardDragon.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D13SohrKhai/D0130BlizzardDragon.cs @@ -53,8 +53,8 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) } class Cauterize(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Cauterize), new AOEShapeRect(53, 10)); -class Fireball(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Fireball), 4); -class SheetOfIce(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SheetOfIce), 5); +class Fireball(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Fireball), 4); +class SheetOfIce(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SheetOfIce), 5); class D130BlizzardDragonStates : StateMachineBuilder { diff --git a/BossMod/Modules/Heavensward/Dungeon/D13SohrKhai/D0130CloudGardener.cs b/BossMod/Modules/Heavensward/Dungeon/D13SohrKhai/D0130CloudGardener.cs index 697b64f6da..d29599b5c6 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D13SohrKhai/D0130CloudGardener.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D13SohrKhai/D0130CloudGardener.cs @@ -26,7 +26,7 @@ public enum AID : uint class RiseAndFall(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RiseAndFall), new AOEShapeCone(9, 135.Degrees())); class TightTornado(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TightTornado), new AOEShapeRect(18, 2)); class Venom(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Venom), new AOEShapeCone(10.9f, 60.Degrees()), (uint)OID.SanctuarySkipper); -class DarkBlizzardIII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DarkBlizzardIII), 5); +class DarkBlizzardIII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DarkBlizzardIII), 5); class D130CloudGardenerStates : StateMachineBuilder { diff --git a/BossMod/Modules/Heavensward/Dungeon/D13SohrKhai/D0130Kargas.cs b/BossMod/Modules/Heavensward/Dungeon/D13SohrKhai/D0130Kargas.cs index b170b0904f..94a6a3ab7d 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D13SohrKhai/D0130Kargas.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D13SohrKhai/D0130Kargas.cs @@ -19,7 +19,7 @@ public enum AID : uint } class BreathWing(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.BreathWing)); -class WingsOfWoe(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.WingsOfWoe), 6); +class WingsOfWoe(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.WingsOfWoe), 6); class D130KargasStates : StateMachineBuilder { diff --git a/BossMod/Modules/Heavensward/Dungeon/D13SohrKhai/D133Hraesvelgr.cs b/BossMod/Modules/Heavensward/Dungeon/D13SohrKhai/D133Hraesvelgr.cs index a231920707..2715c5a482 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D13SohrKhai/D133Hraesvelgr.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D13SohrKhai/D133Hraesvelgr.cs @@ -31,7 +31,7 @@ public enum IconID : uint Spreadmarker = 311 // player->self } -abstract class HallowedWings(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeRect(50, 11)); +abstract class HallowedWings(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), new AOEShapeRect(50, 11)); class HallowedWings1(BossModule module) : HallowedWings(module, AID.HallowedWings1); class HallowedWings2(BossModule module) : HallowedWings(module, AID.HallowedWings2); diff --git a/BossMod/Modules/Heavensward/Dungeon/D15Xelphatol/D150ChasmHarpeia.cs b/BossMod/Modules/Heavensward/Dungeon/D15Xelphatol/D150ChasmHarpeia.cs index 56ef649232..cff833e7e1 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D15Xelphatol/D150ChasmHarpeia.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D15Xelphatol/D150ChasmHarpeia.cs @@ -28,8 +28,8 @@ public enum AID : uint class FlashFlood(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.FlashFlood), new AOEShapeCone(8.16f, 60.Degrees())); class LaboredLeap(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.LaboredLeap), new AOEShapeCircle(10.32f)); -class FallenRock(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FallingRock), 4); -class WingsOfWoe(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.WingsOfWoe), 6); +class FallenRock(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FallingRock), 4); +class WingsOfWoe(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.WingsOfWoe), 6); class D150ChasmHarpeiaStates : StateMachineBuilder { diff --git a/BossMod/Modules/Heavensward/Dungeon/D15Xelphatol/D150XelphatolSkycaller.cs b/BossMod/Modules/Heavensward/Dungeon/D15Xelphatol/D150XelphatolSkycaller.cs index fdd9f41396..7cfa05de4f 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D15Xelphatol/D150XelphatolSkycaller.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D15Xelphatol/D150XelphatolSkycaller.cs @@ -22,7 +22,7 @@ class TornadoHint(BossModule module) : Components.CastInterruptHint(module, Acti class IxaliAeroIII(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.IxaliAeroIII)); class IxaliAeroIIIHint(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.IxaliAeroIII), true, true, showNameInHint: true); class IxaliAeroII(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.IxaliAeroII), new AOEShapeRect(41.8f, 4)); -class Gust(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Gust), 5); +class Gust(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Gust), 5); class D150XelphatolSkycallerStates : StateMachineBuilder { diff --git a/BossMod/Modules/Heavensward/Dungeon/D15Xelphatol/D150XelphatolSwiftbeak.cs b/BossMod/Modules/Heavensward/Dungeon/D15Xelphatol/D150XelphatolSwiftbeak.cs index 71ce426a98..2c6a60f9ec 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D15Xelphatol/D150XelphatolSwiftbeak.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D15Xelphatol/D150XelphatolSwiftbeak.cs @@ -32,7 +32,7 @@ public enum AID : uint } class Overpower(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Overpower), new AOEShapeCone(7.08f, 45.Degrees())); -class Gust(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Gust), 5); +class Gust(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Gust), 5); class D150XelphatolSwiftbeakStates : StateMachineBuilder { diff --git a/BossMod/Modules/Heavensward/Dungeon/D15Xelphatol/D152DotoliCiloc.cs b/BossMod/Modules/Heavensward/Dungeon/D15Xelphatol/D152DotoliCiloc.cs index dc42e4adf8..2825285714 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D15Xelphatol/D152DotoliCiloc.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D15Xelphatol/D152DotoliCiloc.cs @@ -51,7 +51,7 @@ public override void Update() class DarkWings(BossModule module) : Components.SpreadFromIcon(module, (uint)IconID.Spreadmarker, ActionID.MakeSpell(AID.DarkWings), 6, 5.1f); class Whirlwind(BossModule module) : Components.PersistentVoidzone(module, 6, m => m.Enemies(OID.Whirlwind)); -class Stormcoming(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Stormcoming), 6); +class Stormcoming(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Stormcoming), 6); class OnLow(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.OnLow), new AOEShapeCone(10.98f, 60.Degrees())); class OnLowHaste(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Swiftfeather), new AOEShapeCone(10.98f, 60.Degrees())) diff --git a/BossMod/Modules/Heavensward/Dungeon/D17BaelsarsWall/D172ArmoredWeapon.cs b/BossMod/Modules/Heavensward/Dungeon/D17BaelsarsWall/D172ArmoredWeapon.cs index cf7d47e98a..24da9b2803 100644 --- a/BossMod/Modules/Heavensward/Dungeon/D17BaelsarsWall/D172ArmoredWeapon.cs +++ b/BossMod/Modules/Heavensward/Dungeon/D17BaelsarsWall/D172ArmoredWeapon.cs @@ -37,7 +37,7 @@ public enum SID : uint class Launcher(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Launcher)); class AssaultCannon(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AssaultCannon), new AOEShapeRect(40.94f, 1)); -abstract class DiffractiveLaser(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 5); +abstract class DiffractiveLaser(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 5); class DiffractiveLaser1(BossModule module) : DiffractiveLaser(module, AID.DiffractiveLaser1); class DiffractiveLaser2(BossModule module) : DiffractiveLaser(module, AID.DiffractiveLaser2); diff --git a/BossMod/Modules/Heavensward/Extreme/Ext3Thordan/Ex3Thordan.cs b/BossMod/Modules/Heavensward/Extreme/Ext3Thordan/Ex3Thordan.cs index dd3f254813..ec2239b96f 100644 --- a/BossMod/Modules/Heavensward/Extreme/Ext3Thordan/Ex3Thordan.cs +++ b/BossMod/Modules/Heavensward/Extreme/Ext3Thordan/Ex3Thordan.cs @@ -6,12 +6,12 @@ namespace BossMod.Heavensward.Extreme.Ex3Thordan; class HeavenlySlashAdelphel(BossModule module) : HeavenlySlash(module, OID.SerAdelphel); class HeavenlySlashJanlenoux(BossModule module) : HeavenlySlash(module, OID.SerJanlenoux); -class Meteorain(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MeteorainAOE), 6); +class Meteorain(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MeteorainAOE), 6); class AscalonsMercy(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AscalonsMercy), new AOEShapeCone(34.8f, 10.Degrees())); class AscalonsMercyHelper(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AscalonsMercyAOE), new AOEShapeCone(34.5f, 10.Degrees())); class DragonsRage(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.DragonsRage), 6, 8, 8); class LightningStorm(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.LightningStormAOE), 5); -class Heavensflame(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeavensflameAOE), 6); +class Heavensflame(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HeavensflameAOE), 6); class Conviction(BossModule module) : Components.CastTowers(module, ActionID.MakeSpell(AID.ConvictionAOE), 3); class BurningChains(BossModule module) : Components.Chains(module, (uint)TetherID.BurningChains, ActionID.MakeSpell(AID.HolyChain)); class SerZephirin(BossModule module) : Components.Adds(module, (uint)OID.SerZephirin); diff --git a/BossMod/Modules/Heavensward/Extreme/Ext3Thordan/Intermission3.cs b/BossMod/Modules/Heavensward/Extreme/Ext3Thordan/Intermission3.cs index 44c43457af..920f097af3 100644 --- a/BossMod/Modules/Heavensward/Extreme/Ext3Thordan/Intermission3.cs +++ b/BossMod/Modules/Heavensward/Extreme/Ext3Thordan/Intermission3.cs @@ -17,7 +17,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) class HiemalStormVoidzone(BossModule module) : Components.PersistentVoidzone(module, 6, m => m.Enemies(OID.HiemalStorm).Where(x => x.EventState != 7)); class SpiralPierce(BossModule module) : Components.BaitAwayTethers(module, new AOEShapeRect(50, 6), (uint)TetherID.SpiralPierce, ActionID.MakeSpell(AID.SpiralPierce)); -class DimensionalCollapse(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DimensionalCollapseAOE), 9); +class DimensionalCollapse(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DimensionalCollapseAOE), 9); class FaithUnmoving(BossModule module) : Components.Knockback(module, ActionID.MakeSpell(AID.FaithUnmoving), true) { diff --git a/BossMod/Modules/Heavensward/Quest/Heliodrome.cs b/BossMod/Modules/Heavensward/Quest/Heliodrome.cs index 85d4a4326c..efc9fdfee8 100644 --- a/BossMod/Modules/Heavensward/Quest/Heliodrome.cs +++ b/BossMod/Modules/Heavensward/Quest/Heliodrome.cs @@ -22,8 +22,8 @@ public enum AID : uint } -class MagitekMissiles(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MagitekMissiles), 15); -class ShrapnelShell(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ShrapnelShell), 6); +class MagitekMissiles(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MagitekMissiles), 15); +class ShrapnelShell(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ShrapnelShell), 6); class Firebomb(BossModule module) : Components.PersistentVoidzone(module, 4, m => m.Enemies(0x1E86DF).Where(e => e.EventState != 7)); class Uprising(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AugmentedUprising), new AOEShapeCone(8.5f, 60.Degrees())); @@ -31,7 +31,7 @@ class Firebomb(BossModule module) : Components.PersistentVoidzone(module, 4, m = class Heartstopper(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Heartstopper), new AOEShapeRect(3.5f, 1.5f)); class Overpower(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Overpower), new AOEShapeCone(6, 45.Degrees())); class GrandSword(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GrandSword), new AOEShapeCone(21, 60.Degrees())); -class MagitekRay(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MagitekRay), 6); +class MagitekRay(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MagitekRay), 6); class GrandStrike(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GrandStrike), new AOEShapeRect(48, 2)); class Adds(BossModule module) : Components.AddsMulti(module, [0x1960, 0x1961, 0x1962, 0x1963, 0x1964, 0x1965, 0x1966]) diff --git a/BossMod/Modules/Heavensward/Quest/OneLifeOneWorld.cs b/BossMod/Modules/Heavensward/Quest/OneLifeOneWorld.cs index f139ca3802..d2ecf974bb 100644 --- a/BossMod/Modules/Heavensward/Quest/OneLifeOneWorld.cs +++ b/BossMod/Modules/Heavensward/Quest/OneLifeOneWorld.cs @@ -25,7 +25,7 @@ public enum SID : uint class Overpower(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Overpower), new AOEShapeCone(7, 45.Degrees())); class UnlitCyclone(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.UnlitCyclone), new AOEShapeCircle(6)); -class UnlitCycloneAdds(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.UnlitCycloneAdds), 9); +class UnlitCycloneAdds(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.UnlitCycloneAdds), 9); class Skydrive(BossModule module) : Components.BaitAwayIcon(module, new AOEShapeCircle(5), 23, ActionID.MakeSpell(AID.Skydrive), centerAtTarget: true); class SkydrivePuddle(BossModule module) : Components.PersistentVoidzone(module, 5, m => m.Enemies(0x1EA19C).Where(x => x.EventState != 7)); diff --git a/BossMod/Modules/RealmReborn/Alliance/A11BoneDragon/A11BoneDragon.cs b/BossMod/Modules/RealmReborn/Alliance/A11BoneDragon/A11BoneDragon.cs index 39f5b4da0e..ce23e5bc6a 100644 --- a/BossMod/Modules/RealmReborn/Alliance/A11BoneDragon/A11BoneDragon.cs +++ b/BossMod/Modules/RealmReborn/Alliance/A11BoneDragon/A11BoneDragon.cs @@ -1,6 +1,6 @@ namespace BossMod.RealmReborn.Alliance.A11BoneDragon; -class Apocalypse(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Apocalypse), 6); +class Apocalypse(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Apocalypse), 6); class EvilEye(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.EvilEye), new AOEShapeCone(105, 60.Degrees())); class Stone(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Stone)); class Level5Petrify(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Level5Petrify), new AOEShapeCone(7.8f, 45.Degrees())); diff --git a/BossMod/Modules/RealmReborn/Alliance/A12Thanatos/A12Thanatos.cs b/BossMod/Modules/RealmReborn/Alliance/A12Thanatos/A12Thanatos.cs index 791b0c11a8..b8f5836636 100644 --- a/BossMod/Modules/RealmReborn/Alliance/A12Thanatos/A12Thanatos.cs +++ b/BossMod/Modules/RealmReborn/Alliance/A12Thanatos/A12Thanatos.cs @@ -1,8 +1,8 @@ namespace BossMod.RealmReborn.Alliance.A12Thanatos; -class BlackCloud(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BlackCloud), 6); -class Cloudscourge(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Cloudscourge), 6); -class VoidFireII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.VoidFireII), 5); +class BlackCloud(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BlackCloud), 6); +class Cloudscourge(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Cloudscourge), 6); +class VoidFireII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.VoidFireII), 5); class AstralLight(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AstralLight), new AOEShapeCircle(6.8f)); [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "The Combat Reborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 92, NameID = 710)] diff --git a/BossMod/Modules/RealmReborn/Alliance/A14Phlegethon/A14Phlegethon.cs b/BossMod/Modules/RealmReborn/Alliance/A14Phlegethon/A14Phlegethon.cs index 739693fa34..fd3179f837 100644 --- a/BossMod/Modules/RealmReborn/Alliance/A14Phlegethon/A14Phlegethon.cs +++ b/BossMod/Modules/RealmReborn/Alliance/A14Phlegethon/A14Phlegethon.cs @@ -1,9 +1,9 @@ namespace BossMod.RealmReborn.Alliance.A14Phlegethon; -class MegiddoFlame2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MegiddoFlame2), 3); -class MegiddoFlame3(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MegiddoFlame3), 4); -class MegiddoFlame4(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MegiddoFlame4), 5); -class MegiddoFlame5(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MegiddoFlame5), 6); +class MegiddoFlame2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MegiddoFlame2), 3); +class MegiddoFlame3(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MegiddoFlame3), 4); +class MegiddoFlame4(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MegiddoFlame4), 5); +class MegiddoFlame5(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MegiddoFlame5), 6); class MoonfallSlash(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MoonfallSlash), new AOEShapeCone(15, 60.Degrees())); class VacuumSlash2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.VacuumSlash2), new AOEShapeCone(80, 22.5f.Degrees())); class AncientFlare1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AncientFlare1), new AOEShapeCircle(35)); diff --git a/BossMod/Modules/RealmReborn/Alliance/A22Glasya/A22Glasya.cs b/BossMod/Modules/RealmReborn/Alliance/A22Glasya/A22Glasya.cs index 39f3496497..17dfe80ff8 100644 --- a/BossMod/Modules/RealmReborn/Alliance/A22Glasya/A22Glasya.cs +++ b/BossMod/Modules/RealmReborn/Alliance/A22Glasya/A22Glasya.cs @@ -1,6 +1,6 @@ namespace BossMod.RealmReborn.Alliance.A22Glasya; -class Aura(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Aura), 8); +class Aura(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Aura), 8); class VileUtterance(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.VileUtterance), new AOEShapeCone(30, 22.5f.Degrees())); [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "The Combat Reborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 102, NameID = 2815)] diff --git a/BossMod/Modules/RealmReborn/Alliance/A23Amon/A23Amon.cs b/BossMod/Modules/RealmReborn/Alliance/A23Amon/A23Amon.cs index f05eb04e8a..4863900a63 100644 --- a/BossMod/Modules/RealmReborn/Alliance/A23Amon/A23Amon.cs +++ b/BossMod/Modules/RealmReborn/Alliance/A23Amon/A23Amon.cs @@ -8,8 +8,8 @@ class CurtainCall(BossModule module) : Components.CastLineOfSightAOE(module, Act public override IEnumerable BlockerActors() => Module.Enemies(OID.IceCage).Where(a => !a.IsDead); } -class ThundagaForte1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ThundagaForte1), 6); -class ThundagaForte2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ThundagaForte2), 6); +class ThundagaForte1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ThundagaForte1), 6); +class ThundagaForte2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ThundagaForte2), 6); [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "The Combat Reborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 102, NameID = 2821)] public class A23Amon(WorldState ws, Actor primary) : BossModule(ws, primary, new(0, -200), new ArenaBoundsCircle(30)) diff --git a/BossMod/Modules/RealmReborn/Alliance/A24Xande/A24Xande.cs b/BossMod/Modules/RealmReborn/Alliance/A24Xande/A24Xande.cs index cf17fca3c5..f944c58368 100644 --- a/BossMod/Modules/RealmReborn/Alliance/A24Xande/A24Xande.cs +++ b/BossMod/Modules/RealmReborn/Alliance/A24Xande/A24Xande.cs @@ -1,8 +1,8 @@ namespace BossMod.RealmReborn.Alliance.A24Xande; class KnucklePress(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.KnucklePress), new AOEShapeCircle(10)); -class BurningRave1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BurningRave1), 8); -class BurningRave2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BurningRave2), 8); +class BurningRave1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BurningRave1), 8); +class BurningRave2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BurningRave2), 8); class AncientQuake(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.AncientQuake)); class AncientQuaga(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.AncientQuaga)); class AuraCannon(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AuraCannon), new AOEShapeRect(60, 5)); diff --git a/BossMod/Modules/RealmReborn/Alliance/A31AngraMainyu/A31AngraMainyu.cs b/BossMod/Modules/RealmReborn/Alliance/A31AngraMainyu/A31AngraMainyu.cs index d97b94ba8d..289a854c5d 100644 --- a/BossMod/Modules/RealmReborn/Alliance/A31AngraMainyu/A31AngraMainyu.cs +++ b/BossMod/Modules/RealmReborn/Alliance/A31AngraMainyu/A31AngraMainyu.cs @@ -2,8 +2,8 @@ class DoubleVision(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.DoubleVision)); class MortalGaze1(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.MortalGaze1)); -class Level100Flare1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Level100Flare1), 10); -class Level150Death1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Level150Death1), 10); +class Level100Flare1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Level100Flare1), 10); +class Level150Death1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Level150Death1), 10); [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "The Combat Reborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 111, NameID = 3231)] public class A31AngraMainyu(WorldState ws, Actor primary) : BossModule(ws, primary, new(-145, 300), new ArenaBoundsCircle(30)) diff --git a/BossMod/Modules/RealmReborn/Alliance/A32FiveheadedDragon/A32FiveheadedDragon.cs b/BossMod/Modules/RealmReborn/Alliance/A32FiveheadedDragon/A32FiveheadedDragon.cs index 8dfd0e6bbd..dc6bb1d942 100644 --- a/BossMod/Modules/RealmReborn/Alliance/A32FiveheadedDragon/A32FiveheadedDragon.cs +++ b/BossMod/Modules/RealmReborn/Alliance/A32FiveheadedDragon/A32FiveheadedDragon.cs @@ -1,10 +1,10 @@ namespace BossMod.RealmReborn.Alliance.A32FiveheadedDragon; class WhiteBreath(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.WhiteBreath), new AOEShapeCone(30, 60.Degrees())); -class BreathOfFire(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BreathOfFire), 6); -class BreathOfLight(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BreathOfLight), 6); -class BreathOfPoison(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BreathOfPoison), 6); -class BreathOfIce(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BreathOfIce), 6); +class BreathOfFire(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BreathOfFire), 6); +class BreathOfLight(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BreathOfLight), 6); +class BreathOfPoison(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BreathOfPoison), 6); +class BreathOfIce(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BreathOfIce), 6); class Radiance(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Radiance)); class HeatWave(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.HeatWave)); diff --git a/BossMod/Modules/RealmReborn/Alliance/A33Cerberus/A33Cerberus.cs b/BossMod/Modules/RealmReborn/Alliance/A33Cerberus/A33Cerberus.cs index caa401f0d1..ced6b99d1c 100644 --- a/BossMod/Modules/RealmReborn/Alliance/A33Cerberus/A33Cerberus.cs +++ b/BossMod/Modules/RealmReborn/Alliance/A33Cerberus/A33Cerberus.cs @@ -1,7 +1,7 @@ namespace BossMod.RealmReborn.Alliance.A33Cerberus; class TailBlow(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TailBlow), new AOEShapeCone(19, 45.Degrees())); -class Slabber(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Slabber), 8); +class Slabber(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Slabber), 8); class Mini(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Mini), new AOEShapeCircle(9)); class SulphurousBreath1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SulphurousBreath1), new AOEShapeRect(35, 3)); class SulphurousBreath2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SulphurousBreath2), new AOEShapeRect(45, 3)); diff --git a/BossMod/Modules/RealmReborn/Dungeon/D03Copperbell/D032IchorousIre.cs b/BossMod/Modules/RealmReborn/Dungeon/D03Copperbell/D032IchorousIre.cs index f41ad4f702..2610976e38 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D03Copperbell/D032IchorousIre.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D03Copperbell/D032IchorousIre.cs @@ -16,7 +16,7 @@ public enum AID : uint Burst = 28465, // IchorousDrip->self, 6.0s cast, range 8 aoe } -class Syrup(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Syrup), 4); +class Syrup(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Syrup), 4); class FluidSpread(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.FluidSpread)); class Divide(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Burst), new AOEShapeCircle(8)); diff --git a/BossMod/Modules/RealmReborn/Dungeon/D03Copperbell/D033Gyges.cs b/BossMod/Modules/RealmReborn/Dungeon/D03Copperbell/D033Gyges.cs index 653f476fc2..81d367c3f7 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D03Copperbell/D033Gyges.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D03Copperbell/D033Gyges.cs @@ -17,7 +17,7 @@ public enum AID : uint } class GiganticSwing(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GiganticSwing), new AOEShapeDonut(4, 40)); -class GiganticSmash(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GiganticSmash), 10); +class GiganticSmash(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GiganticSmash), 10); class GiganticBlast(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GiganticBlast), new AOEShapeCircle(8)); class GrandSlam(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.GrandSlam)); class ColossalSlam(BossModule module) : Components.SelfTargetedLegacyRotationAOEs(module, ActionID.MakeSpell(AID.ColossalSlam), new AOEShapeCone(40, 30.Degrees())); diff --git a/BossMod/Modules/RealmReborn/Dungeon/D04Halatali/D041Firemane.cs b/BossMod/Modules/RealmReborn/Dungeon/D04Halatali/D041Firemane.cs index 2f415544fb..ebb67a654c 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D04Halatali/D041Firemane.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D04Halatali/D041Firemane.cs @@ -44,7 +44,7 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) } class BurningBolt(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.BurningBolt)); -class FireII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FireII), 5); +class FireII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FireII), 5); class D041FiremaneStates : StateMachineBuilder { diff --git a/BossMod/Modules/RealmReborn/Dungeon/D04Halatali/D042ThunderclapGuivre.cs b/BossMod/Modules/RealmReborn/Dungeon/D04Halatali/D042ThunderclapGuivre.cs index 0ea3ecf118..780b117082 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D04Halatali/D042ThunderclapGuivre.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D04Halatali/D042ThunderclapGuivre.cs @@ -19,7 +19,7 @@ public enum AID : uint } class Levinfang(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Levinfang)); -class Electrify(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Electrify), 6); +class Electrify(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Electrify), 6); class HydroelectricShock(BossModule module) : Components.GenericAOEs(module) { private AOEInstance? _aoe; diff --git a/BossMod/Modules/RealmReborn/Dungeon/D04Halatali/D043Tangata.cs b/BossMod/Modules/RealmReborn/Dungeon/D04Halatali/D043Tangata.cs index b40f04c650..d10853fcbc 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D04Halatali/D043Tangata.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D04Halatali/D043Tangata.cs @@ -32,7 +32,7 @@ public enum SID : uint } class StraightPunch(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.StraightPunch)); -class Firewater(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Firewater), 3); +class Firewater(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Firewater), 3); class PlainPound(BossModule module) : Components.ConcentricAOEs(module, _shapes) { diff --git a/BossMod/Modules/RealmReborn/Dungeon/D06Haukke/D061ManorClaviger.cs b/BossMod/Modules/RealmReborn/Dungeon/D06Haukke/D061ManorClaviger.cs index b8b66510dc..f65a6f9a6e 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D06Haukke/D061ManorClaviger.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D06Haukke/D061ManorClaviger.cs @@ -14,7 +14,7 @@ public enum AID : uint } class SweetSteel(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.SweetSteel), new AOEShapeCone(7.4f, 45.Degrees())); // TODO: verify angle -class VoidFire2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.VoidFire2), 5); +class VoidFire2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.VoidFire2), 5); class DarkMist(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DarkMist), new AOEShapeCircle(9.4f)); class D061ManorClavigerStates : StateMachineBuilder diff --git a/BossMod/Modules/RealmReborn/Dungeon/D10StoneVigil/D102Koshchei.cs b/BossMod/Modules/RealmReborn/Dungeon/D10StoneVigil/D102Koshchei.cs index 15c595bdf7..9ce6ef16c6 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D10StoneVigil/D102Koshchei.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D10StoneVigil/D102Koshchei.cs @@ -17,7 +17,7 @@ public enum AID : uint } class SpikedTail(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.SpikedTail)); -class SonicStorm(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SonicStorm), 6); +class SonicStorm(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SonicStorm), 6); class Typhoon(BossModule module) : Components.Exaflare(module, 3) { diff --git a/BossMod/Modules/RealmReborn/Dungeon/D10StoneVigil/D103Isgebind.cs b/BossMod/Modules/RealmReborn/Dungeon/D10StoneVigil/D103Isgebind.cs index 7286a48870..be203eb313 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D10StoneVigil/D103Isgebind.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D10StoneVigil/D103Isgebind.cs @@ -19,8 +19,8 @@ public enum AID : uint class RimeWreath(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.RimeWreath)); class FrostBreath(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.FrostBreath), new AOEShapeCone(27, 60.Degrees())); // TODO: verify angle -class SheetOfIce(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SheetOfIce), 5); -class SheetOfIce2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SheetOfIce2), 5); +class SheetOfIce(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SheetOfIce), 5); +class SheetOfIce2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SheetOfIce2), 5); class Cauterize(BossModule module) : Components.SelfTargetedLegacyRotationAOEs(module, ActionID.MakeSpell(AID.Cauterize), new AOEShapeRect(48, 10)); class Touchdown(BossModule module) : Components.GenericAOEs(module, ActionID.MakeSpell(AID.Touchdown)) @@ -30,8 +30,8 @@ class Touchdown(BossModule module) : Components.GenericAOEs(module, ActionID.Mak public override IEnumerable ActiveAOEs(int slot, Actor actor) { // TODO: proper timings... - if (!Module.PrimaryActor.IsTargetable && !Module.FindComponent()!.ActiveCasters.Any()) - yield return new(_shape, Module.Center); + if (!Module.PrimaryActor.IsTargetable && Module.FindComponent()!.ActiveCasters.Count == 0) + yield return new(_shape, Arena.Center); } } diff --git a/BossMod/Modules/RealmReborn/Dungeon/D12AurumVale/D121Locksmith.cs b/BossMod/Modules/RealmReborn/Dungeon/D12AurumVale/D121Locksmith.cs index 5be17081a4..b0e58250b2 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D12AurumVale/D121Locksmith.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D12AurumVale/D121Locksmith.cs @@ -14,7 +14,7 @@ public enum AID : uint } class HundredLashings(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.HundredLashings), new AOEShapeCone(12, 45.Degrees())); // TODO: verify angle -class GoldDust(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GoldDust), 8); +class GoldDust(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GoldDust), 8); // arena has multiple weirdly-shaped puddles, so just prefer standing in large safe zone class AIPosition(BossModule module) : BossComponent(module) diff --git a/BossMod/Modules/RealmReborn/Dungeon/D13CastrumMeridianum/D131BlackEft.cs b/BossMod/Modules/RealmReborn/Dungeon/D13CastrumMeridianum/D131BlackEft.cs index 3f0d84229b..ae4fe112ab 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D13CastrumMeridianum/D131BlackEft.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D13CastrumMeridianum/D131BlackEft.cs @@ -25,7 +25,7 @@ public enum AID : uint class IncendiarySupport(BossModule module) : Components.RaidwideCastDelay(module, ActionID.MakeSpell(AID.IncendiarySupportVisual), ActionID.MakeSpell(AID.IncendiarySupport), 1, "Raidwide x3"); class HighPoweredMagitekRay(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.HighPoweredMagitekRay), new AOEShapeRect(50, 2)); -class MagitekCannon(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MagitekCannon), 6); +class MagitekCannon(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MagitekCannon), 6); class D131BlackEftStates : StateMachineBuilder { diff --git a/BossMod/Modules/RealmReborn/Dungeon/D14Praetorium/D141Colossus.cs b/BossMod/Modules/RealmReborn/Dungeon/D14Praetorium/D141Colossus.cs index 21a82a2608..21b390f41a 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D14Praetorium/D141Colossus.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D14Praetorium/D141Colossus.cs @@ -21,8 +21,8 @@ public enum AID : uint } class CeruleumVent(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.CeruleumVent)); -class PrototypeLaserAlpha1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.IronKissAlpha1), 6); -class PrototypeLaserAlpha2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.IronKissAlpha2), 6); +class PrototypeLaserAlpha1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.IronKissAlpha1), 6); +class PrototypeLaserAlpha2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.IronKissAlpha2), 6); class PrototypeLaserBeta(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.IronKissBeta), 5); class GrandSword(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GrandSword), new AOEShapeCone(25, 45.Degrees())); diff --git a/BossMod/Modules/RealmReborn/Dungeon/D14Praetorium/D143Gaius.cs b/BossMod/Modules/RealmReborn/Dungeon/D14Praetorium/D143Gaius.cs index f69f0f36a5..5aabdbadfc 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D14Praetorium/D143Gaius.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D14Praetorium/D143Gaius.cs @@ -62,7 +62,7 @@ class HandOfTheEmpire(BossModule module) : Components.SpreadFromCastTargets(modu class FestinaLente(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.FestinaLente), 6, 4, 4); class Innocence(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Innocence)); class HorridaBella(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.HorridaBella)); -class Ductus(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DuctusAOE), 8); +class Ductus(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DuctusAOE), 8); class AddEnrage(BossModule module) : BossComponent(module) { diff --git a/BossMod/Modules/RealmReborn/Dungeon/D15WanderersPalace/D151KeeperOfHalidom.cs b/BossMod/Modules/RealmReborn/Dungeon/D15WanderersPalace/D151KeeperOfHalidom.cs index 584b946545..519fd2c292 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D15WanderersPalace/D151KeeperOfHalidom.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D15WanderersPalace/D151KeeperOfHalidom.cs @@ -62,7 +62,7 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) } } -class MoldyPhlegm(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MoldyPhlegm), 6); +class MoldyPhlegm(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MoldyPhlegm), 6); class D151KeeperOfHalidomStates : StateMachineBuilder { diff --git a/BossMod/Modules/RealmReborn/Dungeon/D16Amdapor/D161Psycheflayer.cs b/BossMod/Modules/RealmReborn/Dungeon/D16Amdapor/D161Psycheflayer.cs index 6272736b8a..89c75d46a7 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D16Amdapor/D161Psycheflayer.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D16Amdapor/D161Psycheflayer.cs @@ -28,7 +28,7 @@ public enum AID : uint } class VoidFireCleave(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.VoidFireCleave), new AOEShapeCircle(5), originAtTarget: true); -class VoidFireAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.VoidFireAOE), 5); +class VoidFireAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.VoidFireAOE), 5); class VoidThunder(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.VoidThunder), "Interruptible tankbuster"); class MindMelt(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.MindMelt), "Interruptible raidwide"); class Canker(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.Canker), "Interruptible debuff"); diff --git a/BossMod/Modules/RealmReborn/Dungeon/D16Amdapor/D163Anantaboga.cs b/BossMod/Modules/RealmReborn/Dungeon/D16Amdapor/D163Anantaboga.cs index e6560adf8f..1c50e1ffb2 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D16Amdapor/D163Anantaboga.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D16Amdapor/D163Anantaboga.cs @@ -38,7 +38,7 @@ class ImminentCatastrophe(BossModule module) : Components.CastLineOfSightAOE(mod public override IEnumerable BlockerActors() => ((D163Anantaboga)Module).ActivePillars(); } -class TerrorEye(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TerrorEye), 6); +class TerrorEye(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TerrorEye), 6); class PlagueDance(BossModule module) : BossComponent(module) { diff --git a/BossMod/Modules/RealmReborn/Dungeon/D26Snowcloak/D261Wandil.cs b/BossMod/Modules/RealmReborn/Dungeon/D26Snowcloak/D261Wandil.cs index 89f472e503..1a13e39195 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D26Snowcloak/D261Wandil.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D26Snowcloak/D261Wandil.cs @@ -47,7 +47,7 @@ public override void OnCastStarted(Actor caster, ActorCastInfo spell) class IceGuillotine(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.IceGuillotine), new AOEShapeCone(11.23f, 60.Degrees()), activeWhileCasting: false); class SnowDrift(BossModule module) : Components.RaidwideCastDelay(module, ActionID.MakeSpell(AID.SnowDriftVisual), ActionID.MakeSpell(AID.SnowDrift), 2); -class ColdWave(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ColdWave), 8); +class ColdWave(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ColdWave), 8); class D261WandilStates : StateMachineBuilder { diff --git a/BossMod/Modules/RealmReborn/Dungeon/D29KeeperOfTheLake/D291Einhander.cs b/BossMod/Modules/RealmReborn/Dungeon/D29KeeperOfTheLake/D291Einhander.cs index ed8713ab81..2d29ff9f39 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D29KeeperOfTheLake/D291Einhander.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D29KeeperOfTheLake/D291Einhander.cs @@ -24,7 +24,7 @@ class AeroBlast(BossModule module) : Components.RaidwideCast(module, ActionID.Ma class MarkXLIQuickFiringCannon(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MarkXLIQuickFiringCannon), new AOEShapeRect(40, 2)); class CeruleumExplosion(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.CeruleumExplosion), new AOEShapeCircle(12)); class HeavySwing(BossModule module) : Components.SingleTargetDelayableCast(module, ActionID.MakeSpell(AID.HeavySwing)); -class MarkXLIIIMiniCannon(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MarkXLIIIMiniCannon), 15); +class MarkXLIIIMiniCannon(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MarkXLIIIMiniCannon), 15); class D291EinhanderStates : StateMachineBuilder { diff --git a/BossMod/Modules/RealmReborn/Dungeon/D29KeeperOfTheLake/D292MagitekGunship.cs b/BossMod/Modules/RealmReborn/Dungeon/D29KeeperOfTheLake/D292MagitekGunship.cs index 146e73c761..3e04ce5123 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D29KeeperOfTheLake/D292MagitekGunship.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D29KeeperOfTheLake/D292MagitekGunship.cs @@ -31,7 +31,7 @@ public enum AID : uint class GarleanFire(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 8, ActionID.MakeSpell(AID.GarleanFire), m => m.Enemies(OID.FireVoidzone).Where(z => z.EventState != 7), 0.2f); class DrillCannons(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DrillCannons), new AOEShapeRect(32.8f, 2.5f)); -class CarpetBomb(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.CarpetBomb), 5); +class CarpetBomb(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.CarpetBomb), 5); class Overcharge(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Overcharge), new AOEShapeCone(10.8f, 60.Degrees())); class Flamethrower(BossModule module) : Components.GenericAOEs(module) diff --git a/BossMod/Modules/RealmReborn/Extreme/Ex1Ultima/Ex1Ultima.cs b/BossMod/Modules/RealmReborn/Extreme/Ex1Ultima/Ex1Ultima.cs index ef54c5dbc8..9e72cdc5f9 100644 --- a/BossMod/Modules/RealmReborn/Extreme/Ex1Ultima/Ex1Ultima.cs +++ b/BossMod/Modules/RealmReborn/Extreme/Ex1Ultima/Ex1Ultima.cs @@ -1,8 +1,8 @@ namespace BossMod.RealmReborn.Extreme.Ex1Ultima; -class RadiantPlume(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RadiantPlume), 8); -class WeightOfTheLand(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.WeightOfTheLand), 6); -class Eruption(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Eruption), 8); +class RadiantPlume(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RadiantPlume), 8); +class WeightOfTheLand(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.WeightOfTheLand), 6); +class Eruption(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Eruption), 8); class MagitekRayCenter(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MagitekRayCenter), new AOEShapeRect(40, 3)); class MagitekRayLeft(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MagitekRayLeft), new AOEShapeRect(40, 3)); class MagitekRayRight(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MagitekRayRight), new AOEShapeRect(40, 3)); diff --git a/BossMod/Modules/RealmReborn/Extreme/Ex2Garuda/Ex2Garuda.cs b/BossMod/Modules/RealmReborn/Extreme/Ex2Garuda/Ex2Garuda.cs index d8ad205395..8d2792568a 100644 --- a/BossMod/Modules/RealmReborn/Extreme/Ex2Garuda/Ex2Garuda.cs +++ b/BossMod/Modules/RealmReborn/Extreme/Ex2Garuda/Ex2Garuda.cs @@ -4,12 +4,12 @@ class DownburstSuparna(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Downburst1), new AOEShapeCone(11.36f, 60.Degrees()), (uint)OID.Suparna); // TODO: verify angle class DownburstChirada(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Downburst2), new AOEShapeCone(11.36f, 60.Degrees()), (uint)OID.Chirada); // TODO: verify angle class Slipstream(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Slipstream), new AOEShapeCone(11.7f, 45.Degrees())); -class FrictionAdds(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FrictionAdds), 5); -class FeatherRain(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FeatherRain), 3); +class FrictionAdds(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FrictionAdds), 5); +class FeatherRain(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FeatherRain), 3); class AerialBlast(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.AerialBlast)); class MistralShriek(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.MistralShriek)); class Gigastorm(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Gigastorm), new AOEShapeCircle(6.5f)); -class GreatWhirlwind(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GreatWhirlwind), 8); +class GreatWhirlwind(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GreatWhirlwind), 8); [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 65, NameID = 1644)] public class Ex2Garuda : BossModule diff --git a/BossMod/Modules/RealmReborn/Extreme/Ex3Titan/Ex3Titan.cs b/BossMod/Modules/RealmReborn/Extreme/Ex3Titan/Ex3Titan.cs index 528c52cbaf..4c7149052f 100644 --- a/BossMod/Modules/RealmReborn/Extreme/Ex3Titan/Ex3Titan.cs +++ b/BossMod/Modules/RealmReborn/Extreme/Ex3Titan/Ex3Titan.cs @@ -1,6 +1,6 @@ namespace BossMod.RealmReborn.Extreme.Ex3Titan; -class WeightOfTheLand(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.WeightOfTheLandAOE), 6); +class WeightOfTheLand(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.WeightOfTheLandAOE), 6); class GaolerVoidzone(BossModule module) : Components.PersistentVoidzone(module, 5, m => m.Enemies(OID.GaolerVoidzone).Where(e => e.EventState != 7)); [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 64, NameID = 1801, PlanLevel = 50)] diff --git a/BossMod/Modules/RealmReborn/Extreme/Ex4Ifrit/Eruption.cs b/BossMod/Modules/RealmReborn/Extreme/Ex4Ifrit/Eruption.cs index 27790649cd..4bb41266d2 100644 --- a/BossMod/Modules/RealmReborn/Extreme/Ex4Ifrit/Eruption.cs +++ b/BossMod/Modules/RealmReborn/Extreme/Ex4Ifrit/Eruption.cs @@ -1,7 +1,7 @@ namespace BossMod.RealmReborn.Extreme.Ex4Ifrit; // TODO: revise & generalize to 'baited aoe' component, with nice utilities for AI -class Eruption(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.EruptionAOE), Radius) +class Eruption(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.EruptionAOE), Radius) { private DateTime _baitDetectDeadline; public BitMask Baiters; diff --git a/BossMod/Modules/RealmReborn/Extreme/Ex4Ifrit/Ex4Ifrit.cs b/BossMod/Modules/RealmReborn/Extreme/Ex4Ifrit/Ex4Ifrit.cs index 2e8aa8efc6..81ca60d356 100644 --- a/BossMod/Modules/RealmReborn/Extreme/Ex4Ifrit/Ex4Ifrit.cs +++ b/BossMod/Modules/RealmReborn/Extreme/Ex4Ifrit/Ex4Ifrit.cs @@ -5,7 +5,7 @@ class Incinerate(BossModule module) : Components.Cleave(module, ActionID.MakeSpe public static readonly AOEShapeCone CleaveShape = new(21, 60.Degrees()); } -class RadiantPlume(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RadiantPlumeAOE), 8); +class RadiantPlume(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RadiantPlumeAOE), 8); // TODO: consider showing next charge before its cast starts... class CrimsonCyclone(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.CrimsonCyclone), new AOEShapeRect(49, 9)); diff --git a/BossMod/Modules/RealmReborn/Trial/T01IfritN/T01IfritN.cs b/BossMod/Modules/RealmReborn/Trial/T01IfritN/T01IfritN.cs index 4623f4d641..4fa664f04b 100644 --- a/BossMod/Modules/RealmReborn/Trial/T01IfritN/T01IfritN.cs +++ b/BossMod/Modules/RealmReborn/Trial/T01IfritN/T01IfritN.cs @@ -38,8 +38,8 @@ public override void AddGlobalHints(GlobalHints hints) } class Incinerate(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Incinerate), new AOEShapeCone(16, 60.Degrees())); // TODO: verify angle -class Eruption(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.EruptionAOE), 8); -class RadiantPlume(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RadiantPlumeAOE), 8); +class Eruption(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.EruptionAOE), 8); +class RadiantPlume(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RadiantPlumeAOE), 8); class T01IfritNStates : StateMachineBuilder { diff --git a/BossMod/Modules/RealmReborn/Trial/T02TitanN/T02TitanN.cs b/BossMod/Modules/RealmReborn/Trial/T02TitanN/T02TitanN.cs index a14caa8168..866c897a17 100644 --- a/BossMod/Modules/RealmReborn/Trial/T02TitanN/T02TitanN.cs +++ b/BossMod/Modules/RealmReborn/Trial/T02TitanN/T02TitanN.cs @@ -43,7 +43,7 @@ public override void AddGlobalHints(GlobalHints hints) class RockBuster(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.RockBuster), new AOEShapeCone(11.25f, 60.Degrees())); // TODO: verify angle class Geocrush(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Geocrush), new AOEShapeCircle(18)); // TODO: verify falloff class Landslide(BossModule module) : Components.SelfTargetedLegacyRotationAOEs(module, ActionID.MakeSpell(AID.Landslide), new AOEShapeRect(40, 3)); -class WeightOfTheLand(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.WeightOfTheLandAOE), 6); +class WeightOfTheLand(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.WeightOfTheLandAOE), 6); class T02TitanNStates : StateMachineBuilder { diff --git a/BossMod/Modules/RealmReborn/Trial/T05IfritH/T05IfritH.cs b/BossMod/Modules/RealmReborn/Trial/T05IfritH/T05IfritH.cs index 173a1aa8b1..99ef792d3a 100644 --- a/BossMod/Modules/RealmReborn/Trial/T05IfritH/T05IfritH.cs +++ b/BossMod/Modules/RealmReborn/Trial/T05IfritH/T05IfritH.cs @@ -40,7 +40,7 @@ public override void AddGlobalHints(GlobalHints hints) } class Incinerate(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Incinerate), new AOEShapeCone(15, 60.Degrees())); -class Eruption(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.EruptionAOE), 8); +class Eruption(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.EruptionAOE), 8); class CrimsonCyclone(BossModule module) : Components.GenericAOEs(module, ActionID.MakeSpell(AID.CrimsonCyclone)) { @@ -66,7 +66,7 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) } } -class RadiantPlume(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RadiantPlumeAOE), 8); +class RadiantPlume(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RadiantPlumeAOE), 8); class T05IfritHStates : StateMachineBuilder { diff --git a/BossMod/Modules/RealmReborn/Trial/T06GarudaH/T06GarudaH.cs b/BossMod/Modules/RealmReborn/Trial/T06GarudaH/T06GarudaH.cs index 5d997979f1..f112d992c9 100644 --- a/BossMod/Modules/RealmReborn/Trial/T06GarudaH/T06GarudaH.cs +++ b/BossMod/Modules/RealmReborn/Trial/T06GarudaH/T06GarudaH.cs @@ -63,7 +63,7 @@ class MistralSong(BossModule module) : Components.CastLineOfSightAOE(module, Act } class AerialBlast(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.AerialBlast)); -class GreatWhirlwind(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GreatWhirlwind), 8); +class GreatWhirlwind(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GreatWhirlwind), 8); class EyeOfTheStorm(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.EyeOfTheStorm), new AOEShapeDonut(12, 25)); class T06GarudaHStates : StateMachineBuilder diff --git a/BossMod/Modules/RealmReborn/Trial/T07TitanH/T07TitanH.cs b/BossMod/Modules/RealmReborn/Trial/T07TitanH/T07TitanH.cs index 9555abec8f..99e5ede7d4 100644 --- a/BossMod/Modules/RealmReborn/Trial/T07TitanH/T07TitanH.cs +++ b/BossMod/Modules/RealmReborn/Trial/T07TitanH/T07TitanH.cs @@ -49,7 +49,7 @@ public override void AddGlobalHints(GlobalHints hints) // also handles rockbuster, which is just a smaller cleave... class MountainBuster(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.MountainBuster), new AOEShapeCone(21.25f, 60.Degrees())); // TODO: verify angle -class WeightOfTheLand(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.WeightOfTheLandAOE), 6); +class WeightOfTheLand(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.WeightOfTheLandAOE), 6); class Landslide(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Landslide), new AOEShapeRect(40.25f, 3)); class Geocrush(BossModule module) : Components.GenericAOEs(module, ActionID.MakeSpell(AID.Geocrush)) diff --git a/BossMod/Modules/RealmReborn/Trial/T08ThornmarchH/T08ThornmarchH.cs b/BossMod/Modules/RealmReborn/Trial/T08ThornmarchH/T08ThornmarchH.cs index 6006b6f9c4..6098997648 100644 --- a/BossMod/Modules/RealmReborn/Trial/T08ThornmarchH/T08ThornmarchH.cs +++ b/BossMod/Modules/RealmReborn/Trial/T08ThornmarchH/T08ThornmarchH.cs @@ -72,7 +72,7 @@ class ThousandKuponzeCharge(BossModule module) : Components.SingleTargetCast(mod class PomBog(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 8, ActionID.MakeSpell(AID.PomBog), m => m.Enemies(OID.PomBog).Where(a => a.EventState != 7), 0.8f); class MogStone(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.MogStoneAOE), 6, 8, 8); class TwinPomMeteor(BossModule module) : Components.CastSharedTankbuster(module, ActionID.MakeSpell(AID.TwinPomMeteorAOE), 6); -class MogComet(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MogCometAOE), 6); +class MogComet(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MogCometAOE), 6); class MogCreation(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MogCreation), new AOEShapeRect(50, 5)); // note: this fight has well-timed state machine for all phases, but it's just too simple to bother... diff --git a/BossMod/Modules/RealmReborn/Trial/T09WhorleaterH/T09WhorleaterH.cs b/BossMod/Modules/RealmReborn/Trial/T09WhorleaterH/T09WhorleaterH.cs index 253b23a753..fae12cd4ad 100644 --- a/BossMod/Modules/RealmReborn/Trial/T09WhorleaterH/T09WhorleaterH.cs +++ b/BossMod/Modules/RealmReborn/Trial/T09WhorleaterH/T09WhorleaterH.cs @@ -1,6 +1,6 @@ namespace BossMod.RealmReborn.Trial.T09WhorleaterH; -class GrandFall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GrandFall), 8); +class GrandFall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GrandFall), 8); class Hydroshot(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 5, ActionID.MakeSpell(AID.Hydroshot), m => m.Enemies(OID.HydroshotZone).Where(z => z.EventState != 7), 0); class Dreadstorm(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 5, ActionID.MakeSpell(AID.Dreadstorm), m => m.Enemies(OID.DreadstormZone).Where(z => z.EventState != 7), 0); diff --git a/BossMod/Modules/Shadowbringers/Alliance/A13Engels/A13Engels.cs b/BossMod/Modules/Shadowbringers/Alliance/A13Engels/A13Engels.cs index 05a3113544..f21c526109 100644 --- a/BossMod/Modules/Shadowbringers/Alliance/A13Engels/A13Engels.cs +++ b/BossMod/Modules/Shadowbringers/Alliance/A13Engels/A13Engels.cs @@ -35,11 +35,11 @@ public override void OnEventEnvControl(byte index, uint state) class PrecisionGuidedMissile2(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.PrecisionGuidedMissile2), 6); class LaserSight1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.LaserSight1), new AOEShapeRect(100, 10)); -class GuidedMissile2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GuidedMissile2), 6); -class IncendiaryBombing2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.IncendiaryBombing2), 8); +class GuidedMissile2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GuidedMissile2), 6); +class IncendiaryBombing2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.IncendiaryBombing2), 8); class IncendiaryBombing1(BossModule module) : Components.SpreadFromIcon(module, (uint)IconID.Spreadmarker, ActionID.MakeSpell(AID.IncendiaryBombing1), 8, 5); class DiffuseLaser(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.DiffuseLaser)); -class SurfaceMissile2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SurfaceMissile2), 6); +class SurfaceMissile2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SurfaceMissile2), 6); class GuidedMissile : Components.StandardChasingAOEs { diff --git a/BossMod/Modules/Shadowbringers/Alliance/A22FlightUnits/A22FlightUnits.cs b/BossMod/Modules/Shadowbringers/Alliance/A22FlightUnits/A22FlightUnits.cs index 9e1826713b..62278be0a4 100644 --- a/BossMod/Modules/Shadowbringers/Alliance/A22FlightUnits/A22FlightUnits.cs +++ b/BossMod/Modules/Shadowbringers/Alliance/A22FlightUnits/A22FlightUnits.cs @@ -1,13 +1,13 @@ namespace BossMod.Shadowbringers.Alliance.A22FlightUnits; -class IncendiaryBarrage(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.IncendiaryBarrage), 27); -class StandardSurfaceMissile1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.StandardSurfaceMissile1), 10); -class StandardSurfaceMissile2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.StandardSurfaceMissile2), 10); +class IncendiaryBarrage(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.IncendiaryBarrage), 27); +class StandardSurfaceMissile1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.StandardSurfaceMissile1), 10); +class StandardSurfaceMissile2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.StandardSurfaceMissile2), 10); class LethalRevolution(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.LethalRevolution), new AOEShapeCircle(15)); -class GuidedMissile(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GuidedMissile), 4); -class IncendiaryBombing(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.IncendiaryBombing), 8); -class SurfaceMissile(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SurfaceMissile), 6); +class GuidedMissile(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GuidedMissile), 4); +class IncendiaryBombing(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.IncendiaryBombing), 8); +class SurfaceMissile(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SurfaceMissile), 6); class AntiPersonnelMissile(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.AntiPersonnelMissile), 6); class PrecisionGuidedMissile(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.PrecisionGuidedMissile), 6); diff --git a/BossMod/Modules/Shadowbringers/Alliance/A23ArtilleryUnit/A23ArtilleryUnit.cs b/BossMod/Modules/Shadowbringers/Alliance/A23ArtilleryUnit/A23ArtilleryUnit.cs index 954d7afee6..601861035c 100644 --- a/BossMod/Modules/Shadowbringers/Alliance/A23ArtilleryUnit/A23ArtilleryUnit.cs +++ b/BossMod/Modules/Shadowbringers/Alliance/A23ArtilleryUnit/A23ArtilleryUnit.cs @@ -7,8 +7,8 @@ class ManeuverVoltArray(BossModule module) : Components.RaidwideCast(module, Act class UpperLaser2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.UpperLaser2), new AOEShapeDonutSector(16, 23, 30.Degrees())); class UpperLaser3(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.UpperLaser3), new AOEShapeDonutSector(23, 30, 30.Degrees())); -class EnergyBombardment2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.EnergyBombardment2), 4); -class UnknownWeaponskill(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.UnknownWeaponskill), 8); +class EnergyBombardment2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.EnergyBombardment2), 4); +class UnknownWeaponskill(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.UnknownWeaponskill), 8); class ManeuverRevolvingLaser(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ManeuverRevolvingLaser), new AOEShapeDonut(4, 60)); class R010Laser(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.R010Laser), new AOEShapeRect(60, 6)); diff --git a/BossMod/Modules/Shadowbringers/Alliance/A24TheCompound/A24TheCompound.cs b/BossMod/Modules/Shadowbringers/Alliance/A24TheCompound/A24TheCompound.cs index 27057ed363..a4adb0d9c4 100644 --- a/BossMod/Modules/Shadowbringers/Alliance/A24TheCompound/A24TheCompound.cs +++ b/BossMod/Modules/Shadowbringers/Alliance/A24TheCompound/A24TheCompound.cs @@ -3,7 +3,7 @@ class MechanicalLaceration1(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.MechanicalLaceration1)); class MechanicalDissection(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MechanicalDissection), new AOEShapeRect(85, 5.5f, 85)); class MechanicalDecapitation(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MechanicalDecapitation), new AOEShapeDonut(8, 43)); -class MechanicalContusionGround(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MechanicalContusionGround), 6); +class MechanicalContusionGround(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MechanicalContusionGround), 6); class MechanicalContusionSpread(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.MechanicalContusionSpread), 6); class IncongruousSpinAOE(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.IncongruousSpinAOE), new AOEShapeRect(80, 75, -5)); diff --git a/BossMod/Modules/Shadowbringers/Alliance/A25Compound2P/A25Compound2P.cs b/BossMod/Modules/Shadowbringers/Alliance/A25Compound2P/A25Compound2P.cs index c18a43addb..a79b8daa65 100644 --- a/BossMod/Modules/Shadowbringers/Alliance/A25Compound2P/A25Compound2P.cs +++ b/BossMod/Modules/Shadowbringers/Alliance/A25Compound2P/A25Compound2P.cs @@ -5,10 +5,10 @@ class CentrifugalSlice(BossModule module) : Components.RaidwideCast(module, Acti class PrimeBladeFront(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PrimeBladeFront), new AOEShapeRect(85, 10)); class PrimeBladeDonut1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PrimeBladeDonut1), new AOEShapeDonut(7, 43)); class PrimeBladeDonut2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PrimeBladeDonut2), new AOEShapeDonut(7, 43)); -class RelentlessSpiralLocAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RelentlessSpiralLocAOE), 8); +class RelentlessSpiralLocAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RelentlessSpiralLocAOE), 8); class RelentlessSpiralAOE(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RelentlessSpiralAOE), new AOEShapeCircle(8)); class ThreePartsDisdainStack(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.ThreePartsDisdainStack), 6, 8); -class R012LaserLoc(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.R012LaserLoc), 6); +class R012LaserLoc(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.R012LaserLoc), 6); class R012LaserSpread(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.R012LaserSpread), 6); class R012LaserTankBuster(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.R012LaserTankBuster), 6); class R011LaserLine(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.R011LaserLine), new AOEShapeRect(70, 7.5f)); diff --git a/BossMod/Modules/Shadowbringers/Alliance/A31KnaveofHearts/A31KnaveofHearts.cs b/BossMod/Modules/Shadowbringers/Alliance/A31KnaveofHearts/A31KnaveofHearts.cs index 117d629a66..84eb9a5e2a 100644 --- a/BossMod/Modules/Shadowbringers/Alliance/A31KnaveofHearts/A31KnaveofHearts.cs +++ b/BossMod/Modules/Shadowbringers/Alliance/A31KnaveofHearts/A31KnaveofHearts.cs @@ -11,7 +11,7 @@ class Roar(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpe class MagicArtilleryBeta2(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.MagicArtilleryBeta2), 3); class MagicArtilleryAlpha2(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.MagicArtilleryAlpha2), 5); -class LightLeap2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LightLeap2), 25); +class LightLeap2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LightLeap2), 25); class BoxSpawn(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BoxSpawn), new AOEShapeRect(8, 4)); class MagicBarrage(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MagicBarrage), new AOEShapeRect(61, 2.5f)); class Lunge(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.Lunge), 60, stopAtWall: true, kind: Kind.DirForward); diff --git a/BossMod/Modules/Shadowbringers/Alliance/A32HanselGretel/A32HanselGretel.cs b/BossMod/Modules/Shadowbringers/Alliance/A32HanselGretel/A32HanselGretel.cs index 6f60c403e6..13c10738b4 100644 --- a/BossMod/Modules/Shadowbringers/Alliance/A32HanselGretel/A32HanselGretel.cs +++ b/BossMod/Modules/Shadowbringers/Alliance/A32HanselGretel/A32HanselGretel.cs @@ -22,7 +22,7 @@ class RiotOfMagic2(BossModule module) : Components.StackWithCastTargets(module, class HungryLance2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.HungryLance2), new AOEShapeCone(40, 60.Degrees())); class Breakthrough1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Breakthrough1), new AOEShapeRect(50, 50, +10, 90.Degrees())); -class SeedOfMagicBeta3(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SeedOfMagicBeta3), 5); +class SeedOfMagicBeta3(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SeedOfMagicBeta3), 5); class Lamentation(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Lamentation)); [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "The Combat Reborn Team", PrimaryActorOID = (uint)OID.Gretel, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 779, NameID = 9990)] diff --git a/BossMod/Modules/Shadowbringers/Alliance/A34RedGirlP1/A34RedGirlP1.cs b/BossMod/Modules/Shadowbringers/Alliance/A34RedGirlP1/A34RedGirlP1.cs index 6be731e02b..a341437079 100644 --- a/BossMod/Modules/Shadowbringers/Alliance/A34RedGirlP1/A34RedGirlP1.cs +++ b/BossMod/Modules/Shadowbringers/Alliance/A34RedGirlP1/A34RedGirlP1.cs @@ -1,8 +1,8 @@ namespace BossMod.Shadowbringers.Alliance.A34RedGirlP1; class Cruelty1(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Cruelty1)); -class ShockWhite2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ShockWhite2), 5); -class ShockBlack2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ShockBlack2), 5); +class ShockWhite2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ShockWhite2), 5); +class ShockBlack2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ShockBlack2), 5); class GenerateBarrier2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GenerateBarrier2), new AOEShapeRect(18, 1.5f)); class GenerateBarrier3(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GenerateBarrier3), new AOEShapeRect(24, 1.5f)); class DiffuseEnergy1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DiffuseEnergy1), new AOEShapeCone(12, 60.Degrees())); diff --git a/BossMod/Modules/Shadowbringers/Alliance/A36FalseIdol/A36FalseIdol.cs b/BossMod/Modules/Shadowbringers/Alliance/A36FalseIdol/A36FalseIdol.cs index e5f092400f..d8f161f5a9 100644 --- a/BossMod/Modules/Shadowbringers/Alliance/A36FalseIdol/A36FalseIdol.cs +++ b/BossMod/Modules/Shadowbringers/Alliance/A36FalseIdol/A36FalseIdol.cs @@ -3,7 +3,7 @@ class MadeMagic1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MadeMagic1), new AOEShapeRect(50, 15)); class MadeMagic2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MadeMagic2), new AOEShapeRect(50, 15)); class ScreamingScore(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.ScreamingScore)); -class ScatteredMagic(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ScatteredMagic), 4); +class ScatteredMagic(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ScatteredMagic), 4); class DarkerNote2(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.DarkerNote2), 6); [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "The Combat Reborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 779, NameID = 9948)] diff --git a/BossMod/Modules/Shadowbringers/Alliance/A37HerInfloresence/A37HerInfloresence.cs b/BossMod/Modules/Shadowbringers/Alliance/A37HerInfloresence/A37HerInfloresence.cs index 69e1b3c8a2..42404ce0ff 100644 --- a/BossMod/Modules/Shadowbringers/Alliance/A37HerInfloresence/A37HerInfloresence.cs +++ b/BossMod/Modules/Shadowbringers/Alliance/A37HerInfloresence/A37HerInfloresence.cs @@ -6,7 +6,7 @@ class ScreamingScore(BossModule module) : Components.RaidwideCast(module, Action class DarkerNote1(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.DarkerNote1), 6); class HeavyArms1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.HeavyArms1), new AOEShapeRect(44, 50, -5)); class HeavyArms3(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.HeavyArms3), new AOEShapeRect(100, 6, 100)); -class PlaceOfPower(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.PlaceOfPower), 6); +class PlaceOfPower(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.PlaceOfPower), 6); class Shockwave1(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.Shockwave1), 35); class Shockwave2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Shockwave2), new AOEShapeCircle(7)); class Towerfall2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Towerfall2), new AOEShapeRect(70, 7)); diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D01Holminster/D013Philia.cs b/BossMod/Modules/Shadowbringers/Dungeon/D01Holminster/D013Philia.cs index b2a9aa25ab..c04bb81e4e 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D01Holminster/D013Philia.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D01Holminster/D013Philia.cs @@ -172,7 +172,7 @@ public override void AddHints(int slot, Actor actor, TextHints hints) } } -class PendulumAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.PendulumAOE3), 15); +class PendulumAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.PendulumAOE3), 15); class Knout(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCone(24, 105.Degrees())); class LeftKnout(BossModule module) : Knout(module, AID.LeftKnout); diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D02DohnMheg/D021AencThon.cs b/BossMod/Modules/Shadowbringers/Dungeon/D02DohnMheg/D021AencThon.cs index 3fd228a140..b5bcbcc7e7 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D02DohnMheg/D021AencThon.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D02DohnMheg/D021AencThon.cs @@ -29,8 +29,8 @@ public enum IconID : uint class Landsblood(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Landsblood1), "Raidwides + Geysers"); class CandyCane(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.CandyCane)); -class Hydrofall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hydrofall2), 6); -class LaughingLeap(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LaughingLeap1), 4); +class Hydrofall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hydrofall2), 6); +class LaughingLeap(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LaughingLeap1), 4); class LaughingLeapStack(BossModule module) : Components.StackWithIcon(module, (uint)IconID.Stackmarker, ActionID.MakeSpell(AID.LaughingLeap2), 4, 5.15f, 4, 4); class Geyser(BossModule module) : Components.GenericAOEs(module) diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D02DohnMheg/D023AencThon.cs b/BossMod/Modules/Shadowbringers/Dungeon/D02DohnMheg/D023AencThon.cs index 46c1424cb8..916e8c9578 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D02DohnMheg/D023AencThon.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D02DohnMheg/D023AencThon.cs @@ -52,7 +52,7 @@ class VirtuosicCapriccio(BossModule module) : Components.RaidwideCast(module, Ac class CripplingBlow(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.CripplingBlow)); class ImpChoir(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.ImpChoir)); class ToadChoir(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ToadChoir), new AOEShapeCone(19.5f, 75.Degrees())); -class BileBombardment(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BileBombardment), 8); +class BileBombardment(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BileBombardment), 8); class FunambulistsFantasia(BossModule module) : BossComponent(module) { diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D03QitanaRavel/D030RonkanDreamer.cs b/BossMod/Modules/Shadowbringers/Dungeon/D03QitanaRavel/D030RonkanDreamer.cs index 3b44f7a984..08b63e1c75 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D03QitanaRavel/D030RonkanDreamer.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D03QitanaRavel/D030RonkanDreamer.cs @@ -31,7 +31,7 @@ public enum TetherID : uint } class RonkanFire(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.RonkanFire)); -class RonkanAbyss(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RonkanAbyss), 6); +class RonkanAbyss(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RonkanAbyss), 6); class WrathOfTheRonka(BossModule module) : Components.GenericAOEs(module) { diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D03QitanaRavel/D031Lozatl.cs b/BossMod/Modules/Shadowbringers/Dungeon/D03QitanaRavel/D031Lozatl.cs index 5b3a517c3d..85b87dc352 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D03QitanaRavel/D031Lozatl.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D03QitanaRavel/D031Lozatl.cs @@ -25,7 +25,7 @@ public enum AID : uint class LozatlsFuryB(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.LozatlsFuryB), new AOEShapeRect(60, 20, 0, -90.Degrees())); // TODO: verify; there should not be an offset in reality here..., also double halfwidth is strange class Stonefist(BossModule module) : Components.SingleTargetDelayableCast(module, ActionID.MakeSpell(AID.Stonefist)); class LozatlsScorn(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.LozatlsScorn)); -class SunToss(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SunToss), 5); +class SunToss(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SunToss), 5); class RonkanLight(BossModule module) : Components.GenericAOEs(module) { diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D04MalikahsWell/D041GreaterArmadillo.cs b/BossMod/Modules/Shadowbringers/Dungeon/D04MalikahsWell/D041GreaterArmadillo.cs index 90234e8b21..1781c09f34 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D04MalikahsWell/D041GreaterArmadillo.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D04MalikahsWell/D041GreaterArmadillo.cs @@ -23,8 +23,8 @@ public enum AID : uint } class StoneFlail(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.StoneFlail)); -class FallingRock(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FallingRock), 4); -class FlailSmash(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FlailSmash), 10); +class FallingRock(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FallingRock), 4); +class FlailSmash(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FlailSmash), 10); class HeadToss(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.HeadToss), 6, 4, 4); class Earthshake(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Earthshake), new AOEShapeDonut(10, 20)); class Rehydration(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.Rehydration), showNameInHint: true); diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D06Amaurot/D061TheFirstBeast.cs b/BossMod/Modules/Shadowbringers/Dungeon/D06Amaurot/D061TheFirstBeast.cs index 2be229f5d2..bf9e8dcc0c 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D06Amaurot/D061TheFirstBeast.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D06Amaurot/D061TheFirstBeast.cs @@ -36,12 +36,12 @@ public enum IconID : uint } class VenomousBreath(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.VenomousBreath), new AOEShapeCone(9, 60.Degrees())); -class MeteorRain(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MeteorRain), 6); -class TheFallingSky(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TheFallingSky), 10); +class MeteorRain(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MeteorRain), 6); +class TheFallingSky(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TheFallingSky), 10); class CosmicKiss(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.CosmicKiss), new AOEShapeCircle(10)); class Towerfall(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Towerfall), new AOEShapeRect(35, 20)); class Earthquake(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Earthquake), new AOEShapeCircle(10)); -class TheBurningSky1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TheBurningSky1), 6); +class TheBurningSky1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TheBurningSky1), 6); class TheBurningSky2(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.TheBurningSky2), 6); class Meteors(BossModule module) : Components.GenericBaitAway(module) diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D06Amaurot/D062Bellwether.cs b/BossMod/Modules/Shadowbringers/Dungeon/D06Amaurot/D062Bellwether.cs index 53c1f3f445..6c14adae87 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D06Amaurot/D062Bellwether.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D06Amaurot/D062Bellwether.cs @@ -32,8 +32,8 @@ public enum AID : uint class ShrillShriek(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.ShrillShriek)); class Aetherspike(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Aetherspike), new AOEShapeRect(40, 4)); -class Comet(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Comet), 4); -class SicklyInferno(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SicklyInferno), 5); +class Comet(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Comet), 4); +class SicklyInferno(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SicklyInferno), 5); class Burst(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.BurstEnrage), "Enrage!", true); class D062BellwetherStates : StateMachineBuilder diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D06Amaurot/D063Therion.cs b/BossMod/Modules/Shadowbringers/Dungeon/D06Amaurot/D063Therion.cs index 6c798ee59d..292d9df9ae 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D06Amaurot/D063Therion.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D06Amaurot/D063Therion.cs @@ -29,7 +29,7 @@ public enum AID : uint } class ShadowWreck(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.ShadowWreck)); -class Misfortune(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Misfortune), 6); +class Misfortune(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Misfortune), 6); class Border(BossModule module) : Components.GenericAOEs(module, warningText: "Platform will be removed during next Apokalypsis!") { diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D08AkadaemiaAnyder/D081Cladoselache.cs b/BossMod/Modules/Shadowbringers/Dungeon/D08AkadaemiaAnyder/D081Cladoselache.cs index 39a342510c..1e3a2915f3 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D08AkadaemiaAnyder/D081Cladoselache.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D08AkadaemiaAnyder/D081Cladoselache.cs @@ -26,9 +26,9 @@ public enum AID : uint class MarineMayhem(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.MarineMayhem)); class ProtolithicPuncture(BossModule module) : Components.SingleTargetDelayableCast(module, ActionID.MakeSpell(AID.ProtolithicPuncture)); class PelagicCleaver1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PelagicCleaver1), new AOEShapeCone(40, 30.Degrees())); -class PelagicCleaver2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.PelagicCleaver2), new AOEShapeCone(50, 30.Degrees())); +class PelagicCleaver2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.PelagicCleaver2), new AOEShapeCone(50, 30.Degrees())); class TidalGuillotine1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TidalGuillotine1), new AOEShapeCircle(13)); -class TidalGuillotine2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TidalGuillotine2), 13); +class TidalGuillotine2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TidalGuillotine2), 13); class AquaticLance(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.AquaticLance), 8); class AquaticLanceVoidzone(BossModule module) : Components.PersistentVoidzone(module, 8, m => m.Enemies(OID.Voidzone).Where(x => x.EventState != 7)); diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D08AkadaemiaAnyder/D083Quetzalcoatl.cs b/BossMod/Modules/Shadowbringers/Dungeon/D08AkadaemiaAnyder/D083Quetzalcoatl.cs index de3c890678..b3725b2a09 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D08AkadaemiaAnyder/D083Quetzalcoatl.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D08AkadaemiaAnyder/D083Quetzalcoatl.cs @@ -34,7 +34,7 @@ class Thunderbolt(BossModule module) : Components.RaidwideCast(module, ActionID. class Shockbolt(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Shockbolt)); class ShockingPlumage(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ShockingPlumage), new AOEShapeCone(40, 30.Degrees())); class WindingCurrent(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.WindingCurrent), new AOEShapeDonut(5, 40)); -class ThunderstormAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ThunderstormAOE), 5); +class ThunderstormAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ThunderstormAOE), 5); class ThunderstormSpread(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.ThunderstormSpread), 5); class OrbCollecting(BossModule module) : BossComponent(module) diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D09GrandCosmos/D091SeekerOfSolitude.cs b/BossMod/Modules/Shadowbringers/Dungeon/D09GrandCosmos/D091SeekerOfSolitude.cs index 7f7edcf99a..4a44380847 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D09GrandCosmos/D091SeekerOfSolitude.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D09GrandCosmos/D091SeekerOfSolitude.cs @@ -34,7 +34,7 @@ class Shadowbolt(BossModule module) : Components.SingleTargetCast(module, Action class Tribulation(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 6, ActionID.MakeSpell(AID.Tribulation), m => m.Enemies(OID.SweepVoidzone).Where(z => z.EventState != 7), 0.1f); class DarkPulse(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.DarkPulse), 6, 4, 4); class DarkWell(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.DarkWell), 5); -class DarkShock(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DarkShock), 6); +class DarkShock(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DarkShock), 6); class MagickedBroom(BossModule module) : Components.PersistentVoidzone(module, 3.125f, m => m.Enemies(OID.MagickedBroom).Where(x => x.ModelState.AnimState1 == 1), 10); class D091SeekerOfSolitudeStates : StateMachineBuilder diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D09GrandCosmos/D092LeannanSith.cs b/BossMod/Modules/Shadowbringers/Dungeon/D09GrandCosmos/D092LeannanSith.cs index c430982c6a..5bcf6fba19 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D09GrandCosmos/D092LeannanSith.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D09GrandCosmos/D092LeannanSith.cs @@ -40,7 +40,7 @@ public enum SID : uint class OdeToLostLove(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.OdeToLostLove)); class StormOfColor(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.StormOfColor)); class FarWindSpread(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.FarWindSpread), 5); -class FarWind(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FarWind), 8); +class FarWind(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FarWind), 8); class OdeToFallenPetals(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.OdeToFallenPetals), new AOEShapeDonut(5, 60)); class IrefulWind(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.IrefulWind), 10, kind: Kind.DirForward, stopAtWall: true); diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D09GrandCosmos/D093Lugus.cs b/BossMod/Modules/Shadowbringers/Dungeon/D09GrandCosmos/D093Lugus.cs index f43097ade3..edb88c4664 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D09GrandCosmos/D093Lugus.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D09GrandCosmos/D093Lugus.cs @@ -162,7 +162,7 @@ class ScorchingRight(BossModule module) : Scorching(module, AID.ScorchingRight); class CullingBlade(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.CullingBlade)); class CaptiveBolt(BossModule module) : Components.SingleTargetDelayableCast(module, ActionID.MakeSpell(AID.CaptiveBolt)); class FiresIre(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.FiresIre), new AOEShapeCone(20, 45.Degrees())); -class Plummet(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Plummet), 3); +class Plummet(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Plummet), 3); class FiresDomainTether(BossModule module) : Components.StretchTetherDuo(module, default, default) { private static readonly WDir offset = new(0, 24); diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D11HeroesGauntlet/D111SpectralThief.cs b/BossMod/Modules/Shadowbringers/Dungeon/D11HeroesGauntlet/D111SpectralThief.cs index aeca0c735a..efbc2a1ef3 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D11HeroesGauntlet/D111SpectralThief.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D11HeroesGauntlet/D111SpectralThief.cs @@ -86,7 +86,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - if (_aoe.ActiveCasters.Any()) + if (_aoe.ActiveCasters.Count != 0) { } else base.AddAIHints(slot, actor, assignment, hints); diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D11HeroesGauntlet/D112SpectralNecromancer.cs b/BossMod/Modules/Shadowbringers/Dungeon/D11HeroesGauntlet/D112SpectralNecromancer.cs index fb90716dd2..05142cf352 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D11HeroesGauntlet/D112SpectralNecromancer.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D11HeroesGauntlet/D112SpectralNecromancer.cs @@ -66,7 +66,7 @@ public enum TetherID : uint } class AbsoluteDarkII(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AbsoluteDarkII), new AOEShapeCone(40, 60.Degrees())); -class PainMire(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.PainMire), 9) +class PainMire(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.PainMire), 9) { public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { @@ -80,7 +80,7 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme class BleedVoidzone(BossModule module) : Components.PersistentVoidzone(module, 8, m => m.Enemies(OID.BleedVoidzone).Where(x => x.EventState != 7)); class TwistedTouch(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.TwistedTouch)); class ChaosStorm(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.ChaosStorm)); -class DarkDeluge(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DarkDeluge), 5); +class DarkDeluge(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DarkDeluge), 5); class NecrobombBaitAway(BossModule module) : Components.BaitAwayIcon(module, new AOEShapeCircle(9.25f), (uint)IconID.Baitaway, ActionID.MakeSpell(AID.DeathThroes), centerAtTarget: true); // note: explosion is not always exactly the position of player, if zombie teleports to player it is player + zombie hitboxradius = 1.25 away class Necrobombs(BossModule module) : BossComponent(module) diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D11HeroesGauntlet/D113SpectralBerserker.cs b/BossMod/Modules/Shadowbringers/Dungeon/D11HeroesGauntlet/D113SpectralBerserker.cs index e17de98463..9aa5bc856f 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D11HeroesGauntlet/D113SpectralBerserker.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D11HeroesGauntlet/D113SpectralBerserker.cs @@ -149,7 +149,7 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme } class WildRageRaidwide(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.WildRageKnockback)); -class WildRage(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.WildRage), 8); +class WildRage(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.WildRage), 8); class BeastlyFury(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.BeastlyFury)); class CratersWildRampage(BossModule module) : Components.GenericAOEs(module) diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D12MatoyasRelict/D121Mudman.cs b/BossMod/Modules/Shadowbringers/Dungeon/D12MatoyasRelict/D121Mudman.cs index 216578aad3..98b7787e67 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D12MatoyasRelict/D121Mudman.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D12MatoyasRelict/D121Mudman.cs @@ -48,7 +48,7 @@ public enum TetherID : uint class StoneAge(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.StoneAge)); class HardRock(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.HardRock)); class MudVoidzone(BossModule module) : Components.PersistentVoidzone(module, 5, m => m.Enemies(OID.MudVoidzone)); -class Quagmire(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Quagmire), 6); +class Quagmire(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Quagmire), 6); class FallingRock(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.FallingRock), 6, 4, 4); class BrittleBreccia(BossModule module) : Components.ConcentricAOEs(module, _shapes) diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D12MatoyasRelict/D123MotherPorxie.cs b/BossMod/Modules/Shadowbringers/Dungeon/D12MatoyasRelict/D123MotherPorxie.cs index e775336cf1..5457e44b52 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D12MatoyasRelict/D123MotherPorxie.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D12MatoyasRelict/D123MotherPorxie.cs @@ -52,8 +52,8 @@ public enum IconID : uint class TenderLoin(BossModule module) : Components.RaidwideCastDelay(module, ActionID.MakeSpell(AID.TenderLoinVisual), ActionID.MakeSpell(AID.TenderLoin), 0.8f); class MincedMeat(BossModule module) : Components.SingleTargetCastDelay(module, ActionID.MakeSpell(AID.MincedMeatVisual), ActionID.MakeSpell(AID.MincedMeat), 0.9f); class OpenFlame(BossModule module) : Components.SpreadFromIcon(module, (uint)IconID.Spreadmarker, ActionID.MakeSpell(AID.OpenFlame), 5, 6.7f); -class MeatMallet(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MeatMallet), 30); -class BarbequeCircle(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BarbequeCircle), 5); +class MeatMallet(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MeatMallet), 30); +class BarbequeCircle(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BarbequeCircle), 5); class BarbequeRect(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BarbequeRect), new AOEShapeRect(50, 2.5f)); class Buffet(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Buffet), new AOEShapeRect(40, 3)); diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D13Paglthan/D132MagitekFortress.cs b/BossMod/Modules/Shadowbringers/Dungeon/D13Paglthan/D132MagitekFortress.cs index f8699cad92..27d8eea531 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D13Paglthan/D132MagitekFortress.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D13Paglthan/D132MagitekFortress.cs @@ -27,8 +27,8 @@ public enum AID : uint Exhaust = 23705 // MarkIITelotekColossus->self, 4.0s cast, range 40 width 7 rect } -class TwoTonzeMagitekMissile(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TwoTonzeMagitekMissile), 12); -class Aethershot(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Aethershot), 6); +class TwoTonzeMagitekMissile(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TwoTonzeMagitekMissile), 12); +class Aethershot(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Aethershot), 6); class DefensiveReaction(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.DefensiveReaction)); class Exhaust(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Exhaust), new AOEShapeRect(40, 3.5f)); class GroundToGroundBallistic(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.GroundToGroundBallistic), 10) diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D13Paglthan/D133LunarBahamut.cs b/BossMod/Modules/Shadowbringers/Dungeon/D13Paglthan/D133LunarBahamut.cs index 02f172ba87..a3c4e41920 100644 --- a/BossMod/Modules/Shadowbringers/Dungeon/D13Paglthan/D133LunarBahamut.cs +++ b/BossMod/Modules/Shadowbringers/Dungeon/D13Paglthan/D133LunarBahamut.cs @@ -39,11 +39,11 @@ public enum IconID : uint class Upburst(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Upburst), new AOEShapeCircle(2)); class BigBurst(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BigBurst), new AOEShapeCircle(9)); class PerigeanBreath(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PerigeanBreath), new AOEShapeCone(30, 45.Degrees())); -class MegaflareAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MegaflareAOE), 6); +class MegaflareAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MegaflareAOE), 6); class MegaflareSpread(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.MegaflareSpread), 5); class MegaflareDive(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MegaflareDive), new AOEShapeRect(41, 6)); -class LunarFlareBig(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LunarFlareBig), 11); -class LunarFlareSmall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LunarFlareSmall), 6); +class LunarFlareBig(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LunarFlareBig), 11); +class LunarFlareSmall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LunarFlareSmall), 6); class Gigaflare(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Gigaflare)); class Flatten(BossModule module) : Components.SingleTargetDelayableCast(module, ActionID.MakeSpell(AID.Flatten)); diff --git a/BossMod/Modules/Shadowbringers/FATE/Archaeotania.cs b/BossMod/Modules/Shadowbringers/FATE/Archaeotania.cs index bb8e047733..296692d60f 100644 --- a/BossMod/Modules/Shadowbringers/FATE/Archaeotania.cs +++ b/BossMod/Modules/Shadowbringers/FATE/Archaeotania.cs @@ -78,7 +78,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) } class TidalWave(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.TidalWaveVisual), 48, kind: Kind.DirForward); -class WindSlash(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.WindSlashAOE), 8); +class WindSlash(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.WindSlashAOE), 8); class Windwinder(BossModule module) : Components.PersistentVoidzone(module, 5, m => m.Enemies(OID.Twister).Where(a => !a.IsDead)); class CivilizationBuster1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.CivilizationBuster1), new AOEShapeRect(62, 7.5f)); class CivilizationBuster2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.CivilizationBuster2), new AOEShapeRect(62, 7.5f)); diff --git a/BossMod/Modules/Shadowbringers/FATE/Formidable.cs b/BossMod/Modules/Shadowbringers/FATE/Formidable.cs index 89ac8ce7da..a178b5758f 100644 --- a/BossMod/Modules/Shadowbringers/FATE/Formidable.cs +++ b/BossMod/Modules/Shadowbringers/FATE/Formidable.cs @@ -51,7 +51,7 @@ public enum SID : uint } class Spincrush(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Spincrush), new AOEShapeCone(15, 60.Degrees())); -class FireShot(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FireShot), 7); +class FireShot(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FireShot), 7); class FiresOfMtGulg(BossModule module) : Components.GenericAOEs(module) { diff --git a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE12BayingOfHounds.cs b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE12BayingOfHounds.cs index a225491400..1852cf2cf1 100644 --- a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE12BayingOfHounds.cs +++ b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE12BayingOfHounds.cs @@ -34,7 +34,7 @@ public enum AID : uint class Hellclaw(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Hellclaw)); class TailBlow(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TailBlow), new AOEShapeCone(19, 45.Degrees())); -class LavaSpit(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LavaSpitAOE), 5); +class LavaSpit(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LavaSpitAOE), 5); class ScorchingLash(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ScorchingLash), new AOEShapeRect(50, 5)); class Hellpounce(BossModule module) : Components.GenericAOEs(module, ActionID.MakeSpell(AID.Hellpounce), "GTFO from charge!") diff --git a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE14VigilForLost.cs b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE14VigilForLost.cs index 9132b5e466..599dc864ce 100644 --- a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE14VigilForLost.cs +++ b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE14VigilForLost.cs @@ -24,7 +24,7 @@ public enum AID : uint MagitekRay = 21268, // MagitekBit->self, 2.5s cast, range 50 width 4 rect } -class LightLeap(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LightLeap), 10); +class LightLeap(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LightLeap), 10); class ChemicalMissile(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ChemicalMissile), new AOEShapeCircle(12)); class TailMissile(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TailMissileAOE), new AOEShapeCircle(30)); class Shockwave(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Shockwave), new AOEShapeCircle(16)); diff --git a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE21FinalFurlong.cs b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE21FinalFurlong.cs index 556f8300ec..9e5326574e 100644 --- a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE21FinalFurlong.cs +++ b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE21FinalFurlong.cs @@ -39,7 +39,7 @@ public enum TetherID : uint Unfreezable = 17, // GraspingRancor->player (appears if hand wasn't hit by aoe) } -class GraspingRancor : Components.LocationTargetedAOEs +class GraspingRancor : Components.SimpleAOEs { private readonly List _hands; @@ -78,13 +78,13 @@ public override void DrawArenaForeground(int pcSlot, Actor pc) } class HatefulMiasma(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.HatefulMiasma), 6); -class PoisonedWords(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.PoisonedWords), 6); +class PoisonedWords(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.PoisonedWords), 6); class TalonedGaze(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.TalonedGaze), "AOE front/back --> sides"); class TalonedWings(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.TalonedWings), "AOE sides --> front/back"); class CoffinNails(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.CoffinNails), new AOEShapeCone(60, 45.Degrees()), 2); class Stab(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Stab)); class GripOfPoison(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.GripOfPoison)); -class StepsOfDestruction(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.StepsOfDestructionAOE), 6); +class StepsOfDestruction(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.StepsOfDestructionAOE), 6); class CE21FinalFurlongStates : StateMachineBuilder { diff --git a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE31MetalFoxChaos.cs b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE31MetalFoxChaos.cs index ed8ad57f2e..0c35105902 100644 --- a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE31MetalFoxChaos.cs +++ b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE31MetalFoxChaos.cs @@ -92,7 +92,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) } class Rush(BossModule module) : Components.BaitAwayChargeCast(module, ActionID.MakeSpell(AID.Rush), 7); -class LaserShower(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LaserShower2), 10); +class LaserShower(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LaserShower2), 10); class DiffractiveLaser(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DiffractiveLaser), new AOEShapeCone(60, 75.Degrees())); class SatelliteLaser(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.SatelliteLaser), "Raidwide + all lasers fire at the same time"); diff --git a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE42FromBeyondTheGrave.cs b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE42FromBeyondTheGrave.cs index ec292fbede..f3bb7231c0 100644 --- a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE42FromBeyondTheGrave.cs +++ b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE42FromBeyondTheGrave.cs @@ -128,10 +128,10 @@ class Aethertide(BossModule module) : Components.SpreadFromCastTargets(module, A class MarchingBreath(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.MarchingBreath), showNameInHint: true); // heals all allies by 20% of max health (raidwide) class TacticalAero(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TacticalAero), new AOEShapeRect(40, 4)); class EntropicFlame(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.EntropicFlame), new AOEShapeRect(60, 4)); -class DarkFlare(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DarkFlare), 8); +class DarkFlare(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DarkFlare), 8); class SoulSacrifice(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.SoulSacrifice), showNameInHint: true); // WarWraith sacrifices itself to give boss a damage buff -class PurifyingLight : Components.LocationTargetedAOEs +class PurifyingLight : Components.SimpleAOEs { public PurifyingLight(BossModule module) : base(module, ActionID.MakeSpell(AID.PurifyingLight), 12) { diff --git a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE44FamiliarFace.cs b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE44FamiliarFace.cs index c23f754a30..32b1749663 100644 --- a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE44FamiliarFace.cs +++ b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE44FamiliarFace.cs @@ -41,7 +41,7 @@ public enum AID : uint Hammerfall = 23825, // Helper->self, 8.0s cast, range 37 circle aoe } -class TectonicEruption(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TectonicEruption), 6); +class TectonicEruption(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TectonicEruption), 6); class RockCutter(BossModule module) : Components.SingleTargetDelayableCast(module, ActionID.MakeSpell(AID.RockCutter)); class AncientQuake(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.AncientQuake)); class Roxxor(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.Roxxor), 6); diff --git a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE51ThereWouldBeBlood.cs b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE51ThereWouldBeBlood.cs index d46c5349f2..95a8aac916 100644 --- a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE51ThereWouldBeBlood.cs +++ b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE51ThereWouldBeBlood.cs @@ -33,12 +33,12 @@ public enum AID : uint class CloudOfLocusts(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.CloudOfLocusts), new AOEShapeCircle(15)); class PlagueOfLocusts(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PlagueOfLocusts), new AOEShapeDonut(6, 40)); -class DivestingGale(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DivestingGale), 5); +class DivestingGale(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DivestingGale), 5); class Camisado(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Camisado)); class DreadWind(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.DreadWind)); class GaleCannon(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GaleCannon), new AOEShapeRect(30, 6)); class FlightOfTheMaleficCone(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.FlightOfTheMaleficAOECone), new AOEShapeCone(30, 45.Degrees())); -class FlightOfTheMaleficCenter(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FlightOfTheMaleficAOECenter), 6); +class FlightOfTheMaleficCenter(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FlightOfTheMaleficAOECenter), 6); class TempestOfAnguish(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TempestOfAnguish), new AOEShapeRect(55, 5)); class TragicalGaze(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.TragicalGaze)); diff --git a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE52TimeToBurn.cs b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE52TimeToBurn.cs index 3a661badb4..0cf2e59fa0 100644 --- a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE52TimeToBurn.cs +++ b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE52TimeToBurn.cs @@ -131,7 +131,7 @@ public override void OnActorEAnim(Actor actor, uint state) } } -class Eruption(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Eruption), 8); +class Eruption(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Eruption), 8); class FireTankbuster(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.FireTankbuster)); class FireRaidwide(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.FireRaidwide)); diff --git a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE53HereComesTheCavalry.cs b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE53HereComesTheCavalry.cs index 24329b0d28..7bd8839201 100644 --- a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE53HereComesTheCavalry.cs +++ b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE53HereComesTheCavalry.cs @@ -45,14 +45,14 @@ public enum TetherID : uint } class StormSlash(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.StormSlash), new AOEShapeCone(8, 60.Degrees())); -class MagitekBurst(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MagitekBurst), 8); +class MagitekBurst(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MagitekBurst), 8); class BurnishedJoust(BossModule module) : Components.ChargeAOEs(module, ActionID.MakeSpell(AID.BurnishedJoust), 3); // note: there are two casters, probably to avoid 32-target limit - we only want to show one class GustSlash(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.GustSlashAOE), 35, true, 1, null, Kind.DirForward); class FireShot(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 6, ActionID.MakeSpell(AID.FireShot), m => m.Enemies(OID.FireShot).Where(e => e.EventState != 7), 0); -class AirborneExplosion(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AirborneExplosion), 10); +class AirborneExplosion(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AirborneExplosion), 10); class RideDownAOE(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RideDown), new AOEShapeRect(60, 5)); // note: there are two casters, probably to avoid 32-target limit - we only want to show one diff --git a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE54NeverCryWolf.cs b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE54NeverCryWolf.cs index 0391a0a2b8..60c3aa3202 100644 --- a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE54NeverCryWolf.cs +++ b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE54NeverCryWolf.cs @@ -173,7 +173,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) class StormWithout(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.StormWithout), new AOEShapeDonut(10, 40)); class StormWithin(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.StormWithin), new AOEShapeCircle(10)); -class AncientGlacier(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AncientGlacierAOE), 6); +class AncientGlacier(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AncientGlacierAOE), 6); class Glaciation(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Glaciation)); class CE54NeverCryWolfStates : StateMachineBuilder diff --git a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE63WornToShadow.cs b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE63WornToShadow.cs index cabefdc764..5c1d8d7efa 100644 --- a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE63WornToShadow.cs +++ b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE63WornToShadow.cs @@ -76,7 +76,7 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) class BladedBeak(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.BladedBeak)); class NihilitysSong(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.NihilitysSong)); -class Fantod(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FantodAOE), 3); +class Fantod(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FantodAOE), 3); class Foreshadowing(BossModule module) : Components.GenericAOEs(module) { diff --git a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE64FeelingTheBurn.cs b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE64FeelingTheBurn.cs index ee3b45d0df..7f877d73d9 100644 --- a/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE64FeelingTheBurn.cs +++ b/BossMod/Modules/Shadowbringers/Foray/CriticalEngagement/CE64FeelingTheBurn.cs @@ -142,7 +142,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) } } -class SurfaceMissile(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SurfaceMissileAOE), 6); +class SurfaceMissile(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SurfaceMissileAOE), 6); class SuppressiveMagitekRays(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.SuppressiveMagitekRays)); class Analysis(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.Analysis), "Face open weakpoint to charging adds"); class PreciseStrike(BossModule module) : Components.CastWeakpoint(module, ActionID.MakeSpell(AID.PreciseStrike), new AOEShapeRect(60, 3), (uint)SID.FrontUnseen, (uint)SID.BackUnseen, 0, 0); diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginaeNormal/DRN2Dahu/DRN2.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginaeNormal/DRN2Dahu/DRN2.cs index 855a351507..ccecbb2341 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginaeNormal/DRN2Dahu/DRN2.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginaeNormal/DRN2Dahu/DRN2.cs @@ -1,6 +1,6 @@ namespace BossMod.Shadowbringers.Foray.DelubrumReginae.Normal.DRN2Dahu; -class FallingRock(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FallingRock), 4); +class FallingRock(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FallingRock), 4); class HotCharge(BossModule module) : Components.ChargeAOEs(module, ActionID.MakeSpell(AID.HotCharge), 4); class Firebreathe(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Firebreathe), new AOEShapeCone(60, 45.Degrees())); class HeadDown(BossModule module) : Components.ChargeAOEs(module, ActionID.MakeSpell(AID.HeadDown), 2); diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginaeSavage/DRS3Dahu/DRS3.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginaeSavage/DRS3Dahu/DRS3.cs index 20dfbf4a9e..2c2f77c153 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginaeSavage/DRS3Dahu/DRS3.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginaeSavage/DRS3Dahu/DRS3.cs @@ -1,6 +1,6 @@ namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS3Dahu; -class FallingRock(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FallingRock), 4); +class FallingRock(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FallingRock), 4); class HotCharge(BossModule module) : Components.ChargeAOEs(module, ActionID.MakeSpell(AID.HotCharge), 4); class Firebreathe(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Firebreathe), new AOEShapeCone(60, 45.Degrees())); class HeadDown(BossModule module) : Components.ChargeAOEs(module, ActionID.MakeSpell(AID.HeadDown), 2); diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginaeSavage/DRS7StygimolochLord/DRS7.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginaeSavage/DRS7StygimolochLord/DRS7.cs index 7322ff4e78..d3f54745ab 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginaeSavage/DRS7StygimolochLord/DRS7.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginaeSavage/DRS7StygimolochLord/DRS7.cs @@ -6,7 +6,7 @@ class ThunderousDischarge(BossModule module) : Components.CastCounter(module, Ac class Whack(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.WhackAOE), new AOEShapeCone(40, 30.Degrees())); class DevastatingBoltOuter(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DevastatingBoltOuter), new AOEShapeDonut(25, 30)); class DevastatingBoltInner(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DevastatingBoltInner), new AOEShapeDonut(12, 17)); -class Electrocution(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Electrocution), 3); +class Electrocution(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Electrocution), 3); // TODO: ManaFlame component - show reflect hints [ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "Malediktus", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 761, NameID = 9759, PlanLevel = 80)] diff --git a/BossMod/Modules/Shadowbringers/Foray/Duel/Duel4Dabog/Duel4Dabog.cs b/BossMod/Modules/Shadowbringers/Foray/Duel/Duel4Dabog/Duel4Dabog.cs index c84f4713f5..e111f0ff30 100644 --- a/BossMod/Modules/Shadowbringers/Foray/Duel/Duel4Dabog/Duel4Dabog.cs +++ b/BossMod/Modules/Shadowbringers/Foray/Duel/Duel4Dabog/Duel4Dabog.cs @@ -3,7 +3,7 @@ class RightArmBlasterFragment(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RightArmBlasterFragment), new AOEShapeRect(100, 3)); class RightArmBlasterBoss(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RightArmBlasterBoss), new AOEShapeRect(100, 3)); class LeftArmSlash(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.LeftArmSlash), new AOEShapeCone(10, 90.Degrees())); // TODO: verify angle -class LeftArmWave(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LeftArmWaveAOE), 24); +class LeftArmWave(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LeftArmWaveAOE), 24); [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.BozjaDuel, GroupID = 778, NameID = 19)] // bnpcname=9958 public class Duel4Dabog(WorldState ws, Actor primary) : BossModule(ws, primary, new(250, 710), new ArenaBoundsCircle(20)); diff --git a/BossMod/Modules/Shadowbringers/Foray/TheDalriada/DAL3SaunionDawon/DAL3SaunionDawon.cs b/BossMod/Modules/Shadowbringers/Foray/TheDalriada/DAL3SaunionDawon/DAL3SaunionDawon.cs index c6b1a37b86..12f9a67908 100644 --- a/BossMod/Modules/Shadowbringers/Foray/TheDalriada/DAL3SaunionDawon/DAL3SaunionDawon.cs +++ b/BossMod/Modules/Shadowbringers/Foray/TheDalriada/DAL3SaunionDawon/DAL3SaunionDawon.cs @@ -4,8 +4,8 @@ class HighPoweredMagitekRay(BossModule module) : Components.SingleTargetCast(mod class ToothAndTalon(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.ToothAndTalon)); class PentagustAOE(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PentagustAOE), new AOEShapeCone(50, 10.Degrees())); class RawHeat(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RawHeat), new AOEShapeCircle(10)); -class SurfaceMissile(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SurfaceMissile), 6); -class SwoopingFrenzyAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SwoopingFrenzyAOE), 12); +class SurfaceMissile(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SurfaceMissile), 6); +class SwoopingFrenzyAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SwoopingFrenzyAOE), 12); class Touchdown3(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Touchdown3)); class MissileSalvo(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.MissileSalvo), 6); class MagitekCrossray(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MagitekCrossray), new AOEShapeCross(60, 8)); diff --git a/BossMod/Modules/Shadowbringers/Foray/TheDalriada/DAL4DiabloArmament/DAL4DiabloArmament.cs b/BossMod/Modules/Shadowbringers/Foray/TheDalriada/DAL4DiabloArmament/DAL4DiabloArmament.cs index ac374944fc..39c16b69c3 100644 --- a/BossMod/Modules/Shadowbringers/Foray/TheDalriada/DAL4DiabloArmament/DAL4DiabloArmament.cs +++ b/BossMod/Modules/Shadowbringers/Foray/TheDalriada/DAL4DiabloArmament/DAL4DiabloArmament.cs @@ -1,6 +1,6 @@ namespace BossMod.Shadowbringers.Foray.TheDalriada.DAL4DiabloArmament; -class AdvancedDeathIVAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AdvancedDeathIVAOE), 1); +class AdvancedDeathIVAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AdvancedDeathIVAOE), 1); class AdvancedNox : Components.StandardChasingAOEs { @@ -32,7 +32,7 @@ public override void OnStatusLose(Actor actor, ActorStatus status) } class AssaultCannon(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AssaultCannon), new AOEShapeRect(100, 3)); -class DeadlyDealingAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DeadlyDealingAOE), 6); +class DeadlyDealingAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DeadlyDealingAOE), 6); class Explosion1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Explosion1), new AOEShapeRect(60, 11)); class Explosion2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Explosion2), new AOEShapeRect(60, 11)); @@ -44,7 +44,7 @@ class DeadlyDealingAOE(BossModule module) : Components.LocationTargetedAOEs(modu class Explosion8(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Explosion8), new AOEShapeRect(60, 11)); class Explosion9(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Explosion9), new AOEShapeRect(60, 11)); -class LightPseudopillarAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LightPseudopillarAOE), 10); +class LightPseudopillarAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LightPseudopillarAOE), 10); class PillarOfShamash1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PillarOfShamash1), new AOEShapeCone(70, 10.Degrees())); class PillarOfShamash2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PillarOfShamash2), new AOEShapeCone(70, 10.Degrees())); diff --git a/BossMod/Modules/Shadowbringers/Hunt/RankA/Grassman.cs b/BossMod/Modules/Shadowbringers/Hunt/RankA/Grassman.cs index 3ccda61d07..2c72b0fd78 100644 --- a/BossMod/Modules/Shadowbringers/Hunt/RankA/Grassman.cs +++ b/BossMod/Modules/Shadowbringers/Hunt/RankA/Grassman.cs @@ -68,7 +68,7 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme } } -class StoolPelt(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.StoolPelt), 5); +class StoolPelt(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.StoolPelt), 5); class Browbeat(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Browbeat)); class Streak(BossModule module) : Components.ChargeAOEs(module, ActionID.MakeSpell(AID.Streak), 3); diff --git a/BossMod/Modules/Shadowbringers/Hunt/RankA/LilMurderer.cs b/BossMod/Modules/Shadowbringers/Hunt/RankA/LilMurderer.cs index a0278d4323..05aa24f819 100644 --- a/BossMod/Modules/Shadowbringers/Hunt/RankA/LilMurderer.cs +++ b/BossMod/Modules/Shadowbringers/Hunt/RankA/LilMurderer.cs @@ -38,7 +38,7 @@ class GobthunderIII(BossModule module) : Components.SpreadFromCastTargets(module class GobthunderIIIHint(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.GobthunderIII)); class GoblinPunch(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.GoblinPunch)); class Gobhaste(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.Gobhaste), "Attack speed buff"); -class GobthunderII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GobthunderII), 8); +class GobthunderII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GobthunderII), 8); class LilMurdererStates : StateMachineBuilder { diff --git a/BossMod/Modules/Shadowbringers/Hunt/RankA/Rusalka.cs b/BossMod/Modules/Shadowbringers/Hunt/RankA/Rusalka.cs index 639cf782a9..36cfa571e5 100644 --- a/BossMod/Modules/Shadowbringers/Hunt/RankA/Rusalka.cs +++ b/BossMod/Modules/Shadowbringers/Hunt/RankA/Rusalka.cs @@ -14,7 +14,7 @@ public enum AID : uint Flood = 17369, // Boss->self, no cast, range 8 circle } -class Hydrocannon(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hydrocannon), 8); +class Hydrocannon(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hydrocannon), 8); class AetherialSpark(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AetherialSpark), new AOEShapeRect(12, 2)); class AetherialPull(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.AetherialPull), 30, shape: new AOEShapeCircle(30), kind: Kind.TowardsOrigin) diff --git a/BossMod/Modules/Shadowbringers/Hunt/RankS/Aglaope.cs b/BossMod/Modules/Shadowbringers/Hunt/RankS/Aglaope.cs index 2fad9f261a..22610d27c4 100644 --- a/BossMod/Modules/Shadowbringers/Hunt/RankS/Aglaope.cs +++ b/BossMod/Modules/Shadowbringers/Hunt/RankS/Aglaope.cs @@ -61,7 +61,7 @@ public override void Update() } class DeathlyVerse(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DeathlyVerse), new AOEShapeCircle(6)); -class Tornado(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Tornado), 6); +class Tornado(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Tornado), 6); class FourfoldSuffering(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.FourfoldSuffering), new AOEShapeDonut(5, 50)); class AncientAero(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AncientAero), new AOEShapeRect(42.4f, 3)); class AncientAeroIII(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.AncientAeroIII)); diff --git a/BossMod/Modules/Shadowbringers/Hunt/RankS/ForgivenGossip.cs b/BossMod/Modules/Shadowbringers/Hunt/RankS/ForgivenGossip.cs index 6285f711f7..a775675597 100644 --- a/BossMod/Modules/Shadowbringers/Hunt/RankS/ForgivenGossip.cs +++ b/BossMod/Modules/Shadowbringers/Hunt/RankS/ForgivenGossip.cs @@ -12,7 +12,7 @@ public enum AID : uint PetrifyingEye = 18041, // Boss->self, 3.0s cast, range 40 circle } -class Icefall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Icefall), 5); +class Icefall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Icefall), 5); class PetrifyingEye(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.PetrifyingEye)); class ForgivenGossipStates : StateMachineBuilder diff --git a/BossMod/Modules/Shadowbringers/Hunt/RankS/Ixtab.cs b/BossMod/Modules/Shadowbringers/Hunt/RankS/Ixtab.cs index ad73b1d2ca..ad9ad82ffa 100644 --- a/BossMod/Modules/Shadowbringers/Hunt/RankS/Ixtab.cs +++ b/BossMod/Modules/Shadowbringers/Hunt/RankS/Ixtab.cs @@ -85,7 +85,7 @@ public override void AddGlobalHints(GlobalHints hints) } } -class TartareanFlare(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TartareanFlare), 18); +class TartareanFlare(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TartareanFlare), 18); class TartareanMeteor(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.TartareanMeteor), 10, 8); class ArchaicDualcast(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.ArchaicDualcast), "Preparing In/Out or Out/In AOE"); diff --git a/BossMod/Modules/Shadowbringers/Hunt/RankS/Tyger.cs b/BossMod/Modules/Shadowbringers/Hunt/RankS/Tyger.cs index 4a442824ec..9a9390e3f8 100644 --- a/BossMod/Modules/Shadowbringers/Hunt/RankS/Tyger.cs +++ b/BossMod/Modules/Shadowbringers/Hunt/RankS/Tyger.cs @@ -51,7 +51,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) class TheDragonsBreath(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TheDragonsBreath), new AOEShapeCone(30, 60.Degrees())); class TheRamsBreath(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TheRamsBreath), new AOEShapeCone(30, 60.Degrees())); -class TheRamsEmbrace(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TheRamsEmbrace), 9); +class TheRamsEmbrace(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TheRamsEmbrace), 9); class TheRamsVoice(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TheRamsVoice), new AOEShapeCircle(9)); class TheRamsVoiceHint(BossModule module) : Components.CastInterruptHint(module, ActionID.MakeSpell(AID.TheRamsVoice)); class TheDragonsVoice(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TheDragonsVoice), new AOEShapeDonut(8, 30)); diff --git a/BossMod/Modules/Shadowbringers/Quest/ASleepDisturbed.cs b/BossMod/Modules/Shadowbringers/Quest/ASleepDisturbed.cs index ae1fbb5708..a9f291d301 100644 --- a/BossMod/Modules/Shadowbringers/Quest/ASleepDisturbed.cs +++ b/BossMod/Modules/Shadowbringers/Quest/ASleepDisturbed.cs @@ -47,7 +47,7 @@ class GraceOfCalamity(BossModule module) : Components.StackWithCastTargets(modul class BurningBeamNPC(BossModule module) : Components.BaitAwayTethers(module, new AOEShapeRect(40, 2), (uint)TetherID.NPCBaitAway); class BurningBeamPlayer(BossModule module) : Components.BaitAwayTethers(module, new AOEShapeRect(40, 2), (uint)TetherID.BaitAway); class SoundOfHeat(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TheSoundOfHeat), new AOEShapeCone(60, 30.Degrees())); -class DeceitOfPain(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TheDeceitOfPain), 14); +class DeceitOfPain(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TheDeceitOfPain), 14); class BalmOfDisgrace(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TheBalmOfDisgrace), new AOEShapeCircle(12)); class ASleepDisturbedStates : StateMachineBuilder { diff --git a/BossMod/Modules/Shadowbringers/Quest/VowsOfVitrueDeedsOfCruelty.cs b/BossMod/Modules/Shadowbringers/Quest/VowsOfVitrueDeedsOfCruelty.cs index 40d701e867..3e61992c01 100644 --- a/BossMod/Modules/Shadowbringers/Quest/VowsOfVitrueDeedsOfCruelty.cs +++ b/BossMod/Modules/Shadowbringers/Quest/VowsOfVitrueDeedsOfCruelty.cs @@ -65,8 +65,8 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) } } class TerminusEstCircle(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TerminusEstLocationHelper), new AOEShapeCircle(3)); -class FireII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FireII), 5); -class GarleanFire(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GarleanFire), 5); +class FireII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FireII), 5); +class GarleanFire(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GarleanFire), 5); class MetalCutter(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MetalCutter), new AOEShapeCone(30, 10.Degrees())); class MagitekRayBits(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MagitekRayBit), new AOEShapeRect(50, 1)); class AtomicRay(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AtomicRay), new AOEShapeCircle(10)); diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheDungeonsOfLyheGhiah/Goliath.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheDungeonsOfLyheGhiah/Goliath.cs index 62fc59eb68..6728d810a8 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheDungeonsOfLyheGhiah/Goliath.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheDungeonsOfLyheGhiah/Goliath.cs @@ -42,7 +42,7 @@ public enum AID : uint class Compress2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Compress2), new AOEShapeRect(102.1f, 3.5f)); class Accelerate(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.Accelerate), 6, 8, 8); class Incinerate(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Incinerate)); -class Fount(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Fount), 4); +class Fount(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Fount), 4); class MechanicalBlow(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.MechanicalBlow)); class Spin(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Spin), new AOEShapeCircle(11)); diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/DaenOseTheAvariciousTyphon.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/DaenOseTheAvariciousTyphon.cs index b01bab4e4c..cbbf86fce7 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/DaenOseTheAvariciousTyphon.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/DaenOseTheAvariciousTyphon.cs @@ -50,7 +50,7 @@ public enum AID : uint class FellSwipe(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.FellSwipe), new AOEShapeCone(8, 60.Degrees())); class WindShot(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.WindShot), new AOEShapeRect(40, 3)); class LingeringSnort(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.LingeringSnort), new AOEShapeCircle(20)); -class UnpleasantBreeze(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.UnpleasantBreeze), 6); +class UnpleasantBreeze(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.UnpleasantBreeze), 6); class Fireball(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.Fireball), 6, 8, 8); class SnortsaultKB(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.SnortsaultKB), 20, stopAtWall: true); @@ -62,7 +62,7 @@ class SnortsaultCircle(BossModule module) : Components.GenericAOEs(module) public override IEnumerable ActiveAOEs(int slot, Actor actor) { - if (!_aoes.ActiveCasters.Any() && _aoe.HasValue) + if (_aoes.ActiveCasters.Count == 0 && _aoe.HasValue) yield return _aoe.Value; } @@ -114,19 +114,19 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) public override void AddHints(int slot, Actor actor, TextHints hints) { - if (!_aoe.ActiveCasters.Any()) + if (_aoe.ActiveCasters.Count == 0) base.AddHints(slot, actor, hints); } public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - if (!_aoe.ActiveCasters.Any()) + if (_aoe.ActiveCasters.Count == 0) base.AddAIHints(slot, actor, assignment, hints); } public override void DrawArenaBackground(int pcSlot, Actor pc) { - if (!_aoe.ActiveCasters.Any()) + if (_aoe.ActiveCasters.Count == 0) base.DrawArenaBackground(pcSlot, pc); } } diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/DaenOseTheAvariciousUltros.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/DaenOseTheAvariciousUltros.cs index 661d22873b..6e3f569094 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/DaenOseTheAvariciousUltros.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/DaenOseTheAvariciousUltros.cs @@ -47,8 +47,8 @@ public enum AID : uint class Tentacle(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Tentacle), new AOEShapeCircle(8)); class Wallop(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Wallop), new AOEShapeRect(20, 5)); class Megavolt(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Megavolt), new AOEShapeCircle(11)); -class Waterspout(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Waterspout), 4); -class SoakingSplatter(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SoakingSplatter), 10); +class Waterspout(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Waterspout), 4); +class SoakingSplatter(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SoakingSplatter), 10); class FallingWater(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.FallingWater), 8); class ThunderIII(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.ThunderIII)); diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/FuathTroublemaker.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/FuathTroublemaker.cs index 34c39e721d..da09d5a07a 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/FuathTroublemaker.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/FuathTroublemaker.cs @@ -24,7 +24,7 @@ public enum AID : uint class CroakingChorus(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.CroakingChorus), "Calls adds"); class FrigidNeedle(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.FrigidNeedle), new AOEShapeCross(40, 2.5f)); -class Spittle(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Spittle), 8); +class Spittle(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Spittle), 8); class ToyHammer(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.ToyHammer)); class Hydrocannon(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.Hydrocannon), 6, 8, 8); diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/GreedyPixie.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/GreedyPixie.cs index 31c0d42778..db467158f0 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/GreedyPixie.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/GreedyPixie.cs @@ -42,7 +42,7 @@ public enum AID : uint } class Windrune(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.WindRune), new AOEShapeRect(40, 4)); -class SongRune(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SongRune), 6); +class SongRune(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SongRune), 6); class StormRune(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.StormRune)); abstract class BushBash(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCircle(12)); diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretDjinn.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretDjinn.cs index 80b5929406..acb9cfba4e 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretDjinn.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretDjinn.cs @@ -27,7 +27,7 @@ public enum AID : uint Scoop = 21768 // KeeperOfKeys->self, 4.0s cast, range 15 120-degree cone } -class Gust(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Gust), 6); +class Gust(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Gust), 6); class ChangelessWinds(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ChangelessWinds), new AOEShapeRect(40, 4)); class ChangelessWindsKB(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.ChangelessWinds), 10, shape: new AOEShapeRect(40, 4), kind: Kind.DirForward, stopAtWall: true); class Whipwind(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Whipwind), new AOEShapeRect(54, 20, 0.5f)); diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretKorrigan.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretKorrigan.cs index 03a52e6a94..74754d4433 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretKorrigan.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretKorrigan.cs @@ -32,7 +32,7 @@ public enum AID : uint class Hypnotize(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.Hypnotize)); class Ram(BossModule module) : Components.SingleTargetDelayableCast(module, ActionID.MakeSpell(AID.Ram)); class SaibaiMandragora(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.SaibaiMandragora), "Calls adds"); -class LeafDagger(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LeafDagger), 3); +class LeafDagger(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LeafDagger), 3); abstract class Mandragoras(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCircle(6.84f)); class PluckAndPrune(BossModule module) : Mandragoras(module, AID.PluckAndPrune); diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretPorxie.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretPorxie.cs index 4a6ef63481..271637900c 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretPorxie.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretPorxie.cs @@ -47,7 +47,7 @@ public enum AID : uint class BrewingStorm(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BrewingStorm), new AOEShapeCone(5, 30.Degrees())); class HarrowingDream(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.HarrowingDream), new AOEShapeCircle(6)); -class BecloudingDust(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BecloudingDust2), 6); +class BecloudingDust(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BecloudingDust2), 6); class Sweep(BossModule module) : Components.Exaflare(module, 6) { diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretSerpent.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretSerpent.cs index b5e3a98641..b122f4fb91 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretSerpent.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretSerpent.cs @@ -38,7 +38,7 @@ public enum AID : uint } class DouseVoidzone(BossModule module) : Components.PersistentVoidzone(module, 7.5f, m => m.Enemies(OID.WaterVoidzone).Where(z => z.EventState != 7), 0); -class Douse(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Douse), 8); +class Douse(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Douse), 8); class FangsEnd(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.FangsEnd)); class Drench1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Drench1), new AOEShapeCone(15.29f, 45.Degrees())); class Drench2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Drench2), new AOEShapeCone(13.45f, 45.Degrees())); diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretSwallow.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretSwallow.cs index 2347e1af6e..28e442499f 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretSwallow.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretSwallow.cs @@ -32,9 +32,9 @@ public enum AID : uint class ElectricWhorl(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SeventhWave), new AOEShapeCircle(11)); class PrevailingCurrent(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PrevailingCurrent), new AOEShapeRect(24, 3)); class SeventhWave(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ElectricWhorl), new AOEShapeDonut(8, 60)); -class Hydrocannon(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hydrocannon2), 8); +class Hydrocannon(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hydrocannon2), 8); class Ceras(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Ceras)); -class BodySlam(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BodySlam), 10); +class BodySlam(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BodySlam), 10); class BodySlamKB(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.BodySlam), 20, shape: new AOEShapeCircle(10), stopAtWall: true) { diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretUndine.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretUndine.cs index 998dd7166c..2b11ca718b 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretUndine.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretUndine.cs @@ -42,7 +42,7 @@ public enum AID : uint class Hydrofan(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Hydrofan), new AOEShapeCone(44, 15.Degrees())); class Hypnowave(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Hypnowave), new AOEShapeCone(30, 60.Degrees())); class Hydropins(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Hydropins), new AOEShapeRect(12, 2)); -class AquaGlobe(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AquaGlobe), 8); +class AquaGlobe(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AquaGlobe), 8); class Hydrowhirl(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Hydrowhirl), new AOEShapeCircle(8)); class Hydrotaph(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Hydrotaph)); diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretWorm.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretWorm.cs index f515fe10cc..612647f333 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretWorm.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretWorm.cs @@ -36,7 +36,7 @@ public enum IconID : uint Baitaway = 23 // player } -class Hydrocannon(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hydrocannon), 8); +class Hydrocannon(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hydrocannon), 8); class FreshwaterCannon(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.FreshwaterCannon), new AOEShapeRect(46, 2)); class AquaBurst(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AquaBurst), new AOEShapeCircle(10)); class BrineBreath(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.BrineBreath)); diff --git a/BossMod/Modules/Shadowbringers/Ultimate/TEA/TEA.cs b/BossMod/Modules/Shadowbringers/Ultimate/TEA/TEA.cs index 416aac48ba..020c6d2438 100644 --- a/BossMod/Modules/Shadowbringers/Ultimate/TEA/TEA.cs +++ b/BossMod/Modules/Shadowbringers/Ultimate/TEA/TEA.cs @@ -2,12 +2,12 @@ class P1FluidSwing(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.FluidSwing), new AOEShapeCone(11.5f, 45.Degrees())); class P1FluidStrike(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.FluidSwing), new AOEShapeCone(11.6f, 45.Degrees()), (uint)OID.LiquidHand); -class P1Sluice(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Sluice), 5); +class P1Sluice(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Sluice), 5); class P1Splash(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.Splash)); class P1Drainage(BossModule module) : Components.TankbusterTether(module, ActionID.MakeSpell(AID.DrainageP1), (uint)TetherID.Drainage, 6); class P2JKick(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.JKick)); class P2EyeOfTheChakram(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.EyeOfTheChakram), new AOEShapeRect(73, 3, 3)); -class P2HawkBlasterOpticalSight(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HawkBlasterP2), 10); +class P2HawkBlasterOpticalSight(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HawkBlasterP2), 10); class P2Photon(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.PhotonAOE)); class P2SpinCrusher(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SpinCrusher), new AOEShapeCone(10, 45.Degrees())); class P2Drainage(BossModule module) : Components.PersistentVoidzone(module, 8, m => m.Enemies(OID.LiquidRage)); // TODO: verify distance diff --git a/BossMod/Modules/Stormblood/Alliance/A21Famfrit/A21Famfrit.cs b/BossMod/Modules/Stormblood/Alliance/A21Famfrit/A21Famfrit.cs index cdb86d8ea8..2f5c13e1ed 100644 --- a/BossMod/Modules/Stormblood/Alliance/A21Famfrit/A21Famfrit.cs +++ b/BossMod/Modules/Stormblood/Alliance/A21Famfrit/A21Famfrit.cs @@ -2,7 +2,7 @@ class TidePod(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.TidePod)); class WaterIV(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.WaterIV)); -class DarkeningDeluge(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DarkeningDeluge), 6); +class DarkeningDeluge(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DarkeningDeluge), 6); class Tsunami9(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.Tsunami9), 15, stopAtWall: true, kind: Kind.AwayFromOrigin); class Materialize(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Materialize), new AOEShapeCircle(6)); class DarkRain2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DarkRain2), new AOEShapeCircle(8)); diff --git a/BossMod/Modules/Stormblood/Alliance/A22Belias/A22Belias.cs b/BossMod/Modules/Stormblood/Alliance/A22Belias/A22Belias.cs index ae4d44b45d..aca7fa707c 100644 --- a/BossMod/Modules/Stormblood/Alliance/A22Belias/A22Belias.cs +++ b/BossMod/Modules/Stormblood/Alliance/A22Belias/A22Belias.cs @@ -1,7 +1,7 @@ namespace BossMod.Stormblood.Alliance.A22Belias; class FireIV(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.FireIV)); -class Eruption(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Eruption), 8); +class Eruption(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Eruption), 8); class TimeBomb2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TimeBomb2), new AOEShapeCone(60, 45.Degrees())); class TimeEruption(BossModule module) : Components.GenericAOEs(module, ActionID.MakeSpell(AID.TimeEruptionVisual)) diff --git a/BossMod/Modules/Stormblood/Alliance/A23Construct7/A23Construct7.cs b/BossMod/Modules/Stormblood/Alliance/A23Construct7/A23Construct7.cs index 3fc9b69208..0d1e5ff95c 100644 --- a/BossMod/Modules/Stormblood/Alliance/A23Construct7/A23Construct7.cs +++ b/BossMod/Modules/Stormblood/Alliance/A23Construct7/A23Construct7.cs @@ -6,7 +6,7 @@ class Accelerate(BossModule module) : Components.SpreadFromCastTargets(module, A class Compress1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Compress1), new AOEShapeRect(104.5f, 3.5f)); class Compress2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Compress2), new AOEShapeCross(100, 3.5f)); -class Pulverize2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Pulverize2), 12); +class Pulverize2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Pulverize2), 12); class Dispose1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Dispose1), new AOEShapeCone(100, 45.Degrees())); class Dispose3(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Dispose3), new AOEShapeCone(100, 45.Degrees())); diff --git a/BossMod/Modules/Stormblood/Alliance/A24Yiazmat/A24Yiazmat.cs b/BossMod/Modules/Stormblood/Alliance/A24Yiazmat/A24Yiazmat.cs index 38bfd9eb11..02c14112e0 100644 --- a/BossMod/Modules/Stormblood/Alliance/A24Yiazmat/A24Yiazmat.cs +++ b/BossMod/Modules/Stormblood/Alliance/A24Yiazmat/A24Yiazmat.cs @@ -3,15 +3,15 @@ class RakeTB(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.RakeTB)); class RakeSpread(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.RakeSpread), 5); class RakeAOE(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RakeAOE), new AOEShapeCircle(10)); -class RakeLoc1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RakeLoc1), 10); -class RakeLoc2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RakeLoc2), 10); +class RakeLoc1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RakeLoc1), 10); +class RakeLoc2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RakeLoc2), 10); class StoneBreath(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.StoneBreath), new AOEShapeCone(60, 22.5f.Degrees())); class DustStorm2(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.DustStorm2)); class WhiteBreath(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.WhiteBreath), new AOEShapeDonut(10, 60)); class AncientAero(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AncientAero), new AOEShapeRect(40, 3)); class Karma(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Karma), new AOEShapeCone(30, 45.Degrees())); -class UnholyDarkness(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.UnholyDarkness), 8); +class UnholyDarkness(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.UnholyDarkness), 8); class SolarStorm1(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.SolarStorm1)); diff --git a/BossMod/Modules/Stormblood/Alliance/A34UltimaP1/A34UltimaP1.cs b/BossMod/Modules/Stormblood/Alliance/A34UltimaP1/A34UltimaP1.cs index d13f13d97e..bb1a70fcda 100644 --- a/BossMod/Modules/Stormblood/Alliance/A34UltimaP1/A34UltimaP1.cs +++ b/BossMod/Modules/Stormblood/Alliance/A34UltimaP1/A34UltimaP1.cs @@ -1,6 +1,6 @@ namespace BossMod.Stormblood.Alliance.A34UltimaP1; -class HolyIVBait(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HolyIVBait), 6); +class HolyIVBait(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HolyIVBait), 6); class HolyIVSpread(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.HolyIVSpread), 6); class AuralightAOE(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AuralightAOE), new AOEShapeCircle(20)); class AuralightRect(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AuralightRect), new AOEShapeRect(70, 5)); @@ -39,14 +39,14 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) _ => null }; } -class Eruption2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Eruption2), 8); +class Eruption2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Eruption2), 8); class ControlTower2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ControlTower2), new AOEShapeCircle(6)); class ExtremeEdge1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ExtremeEdge1), new AOEShapeRect(60, 18)); class ExtremeEdge2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ExtremeEdge2), new AOEShapeRect(60, 18)); -class CrushWeapon(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.CrushWeapon), 6); -class Searchlight(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Searchlight), 6); -class HallowedBolt(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HallowedBolt), 6); +class CrushWeapon(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.CrushWeapon), 6); +class Searchlight(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Searchlight), 6); +class HallowedBolt(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HallowedBolt), 6); [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "The Combat Reborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 636, NameID = 7909)] public class A34UltimaP1(WorldState ws, Actor primary) : BossModule(ws, primary, new(600, -600), new ArenaBoundsSquare(30)); diff --git a/BossMod/Modules/Stormblood/Alliance/A35UltimaP2/A35UltimaP2.cs b/BossMod/Modules/Stormblood/Alliance/A35UltimaP2/A35UltimaP2.cs index 40629f749b..fac3f4450e 100644 --- a/BossMod/Modules/Stormblood/Alliance/A35UltimaP2/A35UltimaP2.cs +++ b/BossMod/Modules/Stormblood/Alliance/A35UltimaP2/A35UltimaP2.cs @@ -3,11 +3,11 @@ class Redemption(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Redemption)); class Auralight1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Auralight1), new AOEShapeRect(50, 5)); class Auralight2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Auralight2), new AOEShapeRect(25, 5)); -class Bombardment(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Bombardment), 6); -class Embrace2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Embrace2), 3); +class Bombardment(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Bombardment), 6); +class Embrace2(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Embrace2), 3); class GrandCrossAOE(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GrandCrossAOE), new AOEShapeCross(60, 7.5f)); -class Holy(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Holy), 2); -class HolyIVBait(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HolyIVBait), 6); +class Holy(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Holy), 2); +class HolyIVBait(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HolyIVBait), 6); class HolyIVSpread(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.HolyIVSpread), 6); class Plummet(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Plummet), new AOEShapeRect(15, 7.5f)); diff --git a/BossMod/Modules/Stormblood/DeepDungeon/DD10Mojabune.cs b/BossMod/Modules/Stormblood/DeepDungeon/DD10Mojabune.cs index b7069d99d8..0dea40c114 100644 --- a/BossMod/Modules/Stormblood/DeepDungeon/DD10Mojabune.cs +++ b/BossMod/Modules/Stormblood/DeepDungeon/DD10Mojabune.cs @@ -14,7 +14,7 @@ public enum AID : uint Overtow = 11877, // Boss->location, 3.0s cast, range 60 circle } -class ConcussiveOscillationAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ConcussiveOscillation), 7); +class ConcussiveOscillationAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ConcussiveOscillation), 7); class OvertowKB(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.Overtow), 23.7f, true); class AmorphousApplauseAOE(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AmorphousApplause), new AOEShapeCone(27.4f, 90.Degrees())); diff --git a/BossMod/Modules/Stormblood/DeepDungeon/DD40Bhima.cs b/BossMod/Modules/Stormblood/DeepDungeon/DD40Bhima.cs index 707ed7967c..f3a0c12a6d 100644 --- a/BossMod/Modules/Stormblood/DeepDungeon/DD40Bhima.cs +++ b/BossMod/Modules/Stormblood/DeepDungeon/DD40Bhima.cs @@ -17,7 +17,7 @@ public enum AID : uint } class AncientAero(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AncientAero), new AOEShapeRect(52.4f, 4)); -class AncientAeroII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AncientAeroII), 6); +class AncientAeroII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AncientAeroII), 6); class AncientAeroIII(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.AncientAeroIII), 23.5f, true, stopAtWall: true); class Tornado(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.Tornado), 6); class Windage(BossModule module) : Components.PersistentVoidzone(module, 8, m => m.Enemies(OID.Whirlwind).Where(z => z.EventState != 7)); diff --git a/BossMod/Modules/Stormblood/DeepDungeon/DD60Suikazura.cs b/BossMod/Modules/Stormblood/DeepDungeon/DD60Suikazura.cs index 6b5f11de19..fe25a91a4a 100644 --- a/BossMod/Modules/Stormblood/DeepDungeon/DD60Suikazura.cs +++ b/BossMod/Modules/Stormblood/DeepDungeon/DD60Suikazura.cs @@ -19,7 +19,7 @@ public enum AID : uint class Firewalker(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Firewalker), new AOEShapeCone(10, 45.Degrees())); class InfiniteAnguish(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.InfiniteAnguish), new AOEShapeDonut(6.5f, 12)); -class FireII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FireII), 5); +class FireII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FireII), 5); class Topple(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Topple), new AOEShapeCircle(5.5f)); class SearingChain(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SearingChain), new AOEShapeRect(61, 2)); class AncientFlare(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.AncientFlare), "Raidwide, watch your feet after it goes off"); diff --git a/BossMod/Modules/Stormblood/Dungeon/D01SirensongSea/D011Lugat.cs b/BossMod/Modules/Stormblood/Dungeon/D01SirensongSea/D011Lugat.cs index be57e185f2..ee155a9c9e 100644 --- a/BossMod/Modules/Stormblood/Dungeon/D01SirensongSea/D011Lugat.cs +++ b/BossMod/Modules/Stormblood/Dungeon/D01SirensongSea/D011Lugat.cs @@ -22,8 +22,8 @@ public enum IconID : uint Stackmarker = 62 } -class ConcussiveOscillationBoss(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ConcussiveOscillationBoss), 7); -class ConcussiveOscillation(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ConcussiveOscillation), 8); +class ConcussiveOscillationBoss(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ConcussiveOscillationBoss), 7); +class ConcussiveOscillation(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ConcussiveOscillation), 8); class AmorphousApplause(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AmorphousApplause), new AOEShapeCone(24.5f, 90.Degrees())); class Hydroball(BossModule module) : Components.StackWithIcon(module, (uint)IconID.Stackmarker, ActionID.MakeSpell(AID.Hydroball), 5, 5, 4, 4); class SeaSwallowsAll(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.SeaSwallowsAll)); diff --git a/BossMod/Modules/Stormblood/Dungeon/D01SirensongSea/D013Lorelei.cs b/BossMod/Modules/Stormblood/Dungeon/D01SirensongSea/D013Lorelei.cs index 95479f04b4..c336101d1f 100644 --- a/BossMod/Modules/Stormblood/Dungeon/D01SirensongSea/D013Lorelei.cs +++ b/BossMod/Modules/Stormblood/Dungeon/D01SirensongSea/D013Lorelei.cs @@ -62,7 +62,7 @@ class MorbidRetreat(BossModule module) : Components.ActionDrivenForcedMarch(modu } class SomberMelody(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.SomberMelody)); -class VoidWaterIII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.VoidWaterIII), 8); +class VoidWaterIII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.VoidWaterIII), 8); class Voidzone(BossModule module) : Components.PersistentVoidzone(module, 7, m => m.Enemies(OID.Voidzone).Where(z => z.EventState != 7)); class D013LoreleiStates : StateMachineBuilder diff --git a/BossMod/Modules/Stormblood/Dungeon/D03BardamsMettle/D031Garula.cs b/BossMod/Modules/Stormblood/Dungeon/D03BardamsMettle/D031Garula.cs index 4622146e6e..72a67c09e5 100644 --- a/BossMod/Modules/Stormblood/Dungeon/D03BardamsMettle/D031Garula.cs +++ b/BossMod/Modules/Stormblood/Dungeon/D03BardamsMettle/D031Garula.cs @@ -25,7 +25,7 @@ public enum AID : uint WideBlaster = 9395, // SteppeCoeurl->self, 5.5s cast, range 26+R 120-degree cone } -class CrumblingCrust(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.CrumblingCrust), 3); +class CrumblingCrust(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.CrumblingCrust), 3); class Heave(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Heave), new AOEShapeCone(13, 60.Degrees())); class WideBlaster(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.WideBlaster), new AOEShapeCone(29.15f, 60.Degrees())); class Rush(BossModule module) : Components.BaitAwayChargeTether(module, 4, 10.1f, ActionID.MakeSpell(AID.Rush), minimumDistance: 23) diff --git a/BossMod/Modules/Stormblood/Dungeon/D03BardamsMettle/D032HunterOfBardam.cs b/BossMod/Modules/Stormblood/Dungeon/D03BardamsMettle/D032HunterOfBardam.cs index 95ffc04f50..cc9e76afaa 100644 --- a/BossMod/Modules/Stormblood/Dungeon/D03BardamsMettle/D032HunterOfBardam.cs +++ b/BossMod/Modules/Stormblood/Dungeon/D03BardamsMettle/D032HunterOfBardam.cs @@ -51,8 +51,8 @@ public enum IconID : uint } class Comet(BossModule module) : Components.StandardChasingAOEs(module, new AOEShapeCircle(4), ActionID.MakeSpell(AID.CometFirst), ActionID.MakeSpell(AID.CometRest), 10, 1.5f, 9, true, (uint)IconID.ChasingAOE); -class CometFirst(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.CometFirst), 4); -class CometRest(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.CometRest), 4); +class CometFirst(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.CometFirst), 4); +class CometRest(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.CometRest), 4); class MeteorImpact(BossModule module) : Components.CastLineOfSightAOE(module, ActionID.MakeSpell(AID.MeteorImpact), 50, safeInsideHitbox: false) { @@ -86,7 +86,7 @@ public override void Update() class Charge(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Charge), new AOEShapeRect(41.25f, 2.5f, 5)); class EmptyGaze(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.EmptyGaze)); class Sacrifice(BossModule module) : Components.CastTowers(module, ActionID.MakeSpell(AID.Sacrifice), 3); -class Reconstruct(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Reconstruct), 5); +class Reconstruct(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Reconstruct), 5); class CometImpact(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.CometImpact), new AOEShapeCircle(9)); class BardamsRing(BossModule module) : Components.DonutStack(module, ActionID.MakeSpell(AID.BardamsRing), (uint)IconID.BardamsRing, 10, 20, 3.5f, 4, 4); diff --git a/BossMod/Modules/Stormblood/Dungeon/D03BardamsMettle/D033Yol.cs b/BossMod/Modules/Stormblood/Dungeon/D03BardamsMettle/D033Yol.cs index b97e16a47c..2aa3166b9f 100644 --- a/BossMod/Modules/Stormblood/Dungeon/D03BardamsMettle/D033Yol.cs +++ b/BossMod/Modules/Stormblood/Dungeon/D03BardamsMettle/D033Yol.cs @@ -33,7 +33,7 @@ public enum IconID : uint Wingbeat = 16 // player } -class Flutterfall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Flutterfall), 6); +class Flutterfall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Flutterfall), 6); class Pinion(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Pinion), new AOEShapeRect(40.5f, 1)); class EyeOfTheFierce(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.EyeOfTheFierce)); class WindUnbound(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.WindUnbound)); diff --git a/BossMod/Modules/Stormblood/Dungeon/D04DomaCastle/D043HypertunedGrynewaht.cs b/BossMod/Modules/Stormblood/Dungeon/D04DomaCastle/D043HypertunedGrynewaht.cs index 9130dc23b7..3385a47400 100644 --- a/BossMod/Modules/Stormblood/Dungeon/D04DomaCastle/D043HypertunedGrynewaht.cs +++ b/BossMod/Modules/Stormblood/Dungeon/D04DomaCastle/D043HypertunedGrynewaht.cs @@ -48,7 +48,7 @@ public enum SID : uint class CleanCut(BossModule module) : Components.ChargeAOEs(module, ActionID.MakeSpell(AID.CleanCut), 4); class DelayActionCharge(BossModule module) : Components.SpreadFromIcon(module, (uint)IconID.Spreadmarker, ActionID.MakeSpell(AID.DelayActionCharge), 6, 4); -class ThermobaricCharge(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.ThermobaricCharge), 30); +class ThermobaricCharge(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.ThermobaricCharge), 30); class Chainsaw(BossModule module) : Components.GenericAOEs(module) { diff --git a/BossMod/Modules/Stormblood/Dungeon/D05CastrumAbania/D051MagnaRoader.cs b/BossMod/Modules/Stormblood/Dungeon/D05CastrumAbania/D051MagnaRoader.cs index c701aae710..4842f66f2c 100644 --- a/BossMod/Modules/Stormblood/Dungeon/D05CastrumAbania/D051MagnaRoader.cs +++ b/BossMod/Modules/Stormblood/Dungeon/D05CastrumAbania/D051MagnaRoader.cs @@ -114,8 +114,8 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme } } -class MagitekPulse(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MagitekPulse), 6); -class MagitekFireII(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MagitekFireII), 5); +class MagitekPulse(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MagitekPulse), 6); +class MagitekFireII(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MagitekFireII), 5); class MagitekFireIII(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.MagitekFireIII)); class D051MagnaRoaderStates : StateMachineBuilder diff --git a/BossMod/Modules/Stormblood/Dungeon/D05CastrumAbania/D053Inferno.cs b/BossMod/Modules/Stormblood/Dungeon/D05CastrumAbania/D053Inferno.cs index 80ba8439a7..08c3e8e61c 100644 --- a/BossMod/Modules/Stormblood/Dungeon/D05CastrumAbania/D053Inferno.cs +++ b/BossMod/Modules/Stormblood/Dungeon/D05CastrumAbania/D053Inferno.cs @@ -52,14 +52,14 @@ class KetuSlash1(BossModule module) : Components.SingleTargetCast(module, Action class KetuSlash2(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.KetuSlash2)); class KetuSlash3(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.KetuSlash3)); class KetuCutter(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.KetuCutter), new AOEShapeCone(20.5f, 10.Degrees())); -class KetuWave(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.KetuWave), 10); +class KetuWave(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.KetuWave), 10); class RahuBlaster(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeRect(44.5f, 3)); class RahuBlaster1(BossModule module) : RahuBlaster(module, AID.RahuBlaster1); class RahuBlaster2(BossModule module) : RahuBlaster(module, AID.RahuBlaster2); class RahuBlaster3(BossModule module) : RahuBlaster(module, AID.RahuBlaster3); -class RahuComet(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 15); +class RahuComet(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 15); class RahuComet1(BossModule module) : RahuComet(module, AID.RahuComet1); class RahuComet2(BossModule module) : RahuComet(module, AID.RahuComet2); class RahuComet3(BossModule module) : RahuComet(module, AID.RahuComet3); @@ -71,7 +71,7 @@ class RahuCometKB(BossModule module, AID aid, int distance) : Components.Knockba public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { var source = Sources(slot, actor).FirstOrDefault(); - if (source != default && !_aoe.ActiveCasters.Any()) + if (source != default && _aoe.ActiveCasters.Count == 0) hints.AddForbiddenZone(ShapeDistance.InvertedCone(Arena.Center, 20, Angle.FromDirection(Arena.Center - source.Origin), 20.Degrees()), source.Activation); } diff --git a/BossMod/Modules/Stormblood/Dungeon/D06AlaMhigo/D062AulusMalAsina.cs b/BossMod/Modules/Stormblood/Dungeon/D06AlaMhigo/D062AulusMalAsina.cs index da7b082f6f..71239d50c3 100644 --- a/BossMod/Modules/Stormblood/Dungeon/D06AlaMhigo/D062AulusMalAsina.cs +++ b/BossMod/Modules/Stormblood/Dungeon/D06AlaMhigo/D062AulusMalAsina.cs @@ -38,7 +38,7 @@ public enum TetherID : uint MindJack = 45 // EmptyVessel->player } -class AetherochemicalGrenado(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.AetherochemicalGrenado), 8); +class AetherochemicalGrenado(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.AetherochemicalGrenado), 8); class IntegratedAetheromodulator(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.IntegratedAetheromodulator), new AOEShapeDonut(11.4f, 15.6f)); class MagitekRay(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MagitekRay), new AOEShapeRect(45.6f, 1)); class ManaBurst(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.ManaBurst)); diff --git a/BossMod/Modules/Stormblood/Dungeon/D15GhimlytDark/D150ScholaMarkIIColossus.cs b/BossMod/Modules/Stormblood/Dungeon/D15GhimlytDark/D150ScholaMarkIIColossus.cs index e0091d30b8..85b68442ab 100644 --- a/BossMod/Modules/Stormblood/Dungeon/D15GhimlytDark/D150ScholaMarkIIColossus.cs +++ b/BossMod/Modules/Stormblood/Dungeon/D15GhimlytDark/D150ScholaMarkIIColossus.cs @@ -21,7 +21,7 @@ public enum AID : uint SelfDetonate = 14574 // ScholaColossusRubricatus->self, 35.0s cast, range 30 circle, enrage } -class MagitekMissile(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MagitekMissile), 15); +class MagitekMissile(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MagitekMissile), 15); class Exhaust(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Exhaust), new AOEShapeRect(43.2f, 5)); class GrandSword(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GrandSword), new AOEShapeCone(18.4f, 60.Degrees())); class SelfDetonate(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.SelfDetonate), "Enrage!", true); diff --git a/BossMod/Modules/Stormblood/Dungeon/D15GhimlytDark/D152Prometheus.cs b/BossMod/Modules/Stormblood/Dungeon/D15GhimlytDark/D152Prometheus.cs index 1d0ac6ccad..54e16839d4 100644 --- a/BossMod/Modules/Stormblood/Dungeon/D15GhimlytDark/D152Prometheus.cs +++ b/BossMod/Modules/Stormblood/Dungeon/D15GhimlytDark/D152Prometheus.cs @@ -95,7 +95,7 @@ class Nitrospin(BossModule module) : Components.RaidwideCast(module, ActionID.Ma class UnbreakableCermetDrill(BossModule module) : Components.SingleTargetDelayableCast(module, ActionID.MakeSpell(AID.UnbreakableCermetDrill)); class OilShower(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.OilShower), new AOEShapeCone(47.8f, 135.Degrees())); class NeedleGun(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.NeedleGun), new AOEShapeCone(47.8f, 45.Degrees())); -class FreezingMissile(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FreezingMissile), 8); +class FreezingMissile(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FreezingMissile), 8); class D152PrometheusStates : StateMachineBuilder { diff --git a/BossMod/Modules/Stormblood/Dungeon/D15GhimlytDark/D153SoranusDuo.cs b/BossMod/Modules/Stormblood/Dungeon/D15GhimlytDark/D153SoranusDuo.cs index 515093e738..0bc8402140 100644 --- a/BossMod/Modules/Stormblood/Dungeon/D15GhimlytDark/D153SoranusDuo.cs +++ b/BossMod/Modules/Stormblood/Dungeon/D15GhimlytDark/D153SoranusDuo.cs @@ -109,8 +109,8 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell) class Quaternity1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Quaternity1), new AOEShapeRect(41, 2)); class Quaternity2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Quaternity2), new AOEShapeRect(23, 2, 3)); class StunningSweep(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.StunningSweep), new AOEShapeCircle(6.6f)); -class Bombardment(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Bombardment), 10); -class MagitekMissile(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MissileImpact), 6); +class Bombardment(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Bombardment), 10); +class MagitekMissile(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MissileImpact), 6); class CoveringFire(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.CoveringFire), 8); class CeruleumTanks(BossModule module) : Components.GenericAOEs(module) diff --git a/BossMod/Modules/Stormblood/Foray/BaldesionsArsenal/BA1Art/BA1Art.cs b/BossMod/Modules/Stormblood/Foray/BaldesionsArsenal/BA1Art/BA1Art.cs index 345caef5fe..520d3a564e 100644 --- a/BossMod/Modules/Stormblood/Foray/BaldesionsArsenal/BA1Art/BA1Art.cs +++ b/BossMod/Modules/Stormblood/Foray/BaldesionsArsenal/BA1Art/BA1Art.cs @@ -3,8 +3,8 @@ namespace BossMod.Stormblood.Foray.BaldesionArsenal.BA1Art; class Thricecull(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Thricecull)); class AcallamNaSenorach(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.AcallamNaSenorach)); class DefilersDeserts(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DefilersDeserts), new AOEShapeRect(35.5f, 4)); -class Pitfall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Pitfall), 20); -class LegendaryGeasAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LegendaryGeas), 8); +class Pitfall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Pitfall), 20); +class LegendaryGeasAOE(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LegendaryGeas), 8); class DefilersDesertsPredict(BossModule module) : Components.GenericAOEs(module) { diff --git a/BossMod/Modules/Stormblood/Foray/BaldesionsArsenal/BA1Owain/BA1Owain.cs b/BossMod/Modules/Stormblood/Foray/BaldesionsArsenal/BA1Owain/BA1Owain.cs index f8fbc2acfe..95af41abfb 100644 --- a/BossMod/Modules/Stormblood/Foray/BaldesionsArsenal/BA1Owain/BA1Owain.cs +++ b/BossMod/Modules/Stormblood/Foray/BaldesionsArsenal/BA1Owain/BA1Owain.cs @@ -3,7 +3,7 @@ namespace BossMod.Stormblood.Foray.BaldesionArsenal.BA1Owain; class Thricecull(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Thricecull)); class AcallamNaSenorach(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.AcallamNaSenorach)); class LegendaryImbas(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.LegendaryImbas)); // applies dorito stacks, seems to get skipped if less than 4 people alive? -class Pitfall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Pitfall), 20); +class Pitfall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Pitfall), 20); [ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "The Combat Reborn Team (Malediktus)", GroupType = BossModuleInfo.GroupType.BaldesionArsenal, GroupID = 639, NameID = 7970, PlanLevel = 70, SortOrder = 2)] public class BA1Owain(WorldState ws, Actor primary) : BossModule(ws, primary, arena.Center, arena) diff --git a/BossMod/Modules/Stormblood/Foray/BaldesionsArsenal/BA2Raiden/BA2Raiden.cs b/BossMod/Modules/Stormblood/Foray/BaldesionsArsenal/BA2Raiden/BA2Raiden.cs index 33c382bb15..2129e02ddb 100644 --- a/BossMod/Modules/Stormblood/Foray/BaldesionsArsenal/BA2Raiden/BA2Raiden.cs +++ b/BossMod/Modules/Stormblood/Foray/BaldesionsArsenal/BA2Raiden/BA2Raiden.cs @@ -20,13 +20,13 @@ class Shingan(BossModule module) : Components.SingleTargetCast(module, ActionID. class Shock(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Shock), new AOEShapeCircle(8)); class ForHonor(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ForHonor), new AOEShapeCircle(11.4f)); -abstract class LateralZantetsuken(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeRect(75.4f, 19.5f)); +abstract class LateralZantetsuken(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), new AOEShapeRect(75.4f, 19.5f)); class LateralZantetsuken1(BossModule module) : LateralZantetsuken(module, AID.LateralZantetsuken1); class LateralZantetsuken2(BossModule module) : LateralZantetsuken(module, AID.LateralZantetsuken2); class BitterBarbs(BossModule module) : Components.Chains(module, (uint)TetherID.Chains, ActionID.MakeSpell(AID.BitterBarbs)); -class BoomingLament(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BoomingLament), 10); -class SilentLevin(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.SilentLevin), 5); +class BoomingLament(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BoomingLament), 10); +class SilentLevin(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.SilentLevin), 5); class UltimateZantetsuken(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.UltimateZantetsuken), "Enrage, kill the adds!", true); diff --git a/BossMod/Modules/Stormblood/Foray/BaldesionsArsenal/BA2Raiden/BA2RaidenStates.cs b/BossMod/Modules/Stormblood/Foray/BaldesionsArsenal/BA2Raiden/BA2RaidenStates.cs index 8ff6d2c28e..23c624e9aa 100644 --- a/BossMod/Modules/Stormblood/Foray/BaldesionsArsenal/BA2Raiden/BA2RaidenStates.cs +++ b/BossMod/Modules/Stormblood/Foray/BaldesionsArsenal/BA2Raiden/BA2RaidenStates.cs @@ -128,7 +128,7 @@ private void BallLightningLateralZantetsukenUltimateZantetsuken(uint id, float d Targetable(id + 0xB0, true, 4.7f); CastStart(id + 0xC0, AID.UltimateZantetsuken, 2.1f, "Enrage start"); CastEnd(id + 0xD0, 18, "Enrage") - .ResetComp() + .ResetComp() .ResetComp(); } @@ -141,7 +141,7 @@ private void UltimateZantetsuken(uint id, float delay) Targetable(id + 0x40, true, 4); CastStart(id + 0x50, AID.UltimateZantetsuken, 1.6f, "Enrage start"); CastEnd(id + 0x60, 18, "Enrage") - .ResetComp(); + .ResetComp(); } private void BoomingLamentCloudToGround(uint id, float delay) diff --git a/BossMod/Modules/Stormblood/Hunt/RankA/Angada.cs b/BossMod/Modules/Stormblood/Hunt/RankA/Angada.cs index 1806374f39..ea4809d318 100644 --- a/BossMod/Modules/Stormblood/Hunt/RankA/Angada.cs +++ b/BossMod/Modules/Stormblood/Hunt/RankA/Angada.cs @@ -41,7 +41,7 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) } } -class RockThrow(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RockThrow), 6); +class RockThrow(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RockThrow), 6); class AngadaStates : StateMachineBuilder { diff --git a/BossMod/Modules/Stormblood/Hunt/RankA/Gajasura.cs b/BossMod/Modules/Stormblood/Hunt/RankA/Gajasura.cs index 74f9900092..b799ba24eb 100644 --- a/BossMod/Modules/Stormblood/Hunt/RankA/Gajasura.cs +++ b/BossMod/Modules/Stormblood/Hunt/RankA/Gajasura.cs @@ -14,7 +14,7 @@ public enum AID : uint } class Spin(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Spin), new AOEShapeCone(8.23f, 60.Degrees())); -class Hurl(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); +class Hurl(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); class Buffet(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.Buffet), "Heavy damage on random target (except tank)"); class GajasuraStates : StateMachineBuilder diff --git a/BossMod/Modules/Stormblood/Hunt/RankS/Gamma.cs b/BossMod/Modules/Stormblood/Hunt/RankS/Gamma.cs index 2f94f93216..079afb451b 100644 --- a/BossMod/Modules/Stormblood/Hunt/RankS/Gamma.cs +++ b/BossMod/Modules/Stormblood/Hunt/RankS/Gamma.cs @@ -21,7 +21,7 @@ public enum SID : uint Haste = 8, // Boss->Boss, extra=0x0 } -class DiffractiveLaser(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.DiffractiveLaser), 5); +class DiffractiveLaser(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.DiffractiveLaser), 5); class MagitekFlamehook(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.MagitekFlamehook), "Raidwide + Pyretic"); class Launcher(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Launcher), "Raidwide (%HP based)"); diff --git a/BossMod/Modules/Stormblood/Hunt/RankS/Okina.cs b/BossMod/Modules/Stormblood/Hunt/RankS/Okina.cs index 7f9b5913de..2101540a89 100644 --- a/BossMod/Modules/Stormblood/Hunt/RankS/Okina.cs +++ b/BossMod/Modules/Stormblood/Hunt/RankS/Okina.cs @@ -22,7 +22,7 @@ public enum AID : uint class Expulsion(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Expulsion), new AOEShapeCircle(14)); class ExpulsionKB(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.Expulsion), 30, shape: new AOEShapeCircle(14)); class ElectricSwipe(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ElectricSwipe), new AOEShapeCone(25, 30.Degrees())); -class BodySlam(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.BodySlam), 10); +class BodySlam(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.BodySlam), 10); class BodySlamKB(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.BodySlam), 20, shape: new AOEShapeCircle(10)); class Immersion(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Immersion)); class RubyTide(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.RubyTide), "Applies damage buff to self"); diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheHiddenCanalsOfUznair/Airavata.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheHiddenCanalsOfUznair/Airavata.cs index f2b6146776..31266bfe58 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheHiddenCanalsOfUznair/Airavata.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheHiddenCanalsOfUznair/Airavata.cs @@ -59,7 +59,7 @@ public enum AID : uint Telega = 9630 // Mandragoras/Abharamu/NamazuStickywhisker->self, no cast, single-target, bonus adds disappear } -abstract class Hurl(BossModule module, AID aid) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(aid), 6); +abstract class Hurl(BossModule module, AID aid) : Components.SimpleAOEs(module, ActionID.MakeSpell(aid), 6); class HurlBoss(BossModule module) : Hurl(module, AID.HurlBoss); class HurlBonusAdd(BossModule module) : Hurl(module, AID.Hurl); @@ -69,7 +69,7 @@ class Buffet(BossModule module) : Components.SingleTargetCast(module, ActionID.M class DoubleSmash(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DoubleSmash), new AOEShapeCone(7.95f, 60.Degrees())); class AncientAero(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AncientAero), new AOEShapeRect(13.6f, 2)); -class RingOfFire(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RingOfFire), 5); +class RingOfFire(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RingOfFire), 5); class StoneII(BossModule module) : Components.SingleTargetCast(module, ActionID.MakeSpell(AID.StoneII)); class RaucousScritch(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RaucousScritch), new AOEShapeCone(8.42f, 30.Degrees())); diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheLostCanalsOfUznair/CanalIcebeast.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheLostCanalsOfUznair/CanalIcebeast.cs index 83efd7577e..9d8840e327 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheLostCanalsOfUznair/CanalIcebeast.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheLostCanalsOfUznair/CanalIcebeast.cs @@ -30,10 +30,10 @@ public enum AID : uint class Eyeshine(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.Eyeshine)); class AbsoluteZero(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AbsoluteZero), new AOEShapeCone(45.5f, 45.Degrees())); -class Freezeover(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Freezeover), 6); +class Freezeover(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Freezeover), 6); class PlainPound(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PlainPound), new AOEShapeCircle(4.56f)); class RaucousScritch(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RaucousScritch), new AOEShapeCone(8.42f, 30.Degrees())); -class Hurl(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); +class Hurl(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); class Spin(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Spin), new AOEShapeCone(9.42f, 60.Degrees()), (uint)OID.Abharamu); class CanalIcebeastStates : StateMachineBuilder diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarAiravata.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarAiravata.cs index d673df67b9..8abb07b44b 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarAiravata.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarAiravata.cs @@ -31,7 +31,7 @@ public enum IconID : uint BuffetTarget = 23 // player } -class HurlBoss(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HurlBoss), 6); +class HurlBoss(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.HurlBoss), 6); class SpinBoss(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SpinBoss), new AOEShapeCone(30, 60.Degrees())); class BarbarousScream(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BarbarousScream), new AOEShapeCircle(13)); class Huff(BossModule module) : Components.SingleTargetDelayableCast(module, ActionID.MakeSpell(AID.Huff)); @@ -96,7 +96,7 @@ public override void DrawArenaBackground(int pcSlot, Actor pc) } class RaucousScritch(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RaucousScritch), new AOEShapeCone(8.42f, 30.Degrees())); -class Hurl(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); +class Hurl(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); class Spin(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Spin), new AOEShapeCone(9.42f, 60.Degrees()), (uint)OID.AltarMatanga); class AltarAiravataStates : StateMachineBuilder diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarArachne.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarArachne.cs index 9551512bdf..7bb0d448ba 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarArachne.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarArachne.cs @@ -40,7 +40,7 @@ class Implosion(BossModule module) : Components.RaidwideCast(module, ActionID.Ma class Earthquake3(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Earthquake3), new AOEShapeDonut(20, 30)); class RaucousScritch(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RaucousScritch), new AOEShapeCone(8.42f, 30.Degrees())); -class Hurl(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); +class Hurl(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); class Spin(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Spin), new AOEShapeCone(9.42f, 60.Degrees()), (uint)OID.AltarMatanga); class AltarArachneStates : StateMachineBuilder diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarBeast.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarBeast.cs index 4403af70b1..f7dd899e36 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarBeast.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarBeast.cs @@ -42,7 +42,7 @@ public enum AID : uint class TailDrive(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TailDrive), new AOEShapeCone(34.6f, 60.Degrees())); class TheSpin(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TheSpin), new AOEShapeCircle(15)); class WordsOfWoe(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.WordsOfWoe), new AOEShapeRect(49.6f, 3)); -class VengefulSoul(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.VengefulSoul), 6); +class VengefulSoul(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.VengefulSoul), 6); class EyeOfTheFire(BossModule module) : Components.CastGaze(module, ActionID.MakeSpell(AID.EyeOfTheFire)); abstract class Mandragoras(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCircle(6.84f)); @@ -53,7 +53,7 @@ class PungentPirouette(BossModule module) : Mandragoras(module, AID.PungentPirou class Pollen(BossModule module) : Mandragoras(module, AID.Pollen); class RaucousScritch(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RaucousScritch), new AOEShapeCone(8.42f, 30.Degrees())); -class Hurl(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); +class Hurl(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); class Spin(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Spin), new AOEShapeCone(9.42f, 60.Degrees()), (uint)OID.AltarMatanga); class AltarBeastStates : StateMachineBuilder diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarChimera.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarChimera.cs index 30e8472726..b512a32d43 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarChimera.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarChimera.cs @@ -75,7 +75,7 @@ public override void AddHints(int slot, Actor actor, TextHints hints) } class RaucousScritch(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RaucousScritch), new AOEShapeCone(8.42f, 30.Degrees())); -class Hurl(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); +class Hurl(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); class Spin(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Spin), new AOEShapeCone(9.42f, 60.Degrees()), (uint)OID.AltarMatanga); class AltarChimeraStates : StateMachineBuilder diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarDiresaur.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarDiresaur.cs index af54bda6a4..d283cec40a 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarDiresaur.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarDiresaur.cs @@ -40,7 +40,7 @@ class DeadlyHold(BossModule module) : Components.SingleTargetDelayableCast(modul class HeatBreath(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.HeatBreath), new AOEShapeCone(14.6f, 45.Degrees())); class TailSmash(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TailSmash), new AOEShapeCone(26.6f, 45.Degrees())); class RagingInferno(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.RagingInferno)); -class Comet(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Comet), 4); +class Comet(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Comet), 4); class HardStomp(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.HardStomp), new AOEShapeCircle(10)); class Fireball(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 6, ActionID.MakeSpell(AID.Fireball), m => m.Enemies(OID.FireVoidzone).Where(z => z.EventState != 7), 0.7f); @@ -81,7 +81,7 @@ public override void AddHints(int slot, Actor actor, TextHints hints) } class RaucousScritch(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RaucousScritch), new AOEShapeCone(8.42f, 30.Degrees())); -class Hurl(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); +class Hurl(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); class Spin(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Spin), new AOEShapeCone(9.42f, 60.Degrees()), (uint)OID.AltarMatanga); class AltarDiresaurStates : StateMachineBuilder diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarDullahan.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarDullahan.cs index 92e500d9b4..2129624830 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarDullahan.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarDullahan.cs @@ -38,8 +38,8 @@ public enum AID : uint } class IronJustice(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.IronJustice), new AOEShapeCone(11.8f, 60.Degrees())); -class Cloudcover(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Cloudcover), 6); -class TerrorEye(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.TerrorEye), 6); +class Cloudcover(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Cloudcover), 6); +class TerrorEye(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.TerrorEye), 6); class VillainousRebuke(BossModule module) : Components.StackWithCastTargets(module, ActionID.MakeSpell(AID.VillainousRebuke), 6, 8, 8); class StygianRelease(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.StygianRelease)); class StygianReleaseKB(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.StygianRelease), 20, stopAtWall: true) @@ -48,7 +48,7 @@ class StygianReleaseKB(BossModule module) : Components.KnockbackFromCastTarget(m } class RaucousScritch(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RaucousScritch), new AOEShapeCone(8.42f, 30.Degrees())); -class Hurl(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); +class Hurl(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); class Spin(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Spin), new AOEShapeCone(9.42f, 60.Degrees()), (uint)OID.AltarMatanga); abstract class Mandragoras(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCircle(6.84f)); diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarKelpie.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarKelpie.cs index 3f1e4abd95..c17dff4c58 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarKelpie.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarKelpie.cs @@ -38,7 +38,7 @@ public enum AID : uint Telega = 9630 // AltarMatanga/Mandragoras->self, no cast, single-target, bonus adds disappear } -class Innocence(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Innocence), 5); +class Innocence(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Innocence), 5); class HydroPush(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.HydroPush), new AOEShapeRect(49.4f, 22, 5)); class BloodyPuddle(BossModule module) : Components.GenericAOEs(module) @@ -79,7 +79,7 @@ class RisingSeasKB(BossModule module) : Components.KnockbackFromCastTarget(modul } class RaucousScritch(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RaucousScritch), new AOEShapeCone(8.42f, 30.Degrees())); -class Hurl(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); +class Hurl(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); class Spin(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Spin), new AOEShapeCone(9.42f, 60.Degrees()), (uint)OID.AltarMatanga); abstract class Mandragoras(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCircle(6.84f)); diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarMandragora.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarMandragora.cs index c186e30e61..4a36dbb2f3 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarMandragora.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarMandragora.cs @@ -33,7 +33,7 @@ public enum AID : uint class OpticalIntrusion(BossModule module) : Components.SingleTargetDelayableCast(module, ActionID.MakeSpell(AID.OpticalIntrusion)); class Hypnotize(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Hypnotize), new AOEShapeCone(22.85f, 45.Degrees())); class SaibaiMandragora(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.SaibaiMandragora), "Calls adds"); -class LeafDagger(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LeafDagger), 3); +class LeafDagger(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LeafDagger), 3); abstract class Mandragoras(BossModule module, AID aid) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(aid), new AOEShapeCircle(6.84f)); class PluckAndPrune(BossModule module) : Mandragoras(module, AID.PluckAndPrune); diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarSkatene.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarSkatene.cs index c22f5ac841..96d2e45197 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarSkatene.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarSkatene.cs @@ -27,11 +27,11 @@ public enum AID : uint } class Chirp(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Chirp), new AOEShapeCircle(12.48f)); -class Tornado(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Tornado), 6); +class Tornado(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Tornado), 6); class VoidCall(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.VoidCall), "Calls adds"); class RecklessAbandon(BossModule module) : Components.SingleTargetDelayableCast(module, ActionID.MakeSpell(AID.RecklessAbandon)); -class Hurl(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); +class Hurl(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); class Spin(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Spin), new AOEShapeCone(9.42f, 60.Degrees()), (uint)OID.AltarMatanga); class RaucousScritch(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RaucousScritch), new AOEShapeCone(8.42f, 30.Degrees())); diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarTotem.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarTotem.cs index df25dc0051..6e6edb11b1 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarTotem.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarTotem.cs @@ -34,7 +34,7 @@ public enum IconID : uint } class FlurryOfRage(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.FlurryOfRage), new AOEShapeCone(13.06f, 60.Degrees())); -class WaveOfMalice(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.WaveOfMalice), 5); +class WaveOfMalice(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.WaveOfMalice), 5); class WhorlOfFrenzy(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.WhorlOfFrenzy), new AOEShapeCircle(11.06f)); class TheWardensVerdict(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.TheWardensVerdict), new AOEShapeRect(45.06f, 2)); class FlamesOfFury(BossModule module) : Components.PersistentVoidzoneAtCastTarget(module, 10, ActionID.MakeSpell(AID.FlamesOfFury), m => m.Enemies(OID.FireVoidzone).Where(z => z.EventState != 7), 1.2f); @@ -76,7 +76,7 @@ public override void AddHints(int slot, Actor actor, TextHints hints) } class RaucousScritch(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RaucousScritch), new AOEShapeCone(8.42f, 30.Degrees())); -class Hurl(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); +class Hurl(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); class Spin(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Spin), new AOEShapeCone(9.42f, 60.Degrees()), (uint)OID.AltarMatanga); class AltarTotemStates : StateMachineBuilder diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/Hati.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/Hati.cs index 9f0294d471..88247e3f9f 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/Hati.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/Hati.cs @@ -34,7 +34,7 @@ public enum AID : uint } class PolarRoar(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PolarRoar), new AOEShapeDonut(9, 40)); -class Hellstorm(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hellstorm2), 10); +class Hellstorm(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hellstorm2), 10); class Netherwind(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Netherwind), new AOEShapeRect(18, 2)); class GlassyNova(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GlassyNova), new AOEShapeRect(45.4f, 4)); class BrainFreeze(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BrainFreeze), new AOEShapeCircle(15.4f)); diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheOlderOne.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheOlderOne.cs index a3f0e63975..da96add6bc 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheOlderOne.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheOlderOne.cs @@ -44,7 +44,7 @@ public enum AID : uint } class MysticLight(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MysticLight), new AOEShapeCone(45.06f, 30.Degrees())); -class MysticFlame(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MysticFlame2), 7); +class MysticFlame(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MysticFlame2), 7); class MysticHeat(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.MysticHeat), new AOEShapeRect(41.72f, 1.5f)); class SelfDetonate(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.SelfDetonate), new AOEShapeCircle(10.72f)); class MysticLevin(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.MysticLevin)); @@ -58,7 +58,7 @@ class PungentPirouette(BossModule module) : Mandragoras(module, AID.PungentPirou class Pollen(BossModule module) : Mandragoras(module, AID.Pollen); class RaucousScritch(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RaucousScritch), new AOEShapeCone(8.42f, 30.Degrees())); -class Hurl(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); +class Hurl(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); class Spin(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Spin), new AOEShapeCone(9.42f, 60.Degrees()), (uint)OID.AltarMatanga); class TheOlderOneStates : StateMachineBuilder diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheWinged.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheWinged.cs index 6766be8b84..5d0ae7d618 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheWinged.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheWinged.cs @@ -41,7 +41,7 @@ public enum AID : uint class Filoplumes(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Filoplumes), new AOEShapeRect(11.36f, 2)); class Wingbeat(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Wingbeat), new AOEShapeCone(43.36f, 30.Degrees())); class WingbeatKB(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.Wingbeat), 20, false, 1, new AOEShapeCone(43.36f, 30.Degrees()), stopAtWall: true); -class FeatherSquall(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.FeatherSquall), 6); +class FeatherSquall(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.FeatherSquall), 6); class Pinion(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Pinion), new AOEShapeRect(40.5f, 1.5f)); class Sideslip(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.Sideslip)); @@ -53,7 +53,7 @@ class PungentPirouette(BossModule module) : Mandragoras(module, AID.PungentPirou class Pollen(BossModule module) : Mandragoras(module, AID.Pollen); class RaucousScritch(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.RaucousScritch), new AOEShapeCone(8.42f, 30.Degrees())); -class Hurl(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); +class Hurl(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Hurl), 6); class Spin(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Spin), new AOEShapeCone(9.42f, 60.Degrees()), (uint)OID.AltarMatanga); class TheWingedStates : StateMachineBuilder diff --git a/BossMod/Modules/Stormblood/Trial/T07Byakko/T07Byakko.cs b/BossMod/Modules/Stormblood/Trial/T07Byakko/T07Byakko.cs index 0062ca9f10..3511e09e68 100644 --- a/BossMod/Modules/Stormblood/Trial/T07Byakko/T07Byakko.cs +++ b/BossMod/Modules/Stormblood/Trial/T07Byakko/T07Byakko.cs @@ -9,7 +9,7 @@ class TheRoarOfThunder(BossModule module) : Components.RaidwideCast(module, Acti class ImperialGuard(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ImperialGuard), new AOEShapeRect(44.75f, 2.5f)); class FireAndLightning1(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.FireAndLightning1), new AOEShapeRect(50, 10)); class FireAndLightning2(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.FireAndLightning2), new AOEShapeRect(50, 10)); -//class Aratama1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.Aratama1), 4); +//class Aratama1(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.Aratama1), 4); class DistantClap(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.DistantClap), new AOEShapeDonut(5, 30)); class HighestStakes(BossModule module) : Components.StackWithIcon(module, (uint)IconID.Stackmarker, ActionID.MakeSpell(AID.HighestStakes2), 6, 5, 7, 7); diff --git a/BossMod/Modules/Stormblood/Ultimate/UCOB/P2BahamutsFavor.cs b/BossMod/Modules/Stormblood/Ultimate/UCOB/P2BahamutsFavor.cs index e3983fa0b5..5e299af77f 100644 --- a/BossMod/Modules/Stormblood/Ultimate/UCOB/P2BahamutsFavor.cs +++ b/BossMod/Modules/Stormblood/Ultimate/UCOB/P2BahamutsFavor.cs @@ -155,4 +155,4 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) } } -class P2BahamutsFavorWingsOfSalvation(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.WingsOfSalvation), 4); +class P2BahamutsFavorWingsOfSalvation(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.WingsOfSalvation), 4); diff --git a/BossMod/Modules/Stormblood/Ultimate/UCOB/P3QuickmarchTrio.cs b/BossMod/Modules/Stormblood/Ultimate/UCOB/P3QuickmarchTrio.cs index 76dce4d1d7..27ad83b00e 100644 --- a/BossMod/Modules/Stormblood/Ultimate/UCOB/P3QuickmarchTrio.cs +++ b/BossMod/Modules/Stormblood/Ultimate/UCOB/P3QuickmarchTrio.cs @@ -70,5 +70,5 @@ public override void OnEventCast(Actor caster, ActorCastEvent spell) } } -class P3MegaflarePuddle(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MegaflarePuddle), 6); +class P3MegaflarePuddle(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.MegaflarePuddle), 6); class P3TempestWing(BossModule module) : Components.TankbusterTether(module, ActionID.MakeSpell(AID.TempestWing), (uint)TetherID.TempestWing, 5); diff --git a/BossMod/Modules/Stormblood/Ultimate/UWU/P1MistralSong.cs b/BossMod/Modules/Stormblood/Ultimate/UWU/P1MistralSong.cs index c24f96d532..ea3dafd86b 100644 --- a/BossMod/Modules/Stormblood/Ultimate/UWU/P1MistralSong.cs +++ b/BossMod/Modules/Stormblood/Ultimate/UWU/P1MistralSong.cs @@ -65,4 +65,4 @@ public override void OnEventIcon(Actor actor, uint iconID, ulong targetID) bool IsClosest(Actor actor) => ActiveAOEs().Any(aoe => Raid.WithoutSlot().InShape(_shape, aoe.origin, aoe.rotation).Closest(aoe.origin) == actor); } -class P1GreatWhirlwind(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.GreatWhirlwind), 8); +class P1GreatWhirlwind(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.GreatWhirlwind), 8); diff --git a/BossMod/Modules/Stormblood/Ultimate/UWU/P2Eruption.cs b/BossMod/Modules/Stormblood/Ultimate/UWU/P2Eruption.cs index 841932318c..294002a3c8 100644 --- a/BossMod/Modules/Stormblood/Ultimate/UWU/P2Eruption.cs +++ b/BossMod/Modules/Stormblood/Ultimate/UWU/P2Eruption.cs @@ -2,7 +2,7 @@ // TODO: is it baited on farthest dps or any roles? can subsequent eruptions bait on other targets? // casts are 3s long and 2s apart (overlapping) -class P2Eruption(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.EruptionAOE), 8) +class P2Eruption(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.EruptionAOE), 8) { public int NumCastsStarted { get; private set; } private BitMask _baiters; diff --git a/BossMod/Modules/Stormblood/Ultimate/UWU/UWU.cs b/BossMod/Modules/Stormblood/Ultimate/UWU/UWU.cs index a5556b6ac2..e019042aff 100644 --- a/BossMod/Modules/Stormblood/Ultimate/UWU/UWU.cs +++ b/BossMod/Modules/Stormblood/Ultimate/UWU/UWU.cs @@ -4,11 +4,11 @@ class P1Downburst(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Downburst), new AOEShapeCone(11.7f, 45.Degrees())); class P1EyeOfTheStorm(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.EyeOfTheStorm), new AOEShapeDonut(12, 25)); class P1Gigastorm(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Gigastorm), new AOEShapeCircle(6.5f)); -class P2RadiantPlume(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.RadiantPlumeAOE), 8); +class P2RadiantPlume(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.RadiantPlumeAOE), 8); class P2Incinerate(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.Incinerate), new AOEShapeCone(15, 60.Degrees()), (uint)OID.Ifrit); class P3RockBuster(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.RockBuster), new AOEShapeCone(10.55f, 60.Degrees()), (uint)OID.Titan); // TODO: verify angle class P3MountainBuster(BossModule module) : Components.Cleave(module, ActionID.MakeSpell(AID.MountainBuster), new AOEShapeCone(15.55f, 45.Degrees()), (uint)OID.Titan); // TODO: verify angle -class P3WeightOfTheLand(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.WeightOfTheLandAOE), 6); +class P3WeightOfTheLand(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.WeightOfTheLandAOE), 6); class P3Upheaval(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.Upheaval), 24, true); class P3Tumult(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.Tumult)); class P4Blight(BossModule module) : Components.CastCounter(module, ActionID.MakeSpell(AID.Blight)); @@ -18,7 +18,7 @@ class P4HomingLasers(BossModule module) : Components.SpreadFromCastTargets(modul class P5AetherochemicalLaserCenter(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AetherochemicalLaserCenter), new AOEShapeRect(46, 4, 6)); class P5AetherochemicalLaserRight(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AetherochemicalLaserRight), new AOEShapeRect(46, 4, 6)); class P5AetherochemicalLaserLeft(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.AetherochemicalLaserLeft), new AOEShapeRect(46, 4, 6)); -class P5LightPillar(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.LightPillarAOE), 3); // TODO: consider showing circle around baiter +class P5LightPillar(BossModule module) : Components.SimpleAOEs(module, ActionID.MakeSpell(AID.LightPillarAOE), 3); // TODO: consider showing circle around baiter class P5AethericBoom(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.AethericBoom), 10); [ModuleInfo(BossModuleInfo.Maturity.Verified, PrimaryActorOID = (uint)OID.Garuda, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 539, PlanLevel = 70)]