Merge pull request #969 from FFXIV-CombatReborn/mergeWIP2

merge vbm

Author: CarnifexOptimus

BossMod/Autorotation/Standard/xan/AI/Tank.cs

@@ -204,22 +204,25 @@ private bool ShouldRanged(StrategyValues strategy, Actor? primaryTarget)
 
     private void AutoProtect()
     {
-        var threat = Hints.PriorityTargets.FirstOrDefault(x =>
-            // skip all of this for fates mobs, we can't provoke them and probably don't care about this anyway
-            x.Actor.FateID == 0
-            && World.Actors.Find(x.Actor.TargetID) is Actor victim
-            && victim.IsAlly
-            && victim.Class.GetRole() != Role.Tank
+        var threat = Hints.PotentialTargets.TakeWhile(t => t.Priority >= AIHints.Enemy.PriorityInvincible).FirstOrDefault(x =>
+            // fate mobs are immune to provoke and we probably don't care about this anyway
+            x.Actor.FateID == default
+            && World.Party.FindSlot(x.Actor.TargetID) is var slot && slot >= 0
+            && World.Party[slot]!.Class.GetRole() != Role.Tank
         );
         if (threat != null)
         {
-            if (Player.DistanceToHitbox(threat.Actor) > 3)
-                Hints.ActionsToExecute.Push(JobActions.Ranged, threat.Actor, ActionQueue.Priority.VeryHigh);
-            else
-                // in case all mobs are in melee range, but there aren't enough mobs to switch to aoe
-                Hints.ForcedTarget = threat.Actor;
-
+            // provoke works on invincible mobs
             Hints.ActionsToExecute.Push(ActionID.MakeSpell(ClassShared.AID.Provoke), threat.Actor, ActionQueue.Priority.Medium);
+
+            if (threat.Priority > AIHints.Enemy.PriorityInvincible)
+            {
+                if (Player.DistanceToHitbox(threat.Actor) > 3)
+                    Hints.ActionsToExecute.Push(JobActions.Ranged, threat.Actor, ActionQueue.Priority.ManualGCD - 100);
+                else
+                    // in case all mobs are in melee range, but there aren't enough mobs to switch to aoe
+                    Hints.ForcedTarget = threat.Actor;
+            }
         }
 
         foreach (var rw in Raidwides)
@@ -231,7 +234,7 @@ private void AutoProtect()
             }
 
         foreach (var (ally, t) in Tankbusters)
-            if (ally != Player && (t - World.CurrentTime).TotalSeconds < 4)
+            if (ally != Player && (t - World.CurrentTime).TotalSeconds < 4d)
                 Hints.ActionsToExecute.Push(JobActions.AllyMit.ID, ally, ActionQueue.Priority.Low);
     }
 

BossMod/Framework/WorldStateGameSync.cs

@@ -73,7 +73,7 @@ sealed class WorldStateGameSync : IDisposable
 
     private readonly unsafe delegate* unmanaged<ContainerInterface*, float> _calculateMoveSpeedMulti;
 
-    private unsafe delegate void ProcessMapEffectDelegate(byte* data);
+    private unsafe delegate void ProcessMapEffectDelegate(ContentDirector* director, byte* packet);
 
     private readonly Hook<ProcessMapEffectDelegate> _processMapEffect1Hook;
     private readonly Hook<ProcessMapEffectDelegate> _processMapEffect2Hook;
@@ -143,12 +143,15 @@ public unsafe WorldStateGameSync(WorldState ws, ActionManagerEx amex)
         _calculateMoveSpeedMulti = (delegate* unmanaged<ContainerInterface*, float>)Service.SigScanner.ScanText("E8 ?? ?? ?? ?? 44 0F 28 D8 45 0F 57 D2");
         Service.Log($"[WSG] CalculateMovementSpeedMultiplier address = 0x{(nint)_calculateMoveSpeedMulti:X}");
 
-        var processMapEffectAddr = Service.SigScanner.ScanText("E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 4C 8D 47 10 8B D6 48 8D 0D ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 8D 4F 10 E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 4C 8D 47 10 8B D6 48 8D 0D ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 8D 4F 10 E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 48 8D 4F 10 BA");
-        _processMapEffect1Hook = Service.Hook.HookFromAddress<ProcessMapEffectDelegate>(processMapEffectAddr, ProcessMapEffect1Detour);
+        var mapEffectAddrs = Service.SigScanner.ScanAllText("40 55 41 57 48 83 EC ?? 48 83 B9");
+        if (mapEffectAddrs.Length != 3)
+            throw new InvalidOperationException($"expected 3 matches for multi-MapEffect handlers, but got {mapEffectAddrs.Length}");
+
+        _processMapEffect1Hook = Service.Hook.HookFromAddress<ProcessMapEffectDelegate>(mapEffectAddrs[0], ProcessMapEffect1Detour);
         _processMapEffect1Hook.Enable();
