Merge pull request #746 from Xian55/fix/720

Xian55 · web-flow · commit daa055ad3c3a · 2026-02-03T00:12:29.000+01:00
Addon: [1.9.3] - Fix dead soft target blocking combat with body-pulled mobs (#720)
diff --git a/Addons/DataToColor/DataToColor.lua b/Addons/DataToColor/DataToColor.lua
@@ -5,7 +5,7 @@
 -- Trigger between emitting game data and frame location data
 local SETUP_SEQUENCE = false
 -- Total number of data frames generated
-local NUMBER_OF_FRAMES = 111
+local NUMBER_OF_FRAMES = 112
 -- Set number of pixel rows
 local FRAME_ROWS = 1
 -- Size of data squares in px. Varies based on rounding errors as well as dimension size. Use as a guideline, but not 100% accurate.
@@ -212,6 +212,7 @@ DataToColor.gcdExpirationTime = 0
 
 DataToColor.lastAutoShot = 0
 DataToColor.lastMainHandMeleeSwing = 0
+DataToColor.lastDamageDoneTime = 0
 DataToColor.lastCastEvent = 0
 DataToColor.lastCastSpellId = 0
 DataToColor.lastCastGCD = 0
@@ -938,15 +939,6 @@ function DataToColor:CreateFrames()
 
             Pixel(int, DataToColor.talentQueue:shift(globalTick) or 0, 72)
 
-            -- Key bindings queue (slot 106)
-            Pixel(int, DataToColor.bindingQueue:shift(globalTick) or 0, 106)
-
-            -- Action bar texture queue (slot 107)
-            Pixel(int, DataToColor.actionBarTextureQueue:shift(globalTick) or 0, 107)
-
-            -- Action bar macro queue (slot 108)
-            Pixel(int, DataToColor.actionBarMacroQueue:shift(globalTick) or 0, 108)
-
             local gossipNum = DataToColor.gossipQueue:shift(globalTick)
             if gossipNum then
                 --DataToColor:Print("gossipQueue: ", gossipNum)
@@ -1146,6 +1138,18 @@ function DataToColor:CreateFrames()
                 Pixel(int, 0, 105)
             end
 
+
+            -- Key bindings queue (slot 106)
+            Pixel(int, DataToColor.bindingQueue:shift(globalTick) or 0, 106)
+
+            -- Action bar texture queue (slot 107)
+            Pixel(int, DataToColor.actionBarTextureQueue:shift(globalTick) or 0, 107)
+
+            -- Action bar macro queue (slot 108)
+            Pixel(int, DataToColor.actionBarMacroQueue:shift(globalTick) or 0, 108)
+
+            Pixel(int, DataToColor.lastDamageDoneTime, 109)
+
             UpdateGlobalTime()
             -- NUMBER_OF_FRAMES - 1 reserved for validation
 
diff --git a/Addons/DataToColor/DataToColor.toc b/Addons/DataToColor/DataToColor.toc
@@ -2,7 +2,7 @@
 ## Title: DataToColor
 ## Author: FreeHongKongMMO
 ## Notes: Displays data as colors (Legacy Cataclysm 4.3.0)
-## Version: 1.9.2
+## Version: 1.9.3
 ## RequiredDeps:
 ## OptionalDeps: Ace3, LibRangeCheck, cTimerBackport
 ## SavedVariables:
diff --git a/Addons/DataToColor/DataToColor_Classic.toc b/Addons/DataToColor/DataToColor_Classic.toc
@@ -2,7 +2,7 @@
 ## Title: DataToColor
 ## Author: FreeHongKongMMO
 ## Notes: Displays data as colors (Classic)
-## Version: 1.9.2
+## Version: 1.9.3
 ## RequiredDeps:
 ## OptionalDeps: Ace3, LibRangeCheck, LibClassicCasterino
 ## SavedVariables:
diff --git a/Addons/DataToColor/DataToColor_TBC.toc b/Addons/DataToColor/DataToColor_TBC.toc
@@ -2,7 +2,7 @@
 ## Title: DataToColor
 ## Author: FreeHongKongMMO
 ## Notes: Displays data as colors (Classic TBC)
-## Version: 1.9.2
+## Version: 1.9.3
 ## RequiredDeps:
 ## OptionalDeps: Ace3, LibRangeCheck, LibClassicCasterino
 ## SavedVariables:
diff --git a/Addons/DataToColor/EventHandlers.lua b/Addons/DataToColor/EventHandlers.lua
@@ -471,6 +471,7 @@ function DataToColor:OnCombatEvent(...)
             end
 
             DataToColor.CombatDamageDoneQueue:push(DataToColor:getGuidFromUUID(destGUID))
+            DataToColor.lastDamageDoneTime = DataToColor.globalTime
 
             if playerDamageMiss[subEvent] then
                 local missType = select(-2, ...)
diff --git a/Addons/DataToColor/SetupDefaultBindings.lua b/Addons/DataToColor/SetupDefaultBindings.lua
@@ -342,6 +342,9 @@ function DataToColor:SetEssentialBindings()
   wasChanged = TryBind("ALT-HOME", "INTERACTTARGET") or wasChanged
   wasChanged = TryBind("ALT-END", "INTERACTMOUSEOVER") or wasChanged
 
+  -- Combat: Start attack (bypasses soft target interaction)
+  wasChanged = TryBind("ALT-NUMPADPLUS", "STARTATTACK") or wasChanged
+
   -- Pet keys (only meaningful for pet classes)
   wasChanged = TryBind("NUMPADMULTIPLY",  "TARGETPET") or wasChanged
   wasChanged = TryBind("NUMPADMINUS",  "PETATTACK") or wasChanged
diff --git a/Core/Addon/PlayerReader.cs b/Core/Addon/PlayerReader.cs
@@ -308,4 +308,22 @@ public void Reset()
 
         GCD.Reset();
     }
