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

feat: rndbot teleport, grind, stuck problem etc.

Browse Source
This commit is contained in:
Yunfan Li
2023-08-01 23:21:06 +08:00
parent 6b7bf8ade7
commit 0969db4c89
15 changed files with 178 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
conf/playerbots.conf.dist
View File

@@ -549,7 +549,8 @@ AiPlayerbot.PvpProhibitedZoneIds = "2255,656,2361,2362,2363,976,35,2268,3425,392
AiPlayerbot.RandomBotSpellIds = "54197"
# Level diff between random bots and nearby creatures for random teleports
AiPlayerbot.RandomBotTeleLevel = 3
AiPlayerbot.randomBotTeleLowerLevel = 3
AiPlayerbot.randomBotTeleHigerLevel = 1
# ID of spell to open lootable chests
AiPlayerbot.OpenGoSpell = 6477

3
src/PlayerbotAIConfig.cpp
View File

@@ -137,7 +137,8 @@ bool PlayerbotAIConfig::Initialize()
randomBotMinLevel = sConfigMgr->GetOption<int32>("AiPlayerbot.RandomBotMinLevel", 1);
randomBotMaxLevel = sConfigMgr->GetOption<int32>("AiPlayerbot.RandomBotMaxLevel", 80);
randomBotLoginAtStartup = sConfigMgr->GetOption<bool>("AiPlayerbot.RandomBotLoginAtStartup", true);
randomBotTeleLevel = sConfigMgr->GetOption<int32>("AiPlayerbot.RandomBotTeleLevel", 5);
randomBotTeleLowerLevel = sConfigMgr->GetOption<int32>("AiPlayerbot.RandomBotTeleLowerLevel", 3);
randomBotTeleHigerLevel = sConfigMgr->GetOption<int32>("AiPlayerbot.RandomBotTeleHigerLevel", 1);
openGoSpell = sConfigMgr->GetOption<int32>("AiPlayerbot.OpenGoSpell", 6477);
randomChangeMultiplier = sConfigMgr->GetOption<float>("AiPlayerbot.RandomChangeMultiplier", 1.0);

2
src/PlayerbotAIConfig.h
View File

@@ -76,7 +76,7 @@ class PlayerbotAIConfig
bool randomBotJoinBG;
bool randomBotAutoJoinBG;
bool randomBotLoginAtStartup;
uint32 randomBotTeleLevel;
uint32 randomBotTeleLowerLevel, randomBotTeleHigerLevel;
bool logInGroupOnly, logValuesPerTick;
bool fleeingEnabled;
bool summonAtInnkeepersEnabled;

39
src/PlayerbotFactory.cpp
View File

