Merge branch 'master' into loot

This commit is contained in:
KimLS 2014-09-27 20:09:13 -07:00
commit ef082b9144
2 changed files with 3 additions and 2 deletions

View File

@ -6,6 +6,7 @@ Note: identifier is the stat field in spells_new, slot is used for certain effec
Example $mob->GetSpellStat(121, "range"); //Returns spell range
Example $mob->GetSpellStat(121, "effectid", 1); //Returns the the value of effectid1
This will allow you to pull almost all the data for any spell in quest files.
demonstar55: Move the client's SetAttackTimer to the end of Client::CalcBonuses to keep the haste in sync
== 09/24/2014 ==
Uleat: Re-ordered server opcodes and handlers to give them some predictability of location (I need this for the inventory re-enumeration.)

View File

@ -104,6 +104,8 @@ void Client::CalcBonuses()
CalcMaxMana();
CalcMaxEndurance();
SetAttackTimer();
rooted = FindType(SE_Root);
XPRate = 100 + spellbonuses.XPRateMod;
@ -174,8 +176,6 @@ void Client::CalcItemBonuses(StatBonuses* newbon) {
if(newbon->EnduranceRegen > CalcEnduranceRegenCap())
newbon->EnduranceRegen = CalcEnduranceRegenCap();
SetAttackTimer();
}
void Client::AddItemBonuses(const ItemInst *inst, StatBonuses* newbon, bool isAug, bool isTribute) {