Added new commands to website database

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/modules/Bots"]
+	path = src/modules/Bots
+	url = https://github.com/celguar/mangosbot-bots.git

CMakeLists.txt

@@ -327,6 +327,21 @@ if(NOT BUILD_GAME_SERVER AND BUILD_PLAYERBOT)
   message(STATUS "BUILD_PLAYERBOT forced to OFF due to BUILD_GAME_SERVER is not set")
 endif()
 
+if(NOT BUILD_GAME_SERVER AND BUILD_IKE3_BOTS)
+  set(BUILD_IKE3_BOTS OFF)
+  message(STATUS "BUILD_PLAYERBOTS forced to OFF due to BUILD_GAME_SERVER is not set")
+endif()
+
+if(BUILD_IKE3_BOTS)
+  set(BUILD_PLAYERBOT OFF)
+  message(STATUS "CMaNGOS bots DISABLED because Ike3 bots enabled")
+endif()
+
+if(BUILD_PLAYERBOT)
+  set(BUILD_IKE3_BOTS OFF)
+  message(STATUS "Ike3 bots DISABLED because CMaNGOS bots enabled")
+endif()
+
 if(PCH)
   if(${CMAKE_VERSION} VERSION_LESS "3.16") 
     message("PCH is not supported by your CMake version")

cmake/options.cmake

@@ -7,6 +7,7 @@ option(BUILD_LOGIN_SERVER   "Build login server"                    ON)
 option(BUILD_EXTRACTORS     "Build map/dbc/vmap/mmap extractors"    OFF)
 option(BUILD_SCRIPTDEV      "Build ScriptDev. (OFF Speedup build)"  ON)
 option(BUILD_PLAYERBOT      "Build Playerbot mod"                   OFF)
+option(BUILD_IKE3_BOTS      "Build ike3 Playerbots"                 OFF)
 option(BUILD_AHBOT          "Build Auction House Bot mod"           OFF)
 option(BUILD_METRICS        "Build Metrics, generate data for Grafana" OFF)
 option(BUILD_RECASTDEMOMOD  "Build map/vmap/mmap viewer"            OFF)
