yolinlin/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots synced 2025-11-29 15:58:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Innkeeper position and windows compile error

Browse Source
This commit is contained in:
Yunfan Li
2024-12-03 22:57:39 +08:00
parent 5c3591ae5a
commit 87e8c05b20
4 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
conf/playerbots.conf.dist
View File

@@ -714,10 +714,10 @@ AiPlayerbot.RandomBotArenaTeamMinRating = 1000
AiPlayerbot.DeleteRandomBotArenaTeams = 0 AiPlayerbot.DeleteRandomBotArenaTeams = 0
# PvP Restricted Zones (bots don't pvp) # PvP Restricted Zones (bots don't pvp)
AiPlayerbot.PvpProhibitedZoneIds = "2255,656,2361,2362,2363,976,35,2268,3425,392,541,1446,3828,3712,3738,3565,3539,3623,4152,3988,4658,4284,4418,4436,4275,4323,4395,3703,4298" AiPlayerbot.PvpProhibitedZoneIds = "2255,656,2361,2362,2363,976,35,2268,3425,392,541,1446,3828,3712,3738,3565,3539,3623,4152,3988,4658,4284,4418,4436,4275,4323,4395,3703,4298,139"
# PvP Restricted Areas (bots don't pvp) # PvP Restricted Areas (bots don't pvp)
AiPlayerbot.PvpProhibitedAreaIds = "976,35,392" AiPlayerbot.PvpProhibitedAreaIds = "976,35,392,2268"
# Improve react speed in battleground and arena (may cause lag) # Improve react speed in battleground and arena (may cause lag)
AiPlayerbot.FastReactInBG = 1 AiPlayerbot.FastReactInBG = 1

2
src/PlayerbotAIConfig.cpp
View File

@@ -560,7 +560,7 @@ bool PlayerbotAIConfig::IsInRandomQuestItemList(uint32 id)
bool PlayerbotAIConfig::IsPvpProhibited(uint32 zoneId, uint32 areaId) bool PlayerbotAIConfig::IsPvpProhibited(uint32 zoneId, uint32 areaId)
{ {
return IsInPvpProhibitedZone(zoneId) || IsInPvpProhibitedArea(areaId); return IsInPvpProhibitedZone(zoneId) || IsInPvpProhibitedArea(areaId) || IsInPvpProhibitedZone(areaId);
} }
bool PlayerbotAIConfig::IsInPvpProhibitedZone(uint32 id) bool PlayerbotAIConfig::IsInPvpProhibitedZone(uint32 id)

52
src/RandomPlayerbotMgr.cpp
View File

