DRS renumbering to add space for duel.

FFXIV-CombatReborn · Apr 1, 2024 · 3c4bb48 · 3c4bb48
1 parent 9f852bc
commit 3c4bb48
Show file tree

Hide file tree

Showing 48 changed files with 74 additions and 75 deletions.
diff --git a/...rs/Foray/DelubrumReginae/DRS2Dahu/DRS2.cs → ...rs/Foray/DelubrumReginae/DRS3Dahu/DRS3.cs b/...rs/Foray/DelubrumReginae/DRS2Dahu/DRS2.cs → ...rs/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/...ray/DelubrumReginae/DRS2Dahu/DRS2Enums.cs → ...ray/DelubrumReginae/DRS3Dahu/DRS3Enums.cs b/...ray/DelubrumReginae/DRS2Dahu/DRS2Enums.cs → ...ray/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/...ay/DelubrumReginae/DRS2Dahu/DRS2States.cs → ...ay/DelubrumReginae/DRS3Dahu/DRS3States.cs b/...ay/DelubrumReginae/DRS2Dahu/DRS2States.cs → ...ay/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/...inae/DRS2Dahu/FeralHowlHystericAssault.cs → ...inae/DRS3Dahu/FeralHowlHystericAssault.cs b/...inae/DRS2Dahu/FeralHowlHystericAssault.cs → ...inae/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/...umReginae/DRS2Dahu/FirebreatheRotating.cs → ...umReginae/DRS3Dahu/FirebreatheRotating.cs b/...umReginae/DRS2Dahu/FirebreatheRotating.cs → ...umReginae/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/...ray/DelubrumReginae/DRS2Dahu/Shockwave.cs → ...ray/DelubrumReginae/DRS3Dahu/Shockwave.cs b/...ray/DelubrumReginae/DRS2Dahu/Shockwave.cs → ...ray/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/...ray/DelubrumReginae/DRS2Dahu/SpitFlame.cs → ...ray/DelubrumReginae/DRS3Dahu/SpitFlame.cs b/...ray/DelubrumReginae/DRS2Dahu/SpitFlame.cs → ...ray/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/...brumReginae/DRS3QueensGuard/AboveBoard.cs → ...brumReginae/DRS4QueensGuard/AboveBoard.cs b/...brumReginae/DRS3QueensGuard/AboveBoard.cs → ...brumReginae/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/...brumReginae/DRS3QueensGuard/CoatOfArms.cs → ...brumReginae/DRS4QueensGuard/CoatOfArms.cs b/...brumReginae/DRS3QueensGuard/CoatOfArms.cs → ...brumReginae/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/...y/DelubrumReginae/DRS3QueensGuard/DRS3.cs → ...y/DelubrumReginae/DRS4QueensGuard/DRS4.cs b/...y/DelubrumReginae/DRS3QueensGuard/DRS3.cs → ...y/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<Actor> _warrior;
     private IReadOnlyList<Actor> _soldier;