-        _processMapEffect2Hook = Service.Hook.HookFromAddress<ProcessMapEffectDelegate>(processMapEffectAddr + 0x40, ProcessMapEffect2Detour);
+        _processMapEffect2Hook = Service.Hook.HookFromAddress<ProcessMapEffectDelegate>(mapEffectAddrs[1], ProcessMapEffect2Detour);
         _processMapEffect2Hook.Enable();
-        _processMapEffect3Hook = Service.Hook.HookFromAddress<ProcessMapEffectDelegate>(processMapEffectAddr + 0x80, ProcessMapEffect3Detour);
+        _processMapEffect3Hook = Service.Hook.HookFromAddress<ProcessMapEffectDelegate>(mapEffectAddrs[2], ProcessMapEffect3Detour);
         _processMapEffect3Hook.Enable();
         Service.Log($"[WSG] MapEffect addresses = 0x{_processMapEffect1Hook.Address:X}, 0x{_processMapEffect2Hook.Address:X}, 0x{_processMapEffect3Hook.Address:X}");
     }
@@ -1026,27 +1029,28 @@ private unsafe void ProcessPacketOpenTreasureDetour(uint playerID, byte* packet)
         return res;
     }
 
-    private unsafe void ProcessMapEffect1Detour(byte* data)
+    private unsafe void ProcessMapEffect1Detour(ContentDirector* director, byte* packet)
     {
-        _processMapEffect1Hook.Original(data);
-        ProcessMapEffect(data, 10, 18);
+        _processMapEffect1Hook.Original(director, packet);
+        ProcessMapEffect(packet, 10, 18);
     }
 
-    private unsafe void ProcessMapEffect2Detour(byte* data)
+    private unsafe void ProcessMapEffect2Detour(ContentDirector* director, byte* packet)
     {
-        _processMapEffect2Hook.Original(data);
-        ProcessMapEffect(data, 18, 34);
+        _processMapEffect2Hook.Original(director, packet);
+        ProcessMapEffect(packet, 18, 34);
     }
 
-    private unsafe void ProcessMapEffect3Detour(byte* data)
+    private unsafe void ProcessMapEffect3Detour(ContentDirector* director, byte* packet)
     {
-        _processMapEffect3Hook.Original(data);
-        ProcessMapEffect(data, 26, 50);
+        _processMapEffect3Hook.Original(director, packet);
+        ProcessMapEffect(packet, 26, 50);
     }
 
     private unsafe void ProcessMapEffect(byte* data, byte offLow, byte offIndex)
     {
-        for (var i = 0; i < *data; ++i)
+        var count = *data;
+        for (var i = 0; i < count; ++i)
         {
             var low = *(ushort*)(data + 2 * i + offLow);
             var high = *(ushort*)(data + 2 * i + 2);

BossMod/Replay/Visualization/IPCList.cs

@@ -45,6 +45,7 @@ protected override NetworkState.IDScrambleFields GetScramble()
         PacketID.ItemInfo,
         PacketID.ContainerInfo
     ];
+    private bool _filterInvert;
 
     public void Draw(UITree tree, DateTime reference)
     {
@@ -59,6 +60,7 @@ public void Draw(UITree tree, DateTime reference)
     public void ClearFilters()
     {
         _filteredPackets.Clear();
+        _filterInvert = false;
         _nodes = null;
     }
 
@@ -70,21 +72,21 @@ private void DrawNodes(UITree tree, List<PacketDecoder.TextNode>? nodes)
             DrawNodes(tree, n.Children);
     }
 
-    private bool FilterOp(NetworkState.OpServerIPC op) => !_filteredPackets.Contains(op.Packet.ID);
+    private bool FilterOp(NetworkState.OpServerIPC op) => _filterInvert ? _filteredPackets.Contains(op.Packet.ID) : !_filteredPackets.Contains(op.Packet.ID);
 
     private void ContextMenu(NetworkState.OpServerIPC op)
     {
         if (ImGui.MenuItem($"Filter out opcode {op.Packet.ID}"))
         {
             _filteredPackets.Add(op.Packet.ID);
+            _filterInvert = false;
             _nodes = null;
         }
         if (ImGui.MenuItem($"Focus opcode {op.Packet.ID}"))
         {
             _filteredPackets.Clear();
-            foreach (var p in Enum.GetValues<PacketID>())
-                _filteredPackets.Add(p);
-            _filteredPackets.Remove(op.Packet.ID);
+            _filteredPackets.Add(op.Packet.ID);
+            _filterInvert = true;
             _nodes = null;
         }
     }