diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index 3e4837b4a4..a158a53472 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -27,28 +27,33 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class NpcHtmlMessage extends AbstractHtmlPacket { private final int _itemId; + private final int _size; public NpcHtmlMessage() { _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId) { super(npcObjId); _itemId = 0; + _size = 0; } public NpcHtmlMessage(String html) { super(html); _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId, String html) { super(npcObjId, html); _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId, int itemId) @@ -59,6 +64,7 @@ public class NpcHtmlMessage extends AbstractHtmlPacket throw new IllegalArgumentException(); } _itemId = itemId; + _size = 0; } public NpcHtmlMessage(int npcObjId, int itemId, String html) @@ -69,6 +75,24 @@ public class NpcHtmlMessage extends AbstractHtmlPacket throw new IllegalArgumentException(); } _itemId = itemId; + _size = 0; + } + + /** + * @param npcObjId + * @param itemId + * @param html + * @param windowSize 0 - default, 1 - huge, 2 - max + */ + public NpcHtmlMessage(int npcObjId, int itemId, String html, int windowSize) + { + super(npcObjId, html); + if (itemId < 0) + { + throw new IllegalArgumentException(); + } + _itemId = itemId; + _size = windowSize; } @Override @@ -78,7 +102,8 @@ public class NpcHtmlMessage extends AbstractHtmlPacket packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0); // TODO: Find me! + packet.writeD(0); // play sound - 0 = enabled, 1 = disabled + packet.writeC(_size); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index 3e4837b4a4..a158a53472 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -27,28 +27,33 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class NpcHtmlMessage extends AbstractHtmlPacket { private final int _itemId; + private final int _size; public NpcHtmlMessage() { _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId) { super(npcObjId); _itemId = 0; + _size = 0; } public NpcHtmlMessage(String html) { super(html); _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId, String html) { super(npcObjId, html); _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId, int itemId) @@ -59,6 +64,7 @@ public class NpcHtmlMessage extends AbstractHtmlPacket throw new IllegalArgumentException(); } _itemId = itemId; + _size = 0; } public NpcHtmlMessage(int npcObjId, int itemId, String html) @@ -69,6 +75,24 @@ public class NpcHtmlMessage extends AbstractHtmlPacket throw new IllegalArgumentException(); } _itemId = itemId; + _size = 0; + } + + /** + * @param npcObjId + * @param itemId + * @param html + * @param windowSize 0 - default, 1 - huge, 2 - max + */ + public NpcHtmlMessage(int npcObjId, int itemId, String html, int windowSize) + { + super(npcObjId, html); + if (itemId < 0) + { + throw new IllegalArgumentException(); + } + _itemId = itemId; + _size = windowSize; } @Override @@ -78,7 +102,8 @@ public class NpcHtmlMessage extends AbstractHtmlPacket packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0); // TODO: Find me! + packet.writeD(0); // play sound - 0 = enabled, 1 = disabled + packet.writeC(_size); return true; } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index 3e4837b4a4..a158a53472 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -27,28 +27,33 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class NpcHtmlMessage extends AbstractHtmlPacket { private final int _itemId; + private final int _size; public NpcHtmlMessage() { _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId) { super(npcObjId); _itemId = 0; + _size = 0; } public NpcHtmlMessage(String html) { super(html); _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId, String html) { super(npcObjId, html); _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId, int itemId) @@ -59,6 +64,7 @@ public class NpcHtmlMessage extends AbstractHtmlPacket throw new IllegalArgumentException(); } _itemId = itemId; + _size = 0; } public NpcHtmlMessage(int npcObjId, int itemId, String html) @@ -69,6 +75,24 @@ public class NpcHtmlMessage extends AbstractHtmlPacket throw new IllegalArgumentException(); } _itemId = itemId; + _size = 0; + } + + /** + * @param npcObjId + * @param itemId + * @param html + * @param windowSize 0 - default, 1 - huge, 2 - max + */ + public NpcHtmlMessage(int npcObjId, int itemId, String html, int windowSize) + { + super(npcObjId, html); + if (itemId < 0) + { + throw new IllegalArgumentException(); + } + _itemId = itemId; + _size = windowSize; } @Override @@ -78,7 +102,8 @@ public class NpcHtmlMessage extends AbstractHtmlPacket packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0); // TODO: Find me! + packet.writeD(0); // play sound - 0 = enabled, 1 = disabled + packet.writeC(_size); return true; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index 3e4837b4a4..a158a53472 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -27,28 +27,33 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class NpcHtmlMessage extends AbstractHtmlPacket { private final int _itemId; + private final int _size; public NpcHtmlMessage() { _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId) { super(npcObjId); _itemId = 0; + _size = 0; } public NpcHtmlMessage(String html) { super(html); _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId, String html) { super(npcObjId, html); _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId, int itemId) @@ -59,6 +64,7 @@ public class NpcHtmlMessage extends AbstractHtmlPacket throw new IllegalArgumentException(); } _itemId = itemId; + _size = 0; } public NpcHtmlMessage(int npcObjId, int itemId, String html) @@ -69,6 +75,24 @@ public class NpcHtmlMessage extends AbstractHtmlPacket throw new IllegalArgumentException(); } _itemId = itemId; + _size = 0; + } + + /** + * @param npcObjId + * @param itemId + * @param html + * @param windowSize 0 - default, 1 - huge, 2 - max + */ + public NpcHtmlMessage(int npcObjId, int itemId, String html, int windowSize) + { + super(npcObjId, html); + if (itemId < 0) + { + throw new IllegalArgumentException(); + } + _itemId = itemId; + _size = windowSize; } @Override @@ -78,7 +102,8 @@ public class NpcHtmlMessage extends AbstractHtmlPacket packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0); // TODO: Find me! + packet.writeD(0); // play sound - 0 = enabled, 1 = disabled + packet.writeC(_size); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index 3e4837b4a4..a158a53472 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -27,28 +27,33 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class NpcHtmlMessage extends AbstractHtmlPacket { private final int _itemId; + private final int _size; public NpcHtmlMessage() { _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId) { super(npcObjId); _itemId = 0; + _size = 0; } public NpcHtmlMessage(String html) { super(html); _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId, String html) { super(npcObjId, html); _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId, int itemId) @@ -59,6 +64,7 @@ public class NpcHtmlMessage extends AbstractHtmlPacket throw new IllegalArgumentException(); } _itemId = itemId; + _size = 0; } public NpcHtmlMessage(int npcObjId, int itemId, String html) @@ -69,6 +75,24 @@ public class NpcHtmlMessage extends AbstractHtmlPacket throw new IllegalArgumentException(); } _itemId = itemId; + _size = 0; + } + + /** + * @param npcObjId + * @param itemId + * @param html + * @param windowSize 0 - default, 1 - huge, 2 - max + */ + public NpcHtmlMessage(int npcObjId, int itemId, String html, int windowSize) + { + super(npcObjId, html); + if (itemId < 0) + { + throw new IllegalArgumentException(); + } + _itemId = itemId; + _size = windowSize; } @Override @@ -78,7 +102,8 @@ public class NpcHtmlMessage extends AbstractHtmlPacket packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0); // TODO: Find me! + packet.writeD(0); // play sound - 0 = enabled, 1 = disabled + packet.writeC(_size); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index 3e4837b4a4..a158a53472 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -27,28 +27,33 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class NpcHtmlMessage extends AbstractHtmlPacket { private final int _itemId; + private final int _size; public NpcHtmlMessage() { _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId) { super(npcObjId); _itemId = 0; + _size = 0; } public NpcHtmlMessage(String html) { super(html); _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId, String html) { super(npcObjId, html); _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId, int itemId) @@ -59,6 +64,7 @@ public class NpcHtmlMessage extends AbstractHtmlPacket throw new IllegalArgumentException(); } _itemId = itemId; + _size = 0; } public NpcHtmlMessage(int npcObjId, int itemId, String html) @@ -69,6 +75,24 @@ public class NpcHtmlMessage extends AbstractHtmlPacket throw new IllegalArgumentException(); } _itemId = itemId; + _size = 0; + } + + /** + * @param npcObjId + * @param itemId + * @param html + * @param windowSize 0 - default, 1 - huge, 2 - max + */ + public NpcHtmlMessage(int npcObjId, int itemId, String html, int windowSize) + { + super(npcObjId, html); + if (itemId < 0) + { + throw new IllegalArgumentException(); + } + _itemId = itemId; + _size = windowSize; } @Override @@ -78,7 +102,8 @@ public class NpcHtmlMessage extends AbstractHtmlPacket packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0); // TODO: Find me! + packet.writeD(0); // play sound - 0 = enabled, 1 = disabled + packet.writeC(_size); return true; } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index 3e4837b4a4..a158a53472 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -27,28 +27,33 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class NpcHtmlMessage extends AbstractHtmlPacket { private final int _itemId; + private final int _size; public NpcHtmlMessage() { _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId) { super(npcObjId); _itemId = 0; + _size = 0; } public NpcHtmlMessage(String html) { super(html); _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId, String html) { super(npcObjId, html); _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId, int itemId) @@ -59,6 +64,7 @@ public class NpcHtmlMessage extends AbstractHtmlPacket throw new IllegalArgumentException(); } _itemId = itemId; + _size = 0; } public NpcHtmlMessage(int npcObjId, int itemId, String html) @@ -69,6 +75,24 @@ public class NpcHtmlMessage extends AbstractHtmlPacket throw new IllegalArgumentException(); } _itemId = itemId; + _size = 0; + } + + /** + * @param npcObjId + * @param itemId + * @param html + * @param windowSize 0 - default, 1 - huge, 2 - max + */ + public NpcHtmlMessage(int npcObjId, int itemId, String html, int windowSize) + { + super(npcObjId, html); + if (itemId < 0) + { + throw new IllegalArgumentException(); + } + _itemId = itemId; + _size = windowSize; } @Override @@ -78,7 +102,8 @@ public class NpcHtmlMessage extends AbstractHtmlPacket packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0); // TODO: Find me! + packet.writeD(0); // play sound - 0 = enabled, 1 = disabled + packet.writeC(_size); return true; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index 3e4837b4a4..a158a53472 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -27,28 +27,33 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class NpcHtmlMessage extends AbstractHtmlPacket { private final int _itemId; + private final int _size; public NpcHtmlMessage() { _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId) { super(npcObjId); _itemId = 0; + _size = 0; } public NpcHtmlMessage(String html) { super(html); _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId, String html) { super(npcObjId, html); _itemId = 0; + _size = 0; } public NpcHtmlMessage(int npcObjId, int itemId) @@ -59,6 +64,7 @@ public class NpcHtmlMessage extends AbstractHtmlPacket throw new IllegalArgumentException(); } _itemId = itemId; + _size = 0; } public NpcHtmlMessage(int npcObjId, int itemId, String html) @@ -69,6 +75,24 @@ public class NpcHtmlMessage extends AbstractHtmlPacket throw new IllegalArgumentException(); } _itemId = itemId; + _size = 0; + } + + /** + * @param npcObjId + * @param itemId + * @param html + * @param windowSize 0 - default, 1 - huge, 2 - max + */ + public NpcHtmlMessage(int npcObjId, int itemId, String html, int windowSize) + { + super(npcObjId, html); + if (itemId < 0) + { + throw new IllegalArgumentException(); + } + _itemId = itemId; + _size = windowSize; } @Override @@ -78,7 +102,8 @@ public class NpcHtmlMessage extends AbstractHtmlPacket packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0); // TODO: Find me! + packet.writeD(0); // play sound - 0 = enabled, 1 = disabled + packet.writeC(_size); return true; }