From 9d34a584350e925fce8471bed537aa5d0b1fdc05 Mon Sep 17 00:00:00 2001
From: Yunfan Li <lyf_liyunfan@sina.com>
Date: Wed, 1 Jan 2025 20:41:40 +0800
Subject: [PATCH] Improve rpg movement and grind

---
 src/strategy/actions/ChooseTargetActions.cpp | 24 +++++++++++---------
 src/strategy/rpg/NewRpgAction.cpp            |  4 ++--
 src/strategy/rpg/NewRpgAction.h              |  2 +-
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/strategy/actions/ChooseTargetActions.cpp b/src/strategy/actions/ChooseTargetActions.cpp
index cc35180a..bd86740d 100644
--- a/src/strategy/actions/ChooseTargetActions.cpp
+++ b/src/strategy/actions/ChooseTargetActions.cpp
@@ -8,6 +8,7 @@
 #include "ChooseRpgTargetAction.h"
 #include "Event.h"
 #include "LootObjectStack.h"
+#include "NewRpgStrategy.h"
 #include "Playerbots.h"
 #include "PossibleRpgTargetsValue.h"
 #include "PvpTriggers.h"
@@ -35,19 +36,24 @@ bool AttackAnythingAction::isUseful()
 
     if (!AI_VALUE(bool, "can move around"))
         return false;
-
-    if (context->GetValue<TravelTarget*>("travel target")->Get()->isTraveling() &&
-        ChooseRpgTargetAction::isFollowValid(
-            bot, *context->GetValue<TravelTarget*>("travel target")->Get()->getPosition()))  // Bot is traveling
-        return false;
-    // if (bot->IsInCombat()) {
+    
+        
+    // if (context->GetValue<TravelTarget*>("travel target")->Get()->isTraveling() &&
+    //     ChooseRpgTargetAction::isFollowValid(
+    //         bot, *context->GetValue<TravelTarget*>("travel target")->Get()->getPosition()))  // Bot is traveling
     //     return false;
-    // }
+
     Unit* target = GetTarget();
 
     if (!target)
         return false;
 
+    bool rpgGoStatus = botAI->rpgInfo.status == NewRpgStatus::GO_GRIND ||
+                       botAI->rpgInfo.status == NewRpgStatus::GO_INNKEEPER;
+
+    if (rpgGoStatus && bot->GetDistance(target) > 25.0f)
+        return false;
+
     std::string const name = std::string(target->GetName());
     // Check for invalid targets: Dummy, Charge Target, Melee Target, Ranged Target
     if (!name.empty() &&
@@ -59,10 +65,6 @@ bool AttackAnythingAction::isUseful()
         return false;  // Target is one of the disallowed types
     }
 
-    // if (!ChooseRpgTargetAction::isFollowValid(bot, target))                               //Do not grind mobs far
-    // away from master.
-    //     return false;
-
     return true;
 }
 
diff --git a/src/strategy/rpg/NewRpgAction.cpp b/src/strategy/rpg/NewRpgAction.cpp
index ac2c7fb1..478f56fb 100644
--- a/src/strategy/rpg/NewRpgAction.cpp
+++ b/src/strategy/rpg/NewRpgAction.cpp
@@ -44,7 +44,7 @@ bool NewRpgStatusUpdateAction::Execute(Event event)
                 }
             }
             // IDLE -> GO_INNKEEPER
-            else if (bot->GetLevel() >= 6 && roll <= 45)
+            else if (roll <= 45)
             {
                 WorldPosition pos = SelectRandomInnKeeperPos();
                 if (pos != WorldPosition() && bot->GetExactDist(pos) > 50.0f)
@@ -245,7 +245,7 @@ bool NewRpgGoFarAwayPosAction::MoveFarTo(WorldPosition dest)
     while (--attempt)
     {
         float angle = bot->GetAngle(&dest);
-        float delta = (rand_norm() - 0.5) * M_PI * 2;
+        float delta = urand(1, 100) <= 75 ? (rand_norm() - 0.5) * M_PI * 0.5 : (rand_norm() - 0.5) * M_PI * 2;
         angle += delta;
         float dis = rand_norm() * pathFinderDis;
         float dx = x + cos(angle) * dis;
diff --git a/src/strategy/rpg/NewRpgAction.h b/src/strategy/rpg/NewRpgAction.h
index fb293b8e..8e590e7a 100644
--- a/src/strategy/rpg/NewRpgAction.h
+++ b/src/strategy/rpg/NewRpgAction.h
@@ -23,7 +23,7 @@ public:
 protected:
     // const int32 setGrindInterval = 5 * 60 * 1000;
     // const int32 setNpcInterval = 1 * 60 * 1000;
-    const int32 statusNearNpcDuration = 2 * 60 * 1000;
+    const int32 statusNearNpcDuration = 5 * 60 * 1000;
     const int32 statusNearRandomDuration = 2 * 60 * 1000;
     const int32 statusRestDuration = 30 * 1000;
     WorldPosition SelectRandomGrindPos();