From e675c81b7913e97b4faf205d63a99c036b139d38 Mon Sep 17 00:00:00 2001 From: LTS-FFXIV <127939494+LTS-FFXIV@users.noreply.github.com> Date: Sat, 20 Apr 2024 17:31:30 -0500 Subject: [PATCH] General DRN fixes --- .../Normal/DRN2Dahu/DRN2Dahu.cs | 26 +++++++++++++++++++ .../Normal/DRN2Dahu/DRN2DahuStates.cs | 1 + .../Normal/DRN3QueensGuard/DRN3QueensGuard.cs | 2 +- .../DRN3QueensGuard/DRN3QueensGuardEnums.cs | 8 +++--- .../DRN3QueensGuard/DRN3QueensGuardStates.cs | 2 +- .../Normal/DRN4Phantom/DRN4Phantom.cs | 4 ++- .../Normal/DRN4Phantom/DRN4PhantomEnums.cs | 2 +- .../Normal/DRN4Phantom/DRN4PhantomStates.cs | 1 + .../Normal/DRN6Queen/DRN6QueenStates.cs | 5 ++-- 9 files changed, 41 insertions(+), 10 deletions(-) diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN2Dahu/DRN2Dahu.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN2Dahu/DRN2Dahu.cs index 7a281018c5..7ec63ec848 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN2Dahu/DRN2Dahu.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN2Dahu/DRN2Dahu.cs @@ -6,6 +6,32 @@ class HotCharge(BossModule module) : Components.ChargeAOEs(module, ActionID.Make class HeadDown(BossModule module) : Components.ChargeAOEs(module, ActionID.MakeSpell(AID.HeadDown), 2); class HuntersClaw(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.HuntersClaw), new AOEShapeCircle(8)); +class FeralHowl(BossModule module) : Components.Knockback(module) +{ + private Actor? _source; + + public override IEnumerable Sources(int slot, Actor actor) + { + if (_source != null) + yield return new(_source.Position, 30, _source.CastInfo!.NPCFinishAt); + } + + public override void OnCastStarted(Actor caster, ActorCastInfo spell) + { + if ((AID)spell.Action.ID is AID.FeralHowl) + _source = caster; + } + + public override void OnCastFinished(Actor caster, ActorCastInfo spell) + { + if ((AID)spell.Action.ID is AID.FeralHowl) + { + _source = null; + ++NumCasts; + } + } +} + [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "CombatReborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 760, NameID = 9751)] public class DRN2Dahu(WorldState ws, Actor primary) : BossModule(ws, primary, new ArenaBoundsCircle(new(82, 138), 30)) { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN2Dahu/DRN2DahuStates.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN2Dahu/DRN2DahuStates.cs index 38f4f29a1e..b7f99063b0 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN2Dahu/DRN2DahuStates.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN2Dahu/DRN2DahuStates.cs @@ -10,6 +10,7 @@ public DRN2DahuStates(BossModule module) : base(module) .ActivateOnEnter() .ActivateOnEnter() .ActivateOnEnter() + .ActivateOnEnter() .ActivateOnEnter(); } } diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN3QueensGuard/DRN3QueensGuard.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN3QueensGuard/DRN3QueensGuard.cs index deae148a29..5e06293116 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN3QueensGuard/DRN3QueensGuard.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN3QueensGuard/DRN3QueensGuard.cs @@ -2,7 +2,7 @@ class OptimalPlaySword(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.OptimalPlaySword), new AOEShapeCircle(10)); class OptimalPlayShield(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.OptimalPlayShield), new AOEShapeDonut(5, 60)); -class OptimalPlayCone(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.OptimalPlayCone), new AOEShapeCone(60, 135.Degrees())); +//class OptimalPlayCone(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.OptimalPlayCone), new AOEShapeCone(60, 135.Degrees())); class PawnOff(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.PawnOffReal), new AOEShapeCircle(20)); diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN3QueensGuard/DRN3QueensGuardEnums.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN3QueensGuard/DRN3QueensGuardEnums.cs index 5d47b7eb1f..db86ca1feb 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN3QueensGuard/DRN3QueensGuardEnums.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN3QueensGuard/DRN3QueensGuardEnums.cs @@ -45,7 +45,7 @@ public enum AID : uint ShieldOmen = 22513, // Knight->self, 3.0s cast, single-target SwordOmen = 22512, // Knight->self, 3.0s cast, single-target - OptimalPlayCone = 22516, // Helper->self, 5.0s cast, single-target + OptimalPlay = 22516, // Helper->self, 5.0s cast, single-target OptimalPlayShield = 22515, // Knight->self, 6.0s cast, range ?-60 donut OptimalPlaySword = 22514, // Knight->self, 6.0s cast, range 10 circle @@ -86,9 +86,9 @@ public enum SID : uint TheHeatOfBattle = 365, // none->player, extra=0xA Transcendent = 418, // none->player, extra=0x0 TwiceComeRuin = 2485, // Knight/AetherialBolt/Helper->player, extra=0x1 - Unknown1 = 2056, // none->GunTurret, extra=0xE1 - Unknown2 = 2195, // AetherialWard->AetherialWard, extra=0x101/0x100 - Unknown3 = 2160, // none->30B7, extra=0x2129 + GunTurrentStatus = 2056, // none->GunTurret, extra=0xE1 + WardStatus = 2195, // AetherialWard->AetherialWard, extra=0x101/0x100 + AllyStatus = 2160, // none->30B7, extra=0x2129 Weakness = 43, // none->player, extra=0x0 } diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN3QueensGuard/DRN3QueensGuardStates.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN3QueensGuard/DRN3QueensGuardStates.cs index 8518bc49a6..0e31a08cf3 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN3QueensGuard/DRN3QueensGuardStates.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN3QueensGuard/DRN3QueensGuardStates.cs @@ -6,7 +6,7 @@ public DRN3QueensGuardStates(BossModule module) : base(module) TrivialPhase() .ActivateOnEnter() .ActivateOnEnter() - .ActivateOnEnter() + //.ActivateOnEnter() .ActivateOnEnter() .ActivateOnEnter() .ActivateOnEnter(); diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN4Phantom/DRN4Phantom.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN4Phantom/DRN4Phantom.cs index d602f4e7fd..0f50f331c9 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN4Phantom/DRN4Phantom.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN4Phantom/DRN4Phantom.cs @@ -1,4 +1,6 @@ namespace BossMod.Shadowbringers.Foray.DelubrumReginae.Normal.DRN4Phantom; +class UndyingHatred(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.UndyingHatred), 30, kind: Kind.DirForward); + [ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "CombatReborn Team", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 760, NameID = 9755)] -public class DRN4Phantom(WorldState ws, Actor primary) : BossModule(ws, primary, new ArenaBoundsSquare(new(202, -370), 24)); +public class DRN4Phantom(WorldState ws, Actor primary) : BossModule(ws, primary, new ArenaBoundsSquare(new(202, -370), 24)); \ No newline at end of file diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN4Phantom/DRN4PhantomEnums.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN4Phantom/DRN4PhantomEnums.cs index eadd653d30..5f04e46209 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN4Phantom/DRN4PhantomEnums.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN4Phantom/DRN4PhantomEnums.cs @@ -20,7 +20,7 @@ public enum AID : uint CreepingMiasmaRest = 22438, // BozjanPhantom->self, 1.0s cast, range 50 width 12 rect MaledictionOfAgony = 22447, // Boss->self, 4.0s cast, range 70 circle Summon = 22443, // Boss->self, 3.0s cast, single-target, visual (go untargetable and spawn adds) - UndyingHatred = 22444, // StuffyWraith->self, 6.0s cast, range 60 width 48 rect + UndyingHatred = 22444, // StuffyWraith->self, 6.0s cast, range 60 width 48 rect knockback Transference = 22445, // Boss->location, no cast, single-target, teleport VileWave = 22449, // Boss->self, 6.0s cast, range 45 120-degree cone } diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN4Phantom/DRN4PhantomStates.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN4Phantom/DRN4PhantomStates.cs index 2e7f0efeb6..e900539c75 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN4Phantom/DRN4PhantomStates.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN4Phantom/DRN4PhantomStates.cs @@ -4,6 +4,7 @@ class DRN4PhantomStates : StateMachineBuilder public DRN4PhantomStates(BossModule module) : base(module) { TrivialPhase() + .ActivateOnEnter() .ActivateOnEnter(); } } \ No newline at end of file diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN6Queen/DRN6QueenStates.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN6Queen/DRN6QueenStates.cs index 5fbd6257e4..6f843694e0 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN6Queen/DRN6QueenStates.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/Normal/DRN6Queen/DRN6QueenStates.cs @@ -12,8 +12,9 @@ public DRN6QueenStates(BossModule module) : base(module) .ActivateOnEnter() .ActivateOnEnter() .ActivateOnEnter() - .ActivateOnEnter() - .ActivateOnEnter() + //.ActivateOnEnter() + //.ActivateOnEnter() + //.ActivateOnEnter() .ActivateOnEnter() .ActivateOnEnter() .ActivateOnEnter();