From 15af28720abda0316c7c3723d3bb464e0ef2b4d4 Mon Sep 17 00:00:00 2001 From: Uleat Date: Wed, 1 Mar 2017 19:16:02 -0500 Subject: [PATCH] Bad logic..not used anyways --- zone/bot.cpp | 15 --------------- zone/bot.h | 10 ++++------ 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/zone/bot.cpp b/zone/bot.cpp index 172ac3d5d..0fc7418e0 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -7621,21 +7621,6 @@ bool Bot::CheckLoreConflict(const EQEmu::ItemData* item) { return (m_inv.HasItemByLoreGroup(item->LoreGroup, invWhereWorn) != INVALID_INDEX); } -bool Bot::GroupHasClass(Group* group, uint8 classId) { - bool result = false; - - if(group) { - for(int counter = 0; counter < MAX_GROUP_MEMBERS; counter++) { - if(group->members[counter] && group->members[counter]->GetClass() & classId) { - result = true; - break; - } - } - } - - return result; -} - bool EntityList::Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, float iRange, uint32 iSpellTypes) { if((iSpellTypes&SpellTypes_Detrimental) != 0) { Log.Out(Logs::General, Logs::Error, "Error: detrimental spells requested from AICheckCloseBeneficialSpells!!"); diff --git a/zone/bot.h b/zone/bot.h index 88ff654df..dea5dd8e8 100644 --- a/zone/bot.h +++ b/zone/bot.h @@ -461,10 +461,12 @@ public: static int32 GetDisciplineRecastTimer(Bot *caster, int timer_index); static bool CheckDisciplineRecastTimers(Bot *caster, int timer_index); static uint32 GetDisciplineRemainingTime(Bot *caster, int timer_index); + static std::list GetBotSpellsForSpellEffect(Bot* botCaster, int spellEffect); static std::list GetBotSpellsForSpellEffectAndTargetType(Bot* botCaster, int spellEffect, SpellTargetType targetType); static std::list GetBotSpellsBySpellType(Bot* botCaster, uint32 spellType); static std::list GetPrioritizedBotSpellsBySpellType(Bot* botCaster, uint32 spellType); + static BotSpell GetFirstBotSpellBySpellType(Bot* botCaster, uint32 spellType); static BotSpell GetBestBotSpellForFastHeal(Bot* botCaster); static BotSpell GetBestBotSpellForHealOverTime(Bot* botCaster); @@ -476,6 +478,7 @@ public: static BotSpell GetBestBotSpellForGroupHeal(Bot* botCaster); static BotSpell GetBestBotSpellForMagicBasedSlow(Bot* botCaster); static BotSpell GetBestBotSpellForDiseaseBasedSlow(Bot* botCaster); + static Mob* GetFirstIncomingMobToMez(Bot* botCaster, BotSpell botSpell); static BotSpell GetBestBotSpellForMez(Bot* botCaster); static BotSpell GetBestBotMagicianPetSpell(Bot* botCaster); @@ -486,17 +489,12 @@ public: static BotSpell GetDebuffBotSpell(Bot* botCaster, Mob* target); static BotSpell GetBestBotSpellForCure(Bot* botCaster, Mob* target); static BotSpell GetBestBotSpellForResistDebuff(Bot* botCaster, Mob* target); + static NPCType CreateDefaultNPCTypeStructForBot(std::string botName, std::string botLastName, uint8 botLevel, uint16 botRace, uint8 botClass, uint8 gender); // Static Bot Group Methods static bool AddBotToGroup(Bot* bot, Group* group); static bool RemoveBotFromGroup(Bot* bot, Group* group); - static bool GroupHasClass(Group* group, uint8 classId); - static bool GroupHasClericClass(Group* group) { return GroupHasClass(group, CLERIC); } - static bool GroupHasDruidClass(Group* group) { return GroupHasClass(group, DRUID); } - static bool GroupHasShamanClass(Group* group) { return GroupHasClass(group, SHAMAN); } - static bool GroupHasEnchanterClass(Group* group) { return GroupHasClass(group, ENCHANTER); } - static bool GroupHasPriestClass(Group* group) { return GroupHasClass(group, CLERIC | DRUID | SHAMAN); } static void BotGroupSay(Mob *speaker, const char *msg, ...); // "GET" Class Methods