+
+    public bool IsMeleeSwingingDefault() => IsMeleeSwinging(500);
+
+    public bool IsMeleeSwinging(int extraMarginMs)
+    {
+        // Only relevant when in melee range
+        if (!IsInMeleeRange())
+            return false;
+
+        // Check if swing timer shows recent activity
+        int swingSpeed = MainHandSpeedMs();
+        int elapsed = MainHandSwing.ElapsedMs();
+
+        // Buffer: swing speed + network latency + 250ms margin
+        int maxExpectedElapsed = swingSpeed + NetworkLatency + extraMarginMs;
+
+        return elapsed < maxExpectedElapsed;
+    }
 }
diff --git a/Core/AddonComponent/AddonBits.cs b/Core/AddonComponent/AddonBits.cs
@@ -110,6 +110,9 @@ public void Update(IAddonDataProvider reader)
 
     public bool SoftInteract_Enabled() => v3[Mask._10];
 
+    public bool SoftInteract_CombatBlocker() =>
+        SoftInteract() && (SoftInteract_Dead() || SoftInteract_Tagged());
+
     public bool MailFrameShown() => v3[Mask._11];
 
     public bool NotMailFrameShown() => !MailFrameShown();
diff --git a/Core/AddonComponent/CombatLog.cs b/Core/AddonComponent/CombatLog.cs
@@ -33,6 +33,8 @@ public sealed class CombatLog : IReader
     public RecordInt TargetMissType { get; }
     public RecordInt TargetDodge { get; }
 
+    public RecordInt LastDamageDoneTime { get; }
+
     public CombatLog(AddonBits bits)
     {
         this.bits = bits;
@@ -41,6 +43,8 @@ public CombatLog(AddonBits bits)
         DamageTakenGuid = new RecordInt(65);
         DeadGuid = new RecordInt(66);
 
+        LastDamageDoneTime = new(109);
+
         TargetMissType = new(67);
         TargetDodge = new(67);
     }
