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

Rename _spellSettings to m_bot_spell_settings

Browse Source
This commit is contained in:
nytmyr
2025-01-20 10:44:22 -06:00
parent b447b45afe
commit dff3af1193
5 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/bot.cpp
+15 -15
View File
@@ -10176,7 +10176,7 @@ int Bot::GetDefaultBotBaseSetting(uint16 bot_setting, uint8 stance) {
void Bot::LoadDefaultBotSettings() { void Bot::LoadDefaultBotSettings() {
_spellSettings.clear(); m_bot_spell_settings.clear();
uint8 bot_stance = GetBotStance(); uint8 bot_stance = GetBotStance();
@@ -10207,7 +10207,7 @@ void Bot::LoadDefaultBotSettings() {
t.AEOrGroupTargetCount = GetDefaultSpellTypeAEOrGroupTargetCount(i, bot_stance); t.AEOrGroupTargetCount = GetDefaultSpellTypeAEOrGroupTargetCount(i, bot_stance);
t.recastTimer.Start(); t.recastTimer.Start();
_spellSettings.push_back(t); m_bot_spell_settings.push_back(t);
LogBotSettingsDetail("{} says, 'Setting defaults for {} ({}) [#{}] - [{} [#{}] stance]'", GetCleanName(), t.name, t.shortName, t.spellType, Stance::GetName(bot_stance), bot_stance); LogBotSettingsDetail("{} says, 'Setting defaults for {} ({}) [#{}] - [{} [#{}] stance]'", GetCleanName(), t.name, t.shortName, t.spellType, Stance::GetName(bot_stance), bot_stance);
LogBotSettingsDetail("{} says, 'Hold = [{}] | Delay = [{}ms] | MinThreshold = [{}\%] | MaxThreshold = [{}\%]'", GetCleanName(), GetDefaultSpellHold(i, bot_stance), GetDefaultSpellDelay(i, bot_stance), GetDefaultSpellMinThreshold(i, bot_stance), GetDefaultSpellMaxThreshold(i, bot_stance)); LogBotSettingsDetail("{} says, 'Hold = [{}] | Delay = [{}ms] | MinThreshold = [{}\%] | MaxThreshold = [{}\%]'", GetCleanName(), GetDefaultSpellHold(i, bot_stance), GetDefaultSpellDelay(i, bot_stance), GetDefaultSpellMinThreshold(i, bot_stance), GetDefaultSpellMaxThreshold(i, bot_stance));
@@ -10276,11 +10276,11 @@ BotSpell Bot::GetSpellByHealType(uint16 spell_type, Mob* tar) {
uint16 Bot::GetSpellTypePriority(uint16 spell_type, uint8 priority_type) { uint16 Bot::GetSpellTypePriority(uint16 spell_type, uint8 priority_type) {
switch (priority_type) { switch (priority_type) {
case BotPriorityCategories::Idle: case BotPriorityCategories::Idle:
return _spellSettings[spell_type].idlePriority; return m_bot_spell_settings[spell_type].idlePriority;
case BotPriorityCategories::Engaged: case BotPriorityCategories::Engaged:
return _spellSettings[spell_type].engagedPriority; return m_bot_spell_settings[spell_type].engagedPriority;
case BotPriorityCategories::Pursue: case BotPriorityCategories::Pursue:
return _spellSettings[spell_type].pursuePriority; return m_bot_spell_settings[spell_type].pursuePriority;
default: default:
return 0; return 0;
} }
@@ -10736,13 +10736,13 @@ uint16 Bot::GetDefaultSpellTypeAEOrGroupTargetCount(uint16 spell_type, uint8 sta
void Bot::SetSpellTypePriority(uint16 spell_type, uint8 priority_type, uint16 priority) { void Bot::SetSpellTypePriority(uint16 spell_type, uint8 priority_type, uint16 priority) {
switch (priority_type) { switch (priority_type) {
case BotPriorityCategories::Idle: case BotPriorityCategories::Idle:
_spellSettings[spell_type].idlePriority = priority; m_bot_spell_settings[spell_type].idlePriority = priority;
break; break;
case BotPriorityCategories::Engaged: case BotPriorityCategories::Engaged:
_spellSettings[spell_type].engagedPriority = priority; m_bot_spell_settings[spell_type].engagedPriority = priority;
break; break;
case BotPriorityCategories::Pursue: case BotPriorityCategories::Pursue:
_spellSettings[spell_type].pursuePriority = priority; m_bot_spell_settings[spell_type].pursuePriority = priority;
break; break;
default: default:
return; return;
@@ -10750,31 +10750,31 @@ void Bot::SetSpellTypePriority(uint16 spell_type, uint8 priority_type, uint16 pr
} }
void Bot::SetSpellTypeResistLimit(uint16 spell_type, uint16 resist_limit) { void Bot::SetSpellTypeResistLimit(uint16 spell_type, uint16 resist_limit) {
_spellSettings[spell_type].resistLimit = resist_limit; m_bot_spell_settings[spell_type].resistLimit = resist_limit;
} }
void Bot::SetSpellTypeAggroCheck(uint16 spell_type, bool aggro_check) { void Bot::SetSpellTypeAggroCheck(uint16 spell_type, bool aggro_check) {
_spellSettings[spell_type].aggroCheck = aggro_check; m_bot_spell_settings[spell_type].aggroCheck = aggro_check;
} }
void Bot::SetSpellTypeMinManaLimit(uint16 spell_type, uint8 mana_limit) { void Bot::SetSpellTypeMinManaLimit(uint16 spell_type, uint8 mana_limit) {
_spellSettings[spell_type].minManaPct = mana_limit; m_bot_spell_settings[spell_type].minManaPct = mana_limit;
} }
void Bot::SetSpellTypeMaxManaLimit(uint16 spell_type, uint8 mana_limit) { void Bot::SetSpellTypeMaxManaLimit(uint16 spell_type, uint8 mana_limit) {
_spellSettings[spell_type].maxManaPct = mana_limit; m_bot_spell_settings[spell_type].maxManaPct = mana_limit;
} }
void Bot::SetSpellTypeMinHPLimit(uint16 spell_type, uint8 hp_limit) { void Bot::SetSpellTypeMinHPLimit(uint16 spell_type, uint8 hp_limit) {
_spellSettings[spell_type].minHPPct = hp_limit; m_bot_spell_settings[spell_type].minHPPct = hp_limit;
} }
void Bot::SetSpellTypeMaxHPLimit(uint16 spell_type, uint8 hp_limit) { void Bot::SetSpellTypeMaxHPLimit(uint16 spell_type, uint8 hp_limit) {
_spellSettings[spell_type].maxHPPct = hp_limit; m_bot_spell_settings[spell_type].maxHPPct = hp_limit;
} }
void Bot::SetSpellTypeAEOrGroupTargetCount(uint16 spell_type, uint16 target_count) { void Bot::SetSpellTypeAEOrGroupTargetCount(uint16 spell_type, uint16 target_count) {
_spellSettings[spell_type].AEOrGroupTargetCount = target_count; m_bot_spell_settings[spell_type].AEOrGroupTargetCount = target_count;
} }
std::list<BotSpellTypeOrder> Bot::GetSpellTypesPrioritized(uint8 priority_type) { std::list<BotSpellTypeOrder> Bot::GetSpellTypesPrioritized(uint8 priority_type) {
zone/bot.h
+7 -7
View File
@@ -564,19 +564,19 @@ public:
int GetSetting(uint16 setting_category, uint16 setting_type); int GetSetting(uint16 setting_category, uint16 setting_type);
uint16 GetSpellTypePriority(uint16 spell_type, uint8 priority_type); uint16 GetSpellTypePriority(uint16 spell_type, uint8 priority_type);
void SetSpellTypePriority(uint16 spell_type, uint8 priority_type, uint16 priority); void SetSpellTypePriority(uint16 spell_type, uint8 priority_type, uint16 priority);
inline uint16 GetSpellTypeResistLimit(uint16 spell_type) const { return _spellSettings[spell_type].resistLimit; } inline uint16 GetSpellTypeResistLimit(uint16 spell_type) const { return m_bot_spell_settings[spell_type].resistLimit; }
void SetSpellTypeResistLimit(uint16 spell_type, uint16 resist_limit); void SetSpellTypeResistLimit(uint16 spell_type, uint16 resist_limit);
inline bool GetSpellTypeAggroCheck(uint16 spell_type) const { return _spellSettings[spell_type].aggroCheck; } inline bool GetSpellTypeAggroCheck(uint16 spell_type) const { return m_bot_spell_settings[spell_type].aggroCheck; }
void SetSpellTypeAggroCheck(uint16 spell_type, bool aggro_check); void SetSpellTypeAggroCheck(uint16 spell_type, bool aggro_check);
inline uint8 GetSpellTypeMinManaLimit(uint16 spell_type) const { return _spellSettings[spell_type].minManaPct; } inline uint8 GetSpellTypeMinManaLimit(uint16 spell_type) const { return m_bot_spell_settings[spell_type].minManaPct; }
inline uint8 GetSpellTypeMaxManaLimit(uint16 spell_type) const { return _spellSettings[spell_type].maxManaPct; } inline uint8 GetSpellTypeMaxManaLimit(uint16 spell_type) const { return m_bot_spell_settings[spell_type].maxManaPct; }
void SetSpellTypeMinManaLimit(uint16 spell_type, uint8 mana_limit); void SetSpellTypeMinManaLimit(uint16 spell_type, uint8 mana_limit);
void SetSpellTypeMaxManaLimit(uint16 spell_type, uint8 mana_limit); void SetSpellTypeMaxManaLimit(uint16 spell_type, uint8 mana_limit);
inline uint8 GetSpellTypeMinHPLimit(uint16 spell_type) const { return _spellSettings[spell_type].minHPPct; } inline uint8 GetSpellTypeMinHPLimit(uint16 spell_type) const { return m_bot_spell_settings[spell_type].minHPPct; }
inline uint8 GetSpellTypeMaxHPLimit(uint16 spell_type) const { return _spellSettings[spell_type].maxHPPct; } inline uint8 GetSpellTypeMaxHPLimit(uint16 spell_type) const { return m_bot_spell_settings[spell_type].maxHPPct; }
void SetSpellTypeMinHPLimit(uint16 spell_type, uint8 hp_limit); void SetSpellTypeMinHPLimit(uint16 spell_type, uint8 hp_limit);
void SetSpellTypeMaxHPLimit(uint16 spell_type, uint8 hp_limit); void SetSpellTypeMaxHPLimit(uint16 spell_type, uint8 hp_limit);
inline uint16 GetSpellTypeAEOrGroupTargetCount(uint16 spell_type) const { return _spellSettings[spell_type].AEOrGroupTargetCount; } inline uint16 GetSpellTypeAEOrGroupTargetCount(uint16 spell_type) const { return m_bot_spell_settings[spell_type].AEOrGroupTargetCount; }
void SetSpellTypeAEOrGroupTargetCount(uint16 spell_type, uint16 target_count); void SetSpellTypeAEOrGroupTargetCount(uint16 spell_type, uint16 target_count);
bool BotPassiveCheck(); bool BotPassiveCheck();
zone/client.cpp
+2 -2
View File
@@ -13113,7 +13113,7 @@ void Client::ShowZoneShardMenu()
} }
void Client::LoadDefaultBotSettings() { void Client::LoadDefaultBotSettings() {
_spellSettings.clear(); m_bot_spell_settings.clear();
// Only illusion block supported currently // Only illusion block supported currently
SetBotSetting(BotSettingCategories::BaseSetting, BotBaseSettings::IllusionBlock, GetDefaultBotSettings(BotSettingCategories::BaseSetting, BotBaseSettings::IllusionBlock)); SetBotSetting(BotSettingCategories::BaseSetting, BotBaseSettings::IllusionBlock, GetDefaultBotSettings(BotSettingCategories::BaseSetting, BotBaseSettings::IllusionBlock));
@@ -13130,7 +13130,7 @@ void Client::LoadDefaultBotSettings() {
t.minThreshold = GetDefaultSpellMinThreshold(i); t.minThreshold = GetDefaultSpellMinThreshold(i);
t.maxThreshold = GetDefaultSpellMaxThreshold(i); t.maxThreshold = GetDefaultSpellMaxThreshold(i);
_spellSettings.push_back(t); m_bot_spell_settings.push_back(t);
LogBotSettingsDetail("{} says, 'Setting defaults for {} ({}) [#{}]'", GetCleanName(), t.name, t.shortName, t.spellType); LogBotSettingsDetail("{} says, 'Setting defaults for {} ({}) [#{}]'", GetCleanName(), t.name, t.shortName, t.spellType);
LogBotSettingsDetail("{} says, 'Hold = [{}] | Delay = [{}ms] | MinThreshold = [{}\%] | MaxThreshold = [{}\%]'", GetCleanName(), GetDefaultSpellHold(i), GetDefaultSpellDelay(i), GetDefaultSpellMinThreshold(i), GetDefaultSpellMaxThreshold(i)); LogBotSettingsDetail("{} says, 'Hold = [{}] | Delay = [{}ms] | MinThreshold = [{}\%] | MaxThreshold = [{}\%]'", GetCleanName(), GetDefaultSpellHold(i), GetDefaultSpellDelay(i), GetDefaultSpellMinThreshold(i), GetDefaultSpellMaxThreshold(i));
zone/mob.cpp
+7 -7
View File
@@ -9206,34 +9206,34 @@ uint8 Mob::GetDefaultSpellMaxThreshold(uint16 spell_type, uint8 stance) {
} }
void Mob::SetSpellHold(uint16 spell_type, bool hold_status) { void Mob::SetSpellHold(uint16 spell_type, bool hold_status) {
_spellSettings[spell_type].hold = hold_status; m_bot_spell_settings[spell_type].hold = hold_status;
} }
void Mob::SetSpellDelay(uint16 spell_type, uint16 delay_value) { void Mob::SetSpellDelay(uint16 spell_type, uint16 delay_value) {
_spellSettings[spell_type].delay = delay_value; m_bot_spell_settings[spell_type].delay = delay_value;
} }
void Mob::SetSpellMinThreshold(uint16 spell_type, uint8 threshold_value) { void Mob::SetSpellMinThreshold(uint16 spell_type, uint8 threshold_value) {
_spellSettings[spell_type].minThreshold = threshold_value; m_bot_spell_settings[spell_type].minThreshold = threshold_value;
} }
void Mob::SetSpellMaxThreshold(uint16 spell_type, uint8 threshold_value) { void Mob::SetSpellMaxThreshold(uint16 spell_type, uint8 threshold_value) {
_spellSettings[spell_type].maxThreshold = threshold_value; m_bot_spell_settings[spell_type].maxThreshold = threshold_value;
} }
void Mob::SetSpellTypeRecastTimer(uint16 spell_type, uint32 recast_time) { void Mob::SetSpellTypeRecastTimer(uint16 spell_type, uint32 recast_time) {
_spellSettings[spell_type].recastTimer.Start(recast_time); m_bot_spell_settings[spell_type].recastTimer.Start(recast_time);
} }
void Mob::StartBotSpellTimers() { void Mob::StartBotSpellTimers() {
for (uint16 i = BotSpellTypes::START; i <= BotSpellTypes::END; ++i) { for (uint16 i = BotSpellTypes::START; i <= BotSpellTypes::END; ++i) {
_spellSettings[i].recastTimer.Start(); m_bot_spell_settings[i].recastTimer.Start();
} }
} }
void Mob::DisableBotSpellTimers() { void Mob::DisableBotSpellTimers() {
for (uint16 i = BotSpellTypes::START; i <= BotSpellTypes::END; ++i) { for (uint16 i = BotSpellTypes::START; i <= BotSpellTypes::END; ++i) {
_spellSettings[i].recastTimer.Disable(); m_bot_spell_settings[i].recastTimer.Disable();
} }
} }
zone/mob.h
+7 -7
View File
@@ -230,7 +230,7 @@ public:
// Bot attack flag // Bot attack flag
Timer bot_attack_flag_timer; Timer bot_attack_flag_timer;
std::vector<BotSpellSettings_Struct> _spellSettings; std::vector<BotSpellSettings_Struct> m_bot_spell_settings;
//Somewhat sorted: needs documenting! //Somewhat sorted: needs documenting!
@@ -430,7 +430,7 @@ public:
virtual bool IsImmuneToBotSpell(uint16 spell_id, Mob* caster); virtual bool IsImmuneToBotSpell(uint16 spell_id, Mob* caster);
inline bool SpellTypeRecastCheck(uint16 spellType) { return (IsClient() ? true : _spellSettings[spellType].recastTimer.GetRemainingTime() > 0 ? false : true); } inline bool SpellTypeRecastCheck(uint16 spellType) { return (IsClient() ? true : m_bot_spell_settings[spellType].recastTimer.GetRemainingTime() > 0 ? false : true); }
std::vector<Mob*> GatherSpellTargets(bool entireRaid = false, Mob* target = nullptr, bool no_clients = false, bool no_bots = false, bool no_pets = false); std::vector<Mob*> GatherSpellTargets(bool entireRaid = false, Mob* target = nullptr, bool no_clients = false, bool no_bots = false, bool no_pets = false);
@@ -453,16 +453,16 @@ public:
uint8 GetDefaultSpellMinThreshold(uint16 spell_type, uint8 stance = Stance::Balanced); uint8 GetDefaultSpellMinThreshold(uint16 spell_type, uint8 stance = Stance::Balanced);
uint8 GetDefaultSpellMaxThreshold(uint16 spell_type, uint8 stance = Stance::Balanced); uint8 GetDefaultSpellMaxThreshold(uint16 spell_type, uint8 stance = Stance::Balanced);
inline bool GetSpellHold(uint16 spell_type) const { return _spellSettings[spell_type].hold; } inline bool GetSpellHold(uint16 spell_type) const { return m_bot_spell_settings[spell_type].hold; }
void SetSpellHold(uint16 spell_type, bool hold_status); void SetSpellHold(uint16 spell_type, bool hold_status);
inline uint16 GetSpellDelay(uint16 spell_type) const { return _spellSettings[spell_type].delay; } inline uint16 GetSpellDelay(uint16 spell_type) const { return m_bot_spell_settings[spell_type].delay; }
void SetSpellDelay(uint16 spell_type, uint16 delay_value); void SetSpellDelay(uint16 spell_type, uint16 delay_value);
inline uint8 GetSpellMinThreshold(uint16 spell_type) const { return _spellSettings[spell_type].minThreshold; } inline uint8 GetSpellMinThreshold(uint16 spell_type) const { return m_bot_spell_settings[spell_type].minThreshold; }
void SetSpellMinThreshold(uint16 spell_type, uint8 threshold_value); void SetSpellMinThreshold(uint16 spell_type, uint8 threshold_value);
inline uint8 GetSpellMaxThreshold(uint16 spell_type) const { return _spellSettings[spell_type].maxThreshold; } inline uint8 GetSpellMaxThreshold(uint16 spell_type) const { return m_bot_spell_settings[spell_type].maxThreshold; }
void SetSpellMaxThreshold(uint16 spell_type, uint8 threshold_value); void SetSpellMaxThreshold(uint16 spell_type, uint8 threshold_value);
inline uint16 GetSpellTypeRecastTimer(uint16 spell_type) { return _spellSettings[spell_type].recastTimer.GetRemainingTime(); } inline uint16 GetSpellTypeRecastTimer(uint16 spell_type) { return m_bot_spell_settings[spell_type].recastTimer.GetRemainingTime(); }
void SetSpellTypeRecastTimer(uint16 spell_type, uint32 recast_time); void SetSpellTypeRecastTimer(uint16 spell_type, uint32 recast_time);
uint8 GetHPRatioForSpellType(uint16 spell_type, Mob* tar); uint8 GetHPRatioForSpellType(uint16 spell_type, Mob* tar);