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

Fixed restoration of dualclass skills.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-10-20 17:41:51 +00:00
parent ebfc7864ee
commit 0b36e63016
33 changed files with 373 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java vendored
View File

@ -171,6 +171,7 @@ public class Hardin extends AbstractNpcAI
}
}
}
player.restoreDualSkills();
player.store(false);
player.broadcastUserInfo();
player.sendSkillList();

2
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -609,6 +609,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponAwakening(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getCloakId(player), 1);
@ -644,6 +645,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponAwakening(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getPowerItemId(player), 1);

43
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -7393,18 +7393,19 @@ public class PlayerInstance extends Playable
storeSkill(newSkill, oldSkill, -1);
if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
{
final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
for (Skill dualSkill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
if (dualSkill.getId() == newSkill.getId())
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
dualClassSkills.remove(dualSkill);
break;
removeSkill(skillId);
}
}
dualClassSkills.add(newSkill);
getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
knownSkills.put(newSkill.getId(), newSkill.getLevel());
getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
}
}
return oldSkill;
@ -7599,11 +7600,35 @@ public class PlayerInstance extends Playable
}
// Learn known dualclass skills.
restoreDualSkills();
}
/**
* Learn known dualclass skills.
*/
public void restoreDualSkills()
{
if (isDualClassActive() || !isSubClassActive())
{
final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
for (Skill skill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
removeSkill(skillId);
}
}
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
if (knownSkills.isEmpty())
{
return;
}
for (Entry<Integer, Integer> entry : knownSkills.entrySet())
{
final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
removeSkill(skill);
addSkill(skill, true);
}

1
L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java vendored
View File

@ -171,6 +171,7 @@ public class Hardin extends AbstractNpcAI
}
}
}
player.restoreDualSkills();
player.store(false);
player.broadcastUserInfo();
player.sendSkillList();

2
L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -609,6 +609,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponAwakening(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getCloakId(player), 1);
@ -644,6 +645,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponAwakening(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getPowerItemId(player), 1);

43
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -7396,18 +7396,19 @@ public class PlayerInstance extends Playable
storeSkill(newSkill, oldSkill, -1);
if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
{
final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
for (Skill dualSkill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
if (dualSkill.getId() == newSkill.getId())
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
dualClassSkills.remove(dualSkill);
break;
removeSkill(skillId);
}
}
dualClassSkills.add(newSkill);
getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
knownSkills.put(newSkill.getId(), newSkill.getLevel());
getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
}
}
return oldSkill;
@ -7602,11 +7603,35 @@ public class PlayerInstance extends Playable
}
// Learn known dualclass skills.
restoreDualSkills();
}
/**
* Learn known dualclass skills.
*/
public void restoreDualSkills()
{
if (isDualClassActive() || !isSubClassActive())
{
final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
for (Skill skill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
removeSkill(skillId);
}
}
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
if (knownSkills.isEmpty())
{
return;
}
for (Entry<Integer, Integer> entry : knownSkills.entrySet())
{
final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
removeSkill(skill);
addSkill(skill, true);
}

1
L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java vendored
View File

@ -171,6 +171,7 @@ public class Hardin extends AbstractNpcAI
}
}
}
player.restoreDualSkills();
player.store(false);
player.broadcastUserInfo();
player.sendSkillList();

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -609,6 +609,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponAwakening(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getCloakId(player), 1);
@ -644,6 +645,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponAwakening(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getPowerItemId(player), 1);