@@ -56,6 +60,8 @@ public void Reset()
         DamageTakenGuid.Reset();
         DeadGuid.Reset();
 
+        LastDamageDoneTime.Reset();
+
         TargetMissType.Reset();
         TargetDodge.Reset();
     }
@@ -64,6 +70,8 @@ public void Update(IAddonDataProvider reader)
     {
         bool combat = bits.Combat();
 
+        LastDamageDoneTime.Update(reader);
+
         if (combat && DamageTakenGuid.Updated(reader) && DamageTakenGuid.Value > 0)
         {
             DamageTaken.Add(DamageTakenGuid.Value);
diff --git a/Core/ClassConfig/ClassConfigurationBaseActions.cs b/Core/ClassConfig/ClassConfigurationBaseActions.cs
@@ -41,9 +41,9 @@ public sealed partial class ClassConfiguration
     public KeyAction AutoAttack { get; } = new()
     {
         Name = nameof(AutoAttack),
-        BindingID = BindingID.INTERACTTARGET,
+        BindingID = BindingID.STARTATTACK,
         BaseAction = true,
-        Requirement = "!AutoAttacking && !SoftTargetDead"
+        Requirement = "!AutoAttacking && !MeleeSwinging"
     };
 
     public KeyAction TargetLastTarget { get; } = new()
@@ -133,4 +133,18 @@ public sealed partial class ClassConfiguration
         BaseAction = true,
         Cooldown = 6000,
     };
+
+    public KeyAction StrafeLeft { get; } = new()
+    {
+        Name = nameof(StrafeLeft),
+        BindingID = BindingID.STRAFELEFT,
+        BaseAction = true,
+    };
+
+    public KeyAction StrafeRight { get; } = new()
+    {
+        Name = nameof(StrafeRight),
+        BindingID = BindingID.STRAFERIGHT,
+        BaseAction = true,
+    };
 }
diff --git a/Core/ClassConfig/KeyBindingDefaults.cs b/Core/ClassConfig/KeyBindingDefaults.cs
@@ -48,6 +48,7 @@ public static class KeyBindingDefaults
         // ALT-PAGEUP: TARGETFOCUS (TBC+) or TARGETPARTYMEMBER1 (Vanilla) - version dependent, modifiers come from runtime
 
         // ===== Combat =====
+        { BindingID.STARTATTACK, new(BindingID.STARTATTACK, "Add",      ConsoleKey.Add,      "NUMPADPLUS",  107) },
         { BindingID.PETATTACK,   new(BindingID.PETATTACK,   "Subtract", ConsoleKey.Subtract, "NUMPADMINUS", 109) },
 
         // ===== Interaction (ALT-HOME/ALT-END - modifiers come from runtime) =====
@@ -182,6 +183,7 @@ public static class KeyBindingDefaults
         // ALT-PAGEUP: TARGETFOCUS (TBC+) or TARGETPARTYMEMBER1 (Vanilla) - version dependent
 
         // Combat
+        { "Add", BindingID.STARTATTACK },
         { "Subtract", BindingID.PETATTACK },
 
         // Interaction (ALT-HOME/ALT-END)
diff --git a/Core/GOAP/GoapAgent.cs b/Core/GOAP/GoapAgent.cs
@@ -226,6 +226,8 @@ private void GoapThread()
             else if (!wasEmpty)
             {
                 LogNewEmptyGoal(logger);
+                CurrentGoal?.OnExit();
+                CurrentGoal = null;
                 wasEmpty = true;
             }
 
diff --git a/Core/Goals/CombatGoal.cs b/Core/Goals/CombatGoal.cs
@@ -7,6 +7,8 @@
 using System;
 using System.Numerics;
 
+using static System.MathF;
+
 namespace Core.Goals;
 
 public sealed class CombatGoal : GoapGoal, IGoapEventListener
