Proper duty recorder playback support.

awgil · Jun 6, 2024 · 14d4930 · 14d4930
1 parent 24979d6
commit 14d4930
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/BossMod/Debug/DebugParty.cs b/BossMod/Debug/DebugParty.cs
@@ -34,11 +34,13 @@ public void DrawPartyDalamud()
         ImGui.EndTable();
     }
 
-    public unsafe void DrawPartyCustom()
+    public unsafe void DrawPartyCustom(bool secondary)
     {
         // note: alliance slots, unlike normal slots, are more permanent - if a player leaves, other players retain their indices (leaving gaps)
         // also content ID for all alliance members always seems to be 0; this isn't a huge deal, since alliance members are always in the same zone and thus have valid object IDs
         var gm = GroupManager.Instance();
+        if (secondary)
+            gm += 1;
         var ui = UIState.Instance();
         ImGui.TextUnformatted($"Num members: {gm->MemberCount}, alliance={(!gm->IsAlliance ? "no" : gm->IsSmallGroupAlliance ? "small-group" : "yes")}, has-helpers={ui->Buddy.DutyHelperInfo.HasHelpers}");
 

diff --git a/BossMod/Debug/MainDebugWindow.cs b/BossMod/Debug/MainDebugWindow.cs
@@ -68,7 +68,11 @@ public unsafe override void Draw()
         }
         if (ImGui.CollapsingHeader("Party (custom)"))
         {
-            _debugParty.DrawPartyCustom();
+            _debugParty.DrawPartyCustom(false);
+        }
+        if (ImGui.CollapsingHeader("Party (duty recorder)"))
+        {
+            _debugParty.DrawPartyCustom(true);
         }
         if (ImGui.CollapsingHeader("Autorotation"))
         {

diff --git a/BossMod/Framework/WorldStateGameSync.cs b/BossMod/Framework/WorldStateGameSync.cs
@@ -351,9 +351,24 @@ private unsafe void UpdateParty()
     {
         var gm = GroupManager.Instance();
         var ui = UIState.Instance();
+        var pc = GameObjectManager.Instance()->Objects.IndexSorted[0].Value;
+        var pcContentId = UIState.Instance()->PlayerState.ContentId;
+        var pcEntityId = UIState.Instance()->PlayerState.EntityId;
+        if (Service.Condition[Dalamud.Game.ClientState.Conditions.ConditionFlag.DutyRecorderPlayback])
+        {
+            // when doing replay playback, game uses independent group manager
+            gm += 1;
+            pcEntityId = pc != null ? pc->EntityId : 0;
+            var member = pc != null ? gm->GetPartyMemberByObjectId(pcEntityId) : null;
+            pcContentId = member != null ? member->ContentId : 0;
+        }
+        else if (pc != null && pc->EntityId != pcEntityId)
+        {
+            Service.Log($"[WSG] Player entity id mismatch: {pcEntityId:X} vs {pc->EntityId:X}");
+        }
 
         // update player slot
-        UpdatePartySlot(PartyState.PlayerSlot, UIState.Instance()->PlayerState.ContentId, UIState.Instance()->PlayerState.EntityId);
+        UpdatePartySlot(PartyState.PlayerSlot, pcContentId, pcEntityId);
 
         // update normal party slots: first update/remove existing members, then add new ones
         for (int i = PartyState.PlayerSlot + 1; i < PartyState.MaxPartySize; ++i)