@@ -8,6 +8,7 @@
#include "ArenaTeamMgr.h"
#include "GuildMgr.h"
#include "MapMgr.h"
#include "PetDefines.h"
#include "Playerbots.h"
#include "PerformanceMonitor.h"
#include "PlayerbotDbStore.h"
@@ -322,6 +323,7 @@ void PlayerbotFactory::Randomize(bool incremental)
pmo->finish();
}
bot->RemovePet(nullptr, PET_SAVE_AS_CURRENT, true);
if (bot->getLevel() >= 10)
{
pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Pet");
@@ -588,37 +590,6 @@ void PlayerbotFactory::InitPet()
pet->InitTalentForLevel();
pet->SavePetToDB(PET_SAVE_AS_CURRENT);
// bot->PetSpellInitialize();
// if (!pet->Create(guid, bot->GetMap(), bot->GetPhaseMask(), co->Entry, pet_number))
// {
// delete pet;
// pet = nullptr;
// continue;
// }
// pet->Relocate(bot);
// pet->SetOwnerGUID(bot->GetGUID());
// pet->SetGuidValue(UNIT_FIELD_CREATEDBY, bot->GetGUID());
// pet->SetFaction(bot->GetFaction());
// pet->SetLevel(bot->getLevel());
// pet->InitStatsForLevel(bot->getLevel());
// pet->SetPower(POWER_HAPPINESS, HAPPINESS_LEVEL_SIZE * 2);
// pet->GetCharmInfo()->SetPetNumber(sObjectMgr->GeneratePetNumber(), true);
// pet->GetMap()->AddToMap(pet->ToCreature());
// // bot->PetSpellInitialize();
// bot->InitTamedPet(pet, bot->getLevel(), 0);
// pet->InitTalentForLevel();
// pet->CastPetAuras(true);
// pet->UpdateAllStats();
// PetStable& petStable = bot->GetOrInitPetStable();
// pet->FillPetInfo(&petStable.CurrentPet.emplace());
// LOG_INFO("playerbots", "Bot {}: assign pet {} ({} level)", bot->GetName().c_str(), co->Entry, bot->getLevel());
// pet->SavePetToDB(PET_SAVE_AS_CURRENT);
// // bot->PetSpellInitialize();
break;
}
}
@@ -634,7 +605,7 @@ void PlayerbotFactory::InitPet()
{
LOG_ERROR("playerbots", "Cannot create pet for bot {}", bot->GetName().c_str());
return;
}
}
// LOG_INFO("playerbots", "Start make spell auto cast for {} spells. {} already auto casted.", pet->m_spells.size(), pet->GetPetAutoSpellSize());
for (PetSpellMap::const_iterator itr = pet->m_spells.begin(); itr != pet->m_spells.end(); ++itr)
@@ -1215,6 +1186,9 @@ void PlayerbotFactory::InitEquipment(bool incremental)
for (ItemTemplateContainer::const_iterator i = itemTemplates->begin(); i != itemTemplates->end(); ++i)
{
uint32 itemId = i->first;
if (sRandomItemMgr->IsTestItem(itemId)) {
continue;
}
ItemTemplate const* proto = &i->second;
if (!proto)
continue;
@@ -1364,7 +1338,6 @@ void PlayerbotFactory::InitSecondEquipmentSet()
ItemTemplate const* proto = &itr.second;
if (!proto)
continue;
if (!CanEquipItem(proto, desiredQuality))
continue;

5
src/RandomItemMgr.cpp
View File

@@ -945,8 +945,11 @@ void RandomItemMgr::BuildItemInfoCache()
strstr(proto->Name1.c_str(), "Monster ") ||
strstr(proto->Name1.c_str(), "[PH]") ||
strstr(proto->Name1.c_str(), "(OLD)")
)
)
{
itemForTest.insert(proto->ItemId);
continue;
}
// skip items with rank/rep requirements
/*if (proto->RequiredHonorRank > 0 ||

4
src/RandomItemMgr.h
View File

@@ -164,8 +164,8 @@ class RandomItemMgr
float GetItemRarity(uint32 itemId);
uint32 GetQuestIdForItem(uint32 itemId);
std::vector<uint32> GetQuestIdsForItem(uint32 itemId);
static bool IsUsedBySkill(ItemTemplate const* proto, uint32 skillId);
bool IsTestItem(uint32 itemId) { return itemForTest.find(itemId) != itemForTest.end(); }
private:
void BuildRandomItemCache();
@@ -195,7 +195,7 @@ class RandomItemMgr
std::map<std::string, uint32 > weightStatLink;
std::map<std::string, uint32 > weightRatingLink;
std::map<uint32, ItemInfoEntry> itemInfoCache;
std::set<uint32> itemForTest;
static std::set<uint32> itemCache;
};

184
src/RandomPlayerbotMgr.cpp
View File

@@ -871,6 +871,25 @@ bool RandomPlayerbotMgr::ProcessBot(Player* player)
//if (player->isDead())
//return false;
if (player->isDead())
{
if (!GetEventValue(bot, "dead"))
{
uint32 randomTime = urand(sPlayerbotAIConfig->minRandomBotReviveTime, sPlayerbotAIConfig->maxRandomBotReviveTime);
LOG_INFO("playerbots", "Mark bot {} as dead, will be revived in {}s.", player->GetName().c_str(), randomTime);
SetEventValue(bot, "dead", 1, sPlayerbotAIConfig->maxRandomBotInWorldTime);
SetEventValue(bot, "revive", 1, randomTime);
return false;
}
if (!GetEventValue(bot, "revive"))
{
Revive(player);
return true;
}
return false;
}
//GET_PLAYERBOT_AI(player)->GetAiObjectContext()->GetValue<bool>("random bot update")->Set(false);
@@ -946,17 +965,13 @@ void RandomPlayerbotMgr::Revive(Player* player)
{
uint32 bot = player->GetGUID().GetCounter();
//LOG_INFO("playerbots", "Bot {} revived", bot);
LOG_INFO("playerbots", "Bot {} revived", player->GetName().c_str());
SetEventValue(bot, "dead", 0, 0);
SetEventValue(bot, "revive", 0, 0);
if (player->getDeathState() == CORPSE)
RandomTeleport(player);
else
{
RandomTeleportForLevel(player);
Refresh(player);
}
RandomTeleportForLevel(player);
Refresh(player);
}
void RandomPlayerbotMgr::RandomTeleport(Player* bot, std::vector<WorldLocation>& locs, bool hearth)
@@ -985,8 +1000,7 @@ void RandomPlayerbotMgr::RandomTeleport(Player* bot, std::vector<WorldLocation>&
std::vector<WorldPosition> tlocs;
for (auto& loc : locs)
tlocs.push_back(WorldPosition(loc));
// LOG_INFO("playerbots", "Locs {} collected.", tlocs.size());
//Do not teleport to maps disabled in config
// Do not teleport to maps disabled in config
tlocs.erase(std::remove_if(tlocs.begin(), tlocs.end(), [bot](WorldPosition l)
{
std::vector<uint32>::iterator i = find(sPlayerbotAIConfig->randomBotMaps.begin(), sPlayerbotAIConfig->randomBotMaps.end(), l.getMapId());
@@ -1031,23 +1045,23 @@ void RandomPlayerbotMgr::RandomTeleport(Player* bot, std::vector<WorldLocation>&
{
WorldLocation loc = tlocs[urand(0, tlocs.size() - 1)];
float x = loc.GetPositionX() + (attemtps > 0 ? urand(0, sPlayerbotAIConfig->grindDistance) - sPlayerbotAIConfig->grindDistance / 2 : 0);
float y = loc.GetPositionY() + (attemtps > 0 ? urand(0, sPlayerbotAIConfig->grindDistance) - sPlayerbotAIConfig->grindDistance / 2 : 0);
float x = loc.GetPositionX(); // + (attemtps > 0 ? urand(0, sPlayerbotAIConfig->grindDistance) - sPlayerbotAIConfig->grindDistance / 2 : 0);
float y = loc.GetPositionY(); // + (attemtps > 0 ? urand(0, sPlayerbotAIConfig->grindDistance) - sPlayerbotAIConfig->grindDistance / 2 : 0);
float z = loc.GetPositionZ();
Map* map = sMapMgr->FindMap(loc.GetMapId(), 0);
if (!map)
continue;
AreaTableEntry const* area = sAreaTableStore.LookupEntry(map->GetAreaId(bot->GetPhaseMask(), x, y, z));
if (!area)
AreaTableEntry const* zone = sAreaTableStore.LookupEntry(map->GetZoneId(bot->GetPhaseMask(), x, y, z));
if (!zone)
continue;
// Do not teleport to enemy zones if level is low
if (area->team == 4 && bot->GetTeamId() == TEAM_ALLIANCE && bot->getLevel() < 40)
if (zone->team == 4 && bot->GetTeamId() == TEAM_ALLIANCE)
continue;
if (area->team == 2 && bot->GetTeamId() == TEAM_HORDE && bot->getLevel() < 40)
if (zone->team == 2 && bot->GetTeamId() == TEAM_HORDE)
continue;
if (map->IsInWater(bot->GetPhaseMask(), x, y, z, bot->GetCollisionHeight()))
@@ -1060,11 +1074,11 @@ void RandomPlayerbotMgr::RandomTeleport(Player* bot, std::vector<WorldLocation>&
z = 0.05f + ground;
LOG_INFO("playerbots", "Random teleporting bot {} to {} {},{},{} ({}/{} locations)",
bot->GetName().c_str(), area->area_name[0], x, y, z, attemtps, tlocs.size());
bot->GetName().c_str(), zone->area_name[0], x, y, z, attemtps, tlocs.size());
if (hearth)
{
bot->SetHomebind(loc, area->ID);
bot->SetHomebind(loc, zone->ID);
}
bot->GetMotionMaster()->Clear();
@@ -1093,66 +1107,66 @@ void RandomPlayerbotMgr::PrepareTeleportCache()
if (maxLevel > sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL))
maxLevel = sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL);
if (PreparedQueryResult result = PlayerbotsDatabase.Query(PlayerbotsDatabase.GetPreparedStatement(PLAYERBOTS_SEL_TELE_CACHE)))
LOG_INFO("playerbots", "Preparing random teleport caches for {} levels...", maxLevel);
QueryResult results = WorldDatabase.Query(
"WITH GroupedData AS ( "
"SELECT "
"MIN( c.guid ) guid, "
"( "
"AVG( t.maxlevel ) + AVG( t.minlevel )) / 2 lvl "
"FROM "
"creature c "
"INNER JOIN creature_template t ON c.id1 = t.entry "
"WHERE "
"t.npcflag = 0 "
"AND t.lootid != 0 "
"AND t.unit_flags != 768 "
"AND map IN ({}) "
"AND t.maxlevel != 1 "
"GROUP BY "
"map, "
"ROUND( position_x / 250 ) * 250, "
"ROUND( position_y / 250 ) * 250, "
"ROUND( position_z / 5 ) * 5 "
"HAVING "
"count(*) > 10 "
"AND MAX( t.maxlevel ) - MIN( t.minlevel ) < 5 "
"ORDER BY "
"lvl "
") "
"SELECT "
"map, "
"position_x, "
"position_y, "
"position_z, "
"t.maxlevel "
"FROM "
"GroupedData g "
"INNER JOIN creature c ON g.guid = c.guid "
"INNER JOIN creature_template t on c.id1 = t.entry;", sPlayerbotAIConfig->randomBotMapsAsString.c_str());
if (results)
{
LOG_INFO("playerbots", "Loading random teleport caches for {} levels...", maxLevel);
do
{
Field* fields = result->Fetch();
uint32 mapId = fields[0].Get<uint32>();
Field* fields = results->Fetch();
uint16 mapId = fields[0].Get<uint16>();
float x = fields[1].Get<float>();
float y = fields[2].Get<float>();
float z = fields[3].Get<float>();
uint8 level = fields[4].Get<uint8>();
uint32 avg_level = fields[4].Get<uint32>();
WorldLocation loc(mapId, x, y, z, 0);
locsPerLevelCache[level].push_back(std::move(loc));
}
while (result->NextRow());
}
else
{
LOG_INFO("playerbots", "Preparing random teleport caches for {} levels...", maxLevel);
for (uint8 level = 1; level <= maxLevel; level++)
{
QueryResult results = WorldDatabase.Query("SELECT map, position_x, position_y, position_z "
"FROM (SELECT map, position_x, position_y, position_z, AVG(t.maxlevel), AVG(t.minlevel), {} - (AVG(t.maxlevel) + AVG(t.minlevel)) / 2 delta "
"FROM creature c INNER JOIN creature_template t ON c.id1 = t.entry WHERE t.npcflag = 0 AND t.lootid != 0 AND t.unit_flags != 768 GROUP BY t.entry, map, position_x, position_y, position_z HAVING COUNT(*) > 1) q "
"WHERE delta >= 0 AND delta <= {} AND map IN ('{}') AND NOT EXISTS (SELECT map, position_x, position_y, position_z FROM "
"(SELECT map, c.position_x, c.position_y, c.position_z, AVG(t.maxlevel), AVG(t.minlevel), {} - (AVG(t.maxlevel) + AVG(t.minlevel)) / 2 delta "
"FROM creature c INNER JOIN creature_template t ON c.id1 = t.entry WHERE t.npcflag = 0 AND t.lootid != 0 GROUP BY t.entry, map, position_x, position_y, position_z) q1 WHERE abs(delta) > {} and q1.map = q.map AND SQRT("
"(q1.position_x - q.position_x) * (q1.position_x - q.position_x) + (q1.position_y - q.position_y) * (q1.position_y - q.position_y) + "
"(q1.position_z - q.position_z) * (q1.position_z - q.position_z)) < {})", level, sPlayerbotAIConfig->randomBotTeleLevel, sPlayerbotAIConfig->randomBotMapsAsString.c_str(),
level, sPlayerbotAIConfig->randomBotTeleLevel, (uint32) sPlayerbotAIConfig->sightDistance);
if (results)
{
do
{
Field* fields = results->Fetch();
uint16 mapId = fields[0].Get<uint16>();
float x = fields[1].Get<float>();
float y = fields[2].Get<float>();
float z = fields[3].Get<float>();
WorldLocation loc(mapId, x, y, z, 0);
locsPerLevelCache[level].push_back(std::move(loc));
PlayerbotsDatabasePreparedStatement* stmt = PlayerbotsDatabase.GetPreparedStatement(PLAYERBOTS_INS_TELE_CACHE);
stmt->SetData(0, level);
stmt->SetData(1, mapId);
stmt->SetData(2, x);
stmt->SetData(3, y);
stmt->SetData(4, z);
PlayerbotsDatabase.Execute(stmt);
} while (results->NextRow());
LOG_INFO("playerbots", "get location {} {} {} {}, level: {}", mapId, x, y, z, avg_level);
for (int32 level = (int32)avg_level - (int32)sPlayerbotAIConfig->randomBotTeleHigerLevel; level <= (int32)avg_level + (int32)sPlayerbotAIConfig->randomBotTeleLowerLevel; level++) {
if (level < 1 || level > maxLevel) {
continue;
}
locsPerLevelCache[(uint8)level].push_back(loc);
}
}
} while (results->NextRow());
}
LOG_INFO("playerbots", "Preparing RPG teleport caches for {} factions...", sFactionTemplateStore.GetNumRows());
QueryResult results = WorldDatabase.Query("SELECT map, position_x, position_y, position_z, r.race, r.minl, r.maxl FROM creature c INNER JOIN playerbots_rpg_races r ON c.id1 = r.entry "
results = WorldDatabase.Query("SELECT map, position_x, position_y, position_z, r.race, r.minl, r.maxl FROM creature c INNER JOIN playerbots_rpg_races r ON c.id1 = r.entry "
"WHERE r.race < 15");
if (results)
{
@@ -1190,9 +1204,8 @@ void RandomPlayerbotMgr::RandomTeleportForLevel(Player* bot)
uint32 level = bot->getLevel();
uint8 race = bot->getRace();
LOG_INFO("playerbots", "Random teleporting bot {} for level ({} locations available)", bot->GetName().c_str(), rpgLocsCacheLevel[race][level].size());
RandomTeleport(bot, rpgLocsCacheLevel[race][level]);
// Refresh(bot);
LOG_INFO("playerbots", "Random teleporting bot {} for level {} ({} locations available)", bot->GetName().c_str(), bot->GetLevel(), locsPerLevelCache[level].size());
RandomTeleport(bot, locsPerLevelCache[level]);
}
void RandomPlayerbotMgr::RandomTeleport(Player* bot)
@@ -1248,7 +1261,7 @@ void RandomPlayerbotMgr::Randomize(Player* bot)
else {
RandomizeFirst(bot);
}
//RandomTeleportForRpg(bot);
RandomTeleportForLevel(bot);
}
void RandomPlayerbotMgr::IncreaseLevel(Player* bot)
@@ -1296,7 +1309,7 @@ void RandomPlayerbotMgr::RandomizeFirst(Player* bot)
level = maxLevel;
if (bot->getClass() == CLASS_DEATH_KNIGHT)
level = urand(sWorld->getIntConfig(CONFIG_START_HEROIC_PLAYER_LEVEL), std::max(sWorld->getIntConfig(CONFIG_START_HEROIC_PLAYER_LEVEL), maxLevel));
level = urand(std::max(sPlayerbotAIConfig->randomBotMinLevel, sWorld->getIntConfig(CONFIG_START_HEROIC_PLAYER_LEVEL)), std::max(sWorld->getIntConfig(CONFIG_START_HEROIC_PLAYER_LEVEL), maxLevel));
}
SetValue(bot, "level", level);
@@ -1710,11 +1723,11 @@ bool RandomPlayerbotMgr::HandlePlayerbotConsoleCommand(ChatHandler* handler, cha
return true;
}
std::vector<std::string> messages = sRandomPlayerbotMgr->HandlePlayerbotCommand(args);
for (std::vector<std::string>::iterator i = messages.begin(); i != messages.end(); ++i)
{
LOG_INFO("playerbots", "{}", i->c_str());
}
// std::vector<std::string> messages = sRandomPlayerbotMgr->HandlePlayerbotCommand(args);
// for (std::vector<std::string>::iterator i = messages.begin(); i != messages.end(); ++i)
// {
// LOG_INFO("playerbots", "{}", i->c_str());
// }
return true;
}
@@ -2219,8 +2232,9 @@ void RandomPlayerbotMgr::ChangeStrategyOnce(Player* player)
void RandomPlayerbotMgr::RandomTeleportForRpg(Player* bot)
{
uint32 race = bot->getRace();
LOG_INFO("playerbots", "Random teleporting bot {} for RPG ({} locations available)", bot->GetName().c_str(), rpgLocsCache[race].size());
RandomTeleport(bot, rpgLocsCache[race], true);
uint32 level = bot->GetLevel();
LOG_INFO("playerbots", "Random teleporting bot {} for RPG ({} locations available)", bot->GetName().c_str(), rpgLocsCacheLevel[race].size());
RandomTeleport(bot, rpgLocsCacheLevel[race][level], true);
}
void RandomPlayerbotMgr::Remove(Player* bot)
@@ -2291,14 +2305,14 @@ ObjectGuid const RandomPlayerbotMgr::GetBattleMasterGUID(Player* bot, Battlegrou
break;
}
AreaTableEntry const* area = sAreaTableStore.LookupEntry(Bm->GetAreaId());
if (!area)
AreaTableEntry const* zone = sAreaTableStore.LookupEntry(Bm->GetZoneId());
if (!zone)
continue;
if (area->team == 4 && bot->GetTeamId() == TEAM_ALLIANCE)
if (zone->team == 4 && bot->GetTeamId() == TEAM_ALLIANCE)
continue;
if (area->team == 2 && bot->GetTeamId() == TEAM_HORDE)
if (zone->team == 2 && bot->GetTeamId() == TEAM_HORDE)
continue;
if (Bm->getDeathState() == DEAD)

2
src/RandomPlayerbotMgr.h
View File

@@ -121,7 +121,7 @@ class RandomPlayerbotMgr : public PlayerbotHolder
std::vector<Player*> players;
uint32 processTicks;
std::map<uint8, std::vector<WorldLocation>> locsPerLevelCache;
std::map<uint32, std::vector<WorldLocation>> rpgLocsCache;
// std::map<uint32, std::vector<WorldLocation>> rpgLocsCache;
std::map<uint32, std::map<uint32, std::vector<WorldLocation>>> rpgLocsCacheLevel;
std::map<TeamId, std::map<BattlegroundTypeId, std::vector<uint32>>> BattleMastersCache;
std::map<uint32, std::map<std::string, CachedEvent>> eventCache;

7
src/strategy/actions/ChooseTargetActions.cpp
View File

@@ -33,9 +33,12 @@ bool AttackAnythingAction::isUseful()
if (!AI_VALUE(bool, "can move around"))
return false;
if (context->GetValue<TravelTarget*>("travel target")->Get()->isTraveling() && ChooseRpgTargetAction::isFollowValid(bot, *context->GetValue<TravelTarget*>("travel target")->Get()->getPosition())) //Bot is traveling
if (context->GetValue<TravelTarget*>("travel target")->Get()->isTraveling() &&
ChooseRpgTargetAction::isFollowValid(bot, *context->GetValue<TravelTarget*>("travel target")->Get()->getPosition())) //Bot is traveling
return false;
if (bot->IsInCombat()) {
return false;
}
Unit* target = GetTarget();
if (!target)

11
src/strategy/actions/FollowActions.cpp
View File

@@ -25,7 +25,7 @@ bool FollowAction::Execute(Event event)
if (Formation::IsNullLocation(loc) || loc.GetMapId() == -1)
return false;
moved = MoveTo(loc.GetMapId(), loc.GetPositionX(), loc.GetPositionY(), loc.GetPositionZ() + 2.0f);
moved = MoveTo(loc.GetMapId(), loc.GetPositionX(), loc.GetPositionY(), loc.GetPositionZ());
}
if (Pet* pet = bot->GetPet())
@@ -33,11 +33,14 @@ bool FollowAction::Execute(Event event)
if (CreatureAI* creatureAI = ((Creature*)pet)->AI())
{
pet->SetReactState(REACT_PASSIVE);
pet->GetCharmInfo()->SetCommandState(COMMAND_FOLLOW);
pet->GetCharmInfo()->SetIsFollowing(true);
pet->AttackStop();
pet->GetCharmInfo()->SetIsCommandFollow(true);
pet->GetCharmInfo()->IsReturning();
pet->GetMotionMaster()->MoveFollow(bot, PET_FOLLOW_DIST, pet->GetFollowAngle());
// pet->GetCharmInfo()->SetCommandState(COMMAND_FOLLOW);
// pet->GetCharmInfo()->SetIsFollowing(true);
// pet->AttackStop();
// pet->GetCharmInfo()->IsReturning();
// pet->GetMotionMaster()->MoveFollow(bot, PET_FOLLOW_DIST, pet->GetFollowAngle());
}
}
//if (moved)

50
src/strategy/actions/MovementActions.cpp
View File

@@ -4,7 +4,9 @@
#include "MovementActions.h"
#include "MovementGenerator.h"
#include "ObjectGuid.h"
#include "PlayerbotAIConfig.h"
#include "SharedDefines.h"
#include "TargetedMovementGenerator.h"
#include "Event.h"
#include "LastMovementValue.h"
@@ -15,6 +17,7 @@
#include "Playerbots.h"
#include "ServerFacade.h"
#include "Transport.h"
#include "Unit.h"
#include "Vehicle.h"
#include "WaypointMovementGenerator.h"
@@ -128,10 +131,17 @@ bool MovementAction::MoveToLOS(WorldObject* target, bool ranged)
bool MovementAction::MoveTo(uint32 mapId, float x, float y, float z, bool idle, bool react)
{
if (!IsMovingAllowed(mapId, x, y, z))
if (!IsMovingAllowed(mapId, x, y, z)) {
return false;
bot->UpdateGroundPositionZ(x, y, z);
}
// if (bot->HasUnitMovementFlag(MOVEMENTFLAG_FALLING | MOVEMENTFLAG_FALLING_FAR)) {
// bot->Yell("I'm falling!", LANG_UNIVERSAL);
// return false;
// }
// bot->UpdateGroundPositionZ(x, y, z);
z += 15.0f;
bot->UpdateAllowedPositionZ(x, y, z);
z += 0.5f;
float distance = bot->GetDistance2d(x, y);
if (distance > sPlayerbotAIConfig->contactDistance)
{
@@ -159,8 +169,8 @@ bool MovementAction::MoveTo(uint32 mapId, float x, float y, float z, bool idle,
return false;
// UpdateMovementState();
// // LOG_DEBUG("playerbots", "IsMovingAllowed {}", IsMovingAllowed());
// if (!IsMovingAllowed())
// return false;
// bot->AddUnitMovementFlag()
// bool isVehicle = false;
// Unit* mover = bot;
@@ -663,7 +673,7 @@ bool MovementAction::MoveTo(Unit* target, float distance)
float dx = cos(angle) * needToGo + bx;
float dy = sin(angle) * needToGo + by;
float dz = bz + (tz - bz) * (needToGo / distanceToTarget); // calc accurate z postion to avoid stuck
return MoveTo(target->GetMapId(), dx, dy, tz);
}
@@ -1265,9 +1275,7 @@ bool FleeWithPetAction::Execute(Event event)
if (CreatureAI* creatureAI = ((Creature*)pet)->AI())
{
pet->SetReactState(REACT_PASSIVE);
pet->GetCharmInfo()->SetCommandState(COMMAND_FOLLOW);
pet->GetCharmInfo()->SetIsFollowing(true);
pet->AttackStop();
pet->GetCharmInfo()->SetIsCommandFollow(true);
pet->GetCharmInfo()->IsReturning();
pet->GetMotionMaster()->MoveFollow(bot, PET_FOLLOW_DIST, pet->GetFollowAngle());
}
@@ -1384,17 +1392,27 @@ bool MoveOutOfCollisionAction::isUseful()
bool MoveRandomAction::Execute(Event event)
{
//uint32 randnum = bot->GetGUID().GetCounter(); // Semi-random but fixed number for each bot.
//uint32 cycle = floor(getMSTime() / (1000 * 60)); // Semi-random number adds 1 each minute.
float distance = sPlayerbotAIConfig->tooCloseDistance + sPlayerbotAIConfig->grindDistance * urand(3, 10) / 10.0f;
//randnum = ((randnum + cycle) % 1000) + 1;
Map* map = bot->GetMap();
for (int i = 0; i < 10; ++i)
{
float x = bot->GetPositionX();
float y = bot->GetPositionY();
float z = bot->GetPositionZ();
x += urand(0, distance) - distance / 2;
y += urand(0, distance) - distance / 2;
bot->UpdateGroundPositionZ(x, y, z);
uint32 randnum = urand(1, 2000);
if (map->IsInWater(bot->GetPhaseMask(), x, y, z, bot->GetCollisionHeight()))
continue;
float angle = M_PI * (float)randnum / 1000; //urand(1, 1000);
float distance = urand(20, 200);
bool moved = MoveTo(bot->GetMapId(), x, y, z);
if (moved)
return true;
}
return MoveTo(bot->GetMapId(), bot->GetPositionX() + cos(angle) * distance, bot->GetPositionY() + sin(angle) * distance, bot->GetPositionZ());
return false;
}
bool MoveRandomAction::isUseful()

12
src/strategy/actions/NonCombatActions.cpp
View File

@@ -18,8 +18,8 @@ bool DrinkAction::Execute(Event event)
if (sPlayerbotAIConfig->freeFood)
{
if (bot->IsNonMeleeSpellCast(true))
return false;
// if (bot->IsNonMeleeSpellCast(true))
// return false;
bot->ClearUnitState(UNIT_STATE_CHASE);
bot->ClearUnitState(UNIT_STATE_FOLLOW);
@@ -70,8 +70,8 @@ bool EatAction::Execute(Event event)
if (sPlayerbotAIConfig->freeFood)
{
if (bot->IsNonMeleeSpellCast(true))
return false;
// if (bot->IsNonMeleeSpellCast(true))
// return false;
bot->ClearUnitState(UNIT_STATE_CHASE);
bot->ClearUnitState(UNIT_STATE_FOLLOW);
@@ -106,8 +106,8 @@ bool EatAction::Execute(Event event)
}
bool EatAction::isUseful()
{
return UseItemAction::isUseful() && AI_VALUE2(uint8, "health", "self target") < sPlayerbotAIConfig->lowHealth;
{
return UseItemAction::isUseful() && AI_VALUE2(uint8, "health", "self target") < 85;
}
bool EatAction::isPossible()

6
src/strategy/actions/ReviveFromCorpseAction.cpp
View File

@@ -9,6 +9,7 @@
#include "MapMgr.h"
#include "Playerbots.h"
#include "PlayerbotFactory.h"
#include "RandomPlayerbotMgr.h"
#include "ServerFacade.h"
bool ReviveFromCorpseAction::Execute(Event event)
@@ -89,10 +90,11 @@ bool FindCorpseAction::Execute(Event event)
{
if (dCount >= 5)
{
LOG_DEBUG("playerbots", "Bot {} {}:{} <{}>: died too many times and was sent to an inn",
LOG_INFO("playerbots", "Bot {} {}:{} <{}>: died too many times, was revived and teleported",
bot->GetGUID().ToString().c_str(), bot->GetTeamId() == TEAM_ALLIANCE ? "A" : "H", bot->getLevel(), bot->GetName().c_str());
context->GetValue<uint32>("death count")->Set(0);
sRandomPlayerbotMgr->RandomTeleportForLevel(bot);
// sRandomPlayerbotMgr->RandomTeleportForLevel(bot);
sRandomPlayerbotMgr->Revive(bot);
return true;
}
}

2
src/strategy/generic/GrindingStrategy.cpp
View File

@@ -12,6 +12,8 @@ NextAction** GrindingStrategy::getDefaultActions()
void GrindingStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
{
triggers.push_back(new TriggerNode("medium mana", NextAction::array(0, new NextAction("drink", 7.0f), nullptr)));
triggers.push_back(new TriggerNode("medium health", NextAction::array(0, new NextAction("food", 6.0f), nullptr)));
triggers.push_back(new TriggerNode("no target", NextAction::array(0, new NextAction("attack anything", 5.0f), nullptr)));
}

5
src/strategy/values/Arrow.cpp
View File

@@ -3,6 +3,7 @@
*/
#include "Arrow.h"
#include "Map.h"
#include "Playerbots.h"
WorldLocation ArrowFormation::GetLocationInternal()
@@ -47,8 +48,8 @@ WorldLocation ArrowFormation::GetLocationInternal()
float ground = master->GetMap()->GetHeight(x, y, z + 0.5f);
if (ground <= INVALID_HEIGHT)
return Formation::NullLocation;
return WorldLocation(master->GetMapId(), x, y, 0.05f + ground);
// master->UpdateGroundPositionZ(x, y, z);
return WorldLocation(master->GetMapId(), x, y, z);
}
void ArrowFormation::Build()