43
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -7398,18 +7398,19 @@ public class PlayerInstance extends Playable
storeSkill(newSkill, oldSkill, -1);
if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
{
final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
for (Skill dualSkill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
if (dualSkill.getId() == newSkill.getId())
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
dualClassSkills.remove(dualSkill);
break;
removeSkill(skillId);
}
}
dualClassSkills.add(newSkill);
getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
knownSkills.put(newSkill.getId(), newSkill.getLevel());
getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
}
}
return oldSkill;
@ -7604,11 +7605,35 @@ public class PlayerInstance extends Playable
}
// Learn known dualclass skills.
restoreDualSkills();
}
/**
* Learn known dualclass skills.
*/
public void restoreDualSkills()
{
if (isDualClassActive() || !isSubClassActive())
{
final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
for (Skill skill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
removeSkill(skillId);
}
}
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
if (knownSkills.isEmpty())
{
return;
}
for (Entry<Integer, Integer> entry : knownSkills.entrySet())
{
final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
removeSkill(skill);
addSkill(skill, true);
}

1
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java vendored
View File

@ -171,6 +171,7 @@ public class Hardin extends AbstractNpcAI
}
}
}
player.restoreDualSkills();
player.store(false);
player.broadcastUserInfo();
player.sendSkillList();

2
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -609,6 +609,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponAwakening(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getCloakId(player), 1);
@ -644,6 +645,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponAwakening(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getPowerItemId(player), 1);

43
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -7393,18 +7393,19 @@ public class PlayerInstance extends Playable
storeSkill(newSkill, oldSkill, -1);
if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
{
final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
for (Skill dualSkill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
if (dualSkill.getId() == newSkill.getId())
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
dualClassSkills.remove(dualSkill);
break;
removeSkill(skillId);
}
}
dualClassSkills.add(newSkill);
getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
knownSkills.put(newSkill.getId(), newSkill.getLevel());
getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
}
}
return oldSkill;
@ -7599,11 +7600,35 @@ public class PlayerInstance extends Playable
}
// Learn known dualclass skills.
restoreDualSkills();
}
/**
* Learn known dualclass skills.
*/
public void restoreDualSkills()
{
if (isDualClassActive() || !isSubClassActive())
{
final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
for (Skill skill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
removeSkill(skillId);
}
}
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
if (knownSkills.isEmpty())
{
return;
}
for (Entry<Integer, Integer> entry : knownSkills.entrySet())
{
final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
removeSkill(skill);
addSkill(skill, true);
}

1
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java vendored
View File

@ -171,6 +171,7 @@ public class Hardin extends AbstractNpcAI
}
}
}
player.restoreDualSkills();
player.store(false);
player.broadcastUserInfo();
player.sendSkillList();

2
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -609,6 +609,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponAwakening(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getCloakId(player), 1);
@ -644,6 +645,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponAwakening(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getPowerItemId(player), 1);

43
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -7375,18 +7375,19 @@ public class PlayerInstance extends Playable
storeSkill(newSkill, oldSkill, -1);
if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
{
final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
for (Skill dualSkill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
if (dualSkill.getId() == newSkill.getId())
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
dualClassSkills.remove(dualSkill);
break;
removeSkill(skillId);
}
}
dualClassSkills.add(newSkill);
getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
knownSkills.put(newSkill.getId(), newSkill.getLevel());
getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
}
}
return oldSkill;
@ -7581,11 +7582,35 @@ public class PlayerInstance extends Playable
}
// Learn known dualclass skills.
restoreDualSkills();
}
/**
* Learn known dualclass skills.
*/
public void restoreDualSkills()
{
if (isDualClassActive() || !isSubClassActive())
{
final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
for (Skill skill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
removeSkill(skillId);
}
}
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
if (knownSkills.isEmpty())
{
return;
}
for (Entry<Integer, Integer> entry : knownSkills.entrySet())
{
final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
removeSkill(skill);
addSkill(skill, true);
}

1
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java vendored
View File

@ -171,6 +171,7 @@ public class Hardin extends AbstractNpcAI
}
}
}
player.restoreDualSkills();
player.store(false);
player.broadcastUserInfo();
player.sendSkillList();

2
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -609,6 +609,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponAwakening(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getCloakId(player), 1);
@ -644,6 +645,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponAwakening(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getPowerItemId(player), 1);