@@ -34,6 +35,7 @@ message(STATUS
     BUILD_EXTRACTORS        Build map/dbc/vmap/mmap extractor
     BUILD_SCRIPTDEV         Build scriptdev. (Disable it to speedup build in dev mode by not including scripts)
     BUILD_PLAYERBOT         Build Playerbot mod
+    BUILD_IKE3_BOTS         Build Ike3 Playerbot mod
     BUILD_AHBOT             Build Auction House Bot mod
     BUILD_METRICS           Build Metrics, generate data for Grafana
     BUILD_RECASTDEMOMOD     Build map/vmap/mmap viewer

cmake/showoptions.cmake

@@ -67,6 +67,12 @@ else()
   message(STATUS "Build Playerbot       : No  (default)")
 endif()
 
+if(BUILD_IKE3_BOTS)
+  message(STATUS "Build ike3 Playerbots : Yes")
+else()
+  message(STATUS "Build ike3 Playerbots : No  (default)")
+endif()
+
 if(BUILD_EXTRACTORS)
   message(STATUS "Build extractors      : Yes")
 else()

contrib/mmap/src/MapBuilder.cpp

@@ -34,6 +34,36 @@
 
 using namespace VMAP;
 
+void rcModAlmostUnwalkableTriangles(rcContext* ctx, const float walkableSlopeAngle,
+    const float* verts, int /*nv*/,
+    const int* tris, int nt,
+    unsigned char* areas)
+{
+    rcIgnoreUnused(ctx);
+
+    const float walkableThr = cosf(walkableSlopeAngle / 180.0f * RC_PI);
+
+    float norm[3];
+
+    for (int i = 0; i < nt; ++i)
+    {
+        if (areas[i] & RC_WALKABLE_AREA)
+        {
+            const int* tri = &tris[i * 3];
+
+            float e0[3], e1[3];
+            rcVsub(e0, &verts[tri[1] * 3], &verts[tri[0] * 3]);
+            rcVsub(e1, &verts[tri[2] * 3], &verts[tri[0] * 3]);
+            rcVcross(norm, e0, e1);
+            rcVnormalize(norm);
+
+            // Check if the face is walkable.
+            if (norm[1] <= walkableThr)
+                areas[i] = NAV_AREA_GROUND_STEEP; //Slopes between 50 and 60. Walkable for mobs, unwalkable for players.
+        }
+    }
+}
+
 void from_json(const json& j, rcConfig& config)
 {
     config.tileSize = MMAP::VERTEX_PER_TILE;
@@ -1147,8 +1177,13 @@ namespace MMAP
         }
 
         // mark all walkable tiles, both liquids and solids
-        rcClearUnwalkableTriangles(m_rcContext, tileCfg.walkableSlopeAngle, tVerts, tVertCount, tTris, tTriCount, tTriFlags);
-        rcRasterizeTriangles(m_rcContext, tVerts, tVertCount, tTris, tTriFlags, tTriCount, *tile.solid, tileCfg.walkableClimb);
+
+        unsigned char* triFlags = new unsigned char[tTriCount];      
+        memset(triFlags, NAV_AREA_GROUND, tTriCount * sizeof(unsigned char));
+        rcClearUnwalkableTriangles(m_rcContext, tileCfg.walkableSlopeAngle, tVerts, tVertCount, tTris, tTriCount, triFlags);
+        rcModAlmostUnwalkableTriangles(m_rcContext, 50.0f, tVerts, tVertCount, tTris, tTriCount, triFlags);
+        rcRasterizeTriangles(m_rcContext, tVerts, tVertCount, tTris, triFlags, tTriCount, *tile.solid, tileCfg.walkableClimb);
+        delete[] triFlags;
 
         rcFilterLowHangingWalkableObstacles(m_rcContext, tileCfg.walkableClimb, *tile.solid);
         rcFilterLedgeSpans(m_rcContext, tileCfg.walkableHeight, tileCfg.walkableClimb, *tile.solid);
@@ -1371,7 +1406,7 @@ namespace MMAP
             {"minRegionArea", 30},
             {"walkableClimb", 4},
             {"walkableHeight", 3},
-            {"walkableRadius", 2},
+            {"walkableRadius", 1},
             {"walkableSlopeAngle", 60.0f},
             {"liquidFlagMergeThreshold", 0.0f},
         };

contrib/recastdemomod/Include/RecastDemoSharedDefines.h

@@ -17,15 +17,16 @@ enum SamplePolyAreas
     SAMPLE_POLYAREA_DOOR,
     SAMPLE_POLYAREA_GRASS,
     SAMPLE_POLYAREA_JUMP,
+    SAMPLE_POLYAREA_SLOPE,
 };
 enum SamplePolyFlags
 {
     SAMPLE_POLYFLAGS_WALK = 0x01,		// Ability to walk (ground, grass, road)
-    SAMPLE_POLYFLAGS_SWIM = 0x02,		// Ability to swim (water).
-    SAMPLE_POLYFLAGS_DOOR = 0x04,		// Ability to move through doors.
-    SAMPLE_POLYFLAGS_JUMP = 0x08,		// Ability to jump.
-    SAMPLE_POLYFLAGS_DISABLED = 0x10,		// Disabled polygon
-    SAMPLE_POLYFLAGS_ALL = 0xffff	// All abilities.
+    SAMPLE_POLYFLAGS_SLOPES = 0x02,		// Ability to swim (water).
+    SAMPLE_POLYFLAGS_SWIM = 0x04,		// Ability to move through doors.
+    SAMPLE_POLYFLAGS_MAGMA_SLIME = 0x08,		// Ability to jump.
+    SAMPLE_POLYFLAGS_DISABLED = 0x20,   // Disabled polygon
+    SAMPLE_POLYFLAGS_ALL = 0xffff	    // All abilities.
 };
 
 enum SamplePartitionType

