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

Cap tic diff to 0 for duration based calcs

Browse Source 
This will match Splurt with the double 191
This commit is contained in:
Michael Cook (mackal) 2016-07-23 17:52:30 -04:00
parent 83548ee405
commit cd9a7f1d5d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zone/spell_effects.cpp
View File

@ -3145,7 +3145,7 @@ snare has both of them negative, yet their range should work the same:
case 107: case 107:
{ {
int ticdif = CalcBuffDuration_formula(caster_level, spells[spell_id].buffdurationformula, spells[spell_id].buffduration) - (ticsremaining - 1); int ticdif = CalcBuffDuration_formula(caster_level, spells[spell_id].buffdurationformula, spells[spell_id].buffduration) - std::max((ticsremaining - 1), 0);
if (ticdif < 0) if (ticdif < 0)
ticdif = 0; ticdif = 0;
result = updownsign * (ubase - ticdif); result = updownsign * (ubase - ticdif);
@ -3154,7 +3154,7 @@ snare has both of them negative, yet their range should work the same:
} }
case 108: case 108:
{ {
int ticdif = CalcBuffDuration_formula(caster_level, spells[spell_id].buffdurationformula, spells[spell_id].buffduration) - (ticsremaining - 1); int ticdif = CalcBuffDuration_formula(caster_level, spells[spell_id].buffdurationformula, spells[spell_id].buffduration) - std::max((ticsremaining - 1), 0);
if (ticdif < 0) if (ticdif < 0)
ticdif = 0; ticdif = 0;
result = updownsign * (ubase - (2 * ticdif)); result = updownsign * (ubase - (2 * ticdif));
@ -3207,7 +3207,7 @@ snare has both of them negative, yet their range should work the same:
result = ubase + (caster_level / 8); break; result = ubase + (caster_level / 8); break;
case 120: case 120:
{ {
int ticdif = CalcBuffDuration_formula(caster_level, spells[spell_id].buffdurationformula, spells[spell_id].buffduration) - (ticsremaining - 1); int ticdif = CalcBuffDuration_formula(caster_level, spells[spell_id].buffdurationformula, spells[spell_id].buffduration) - std::max((ticsremaining - 1), 0);
if (ticdif < 0) if (ticdif < 0)
ticdif = 0; ticdif = 0;
result = updownsign * (ubase - (5 * ticdif)); result = updownsign * (ubase - (5 * ticdif));
@ -3218,7 +3218,7 @@ snare has both of them negative, yet their range should work the same:
result = ubase + (caster_level / 3); break; result = ubase + (caster_level / 3); break;
case 122: case 122:
{ {
int ticdif = CalcBuffDuration_formula(caster_level, spells[spell_id].buffdurationformula, spells[spell_id].buffduration) - (ticsremaining - 1); int ticdif = CalcBuffDuration_formula(caster_level, spells[spell_id].buffdurationformula, spells[spell_id].buffduration) - std::max((ticsremaining - 1), 0);
if(ticdif < 0) if(ticdif < 0)
ticdif = 0; ticdif = 0;
@ -3330,7 +3330,7 @@ snare has both of them negative, yet their range should work the same:
{ {
// These work like splurt, accept instead of being hard coded to 12, it is formula - 1000. // These work like splurt, accept instead of being hard coded to 12, it is formula - 1000.
// Formula 1999 seems to have a slightly different effect, so is not included here // Formula 1999 seems to have a slightly different effect, so is not included here
int ticdif = CalcBuffDuration_formula(caster_level, spells[spell_id].buffdurationformula, spells[spell_id].buffduration) - (ticsremaining - 1); int ticdif = CalcBuffDuration_formula(caster_level, spells[spell_id].buffdurationformula, spells[spell_id].buffduration) - std::max((ticsremaining - 1), 0);
if(ticdif < 0) if(ticdif < 0)
ticdif = 0; ticdif = 0;