43
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -7375,18 +7375,19 @@ public class PlayerInstance extends Playable
storeSkill(newSkill, oldSkill, -1);
if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
{
final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
for (Skill dualSkill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
if (dualSkill.getId() == newSkill.getId())
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
dualClassSkills.remove(dualSkill);
break;
removeSkill(skillId);
}
}
dualClassSkills.add(newSkill);
getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
knownSkills.put(newSkill.getId(), newSkill.getLevel());
getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
}
}
return oldSkill;
@ -7581,11 +7582,35 @@ public class PlayerInstance extends Playable
}
// Learn known dualclass skills.
restoreDualSkills();
}
/**
* Learn known dualclass skills.
*/
public void restoreDualSkills()
{
if (isDualClassActive() || !isSubClassActive())
{
final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
for (Skill skill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
removeSkill(skillId);
}
}
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
if (knownSkills.isEmpty())
{
return;
}
for (Entry<Integer, Integer> entry : knownSkills.entrySet())
{
final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
removeSkill(skill);
addSkill(skill, true);
}

1
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java vendored
View File

@ -171,6 +171,7 @@ public class Hardin extends AbstractNpcAI
}
}
}
player.restoreDualSkills();
player.store(false);
player.broadcastUserInfo();
player.sendSkillList();

2
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -609,6 +609,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponAwakening(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getCloakId(player), 1);
@ -644,6 +645,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponAwakening(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getPowerItemId(player), 1);

43
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -7376,18 +7376,19 @@ public class PlayerInstance extends Playable
storeSkill(newSkill, oldSkill, -1);
if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
{
final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
for (Skill dualSkill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
if (dualSkill.getId() == newSkill.getId())
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
dualClassSkills.remove(dualSkill);
break;
removeSkill(skillId);
}
}
dualClassSkills.add(newSkill);
getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
knownSkills.put(newSkill.getId(), newSkill.getLevel());
getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
}
}
return oldSkill;
@ -7582,11 +7583,35 @@ public class PlayerInstance extends Playable
}
// Learn known dualclass skills.
restoreDualSkills();
}
/**
* Learn known dualclass skills.
*/
public void restoreDualSkills()
{
if (isDualClassActive() || !isSubClassActive())
{
final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
for (Skill skill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
removeSkill(skillId);
}
}
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
if (knownSkills.isEmpty())
{
return;
}
for (Entry<Integer, Integer> entry : knownSkills.entrySet())
{
final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
removeSkill(skill);
addSkill(skill, true);
}

1
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java vendored
View File

@ -217,6 +217,7 @@ public class Joachim extends AbstractNpcAI
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
player.sendPacket(getNpcHtmlMessage(player, npc, "34513-07.html"));
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
player.broadcastUserInfo();

1
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java vendored
View File

@ -169,6 +169,7 @@ public class Hardin extends AbstractNpcAI
}
}
}
player.restoreDualSkills();
player.store(false);
player.broadcastUserInfo();
player.sendSkillList();

2
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -594,6 +594,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getCloakId(player), 1);
@ -633,6 +634,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_S1_HAS_BEEN_ADDED_CONGRATS);
player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getPowerItemId(player), 1);

43
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -7390,18 +7390,19 @@ public class PlayerInstance extends Playable
storeSkill(newSkill, oldSkill, -1);
if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
{
final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
for (Skill dualSkill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
if (dualSkill.getId() == newSkill.getId())
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
dualClassSkills.remove(dualSkill);
break;
removeSkill(skillId);
}
}
dualClassSkills.add(newSkill);
getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
knownSkills.put(newSkill.getId(), newSkill.getLevel());
getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
}
}
return oldSkill;
@ -7596,11 +7597,35 @@ public class PlayerInstance extends Playable
}
// Learn known dualclass skills.
restoreDualSkills();
}
/**
* Learn known dualclass skills.
*/
public void restoreDualSkills()
{
if (isDualClassActive() || !isSubClassActive())
{
final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
for (Skill skill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
removeSkill(skillId);
}
}
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
if (knownSkills.isEmpty())
{
return;
}
for (Entry<Integer, Integer> entry : knownSkills.entrySet())
{
final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
removeSkill(skill);
addSkill(skill, true);
}

1
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java vendored
View File

@ -217,6 +217,7 @@ public class Joachim extends AbstractNpcAI
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
player.sendPacket(getNpcHtmlMessage(player, npc, "34513-07.html"));
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
player.broadcastUserInfo();

1
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java vendored
View File

@ -169,6 +169,7 @@ public class Hardin extends AbstractNpcAI
}
}
}
player.restoreDualSkills();
player.store(false);
player.broadcastUserInfo();
player.sendSkillList();