contrib/recastdemomod/Include/SampleInterfaces.h

@@ -46,14 +46,21 @@ class BuildContext : public rcContext
     std::string m_mMapsFolder;
     std::string m_vMapsFolder;
 
+	unsigned int mapID;
+	unsigned int tileX;
+	unsigned int tileY;
+
 public:
-	BuildContext(const char* dataDir);
+	BuildContext(const char* dataDir, unsigned int mapId, unsigned int tileX, unsigned int tileY);
 	virtual ~BuildContext();
 
 	const char* getMapFolder() { return m_mapsFolder.c_str(); }
 	const char* getMMapFolder() { return m_mMapsFolder.c_str(); }
 	const char* getVMapFolder() { return m_vMapsFolder.c_str(); }
 	const char* getDataDir() { return m_dataDir; }
+	unsigned int getMapId() { return mapID; }
+	unsigned int getTileX() { return tileX; }
+	unsigned int getTileY() { return tileY; }
 
 	/// Dumps the log to stdout.
 	void dumpLog(const char* format, ...);

contrib/recastdemomod/Source/CMaNGOS_Map.cpp

@@ -266,11 +266,58 @@ void CMaNGOS_Map::Init()
     ScanFoldersForMaps();
     if (m_mapID < 0)
         return;
+
+    if (m_ctx->getMapId() != m_mapID && m_ctx->getTileX() && m_ctx->getTileY())
+        m_mapID = m_ctx->getMapId();
+
     scanFoldersForTiles();
     m_MapInfos = new MapInfos();
     m_MapInfos->Init(m_mapID, m_ctx);
     m_navMesh = m_MapInfos->GetNavMesh();
     m_navQuery = m_MapInfos->GetNavMeshQuery();
+
+    if (m_ctx->getTileX() && m_ctx->getTileY())
+    {
+        if (LoadTileData(m_ctx->getTileX(), m_ctx->getTileY()))
+        {
+            //m_showLevel = SHOW_LEVEL_NONE;
+        }
+        // if first chosen tile, add neighbor
+        if (!m_MapInfos->IsEmpty())
+        {
+            unsigned int x, y;
+            x = m_ctx->getTileX();
+            y = m_ctx->getTileY();
+            m_NeighborTiles.clear();
+            if (x != y || x != 64)
+            {
+                for (int i = 0; i < 3; ++i)
+                {
+                    for (int j = 0; j < 3; ++j)
+                    {
+                        uint32 tx = x - 1 + i;
+                        uint32 ty = y - 1 + j;
+
+                        // skip current already loaded tile
+                        if (tx == x && ty == y)
+                            continue;
+
+                        // add only available tile
+                        uint32 pxy = VMAP::StaticMapTree::packTileID(tx, ty);
+                        if (m_TilesFound.find(pxy) != m_TilesFound.end())
+                            m_NeighborTiles.insert(pxy);
+                    }
+                }
+            }
+        }
+
+        if (m_MapInfos->IsEmpty())
+            m_TileButtonStr = "Click to choose a tile";
+        else if (!m_NeighborTiles.empty())
+            m_TileButtonStr = "Add neighbor tile";
+        else
+            m_TileButtonStr = "No neighbor tile to add";
+    }
 }
 
 void CMaNGOS_Map::ClearAllGeoms()
@@ -299,7 +346,7 @@ void CMaNGOS_Map::resetCommonSettings()
     m_agentHeight = m_bigBaseUnit ? 3.0f : 6.0f;
     m_agentRadius = m_bigBaseUnit ? 1.0f : 2.0f;
     m_agentMaxClimb = m_bigBaseUnit ? 2.0f : 4.0f;
