diff --git a/L2J_Mobius_Classic_2.2_Antharas/.project b/L2J_Mobius_Classic_2.2_Antharas/.project index a85e7675b1..c7570e2753 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/.project +++ b/L2J_Mobius_Classic_2.2_Antharas/.project @@ -1,6 +1,6 @@ - L2J_Mobius_Classic_2.1_Zaken + L2J_Mobius_Classic_2.2_Antharas diff --git a/L2J_Mobius_Classic_2.2_Antharas/build.xml b/L2J_Mobius_Classic_2.2_Antharas/build.xml index f10719071e..2fe99b5365 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/build.xml +++ b/L2J_Mobius_Classic_2.2_Antharas/build.xml @@ -1,6 +1,6 @@ - + This file is part of the L2J Mobius project. @@ -133,15 +133,15 @@ - + - + - + diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Character.ini b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Character.ini index c783212cb0..66a550aa0d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Character.ini +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Character.ini @@ -650,8 +650,8 @@ RaidLootRightsCCSize = 45 # Specific item ids for auto pickup. # Overrides all methods above. # Format: itemId,itemId,itemId,.... -# Default: 0 -AutoLootItemIds = 0 +# Default: 57 +AutoLootItemIds = 57 # Enable keyboard movement. # Retail: True diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Server.ini b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Server.ini index 8aaa954f5f..94926c2007 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Server.ini +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Server.ini @@ -106,8 +106,8 @@ MaximumOnlineUsers = 2000 # Numbers of protocol revisions that server allows to connect. # Delimiter is ; # WARNING: Changing the protocol revision may result in incompatible communication and many errors in game! -# Grand Crusade: 110 -AllowedProtocolRevisions = 110 +# Antharas: 140 +AllowedProtocolRevisions = 140 # Displays server type next to the server name on character selection. # Notes: diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/teleporter/34040.htm b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/teleporter/34040.htm new file mode 100644 index 0000000000..d6c71f07f9 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/teleporter/34040.htm @@ -0,0 +1,5 @@ +Tyrone:
+Now no one even remembers the forgotten treasures ... But the cunning and quick-witted Varka Faunas and the Ketra Orks constantly break camps and seek treasures. It would be to kill these creatures and take the treasure to yourself. True, in the treasure hunt, there is a risk of encountering a monster about which horrible legends are composed.
+Caves conceal and untold treasures, and incredible dangers. Remember this.
+ + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/mapregion/aden_town.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/mapregion/aden_town.xml index ca0463ddee..dafd2efec8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/mapregion/aden_town.xml +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/mapregion/aden_town.xml @@ -37,5 +37,6 @@ + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 1ec9ecada8..820d80087e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -239,7 +239,7 @@ public class AdminCreateItem implements IAdminCommandHandler } player.getInventory().destroyItem("AdminDelete", idval, numval, activeChar, null); - activeChar.sendPacket(new GMViewItemList(player)); + activeChar.sendPacket(new GMViewItemList(1, player)); BuilderUtil.sendSysMessage(activeChar, "Item deleted."); } else @@ -276,7 +276,7 @@ public class AdminCreateItem implements IAdminCommandHandler ih.useItem(player, item, false); } } - activeChar.sendPacket(new GMViewItemList(player)); + activeChar.sendPacket(new GMViewItemList(1, player)); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 0b18a16a42..1b858b0ecf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -807,7 +807,7 @@ public class AdminEditChar implements IAdminCommandHandler if (target instanceof L2PetInstance) { - activeChar.sendPacket(new GMViewItemList((L2PetInstance) target)); + activeChar.sendPacket(new GMViewItemList(1, (L2PetInstance) target)); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index b937970ce0..734fdb9759 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -96,7 +96,8 @@ public class ClanWarehouse implements IBypassHandler } } - activeChar.sendPacket(new WareHouseWithdrawalList(activeChar, WareHouseWithdrawalList.CLAN)); + activeChar.sendPacket(new WareHouseWithdrawalList(1, activeChar, WareHouseWithdrawalList.CLAN)); + activeChar.sendPacket(new WareHouseWithdrawalList(2, activeChar, WareHouseWithdrawalList.CLAN)); return true; } else if (command.toLowerCase().startsWith(COMMANDS[1])) // DepositC @@ -104,7 +105,8 @@ public class ClanWarehouse implements IBypassHandler activeChar.sendPacket(ActionFailed.STATIC_PACKET); activeChar.setActiveWarehouse(activeChar.getClan().getWarehouse()); activeChar.setInventoryBlockingStatus(true); - activeChar.sendPacket(new WareHouseDepositList(activeChar, WareHouseDepositList.CLAN)); + activeChar.sendPacket(new WareHouseDepositList(1, activeChar, WareHouseDepositList.CLAN)); + activeChar.sendPacket(new WareHouseDepositList(2, activeChar, WareHouseDepositList.CLAN)); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index fe61f40501..d46d00ae49 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -59,7 +59,7 @@ public class Freight implements IBypassHandler activeChar.getActiveWarehouse().destroyItem("L2ItemInstance", i, activeChar, null); } } - activeChar.sendPacket(new WareHouseWithdrawalList(activeChar, WareHouseWithdrawalList.FREIGHT)); + activeChar.sendPacket(new WareHouseWithdrawalList(1, activeChar, WareHouseWithdrawalList.FREIGHT)); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index 59491ae669..fa92ef0e23 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -59,7 +59,8 @@ public class PrivateWarehouse implements IBypassHandler activeChar.sendPacket(ActionFailed.STATIC_PACKET); activeChar.setActiveWarehouse(activeChar.getWarehouse()); activeChar.setInventoryBlockingStatus(true); - activeChar.sendPacket(new WareHouseDepositList(activeChar, WareHouseDepositList.PRIVATE)); + activeChar.sendPacket(new WareHouseDepositList(1, activeChar, WareHouseDepositList.PRIVATE)); + activeChar.sendPacket(new WareHouseDepositList(2, activeChar, WareHouseDepositList.PRIVATE)); return true; } @@ -83,7 +84,8 @@ public class PrivateWarehouse implements IBypassHandler return; } - player.sendPacket(new WareHouseWithdrawalList(player, WareHouseWithdrawalList.PRIVATE)); + player.sendPacket(new WareHouseWithdrawalList(1, player, WareHouseWithdrawalList.PRIVATE)); + player.sendPacket(new WareHouseWithdrawalList(2, player, WareHouseWithdrawalList.PRIVATE)); } @Override diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/PrivateStore.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/PrivateStore.java index 6ec67501d3..84ef731ac7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/PrivateStore.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/PrivateStore.java @@ -101,14 +101,16 @@ public final class PrivateStore implements IPlayerActionHandler case PACKAGE_SELL: { activeChar.setPrivateStoreType(PrivateStoreType.SELL_MANAGE); - activeChar.sendPacket(new PrivateStoreManageListSell(activeChar, type == PrivateStoreType.PACKAGE_SELL)); + activeChar.sendPacket(new PrivateStoreManageListSell(1, activeChar, type == PrivateStoreType.PACKAGE_SELL)); + activeChar.sendPacket(new PrivateStoreManageListSell(2, activeChar, type == PrivateStoreType.PACKAGE_SELL)); break; } case BUY: case BUY_MANAGE: { activeChar.setPrivateStoreType(PrivateStoreType.BUY_MANAGE); - activeChar.sendPacket(new PrivateStoreManageListBuy(activeChar)); + activeChar.sendPacket(new PrivateStoreManageListBuy(1, activeChar)); + activeChar.sendPacket(new PrivateStoreManageListBuy(2, activeChar)); break; } case MANUFACTURE: diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/18300-18399.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/18300-18399.xml index 1eb5106f76..74f6a74099 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/18300-18399.xml +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/18300-18399.xml @@ -8,7 +8,7 @@ FAIRY MALE - + diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/20400-20499.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/20400-20499.xml index 8065b1b0c8..a35b7f6480 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/20400-20499.xml +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/20400-20499.xml @@ -399,121 +399,133 @@ - + + - - - + + DEMONIC - MALE + FEMALE - - - + + + - + - 370 + 560 + - + + + + - - - - + + + + - + + + - false - + true + - - + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - + + - - - + + - UNDEAD - MALE + DEMONIC + FEMALE - - - + + + - - + + - 370 + 560 + - + + + + - - - - + + + + - + + + - false - + true + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + @@ -5133,23 +5145,23 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/21700-21799.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/21700-21799.xml new file mode 100644 index 0000000000..b129d2bfd2 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/21700-21799.xml @@ -0,0 +1,1919 @@ + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 480 + + + + + + + + + + + + + + + + + + + + + false + 2 + + + VARKA_SILENOS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 590 + + + + + + + + + + + + + + + + + + + false + 2 + + + VARKA_SILENOS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 480 + + + + + + + + + + + + + + + + + + + + + + + + false + 2 + + + VARKA_SILENOS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 470 + + + + + + + + + + + + + + + + + + + + + false + 2 + + + VARKA_SILENOS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 460 + + + + + + + + + + + + + + + + + + + + false + 2 + + + KETRA_ORC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 510 + + + + + + + + + + + + + + + + + + + + + + + false + 2 + + + KETRA_ORC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 340 + + + + + + + + + + + + + + + + + + + + + + false + 2 + + + + KETRA_ORC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 910 + + + + + + + + + + + + + + + + + + false + 2 + + + KETRA_ORC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 510 + + + + + + + + + + + + + + + + + + + + + + + false + 2 + + + KETRA_ORC + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 480 + + + + + + + + + + + + + + + + + + + + + + + + false + 2 + + + VARKA_SILENOS + + + + + + + + + CONSTRUCT + MALE + + + + + + + + + 560 + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 480 + + + + + + + + + + + + + + + + + + + + + false + 2 + + + VARKA_SILENOS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 540 + + + + + + + + + + + + + + + + + + + + + + + false + 2 + + + KETRA_ORC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 490 + + + + + + + + + + + + + + + + + + + + + + + false + 2 + + + + VARKA_SILENOS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 480 + + + + + + + + + + + + + + + + + + + false + 2 + + + VARKA_SILENOS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 480 + + + + + + + + + + + + + + + + + + + + + + + + false + 2 + + + VARKA_SILENOS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 480 + + + + + + + + + + + + + + + + + + + false + 2 + + + VARKA_SILENOS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 480 + + + + + + + + + + + + + + + + + + + + + + + + false + 2 + + + VARKA_SILENOS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 340 + + + + + + + + + + + + + + + + + + + + + + false + 2 + + + + KETRA_ORC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 480 + + + + + + + + + + + + + + + + + + false + 2 + + + KETRA_ORC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 510 + + + + + + + + + + + + + + + + + + + + + + + false + 2 + + + KETRA_ORC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 480 + + + + + + + + + + + + + + + + + + false + 2 + + + KETRA_ORC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CONSTRUCT + MALE + + + + + + + + + 560 + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + HUMANOID + MALE + + + + + + + + + + + 480 + + + + + + + + + + + + + + + + + + + + + + false + 2 + + + KETRA_ORC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/34000-34099.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/34000-34099.xml index d64006aec8..db09760eb9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/34000-34099.xml +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/34000-34099.xml @@ -34,6 +34,22 @@ + + HUMAN + FEMALE + + + + + + + + + + + + + HUMAN MALE diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/teleporters/others/forgotten_island.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/teleporters/others/forgotten_island.xml new file mode 100644 index 0000000000..dfe156d0b2 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/teleporters/others/forgotten_island.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/teleporters/town/Elisa.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/teleporters/town/Elisa.xml index 608343793a..31d1654466 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/teleporters/town/Elisa.xml +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/teleporters/town/Elisa.xml @@ -15,6 +15,7 @@ + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/enums/InventorySlot.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/enums/InventorySlot.java index 4c5b4f78d0..004ef691e4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/enums/InventorySlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/enums/InventorySlot.java @@ -56,7 +56,12 @@ public enum InventorySlot implements IUpdateTypeComponent BROOCH_JEWEL3(Inventory.PAPERDOLL_BROOCH_JEWEL3), BROOCH_JEWEL4(Inventory.PAPERDOLL_BROOCH_JEWEL4), BROOCH_JEWEL5(Inventory.PAPERDOLL_BROOCH_JEWEL5), - BROOCH_JEWEL6(Inventory.PAPERDOLL_BROOCH_JEWEL6); + BROOCH_JEWEL6(Inventory.PAPERDOLL_BROOCH_JEWEL6), + AGATION1(32), // new 140 + AGATION2(33), // new 140 + AGATION3(34), // new 140 + AGATION4(35), // new 140 + AGATION5(36); // new 140 private final int _paperdollSlot; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java index d761b64449..6e479d2067 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java @@ -992,7 +992,7 @@ public class L2FortManagerInstance extends L2MerchantInstance { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getClan().getWarehouse()); - player.sendPacket(new WareHouseDepositList(player, WareHouseDepositList.CLAN)); + player.sendPacket(new WareHouseDepositList(1, player, WareHouseDepositList.CLAN)); } private void showVaultWindowWithdraw(L2PcInstance player) @@ -1001,7 +1001,7 @@ public class L2FortManagerInstance extends L2MerchantInstance { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getClan().getWarehouse()); - player.sendPacket(new WareHouseWithdrawalList(player, WareHouseWithdrawalList.CLAN)); + player.sendPacket(new WareHouseWithdrawalList(1, player, WareHouseWithdrawalList.CLAN)); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 382af44204..d034391ca4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -4607,7 +4607,8 @@ public final class L2PcInstance extends L2Playable standUp(); } setPrivateStoreType(PrivateStoreType.BUY_MANAGE); - sendPacket(new PrivateStoreManageListBuy(this)); + sendPacket(new PrivateStoreManageListBuy(1, this)); + sendPacket(new PrivateStoreManageListBuy(2, this)); } } else @@ -5615,7 +5616,8 @@ public final class L2PcInstance extends L2Playable final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_BEGIN_TRADING_WITH_C1); msg.addPcName(partner); sendPacket(msg); - sendPacket(new TradeStart(this)); + sendPacket(new TradeStart(1, this)); + sendPacket(new TradeStart(2, this)); } public void onTradeConfirm(L2PcInstance partner) @@ -13697,8 +13699,10 @@ public final class L2PcInstance extends L2Playable */ public void sendItemList(boolean open) { - sendPacket(new ItemList(this, open)); - sendPacket(new ExQuestItemList(this)); + sendPacket(new ItemList(1, this, open)); + sendPacket(new ItemList(2, this, open)); + sendPacket(new ExQuestItemList(1, this)); + sendPacket(new ExQuestItemList(2, this)); sendPacket(new ExAdenaInvenCount(this)); sendPacket(new ExUserInfoInvenWeight(this)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 118940a300..463e1d5513 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -113,7 +113,12 @@ public abstract class Inventory extends ItemContainer public static final int PAPERDOLL_BROOCH_JEWEL4 = 29; public static final int PAPERDOLL_BROOCH_JEWEL5 = 30; public static final int PAPERDOLL_BROOCH_JEWEL6 = 31; - public static final int PAPERDOLL_TOTALSLOTS = 32; + public static final int PAPERDOLL_AGATION1 = 32; // new 140 + public static final int PAPERDOLL_AGATION2 = 33; // new 140 + public static final int PAPERDOLL_AGATION3 = 34; // new 140 + public static final int PAPERDOLL_AGATION4 = 35; // new 140 + public static final int PAPERDOLL_AGATION5 = 36; // new 140 + public static final int PAPERDOLL_TOTALSLOTS = 37; // Speed percentage mods public static final double MAX_ARMOR_WEIGHT = 12000; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/ExIncomingPackets.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/ExIncomingPackets.java index f42ff105f7..4a85f53f62 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/ExIncomingPackets.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/ExIncomingPackets.java @@ -392,9 +392,47 @@ public enum ExIncomingPackets implements IIncomingPackets EXREQUEST_MATCH_GROUP_WITHDRAW(0x133, null, ConnectionState.IN_GAME), EXREQUEST_MATCH_GROUP_OUST(0x134, null, ConnectionState.IN_GAME), EXREQUEST_MATCH_GROUP_CHANGE_MASTER(0x135, null, ConnectionState.IN_GAME), - REQUEST_BLOCK_LIST_FOR_AD(0x136, null, ConnectionState.IN_GAME), - REQUEST_UPGRADE_SYSTEM_RESULT(0x137, null, ConnectionState.IN_GAME), - REQUEST_USER_BAN_INFO(0x138, null, ConnectionState.IN_GAME); + REQUEST_UPGRADE_SYSTEM_RESULT(0x136, null, ConnectionState.IN_GAME), + EX_CARD_UPDOWN_PICK_NUMB(0x137, null, ConnectionState.IN_GAME), + EX_CARD_UPDOWN_GAME_REWARD_REQUEST(0x138, null, ConnectionState.IN_GAME), + EX_CARD_UPDOWN_GAME_RETRY(0x139, null, ConnectionState.IN_GAME), + EX_CARD_UPDOWN_GAME_QUIT(0x13A, null, ConnectionState.IN_GAME), + EX_ARENA_RANK_ALL(0x13B, null, ConnectionState.IN_GAME), + EX_ARENA_MYRANK(0x13C, null, ConnectionState.IN_GAME), + EX_SWAP_AGATHION_SLOT_ITEMS(0x13D, null, ConnectionState.IN_GAME), + EX_PLEDGE_CONTRIBUTION_RANK(0x13E, null, ConnectionState.IN_GAME), + EX_PLEDGE_CONTRIBUTION_INFO(0x13F, null, ConnectionState.IN_GAME), + EX_PLEDGE_CONTRIBUTION_REWARD(0x140, null, ConnectionState.IN_GAME), + EX_PLEDGE_LEVEL_UP(0x141, null, ConnectionState.IN_GAME), + EX_PLEDGE_MISSION_INFO(0x142, null, ConnectionState.IN_GAME), + EX_PLEDGE_MISSION_REWARD(0x143, null, ConnectionState.IN_GAME), + EX_PLEDGE_MASTERY_INFO(0x144, null, ConnectionState.IN_GAME), + EX_PLEDGE_MASTERY_SET(0x145, null, ConnectionState.IN_GAME), + EX_PLEDGE_MASTERY_RESET(0x146, null, ConnectionState.IN_GAME), + EX_PLEDGE_SKILL_INFO(0x147, null, ConnectionState.IN_GAME), + EX_PLEDGE_SKILL_ACTIVATE(0x148, null, ConnectionState.IN_GAME), + EX_PLEDGE_ITEM_LIST(0x149, null, ConnectionState.IN_GAME), + EX_PLEDGE_ITEM_ACTIVATE(0x14A, null, ConnectionState.IN_GAME), + EX_PLEDGE_ANNOUNCE(0x14B, null, ConnectionState.IN_GAME), + EX_PLEDGE_ANNOUNCE_SET(0x14C, null, ConnectionState.IN_GAME), + EX_CREATE_PLEDGE(0x14D, null, ConnectionState.IN_GAME), + EX_PLEDGE_ITEM_INFO(0x14E, null, ConnectionState.IN_GAME), + EX_PLEDGE_ITEM_BUY(0x14F, null, ConnectionState.IN_GAME), + EX_ELEMENTAL_SPIRIT_INFO(0x150, null, ConnectionState.IN_GAME), + EX_ELEMENTAL_SPIRIT_EXTRACT_INFO(0x151, null, ConnectionState.IN_GAME), + EX_ELEMENTAL_SPIRIT_EXTRACT(0x152, null, ConnectionState.IN_GAME), + EX_ELEMENTAL_SPIRIT_EVOLUTION_INFO(0x153, null, ConnectionState.IN_GAME), + EX_ELEMENTAL_SPIRIT_EVOLUTION(0x154, null, ConnectionState.IN_GAME), + EX_ELEMENTAL_SPIRIT_SET_TALENT(0x155, null, ConnectionState.IN_GAME), + EX_ELEMENTAL_SPIRIT_INIT_TALENT(0x156, null, ConnectionState.IN_GAME), + EX_ELEMENTAL_SPIRIT_ABSORB_INFO(0x157, null, ConnectionState.IN_GAME), + EX_ELEMENTAL_SPIRIT_ABSORB(0x158, null, ConnectionState.IN_GAME), + EX_REQUEST_LOCKED_ITEM(0x159, null, ConnectionState.IN_GAME), + EX_REQUEST_UNLOCKED_ITEM(0x15A, null, ConnectionState.IN_GAME), + EX_LOCKED_ITEM_CANCEL(0x15B, null, ConnectionState.IN_GAME), + EX_UNLOCKED_ITEM_CANCEL(0x15C, null, ConnectionState.IN_GAME), + REQUEST_BLOCK_LIST_FOR_AD(0x15D, null, ConnectionState.IN_GAME), + REQUEST_USER_BAN_INFO(0x15E, null, ConnectionState.IN_GAME); public static final ExIncomingPackets[] PACKET_ARRAY; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/OutgoingPackets.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/OutgoingPackets.java index 27c56590a5..f923f9cd29 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/OutgoingPackets.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/OutgoingPackets.java @@ -741,11 +741,53 @@ public enum OutgoingPackets EX_MATCH_GROUP_WITHDRAW(0xFE, 0x1CA), EX_MATCH_GROUP_OUST(0xFE, 0x1CB), EX_ARENA_SHOW_ENEMY_PARTY_LOCATION(0xFE, 0x1CC), - EX_DRESS_ROOM_UI_OPEN(0xFE, 0x1CD), - EX_DRESS_HANGER_LIST(0xFE, 0x1CE), - EX_SHOW_UPGRADE_SYSTEM(0xFE, 0x1CF), - EX_UPGRADE_SYSTEM_RESULT(0xFE, 0x1D0), - EX_USER_BAN_INFO(0xFE, 0x1D1); + EX_SHOW_UPGRADE_SYSTEM(0xFE, 0x1CD), + EX_UPGRADE_SYSTEM_RESULT(0xFE, 0x1CE), + EX_CARD_UPDOWN_GAME_START(0xFE, 0x1CF), + EX_CARD_UPDOWN_PICK_RESULT(0xFE, 0x1D0), + EX_CARD_UPDOWN_GAME_PREPARE_REWARD(0xFE, 0x1D1), + EX_CARD_UPDOWN_GAME_REWARD_REPLY(0xFE, 0x1D2), + EX_CARD_UPDOWN_GAME_QUIT(0xFE, 0x1D3), + EX_ARENA_RANK_ALL(0xFE, 0x1D4), + EX_ARENA_MYRANK(0xFE, 0x1D5), + EX_PLEDGE_CLASSIC_RAID_INFO(0xFE, 0x1D6), + EX_ARENA_OBSERVE(0xFE, 0x1D7), + EX_HTML_WITH_NPC_VIEWPORT(0xFE, 0x1D8), + EX_PLEDGE_CONTRIBUTION_RANK(0xFE, 0x1D9), + EX_PLEDGE_CONTRIBUTION_INFO(0xFE, 0x1DA), + EX_PLEDGE_CONTRIBUTION_REWARD(0xFE, 0x1DB), + EX_PLEDGE_RAID_INFO(0xFE, 0x1DC), + EX_PLEDGE_RAID_RANK(0xFE, 0x1DD), + EX_PLEDGE_LEVEL_UP(0xFE, 0x1DE), + EX_PLEDGE_SHOW_INFO_UPDATE(0xFE, 0x1DF), + EX_PLEDGE_MISSION_INFO(0xFE, 0x1E0), + EX_PLEDGE_MISSION_REWARD_COUNT(0xFE, 0x1E1), + EX_PLEDGE_MASTERY_INFO(0xFE, 0x1E2), + EX_PLEDGE_MASTERY_SET(0xFE, 0x1E3), + EX_PLEDGE_MASTERY_RESET(0xFE, 0x1E4), + EX_TUTORIAL_SHOW_ID(0xFE, 0x1E5), + EX_PLEDGE_SKILL_INFO(0xFE, 0x1E6), + EX_PLEDGE_SKILL_ACTIVATE(0xFE, 0x1E7), + EX_PLEDGE_ITEM_LIST(0xFE, 0x1E8), + EX_PLEDGE_ITEM_ACTIVATE(0xFE, 0x1E9), + EX_PLEDGE_ANNOUNCE(0xFE, 0x1EA), + EX_PLEDGE_ANNOUNCE_SET(0xFE, 0x1EB), + EX_SET_PLEDGE_EMBLEM(0xFE, 0x1EC), + EX_SHOW_CREATE_PLEDGE(0xFE, 0x1ED), + EX_PLEDGE_ITEM_INFO(0xFE, 0x1EE), + EX_PLEDGE_ITEM_BUY(0xFE, 0x1EF), + EX_ELEMENTAL_SPIRIT_INFO(0xFE, 0x1F0), + EX_ELEMENTAL_SPIRIT_EXTRACT_INFO(0xFE, 0x1F1), + EX_ELEMENTAL_SPIRIT_EVOLUTION_INFO(0xFE, 0x1F2), + EX_ELEMENTAL_SPIRIT_EVOLUTION(0xFE, 0x1F3), + EX_ELEMENTAL_SPIRIT_SET_TALENT(0xFE, 0x1F4), + EX_ELEMENTAL_SPIRIT_ABSORB_INFO(0xFE, 0x1F5), + EX_ELEMENTAL_SPIRIT_ABSORB(0xFE, 0x1F6), + EX_CHOOSE_LOCKED_ITEM(0xFE, 0x1F7), + EX_LOCKED_RESULT(0xFE, 0x1F8), + EX_DRESS_ROOM_UI_OPEN(0xFE, 0x1F9), + EX_DRESS_HANGER_LIST(0xFE, 0x1FA), + EX_USER_BAN_INFO(0xFE, 0x1FB); private final int _id1; private final int _id2; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 1ffd75d20c..eaa433f310 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.TradeItem; import com.l2jmobius.gameserver.model.TradeList; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.network.L2GameClient; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; @@ -94,12 +95,16 @@ public final class AddTradeItem implements IClientIncomingPacket return; } - final TradeItem item = trade.addItem(_objectId, _count); - if (item != null) + final L2ItemInstance item1 = player.getInventory().getItemByObjectId(_objectId); + final TradeItem item2 = trade.addItem(_objectId, _count); + if (item2 != null) { - player.sendPacket(new TradeOwnAdd(item)); - player.sendPacket(new TradeUpdate(player, item)); - partner.sendPacket(new TradeOtherAdd(item)); + player.sendPacket(new TradeOwnAdd(1, item2)); + player.sendPacket(new TradeOwnAdd(2, item2)); + player.sendPacket(new TradeUpdate(1, null, null, 0)); + player.sendPacket(new TradeUpdate(2, player, item2, item1.getCount() - item2.getCount())); + partner.sendPacket(new TradeOtherAdd(1, item2)); + partner.sendPacket(new TradeOtherAdd(2, item2)); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 5e4f070447..887e483e91 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -354,10 +354,12 @@ public class EnterWorld implements IClientIncomingPacket client.sendPacket(new ExGetBookMarkInfoPacket(activeChar)); // Send Item List - client.sendPacket(new ItemList(activeChar, false)); + client.sendPacket(new ItemList(1, activeChar, false)); + client.sendPacket(new ItemList(2, activeChar, false)); // Send Quest Item List - client.sendPacket(new ExQuestItemList(activeChar)); + client.sendPacket(new ExQuestItemList(1, activeChar)); + client.sendPacket(new ExQuestItemList(2, activeChar)); // Send Adena and Inventory Count client.sendPacket(new ExAdenaInvenCount(activeChar)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java index 3c7f86b7de..776ed2fa18 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java @@ -44,7 +44,6 @@ public final class RequestGMCommand implements IClientIncomingPacket { _targetName = packet.readS(); _command = packet.readD(); - // _unknown = packet.readD(); return true; } @@ -95,7 +94,8 @@ public final class RequestGMCommand implements IClientIncomingPacket } case 5: // player inventory { - client.sendPacket(new GMViewItemList(player)); + client.sendPacket(new GMViewItemList(1, player)); + client.sendPacket(new GMViewItemList(2, player)); client.sendPacket(new GMHennaInfo(player)); break; } @@ -113,7 +113,6 @@ public final class RequestGMCommand implements IClientIncomingPacket } break; } - } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java index aa475e131d..3a7bdf76f2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java @@ -55,6 +55,7 @@ public final class RequestPostItemList implements IClientIncomingPacket return; } - client.sendPacket(new ExReplyPostItemList(activeChar)); + client.sendPacket(new ExReplyPostItemList(1, activeChar)); + client.sendPacket(new ExReplyPostItemList(2, activeChar)); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 712d599e7d..4360a1887a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -144,14 +144,16 @@ public final class SetPrivateStoreListBuy implements IClientIncomingPacket if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) || player.isInDuel()) { player.sendPacket(SystemMessageId.WHILE_YOU_ARE_ENGAGED_IN_COMBAT_YOU_CANNOT_OPERATE_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP); - player.sendPacket(new PrivateStoreManageListBuy(player)); + player.sendPacket(new PrivateStoreManageListBuy(1, player)); + player.sendPacket(new PrivateStoreManageListBuy(2, player)); player.sendPacket(ActionFailed.STATIC_PACKET); return; } if (player.isInsideZone(ZoneId.NO_STORE)) { - player.sendPacket(new PrivateStoreManageListBuy(player)); + player.sendPacket(new PrivateStoreManageListBuy(1, player)); + player.sendPacket(new PrivateStoreManageListBuy(2, player)); player.sendPacket(SystemMessageId.YOU_CANNOT_OPEN_A_PRIVATE_STORE_HERE); player.sendPacket(ActionFailed.STATIC_PACKET); return; @@ -163,7 +165,8 @@ public final class SetPrivateStoreListBuy implements IClientIncomingPacket // Check maximum number of allowed slots for pvt shops if (_items.length > player.getPrivateBuyStoreLimit()) { - player.sendPacket(new PrivateStoreManageListBuy(player)); + player.sendPacket(new PrivateStoreManageListBuy(1, player)); + player.sendPacket(new PrivateStoreManageListBuy(2, player)); player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED); return; } @@ -190,7 +193,8 @@ public final class SetPrivateStoreListBuy implements IClientIncomingPacket // Check for available funds if (totalCost > player.getAdena()) { - player.sendPacket(new PrivateStoreManageListBuy(player)); + player.sendPacket(new PrivateStoreManageListBuy(1, player)); + player.sendPacket(new PrivateStoreManageListBuy(2, player)); player.sendPacket(SystemMessageId.THE_PURCHASE_PRICE_IS_HIGHER_THAN_THE_AMOUNT_OF_MONEY_THAT_YOU_HAVE_AND_SO_YOU_CANNOT_OPEN_A_PERSONAL_STORE); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java index 4fe7585a2e..8f18a2cf13 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java @@ -97,14 +97,16 @@ public class SetPrivateStoreListSell implements IClientIncomingPacket if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) || player.isInDuel()) { player.sendPacket(SystemMessageId.WHILE_YOU_ARE_ENGAGED_IN_COMBAT_YOU_CANNOT_OPERATE_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP); - player.sendPacket(new PrivateStoreManageListSell(player, _packageSale)); + player.sendPacket(new PrivateStoreManageListSell(1, player, _packageSale)); + player.sendPacket(new PrivateStoreManageListSell(2, player, _packageSale)); player.sendPacket(ActionFailed.STATIC_PACKET); return; } if (player.isInsideZone(ZoneId.NO_STORE)) { - player.sendPacket(new PrivateStoreManageListSell(player, _packageSale)); + player.sendPacket(new PrivateStoreManageListSell(1, player, _packageSale)); + player.sendPacket(new PrivateStoreManageListSell(2, player, _packageSale)); player.sendPacket(SystemMessageId.YOU_CANNOT_OPEN_A_PRIVATE_STORE_HERE); player.sendPacket(ActionFailed.STATIC_PACKET); return; @@ -113,7 +115,8 @@ public class SetPrivateStoreListSell implements IClientIncomingPacket // Check maximum number of allowed slots for pvt shops if (_items.length > player.getPrivateSellStoreLimit()) { - player.sendPacket(new PrivateStoreManageListSell(player, _packageSale)); + player.sendPacket(new PrivateStoreManageListSell(1, player, _packageSale)); + player.sendPacket(new PrivateStoreManageListSell(2, player, _packageSale)); player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index dcbc472c7a..d6d90d91b8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -84,7 +84,9 @@ public abstract class AbstractInventoryUpdate extends AbstractItemPacket protected final void writeItems(PacketWriter packet) { - packet.writeH(_items.size()); + packet.writeC(0); // 140 + packet.writeD(0); // 140 + packet.writeD(_items.size()); // 140 for (ItemInfo item : _items.values()) { packet.writeH(item.getChange()); // Update type : 01-add, 02-modify, 03-remove diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 19a51d6989..dabe6a62bc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -43,6 +43,11 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket _items; - public ExQuestItemList(L2PcInstance activeChar) + public ExQuestItemList(int sendType, L2PcInstance activeChar) { + _sendType = sendType; _activeChar = activeChar; _items = activeChar.getInventory().getItems(L2ItemInstance::isQuestItem); } @@ -41,8 +43,16 @@ public class ExQuestItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_ITEM_LIST.writeId(packet); - - packet.writeH(_items.size()); + packet.writeC(_sendType); + if (_sendType == 2) + { + packet.writeD(_items.size()); + } + else + { + packet.writeH(0); + } + packet.writeD(_items.size()); for (L2ItemInstance item : _items) { writeItem(packet, item); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index b3dc06f6fb..637c7aa99b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -28,11 +28,13 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExReplyPostItemList extends AbstractItemPacket { + private final int _sendType; private final L2PcInstance _activeChar; private final Collection _itemList; - public ExReplyPostItemList(L2PcInstance activeChar) + public ExReplyPostItemList(int sendType, L2PcInstance activeChar) { + _sendType = sendType; _activeChar = activeChar; _itemList = _activeChar.getInventory().getAvailableItems(true, false, false); } @@ -41,11 +43,15 @@ public class ExReplyPostItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_POST_ITEM_LIST.writeId(packet); - + packet.writeC(_sendType); packet.writeD(_itemList.size()); - for (L2ItemInstance item : _itemList) + if (_sendType == 2) { - writeItem(packet, item); + packet.writeD(_itemList.size()); + for (L2ItemInstance item : _itemList) + { + writeItem(packet, item); + } } return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index 323f5b91eb..89199957bf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -27,12 +27,14 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket { + private final int _sendType; private final List _items = new ArrayList<>(); private final int _limit; private final String _playerName; - public GMViewItemList(L2PcInstance cha) + public GMViewItemList(int sendType, L2PcInstance cha) { + _sendType = sendType; _playerName = cha.getName(); _limit = cha.getInventoryLimit(); for (L2ItemInstance item : cha.getInventory().getItems()) @@ -41,8 +43,9 @@ public class GMViewItemList extends AbstractItemPacket } } - public GMViewItemList(L2PetInstance cha) + public GMViewItemList(int sendType, L2PetInstance cha) { + _sendType = sendType; _playerName = cha.getName(); _limit = cha.getInventoryLimit(); for (L2ItemInstance item : cha.getInventory().getItems()) @@ -55,11 +58,17 @@ public class GMViewItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_ITEM_LIST.writeId(packet); - - packet.writeS(_playerName); - packet.writeD(_limit); // inventory limit - packet.writeH(0x01); // show window ?? - packet.writeH(_items.size()); + packet.writeC(_sendType); + if (_sendType == 2) + { + packet.writeD(_items.size()); + } + else + { + packet.writeS(_playerName); + packet.writeD(_limit); // inventory limit + } + packet.writeD(_items.size()); for (L2ItemInstance item : _items) { writeItem(packet, item); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index dd10c1edb5..313324b091 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -63,7 +63,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - packet.writeD(0x00); // TODO: Find me! } } return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 9d7a59b79d..eccca03abc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -51,7 +51,6 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); packet.writeD(0x00); - packet.writeD(0x00); } } return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ItemList.java index 1db42fec5c..567bc3e488 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -26,12 +26,14 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; public final class ItemList extends AbstractItemPacket { + private final int _sendType; private final L2PcInstance _activeChar; private final List _items; private final boolean _showWindow; - public ItemList(L2PcInstance activeChar, boolean showWindow) + public ItemList(int sendType, L2PcInstance activeChar, boolean showWindow) { + _sendType = sendType; _activeChar = activeChar; _showWindow = showWindow; _items = activeChar.getInventory().getItems(item -> !item.isQuestItem()).stream().collect(Collectors.toList()); @@ -41,12 +43,21 @@ public final class ItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.ITEM_LIST.writeId(packet); - - packet.writeH(_showWindow ? 0x01 : 0x00); - packet.writeH(_items.size()); - for (L2ItemInstance item : _items) + if (_sendType == 2) { - writeItem(packet, item); + packet.writeC(_sendType); + packet.writeD(_items.size()); + packet.writeD(_items.size()); + for (L2ItemInstance item : _items) + { + writeItem(packet, item); + } + } + else + { + packet.writeC(_showWindow ? 0x01 : 0x00); + packet.writeD(0x00); + packet.writeD(_items.size()); } writeInventoryBlock(packet, _activeChar.getInventory()); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 73d1518278..1e126f7c47 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -26,13 +26,15 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket { + private final int _sendType; private final int _objId; private final long _playerAdena; private final Collection _itemList; private final TradeItem[] _buyList; - public PrivateStoreManageListBuy(L2PcInstance player) + public PrivateStoreManageListBuy(int sendType, L2PcInstance player) { + _sendType = sendType; _objId = player.getObjectId(); _playerAdena = player.getAdena(); _itemList = player.getInventory().getUniqueItems(false, true); @@ -43,24 +45,35 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MANAGE_LIST.writeId(packet); - - packet.writeD(_objId); - packet.writeQ(_playerAdena); - - packet.writeD(_itemList.size()); // inventory items for potential buy - for (L2ItemInstance item : _itemList) + packet.writeC(_sendType); + if (_sendType == 2) { - writeItem(packet, item); - packet.writeQ(item.getItem().getReferencePrice() * 2); + packet.writeD(_itemList.size()); + packet.writeD(_itemList.size()); + for (L2ItemInstance item : _itemList) + { + writeItem(packet, item); + packet.writeQ(item.getItem().getReferencePrice() * 2); + } } - - packet.writeD(_buyList.length); // count for all items already added for buy - for (TradeItem item : _buyList) + else { - writeItem(packet, item); - packet.writeQ(item.getPrice()); - packet.writeQ(item.getItem().getReferencePrice() * 2); - packet.writeQ(item.getCount()); + packet.writeD(_objId); + packet.writeQ(_playerAdena); + packet.writeD(0x00); + for (L2ItemInstance item : _itemList) + { + writeItem(packet, item); + packet.writeQ(item.getItem().getReferencePrice() * 2); + } + packet.writeD(0x00); + for (TradeItem item2 : _buyList) + { + writeItem(packet, item2); + packet.writeQ(item2.getPrice()); + packet.writeQ(item2.getItem().getReferencePrice() * 2); + packet.writeQ(item2.getCount()); + } } return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index ab8716c6ba..feb0280e7a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -25,14 +25,16 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListSell extends AbstractItemPacket { + private final int _sendType; private final int _objId; private final long _playerAdena; private final boolean _packageSale; private final Collection _itemList; private final TradeItem[] _sellList; - public PrivateStoreManageListSell(L2PcInstance player, boolean isPackageSale) + public PrivateStoreManageListSell(int sendType, L2PcInstance player, boolean isPackageSale) { + _sendType = sendType; _objId = player.getObjectId(); _playerAdena = player.getAdena(); player.getSellList().updateItems(); @@ -45,24 +47,35 @@ public class PrivateStoreManageListSell extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MANAGE_LIST.writeId(packet); - - packet.writeD(_objId); - packet.writeD(_packageSale ? 1 : 0); // Package sell - packet.writeQ(_playerAdena); - - packet.writeD(_itemList.size()); // for potential sells - for (TradeItem item : _itemList) + packet.writeC(_sendType); + if (_sendType == 2) { - writeItem(packet, item); - packet.writeQ(item.getItem().getReferencePrice() * 2); + packet.writeD(_itemList.size()); + packet.writeD(_itemList.size()); + for (TradeItem item : _itemList) + { + writeItem(packet, item); + packet.writeQ(item.getItem().getReferencePrice() * 2); + } } - - packet.writeD(_sellList.length); // count for any items already added for sell - for (TradeItem item : _sellList) + else { - writeItem(packet, item); - packet.writeQ(item.getPrice()); - packet.writeQ(item.getItem().getReferencePrice() * 2); + packet.writeD(_objId); + packet.writeD(_packageSale ? 1 : 0); + packet.writeQ(_playerAdena); + packet.writeD(0x00); + for (TradeItem item : _itemList) + { + writeItem(packet, item); + packet.writeQ(item.getItem().getReferencePrice() * 2); + } + packet.writeD(0x00); + for (TradeItem item2 : _sellList) + { + writeItem(packet, item2); + packet.writeQ(item2.getPrice()); + packet.writeQ(item2.getItem().getReferencePrice() * 2); + } } return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index 50f74a4831..404809ec54 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -25,10 +25,12 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; */ public final class TradeOtherAdd extends AbstractItemPacket { + private final int _sendType; private final TradeItem _item; - public TradeOtherAdd(TradeItem item) + public TradeOtherAdd(int sendType, TradeItem item) { + _sendType = sendType; _item = item; } @@ -36,7 +38,12 @@ public final class TradeOtherAdd extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_OTHER_ADD.writeId(packet); - packet.writeH(1); // item count + packet.writeC(_sendType); + if (_sendType == 2) + { + packet.writeD(0x01); + } + packet.writeD(0x01); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 2f5a9b68bf..b0838e73f2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -25,10 +25,12 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; */ public final class TradeOwnAdd extends AbstractItemPacket { + private final int _sendType; private final TradeItem _item; - public TradeOwnAdd(TradeItem item) + public TradeOwnAdd(int sendType, TradeItem item) { + _sendType = sendType; _item = item; } @@ -36,7 +38,12 @@ public final class TradeOwnAdd extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_OWN_ADD.writeId(packet); - packet.writeH(1); // items added count + packet.writeC(_sendType); + if (_sendType == 2) + { + packet.writeD(0x01); + } + packet.writeD(0x01); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 8e320891d3..ff914054c7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -28,13 +28,15 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; public final class TradeStart extends AbstractItemPacket { + private final int _sendType; private final L2PcInstance _activeChar; private final L2PcInstance _partner; private final Collection _itemList; private int _mask = 0; - public TradeStart(L2PcInstance player) + public TradeStart(int sendType, L2PcInstance player) { + _sendType = sendType; _activeChar = player; _partner = player.getActiveTradeList().getPartner(); _itemList = _activeChar.getInventory().getAvailableItems(true, (_activeChar.canOverrideCond(PcCondOverride.ITEM_CONDITIONS) && Config.GM_TRADE_RESTRICTED_ITEMS), false); @@ -75,16 +77,24 @@ public final class TradeStart extends AbstractItemPacket } OutgoingPackets.TRADE_START.writeId(packet); - packet.writeD(_partner.getObjectId()); - packet.writeC(_mask); // some kind of mask - if ((_mask & 0x10) == 0) + packet.writeC(_sendType); + if (_sendType == 2) { - packet.writeC(_partner.getLevel()); + packet.writeD(_itemList.size()); + packet.writeD(_itemList.size()); + for (L2ItemInstance item : _itemList) + { + writeItem(packet, item); + } } - packet.writeH(_itemList.size()); - for (L2ItemInstance item : _itemList) + else { - writeItem(packet, item); + packet.writeD(_partner.getObjectId()); + packet.writeC(_mask); // some kind of mask + if ((_mask & 0x10) == 0) + { + packet.writeC(_partner.getLevel()); + } } return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index 5eb1460aab..41767c5165 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -26,11 +26,15 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; */ public class TradeUpdate extends AbstractItemPacket { + private final int _sendType; private final TradeItem _item; private final long _newCount; + private final long _count; - public TradeUpdate(L2PcInstance player, TradeItem item) + public TradeUpdate(int sendType, L2PcInstance player, TradeItem item, long count) { + _sendType = sendType; + _count = count; _item = item; _newCount = player.getInventory().getItemByObjectId(item.getObjectId()).getCount() - item.getCount(); } @@ -39,10 +43,14 @@ public class TradeUpdate extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_UPDATE.writeId(packet); - - packet.writeH(1); - packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); - writeItem(packet, _item); + packet.writeC(_sendType); + packet.writeD(0x01); + if (_sendType == 2) + { + packet.writeD(0x01); + packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); + writeItem(packet, _item, _count); + } return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/UserInfo.java index c6de9f2d95..2fb5cbf851 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -132,7 +132,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_activeChar.getObjectId()); packet.writeD(_initSize); - packet.writeH(23); + packet.writeH(24); packet.writeB(_masks); if (containsMask(UserInfoType.RELATION)) @@ -322,14 +322,13 @@ public class UserInfo extends AbstractMaskPacket if (containsMask(UserInfoType.SLOTS)) { - packet.writeH(9); - packet.writeC(_activeChar.getInventory().getTalismanSlots()); // Confirmed - packet.writeC(_activeChar.getInventory().getBroochJewelSlots()); // Confirmed - packet.writeC(_activeChar.getTeam().getId()); // Confirmed - packet.writeC(0x00); // (1 = Red, 2 = White, 3 = White Pink) dotted ring on the floor - packet.writeC(0x00); + packet.writeH(11); // 140 + packet.writeC(_activeChar.getInventory().getTalismanSlots()); + packet.writeC(_activeChar.getInventory().getBroochJewelSlots()); + packet.writeC(_activeChar.getTeam().getId()); packet.writeC(0x00); packet.writeC(0x00); + packet.writeD(0x00); } if (containsMask(UserInfoType.MOVEMENTS)) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index f56e1fea8f..ba93760766 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,8 +30,8 @@ public final class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final int _sendType; private final long _playerAdena; - private final int _warehouseSize; private final List _items = new ArrayList<>(); private final List _itemsStackable = new ArrayList<>(); /** @@ -44,11 +44,11 @@ public final class WareHouseDepositList extends AbstractItemPacket */ private final int _whType; - public WareHouseDepositList(L2PcInstance player, int type) + public WareHouseDepositList(int sendType, L2PcInstance player, int type) { + _sendType = sendType; _whType = type; _playerAdena = player.getAdena(); - _warehouseSize = player.getActiveWarehouse() != null ? player.getActiveWarehouse().getSize() : 0; final boolean isPrivate = _whType == PRIVATE; for (L2ItemInstance temp : player.getInventory().getAvailableItems(true, isPrivate, false)) @@ -68,23 +68,23 @@ public final class WareHouseDepositList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.WAREHOUSE_DEPOSIT_LIST.writeId(packet); - - packet.writeH(_whType); - packet.writeQ(_playerAdena); - packet.writeD(_warehouseSize); - packet.writeH(_itemsStackable.size()); - - for (int itemId : _itemsStackable) + packet.writeC(_sendType); + if (_sendType == 2) { - packet.writeD(itemId); + packet.writeD(_whType); + packet.writeD(_items.size()); + for (L2ItemInstance item : _items) + { + writeItem(packet, item); + packet.writeD(item.getObjectId()); + } } - - packet.writeH(_items.size()); - - for (L2ItemInstance item : _items) + else { - writeItem(packet, item); - packet.writeD(item.getObjectId()); + packet.writeH(_whType); + packet.writeQ(_playerAdena); + packet.writeD(_itemsStackable.size()); + packet.writeD(_items.size()); } return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 77c787e1be..c06ac47535 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -31,6 +31,7 @@ public final class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private final int _sendType; private L2PcInstance _activeChar; private long _playerAdena; private final int _invSize; @@ -46,8 +47,9 @@ public final class WareHouseWithdrawalList extends AbstractItemPacket */ private int _whType; - public WareHouseWithdrawalList(L2PcInstance player, int type) + public WareHouseWithdrawalList(int sendType, L2PcInstance player, int type) { + _sendType = sendType; _activeChar = player; _whType = type; @@ -74,22 +76,26 @@ public final class WareHouseWithdrawalList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.WAREHOUSE_WITHDRAW_LIST.writeId(packet); - - packet.writeH(_whType); - packet.writeQ(_playerAdena); - packet.writeH(_items.size()); - packet.writeH(_itemsStackable.size()); - for (int itemId : _itemsStackable) + packet.writeC(_sendType); + if (_sendType == 2) { - packet.writeD(itemId); + packet.writeH(0x00); + packet.writeD(_invSize); + packet.writeD(_items.size()); + for (L2ItemInstance item : _items) + { + writeItem(packet, item); + packet.writeD(item.getObjectId()); + packet.writeD(0x00); + packet.writeD(0x00); + } } - packet.writeD(_invSize); - for (L2ItemInstance item : _items) + else { - writeItem(packet, item); - packet.writeD(item.getObjectId()); - packet.writeD(0); - packet.writeD(0); + packet.writeH(_whType); + packet.writeQ(_playerAdena); + packet.writeD(_invSize); + packet.writeD(_items.size()); } return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/launcher/Gameserver.launch b/L2J_Mobius_Classic_2.2_Antharas/launcher/Gameserver.launch index c40c75dff5..ba9b9e3b33 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/launcher/Gameserver.launch +++ b/L2J_Mobius_Classic_2.2_Antharas/launcher/Gameserver.launch @@ -1,18 +1,18 @@ - + - + - - + + diff --git a/L2J_Mobius_Classic_2.2_Antharas/launcher/Loginserver.launch b/L2J_Mobius_Classic_2.2_Antharas/launcher/Loginserver.launch index 93bea30bb3..c5f59ada93 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/launcher/Loginserver.launch +++ b/L2J_Mobius_Classic_2.2_Antharas/launcher/Loginserver.launch @@ -1,19 +1,19 @@ - + - + - - + + diff --git a/L2J_Mobius_Classic_2.2_Antharas/readme.txt b/L2J_Mobius_Classic_2.2_Antharas/readme.txt index b95196fb8c..325f9b3387 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/readme.txt +++ b/L2J_Mobius_Classic_2.2_Antharas/readme.txt @@ -1,7 +1,7 @@ L2J-Mobius Classic 2.0 -Client: https://drive.google.com/uc?id=1i8udOtNak2ANythwdPYY3sVdawOxuyBo&export=download -Geodata: http://www.mediafire.com/file/2rzuybowd9zfax4/mobius_geodata_zaken_l2d.zip +Client: +Geodata: Saviors: https://eu.4game.com/lineage2classic/play/saviors/ -Classic packet compatibility @@ -62,6 +62,9 @@ Zaken: https://eu.4game.com/lineage2classic/play/zaken/ -Zaken boss AI -TODO: Newbie quest changes +Antharas: https://eu.4game.com/lineage2classic/play/antharas/ + + Customs: -Newbie Helper NPC location info -Newbie Helper buff support until 40 level