Untitled diff

Created Diff never expires
1 removal
13 lines
1 addition
13 lines
int32_t WeaponMelee::getWeaponDamage(const Player* player, const Creature*, const Item* item, bool maxDamage /*= false*/) const
int32_t WeaponMelee::getWeaponDamage(const Player* player, const Creature*, const Item* item, bool maxDamage /*= false*/) const
{
{
int32_t attackSkill = player->getWeaponSkill(item);
int32_t attackSkill = player->getWeaponSkill(item);
int32_t attackValue = std::max<int32_t>(0, item->getAttack());
int32_t attackValue = std::max<int32_t>(0, item->getAttack());
float attackFactor = player->getAttackFactor();
float attackFactor = player->getAttackFactor();


int32_t maxValue = static_cast<int32_t>(Weapons::getMaxWeaponDamage(player->getLevel(), attackSkill, attackValue, attackFactor) * player->getVocation()->meleeDamageMultiplier);
int32_t maxValue = static_cast<int32_t>(Weapons::getMaxWeaponDamage(player->getLevel(), attackSkill, attackValue, attackFactor, player->getPassiveDamageBonus()) * player->getVocation()->meleeDamageMultiplier);
if (maxDamage) {
if (maxDamage) {
return -maxValue;
return -maxValue;
}
}


return -normal_random(0, maxValue);
return -normal_random(0, maxValue);
}
}