Merge pull request #122 from FFXIV-CombatReborn/mergeWIP2

sync with vbm 0.0.0.160

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}");
 

BossMod/Debug/MainDebugWindow.cs

@@ -70,7 +70,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"))
         {

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)

BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D111Albion.cs

@@ -44,8 +44,8 @@ class WildlifeCrossing(BossModule module) : Components.GenericAOEs(module)
     private static readonly Angle Rot90 = 90.Degrees();
     private static readonly Angle RotM90 = -90.Degrees();
 
-    private Stampede stampede1 = Stampede.Default;
-    private Stampede stampede2 = Stampede.Default;
+    private Stampede stampede1;
+    private Stampede stampede2;
 
     private static readonly (WPos, Angle)[] stampedePositions = [(new(4, -759), Rot90),
         (new(44, -759), RotM90), (new(4, -749), Rot90), (new(44, -749), RotM90),
@@ -151,15 +151,12 @@ private void UpdateStampedeCount(ref Stampede stampede, float casterZ)
     }
 }
 
-struct Stampede(bool active, WPos position, Angle rotation)
+record struct Stampede(bool Active, WPos Position, Angle Rotation)
 {
-    public bool Active = active;
-    public WPos Position = position;
-    public Angle Rotation = rotation;
     public int Count = 0;
     public DateTime Reset = default;
     public List<Actor> Beasts = [];
-    public static readonly Stampede Default = new(false, new WPos(), new Angle());
+    public static readonly Stampede Default = new(false, default, default);
 }
 
 class IcyThroes(BossModule module) : Components.GenericBaitAway(module)

BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D113Cagnazzo.cs

@@ -66,7 +66,16 @@ class Voidcleaver(BossModule module) : Components.RaidwideCast(module, ActionID.
 class Lifescleaver(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Lifescleaver2), new AOEShapeCone(50, 15.Degrees()));
 class Tsunami(BossModule module) : Components.RaidwideAfterNPCYell(module, ActionID.MakeSpell(AID.Tsunami), (uint)NPCYell.LimitBreakStart, 4.5f);
 class StygianDeluge(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.StygianDeluge));
-class Antediluvian(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Antediluvian2), new AOEShapeCircle(15));
+class Antediluvian(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.Antediluvian2), new AOEShapeCircle(15))
+{
+    public override void OnCastFinished(Actor caster, ActorCastInfo spell)
+    {
+        base.OnCastFinished(caster, spell);
+        if (NumCasts == 6 && (AID)spell.Action.ID == AID.Antediluvian2)
+            NumCasts = 0;
+    }
+}
+
 class BodySlam(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.BodySlam3), new AOEShapeCircle(8));
 class BodySlamKB(BossModule module) : Components.KnockbackFromCastTarget(module, ActionID.MakeSpell(AID.BodySlam2), 10)
 {

BossMod/Util/Hook.cs

@@ -25,6 +25,7 @@ public bool Enabled
     public HookAddress(Address address, T detour, bool autoEnable = true) : this(address.Value, detour, autoEnable) { }
     public HookAddress(nint address, T detour, bool autoEnable = true)
     {
+        Service.Log($"Hooking {typeof(T)} @ 0x{address:X}");
         _hook = Service.Hook.HookFromAddress(address, detour);
         if (autoEnable)
             _hook.Enable();