Some DRS fixes.

KouGithub2022 · Apr 4, 2024 · 3e73a7f · 3e73a7f
1 parent d1abc5e
commit 3e73a7f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/DRS4States.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS4QueensGuard/DRS4States.cs
@@ -49,7 +49,8 @@ private void Phase2(uint id)
         P2BloodAndBone(id + 0x30000, 4.2f);
         P2GunTurret(id + 0x40000, 10.2f);
         P2DoubleGambit(id + 0x50000, 10.3f);
-        // TODO: raidwides -> tankbusters -> 4th battery -> raidwides -> tankbusters -> enrage
+        P2BloodAndBone(id + 0x60000, 5.7f);
+        // TODO: tankbusters -> 4th battery -> raidwides -> tankbusters -> enrage
         SimpleState(id + 0xFF0000, 100, "???");
     }
 

diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/DRS6States.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS6TrinityAvowed/DRS6States.cs
@@ -61,13 +61,12 @@ private void ForkSwordBowStaff(uint id)
 
     private void ForkStaffBowSword(uint id)
     {
-        // TODO: no idea about timings here
-        Staff1(id, 8);
-        Bow1(id + 0x100000, 8);
-        Sword1(id + 0x200000, 8);
-        Staff2(id + 0x300000, 8);
-        Bow2(id + 0x400000, 8);
-        Sword2(id + 0x500000, 8);
+        Staff1(id, 5.3f);
+        Bow1(id + 0x100000, 8.7f);
+        Sword1(id + 0x200000, 10.4f);
+        Staff2(id + 0x300000, 7.4f);
+        Bow2(id + 0x400000, 9.1f);
+        Sword2(id + 0x500000, 7.9f);
         Enrage(id + 0x600000, 16); // TODO: timing
     }
 

diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/AboveBoard.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/AboveBoard.cs
@@ -51,7 +51,7 @@ public override void OnEventCast(BossModule module, Actor caster, ActorCastEvent
         switch ((AID)spell.Action.ID)
         {
             case AID.LotsCastBigShort:
-            //case AID.LotsCastSmallShort:
+            case AID.LotsCastSmallShort:
                 AdvanceState(State.ShortExplosionsDone);
                 break;
             case AID.LotsCastLong:

diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/DRS8Enums.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS8Queen/DRS8Enums.cs
@@ -96,6 +96,8 @@ public enum AID : uint
     AboveBoard = 23051, // QueensWarrior->self, 6.0s cast, range 60 circle, visual (throw up)
     AboveBoardExtra = 23438, // Helper->self, 6.0s cast, range 60 circle, visual (???)
     LotsCastBigShort = 23433, // AetherialBurst->location, no cast, range 10 circle
+    LotsCastSmallShort = 23053, // AetherialBolt->location, no cast, range 10 circle
+    LotsCastBigLong = 23052, // AetherialBurst->location, no cast, range 10 circle visual
     LotsCastSmallLong = 23432, // AetherialBolt->location, no cast, range 10 circle visual
     LotsCastLong = 23478, // Helper->location, 1.2s cast, range 10 circle
 

diff --git a/BossMod/Replay/ReplayUtils.cs b/BossMod/Replay/ReplayUtils.cs
@@ -4,7 +4,10 @@ public static class ReplayUtils
 {
     public static string ParticipantString(Replay.Participant? p, DateTime t)
     {
-        return p != null ? $"{p.Type} {p.InstanceID:X} ({p.OID:X}) '{p.NameAt(t)}'" : "<none>";
+        if (p == null)
+            return "<none>";
+        var name = p.NameAt(t);
+        return $"{p.Type} {p.InstanceID:X} ({p.OID:X}/{name.id}) '{name.name}'";
     }
 
     public static string ParticipantPosRotString(Replay.Participant? p, DateTime t)