Fix: 684 - AssistFocus - bot doesn't join party1's combat encounter

Core: PullTargetGoal: While AssistFocus is active the enemy might not target the player but the playerfocus.

Core: TargetFocusTargetGoal: When the playerfocus is casting - initiates the pull - the assistant may also engage

Author: Xian55

Core/Goals/PullTargetGoal.cs

@@ -86,9 +86,12 @@ public PullTargetGoal(ILogger<PullTargetGoal> logger, ConfigurableInput input,
             }
         }
 
-        AddPrecondition(GoapKey.targettargetsus, false);
         AddPrecondition(GoapKey.hastarget, true);
         AddPrecondition(GoapKey.targetisalive, true);
+        if (classConfig.Mode != Mode.AssistFocus)
+        {
+            AddPrecondition(GoapKey.targettargetsus, false);
+        }
         AddPrecondition(GoapKey.targethostile, true);
         AddPrecondition(GoapKey.withinpullrange, true);
 

Core/Goals/TargetFocusTargetGoal.cs

@@ -35,8 +35,10 @@ public override bool CanRun()
             return false;
 
         return
-            (bits.FocusTarget_Hostile() && bits.FocusTarget_Combat()) ||
-            !bits.FocusTarget_Hostile();
+            !bits.TargetTarget_PlayerOrPet() &&
+            ((bits.FocusTarget_Hostile() && bits.FocusTarget_Combat()) ||
+            !bits.FocusTarget_Hostile() ||
+            CanPull());
     }
 
     public override void OnEnter()
@@ -47,9 +49,9 @@ public override void OnEnter()
 
     public override void Update()
     {
-        if (bits.FocusTarget_Hostile())
+        if (bits.FocusTarget_Hostile() || playerReader.IsTargetCasting())
         {
-            if (bits.FocusTarget_Combat())
+            if (bits.FocusTarget_Combat() || CanPull())
             {
                 input.PressTargetFocus();
                 input.PressTargetOfTarget();
@@ -73,4 +75,9 @@ public override void OnExit()
             wait.Update();
         }
     }
+
+    private bool CanPull()
+    {
+        return bits.FocusTarget() && playerReader.IsTargetCasting();
+    }
 }