From 4200061c832a15cd7a9c4398aff697b97135a0e3 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 21 Nov 2017 23:08:36 +0000 Subject: [PATCH] Skill sublevel added to system message. --- .../network/serverpackets/AbstractMessagePacket.java | 12 +++++++----- .../network/serverpackets/AbstractMessagePacket.java | 12 +++++++----- .../network/serverpackets/AbstractMessagePacket.java | 12 +++++++----- .../network/serverpackets/AbstractMessagePacket.java | 12 +++++++----- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index bcc078c8e4..826065a6da 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -295,20 +295,21 @@ public abstract class AbstractMessagePacket> { return addString(skill.getName()); } - return addSkillName(skill.getId(), skill.getLevel()); + return addSkillName(skill.getId(), skill.getLevel(), skill.getSubLevel()); } public final T addSkillName(int id) { - return addSkillName(id, 1); + return addSkillName(id, 1, 0); } - public final T addSkillName(int id, int lvl) + public final T addSkillName(int id, int lvl, int subLvl) { append(new SMParam(TYPE_SKILL_NAME, new int[] { id, - lvl + lvl, + subLvl })); return (T) this; } @@ -438,7 +439,7 @@ public abstract class AbstractMessagePacket> final int[] array = param.getIntArrayValue(); packet.writeD(array[0]); // skill id packet.writeH(array[1]); // skill level - packet.writeH(0x00); // skill sub level + packet.writeH(array[2]); // skill sub level break; } @@ -507,6 +508,7 @@ public abstract class AbstractMessagePacket> final int[] array = param.getIntArrayValue(); out.println(array[0]); // SkillId out.println(array[1]); // SkillLevel + out.println(array[2]); // SkillSubLevel break; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index bcc078c8e4..826065a6da 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -295,20 +295,21 @@ public abstract class AbstractMessagePacket> { return addString(skill.getName()); } - return addSkillName(skill.getId(), skill.getLevel()); + return addSkillName(skill.getId(), skill.getLevel(), skill.getSubLevel()); } public final T addSkillName(int id) { - return addSkillName(id, 1); + return addSkillName(id, 1, 0); } - public final T addSkillName(int id, int lvl) + public final T addSkillName(int id, int lvl, int subLvl) { append(new SMParam(TYPE_SKILL_NAME, new int[] { id, - lvl + lvl, + subLvl })); return (T) this; } @@ -438,7 +439,7 @@ public abstract class AbstractMessagePacket> final int[] array = param.getIntArrayValue(); packet.writeD(array[0]); // skill id packet.writeH(array[1]); // skill level - packet.writeH(0x00); // skill sub level + packet.writeH(array[2]); // skill sub level break; } @@ -507,6 +508,7 @@ public abstract class AbstractMessagePacket> final int[] array = param.getIntArrayValue(); out.println(array[0]); // SkillId out.println(array[1]); // SkillLevel + out.println(array[2]); // SkillSubLevel break; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index 6492f5c473..62d5c3076e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -296,20 +296,21 @@ public abstract class AbstractMessagePacket> { return addString(skill.getName()); } - return addSkillName(skill.getId(), skill.getLevel()); + return addSkillName(skill.getId(), skill.getLevel(), skill.getSubLevel()); } public final T addSkillName(int id) { - return addSkillName(id, 1); + return addSkillName(id, 1, 0); } - public final T addSkillName(int id, int lvl) + public final T addSkillName(int id, int lvl, int subLvl) { append(new SMParam(TYPE_SKILL_NAME, new int[] { id, - lvl + lvl, + subLvl })); return (T) this; } @@ -446,7 +447,7 @@ public abstract class AbstractMessagePacket> final int[] array = param.getIntArrayValue(); packet.writeD(array[0]); // skill id packet.writeH(array[1]); // skill level - packet.writeH(0x00); // skill sub level + packet.writeH(array[2]); // skill sub level break; } @@ -515,6 +516,7 @@ public abstract class AbstractMessagePacket> final int[] array = param.getIntArrayValue(); out.println(array[0]); // SkillId out.println(array[1]); // SkillLevel + out.println(array[2]); // SkillSubLevel break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index bcc078c8e4..826065a6da 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -295,20 +295,21 @@ public abstract class AbstractMessagePacket> { return addString(skill.getName()); } - return addSkillName(skill.getId(), skill.getLevel()); + return addSkillName(skill.getId(), skill.getLevel(), skill.getSubLevel()); } public final T addSkillName(int id) { - return addSkillName(id, 1); + return addSkillName(id, 1, 0); } - public final T addSkillName(int id, int lvl) + public final T addSkillName(int id, int lvl, int subLvl) { append(new SMParam(TYPE_SKILL_NAME, new int[] { id, - lvl + lvl, + subLvl })); return (T) this; } @@ -438,7 +439,7 @@ public abstract class AbstractMessagePacket> final int[] array = param.getIntArrayValue(); packet.writeD(array[0]); // skill id packet.writeH(array[1]); // skill level - packet.writeH(0x00); // skill sub level + packet.writeH(array[2]); // skill sub level break; } @@ -507,6 +508,7 @@ public abstract class AbstractMessagePacket> final int[] array = param.getIntArrayValue(); out.println(array[0]); // SkillId out.println(array[1]); // SkillLevel + out.println(array[2]); // SkillSubLevel break; }