mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-12 05:21:29 +00:00
[Hotfix] Revert GetSkill from #4234
This commit is contained in:
parent
fddb91794b
commit
fe136e58e4
@ -12418,34 +12418,10 @@ 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) {
|
return (itembonuses.skillmod[skill_id] > 0 ? (itembonuses.skillmodmax[skill_id] > 0 ? std::min(
|
||||||
if (itembonuses.skillmod[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 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);
|
|
||||||
}
|
|
||||||
|
|
||||||
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] + itembonuses.skillmodmax[skill_id],
|
||||||
m_pp.skills[skill_id] * (100 + itembonuses.skillmod[skill_id]) / 100
|
m_pp.skills[skill_id] * (100 + itembonuses.skillmod[skill_id]) / 100
|
||||||
);
|
) : m_pp.skills[skill_id] * (100 + itembonuses.skillmod[skill_id]) / 100) : m_pp.skills[skill_id]);
|
||||||
}
|
}
|
||||||
return m_pp.skills[skill_id] * (100 + itembonuses.skillmod[skill_id]) / 100;
|
|
||||||
}
|
|
||||||
return m_pp.skills[skill_id];
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user