pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-02-21 13:42:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] spell cast time cap issue introduced in e5b9d72b81 (#1435)

Browse Source 
Me bad coder.
This commit is contained in:
Michael Cook (mackal) 2021-06-22 12:08:04 -04:00 committed by GitHub
parent 34d5959cae
commit c214c3a95b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zone/bot.cpp
View File

@ -6793,6 +6793,7 @@ int32 Bot::GetActSpellHealing(uint16 spell_id, int32 value, Mob* target) {
int32 Bot::GetActSpellCasttime(uint16 spell_id, int32 casttime) {
int32 cast_reducer = GetBotFocusEffect(focusSpellHaste, spell_id);
auto min_cap = casttime / 2;
uint8 botlevel = GetLevel();
uint8 botclass = GetClass();
if (botlevel >= 51 && casttime >= 3000 && !spells[spell_id].goodEffect &&
@ -6870,7 +6871,7 @@ int32 Bot::GetActSpellCasttime(uint16 spell_id, int32 casttime) {
}
casttime = casttime * (100 - cast_reducer) / 100;
return std::max(casttime, casttime / 2);
return std::max(casttime, min_cap);
}
int32 Bot::GetActSpellCost(uint16 spell_id, int32 cost) {

3
zone/mob.cpp
View File

@ -3124,6 +3124,7 @@ uint32 Mob::GetLevelHP(uint8 tlevel)
int32 Mob::GetActSpellCasttime(uint16 spell_id, int32 casttime)
{
int32 cast_reducer = GetFocusEffect(focusSpellHaste, spell_id);
auto min_cap = casttime / 2;
if (level > 50 && casttime >= 3000 && !spells[spell_id].goodEffect &&
(GetClass() == RANGER || GetClass() == SHADOWKNIGHT || GetClass() == PALADIN || GetClass() == BEASTLORD)) {
@ -3132,7 +3133,7 @@ int32 Mob::GetActSpellCasttime(uint16 spell_id, int32 casttime)
}
casttime = casttime * (100 - cast_reducer) / 100;
return std::max(casttime, casttime / 2);
return std::max(casttime, min_cap);
}
void Mob::ExecWeaponProc(const EQ::ItemInstance *inst, uint16 spell_id, Mob *on, int level_override) {