misc cleanup

This commit is contained in:
nytmyr
2024-11-28 22:33:30 -06:00
parent 12f703678e
commit dc0819c2c6
5 changed files with 6 additions and 30 deletions
+4 -4
View File
@@ -1613,7 +1613,7 @@ bool Bot::Process()
}
ScanCloseMobProcess();
CheckScanCloseMobsMovingTimer(); // TODO bot rewrite -- necessary for bots?
CheckScanCloseMobsMovingTimer();
SpellProcess();
if (tic_timer.Check()) {
@@ -1661,7 +1661,7 @@ bool Bot::Process()
}
}
if (viral_timer.Check()) { // TODO bot rewrite -- necessary for bots?
if (viral_timer.Check()) {
VirusEffectProcess();
}
@@ -7160,7 +7160,7 @@ bool Bot::CheckLoreConflict(const EQ::ItemData* item) {
return (m_inv.HasItemByLoreGroup(item->LoreGroup, invWhereWorn) != INVALID_INDEX);
}
bool EntityList::Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, float iRange, uint16 spellType) {
bool EntityList::Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, uint16 spellType) {
if (BOT_SPELL_TYPES_DETRIMENTAL(spellType, caster->GetClass())) {
LogError("[EntityList::Bot_AICheckCloseBeneficialSpells] detrimental spells requested");
@@ -10927,7 +10927,7 @@ bool Bot::AttemptAICastSpell(uint16 spellType) {
}
if (!tar || !PrecastChecks(tar, spellType) || !AICastSpell(tar, GetChanceToCastBySpellType(spellType), spellType)) {
if (!entity_list.Bot_AICheckCloseBeneficialSpells(this, GetChanceToCastBySpellType(spellType), BotAISpellRange, spellType)) {
if (!entity_list.Bot_AICheckCloseBeneficialSpells(this, GetChanceToCastBySpellType(spellType), spellType)) {
return result;
}
}
-1
View File
@@ -46,7 +46,6 @@ constexpr uint32 MAG_EPIC_1_0 = 28034;
extern WorldServer worldserver;
constexpr int BotAISpellRange = 100; // TODO: Write a method that calcs what the bot's spell range is based on spell, equipment, AA, whatever and replace this
constexpr int NegativeItemReuse = -1; // Unlinked timer for items
constexpr uint8 SumWater = 1;
+1 -1
View File
@@ -628,7 +628,7 @@ private:
Client* GetBotOwnerByBotID(const uint32 bot_id);
std::list<Bot*> GetBotsByBotOwnerCharacterID(uint32 botOwnerCharacterID);
bool Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, float iRange, uint16 spellType); // TODO: Evaluate this closesly in hopes to eliminate
bool Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, uint16 spellType); // TODO: Evaluate this closesly in hopes to eliminate
void ShowSpawnWindow(Client* client, int Distance, bool NamedOnly); // TODO: Implement ShowSpawnWindow in the bot class but it needs entity list stuff
void ScanCloseClientMobs(std::unordered_map<uint16, Mob*>& close_mobs, Mob* scanning_mob);