@@ -62,7 +62,7 @@ public class DRS3 : BossModule
     public IReadOnlyList<Actor> AuraSpheres;
     public IReadOnlyList<Actor> 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/...ubrumReginae/DRS3QueensGuard/DRS3Enums.cs → ...ubrumReginae/DRS4QueensGuard/DRS4Enums.cs b/...ubrumReginae/DRS3QueensGuard/DRS3Enums.cs → ...ubrumReginae/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/...brumReginae/DRS3QueensGuard/DRS3States.cs → ...brumReginae/DRS4QueensGuard/DRS4States.cs b/...brumReginae/DRS3QueensGuard/DRS3States.cs → ...brumReginae/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/...eginae/DRS3QueensGuard/GreatBallOfFire.cs → ...eginae/DRS4QueensGuard/GreatBallOfFire.cs b/...eginae/DRS3QueensGuard/GreatBallOfFire.cs → ...eginae/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/...ginae/DRS3QueensGuard/OptimalOffensive.cs → ...ginae/DRS4QueensGuard/OptimalOffensive.cs b/...ginae/DRS3QueensGuard/OptimalOffensive.cs → ...ginae/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/...S3QueensGuard/SpellforgeSteelstingHint.cs → ...S4QueensGuard/SpellforgeSteelstingHint.cs b/...S3QueensGuard/SpellforgeSteelstingHint.cs → ...S4QueensGuard/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/...mReginae/DRS3QueensGuard/WindsOfWeight.cs → ...mReginae/DRS4QueensGuard/WindsOfWeight.cs b/...mReginae/DRS3QueensGuard/WindsOfWeight.cs → ...mReginae/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/...Foray/DelubrumReginae/DRS4Phantom/DRS4.cs → ...Foray/DelubrumReginae/DRS5Phantom/DRS5.cs b/...Foray/DelubrumReginae/DRS4Phantom/DRS4.cs → ...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/.../DelubrumReginae/DRS4Phantom/DRS4Enums.cs → .../DelubrumReginae/DRS5Phantom/DRS5Enums.cs b/.../DelubrumReginae/DRS4Phantom/DRS4Enums.cs → .../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/...DelubrumReginae/DRS4Phantom/DRS4States.cs → ...DelubrumReginae/DRS5Phantom/DRS5States.cs b/...DelubrumReginae/DRS4Phantom/DRS4States.cs → ...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/...ray/DelubrumReginae/DRS4Phantom/Miasma.cs → ...ray/DelubrumReginae/DRS5Phantom/Miasma.cs b/...ray/DelubrumReginae/DRS4Phantom/Miasma.cs → ...ray/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/...nae/DRS5TrinityAvowed/AllegiantArsenal.cs → ...nae/DRS6TrinityAvowed/AllegiantArsenal.cs b/...nae/DRS5TrinityAvowed/AllegiantArsenal.cs → ...nae/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/...ginae/DRS5TrinityAvowed/BladeOfEntropy.cs → ...ginae/DRS6TrinityAvowed/BladeOfEntropy.cs b/...ginae/DRS5TrinityAvowed/BladeOfEntropy.cs → ...ginae/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/.../DelubrumReginae/DRS5TrinityAvowed/Bow.cs → .../DelubrumReginae/DRS6TrinityAvowed/Bow.cs b/.../DelubrumReginae/DRS5TrinityAvowed/Bow.cs → .../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/...DelubrumReginae/DRS5TrinityAvowed/DRS5.cs → ...DelubrumReginae/DRS6TrinityAvowed/DRS6.cs b/...DelubrumReginae/DRS5TrinityAvowed/DRS5.cs → ...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/...rumReginae/DRS5TrinityAvowed/DRS5Enums.cs → ...rumReginae/DRS6TrinityAvowed/DRS6Enums.cs b/...rumReginae/DRS5TrinityAvowed/DRS5Enums.cs → ...rumReginae/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/...umReginae/DRS5TrinityAvowed/DRS5States.cs → ...umReginae/DRS6TrinityAvowed/DRS6States.cs b/...umReginae/DRS5TrinityAvowed/DRS5States.cs → ...umReginae/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<AllegiantArsenal>();

diff --git a/...elubrumReginae/DRS5TrinityAvowed/Staff.cs → ...elubrumReginae/DRS6TrinityAvowed/Staff.cs b/...elubrumReginae/DRS5TrinityAvowed/Staff.cs → ...elubrumReginae/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/...ginae/DRS5TrinityAvowed/TemperatureAOE.cs → ...ginae/DRS6TrinityAvowed/TemperatureAOE.cs b/...ginae/DRS5TrinityAvowed/TemperatureAOE.cs → ...ginae/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/...inae/DRS6StygimolochLord/AddPhaseArena.cs → ...inae/DRS7StygimolochLord/AddPhaseArena.cs b/...inae/DRS6StygimolochLord/AddPhaseArena.cs → ...inae/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/...ginae/DRS6StygimolochLord/CrushingHoof.cs → ...ginae/DRS7StygimolochLord/CrushingHoof.cs b/...ginae/DRS6StygimolochLord/CrushingHoof.cs → ...ginae/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/...lubrumReginae/DRS6StygimolochLord/DRS6.cs → ...lubrumReginae/DRS7StygimolochLord/DRS7.cs b/...lubrumReginae/DRS6StygimolochLord/DRS6.cs → ...lubrumReginae/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<Actor> _monks;
     private IReadOnlyList<Actor> _ballsEarth;
     private IReadOnlyList<Actor> _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/...mReginae/DRS6StygimolochLord/DRS6Enums.cs → ...mReginae/DRS7StygimolochLord/DRS7Enums.cs b/...mReginae/DRS6StygimolochLord/DRS6Enums.cs → ...mReginae/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/...Reginae/DRS6StygimolochLord/DRS6States.cs → ...Reginae/DRS7StygimolochLord/DRS7States.cs b/...Reginae/DRS6StygimolochLord/DRS6States.cs → ...Reginae/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<RapidBoltsAOE>()

