mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-27 12:27:17 +00:00
Fix defaults for clients
This commit is contained in:
+3
-3
@@ -2283,9 +2283,9 @@ public:
|
|||||||
int GetBotSetting(uint8 setting_type, uint16 bot_setting);
|
int GetBotSetting(uint8 setting_type, uint16 bot_setting);
|
||||||
void SetBotSetting(uint8 setting_type, uint16 bot_setting, uint32 setting_value);
|
void SetBotSetting(uint8 setting_type, uint16 bot_setting, uint32 setting_value);
|
||||||
|
|
||||||
uint16 GetDefaultSpellDelay(uint16 spell_type, uint8 stance = Stance::Balanced);
|
uint16 GetDefaultSpellDelay(uint16 spell_type);
|
||||||
uint8 GetDefaultSpellMinThreshold(uint16 spell_type, uint8 stance = Stance::Balanced);
|
uint8 GetDefaultSpellMinThreshold(uint16 spell_type);
|
||||||
uint8 GetDefaultSpellMaxThreshold(uint16 spell_type, uint8 stance = Stance::Balanced);
|
uint8 GetDefaultSpellMaxThreshold(uint16 spell_type);
|
||||||
inline uint16 GetSpellDelay(uint16 spell_type) const { return m_bot_spell_settings[spell_type].delay; }
|
inline uint16 GetSpellDelay(uint16 spell_type) const { return m_bot_spell_settings[spell_type].delay; }
|
||||||
inline void SetSpellDelay(uint16 spell_type, uint16 delay_value) { m_bot_spell_settings[spell_type].delay = delay_value; }
|
inline void SetSpellDelay(uint16 spell_type, uint16 delay_value) { m_bot_spell_settings[spell_type].delay = delay_value; }
|
||||||
inline uint8 GetSpellMinThreshold(uint16 spell_type) const { return m_bot_spell_settings[spell_type].min_threshold; }
|
inline uint8 GetSpellMinThreshold(uint16 spell_type) const { return m_bot_spell_settings[spell_type].min_threshold; }
|
||||||
|
|||||||
+5
-49
@@ -348,7 +348,7 @@ void Client::SendSpellTypePrompts(bool commanded_types, bool client_only_types)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint16 Client::GetDefaultSpellDelay(uint16 spell_type, uint8 stance) {
|
uint16 Client::GetDefaultSpellDelay(uint16 spell_type) {
|
||||||
switch (spell_type) {
|
switch (spell_type) {
|
||||||
case BotSpellTypes::VeryFastHeals:
|
case BotSpellTypes::VeryFastHeals:
|
||||||
case BotSpellTypes::PetVeryFastHeals:
|
case BotSpellTypes::PetVeryFastHeals:
|
||||||
@@ -379,84 +379,40 @@ uint16 Client::GetDefaultSpellDelay(uint16 spell_type, uint8 stance) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8 Client::GetDefaultSpellMinThreshold(uint16 spell_type, uint8 stance) {
|
uint8 Client::GetDefaultSpellMinThreshold(uint16 spell_type) {
|
||||||
switch (spell_type) {
|
switch (spell_type) {
|
||||||
default:
|
default:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8 Client::GetDefaultSpellMaxThreshold(uint16 spell_type, uint8 stance) {
|
uint8 Client::GetDefaultSpellMaxThreshold(uint16 spell_type) {
|
||||||
uint8 bot_class = GetClass();
|
uint8 client_class = GetClass();
|
||||||
|
|
||||||
switch (spell_type) {
|
switch (spell_type) {
|
||||||
case BotSpellTypes::VeryFastHeals:
|
case BotSpellTypes::VeryFastHeals:
|
||||||
case BotSpellTypes::PetVeryFastHeals:
|
case BotSpellTypes::PetVeryFastHeals:
|
||||||
switch (stance) {
|
|
||||||
case Stance::AEBurn:
|
|
||||||
case Stance::Burn:
|
|
||||||
case Stance::Aggressive:
|
|
||||||
return 40;
|
|
||||||
case Stance::Efficient:
|
|
||||||
default:
|
|
||||||
return 25;
|
return 25;
|
||||||
}
|
|
||||||
case BotSpellTypes::FastHeals:
|
case BotSpellTypes::FastHeals:
|
||||||
case BotSpellTypes::PetFastHeals:
|
case BotSpellTypes::PetFastHeals:
|
||||||
switch (stance) {
|
|
||||||
case Stance::AEBurn:
|
|
||||||
case Stance::Burn:
|
|
||||||
case Stance::Aggressive:
|
|
||||||
return 55;
|
|
||||||
case Stance::Efficient:
|
|
||||||
return 35;
|
|
||||||
default:
|
|
||||||
return 40;
|
return 40;
|
||||||
}
|
|
||||||
case BotSpellTypes::GroupHeals:
|
case BotSpellTypes::GroupHeals:
|
||||||
case BotSpellTypes::RegularHeal:
|
case BotSpellTypes::RegularHeal:
|
||||||
case BotSpellTypes::PetRegularHeals:
|
case BotSpellTypes::PetRegularHeals:
|
||||||
switch (stance) {
|
|
||||||
case Stance::AEBurn:
|
|
||||||
case Stance::Burn:
|
|
||||||
case Stance::Aggressive:
|
|
||||||
return 70;
|
|
||||||
case Stance::Efficient:
|
|
||||||
return 50;
|
|
||||||
default:
|
|
||||||
return 60;
|
return 60;
|
||||||
}
|
|
||||||
case BotSpellTypes::CompleteHeal:
|
case BotSpellTypes::CompleteHeal:
|
||||||
case BotSpellTypes::GroupCompleteHeals:
|
case BotSpellTypes::GroupCompleteHeals:
|
||||||
case BotSpellTypes::PetCompleteHeals:
|
case BotSpellTypes::PetCompleteHeals:
|
||||||
switch (stance) {
|
|
||||||
case Stance::AEBurn:
|
|
||||||
case Stance::Burn:
|
|
||||||
case Stance::Aggressive:
|
|
||||||
return 90;
|
|
||||||
case Stance::Efficient:
|
|
||||||
return 65;
|
|
||||||
default:
|
|
||||||
return 80;
|
return 80;
|
||||||
}
|
|
||||||
case BotSpellTypes::GroupHoTHeals:
|
case BotSpellTypes::GroupHoTHeals:
|
||||||
case BotSpellTypes::HoTHeals:
|
case BotSpellTypes::HoTHeals:
|
||||||
case BotSpellTypes::PetHoTHeals:
|
case BotSpellTypes::PetHoTHeals:
|
||||||
if (bot_class == Class::Necromancer || bot_class == Class::Shaman) {
|
if (client_class == Class::Necromancer || client_class == Class::Shaman) {
|
||||||
return 60;
|
return 60;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
switch (stance) {
|
|
||||||
case Stance::AEBurn:
|
|
||||||
case Stance::Burn:
|
|
||||||
case Stance::Aggressive:
|
|
||||||
return 95;
|
|
||||||
case Stance::Efficient:
|
|
||||||
return 80;
|
|
||||||
default:
|
|
||||||
return 90;
|
return 90;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
case BotSpellTypes::Buff:
|
case BotSpellTypes::Buff:
|
||||||
case BotSpellTypes::Cure:
|
case BotSpellTypes::Cure:
|
||||||
case BotSpellTypes::GroupCures:
|
case BotSpellTypes::GroupCures:
|
||||||
|
|||||||
Reference in New Issue
Block a user