diff options
| -rw-r--r-- | src/game/DBCEnums.h | 5 | ||||
| -rw-r--r-- | src/game/Player.cpp | 16 | ||||
| -rw-r--r-- | src/game/World.cpp | 4 |
3 files changed, 19 insertions, 6 deletions
diff --git a/src/game/DBCEnums.h b/src/game/DBCEnums.h index 44ab34d7a11..a0e030bf7cb 100644 --- a/src/game/DBCEnums.h +++ b/src/game/DBCEnums.h @@ -19,6 +19,11 @@ #ifndef DBCENUMS_H #define DBCENUMS_H +// Client expected level limitation, like as used in DBC item max levels for "until max player level" +// use as default max player level, must be fit max level for used client +// also see MAX_LEVEL and STRONG_MAX_LEVEL define +#define DEFAULT_MAX_LEVEL 80 + // client supported max level for player/pets/etc. Avoid overflow or client stability affected. // also see GT_MAX_LEVEL define #define MAX_LEVEL 100 diff --git a/src/game/Player.cpp b/src/game/Player.cpp index c54679ad623..6e758df7a77 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -6690,13 +6690,20 @@ void Player::_ApplyItemMods(Item *item, uint8 slot,bool apply) void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool apply, bool only_level_scale /*= false*/) { - if(slot >= INVENTORY_SLOT_BAG_END || !proto) + if (slot >= INVENTORY_SLOT_BAG_END || !proto) return; ScalingStatDistributionEntry const *ssd = proto->ScalingStatDistribution ? sScalingStatDistributionStore.LookupEntry(proto->ScalingStatDistribution) : NULL; - ScalingStatValuesEntry const *ssv = proto->ScalingStatValue ? sScalingStatValuesStore.LookupEntry(getLevel()) : NULL; + if (only_level_scale && !ssd) + return; + + // req. check at equip, but allow use for extended range if range limit max level, set proper level + uint32 ssd_level = getLevel(); + if (ssd && ssd_level > ssd->MaxLevel) + ssd_level = ssd->MaxLevel; - if(only_level_scale && !(ssd && ssv)) + ScalingStatValuesEntry const *ssv = proto->ScalingStatValue ? sScalingStatValuesStore.LookupEntry(ssd_level) : NULL; + if (only_level_scale && !ssv) return; for (uint8 i = 0; i < MAX_ITEM_PROTO_STATS; ++i) @@ -10145,7 +10152,8 @@ uint8 Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bo } ScalingStatDistributionEntry const *ssd = pProto->ScalingStatDistribution ? sScalingStatDistributionStore.LookupEntry(pProto->ScalingStatDistribution) : 0; - if (ssd && ssd->MaxLevel < getLevel()) + // check allowed level (extend range to upper values if MaxLevel more or equal max player level, this let GM set high level with 1...max range items) + if (ssd && ssd->MaxLevel < DEFAULT_MAX_LEVEL && ssd->MaxLevel < getLevel()) return EQUIP_ERR_ITEM_CANT_BE_EQUIPPED; uint8 eslot = FindEquipSlot( pProto, slot, swap ); diff --git a/src/game/World.cpp b/src/game/World.cpp index 1f82c4d2c9b..bfd7893c7b6 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -711,12 +711,12 @@ void World::LoadConfigSettings(bool reload) if(reload) { - uint32 val = sConfig.GetIntDefault("MaxPlayerLevel", 80); + uint32 val = sConfig.GetIntDefault("MaxPlayerLevel", DEFAULT_MAX_LEVEL); if(val!=m_configs[CONFIG_MAX_PLAYER_LEVEL]) sLog.outError("MaxPlayerLevel option can't be changed at config reload, using current value (%u).",m_configs[CONFIG_MAX_PLAYER_LEVEL]); } else - m_configs[CONFIG_MAX_PLAYER_LEVEL] = sConfig.GetIntDefault("MaxPlayerLevel", 80); + m_configs[CONFIG_MAX_PLAYER_LEVEL] = sConfig.GetIntDefault("MaxPlayerLevel", DEFAULT_MAX_LEVEL); if(m_configs[CONFIG_MAX_PLAYER_LEVEL] > MAX_LEVEL) { |