fix merge master conflict

src/strategy/actions/ChangeTalentsAction.cpp

@@ -18,8 +18,6 @@ bool ChangeTalentsAction::Execute(Event event)
 
     std::ostringstream out;
 
-    TalentSpec botSpec(bot);
-
     if (!param.empty())
     {
         if (param.find("help") != std::string::npos)

src/strategy/actions/ChatActionContext.h

@@ -173,6 +173,7 @@ public:
         creators["bwl chat shortcut"] = &ChatActionContext::bwl_chat_shortcut;
         creators["tell expected dps"] = &ChatActionContext::tell_expected_dps;
         creators["join"] = &ChatActionContext::join;
+        creators["calc"] = &ChatActionContext::calc;
     }
 
 private:
@@ -270,6 +271,7 @@ private:
     static Action* bwl_chat_shortcut(PlayerbotAI* ai) { return new BwlChatShortcutAction(ai); }
     static Action* tell_expected_dps(PlayerbotAI* ai) { return new TellExpectedDpsAction(ai); }
     static Action* join(PlayerbotAI* ai) { return new JoinGroupAction(ai); }
+    static Action* calc(PlayerbotAI* ai) { return new TellCalculateItemAction(ai); }
 };
 
 #endif

src/strategy/actions/MovementActions.cpp

@@ -827,15 +827,21 @@ bool MovementAction::ReachCombatTo(Unit* target, float distance)
             ty = target->GetPositionY();
             tz = target->GetPositionZ();
         }
+        // Prediction may cause this, which makes ShortenPathUntilDist fail
+        if (bot->GetExactDist(tx, ty, tz) <= distance)
+        {
+            tx = target->GetPositionX();
+            ty = target->GetPositionY();
+            tz = target->GetPositionZ();
+        }
     }
     if (bot->GetExactDist(tx, ty, tz) <= distance)
-    {
         return false;
-    }
     PathGenerator path(bot);
     path.CalculatePath(tx, ty, tz, false);
     PathType type = path.GetPathType();
-    if (type != PATHFIND_NORMAL && type != PATHFIND_INCOMPLETE)
+    int typeOk = PATHFIND_NORMAL | PATHFIND_INCOMPLETE;
+    if (!(type & typeOk))
         return false;
     path.ShortenPathUntilDist(G3D::Vector3(tx, ty, tz), distance);
     G3D::Vector3 endPos = path.GetPath().back();
@@ -881,7 +887,7 @@ bool MovementAction::IsMovingAllowed(Unit* target)
 
 bool MovementAction::IsMovingAllowed(uint32 mapId, float x, float y, float z)
 {
-    // removed sqrt as means distance limit was effectively 22500 (ReactDistance²)
+    // removed sqrt as means distance limit was effectively 22500 (ReactDistance<EFBFBD>)
     // leaving it commented incase we find ReactDistance limit causes problems
     // float distance = sqrt(bot->GetDistance(x, y, z));
     float distance = bot->GetDistance(x, y, z);
@@ -2351,10 +2357,15 @@ bool MoveRandomAction::Execute(Event event)
         float angle = (float)rand_norm() * static_cast<float>(M_PI);
         x += urand(0, distance) * cos(angle);
         y += urand(0, distance) * sin(angle);
+        float ox = x;
+        float oy = y;
+        float oz = z;
         if (!bot->GetMap()->CheckCollisionAndGetValidCoords(bot, bot->GetPositionX(), bot->GetPositionY(),
                                                             bot->GetPositionZ(), x, y, z))
         {
-            continue;
+            x = ox;
+            y = oy;
+            z = oz;
         }
         if (map->IsInWater(bot->GetPhaseMask(), x, y, z, bot->GetCollisionHeight()))
             continue;

src/strategy/actions/TellLosAction.cpp

@@ -4,10 +4,16 @@
  */
 
 #include "TellLosAction.h"
+#include <istream>
+#include <sstream>
 
 #include "ChatHelper.h"
+#include "DBCStores.h"
 #include "Event.h"
+#include "ItemTemplate.h"
+#include "ObjectMgr.h"
 #include "Playerbots.h"
+#include "StatsWeightCalculator.h"
 #include "World.h"
 
 bool TellLosAction::Execute(Event event)
@@ -130,3 +136,21 @@ bool TellExpectedDpsAction::Execute(Event event)
     botAI->TellMaster("Expected Group DPS: " + std::to_string(dps));
     return true;
 }
+
+bool TellCalculateItemAction::Execute(Event event)
+{
+    std::string const text = event.getParam();
+    ItemIds ids = chat->parseItems(text);
+    StatsWeightCalculator calculator(bot);
+    for (const uint32 &id : ids)
+    {
+        const ItemTemplate* proto = sObjectMgr->GetItemTemplate(id);
+        if (!proto)
+            continue;
+        float score = calculator.CalculateItem(id);
+        std::ostringstream out;
+        out << "Calculated score of " << chat->FormatItem(proto) << " : " << score;
+        botAI->TellMasterNoFacing(out.str());
+    }
+    return true;
+}

src/strategy/actions/TellLosAction.h

@@ -37,4 +37,13 @@ public:
 
     virtual bool Execute(Event event);
 };
+
+class TellCalculateItemAction : public Action
+{
+public:
+    TellCalculateItemAction(PlayerbotAI* ai) : Action(ai, "calculate item") {}
+
+    virtual bool Execute(Event event);
+};
+
 #endif

src/strategy/actions/TradeStatusAction.cpp

@@ -10,8 +10,10 @@
 #include "GuildTaskMgr.h"
 #include "ItemUsageValue.h"
 #include "ItemVisitors.h"
+#include "PlayerbotMgr.h"
 #include "PlayerbotSecurity.h"
 #include "Playerbots.h"
+#include "RandomPlayerbotMgr.h"
 #include "SetCraftAction.h"
 
 bool TradeStatusAction::Execute(Event event)
@@ -180,8 +182,12 @@ bool TradeStatusAction::CheckTrade()
         }
         return isGettingItem;
     }
-
-    if (!sRandomPlayerbotMgr->IsRandomBot(bot))
+    if (!bot->GetSession())
+    {
+        return false;
+    }
+    uint32 accountId = bot->GetSession()->GetAccountId();
+    if (!sPlayerbotAIConfig->IsInRandomAccountList(accountId))
     {
         int32 botItemsMoney = CalculateCost(bot, true);
         int32 botMoney = bot->GetTradeData()->GetMoney() + botItemsMoney;