mirror of
https://github.com/EQEmu/Server.git
synced 2026-03-30 13:32:26 +00:00
[Hotfix] GetSkill default return 0
This commit is contained in:
parent
fa733eee50
commit
ad3a675222
@ -12418,25 +12418,27 @@ std::vector<Mob*> Client::GetRaidOrGroupOrSelf(bool clients_only)
|
|||||||
uint16 Client::GetSkill(EQ::skills::SkillType skill_id) const
|
uint16 Client::GetSkill(EQ::skills::SkillType skill_id) const
|
||||||
{
|
{
|
||||||
if (skill_id <= EQ::skills::HIGHEST_SKILL) {
|
if (skill_id <= EQ::skills::HIGHEST_SKILL) {
|
||||||
|
|
||||||
if (spellbonuses.ReduceSkill[skill_id] > 0) {
|
if (spellbonuses.ReduceSkill[skill_id] > 0) {
|
||||||
|
|
||||||
if (itembonuses.skillmod[skill_id] > 0) {
|
if (itembonuses.skillmod[skill_id] > 0) {
|
||||||
|
|
||||||
if (itembonuses.skillmodmax[skill_id] > 0) {
|
if (itembonuses.skillmodmax[skill_id] > 0) {
|
||||||
return std::min(m_pp.skills[skill_id] + itembonuses.skillmodmax[skill_id], m_pp.skills[skill_id] + ((m_pp.skills[skill_id] * (itembonuses.skillmod[skill_id] - spellbonuses.ReduceSkill[skill_id])) / 100));
|
return std::min(
|
||||||
|
m_pp.skills[skill_id] + itembonuses.skillmodmax[skill_id],
|
||||||
|
m_pp.skills[skill_id] + ((m_pp.skills[skill_id] * (itembonuses.skillmod[skill_id] -
|
||||||
|
spellbonuses.ReduceSkill[skill_id])) / 100));
|
||||||
}
|
}
|
||||||
return m_pp.skills[skill_id] + ((m_pp.skills[skill_id] * (itembonuses.skillmod[skill_id] - spellbonuses.ReduceSkill[skill_id])) / 100);
|
return m_pp.skills[skill_id] + ((m_pp.skills[skill_id] * (itembonuses.skillmod[skill_id] -
|
||||||
|
spellbonuses.ReduceSkill[skill_id])) / 100);
|
||||||
}
|
}
|
||||||
return m_pp.skills[skill_id] - ((m_pp.skills[skill_id] * spellbonuses.ReduceSkill[skill_id]) / 100);
|
return m_pp.skills[skill_id] - ((m_pp.skills[skill_id] * spellbonuses.ReduceSkill[skill_id]) / 100);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (itembonuses.skillmod[skill_id] > 0) {
|
if (itembonuses.skillmod[skill_id] > 0) {
|
||||||
|
if (itembonuses.skillmodmax[skill_id] > 0) {
|
||||||
if (itembonuses.skillmodmax[skill_id] > 0){
|
|
||||||
|
|
||||||
if (itembonuses.skillmodmax[skill_id] > 0) {
|
if (itembonuses.skillmodmax[skill_id] > 0) {
|
||||||
return std::min(m_pp.skills[skill_id] + itembonuses.skillmodmax[skill_id], m_pp.skills[skill_id] * (100 + itembonuses.skillmod[skill_id]) / 100);
|
return std::min(
|
||||||
|
m_pp.skills[skill_id] + itembonuses.skillmodmax[skill_id],
|
||||||
|
m_pp.skills[skill_id] * (100 + itembonuses.skillmod[skill_id]) / 100
|
||||||
|
);
|
||||||
}
|
}
|
||||||
return m_pp.skills[skill_id] * (100 + itembonuses.skillmod[skill_id]) / 100;
|
return m_pp.skills[skill_id] * (100 + itembonuses.skillmod[skill_id]) / 100;
|
||||||
}
|
}
|
||||||
@ -12444,4 +12446,6 @@ uint16 Client::GetSkill(EQ::skills::SkillType skill_id) const
|
|||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user