2
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -594,6 +594,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getCloakId(player), 1);
@ -633,6 +634,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_S1_HAS_BEEN_ADDED_CONGRATS);
player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getPowerItemId(player), 1);

43
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -7492,18 +7492,19 @@ public class PlayerInstance extends Playable
storeSkill(newSkill, oldSkill, -1);
if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
{
final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
for (Skill dualSkill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
if (dualSkill.getId() == newSkill.getId())
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
dualClassSkills.remove(dualSkill);
break;
removeSkill(skillId);
}
}
dualClassSkills.add(newSkill);
getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
knownSkills.put(newSkill.getId(), newSkill.getLevel());
getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
}
}
return oldSkill;
@ -7698,11 +7699,35 @@ public class PlayerInstance extends Playable
}
// Learn known dualclass skills.
restoreDualSkills();
}
/**
* Learn known dualclass skills.
*/
public void restoreDualSkills()
{
if (isDualClassActive() || !isSubClassActive())
{
final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
for (Skill skill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
removeSkill(skillId);
}
}
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
if (knownSkills.isEmpty())
{
return;
}
for (Entry<Integer, Integer> entry : knownSkills.entrySet())
{
final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
removeSkill(skill);
addSkill(skill, true);
}

1
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java vendored
View File

@ -217,6 +217,7 @@ public class Joachim extends AbstractNpcAI
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
player.sendPacket(getNpcHtmlMessage(player, npc, "34513-07.html"));
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
player.broadcastUserInfo();

1
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java vendored
View File

@ -169,6 +169,7 @@ public class Hardin extends AbstractNpcAI
}
}
}
player.restoreDualSkills();
player.store(false);
player.broadcastUserInfo();
player.sendSkillList();

2
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -594,6 +594,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getCloakId(player), 1);
@ -633,6 +634,7 @@ public class Raina extends AbstractNpcAI
player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_S1_HAS_BEEN_ADDED_CONGRATS);
player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
player.restoreDualSkills();
player.sendPacket(new AcquireSkillList(player));
player.sendSkillList();
giveItems(player, getPowerItemId(player), 1);

43
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -7518,18 +7518,19 @@ public class PlayerInstance extends Playable
storeSkill(newSkill, oldSkill, -1);
if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
{
final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
for (Skill dualSkill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
if (dualSkill.getId() == newSkill.getId())
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
dualClassSkills.remove(dualSkill);
break;
removeSkill(skillId);
}
}
dualClassSkills.add(newSkill);
getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
knownSkills.put(newSkill.getId(), newSkill.getLevel());
getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
}
}
return oldSkill;
@ -7724,11 +7725,35 @@ public class PlayerInstance extends Playable
}
// Learn known dualclass skills.
restoreDualSkills();
}
/**
* Learn known dualclass skills.
*/
public void restoreDualSkills()
{
if (isDualClassActive() || !isSubClassActive())
{
final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
for (Skill skill : dualClassSkills)
// Old system compatibility.
if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
{
getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
for (int skillId : DUAL_CLASS_SKILLS)
{
removeSkill(skillId);
}
}
final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
if (knownSkills.isEmpty())
{
return;
}
for (Entry<Integer, Integer> entry : knownSkills.entrySet())
{
final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
removeSkill(skill);
addSkill(skill, true);
}