diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index d1d6a8af6e..ed5eed39cc 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -44,6 +44,6 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
return false;
}
final int skillLevel = ((L2Character) target).getSkillLevel(_skillId);
- return _hasLearned ? skillLevel != -1 : skillLevel == -1;
+ return _hasLearned ? skillLevel != 0 : skillLevel == 0;
}
}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 6270fa7541..4b20bf7720 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -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();
}
/**
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index b3d372ae0f..df7cc8469a 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -2605,7 +2605,7 @@ public final class L2PcInstance extends L2Playable
continue;
}
- if (getSkillLevel(skill.getId()) == -1)
+ if (getSkillLevel(skill.getId()) == 0)
{
skillCounter++;
}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
index a2a2185d28..8ff61d1770 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
@@ -1255,7 +1255,7 @@ public class L2PetInstance extends L2Summon
{
if (getKnownSkill(skillId) == null)
{
- return -1;
+ return 0;
}
final int lvl = getLevel();
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
index a878321547..7426543ec5 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
@@ -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();
}
/**
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 7305d15034..e4ab4ae6e7 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -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;
}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 16200a36b0..4435aee98b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -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!!!!!!!!!!!!!!
* 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();
}
}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 6ceb8bc736..daaae05884 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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))
{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
index c715881866..75eb3d1455 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
@@ -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();
}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index d1d6a8af6e..ed5eed39cc 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -44,6 +44,6 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
return false;
}
final int skillLevel = ((L2Character) target).getSkillLevel(_skillId);
- return _hasLearned ? skillLevel != -1 : skillLevel == -1;
+ return _hasLearned ? skillLevel != 0 : skillLevel == 0;
}
}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 6270fa7541..4b20bf7720 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -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();
}
/**
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index a869c4d800..1951ee46a5 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -2611,7 +2611,7 @@ public final class L2PcInstance extends L2Playable
continue;
}
- if (getSkillLevel(skill.getId()) == -1)
+ if (getSkillLevel(skill.getId()) == 0)
{
skillCounter++;
}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
index a2a2185d28..8ff61d1770 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
@@ -1255,7 +1255,7 @@ public class L2PetInstance extends L2Summon
{
if (getKnownSkill(skillId) == null)
{
- return -1;
+ return 0;
}
final int lvl = getLevel();
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
index a878321547..7426543ec5 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
@@ -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();
}
/**
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 04de2725ef..7ac35715d1 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -344,7 +344,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;
}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 92020c5b77..292d3a8f7f 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -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!!!!!!!!!!!!!!
* 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();
}
}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 6ceb8bc736..daaae05884 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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))
{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
index 9a65c0b9ab..95cfb7da92 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
@@ -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();
}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index d1d6a8af6e..ed5eed39cc 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -44,6 +44,6 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
return false;
}
final int skillLevel = ((L2Character) target).getSkillLevel(_skillId);
- return _hasLearned ? skillLevel != -1 : skillLevel == -1;
+ return _hasLearned ? skillLevel != 0 : skillLevel == 0;
}
}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 6270fa7541..4b20bf7720 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -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();
}
/**
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index af26a0ae64..d3fac675b4 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -2613,7 +2613,7 @@ public final class L2PcInstance extends L2Playable
continue;
}
- if (getSkillLevel(skill.getId()) == -1)
+ if (getSkillLevel(skill.getId()) == 0)
{
skillCounter++;
}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
index a2a2185d28..8ff61d1770 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
@@ -1255,7 +1255,7 @@ public class L2PetInstance extends L2Summon
{
if (getKnownSkill(skillId) == null)
{
- return -1;
+ return 0;
}
final int lvl = getLevel();
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
index a878321547..7426543ec5 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
@@ -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();
}
/**
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 04de2725ef..7ac35715d1 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -344,7 +344,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;
}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 92020c5b77..292d3a8f7f 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -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!!!!!!!!!!!!!!
* 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();
}
}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 6ceb8bc736..daaae05884 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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))
{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
index 9a65c0b9ab..95cfb7da92 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
@@ -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();
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index d1d6a8af6e..ed5eed39cc 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -44,6 +44,6 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
return false;
}
final int skillLevel = ((L2Character) target).getSkillLevel(_skillId);
- return _hasLearned ? skillLevel != -1 : skillLevel == -1;
+ return _hasLearned ? skillLevel != 0 : skillLevel == 0;
}
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 6270fa7541..4b20bf7720 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -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();
}
/**
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 15178d4a21..426d8d82a8 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -2616,7 +2616,7 @@ public final class L2PcInstance extends L2Playable
continue;
}
- if (getSkillLevel(skill.getId()) == -1)
+ if (getSkillLevel(skill.getId()) == 0)
{
skillCounter++;
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
index a2a2185d28..8ff61d1770 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
@@ -1255,7 +1255,7 @@ public class L2PetInstance extends L2Summon
{
if (getKnownSkill(skillId) == null)
{
- return -1;
+ return 0;
}
final int lvl = getLevel();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
index a878321547..7426543ec5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
@@ -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();
}
/**
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 59ec0e73be..84e565f6fd 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -344,7 +344,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;
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 92020c5b77..292d3a8f7f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -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!!!!!!!!!!!!!!
* 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();
}
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 6ceb8bc736..daaae05884 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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))
{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
index 550c346bca..b919b3b868 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
@@ -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();
}
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java
index b4e5e736ff..1f322c12f9 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java
@@ -224,7 +224,7 @@ public class AdminSkill implements IAdminCommandHandler
continue;
}
- if (player.getSkillLevel(sk.getId()) == -1)
+ if (player.getSkillLevel(sk.getId()) == 0)
{
skillCounter++;
}
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index cc149d6d44..93c23922f6 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -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())
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index cf5faf7e96..44bfe2000d 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -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())));
}
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
index c2ff8a48dc..053d9958e9 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
@@ -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;
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/holders/PlayerSkillHolder.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/holders/PlayerSkillHolder.java
index dd5c90dd37..9956698ded 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/holders/PlayerSkillHolder.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/holders/PlayerSkillHolder.java
@@ -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();
}
/**
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/l2skills/L2SkillSummon.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/l2skills/L2SkillSummon.java
index b87d426026..5e035303e9 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/l2skills/L2SkillSummon.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/l2skills/L2SkillSummon.java
@@ -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);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 0acd773179..5d84b1d01f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -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();
}
/**
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index b8a07a5a55..fc8aaa97f5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -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
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
index 393d62036d..84626ddffc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
@@ -1200,7 +1200,7 @@ public class L2PetInstance extends L2Summon
{
if (getKnownSkill(skillId) == null)
{
- return -1;
+ return 0;
}
final int lvl = getLevel();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
index 344fddf8fc..e1e81af0e0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
@@ -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);
}
/**
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
index 3f624a1e55..36be975c50 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
@@ -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();
}
/**
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 96229ac624..e938fe87a3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -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;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index f8d0dfaf09..f915870e1d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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))
{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index f96c7c9134..0dba5efa2a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index d1d6a8af6e..ed5eed39cc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -44,6 +44,6 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
return false;
}
final int skillLevel = ((L2Character) target).getSkillLevel(_skillId);
- return _hasLearned ? skillLevel != -1 : skillLevel == -1;
+ return _hasLearned ? skillLevel != 0 : skillLevel == 0;
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 6270fa7541..4b20bf7720 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -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();
}
/**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 4cd337b679..f9eed4c647 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -2587,7 +2587,7 @@ public final class L2PcInstance extends L2Playable
continue;
}
- if (getSkillLevel(skill.getId()) == -1)
+ if (getSkillLevel(skill.getId()) == 0)
{
skillCounter++;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
index a2a2185d28..8ff61d1770 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
@@ -1255,7 +1255,7 @@ public class L2PetInstance extends L2Summon
{
if (getKnownSkill(skillId) == null)
{
- return -1;
+ return 0;
}
final int lvl = getLevel();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
index a878321547..7426543ec5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
@@ -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();
}
/**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 04de2725ef..7ac35715d1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -344,7 +344,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;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index ede0dd7f8d..f0f899bf68 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -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!!!!!!!!!!!!!!
* 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();
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 6ceb8bc736..daaae05884 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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))
{
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index d1d6a8af6e..ed5eed39cc 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -44,6 +44,6 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
return false;
}
final int skillLevel = ((L2Character) target).getSkillLevel(_skillId);
- return _hasLearned ? skillLevel != -1 : skillLevel == -1;
+ return _hasLearned ? skillLevel != 0 : skillLevel == 0;
}
}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 6270fa7541..4b20bf7720 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -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();
}
/**
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 30b52073c9..597483664a 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -2587,7 +2587,7 @@ public final class L2PcInstance extends L2Playable
continue;
}
- if (getSkillLevel(skill.getId()) == -1)
+ if (getSkillLevel(skill.getId()) == 0)
{
skillCounter++;
}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
index a2a2185d28..8ff61d1770 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
@@ -1255,7 +1255,7 @@ public class L2PetInstance extends L2Summon
{
if (getKnownSkill(skillId) == null)
{
- return -1;
+ return 0;
}
final int lvl = getLevel();
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
index a878321547..7426543ec5 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/holders/PlayerSkillHolder.java
@@ -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();
}
/**
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 04de2725ef..7ac35715d1 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -344,7 +344,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;
}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index ede0dd7f8d..f0f899bf68 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -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!!!!!!!!!!!!!!
* 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();
}
}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 6ceb8bc736..daaae05884 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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))
{