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_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -4021,7 +4021,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();
}
/**

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -2605,7 +2605,7 @@ public final class L2PcInstance extends L2Playable
continue;
}
if (getSkillLevel(skill.getId()) == -1)
if (getSkillLevel(skill.getId()) == 0)
{
skillCounter++;
}

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
View File

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

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
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();
}
/**

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -341,7 +341,7 @@ public abstract class Inventory extends ItemContainer
itm.getItem().forEachSkill(ItemSkillType.NORMAL, holder ->
{
if (player.getSkillLevel(holder.getSkillId()) != -1)
if (player.getSkillLevel(holder.getSkillId()) != 0)
{
return;
}

8
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -138,8 +138,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
return;
}
final int tmpLv = (prevSkillLevel == -1) ? 0 : prevSkillLevel;
if (tmpLv != (_level - 1))
if (prevSkillLevel != (_level - 1))
{
// The previous level skill has not been learned.
activeChar.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED);
@@ -759,7 +758,6 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
}
/**
* TODO: CHECK & REMOVE THIS SHIT!!!!!!!!!!!!!!<br>
* Verify if the player can transform.
* @param player the player to verify
* @return {@code true} if the player meets the required conditions to learn a transformation, {@code false} otherwise
@@ -770,7 +768,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
{
return true;
}
final QuestState st = player.getQuestState("Q00136_MoreThanMeetsTheEye");
return (st != null) && st.isCompleted();
final QuestState qs = player.getQuestState("Q00136_MoreThanMeetsTheEye");
return (qs != null) && qs.isCompleted();
}
}

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
View File

@@ -90,7 +90,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket
{
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))
{

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
View File

@@ -144,7 +144,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
final Skill skill = SkillData.getInstance().getSkill(learn.getSkillId(), learn.getSkillLevel());
final int points;
final int knownLevel = activeChar.getSkillLevel(skill.getId());
if (knownLevel == -1) // player didn't knew it at all!
if (knownLevel == 0) // player didn't knew it at all!
{
points = learn.getSkillLevel();
}