diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-01-14 22:37:13 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-01-14 22:37:13 +0100 |
| commit | f11e6c8247dc519b8331b41a76a3dd64378071d6 (patch) | |
| tree | 4da15edfe31084356041536d8bbf5419af097da1 /src/server/game/Entities | |
| parent | 820c69ed8cc2523b69c22fd5dec78fae0ee590ba (diff) | |
Core: Updated to 7.1.5.23360
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Object/Updates/UpdateFields.h | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 26 |
2 files changed, 26 insertions, 2 deletions
diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h index a941a2360f2..8e6d7136d1d 100644 --- a/src/server/game/Entities/Object/Updates/UpdateFields.h +++ b/src/server/game/Entities/Object/Updates/UpdateFields.h @@ -19,7 +19,7 @@ #ifndef _UPDATEFIELDS_H #define _UPDATEFIELDS_H -// Auto generated for version 7, 1, 0, 22900 +// Auto generated for version 7, 1, 5, 23360 enum ObjectFields { diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 74cbb8fa163..1ac799d6b68 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -7170,7 +7170,31 @@ void Player::_ApplyItemBonuses(Item* item, uint8 slot, bool apply) uint32 itemLevel = item->GetItemLevel(this); float combatRatingMultiplier = 1.0f; if (GtCombatRatingsMultByILvl const* ratingMult = sCombatRatingsMultByILvlGameTable.GetRow(itemLevel)) - combatRatingMultiplier = ratingMult->RatingMultiplier; + { + switch (proto->GetInventoryType()) + { + case INVTYPE_WEAPON: + case INVTYPE_SHIELD: + case INVTYPE_RANGED: + case INVTYPE_2HWEAPON: + case INVTYPE_WEAPONMAINHAND: + case INVTYPE_WEAPONOFFHAND: + case INVTYPE_HOLDABLE: + case INVTYPE_RANGEDRIGHT: + combatRatingMultiplier = ratingMult->WeaponMultiplier; + break; + case INVTYPE_TRINKET: + combatRatingMultiplier = ratingMult->TrinketMultiplier; + break; + case INVTYPE_NECK: + case INVTYPE_FINGER: + combatRatingMultiplier = ratingMult->JewelryMultiplier; + break; + default: + combatRatingMultiplier = ratingMult->ArmorMultiplier; + break; + } + } // req. check at equip, but allow use for extended range if range limit max level, set proper level for (uint8 i = 0; i < MAX_ITEM_PROTO_STATS; ++i) |