From 3c4bb48ce3154c202a75321530b18fb006538398 Mon Sep 17 00:00:00 2001 From: Andrew Gilewsky Date: Mon, 1 Apr 2024 22:09:29 +0100 Subject: [PATCH] DRS renumbering to add space for duel. --- .../{DRS2Dahu/DRS2.cs => DRS3Dahu/DRS3.cs} | 6 +++--- .../{DRS2Dahu/DRS2Enums.cs => DRS3Dahu/DRS3Enums.cs} | 2 +- .../{DRS2Dahu/DRS2States.cs => DRS3Dahu/DRS3States.cs} | 6 +++--- .../{DRS2Dahu => DRS3Dahu}/FeralHowlHystericAssault.cs | 2 +- .../{DRS2Dahu => DRS3Dahu}/FirebreatheRotating.cs | 2 +- .../DelubrumReginae/{DRS2Dahu => DRS3Dahu}/Shockwave.cs | 2 +- .../DelubrumReginae/{DRS2Dahu => DRS3Dahu}/SpitFlame.cs | 2 +- .../{DRS3QueensGuard => DRS4QueensGuard}/AboveBoard.cs | 2 +- .../{DRS3QueensGuard => DRS4QueensGuard}/CoatOfArms.cs | 2 +- .../{DRS3QueensGuard/DRS3.cs => DRS4QueensGuard/DRS4.cs} | 6 +++--- .../DRS3Enums.cs => DRS4QueensGuard/DRS4Enums.cs} | 2 +- .../DRS3States.cs => DRS4QueensGuard/DRS4States.cs} | 8 ++++---- .../GreatBallOfFire.cs | 2 +- .../OptimalOffensive.cs | 2 +- .../SpellforgeSteelstingHint.cs | 2 +- .../{DRS3QueensGuard => DRS4QueensGuard}/WindsOfWeight.cs | 2 +- .../{DRS4Phantom/DRS4.cs => DRS5Phantom/DRS5.cs} | 6 +++--- .../DRS4Enums.cs => DRS5Phantom/DRS5Enums.cs} | 2 +- .../DRS4States.cs => DRS5Phantom/DRS5States.cs} | 6 +++--- .../{DRS4Phantom => DRS5Phantom}/Miasma.cs | 2 +- .../AllegiantArsenal.cs | 2 +- .../BladeOfEntropy.cs | 2 +- .../{DRS5TrinityAvowed => DRS6TrinityAvowed}/Bow.cs | 2 +- .../DRS5.cs => DRS6TrinityAvowed/DRS6.cs} | 6 +++--- .../DRS5Enums.cs => DRS6TrinityAvowed/DRS6Enums.cs} | 2 +- .../DRS5States.cs => DRS6TrinityAvowed/DRS6States.cs} | 6 +++--- .../{DRS5TrinityAvowed => DRS6TrinityAvowed}/Staff.cs | 2 +- .../TemperatureAOE.cs | 2 +- .../AddPhaseArena.cs | 2 +- .../CrushingHoof.cs | 2 +- .../DRS6.cs => DRS7StygimolochLord/DRS7.cs} | 6 +++--- .../DRS6Enums.cs => DRS7StygimolochLord/DRS7Enums.cs} | 2 +- .../DRS6States.cs => DRS7StygimolochLord/DRS7States.cs} | 6 +++--- .../FatefulWords.cs | 2 +- .../RapidBolts.cs | 2 +- .../ViciousSwipe.cs | 2 +- .../{DRS7Queen => DRS8Queen}/AboveBoard.cs | 2 +- .../DelubrumReginae/{DRS7Queen => DRS8Queen}/Chess.cs | 2 +- .../{DRS7Queen/DRS7.cs => DRS8Queen/DRS8.cs} | 6 +++--- .../{DRS7Queen/DRS7Enums.cs => DRS8Queen/DRS8Enums.cs} | 2 +- .../{DRS7Queen/DRS7States.cs => DRS8Queen/DRS8States.cs} | 7 +++---- .../{DRS7Queen => DRS8Queen}/FieryIcyPortent.cs | 2 +- .../{DRS7Queen => DRS8Queen}/HeavensWrath.cs | 2 +- .../{DRS7Queen => DRS8Queen}/JudgmentBlade.cs | 2 +- .../{DRS7Queen => DRS8Queen}/MaelstromsBolt.cs | 2 +- .../{DRS7Queen => DRS8Queen}/TurretsTour.cs | 2 +- .../{DRS7Queen => DRS8Queen}/UnluckyLotAetherialSphere.cs | 2 +- .../{DRS7Queen => DRS8Queen}/WindsOfWeight.cs | 4 ++-- 48 files changed, 74 insertions(+), 75 deletions(-) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS2Dahu/DRS2.cs => DRS3Dahu/DRS3.cs} (88%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS2Dahu/DRS2Enums.cs => DRS3Dahu/DRS3Enums.cs} (97%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS2Dahu/DRS2States.cs => DRS3Dahu/DRS3States.cs} (97%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS2Dahu => DRS3Dahu}/FeralHowlHystericAssault.cs (94%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS2Dahu => DRS3Dahu}/FirebreatheRotating.cs (94%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS2Dahu => DRS3Dahu}/Shockwave.cs (94%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS2Dahu => DRS3Dahu}/SpitFlame.cs (96%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS3QueensGuard => DRS4QueensGuard}/AboveBoard.cs (98%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS3QueensGuard => DRS4QueensGuard}/CoatOfArms.cs (89%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS3QueensGuard/DRS3.cs => DRS4QueensGuard/DRS4.cs} (94%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS3QueensGuard/DRS3Enums.cs => DRS4QueensGuard/DRS4Enums.cs} (99%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS3QueensGuard/DRS3States.cs => DRS4QueensGuard/DRS4States.cs} (98%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS3QueensGuard => DRS4QueensGuard}/GreatBallOfFire.cs (95%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS3QueensGuard => DRS4QueensGuard}/OptimalOffensive.cs (96%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS3QueensGuard => DRS4QueensGuard}/SpellforgeSteelstingHint.cs (93%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS3QueensGuard => DRS4QueensGuard}/WindsOfWeight.cs (95%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS4Phantom/DRS4.cs => DRS5Phantom/DRS5.cs} (75%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS4Phantom/DRS4Enums.cs => DRS5Phantom/DRS5Enums.cs} (96%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS4Phantom/DRS4States.cs => DRS5Phantom/DRS5States.cs} (95%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS4Phantom => DRS5Phantom}/Miasma.cs (98%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS5TrinityAvowed => DRS6TrinityAvowed}/AllegiantArsenal.cs (97%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS5TrinityAvowed => DRS6TrinityAvowed}/BladeOfEntropy.cs (97%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS5TrinityAvowed => DRS6TrinityAvowed}/Bow.cs (99%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS5TrinityAvowed/DRS5.cs => DRS6TrinityAvowed/DRS6.cs} (88%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS5TrinityAvowed/DRS5Enums.cs => DRS6TrinityAvowed/DRS6Enums.cs} (99%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS5TrinityAvowed/DRS5States.cs => DRS6TrinityAvowed/DRS6States.cs} (98%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS5TrinityAvowed => DRS6TrinityAvowed}/Staff.cs (97%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS5TrinityAvowed => DRS6TrinityAvowed}/TemperatureAOE.cs (97%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS6StygimolochLord => DRS7StygimolochLord}/AddPhaseArena.cs (97%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS6StygimolochLord => DRS7StygimolochLord}/CrushingHoof.cs (92%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS6StygimolochLord/DRS6.cs => DRS7StygimolochLord/DRS7.cs} (92%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS6StygimolochLord/DRS6Enums.cs => DRS7StygimolochLord/DRS7Enums.cs} (98%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS6StygimolochLord/DRS6States.cs => DRS7StygimolochLord/DRS7States.cs} (97%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS6StygimolochLord => DRS7StygimolochLord}/FatefulWords.cs (94%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS6StygimolochLord => DRS7StygimolochLord}/RapidBolts.cs (95%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS6StygimolochLord => DRS7StygimolochLord}/ViciousSwipe.cs (92%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS7Queen => DRS8Queen}/AboveBoard.cs (98%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS7Queen => DRS8Queen}/Chess.cs (99%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS7Queen/DRS7.cs => DRS8Queen/DRS8.cs} (93%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS7Queen/DRS7Enums.cs => DRS8Queen/DRS8Enums.cs} (99%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS7Queen/DRS7States.cs => DRS8Queen/DRS8States.cs} (98%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS7Queen => DRS8Queen}/FieryIcyPortent.cs (91%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS7Queen => DRS8Queen}/HeavensWrath.cs (94%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS7Queen => DRS8Queen}/JudgmentBlade.cs (93%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS7Queen => DRS8Queen}/MaelstromsBolt.cs (93%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS7Queen => DRS8Queen}/TurretsTour.cs (96%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS7Queen => DRS8Queen}/UnluckyLotAetherialSphere.cs (92%) rename BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/{DRS7Queen => DRS8Queen}/WindsOfWeight.cs (90%) diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/DRS2.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/DRS3.cs similarity index 88% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/DRS2.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/DRS3.cs index 63d5d5d81c..b7d7ae6af5 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/DRS2.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/DRS3.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS2Dahu; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS3Dahu; class FallingRock : Components.LocationTargetedAOEs { @@ -31,9 +31,9 @@ class Burn : Components.BaitAwayIcon } [ModuleInfo(GroupType = BossModuleInfo.GroupType.CFC, GroupID = 761, NameID = 9751)] -public class DRS2 : BossModule +public class DRS3 : BossModule { - public DRS2(WorldState ws, Actor primary) : base(ws, primary, new ArenaBoundsCircle(new(82, 138), 30)) { } + public DRS3(WorldState ws, Actor primary) : base(ws, primary, new ArenaBoundsCircle(new(82, 138), 30)) { } protected override void DrawEnemies(int pcSlot, Actor pc) { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/DRS2Enums.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/DRS3Enums.cs similarity index 97% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/DRS2Enums.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/DRS3Enums.cs index 57bf0af40f..0b19db4caa 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/DRS2Enums.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/DRS3Enums.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS2Dahu; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS3Dahu; public enum OID : uint { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/DRS2States.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/DRS3States.cs similarity index 97% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/DRS2States.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/DRS3States.cs index 95887a4273..86b68494c2 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/DRS2States.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/DRS3States.cs @@ -1,8 +1,8 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS2Dahu; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS3Dahu; -class DRS2States : StateMachineBuilder +class DRS3States : StateMachineBuilder { - public DRS2States(BossModule module) : base(module) + public DRS3States(BossModule module) : base(module) { DeathPhase(0, SinglePhase); } diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/FeralHowlHystericAssault.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/FeralHowlHystericAssault.cs similarity index 94% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/FeralHowlHystericAssault.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/FeralHowlHystericAssault.cs index 040a1dfdb4..db1ba0ce2b 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/FeralHowlHystericAssault.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/FeralHowlHystericAssault.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS2Dahu; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS3Dahu; // these two abilities are very similar, only differ by activation delay and action id class FeralHowlHystericAssault : Components.Knockback diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/FirebreatheRotating.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/FirebreatheRotating.cs similarity index 94% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/FirebreatheRotating.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/FirebreatheRotating.cs index 5b3254d744..2f5770d399 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/FirebreatheRotating.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/FirebreatheRotating.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS2Dahu; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS3Dahu; class FirebreatheRotating : Components.GenericRotatingAOE { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/Shockwave.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/Shockwave.cs similarity index 94% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/Shockwave.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/Shockwave.cs index c7e36701a3..473e7d5d2e 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/Shockwave.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/Shockwave.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS2Dahu; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS3Dahu; class Shockwave : Components.GenericAOEs { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/SpitFlame.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/SpitFlame.cs similarity index 96% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/SpitFlame.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/SpitFlame.cs index d6d4e257bc..e60b18938a 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2Dahu/SpitFlame.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3Dahu/SpitFlame.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS2Dahu; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS3Dahu; class SpitFlame : Components.UniformStackSpread { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/AboveBoard.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/AboveBoard.cs similarity index 98% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/AboveBoard.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/AboveBoard.cs index d49392f56b..a7c66845fa 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/AboveBoard.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/AboveBoard.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS3QueensGuard; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS4QueensGuard; class AboveBoard : Components.GenericAOEs { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/CoatOfArms.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/CoatOfArms.cs similarity index 89% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/CoatOfArms.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/CoatOfArms.cs index 30c9fa8806..95ec040bc3 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/CoatOfArms.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/CoatOfArms.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS3QueensGuard; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS4QueensGuard; class CoatOfArms : Components.DirectionalParry { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/DRS3.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/DRS4.cs similarity index 94% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/DRS3.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/DRS4.cs index 5a5dfcec5b..6554f153e7 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/DRS3.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/DRS4.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS3QueensGuard; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS4QueensGuard; class OptimalPlaySword : Components.SelfTargetedAOEs { @@ -48,7 +48,7 @@ public Fracture() : base(ActionID.MakeSpell(AID.Fracture)) { } } [ModuleInfo(PrimaryActorOID = (uint)OID.Knight, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 761, NameID = 9838)] -public class DRS3 : BossModule +public class DRS4 : BossModule { private IReadOnlyList _warrior; private IReadOnlyList _soldier; @@ -62,7 +62,7 @@ public class DRS3 : BossModule public IReadOnlyList AuraSpheres; public IReadOnlyList SpiritualSpheres; - public DRS3(WorldState ws, Actor primary) : base(ws, primary, new ArenaBoundsCircle(new(244, -162), 25)) + public DRS4(WorldState ws, Actor primary) : base(ws, primary, new ArenaBoundsCircle(new(244, -162), 25)) { _warrior = Enemies(OID.Warrior); _soldier = Enemies(OID.Soldier); diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/DRS3Enums.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/DRS4Enums.cs similarity index 99% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/DRS3Enums.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/DRS4Enums.cs index 709076a3df..82baa0001a 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/DRS3Enums.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/DRS4Enums.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS3QueensGuard; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS4QueensGuard; public enum OID : uint { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/DRS3States.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/DRS4States.cs similarity index 98% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/DRS3States.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/DRS4States.cs index 12f7a83cc2..e70e881c9c 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/DRS3States.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/DRS4States.cs @@ -1,10 +1,10 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS3QueensGuard; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS4QueensGuard; -class DRS3States : StateMachineBuilder +class DRS4States : StateMachineBuilder { - DRS3 _module; + DRS4 _module; - public DRS3States(DRS3 module) : base(module) + public DRS4States(DRS4 module) : base(module) { _module = module; SimplePhase(0, Phase0, "P0: 4 guards") diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/GreatBallOfFire.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/GreatBallOfFire.cs similarity index 95% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/GreatBallOfFire.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/GreatBallOfFire.cs index 085820ca06..1950d24108 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/GreatBallOfFire.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/GreatBallOfFire.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS3QueensGuard; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS4QueensGuard; class GreatBallOfFire : Components.GenericAOEs { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/OptimalOffensive.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/OptimalOffensive.cs similarity index 96% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/OptimalOffensive.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/OptimalOffensive.cs index d4049a7eec..62c8cd4e86 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/OptimalOffensive.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/OptimalOffensive.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS3QueensGuard; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS4QueensGuard; class OptimalOffensiveSword : Components.ChargeAOEs { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/SpellforgeSteelstingHint.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/SpellforgeSteelstingHint.cs similarity index 93% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/SpellforgeSteelstingHint.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/SpellforgeSteelstingHint.cs index df49ccfee9..c63d4b31cc 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/SpellforgeSteelstingHint.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/SpellforgeSteelstingHint.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS3QueensGuard; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS4QueensGuard; // TODO: improve hints (check player's class; for healers, hints for party members having incorrect buff) class SpellforgeSteelstingHint : BossComponent diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/WindsOfWeight.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/WindsOfWeight.cs similarity index 95% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/WindsOfWeight.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/WindsOfWeight.cs index f29b45e74e..d0bb595a1a 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS3QueensGuard/WindsOfWeight.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/WindsOfWeight.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS3QueensGuard; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS4QueensGuard; class WindsOfWeight : Components.GenericAOEs { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4Phantom/DRS4.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5Phantom/DRS5.cs similarity index 75% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4Phantom/DRS4.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5Phantom/DRS5.cs index b68461c74e..bb04160e83 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4Phantom/DRS4.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5Phantom/DRS5.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS4Phantom; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS5Phantom; class MaledictionOfAgony : Components.CastCounter { @@ -16,7 +16,7 @@ public MistyWraith() : base((uint)OID.MistyWraith) { } } [ModuleInfo(GroupType = BossModuleInfo.GroupType.CFC, GroupID = 761, NameID = 9755)] -public class DRS4 : BossModule +public class DRS5 : BossModule { - public DRS4(WorldState ws, Actor primary) : base(ws, primary, new ArenaBoundsSquare(new(202, -370), 24)) { } + public DRS5(WorldState ws, Actor primary) : base(ws, primary, new ArenaBoundsSquare(new(202, -370), 24)) { } } diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4Phantom/DRS4Enums.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5Phantom/DRS5Enums.cs similarity index 96% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4Phantom/DRS4Enums.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5Phantom/DRS5Enums.cs index d5660b89ac..412b5712bc 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4Phantom/DRS4Enums.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5Phantom/DRS5Enums.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS4Phantom; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS5Phantom; public enum OID : uint { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4Phantom/DRS4States.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5Phantom/DRS5States.cs similarity index 95% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4Phantom/DRS4States.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5Phantom/DRS5States.cs index a171f236ed..2aa2c9570d 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4Phantom/DRS4States.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5Phantom/DRS5States.cs @@ -1,8 +1,8 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS4Phantom; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS5Phantom; -class DRS4States : StateMachineBuilder +class DRS5States : StateMachineBuilder { - public DRS4States(BossModule module) : base(module) + public DRS5States(BossModule module) : base(module) { DeathPhase(0, SinglePhase); } diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4Phantom/Miasma.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5Phantom/Miasma.cs similarity index 98% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4Phantom/Miasma.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5Phantom/Miasma.cs index 649a161a84..f5b6165359 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4Phantom/Miasma.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5Phantom/Miasma.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS4Phantom; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS5Phantom; // TODO: improve hints, currently they are not good... we probably don't need a fully generic implementation, since there are few possible patterns class Miasma : Components.GenericAOEs diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/AllegiantArsenal.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/AllegiantArsenal.cs similarity index 97% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/AllegiantArsenal.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/AllegiantArsenal.cs index 161eefd40b..a6f372e564 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/AllegiantArsenal.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/AllegiantArsenal.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS5TrinityAvowed; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS6TrinityAvowed; class AllegiantArsenal : Components.GenericAOEs { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/BladeOfEntropy.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/BladeOfEntropy.cs similarity index 97% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/BladeOfEntropy.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/BladeOfEntropy.cs index 2c609133f9..9b3ff49977 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/BladeOfEntropy.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/BladeOfEntropy.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS5TrinityAvowed; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS6TrinityAvowed; // note: instead of trying to figure out cone intersections and shit, we use the fact that clones are always positioned on grid and just check each cell class BladeOfEntropy : TemperatureAOE diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/Bow.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/Bow.cs similarity index 99% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/Bow.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/Bow.cs index f43e4ee38d..906cd5b6f4 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/Bow.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/Bow.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS5TrinityAvowed; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS6TrinityAvowed; // aoe starts at cast and ends with envcontrol; it's not considered 'risky' when paired with quick march class FlamesOfBozja : Components.GenericAOEs diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/DRS5.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/DRS6.cs similarity index 88% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/DRS5.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/DRS6.cs index 2e58bbe0fc..4d46d45178 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/DRS5.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/DRS6.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS5TrinityAvowed; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS6TrinityAvowed; class WrathOfBozja : Components.CastSharedTankbuster { @@ -32,7 +32,7 @@ class GleamingArrow : Components.SelfTargetedAOEs } [ModuleInfo(GroupType = BossModuleInfo.GroupType.CFC, GroupID = 761, NameID = 9853)] -public class DRS5 : BossModule +public class DRS6 : BossModule { - public DRS5(WorldState ws, Actor primary) : base(ws, primary, new ArenaBoundsSquare(new(-272, -82), 25)) { } + public DRS6(WorldState ws, Actor primary) : base(ws, primary, new ArenaBoundsSquare(new(-272, -82), 25)) { } } diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/DRS5Enums.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/DRS6Enums.cs similarity index 99% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/DRS5Enums.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/DRS6Enums.cs index 20b953d5df..72278d6c3d 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/DRS5Enums.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/DRS6Enums.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS5TrinityAvowed; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS6TrinityAvowed; public enum OID : uint { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/DRS5States.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/DRS6States.cs similarity index 98% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/DRS5States.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/DRS6States.cs index 5816004f26..71f99ca944 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/DRS5States.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/DRS6States.cs @@ -1,8 +1,8 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS5TrinityAvowed; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS6TrinityAvowed; -class DRS5States : StateMachineBuilder +class DRS6States : StateMachineBuilder { - public DRS5States(BossModule module) : base(module) + public DRS6States(BossModule module) : base(module) { DeathPhase(0, SinglePhase) .ActivateOnEnter(); diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/Staff.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/Staff.cs similarity index 97% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/Staff.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/Staff.cs index 3cc1315dbd..d9d7c3bd97 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/Staff.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/Staff.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS5TrinityAvowed; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS6TrinityAvowed; class FreedomOfBozja : TemperatureAOE { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/TemperatureAOE.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/TemperatureAOE.cs similarity index 97% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/TemperatureAOE.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/TemperatureAOE.cs index 346d7c1445..c648523d93 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS5TrinityAvowed/TemperatureAOE.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/TemperatureAOE.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS5TrinityAvowed; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS6TrinityAvowed; abstract class TemperatureAOE : Components.GenericAOEs { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/AddPhaseArena.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/AddPhaseArena.cs similarity index 97% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/AddPhaseArena.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/AddPhaseArena.cs index f285867316..5c02857a3e 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/AddPhaseArena.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/AddPhaseArena.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS6StygimolochLord; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7StygimolochLord; class AddPhaseArena : BossComponent { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/CrushingHoof.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/CrushingHoof.cs similarity index 92% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/CrushingHoof.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/CrushingHoof.cs index dbea90351b..b7d9d87dfc 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/CrushingHoof.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/CrushingHoof.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS6StygimolochLord; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7StygimolochLord; class CrushingHoof : Components.GenericAOEs { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/DRS6.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/DRS7.cs similarity index 92% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/DRS6.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/DRS7.cs index 1364709220..13e0b5bde2 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/DRS6.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/DRS7.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS6StygimolochLord; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7StygimolochLord; class FoeSplitter : Components.Cleave { @@ -37,13 +37,13 @@ public Electrocution() : base(ActionID.MakeSpell(AID.Electrocution), 3) { } // TODO: ManaFlame component - show reflect hints [ModuleInfo(GroupType = BossModuleInfo.GroupType.CFC, GroupID = 761, NameID = 9759)] -public class DRS6 : BossModule +public class DRS7 : BossModule { private IReadOnlyList _monks; private IReadOnlyList _ballsEarth; private IReadOnlyList _ballsFire; - public DRS6(WorldState ws, Actor primary) : base(ws, primary, new ArenaBoundsCircle(new(-416, -184), 35)) + public DRS7(WorldState ws, Actor primary) : base(ws, primary, new ArenaBoundsCircle(new(-416, -184), 35)) { _monks = Enemies(OID.StygimolochMonk); _ballsEarth = Enemies(OID.BallOfEarth); diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/DRS6Enums.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/DRS7Enums.cs similarity index 98% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/DRS6Enums.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/DRS7Enums.cs index 16514ef6aa..f2f5d090d7 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/DRS6Enums.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/DRS7Enums.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS6StygimolochLord; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7StygimolochLord; public enum OID : uint { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/DRS6States.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/DRS7States.cs similarity index 97% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/DRS6States.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/DRS7States.cs index 8c9766a26f..7912ce6d7a 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/DRS6States.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/DRS7States.cs @@ -1,8 +1,8 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS6StygimolochLord; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7StygimolochLord; -class DRS6States : StateMachineBuilder +class DRS7States : StateMachineBuilder { - public DRS6States(BossModule module) : base(module) + public DRS7States(BossModule module) : base(module) { SimplePhase(0, PhaseBeforeAdds, "Before adds") .ActivateOnEnter() diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/FatefulWords.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/FatefulWords.cs similarity index 94% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/FatefulWords.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/FatefulWords.cs index cdf371cd8e..afa34ea8ee 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/FatefulWords.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/FatefulWords.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS6StygimolochLord; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7StygimolochLord; class FatefulWords : Components.Knockback { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/RapidBolts.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/RapidBolts.cs similarity index 95% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/RapidBolts.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/RapidBolts.cs index 28ff073859..1492e9f806 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/RapidBolts.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/RapidBolts.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS6StygimolochLord; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7StygimolochLord; // TODO: generalize to 'baited puddles' component class RapidBoltsBait : Components.UniformStackSpread diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/ViciousSwipe.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/ViciousSwipe.cs similarity index 92% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/ViciousSwipe.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/ViciousSwipe.cs index 9020a09314..db04ea9612 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6StygimolochLord/ViciousSwipe.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7StygimolochLord/ViciousSwipe.cs @@ -1,5 +1,5 @@  -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS6StygimolochLord; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7StygimolochLord; class ViciousSwipe : Components.Knockback { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/AboveBoard.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/AboveBoard.cs similarity index 98% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/AboveBoard.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/AboveBoard.cs index 60cd3c7eca..8188ccaef4 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/AboveBoard.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/AboveBoard.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7Queen; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS8Queen; // note: this is exactly the same as queen's guard component class AboveBoard : Components.GenericAOEs diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/Chess.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/Chess.cs similarity index 99% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/Chess.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/Chess.cs index a57967181d..38f3a2833d 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/Chess.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/Chess.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7Queen; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS8Queen; abstract class Chess : Components.GenericAOEs { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/DRS7.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/DRS8.cs similarity index 93% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/DRS7.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/DRS8.cs index 8b928b88f2..265fb0f74f 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/DRS7.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/DRS8.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7Queen; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS8Queen; class NorthswainsGlow : Components.SelfTargetedAOEs { @@ -59,7 +59,7 @@ class OptimalPlayCone : Components.SelfTargetedAOEs } [ModuleInfo(GroupType = BossModuleInfo.GroupType.CFC, GroupID = 761, NameID = 9863)] -public class DRS7 : BossModule +public class DRS8 : BossModule { - public DRS7(WorldState ws, Actor primary) : base(ws, primary, new ArenaBoundsCircle(new(-272, -415), 25)) { } // note: initially arena is square, but it quickly changes to circle + public DRS8(WorldState ws, Actor primary) : base(ws, primary, new ArenaBoundsCircle(new(-272, -415), 25)) { } // note: initially arena is square, but it quickly changes to circle } diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/DRS7Enums.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/DRS8Enums.cs similarity index 99% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/DRS7Enums.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/DRS8Enums.cs index 8c25db839d..602d71b428 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/DRS7Enums.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/DRS8Enums.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7Queen; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS8Queen; public enum OID : uint { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/DRS7States.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/DRS8States.cs similarity index 98% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/DRS7States.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/DRS8States.cs index 1f8c0a0d9a..00be68ca0a 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/DRS7States.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/DRS8States.cs @@ -1,8 +1,8 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7Queen; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS8Queen; -class DRS7States : StateMachineBuilder +class DRS8States : StateMachineBuilder { - public DRS7States(BossModule module) : base(module) + public DRS8States(BossModule module) : base(module) { SimplePhase(0, Phase1, "P1") .Raw.Update = () => Module.PrimaryActor.IsDestroyed || Module.PrimaryActor.HP.Cur <= 1 || (Module.PrimaryActor.CastInfo?.IsSpell(AID.GodsSaveTheQueen) ?? false); @@ -171,7 +171,6 @@ private void RelentlessPlay2(uint id, float delay) ComponentCondition(id + 0x29, 0.5f, comp => comp.NumCasts > 0, "Sphere explosion") .DeactivateOnExit(); ActorCastEnd(id + 0x2A, Module.Enemies(OID.QueensSoldier).FirstOrDefault, 1.7f); - ActorCastEnd(id + 0x2A, Module.Enemies(OID.QueensSoldier).FirstOrDefault, 1.7f); CastMulti(id + 0x30, new[] { AID.JudgmentBladeR, AID.JudgmentBladeL }, 2.2f, 7) .ActivateOnEnter() diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/FieryIcyPortent.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/FieryIcyPortent.cs similarity index 91% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/FieryIcyPortent.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/FieryIcyPortent.cs index a907d4927a..52db6066ce 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/FieryIcyPortent.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/FieryIcyPortent.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7Queen; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS8Queen; class FieryIcyPortent : Components.StayMove { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/HeavensWrath.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/HeavensWrath.cs similarity index 94% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/HeavensWrath.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/HeavensWrath.cs index c5b76f7ff9..fbb377578b 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/HeavensWrath.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/HeavensWrath.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7Queen; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS8Queen; class HeavensWrathAOE : Components.SelfTargetedAOEs { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/JudgmentBlade.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/JudgmentBlade.cs similarity index 93% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/JudgmentBlade.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/JudgmentBlade.cs index 80e579000d..31d91369e8 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/JudgmentBlade.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/JudgmentBlade.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7Queen; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS8Queen; class JudgmentBlade : Components.GenericAOEs { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/MaelstromsBolt.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/MaelstromsBolt.cs similarity index 93% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/MaelstromsBolt.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/MaelstromsBolt.cs index 95e56acfcf..2675458414 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/MaelstromsBolt.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/MaelstromsBolt.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7Queen; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS8Queen; // TODO: show reflect hints, show stay under dome hints class MaelstromsBolt : Components.CastCounter diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/TurretsTour.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/TurretsTour.cs similarity index 96% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/TurretsTour.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/TurretsTour.cs index 5a5edc9eb3..c9d231a4ec 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/TurretsTour.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/TurretsTour.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7Queen; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS8Queen; class TurretsTour : Components.GenericAOEs { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/UnluckyLotAetherialSphere.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/UnluckyLotAetherialSphere.cs similarity index 92% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/UnluckyLotAetherialSphere.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/UnluckyLotAetherialSphere.cs index 2695387665..290c82512e 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/UnluckyLotAetherialSphere.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/UnluckyLotAetherialSphere.cs @@ -1,4 +1,4 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7Queen; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS8Queen; class UnluckyLotAetherialSphere : Components.GenericAOEs { diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/WindsOfWeight.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/WindsOfWeight.cs similarity index 90% rename from BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/WindsOfWeight.cs rename to BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/WindsOfWeight.cs index e38081ed2a..786d95b327 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS7Queen/WindsOfWeight.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/WindsOfWeight.cs @@ -1,6 +1,6 @@ -namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7Queen; +namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS8Queen; -// TODO: this is essentialy copy-paste of DRS3 component, generalize?.. the only different thing is AIDs +// TODO: this is essentialy copy-paste of DRS4 component, generalize?.. the only different thing is AIDs class WindsOfWeight : Components.GenericAOEs { private List _green = new();