-    m_agentMaxSlope = 50.0f;
+    m_agentMaxSlope = 60.0f;
     m_regionMinSize = 60;
     m_regionMergeSize = 50;
     m_partitionType = SAMPLE_PARTITION_WATERSHED;

contrib/recastdemomod/Source/MMapData.cpp

@@ -497,22 +497,17 @@ void MMapData::BuildNavMeshOfTile(unsigned int tx, unsigned int ty, MeshObjects
         // Update poly flags from areas.
         for (int i = 0; i < m_pmesh->npolys; ++i)
         {
-            if (m_pmesh->areas[i] == RC_WALKABLE_AREA)
-                m_pmesh->areas[i] = SAMPLE_POLYAREA_GROUND;
-
-            if (m_pmesh->areas[i] == SAMPLE_POLYAREA_GROUND ||
-                m_pmesh->areas[i] == SAMPLE_POLYAREA_GRASS ||
-                m_pmesh->areas[i] == SAMPLE_POLYAREA_ROAD)
+            if (m_pmesh->areas[i] == 11)
             {
                 m_pmesh->flags[i] = SAMPLE_POLYFLAGS_WALK;
             }
-            else if (m_pmesh->areas[i] == SAMPLE_POLYAREA_WATER)
+            else if (m_pmesh->areas[i] == 9 || m_pmesh->areas[i] == 8)
             {
                 m_pmesh->flags[i] = SAMPLE_POLYFLAGS_SWIM;
             }
-            else if (m_pmesh->areas[i] == SAMPLE_POLYAREA_DOOR)
+            else if (m_pmesh->areas[i] == 10)
             {
-                m_pmesh->flags[i] = SAMPLE_POLYFLAGS_WALK | SAMPLE_POLYFLAGS_DOOR;
+                m_pmesh->flags[i] = SAMPLE_POLYFLAGS_SLOPES;
             }
         }
 

contrib/recastdemomod/Source/NavMeshTesterTool.cpp

@@ -263,6 +263,7 @@ void NavMeshTesterTool::init(CMaNGOS_Map* sample)
 		m_filter.setAreaCost(SAMPLE_POLYAREA_DOOR, 1.0f);
 		m_filter.setAreaCost(SAMPLE_POLYAREA_GRASS, 2.0f);
 		m_filter.setAreaCost(SAMPLE_POLYAREA_JUMP, 1.5f);
+		m_filter.setAreaCost(SAMPLE_POLYAREA_SLOPE, 5.0f);
 	}
 
 	m_neighbourhoodRadius = sample->getAgentRadius() * 20.0f;
@@ -424,14 +425,9 @@ void NavMeshTesterTool::handleMenu()
 		m_filter.setIncludeFlags(m_filter.getIncludeFlags() ^ SAMPLE_POLYFLAGS_SWIM);
 		recalc();
 	}
-	if (imguiCheck("Door", (m_filter.getIncludeFlags() & SAMPLE_POLYFLAGS_DOOR) != 0))
+	if (imguiCheck("Slopes", (m_filter.getIncludeFlags() & SAMPLE_POLYFLAGS_SLOPES) != 0))
 	{
-		m_filter.setIncludeFlags(m_filter.getIncludeFlags() ^ SAMPLE_POLYFLAGS_DOOR);
-		recalc();
-	}
-	if (imguiCheck("Jump", (m_filter.getIncludeFlags() & SAMPLE_POLYFLAGS_JUMP) != 0))
-	{
-		m_filter.setIncludeFlags(m_filter.getIncludeFlags() ^ SAMPLE_POLYFLAGS_JUMP);
+		m_filter.setIncludeFlags(m_filter.getIncludeFlags() ^ SAMPLE_POLYFLAGS_SLOPES);
 		recalc();
 	}
 	imguiUnindent();
@@ -450,14 +446,9 @@ void NavMeshTesterTool::handleMenu()
 		m_filter.setExcludeFlags(m_filter.getExcludeFlags() ^ SAMPLE_POLYFLAGS_SWIM);
 		recalc();
 	}
