lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return zero as nonexistent skill level.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java
View File

@ -224,7 +224,7 @@ public class AdminSkill implements IAdminCommandHandler
continue;
}
if (player.getSkillLevel(sk.getId()) == -1)
if (player.getSkillLevel(sk.getId()) == 0)
{
skillCounter++;
}

17
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -8104,13 +8104,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
public int getSkillLevel(int skillId)
{
final L2Skill skill = getSkills().get(skillId);
if (skill == null)
{
return -1;
}
return skill.getLevel();
return (skill == null) ? 0 : skill.getLevel();
}
/**
@ -8194,7 +8188,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
*/
public int getMaxBuffCount()
{
return Config.BUFFS_MAX_AMOUNT + Math.max(0, getSkillLevel(L2Skill.SKILL_DIVINE_INSPIRATION));
return Config.BUFFS_MAX_AMOUNT + getSkillLevel(L2Skill.SKILL_DIVINE_INSPIRATION);
}
/**
@ -8496,12 +8490,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
final int magicId = skill.getDisplayId();
// Get the level of the skill
int level = getSkillLevel(skill.getId());
if (level < 1)
{
level = 1;
}
final int level = getSkillLevel(skill.getId());
// Send a Server->Client packet MagicSkillLaunched to the L2Character AND to all L2PcInstance in the _KnownPlayers of the L2Character
if (!skill.isPotion())

4
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -3893,7 +3893,7 @@ public final class L2PcInstance extends L2Playable
// continue;
// }
if (getSkillLevel(sk.getId()) == -1)
if (getSkillLevel(sk.getId()) == 0)
{
skillCounter++;
}
@ -7533,7 +7533,7 @@ public final class L2PcInstance extends L2Playable
{
// Reduce the Experience of the L2PcInstance in function of the calculated Death Penalty
// NOTE: deathPenalty +- Exp will update karma
if ((getSkillLevel(L2Skill.SKILL_LUCKY) < 0) || (getStat().getLevel() > 9))
if ((getSkillLevel(L2Skill.SKILL_LUCKY) <= 0) || (getStat().getLevel() > 9))
{
deathPenalty(((pk != null) && (getClan() != null) && (pk.getClan() != null) && pk.getClan().isAtWarWith(getClanId())));
}

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
View File

@ -1342,7 +1342,7 @@ public class L2PetInstance extends L2Summon
{
if ((getSkills() == null) || (getSkills().get(skillId) == null))
{
return -1;
return 0;
}
final int lvl = getLevel();
return lvl > 70 ? 7 + ((lvl - 70) / 5) : lvl / 10;

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/holders/PlayerSkillHolder.java
View File

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

12
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/l2skills/L2SkillSummon.java
View File

@ -87,10 +87,6 @@ public class L2SkillSummon extends L2Skill
return true; // Player is always able to cast mass cubic skill
}
int mastery = player.getSkillLevel(SKILL_CUBIC_MASTERY);
if (mastery < 0)
{
mastery = 0;
}
final int count = player.getCubics().size();
if (count > mastery)
{
@ -160,10 +156,6 @@ public class L2SkillSummon extends L2Skill
}
final L2PcInstance player = ((L2PcInstance) obj);
int mastery = player.getSkillLevel(SKILL_CUBIC_MASTERY);
if (mastery < 0)
{
mastery = 0;
}
if ((mastery == 0) && !player.getCubics().isEmpty())
{
// Player can have only 1 cubic - we shuld replace old cubic with new one
@ -196,10 +188,6 @@ public class L2SkillSummon extends L2Skill
}
int mastery = activeChar.getSkillLevel(SKILL_CUBIC_MASTERY);
if (mastery < 0)
{
mastery = 0;
}
if (activeChar.getCubics().containsKey(_npcId))
{
final L2CubicInstance cubic = activeChar.getCubic(_npcId);