Merge branch 'master' of https://github.com/cmangos/playerbots

cmangos · Jan 11, 2025 · 46e16f5 · 46e16f5
2 parents bcc03c3 + 1d254a6
commit 46e16f5
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 35 deletions.
diff --git a/playerbot/PlayerbotLLMInterface.cpp b/playerbot/PlayerbotLLMInterface.cpp
@@ -393,7 +393,7 @@ std::vector<std::string> PlayerbotLLMInterface::ParseResponse(const std::string&
 
     actualResponse = extractAfterPattern(actualResponse, startPattern);
 
-    PlayerbotTextMgr::replaceAll(actualResponse, R"(\")", "'");
+    PlayerbotTextMgr::ReplaceAll(actualResponse, R"(\")", "'");
 
     if (debug)
     {

diff --git a/playerbot/PlayerbotTextMgr.cpp b/playerbot/PlayerbotTextMgr.cpp
@@ -115,7 +115,7 @@ std::string PlayerbotTextMgr::GetBotText(std::string name, std::map<std::string,
     if (botText.empty())
         botText = name;
 
-    replacePlaceholders(botText, placeholders);
+    ReplacePlaceholders(botText, placeholders);
 
     return botText;
 }
@@ -156,7 +156,7 @@ std::string PlayerbotTextMgr::GetBotText(ChatReplyType replyType, std::map<std::
             botText = textEntry.m_text;
     }
 
-    replacePlaceholders(botText, placeholders);
+    ReplacePlaceholders(botText, placeholders);
 
     return botText;
 }

diff --git a/playerbot/TravelNode.cpp b/playerbot/TravelNode.cpp
@@ -81,7 +81,7 @@ void TravelNodePath::calculateCost(bool distanceOnly)
 
             if (lastPoint && point.getMapId() == lastPoint.getMapId())
             {
-                if (!distanceOnly && (point.isInWater() || lastPoint.isInWater()))
+                if (!distanceOnly && (point.isVmapLoaded() && point.isInWater()) || (lastPoint.isVmapLoaded() && lastPoint.isInWater()))
                     swimDistance += point.distance(lastPoint);
 
                 distance += point.distance(lastPoint);
@@ -1843,8 +1843,23 @@ void TravelNodeMap::manageNodes(Unit* bot, bool mapFull)
 
 void TravelNodeMap::LoadMaps()
 {
-#ifdef MANGOSBOT_ZERO
     sLog.outError("Trying to load all maps and tiles for node generation. Please ignore any maps that could not be loaded.");
+    for (uint32 i = 0; i < sMapStore.GetNumRows(); ++i)
+    {
+        if (!sMapStore.LookupEntry(i))
+            continue;
+
+        uint32 mapId = sMapStore.LookupEntry(i)->MapID;
+        if (mapId == 0 || mapId == 1 || mapId == 530 || mapId == 571)
+        {
+            MMAP::MMapFactory::createOrGetMMapManager()->loadAllMapTiles(sWorld.GetDataPath(), mapId);
+        }
+        else
+        {
+            MMAP::MMapFactory::createOrGetMMapManager()->loadMapInstance(sWorld.GetDataPath(), mapId, 0);
+        }
+    }
+
     for (uint32 i = 0; i < sMapStore.GetNumRows(); ++i)
     {
         if (!sMapStore.LookupEntry(i))
@@ -1871,26 +1886,6 @@ void TravelNodeMap::LoadMaps()
             }
         }
     }
-#endif
-#ifdef MANGOSBOT_ONE
-    sLog.outError("Trying to load all maps and tiles for node generation. Please ignore any maps that could not be loaded.");
-    for (uint32 i = 0; i < sMapStore.GetNumRows(); ++i)
-    {
-        if (!sMapStore.LookupEntry(i))
-            continue;
-
-        uint32 mapId = sMapStore.LookupEntry(i)->MapID;
-        if (mapId == 0 || mapId == 1 || mapId == 530 || mapId == 571)
-        {
-            MMAP::MMapFactory::createOrGetMMapManager()->loadAllMapTiles(sWorld.GetDataPath(), mapId);
-        }
-        else
-        {
-            MMAP::MMapFactory::createOrGetMMapManager()->loadMapInstance(sWorld.GetDataPath(), mapId, 0);
-        }
-    }
-#endif
-
 }
 
 void TravelNodeMap::generateNpcNodes()

diff --git a/playerbot/WorldPosition.cpp b/playerbot/WorldPosition.cpp
@@ -686,10 +686,10 @@ bool WorldPosition::loadMapAndVMap(uint32 mapId, uint32 instanceId, int x, int y
 {
     std::string logName = "load_map_grid.csv";
 
-    bool hasVmap = isVmapLoaded(mapId, x, y);
+    //bool hasVmap = isVmapLoaded(mapId, x, y);
     bool hasMmap = isMmapLoaded(mapId, instanceId, x, y);
 
-    if (hasVmap && hasMmap)
+    if (hasMmap)
         return true;
 
     if (sTravelMgr.IsBadMmap(mapId, x, y))
@@ -718,14 +718,14 @@ bool WorldPosition::loadMapAndVMap(uint32 mapId, uint32 instanceId, int x, int y
 #endif
 
 
-        if (!isLoaded)
-            sTravelMgr.AddBadMmap(mapId, x, y);
+        //if (!isLoaded)
+        //    sTravelMgr.AddBadMmap(mapId, x, y);
     }
 
-    if (!hasVmap)
-    {
-        loadVMap(mapId, x, y);
-    }
+    //if (!hasVmap)
+    //{
+    //    loadVMap(mapId, x, y);
+    //}
 
     if (sPlayerbotAIConfig.hasLog(logName))
     {

diff --git a/playerbot/strategy/actions/RtscAction.cpp b/playerbot/strategy/actions/RtscAction.cpp
@@ -149,7 +149,7 @@ bool RTSCAction::Execute(Event& event)
 
 				if (filePerBot)
 				{
-					PlayerbotTextMgr::replaceAll(fileName, "BOTNAME", playerName);
+					PlayerbotTextMgr::ReplaceAll(fileName, "BOTNAME", playerName);
 					sPlayerbotAIConfig.openLog(fileName, "w", true);
 				}
 
@@ -217,7 +217,7 @@ bool RTSCAction::Execute(Event& event)
 
 				if (filePerBot)
 				{
-					PlayerbotTextMgr::replaceAll(fileName, "BOTNAME", playerName);
+					PlayerbotTextMgr::ReplaceAll(fileName, "BOTNAME", playerName);
 				}
 
 				std::string m_logsDir = sConfig.GetStringDefault("LogsDir");