@@ -109,7 +111,7 @@ public override void Update()
     {
         wait.Update();
 
-        if (MathF.Abs(lastDirection - playerReader.Direction) > MathF.PI / 2)
+        if (Abs(lastDirection - playerReader.Direction) > PI / 2)
         {
             logger.LogInformation("Turning too fast!");
             stopMoving.Stop();
@@ -125,6 +127,11 @@ public override void Update()
             return;
         }
 
+        if (bits.SoftInteract_Enabled())
+        {
+            UnstuckDeadSoftTargetLock();
+        }
+
         if (classConfig.AutoPetAttack &&
             bits.Pet() &&
             (!playerReader.PetTarget() || playerReader.PetTargetGuid != playerReader.TargetGuid) &&
@@ -151,11 +158,6 @@ public override void Update()
             }
         }
 
-        if (bits.SoftInteract_Enabled())
-        {
-            DealWithSoftInteract();
-        }
-
         if (!bits.Target() || (bits.Target() && bits.Target_Dead()))
         {
             logger.LogInformation("Lost target!");
@@ -213,78 +215,88 @@ private void FindPossibleThreats()
 
         if (bits.Target() && !bits.Target_Dead() && bits.Target_Hostile())
         {
-            if (bits.Target_Combat() && bits.TargetTarget_PlayerOrPet())
+            if (!bits.Target_Combat())
+            {
+                logger.LogWarning("Dont pull non-hostile target!");
+                input.PressClearTarget();
+                wait.Update();
+                return;
+            }
+
+            if (bits.TargetTarget_PlayerOrPet() || combatLog.DamageTaken.Contains(playerReader.TargetGuid))
             {
                 ResetCooldowns();
 
                 logger.LogWarning("Found new target!");
                 wait.Update();
                 return;
             }
-
-            logger.LogWarning("Dont pull non-hostile target!");
-            input.PressClearTarget();
-            wait.Update();
         }
 
-        logger.LogWarning($"Waiting for target to exists or lose combat. Possible threats {combatLog.DamageTakenCount()}!");
-        wait.Till(CastingHandler.GCD * 2,
-            () => bits.Target_Alive() || !bits.Combat());
+        logger.LogWarning($"Possible threats {combatLog.DamageTakenCount()}!");
+
+        if (bits.SoftInteract_Enabled())
+        {
+            UnstuckDeadSoftTargetLock();
+        }
     }
 
     private Vector3 GetCorpseLocation(float distance)
     {
         return PointEstimator.GetMapPos(playerReader.WorldMapArea, playerReader.WorldPos, playerReader.Direction, distance);
     }
 
-    private void DealWithSoftInteract()
+    private void UnstuckDeadSoftTargetLock()
     {
-        if (!playerReader.IsInMeleeRange() ||
-            playerReader.IsCasting() ||
-            !InvalidSoftInteractExists() ||
-            playerReader.TargetGuid == playerReader.SoftInteract_Guid)
+        if (!bits.SoftInteract() ||
+            !bits.SoftInteract_Dead() ||
+            !bits.Auto_Attack() ||
+            combatLog.LastDamageDoneTime.ElapsedMs() < playerReader.MainHandSpeedMs() * 2 ||
+            combatLog.DamageTakenCount() == 0)
         {
             return;
         }
 
-        // TODO: have to find a better way to deal with this
-        return;
+        logger.LogWarning("Turn away from dead softTarget due locking current target interaction!");
+
+        float startDirection = playerReader.Direction;
+        float totalRotation = 0f;
 
-        ConsoleKey key = Random.Shared.Next(2) == 0
+        ConsoleKey turnKey = Random.Shared.Next(2) == 0
             ? input.TurnLeftKey
             : input.TurnRightKey;
 
-        logger.LogWarning($"Invalid SoftInteract Detected Turn away({key}) then face target!");
+        input.SetKeyState(turnKey, true, false);
 
-        input.SetKeyState(key, true, false);
-        while (InvalidSoftInteractExists())
+        while (bits.SoftInteract() && bits.SoftInteract_Dead())
         {
             wait.Update();
-        }
-        input.SetKeyState(key, false, false);
-        wait.Fixed(playerReader.DoubleNetworkLatency);
-        wait.Update();
 
-        if (bits.Target() && !InvalidSoftInteractExists())
-        {
-            input.PressFastInteract();
+            float currentDirection = playerReader.Direction;
+            float delta = Abs(currentDirection - startDirection);
+            if (delta > PI)
+                delta = Tau - delta;
 
-            const int updateCount = 2;
-            float e = wait.AfterEquals(playerReader.SpellQueueTimeMs,
-                updateCount, playerReader._Direction);
+            totalRotation = delta;
 
-            stopMoving.StopForward();
+            // Safety: if we've turned nearly 360°, soft target is everywhere - strafe instead
+            if (totalRotation >= Tau - 0.2f)
+            {
+                input.SetKeyState(turnKey, false, false);
+                logger.LogWarning("Full rotation without clearing soft target - strafe!");
+
+                KeyAction strafeAction = Random.Shared.Next(2) == 0
+                    ? input.StrafeLeft
+                    : input.StrafeRight;
+
+                input.PressFixed(strafeAction.ConsoleKey, 500, default);
+                wait.Update();
+
+                return;
+            }
         }
-    }
 
