pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-30 17:42:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Few tweaks to bot ai

Browse Source
This commit is contained in:
Uleat 2019-12-13 16:50:42 -05:00
parent ed67b461ea
commit bd6e06aadb
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
zone/bot.cpp
View File

@ -83,6 +83,7 @@ Bot::Bot(NPCType *npcTypeData, Client* botOwner) : NPC(npcTypeData, nullptr, glm
SetPauseAI(false); SetPauseAI(false);
m_alt_combat_hate_timer.Start(250); m_alt_combat_hate_timer.Start(250);
m_auto_defend_timer.Disable();
//m_combat_jitter_timer.Disable(); //m_combat_jitter_timer.Disable();
//SetCombatJitterFlag(false); //SetCombatJitterFlag(false);
SetGuardFlag(false); SetGuardFlag(false);
@ -180,6 +181,7 @@ Bot::Bot(uint32 botID, uint32 botOwnerCharacterID, uint32 botSpellsID, double to
SetPauseAI(false); SetPauseAI(false);
m_alt_combat_hate_timer.Start(250); m_alt_combat_hate_timer.Start(250);
m_auto_defend_timer.Disable();
//m_combat_jitter_timer.Disable(); //m_combat_jitter_timer.Disable();
//SetCombatJitterFlag(false); //SetCombatJitterFlag(false);
SetGuardFlag(false); SetGuardFlag(false);
@ -2462,7 +2464,7 @@ constexpr float MAX_CASTER_DISTANCE[PLAYER_CLASS_COUNT] = {
// W C P R S D M B R S N W M E B B // W C P R S D M B R S N W M E B B
// A L A N H R N R O H E I A N S E // A L A N H R N R O H E I A N S E
// R R L G D U K D G M C Z G C T R // R R L G D U K D G M C Z G C T R
}; };
void Bot::AI_Process() void Bot::AI_Process()
{ {
@ -2861,14 +2863,14 @@ void Bot::AI_Process()
if (find_target) { if (find_target) {
if (IsRooted()) { if (IsRooted()) {
SetTarget(hate_list.GetClosestEntOnHateList(this)); SetTarget(hate_list.GetClosestEntOnHateList(this, true));
} }
else { else {
// This will keep bots on target for now..but, future updates will allow for rooting/stunning // This will keep bots on target for now..but, future updates will allow for rooting/stunning
SetTarget(hate_list.GetEscapingEntOnHateList(leash_owner, leash_distance)); SetTarget(hate_list.GetEscapingEntOnHateList(leash_owner, leash_distance));
if (!GetTarget()) { if (!GetTarget()) {
SetTarget(hate_list.GetEntWithMostHateOnList(this)); SetTarget(hate_list.GetEntWithMostHateOnList(this, nullptr, true));
} }
} }
} }
@ -3550,9 +3552,15 @@ void Bot::AI_Process()
// This is as close as I could get without modifying the aggro mechanics and making it an expensive process... // This is as close as I could get without modifying the aggro mechanics and making it an expensive process...
// 'class Client' doesn't make use of hate_list... // 'class Client' doesn't make use of hate_list...
if (bot_owner->GetAggroCount() && bot_owner->GetBotOption(Client::booAutoDefend)) { if (RuleB(Bots, AllowOwnerOptionAutoDefend) && bot_owner->GetBotOption(Client::booAutoDefend)) {
if (RuleB(Bots, AllowOwnerOptionAutoDefend)) { if (!m_auto_defend_timer.Enabled()) {
m_auto_defend_timer.Start(zone->random.Int(250, 1250)); // random timer to simulate 'awareness' (cuts down on scanning overhead)
return;
}
if (m_auto_defend_timer.Check() && bot_owner->GetAggroCount()) {
if (NOT_HOLDING && NOT_PASSIVE) { if (NOT_HOLDING && NOT_PASSIVE) {
@ -3570,7 +3578,7 @@ void Bot::AI_Process()
} }
auto hater = entity_list.GetMob(hater_iter.spawn_id); auto hater = entity_list.GetMob(hater_iter.spawn_id);
if (hater && DistanceSquared(hater->GetPosition(), bot_owner->GetPosition()) <= leash_distance) { if (hater && !hater->IsMezzed() && DistanceSquared(hater->GetPosition(), bot_owner->GetPosition()) <= leash_distance) {
// This is roughly equivilent to npc attacking a client pet owner // This is roughly equivilent to npc attacking a client pet owner
AddToHateList(hater, 1); AddToHateList(hater, 1);
@ -3582,6 +3590,8 @@ void Bot::AI_Process()
GetPet()->SetTarget(hater); GetPet()->SetTarget(hater);
} }
m_auto_defend_timer.Disable();
return; return;
} }
} }

1
zone/bot.h
View File

@ -693,6 +693,7 @@ private:
Timer m_evade_timer; // can be moved to pTimers at some point Timer m_evade_timer; // can be moved to pTimers at some point
Timer m_alt_combat_hate_timer; Timer m_alt_combat_hate_timer;
Timer m_auto_defend_timer;
//Timer m_combat_jitter_timer; //Timer m_combat_jitter_timer;
//bool m_combat_jitter_flag; //bool m_combat_jitter_flag;
bool m_guard_flag; bool m_guard_flag;

2
zone/bot_command.cpp
View File

@ -5758,7 +5758,7 @@ void bot_subcommand_bot_list(Client *c, const Seperator *sep)
} }
Bot * botCheckNotOnline = entity_list.GetBotByBotName(bots_iter.Name); Bot * botCheckNotOnline = entity_list.GetBotByBotName(bots_iter.Name);
std::string botspawn_saylink = StringFormat("^botspawn %s", bots_iter.Name); std::string botspawn_saylink = StringFormat("^botspawn %s", bots_iter.Name);
c->Message(Chat::White, "%s is a level %u %s %s %s who is owned by %s", c->Message(Chat::White, "[%s] is a level %u %s %s %s who is owned by %s",
((c->CharacterID() == bots_iter.Owner_ID) && (!botCheckNotOnline) ? (EQEmu::SayLinkEngine::GenerateQuestSaylink(botspawn_saylink, false, bots_iter.Name).c_str()) : (bots_iter.Name)), ((c->CharacterID() == bots_iter.Owner_ID) && (!botCheckNotOnline) ? (EQEmu::SayLinkEngine::GenerateQuestSaylink(botspawn_saylink, false, bots_iter.Name).c_str()) : (bots_iter.Name)),
bots_iter.Level, bots_iter.Level,
Bot::RaceIdToString(bots_iter.Race).c_str(), Bot::RaceIdToString(bots_iter.Race).c_str(),