-	if (imguiCheck("Door", (m_filter.getExcludeFlags() & SAMPLE_POLYFLAGS_DOOR) != 0))
-	{
-		m_filter.setExcludeFlags(m_filter.getExcludeFlags() ^ SAMPLE_POLYFLAGS_DOOR);
-		recalc();
-	}
-	if (imguiCheck("Jump", (m_filter.getExcludeFlags() & SAMPLE_POLYFLAGS_JUMP) != 0))
+	if (imguiCheck("Slopes", (m_filter.getExcludeFlags() & SAMPLE_POLYFLAGS_SLOPES) != 0))
 	{
-		m_filter.setExcludeFlags(m_filter.getExcludeFlags() ^ SAMPLE_POLYFLAGS_JUMP);
+		m_filter.setExcludeFlags(m_filter.getExcludeFlags() ^ SAMPLE_POLYFLAGS_SLOPES);
 		recalc();
 	}
 	imguiUnindent();

contrib/recastdemomod/Source/SampleInterfaces.cpp

@@ -16,11 +16,14 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BuildContext::BuildContext(const char* dataDir) :
+BuildContext::BuildContext(const char* dataDir, unsigned int mapid, unsigned int tilex, unsigned int tiley) :
 	m_messageCount(0),
 	m_textPoolSize(0)
 {
 	m_dataDir = dataDir;
+	mapID = mapid;
+	tileX = tilex;
+	tileY = tiley;
     m_mapsFolder = dataDir;
     m_vMapsFolder = dataDir;
     m_mMapsFolder = dataDir;

contrib/recastdemomod/Source/main.cpp

@@ -28,6 +28,7 @@
 #include "RecastDebugDraw.h"
 #include "Filelist.h"
 #include <filesystem>
+#include <sstream>
 
 //#include "Sample_SoloMesh.h"
 //#include "Sample_TileMesh.h"
@@ -71,6 +72,39 @@ bool handleArgs(int argc, char** argv, char*& dataDir)
     return true;
 }
 
+uint32 check_int_input(const char* arg)
+{
+    std::istringstream ss(arg);
+    unsigned int x;
+    if (!(ss >> x))
+        return 0; // std::cerr << "Invalid number: " << arg << '\n';
+    else if (!ss.eof())
+        return 0; // std::cerr << "Trailing characters after number: " << arg << '\n';
+    return x;
+}
+
+bool handleArgs(int argc, char** argv, char* argName, uint32& result)
+{
+    uint32 param = 0;
+
+    for (int i = 1; i < argc; ++i)
+    {
+        if (strcmp(argv[i], argName) == 0)
+        {
+            param = check_int_input(argv[++i]);
+            if (!param)
+            {
+                printUsage();
+                return false;
+            }
+
+            result = param;
+        }
+    }
+
+    return true;
+}
+
 int main(int argc, char** argv)
 {
     // Init SDL
@@ -81,10 +115,17 @@ int main(int argc, char** argv)
     }
 
     char* dataDir = nullptr;
+    uint32 mapId = 0;
+    uint32 tileX = 0;
+    uint32 tileY = 0;
 
     if (!handleArgs(argc, argv, dataDir))
         return -1;
 
+    handleArgs(argc, argv, "-map", mapId);
+    handleArgs(argc, argv, "-tilex", tileX);
+    handleArgs(argc, argv, "-tiley", tileY);
+
     // Center window
     char env[] = "SDL_VIDEO_CENTERED=1";
     putenv(env);
@@ -164,7 +205,7 @@ int main(int argc, char** argv)
 
     //InputGeom* geom = 0;
     CMaNGOS_Map* sample = new CMaNGOS_Map();
-    BuildContext ctx(dataDir);
+    BuildContext ctx(dataDir, mapId, tileX, tileY);
     sample->setContext(&ctx);
     sample->Init();
     if (sample->GetMapId() < 0)