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

Keep sublevel when giving available skills.

Browse Source
This commit is contained in:
MobiusDev
2018-05-04 15:41:08 +00:00
parent 32df4e178a
commit 475bb35bcc
6 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2561,7 +2561,8 @@ public final class L2PcInstance extends L2Playable
for (Skill skill : skills) for (Skill skill : skills)
{ {
if (getKnownSkill(skill.getId()) == skill) final Skill oldSkill = getKnownSkill(skill.getId());
if (oldSkill == skill)
{ {
continue; continue;
} }
@@ -2577,6 +2578,12 @@ public final class L2PcInstance extends L2Playable
stopSkillEffects(true, skill.getId()); stopSkillEffects(true, skill.getId());
} }
// Mobius: Keep sublevel on skill level increase.
if ((oldSkill != null) && (oldSkill.getSubLevel() > 0) && (skill.getSubLevel() == 0) && (oldSkill.getLevel() < skill.getLevel()))
{
skill = SkillData.getInstance().getSkill(skill.getId(), skill.getLevel(), oldSkill.getSubLevel());
}
addSkill(skill, false); addSkill(skill, false);
skillsForStore.add(skill); skillsForStore.add(skill);
} }

9
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -2567,7 +2567,8 @@ public final class L2PcInstance extends L2Playable
for (Skill skill : skills) for (Skill skill : skills)
{ {
if (getKnownSkill(skill.getId()) == skill) final Skill oldSkill = getKnownSkill(skill.getId());
if (oldSkill == skill)
{ {
continue; continue;
} }
@@ -2583,6 +2584,12 @@ public final class L2PcInstance extends L2Playable
stopSkillEffects(true, skill.getId()); stopSkillEffects(true, skill.getId());
} }
// Mobius: Keep sublevel on skill level increase.
if ((oldSkill != null) && (oldSkill.getSubLevel() > 0) && (skill.getSubLevel() == 0) && (oldSkill.getLevel() < skill.getLevel()))
{
skill = SkillData.getInstance().getSkill(skill.getId(), skill.getLevel(), oldSkill.getSubLevel());
}
addSkill(skill, false); addSkill(skill, false);
skillsForStore.add(skill); skillsForStore.add(skill);
} }

9
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -2569,7 +2569,8 @@ public final class L2PcInstance extends L2Playable
for (Skill skill : skills) for (Skill skill : skills)
{ {
if (getKnownSkill(skill.getId()) == skill) final Skill oldSkill = getKnownSkill(skill.getId());
if (oldSkill == skill)
{ {
continue; continue;
} }
@@ -2585,6 +2586,12 @@ public final class L2PcInstance extends L2Playable
stopSkillEffects(true, skill.getId()); stopSkillEffects(true, skill.getId());
} }
// Mobius: Keep sublevel on skill level increase.
if ((oldSkill != null) && (oldSkill.getSubLevel() > 0) && (skill.getSubLevel() == 0) && (oldSkill.getLevel() < skill.getLevel()))
{
skill = SkillData.getInstance().getSkill(skill.getId(), skill.getLevel(), oldSkill.getSubLevel());
}
addSkill(skill, false); addSkill(skill, false);
skillsForStore.add(skill); skillsForStore.add(skill);
} }

9
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -2572,7 +2572,8 @@ public final class L2PcInstance extends L2Playable
for (Skill skill : skills) for (Skill skill : skills)
{ {
if (getKnownSkill(skill.getId()) == skill) final Skill oldSkill = getKnownSkill(skill.getId());
if (oldSkill == skill)
{ {
continue; continue;
} }
@@ -2588,6 +2589,12 @@ public final class L2PcInstance extends L2Playable
stopSkillEffects(true, skill.getId()); stopSkillEffects(true, skill.getId());
} }
// Mobius: Keep sublevel on skill level increase.
if ((oldSkill != null) && (oldSkill.getSubLevel() > 0) && (skill.getSubLevel() == 0) && (oldSkill.getLevel() < skill.getLevel()))
{
skill = SkillData.getInstance().getSkill(skill.getId(), skill.getLevel(), oldSkill.getSubLevel());
}
addSkill(skill, false); addSkill(skill, false);
skillsForStore.add(skill); skillsForStore.add(skill);
} }

9
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -2543,7 +2543,8 @@ public final class L2PcInstance extends L2Playable
for (Skill skill : skills) for (Skill skill : skills)
{ {
if (getKnownSkill(skill.getId()) == skill) final Skill oldSkill = getKnownSkill(skill.getId());
if (oldSkill == skill)
{ {
continue; continue;
} }
@@ -2559,6 +2560,12 @@ public final class L2PcInstance extends L2Playable
stopSkillEffects(true, skill.getId()); stopSkillEffects(true, skill.getId());
} }
// Mobius: Keep sublevel on skill level increase.
if ((oldSkill != null) && (oldSkill.getSubLevel() > 0) && (skill.getSubLevel() == 0) && (oldSkill.getLevel() < skill.getLevel()))
{
skill = SkillData.getInstance().getSkill(skill.getId(), skill.getLevel(), oldSkill.getSubLevel());
}
addSkill(skill, false); addSkill(skill, false);
skillsForStore.add(skill); skillsForStore.add(skill);
} }

9
L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -2543,7 +2543,8 @@ public final class L2PcInstance extends L2Playable
for (Skill skill : skills) for (Skill skill : skills)
{ {
if (getKnownSkill(skill.getId()) == skill) final Skill oldSkill = getKnownSkill(skill.getId());
if (oldSkill == skill)
{ {
continue; continue;
} }
@@ -2559,6 +2560,12 @@ public final class L2PcInstance extends L2Playable
stopSkillEffects(true, skill.getId()); stopSkillEffects(true, skill.getId());
} }
// Mobius: Keep sublevel on skill level increase.
if ((oldSkill != null) && (oldSkill.getSubLevel() > 0) && (skill.getSubLevel() == 0) && (oldSkill.getLevel() < skill.getLevel()))
{
skill = SkillData.getInstance().getSkill(skill.getId(), skill.getLevel(), oldSkill.getSubLevel());
}
addSkill(skill, false); addSkill(skill, false);
skillsForStore.add(skill); skillsForStore.add(skill);
} }