Merge pull request #630 from lionaneesh/patch-approach-target-goal

Add Approach and Pull Max duration to constants
Xian55 · Dec 3, 2024 · 7e31a1a · 7e31a1a
2 parents 25a63cf + 546b27a
commit 7e31a1a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Core/Goals/ApproachTargetGoal.cs b/Core/Goals/ApproachTargetGoal.cs
@@ -13,6 +13,8 @@ public sealed class ApproachTargetGoal : GoapGoal, IGoapEventListener
 {
     private const bool debug = true;
     private const double STUCK_INTERVAL_MS = 400; // cant be lower than Approach.Cooldown
+    private const double MAX_APPROACH_DURATION_MS = 15_000; // max time to chase to pull
+
 
     public override float Cost => 8f;
 
@@ -166,7 +168,7 @@ private void NonCombatApproach()
             }
         }
 
-        if (ApproachDurationMs > 15_000)
+        if (ApproachDurationMs > MAX_APPROACH_DURATION_MS)
         {
             if (debug)
                 Log("Too long time. Clear Target. Turn away.");
@@ -244,4 +246,4 @@ private void Log(string text)
     {
         logger.LogDebug(text);
     }
-}
+}
diff --git a/Core/Goals/PullTargetGoal.cs b/Core/Goals/PullTargetGoal.cs
@@ -13,7 +13,7 @@ public sealed class PullTargetGoal : GoapGoal, IGoapEventListener
     public override float Cost => 7f;
 
     private const int AcquireTargetTimeMs = 5000;
-
+    private const int MAX_PULL_DURATION = 15_000;
     private readonly ILogger<PullTargetGoal> logger;
     private readonly ConfigurableInput input;
     private readonly ClassConfiguration classConfig;
@@ -144,7 +144,7 @@ public override void Update()
             return;
         }
 
-        if (PullDurationMs > 15_000)
+        if (PullDurationMs > MAX_PULL_DURATION)
         {
             input.PressClearTarget();
             Log("Pull taking too long. Clear target and face away!");
@@ -289,4 +289,4 @@ private void Log(string text)
     {
         logger.LogInformation(text);
     }
-}
+}