veitR/mod-playerbots
1
0
Fork 0
mirror of https://github.com/liyunfan1223/mod-playerbots.git synced 2026-02-20 18:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix rpg move far (#822)

Browse Source 
* Fix rpg move far

* Don't go innkeeper with diff zone
This commit is contained in:
Yunfan Li 2024-12-28 01:11:39 +08:00 committed by GitHub
parent 2b758c9624
commit 1ed6645119
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/factory/PlayerbotFactory.cpp
View File

@ -3130,7 +3130,7 @@ void PlayerbotFactory::InitReagents()
items.push_back({17030, 40}); // Ankh items.push_back({17030, 40}); // Ankh
break; break;
case CLASS_WARLOCK: case CLASS_WARLOCK:
items.push_back({6265, 10}); // shard items.push_back({6265, 20}); // shard
break; break;
case CLASS_PRIEST: case CLASS_PRIEST:
if (level >= 48 && level < 60) if (level >= 48 && level < 60)

8
src/strategy/rpg/NewRpgAction.cpp
View File

@ -198,6 +198,10 @@ WorldPosition NewRpgStatusUpdateAction::SelectRandomInnKeeperPos()
if (bot->GetMapId() != loc.GetMapId()) if (bot->GetMapId() != loc.GetMapId())
continue; continue;
if (bot->GetMap()->GetZoneId(bot->GetPhaseMask(), loc.GetPositionX(), loc.GetPositionY(), loc.GetPositionZ()) !=
bot->GetZoneId())
continue;
float range = bot->GetLevel() <= 5 ? 500.0f : 2500.0f; float range = bot->GetLevel() <= 5 ? 500.0f : 2500.0f;
if (bot->GetExactDist(loc) < range) if (bot->GetExactDist(loc) < range)
{ {
@ -246,13 +250,13 @@ bool NewRpgGoFarAwayPosAction::MoveFarTo(WorldPosition dest)
float dis = rand_norm() * pathFinderDis; float dis = rand_norm() * pathFinderDis;
float dx = x + cos(angle) * dis; float dx = x + cos(angle) * dis;
float dy = y + sin(angle) * dis; float dy = y + sin(angle) * dis;
float dz = z + 5.0f; float dz = z + 0.5f;
bot->UpdateAllowedPositionZ(dx, dy, dz); bot->UpdateAllowedPositionZ(dx, dy, dz);
PathGenerator path(bot); PathGenerator path(bot);
path.CalculatePath(dx, dy, dz); path.CalculatePath(dx, dy, dz);
PathType type = path.GetPathType(); PathType type = path.GetPathType();
bool canReach = type == PATHFIND_INCOMPLETE || type == PATHFIND_NORMAL; bool canReach = type == PATHFIND_NORMAL;
if (canReach && fabs(delta) <= minDelta) if (canReach && fabs(delta) <= minDelta)
{ {