diff --git a/...ginae/DRS6StygimolochLord/FatefulWords.cs → ...ginae/DRS7StygimolochLord/FatefulWords.cs b/...ginae/DRS6StygimolochLord/FatefulWords.cs → ...ginae/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/...Reginae/DRS6StygimolochLord/RapidBolts.cs → ...Reginae/DRS7StygimolochLord/RapidBolts.cs b/...Reginae/DRS6StygimolochLord/RapidBolts.cs → ...Reginae/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/...ginae/DRS6StygimolochLord/ViciousSwipe.cs → ...ginae/DRS7StygimolochLord/ViciousSwipe.cs b/...ginae/DRS6StygimolochLord/ViciousSwipe.cs → ...ginae/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/...y/DelubrumReginae/DRS7Queen/AboveBoard.cs → ...y/DelubrumReginae/DRS8Queen/AboveBoard.cs b/...y/DelubrumReginae/DRS7Queen/AboveBoard.cs → ...y/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/.../Foray/DelubrumReginae/DRS7Queen/Chess.cs → .../Foray/DelubrumReginae/DRS8Queen/Chess.cs b/.../Foray/DelubrumReginae/DRS7Queen/Chess.cs → .../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/...s/Foray/DelubrumReginae/DRS7Queen/DRS7.cs → ...s/Foray/DelubrumReginae/DRS8Queen/DRS8.cs b/...s/Foray/DelubrumReginae/DRS7Queen/DRS7.cs → ...s/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/...ay/DelubrumReginae/DRS7Queen/DRS7Enums.cs → ...ay/DelubrumReginae/DRS8Queen/DRS8Enums.cs b/...ay/DelubrumReginae/DRS7Queen/DRS7Enums.cs → ...ay/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/...y/DelubrumReginae/DRS7Queen/DRS7States.cs → ...y/DelubrumReginae/DRS8Queen/DRS8States.cs b/...y/DelubrumReginae/DRS7Queen/DRS7States.cs → ...y/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<UnluckyLotAetherialSphere>(id + 0x29, 0.5f, comp => comp.NumCasts > 0, "Sphere explosion")
             .DeactivateOnExit<UnluckyLotAetherialSphere>();
         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<JudgmentBlade>()

diff --git a/...ubrumReginae/DRS7Queen/FieryIcyPortent.cs → ...ubrumReginae/DRS8Queen/FieryIcyPortent.cs b/...ubrumReginae/DRS7Queen/FieryIcyPortent.cs → ...ubrumReginae/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/...DelubrumReginae/DRS7Queen/HeavensWrath.cs → ...DelubrumReginae/DRS8Queen/HeavensWrath.cs b/...DelubrumReginae/DRS7Queen/HeavensWrath.cs → ...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/...elubrumReginae/DRS7Queen/JudgmentBlade.cs → ...elubrumReginae/DRS8Queen/JudgmentBlade.cs b/...elubrumReginae/DRS7Queen/JudgmentBlade.cs → ...elubrumReginae/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/...lubrumReginae/DRS7Queen/MaelstromsBolt.cs → ...lubrumReginae/DRS8Queen/MaelstromsBolt.cs b/...lubrumReginae/DRS7Queen/MaelstromsBolt.cs → ...lubrumReginae/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/.../DelubrumReginae/DRS7Queen/TurretsTour.cs → .../DelubrumReginae/DRS8Queen/TurretsTour.cs b/.../DelubrumReginae/DRS7Queen/TurretsTour.cs → .../DelubrumReginae/DRS8Queen/TurretsTour.cs
@@ -1,4 +1,4 @@
-namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS7Queen;
+namespace BossMod.Shadowbringers.Foray.DelubrumReginae.DRS8Queen;
 
 class TurretsTour : Components.GenericAOEs
 {