-    private bool InvalidSoftInteractExists()
-    {
-        return
-            bits.SoftInteract() &&
-            (
-            playerReader.SoftInteract_Type != GuidType.Creature ||
-            bits.SoftInteract_Dead() ||
-            bits.SoftInteract_Tagged()
-            );
+        input.SetKeyState(turnKey, false, false);
+        logger.LogInformation($"Cleared dead soft target after {totalRotation * 180f / PI:F0}° turn");
     }
 }
diff --git a/Core/GoalsComponent/ReactCastError.cs b/Core/GoalsComponent/ReactCastError.cs
diff --git a/Core/Input/ConfigurableInputClassConfig.cs b/Core/Input/ConfigurableInputClassConfig.cs
diff --git a/Core/Requirement/RequirementFactory.cs b/Core/Requirement/RequirementFactory.cs

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ public sealed class CombatLog : IReader`
`33`	`33`	`public RecordInt TargetMissType { get; }`
`34`	`34`	`public RecordInt TargetDodge { get; }`
`35`	`35`
	`36`	`+ public RecordInt LastDamageDoneTime { get; }`
	`37`	`+`
`36`	`38`	`public CombatLog(AddonBits bits)`
`37`	`39`	`{`
`38`	`40`	`this.bits = bits;`
`@@ -41,6 +43,8 @@ public CombatLog(AddonBits bits)`
`41`	`43`	`DamageTakenGuid = new RecordInt(65);`
`42`	`44`	`DeadGuid = new RecordInt(66);`
`43`	`45`
	`46`	`+ LastDamageDoneTime = new(109);`
	`47`	`+`
`44`	`48`	`TargetMissType = new(67);`
`45`	`49`	`TargetDodge = new(67);`
`46`	`50`	`}`
`@@ -56,6 +60,8 @@ public void Reset()`
`56`	`60`	`DamageTakenGuid.Reset();`
`57`	`61`	`DeadGuid.Reset();`
`58`	`62`
	`63`	`+ LastDamageDoneTime.Reset();`
	`64`	`+`
`59`	`65`	`TargetMissType.Reset();`
`60`	`66`	`TargetDodge.Reset();`
`61`	`67`	`}`
`@@ -64,6 +70,8 @@ public void Update(IAddonDataProvider reader)`
`64`	`70`	`{`
`65`	`71`	`bool combat = bits.Combat();`
`66`	`72`
	`73`	`+ LastDamageDoneTime.Update(reader);`
	`74`	`+`
`67`	`75`	`if (combat && DamageTakenGuid.Updated(reader) && DamageTakenGuid.Value > 0)`
`68`	`76`	`{`
`69`	`77`	`DamageTaken.Add(DamageTakenGuid.Value);`