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

Fix when the random +1 tick is added to nerf extension focus effects to where they should be

Browse Source
This commit is contained in:
Michael Cook 2013-10-03 23:04:58 -04:00
parent bf77bc47d1
commit 6b4b259753
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog.txt
View File

@ -1,5 +1,8 @@
EQEMu Changelog (Started on Sept 24, 2003 15:50) EQEMu Changelog (Started on Sept 24, 2003 15:50)
------------------------------------------------------- -------------------------------------------------------
== 10/03/2013 ==
demonstar55: Fix when the random +1 tick is added to nerf extension focus effects to where they should be
== 09/30/2013 == == 09/30/2013 ==
Sorvani: Changed SummonItem to only summon an item with max charges when said default value is present and not on zero charges Sorvani: Changed SummonItem to only summon an item with max charges when said default value is present and not on zero charges
demonstar55: Fixed issue with #showstats showing your level for a bunch of values demonstar55: Fixed issue with #showstats showing your level for a bunch of values

8
zone/effects.cpp
View File

@ -414,6 +414,14 @@ int32 Client::GetActSpellDuration(uint16 spell_id, int32 duration)
if(IsMezSpell(spell_id)) { if(IsMezSpell(spell_id)) {
tic_inc += GetAA(aaMesmerizationMastery); tic_inc += GetAA(aaMesmerizationMastery);
} }
// Only need this for clients, since the change was for bard songs, I assume we should keep non bard songs getting +1
// However if its bard or not and is mez, charm or fear, we need to add 1 so that client is in sync
if(!IsShortDurationBuff(spell_id) ||
IsFearSpell(spell_id) ||
IsCharmSpell(spell_id) ||
IsMezSpell(spell_id) ||
IsBlindSpell(spell_id))
tic_inc += 1;
return (((duration * increase) / 100) + tic_inc); return (((duration * increase) / 100) + tic_inc);
} }

8
zone/spells.cpp
View File

@ -2364,14 +2364,6 @@ int Mob::CalcBuffDuration(Mob *caster, Mob *target, uint16 spell_id, int32 caste
castlevel = caster_level_override; castlevel = caster_level_override;
int res = CalcBuffDuration_formula(castlevel, formula, duration); int res = CalcBuffDuration_formula(castlevel, formula, duration);
// Only need this for clients, since the change was for bard songs, I assume we should keep non bard songs getting +1
// However if its bard or not and is mez, charm or fear, we need to add 1 so that client is in sync
if(!IsShortDurationBuff(spell_id) ||
IsFearSpell(spell_id) ||
IsCharmSpell(spell_id) ||
IsMezSpell(spell_id) ||
IsBlindSpell(spell_id))
res += 1;
res = mod_buff_duration(res, caster, target, spell_id); res = mod_buff_duration(res, caster, target, spell_id);