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

Fix stacking issues with SE_DamageModifier and SE_MinDamageModifier

Browse Source
This commit is contained in:
Michael Cook (mackal) 2016-01-10 15:31:04 -05:00
parent 1aa98d34ca
commit 6fc5f8fba2
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
zone/bonuses.cpp
View File

@ -1555,9 +1555,12 @@ void Mob::CalcSpellBonuses(StatBonuses* newbon)
NegateSpellsBonuses(buffs[i].spellid); NegateSpellsBonuses(buffs[i].spellid);
} }
} }
// THIS IS WRONG, leaving for now
//this prolly suffer from roundoff error slightly... //this prolly suffer from roundoff error slightly...
newbon->AC = newbon->AC * 10 / 34; //ratio determined impirically from client. newbon->AC = newbon->AC * 10 / 34; //ratio determined impirically from client.
if (GetClass() == BARD) newbon->ManaRegen = 0; // Bards do not get mana regen from spells. if (GetClass() == BARD)
newbon->ManaRegen = 0; // Bards do not get mana regen from spells.
} }
void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *new_bonus, uint16 casterId, void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *new_bonus, uint16 casterId,
@ -2209,10 +2212,11 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne
// Bad data or unsupported new skill // Bad data or unsupported new skill
if (base2 > HIGHEST_SKILL) if (base2 > HIGHEST_SKILL)
break; break;
if(base2 == ALL_SKILLS) int skill = base2 == ALL_SKILLS ? HIGHEST_SKILL + 1 : base2;
new_bonus->DamageModifier[HIGHEST_SKILL+1] += effect_value; if (effect_value < 0 && new_bonus->DamageModifier[skill] > effect_value)
else new_bonus->DamageModifier[skill] = effect_value;
new_bonus->DamageModifier[base2] += effect_value; else if (effect_value > 0 && new_bonus->DamageModifier[skill] < effect_value)
new_bonus->DamageModifier[skill] = effect_value;
break; break;
} }
@ -2221,10 +2225,11 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne
// Bad data or unsupported new skill // Bad data or unsupported new skill
if (base2 > HIGHEST_SKILL) if (base2 > HIGHEST_SKILL)
break; break;
if(base2 == ALL_SKILLS) int skill = base2 == ALL_SKILLS ? HIGHEST_SKILL + 1 : base2;
new_bonus->DamageModifier2[HIGHEST_SKILL+1] += effect_value; if (effect_value < 0 && new_bonus->DamageModifier2[skill] > effect_value)
else new_bonus->DamageModifier2[skill] = effect_value;
new_bonus->DamageModifier2[base2] += effect_value; else if (effect_value > 0 && new_bonus->DamageModifier2[skill] < effect_value)
new_bonus->DamageModifier2[skill] = effect_value;
break; break;
} }
@ -2233,10 +2238,11 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne
// Bad data or unsupported new skill // Bad data or unsupported new skill
if (base2 > HIGHEST_SKILL) if (base2 > HIGHEST_SKILL)
break; break;
if(base2 == ALL_SKILLS) int skill = base2 == ALL_SKILLS ? HIGHEST_SKILL + 1 : base2;
new_bonus->MinDamageModifier[HIGHEST_SKILL+1] += effect_value; if (effect_value < 0 && new_bonus->MinDamageModifier[skill] > effect_value)
else new_bonus->MinDamageModifier[skill] = effect_value;
new_bonus->MinDamageModifier[base2] += effect_value; else if (effect_value > 0 && new_bonus->MinDamageModifier[skill] < effect_value)
new_bonus->MinDamageModifier[skill] = effect_value;
break; break;
} }