Return zero as nonexistent skill level.

This commit is contained in:
MobiusDev
2018-03-27 01:39:11 +00:00
parent 30ce5ece22
commit 1d11e95d62
66 changed files with 81 additions and 117 deletions

View File

@@ -5257,7 +5257,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
public int getSkillLevel(int skillId)
{
final Skill skill = getKnownSkill(skillId);
return (skill == null) ? -1 : skill.getLevel();
return (skill == null) ? 0 : skill.getLevel();
}
/**

View File

@@ -2592,7 +2592,7 @@ public final class L2PcInstance extends L2Playable
continue;
}
if (getSkillLevel(sk.getId()) == -1)
if (getSkillLevel(sk.getId()) == 0)
{
skillCounter++;
}
@@ -10631,7 +10631,7 @@ public final class L2PcInstance extends L2Playable
*/
public int getExpertiseLevel()
{
return getSkillLevel(239) < 0 ? 0 : getSkillLevel(239);
return getSkillLevel(239);
}
@Override

View File

@@ -1200,7 +1200,7 @@ public class L2PetInstance extends L2Summon
{
if (getKnownSkill(skillId) == null)
{
return -1;
return 0;
}
final int lvl = getLevel();

View File

@@ -813,8 +813,7 @@ public class CharStat
*/
public int getMaxBuffCount()
{
final int extraSlots = _activeChar.getSkillLevel(DIVINE_INSPIRATION);
return extraSlots > -1 ? _maxBuffCount + extraSlots : _maxBuffCount;
return _maxBuffCount + _activeChar.getSkillLevel(DIVINE_INSPIRATION);
}
/**

View File

@@ -71,7 +71,7 @@ public class PlayerSkillHolder implements ISkillsHolder
public int getSkillLevel(int skillId)
{
final Skill skill = getKnownSkill(skillId);
return (skill == null) ? -1 : skill.getLevel();
return (skill == null) ? 0 : skill.getLevel();
}
/**

View File

@@ -337,7 +337,7 @@ public abstract class Inventory extends ItemContainer
}
for (SkillHolder sk : itm.getItem().getSkills())
{
if (player.getSkillLevel(sk.getSkillId()) != -1)
if (player.getSkillLevel(sk.getSkillId()) != 0)
{
continue;
}

View File

@@ -84,7 +84,7 @@ public final class RequestAcquireSkillInfo extends L2GameClientPacket
{
if (prevSkillLevel == _level)
{
_log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is trequesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!");
_log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!");
}
else if (prevSkillLevel != (_level - 1))
{

View File

@@ -72,7 +72,7 @@ public final class RequestExEnchantSkillInfoDetail extends L2GameClientPacket
final int playerSkillLvl = activeChar.getSkillLevel(_skillId);
// dont have such skill
if (playerSkillLvl == -1)
if (playerSkillLvl == 0)
{
return;
}