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

Fix songcap implementation

Browse Source
This commit is contained in:
Michael Cook (mackal) 2015-06-27 22:43:00 -04:00
parent 5a6685d129
commit 009918cbd1
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zone/client_mods.cpp
View File

@ -1979,10 +1979,17 @@ uint32 Mob::GetInstrumentMod(uint16 spell_id) const
uint32 effectmod = 10; uint32 effectmod = 10;
int effectmodcap = 0; int effectmodcap = 0;
if (RuleB(Character, UseSpellFileSongCap)) bool nocap = false;
if (RuleB(Character, UseSpellFileSongCap)) {
effectmodcap = spells[spell_id].songcap / 10; effectmodcap = spells[spell_id].songcap / 10;
// this looks a bit weird, but easiest way I could think to keep both systems working
if (effectmodcap == 0)
nocap = true;
else else
effectmodcap += 10;
} else {
effectmodcap = RuleI(Character, BaseInstrumentSoftCap); effectmodcap = RuleI(Character, BaseInstrumentSoftCap);
}
// this should never use spell modifiers... // this should never use spell modifiers...
// if a spell grants better modifers, they are copied into the item mods // if a spell grants better modifers, they are copied into the item mods
// because the spells are supposed to act just like having the intrument. // because the spells are supposed to act just like having the intrument.
@ -2056,7 +2063,7 @@ uint32 Mob::GetInstrumentMod(uint16 spell_id) const
effectmodcap += aabonuses.songModCap + spellbonuses.songModCap + itembonuses.songModCap; effectmodcap += aabonuses.songModCap + spellbonuses.songModCap + itembonuses.songModCap;
if (effectmod < 10) if (effectmod < 10)
effectmod = 10; effectmod = 10;
if (effectmodcap && effectmod > effectmodcap) // if the cap is calculated to be 0 using new rules, no cap. if (!nocap && effectmod > effectmodcap) // if the cap is calculated to be 0 using new rules, no cap.
effectmod = effectmodcap; effectmod = effectmodcap;
Log.Out(Logs::Detail, Logs::Spells, "%s::GetInstrumentMod() spell=%d mod=%d modcap=%d\n", GetName(), spell_id, Log.Out(Logs::Detail, Logs::Spells, "%s::GetInstrumentMod() spell=%d mod=%d modcap=%d\n", GetName(), spell_id,
effectmod, effectmodcap); effectmod, effectmodcap);