@@ -39,9 +39,11 @@
#include "PlayerbotCommandServer.h" #include "PlayerbotCommandServer.h"
#include "PlayerbotFactory.h" #include "PlayerbotFactory.h"
#include "Playerbots.h" #include "Playerbots.h"
#include "Position.h"
#include "Random.h" #include "Random.h"
#include "ServerFacade.h" #include "ServerFacade.h"
#include "SharedDefines.h" #include "SharedDefines.h"
#include "TravelMgr.h"
#include "Unit.h" #include "Unit.h"
#include "UpdateTime.h" #include "UpdateTime.h"
#include "World.h" #include "World.h"
@@ -1420,7 +1422,7 @@ void RandomPlayerbotMgr::PrepareTeleportCache()
"position_x, " "position_x, "
"position_y, " "position_y, "
"position_z, " "position_z, "
"t.minlevel " "t.maxlevel "
"FROM " "FROM "
"(SELECT " "(SELECT "
"map, " "map, "
@@ -1431,12 +1433,15 @@ void RandomPlayerbotMgr::PrepareTeleportCache()
"WHERE " "WHERE "
"t.npcflag = 0 " "t.npcflag = 0 "
"AND t.lootid != 0 " "AND t.lootid != 0 "
"AND t.unit_flags != 768 "
"AND t.maxlevel - t.minlevel < 3 " "AND t.maxlevel - t.minlevel < 3 "
"AND map IN ({}) " "AND map IN ({}) "
"AND c.id1 != 32820 " "AND t.entry != 32820 "
"AND t.entry != 24196 "
"AND c.spawntimesecs < 1000 " "AND c.spawntimesecs < 1000 "
"AND t.faction != 188 " "AND t.faction not in (11, 71, 79, 85, 188) "
"AND (t.unit_flags & 256) = 0 "
"AND (t.unit_flags & 4096) = 0 "
// "AND (t.flags_extra & 32768) = 0 "
"GROUP BY " "GROUP BY "
"map, " "map, "
"ROUND(position_x / 50), " "ROUND(position_x / 50), "
@@ -1516,23 +1521,42 @@ void RandomPlayerbotMgr::PrepareTeleportCache()
continue; continue;
const AreaTableEntry* area = sAreaTableStore.LookupEntry(map->GetAreaId(1, x, y, z)); const AreaTableEntry* area = sAreaTableStore.LookupEntry(map->GetAreaId(1, x, y, z));
uint32 level = area->area_level; uint32 level = area->area_level;
// LOG_INFO("playerbots", "Area: {} Level: {} creature_entry: {}", area->ID, level, c_entry); for (int i = 2; i<= 80; i++)
int range = level <= 10 ? 6 : 8;
for (int32 l = (int32)level; l <= (int32)level + range; l++)
{ {
if (l < 1 || l > maxLevel) std::vector<WorldLocation> &locs = locsPerLevelCache[i - 1];
for (auto &levelLoc : locs)
{
if (loc.GetMapId() == levelLoc.GetMapId() && loc.GetExactDist(levelLoc) <= 500.0f)
{ {
continue;
}
if (!(entry->hostileMask & 4)) if (!(entry->hostileMask & 4))
{ {
hordeInnkeeperPerLevelCache[(uint8)l].push_back(loc); hordeInnkeeperPerLevelCache[i].push_back(loc);
} }
if (!(entry->hostileMask & 2)) if (!(entry->hostileMask & 2))
{ {
allianceInnkeeperPerLevelCache[(uint8)l].push_back(loc); allianceInnkeeperPerLevelCache[i].push_back(loc);
}
// LOG_INFO("playerbots", "Area: {} Level: {} creature_entry: {} add to: {} ({},{},{},{})", area->ID, level, c_entry, i, levelLoc.GetPositionX(), levelLoc.GetPositionY(), levelLoc.GetPositionZ(), levelLoc.GetMapId());
break;
} }
} }
}
// int range = level <= 10 ? 6 : 8;
// for (int32 l = (int32)level; l <= (int32)level + range; l++)
// {
// if (l < 1 || l > maxLevel)
// {
// continue;
// }
// if (!(entry->hostileMask & 4))
// {
// hordeInnkeeperPerLevelCache[(uint8)l].push_back(loc);
// }
// if (!(entry->hostileMask & 2))
// {
// allianceInnkeeperPerLevelCache[(uint8)l].push_back(loc);
// }
// }
} while (results->NextRow()); } while (results->NextRow());
} }
// add all initial position // add all initial position
@@ -1547,7 +1571,7 @@ void RandomPlayerbotMgr::PrepareTeleportCache()
WorldPosition pos(info->mapId, info->positionX, info->positionY, info->positionZ, info->orientation); WorldPosition pos(info->mapId, info->positionX, info->positionY, info->positionZ, info->orientation);
for (int32 l = 1; l <= 6; l++) for (int32 l = 1; l <= 5; l++)
{ {
if ((1 << (i - 1)) & RACEMASK_ALLIANCE) if ((1 << (i - 1)) & RACEMASK_ALLIANCE)
allianceInnkeeperPerLevelCache[(uint8)l].push_back(pos); allianceInnkeeperPerLevelCache[(uint8)l].push_back(pos);
@@ -1676,7 +1700,7 @@ void RandomPlayerbotMgr::RandomTeleportForLevel(Player* bot)
locs = &locsPerLevelCache[level]; locs = &locsPerLevelCache[level];
LOG_DEBUG("playerbots", "Random teleporting bot {} for level {} ({} locations available)", bot->GetName().c_str(), LOG_DEBUG("playerbots", "Random teleporting bot {} for level {} ({} locations available)", bot->GetName().c_str(),
bot->GetLevel(), locs->size()); bot->GetLevel(), locs->size());
if (level >= 5 && urand(0, 100) < sPlayerbotAIConfig->probTeleToBankers * 100) if (level >= 10 && urand(0, 100) < sPlayerbotAIConfig->probTeleToBankers * 100)
{ {
RandomTeleport(bot, bankerLocsPerLevelCache[level], true); RandomTeleport(bot, bankerLocsPerLevelCache[level], true);
} }

3
src/strategy/actions/NewRpgAction.cpp
View File

@@ -1,6 +1,7 @@
#include "NewRpgAction.h" #include "NewRpgAction.h"
#include <cmath> #include <cmath>
#include <cstdint>
#include "NewRpgStrategy.h" #include "NewRpgStrategy.h"
#include "ObjectDefines.h" #include "ObjectDefines.h"
@@ -217,7 +218,7 @@ bool NewRpgGoFarAwayPosAction::MoveFarTo(WorldPosition dest)
} }
int attempt = 10; int attempt = 10;
float minDelta = MAXFLOAT; float minDelta = M_PI;
const float x = bot->GetPositionX(); const float x = bot->GetPositionX();
const float y = bot->GetPositionY(); const float y = bot->GetPositionY();
const float z = bot->GetPositionZ(); const float z = bot->GetPositionZ();