From c45939596829885348463ebdf08aae0635a14ef2 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 17 Feb 2018 14:58:09 +0000
Subject: [PATCH] Combination item rework. Adapted from: L2jUnity free files.
---
.../dist/game/data/CombinationItems.xml | 2483 ++++++++++++
.../game/data/stats/items/34900-34999.xml | 2 -
.../game/data/stats/items/38100-38199.xml | 8 -
.../game/data/stats/items/38400-38499.xml | 80 -
.../game/data/stats/items/38500-38599.xml | 8 -
.../game/data/stats/items/38800-38899.xml | 82 -
.../game/data/stats/items/38900-38999.xml | 8 -
.../game/data/stats/items/39600-39699.xml | 46 -
.../dist/game/data/xsd/CombinationItems.xsd | 24 +
.../dist/game/data/xsd/items.xsd | 2 -
.../l2jmobius/commons/util/CommonUtil.java | 14 +
.../com/l2jmobius/gameserver/GameServer.java | 2 +
.../data/xml/impl/CombinationItemsData.java | 111 +
.../gameserver/model/items/L2Item.java | 14 -
.../items/combination/CombinationItem.java | 65 +
.../combination/CombinationItemReward.java | 38 +
.../combination/CombinationItemType.java | 26 +
.../compound/RequestNewEnchantPushOne.java | 8 +-
.../compound/RequestNewEnchantPushTwo.java | 11 +-
.../compound/RequestNewEnchantTry.java | 45 +-
.../dist/game/data/CombinationItems.xml | 2787 ++++++++++++++
.../game/data/stats/items/26400-26499.xml | 36 -
.../game/data/stats/items/26500-26599.xml | 14 -
.../game/data/stats/items/27400-27499.xml | 22 -
.../game/data/stats/items/34900-34999.xml | 2 -
.../game/data/stats/items/38100-38199.xml | 8 -
.../game/data/stats/items/38400-38499.xml | 80 -
.../game/data/stats/items/38500-38599.xml | 8 -
.../game/data/stats/items/38800-38899.xml | 82 -
.../game/data/stats/items/38900-38999.xml | 8 -
.../game/data/stats/items/39600-39699.xml | 46 -
.../game/data/stats/items/46400-46499.xml | 56 -
.../game/data/stats/items/46500-46599.xml | 14 -
.../game/data/stats/items/46600-46699.xml | 24 -
.../dist/game/data/xsd/CombinationItems.xsd | 24 +
.../dist/game/data/xsd/items.xsd | 2 -
.../l2jmobius/commons/util/CommonUtil.java | 14 +
.../com/l2jmobius/gameserver/GameServer.java | 2 +
.../data/xml/impl/CombinationItemsData.java | 111 +
.../gameserver/model/items/L2Item.java | 14 -
.../items/combination/CombinationItem.java | 65 +
.../combination/CombinationItemReward.java | 38 +
.../combination/CombinationItemType.java | 26 +
.../compound/RequestNewEnchantPushOne.java | 8 +-
.../compound/RequestNewEnchantPushTwo.java | 11 +-
.../compound/RequestNewEnchantTry.java | 45 +-
.../dist/game/data/CombinationItems.xml | 3323 +++++++++++++++++
.../game/data/stats/items/26400-26499.xml | 36 -
.../game/data/stats/items/26500-26599.xml | 14 -
.../game/data/stats/items/27400-27499.xml | 22 -
.../game/data/stats/items/28300-28399.xml | 6 -
.../game/data/stats/items/28400-28499.xml | 18 -
.../game/data/stats/items/34900-34999.xml | 2 -
.../game/data/stats/items/38100-38199.xml | 8 -
.../game/data/stats/items/38400-38499.xml | 80 -
.../game/data/stats/items/38500-38599.xml | 8 -
.../game/data/stats/items/38800-38899.xml | 96 -
.../game/data/stats/items/38900-38999.xml | 10 -
.../game/data/stats/items/39600-39699.xml | 46 -
.../game/data/stats/items/46400-46499.xml | 56 -
.../game/data/stats/items/46500-46599.xml | 14 -
.../game/data/stats/items/46600-46699.xml | 24 -
.../game/data/stats/items/47600-47699.xml | 20 -
.../dist/game/data/xsd/CombinationItems.xsd | 24 +
.../dist/game/data/xsd/items.xsd | 2 -
.../l2jmobius/commons/util/CommonUtil.java | 14 +
.../com/l2jmobius/gameserver/GameServer.java | 2 +
.../data/xml/impl/CombinationItemsData.java | 111 +
.../gameserver/model/items/L2Item.java | 14 -
.../items/combination/CombinationItem.java | 65 +
.../combination/CombinationItemReward.java | 38 +
.../combination/CombinationItemType.java | 26 +
.../compound/RequestNewEnchantPushOne.java | 8 +-
.../compound/RequestNewEnchantPushTwo.java | 11 +-
.../compound/RequestNewEnchantTry.java | 45 +-
.../compound/ExEnchantRetryToPutItemFail.java | 40 +
.../compound/ExEnchantRetryToPutItemOk.java | 40 +
.../dist/game/data/CombinationItems.xml | 3323 +++++++++++++++++
.../game/data/stats/items/26400-26499.xml | 36 -
.../game/data/stats/items/26500-26599.xml | 14 -
.../game/data/stats/items/27400-27499.xml | 22 -
.../game/data/stats/items/28300-28399.xml | 6 -
.../game/data/stats/items/28400-28499.xml | 18 -
.../game/data/stats/items/29000-29099.xml | 18 -
.../game/data/stats/items/34900-34999.xml | 2 -
.../game/data/stats/items/38100-38199.xml | 8 -
.../game/data/stats/items/38400-38499.xml | 80 -
.../game/data/stats/items/38500-38599.xml | 8 -
.../game/data/stats/items/38800-38899.xml | 96 -
.../game/data/stats/items/38900-38999.xml | 10 -
.../game/data/stats/items/39600-39699.xml | 46 -
.../game/data/stats/items/46400-46499.xml | 56 -
.../game/data/stats/items/46500-46599.xml | 14 -
.../game/data/stats/items/46600-46699.xml | 24 -
.../game/data/stats/items/47600-47699.xml | 20 -
.../dist/game/data/xsd/CombinationItems.xsd | 24 +
.../dist/game/data/xsd/items.xsd | 2 -
.../l2jmobius/commons/util/CommonUtil.java | 14 +
.../com/l2jmobius/gameserver/GameServer.java | 2 +
.../data/xml/impl/CombinationItemsData.java | 111 +
.../gameserver/model/items/L2Item.java | 14 -
.../items/combination/CombinationItem.java | 65 +
.../combination/CombinationItemReward.java | 38 +
.../combination/CombinationItemType.java | 26 +
.../gameserver/network/ExIncomingPackets.java | 1 +
.../RequestNewEnchantRetryToPutItems.java | 102 -
.../compound/RequestNewEnchantPushOne.java | 8 +-
.../compound/RequestNewEnchantPushTwo.java | 11 +-
.../RequestNewEnchantRetryToPutItems.java | 210 +-
.../compound/RequestNewEnchantTry.java | 45 +-
.../compound/ExEnchantRetryToPutItemFail.java | 40 +
.../compound/ExEnchantRetryToPutItemOk.java | 40 +
.../dist/game/data/CombinationItems.xml | 395 ++
.../dist/game/data/xsd/CombinationItems.xsd | 24 +
.../dist/game/data/xsd/items.xsd | 2 -
.../l2jmobius/commons/util/CommonUtil.java | 14 +
.../com/l2jmobius/gameserver/GameServer.java | 2 +
.../data/xml/impl/CombinationItemsData.java | 111 +
.../items/combination/CombinationItem.java | 65 +
.../combination/CombinationItemReward.java | 38 +
.../combination/CombinationItemType.java | 26 +
.../compound/RequestNewEnchantPushOne.java | 8 +-
.../compound/RequestNewEnchantPushTwo.java | 11 +-
.../compound/RequestNewEnchantTry.java | 45 +-
.../compound/ExEnchantRetryToPutItemFail.java | 40 +
.../compound/ExEnchantRetryToPutItemOk.java | 40 +
126 files changed, 14210 insertions(+), 2012 deletions(-)
create mode 100644 L2J_Mobius_1.0_Ertheia/dist/game/data/CombinationItems.xml
create mode 100644 L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/CombinationItems.xsd
create mode 100644 L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
create mode 100644 L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/combination/CombinationItem.java
create mode 100644 L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java
create mode 100644 L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/combination/CombinationItemType.java
create mode 100644 L2J_Mobius_2.5_Underground/dist/game/data/CombinationItems.xml
create mode 100644 L2J_Mobius_2.5_Underground/dist/game/data/xsd/CombinationItems.xsd
create mode 100644 L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
create mode 100644 L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/combination/CombinationItem.java
create mode 100644 L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java
create mode 100644 L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/combination/CombinationItemType.java
create mode 100644 L2J_Mobius_3.0_Helios/dist/game/data/CombinationItems.xml
create mode 100644 L2J_Mobius_3.0_Helios/dist/game/data/xsd/CombinationItems.xsd
create mode 100644 L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
create mode 100644 L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/combination/CombinationItem.java
create mode 100644 L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java
create mode 100644 L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/combination/CombinationItemType.java
create mode 100644 L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantRetryToPutItemFail.java
create mode 100644 L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantRetryToPutItemOk.java
create mode 100644 L2J_Mobius_4.0_GrandCrusade/dist/game/data/CombinationItems.xml
create mode 100644 L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/CombinationItems.xsd
create mode 100644 L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
create mode 100644 L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/combination/CombinationItem.java
create mode 100644 L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java
create mode 100644 L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/combination/CombinationItemType.java
delete mode 100644 L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestNewEnchantRetryToPutItems.java
rename {L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets => L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/compound}/RequestNewEnchantRetryToPutItems.java (82%)
create mode 100644 L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantRetryToPutItemFail.java
create mode 100644 L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantRetryToPutItemOk.java
create mode 100644 L2J_Mobius_Classic_2.0_Saviors/dist/game/data/CombinationItems.xml
create mode 100644 L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/CombinationItems.xsd
create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/combination/CombinationItem.java
create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java
create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/combination/CombinationItemType.java
create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantRetryToPutItemFail.java
create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantRetryToPutItemOk.java
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/CombinationItems.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/CombinationItems.xml
new file mode 100644
index 0000000000..8d6ccb1e66
--- /dev/null
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/CombinationItems.xml
@@ -0,0 +1,2483 @@
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/34900-34999.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/34900-34999.xml
index 4f8a6cf424..d117a4d0a4 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/34900-34999.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/34900-34999.xml
@@ -1777,8 +1777,6 @@
-
-
-
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38100-38199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38100-38199.xml
index ff086e34be..26e5d10378 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38100-38199.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38100-38199.xml
@@ -515,8 +515,6 @@
-
-
-
@@ -545,8 +543,6 @@
-
-
-
@@ -575,8 +571,6 @@
-
-
-
@@ -604,8 +598,6 @@
-
-
-
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38400-38499.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38400-38499.xml
index 8d0f11b2b9..7f25e40a77 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38400-38499.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38400-38499.xml
@@ -940,8 +940,6 @@
-
-
-
@@ -970,8 +968,6 @@
-
-
-
@@ -1000,8 +996,6 @@
-
-
-
@@ -1029,8 +1023,6 @@
-
-
-
@@ -1085,8 +1077,6 @@
-
-
-
@@ -1115,8 +1105,6 @@
-
-
-
@@ -1145,8 +1133,6 @@
-
-
-
@@ -1174,8 +1160,6 @@
-
-
-
@@ -1230,8 +1214,6 @@
-
-
-
@@ -1260,8 +1242,6 @@
-
-
-
@@ -1290,8 +1270,6 @@
-
-
-
@@ -1319,8 +1297,6 @@
-
-
-
@@ -1375,8 +1351,6 @@
-
-
-
@@ -1405,8 +1379,6 @@
-
-
-
@@ -1435,8 +1407,6 @@
-
-
-
@@ -1464,8 +1434,6 @@
-
-
-
@@ -1520,8 +1488,6 @@
-
-
-
@@ -1550,8 +1516,6 @@
-
-
-
@@ -1580,8 +1544,6 @@
-
-
-
@@ -1609,8 +1571,6 @@
-
-
-
@@ -1666,8 +1626,6 @@
-
-
-
@@ -1696,8 +1654,6 @@
-
-
-
@@ -1726,8 +1682,6 @@
-
-
-
@@ -1755,8 +1709,6 @@
-
-
-
@@ -1811,8 +1763,6 @@
-
-
-
@@ -1841,8 +1791,6 @@
-
-
-
@@ -1871,8 +1819,6 @@
-
-
-
@@ -1900,8 +1846,6 @@
-
-
-
@@ -1956,8 +1900,6 @@
-
-
-
@@ -1986,8 +1928,6 @@
-
-
-
@@ -2016,8 +1956,6 @@
-
-
-
@@ -2045,8 +1983,6 @@
-
-
-
@@ -2101,8 +2037,6 @@
-
-
-
@@ -2131,8 +2065,6 @@
-
-
-
@@ -2161,8 +2093,6 @@
-
-
-
@@ -2190,8 +2120,6 @@
-
-
-
@@ -2246,8 +2174,6 @@
-
-
-
@@ -2276,8 +2202,6 @@
-
-
-
@@ -2306,8 +2230,6 @@
-
-
-
@@ -2336,8 +2258,6 @@
-
-
-
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38500-38599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38500-38599.xml
index 6f56614ce1..e3358d6647 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38500-38599.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38500-38599.xml
@@ -3,8 +3,6 @@
-
-
-
@@ -33,8 +31,6 @@
-
-
-
@@ -63,8 +59,6 @@
-
-
-
@@ -92,8 +86,6 @@
-
-
-
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38800-38899.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38800-38899.xml
index 12a4114d04..ac82de0eda 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38800-38899.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38800-38899.xml
@@ -1503,8 +1503,6 @@
-
-
-
@@ -1522,8 +1520,6 @@
-
-
-
@@ -1541,8 +1537,6 @@
-
-
-
@@ -1560,8 +1554,6 @@
-
-
-
@@ -1591,8 +1583,6 @@
-
-
-
@@ -1610,8 +1600,6 @@
-
-
-
@@ -1629,8 +1617,6 @@
-
-
-
@@ -1648,8 +1634,6 @@
-
-
-
@@ -1667,8 +1651,6 @@
-
-
-
@@ -1683,8 +1665,6 @@
-
-
-
@@ -1697,8 +1677,6 @@
-
-
-
@@ -1711,8 +1689,6 @@
-
-
-
@@ -1725,8 +1701,6 @@
-
-
-
@@ -1751,8 +1725,6 @@
-
-
-
@@ -1765,8 +1737,6 @@
-
-
-
@@ -1779,8 +1749,6 @@
-
-
-
@@ -1793,8 +1761,6 @@
-
-
-
@@ -1819,8 +1785,6 @@
-
-
-
@@ -1838,8 +1802,6 @@
-
-
-
@@ -1857,8 +1819,6 @@
-
-
-
@@ -1876,8 +1836,6 @@
-
-
-
@@ -1909,8 +1867,6 @@
-
-
-
@@ -1928,8 +1884,6 @@
-
-
-
@@ -1947,8 +1901,6 @@
-
-
-
@@ -1966,8 +1918,6 @@
-
-
-
@@ -1999,8 +1949,6 @@
-
-
-
@@ -2018,8 +1966,6 @@
-
-
-
@@ -2038,8 +1984,6 @@
-
-
-
@@ -2058,8 +2002,6 @@
-
-
-
@@ -2092,8 +2034,6 @@
-
-
-
@@ -2112,8 +2052,6 @@
-
-
-
@@ -2132,8 +2070,6 @@
-
-
-
@@ -2152,8 +2088,6 @@
-
-
-
@@ -2186,8 +2120,6 @@
-
-
-
@@ -2206,8 +2138,6 @@
-
-
-
@@ -2226,8 +2156,6 @@
-
-
-
@@ -2246,8 +2174,6 @@
-
-
-
@@ -2280,8 +2206,6 @@
-
-
-
@@ -2300,8 +2224,6 @@
-
-
-
@@ -2320,8 +2242,6 @@
-
-
-
@@ -2340,8 +2260,6 @@
-
-
-
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38900-38999.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38900-38999.xml
index ee6be364ed..12f94e4a18 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38900-38999.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38900-38999.xml
@@ -231,8 +231,6 @@
-
-
-
@@ -252,8 +250,6 @@
-
-
-
@@ -273,8 +269,6 @@
-
-
-
@@ -293,8 +287,6 @@
-
-
-
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/39600-39699.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/39600-39699.xml
index 74d79ecba0..ac134f3751 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/39600-39699.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/39600-39699.xml
@@ -921,8 +921,6 @@
-
-
-
@@ -941,8 +939,6 @@
-
-
-
@@ -960,8 +956,6 @@
-
-
-
@@ -979,8 +973,6 @@
-
-
-
@@ -998,8 +990,6 @@
-
-
-
@@ -1017,8 +1007,6 @@
-
-
-
@@ -1036,8 +1024,6 @@
-
-
-
@@ -1055,8 +1041,6 @@
-
-
-
@@ -1074,8 +1058,6 @@
-
-
-
@@ -1093,8 +1075,6 @@
-
-
-
@@ -1112,8 +1092,6 @@
-
-
-
@@ -1131,8 +1109,6 @@
-
-
-
@@ -1150,8 +1126,6 @@
-
-
-
@@ -1169,8 +1143,6 @@
-
-
-
@@ -1187,8 +1159,6 @@
-
-
-
@@ -1205,8 +1175,6 @@
-
-
-
@@ -1223,8 +1191,6 @@
-
-
-
@@ -1241,8 +1207,6 @@
-
-
-
@@ -1259,8 +1223,6 @@
-
-
-
@@ -1277,8 +1239,6 @@
-
-
-
@@ -1295,8 +1255,6 @@
-
-
-
@@ -1313,8 +1271,6 @@
-
-
-
@@ -1331,8 +1287,6 @@
-
-
-
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/CombinationItems.xsd b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/CombinationItems.xsd
new file mode 100644
index 0000000000..eb06810c8c
--- /dev/null
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/CombinationItems.xsd
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/items.xsd b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/items.xsd
index f54adbc12f..9e808080f2 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/items.xsd
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/items.xsd
@@ -134,8 +134,6 @@
-
-
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/CommonUtil.java
index bfba2b32b6..16530e4fcf 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/CommonUtil.java
@@ -21,12 +21,15 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.nio.ByteBuffer;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
import java.time.DayOfWeek;
import java.time.LocalDateTime;
import java.time.temporal.TemporalAdjusters;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
+import java.util.Locale;
import java.util.StringJoiner;
import java.util.StringTokenizer;
@@ -573,4 +576,15 @@ public final class CommonUtil
}
return sj.toString();
}
+
+ /**
+ * @param val
+ * @param format
+ * @return
+ */
+ public static String formatDouble(double val, String format)
+ {
+ final DecimalFormat formatter = new DecimalFormat(format, new DecimalFormatSymbols(Locale.ENGLISH));
+ return formatter.format(val);
+ }
}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/GameServer.java
index 9cbf10ad41..f1d6736c11 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/GameServer.java
@@ -50,6 +50,7 @@ import com.l2jmobius.gameserver.data.xml.impl.CategoryData;
import com.l2jmobius.gameserver.data.xml.impl.ClanHallData;
import com.l2jmobius.gameserver.data.xml.impl.ClanRewardData;
import com.l2jmobius.gameserver.data.xml.impl.ClassListData;
+import com.l2jmobius.gameserver.data.xml.impl.CombinationItemsData;
import com.l2jmobius.gameserver.data.xml.impl.CubicData;
import com.l2jmobius.gameserver.data.xml.impl.DoorData;
import com.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
@@ -203,6 +204,7 @@ public class GameServer
CategoryData.getInstance();
SecondaryAuthData.getInstance();
AbilityPointsData.getInstance();
+ CombinationItemsData.getInstance();
SayuneData.getInstance();
ClanRewardData.getInstance();
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
new file mode 100644
index 0000000000..a7e90d5f89
--- /dev/null
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
@@ -0,0 +1,111 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package com.l2jmobius.gameserver.data.xml.impl;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+import org.w3c.dom.Document;
+
+import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.gameserver.datatables.ItemTable;
+import com.l2jmobius.gameserver.model.StatsSet;
+import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
+import com.l2jmobius.gameserver.model.items.combination.CombinationItemReward;
+import com.l2jmobius.gameserver.model.items.combination.CombinationItemType;
+
+/**
+ * @author UnAfraid
+ */
+public class CombinationItemsData implements IGameXmlReader
+{
+ private static final Logger LOGGER = Logger.getLogger(CombinationItemsData.class.getName());
+ private final List _items = new ArrayList<>();
+
+ protected CombinationItemsData()
+ {
+ load();
+ }
+
+ @Override
+ public synchronized void load()
+ {
+ _items.clear();
+ parseDatapackFile("data/CombinationItems.xml");
+ LOGGER.info(getClass().getSimpleName() + ": Loaded " + _items.size() + " combinations.");
+ }
+
+ @Override
+ public void parseDocument(Document doc, File f)
+ {
+ forEach(doc, "list", listNode -> forEach(listNode, "item", itemNode ->
+ {
+ final CombinationItem item = new CombinationItem(new StatsSet(parseAttributes(itemNode)));
+
+ forEach(itemNode, "reward", rewardNode ->
+ {
+ final int id = parseInteger(rewardNode.getAttributes(), "id");
+ final int count = parseInteger(rewardNode.getAttributes(), "count", 1);
+ final CombinationItemType type = parseEnum(rewardNode.getAttributes(), CombinationItemType.class, "type");
+ item.addReward(new CombinationItemReward(id, count, type));
+ if (ItemTable.getInstance().getTemplate(id) == null)
+ {
+ LOGGER.info(getClass().getSimpleName() + ": Could not find item with id " + id);
+ }
+ });
+ _items.add(item);
+ }));
+ }
+
+ public int getLoadedElementsCount()
+ {
+ return _items.size();
+ }
+
+ public List getItems()
+ {
+ return _items;
+ }
+
+ public CombinationItem getItemsBySlots(int firstSlot, int secondSlot)
+ {
+ return _items.stream().filter(item -> (item.getItemOne() == firstSlot) && (item.getItemTwo() == secondSlot)).findFirst().orElse(null);
+ }
+
+ public List getItemsByFirstSlot(int id)
+ {
+ return _items.stream().filter(item -> item.getItemOne() == id).collect(Collectors.toList());
+ }
+
+ public List getItemsBySecondSlot(int id)
+ {
+ return _items.stream().filter(item -> item.getItemTwo() == id).collect(Collectors.toList());
+ }
+
+ public static final CombinationItemsData getInstance()
+ {
+ return SingletonHolder.INSTANCE;
+ }
+
+ private static class SingletonHolder
+ {
+ protected static final CombinationItemsData INSTANCE = new CombinationItemsData();
+ }
+}
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Item.java
index 2f590854f8..c86ec8ca9b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Item.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Item.java
@@ -170,8 +170,6 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
private int _sharedReuseGroup;
private CommissionItemType _commissionItemType;
- private int _compoundItem;
- private float _compoundChance;
private boolean _isAppearanceable;
private boolean _isBlessed;
@@ -230,8 +228,6 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
_reuseDelay = set.getInt("reuse_delay", 0);
_sharedReuseGroup = set.getInt("shared_reuse_group", 0);
_commissionItemType = set.getEnum("commissionItemType", CommissionItemType.class, CommissionItemType.OTHER_ITEM);
- _compoundItem = set.getInt("compoundItem", 0);
- _compoundChance = set.getFloat("compoundChance", 0);
_common = ((_itemId >= 11605) && (_itemId <= 12361));
_heroItem = ((_itemId >= 6611) && (_itemId <= 6621)) || ((_itemId >= 9388) && (_itemId <= 9390)) || (_itemId == 6842);
_pvpItem = ((_itemId >= 10667) && (_itemId <= 10835)) || ((_itemId >= 12852) && (_itemId <= 12977)) || ((_itemId >= 14363) && (_itemId <= 14525)) || (_itemId == 14528) || (_itemId == 14529) || (_itemId == 14558) || ((_itemId >= 15913) && (_itemId <= 16024)) || ((_itemId >= 16134) && (_itemId <= 16147)) || (_itemId == 16149) || (_itemId == 16151) || (_itemId == 16153) || (_itemId == 16155) || (_itemId == 16157) || (_itemId == 16159) || ((_itemId >= 16168) && (_itemId <= 16176)) || ((_itemId >= 16179) && (_itemId <= 16220));
@@ -961,16 +957,6 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
return _commissionItemType;
}
- public int getCompoundItem()
- {
- return _compoundItem;
- }
-
- public float getCompoundChance()
- {
- return _compoundChance;
- }
-
/**
* Usable in HTML windows.
* @return the icon link in client files
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/combination/CombinationItem.java
new file mode 100644
index 0000000000..d186f635fe
--- /dev/null
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/combination/CombinationItem.java
@@ -0,0 +1,65 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package com.l2jmobius.gameserver.model.items.combination;
+
+import java.util.EnumMap;
+import java.util.Map;
+
+import com.l2jmobius.gameserver.model.StatsSet;
+
+/**
+ * @author UnAfraid
+ */
+public class CombinationItem
+{
+ private final int _itemOne;
+ private final int _itemTwo;
+ private final int _chance;
+ private final Map _rewards = new EnumMap<>(CombinationItemType.class);
+
+ public CombinationItem(StatsSet set)
+ {
+ _itemOne = set.getInt("one");
+ _itemTwo = set.getInt("two");
+ _chance = set.getInt("chance");
+ }
+
+ public int getItemOne()
+ {
+ return _itemOne;
+ }
+
+ public int getItemTwo()
+ {
+ return _itemTwo;
+ }
+
+ public int getChance()
+ {
+ return _chance;
+ }
+
+ public void addReward(CombinationItemReward item)
+ {
+ _rewards.put(item.getType(), item);
+ }
+
+ public CombinationItemReward getReward(CombinationItemType type)
+ {
+ return _rewards.get(type);
+ }
+}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java
new file mode 100644
index 0000000000..c84363b0b2
--- /dev/null
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package com.l2jmobius.gameserver.model.items.combination;
+
+import com.l2jmobius.gameserver.model.holders.ItemHolder;
+
+/**
+ * @author UnAfraid
+ */
+public class CombinationItemReward extends ItemHolder
+{
+ private final CombinationItemType _type;
+
+ public CombinationItemReward(int id, int count, CombinationItemType type)
+ {
+ super(id, count);
+ _type = type;
+ }
+
+ public CombinationItemType getType()
+ {
+ return _type;
+ }
+}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/combination/CombinationItemType.java
new file mode 100644
index 0000000000..252c81fea6
--- /dev/null
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/combination/CombinationItemType.java
@@ -0,0 +1,26 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package com.l2jmobius.gameserver.model.items.combination;
+
+/**
+ * @author UnAfraid
+ */
+public enum CombinationItemType
+{
+ ON_SUCCESS,
+ ON_FAILURE;
+}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 198dcb3bc5..4bb19b2b40 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -16,9 +16,13 @@
*/
package com.l2jmobius.gameserver.network.clientpackets.compound;
+import java.util.List;
+
import com.l2jmobius.commons.network.PacketReader;
+import com.l2jmobius.gameserver.data.xml.impl.CombinationItemsData;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.request.CompoundRequest;
+import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -78,8 +82,10 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
return;
}
+ final List combinationItems = CombinationItemsData.getInstance().getItemsByFirstSlot(itemOne.getId());
+
// Not implemented or not able to merge!
- if ((itemOne.getItem().getCompoundItem() == 0) || (itemOne.getItem().getCompoundChance() == 0))
+ if (combinationItems.isEmpty())
{
client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
activeChar.removeRequest(request.getClass());
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 9bb1e53e8c..a0317b61be 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -17,8 +17,10 @@
package com.l2jmobius.gameserver.network.clientpackets.compound;
import com.l2jmobius.commons.network.PacketReader;
+import com.l2jmobius.gameserver.data.xml.impl.CombinationItemsData;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.request.CompoundRequest;
+import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -86,15 +88,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
return;
}
- // Combining only same items!
- if (itemOne.getItem().getId() != itemTwo.getItem().getId())
- {
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
- return;
- }
+ final CombinationItem combinationItem = CombinationItemsData.getInstance().getItemsBySlots(itemOne.getId(), itemTwo.getId());
// Not implemented or not able to merge!
- if ((itemOne.getItem().getCompoundItem() == 0) || (itemOne.getItem().getCompoundChance() == 0))
+ if (combinationItem == null)
{
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index 2143d745d5..6858e0b447 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -18,8 +18,12 @@ package com.l2jmobius.gameserver.network.clientpackets.compound;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.commons.util.Rnd;
+import com.l2jmobius.gameserver.data.xml.impl.CombinationItemsData;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.request.CompoundRequest;
+import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
+import com.l2jmobius.gameserver.model.items.combination.CombinationItemReward;
+import com.l2jmobius.gameserver.model.items.combination.CombinationItemType;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -82,50 +86,39 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice
if (itemOne.getObjectId() == itemTwo.getObjectId())
{
- client.sendPacket(new ExEnchantFail(itemOne.getItem().getId(), itemTwo.getItem().getId()));
+ client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
activeChar.removeRequest(request.getClass());
return;
}
- // Combining only same items!
- if (itemOne.getItem().getId() != itemTwo.getItem().getId())
- {
- client.sendPacket(new ExEnchantFail(itemOne.getItem().getId(), itemTwo.getItem().getId()));
- activeChar.removeRequest(request.getClass());
- return;
- }
+ final CombinationItem combinationItem = CombinationItemsData.getInstance().getItemsBySlots(itemOne.getId(), itemTwo.getId());
// Not implemented or not able to merge!
- if ((itemOne.getItem().getCompoundItem() == 0) || (itemOne.getItem().getCompoundChance() == 0))
+ if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getItem().getId(), itemTwo.getItem().getId()));
+ client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
activeChar.removeRequest(request.getClass());
return;
}
final InventoryUpdate iu = new InventoryUpdate();
- final double random = Rnd.nextDouble() * 100;
+ iu.addRemovedItem(itemOne);
+ iu.addRemovedItem(itemTwo);
- // Success
- if (random < itemOne.getItem().getCompoundChance())
+ if (activeChar.destroyItem("Compound-Item-One", itemOne, 1, null, true) && activeChar.destroyItem("Compound-Item-Two", itemTwo, 1, null, true))
{
- iu.addRemovedItem(itemOne);
- iu.addRemovedItem(itemTwo);
+ final double random = (Rnd.nextDouble() * 100);
+ final boolean success = random <= combinationItem.getChance();
+ final CombinationItemReward rewardItem = combinationItem.getReward(success ? CombinationItemType.ON_SUCCESS : CombinationItemType.ON_FAILURE);
+ final L2ItemInstance item = activeChar.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
- if (activeChar.destroyItem("Compound-Item-One", itemOne, null, true) && activeChar.destroyItem("Compound-Item-Two", itemTwo, null, true))
+ if (success)
{
- final L2ItemInstance item = activeChar.addItem("Compound-Result", itemOne.getItem().getCompoundItem(), 1, null, true);
- client.sendPacket(new ExEnchantSucess(item.getItem().getId()));
+ client.sendPacket(new ExEnchantSucess(item.getId()));
}
- }
- else
- {
- iu.addRemovedItem(itemTwo);
-
- // Upon fail we destroy the second item.
- if (activeChar.destroyItem("Compound-Item-Two-Fail", itemTwo, null, true))
+ else
{
- client.sendPacket(new ExEnchantFail(itemOne.getItem().getId(), itemTwo.getItem().getId()));
+ client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/CombinationItems.xml b/L2J_Mobius_2.5_Underground/dist/game/data/CombinationItems.xml
new file mode 100644
index 0000000000..4566f70454
--- /dev/null
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/CombinationItems.xml
@@ -0,0 +1,2787 @@
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/26400-26499.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/26400-26499.xml
index 2c2d6a0649..cee936f445 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/26400-26499.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/26400-26499.xml
@@ -852,8 +852,6 @@
-
-
-
@@ -871,8 +869,6 @@
-
-
-
@@ -890,8 +886,6 @@
-
-
-
@@ -910,8 +904,6 @@
-
-
-
@@ -930,8 +922,6 @@
-
-
-
@@ -947,8 +937,6 @@
-
-
-
@@ -966,8 +954,6 @@
-
-
-
@@ -985,8 +971,6 @@
-
-
-
@@ -1004,8 +988,6 @@
-
-
-
@@ -1023,8 +1005,6 @@
-
-
-
@@ -1038,8 +1018,6 @@
-
-
-
@@ -1057,8 +1035,6 @@
-
-
-
@@ -1076,8 +1052,6 @@
-
-
-
@@ -1095,8 +1069,6 @@
-
-
-
@@ -1114,8 +1086,6 @@
-
-
-
@@ -1214,8 +1184,6 @@
-
-
-
@@ -1233,8 +1201,6 @@
-
-
-
@@ -1252,8 +1218,6 @@
-
-
-
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/26500-26599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/26500-26599.xml
index c0e36776d5..a7476726ec 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/26500-26599.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/26500-26599.xml
@@ -3,8 +3,6 @@
-
-
-
@@ -23,8 +21,6 @@
-
-
-
@@ -39,8 +35,6 @@
-
-
-
@@ -59,8 +53,6 @@
-
-
-
@@ -79,8 +71,6 @@
-
-
-
@@ -99,8 +89,6 @@
-
-
-
@@ -119,8 +107,6 @@
-
-
-
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/27400-27499.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/27400-27499.xml
index e5c3e83fae..b5f0e82d69 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/27400-27499.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/27400-27499.xml
@@ -992,8 +992,6 @@
-
-
-
@@ -1009,8 +1007,6 @@
-
-
-
@@ -1021,8 +1017,6 @@
-
-
-
@@ -1037,8 +1031,6 @@
-
-
-
@@ -1057,8 +1049,6 @@
-
-
-
@@ -1077,8 +1067,6 @@
-
-
-
@@ -1097,8 +1085,6 @@
-
-
-
@@ -1117,8 +1103,6 @@
-
-
-
@@ -1154,8 +1138,6 @@
-
-
-
@@ -1171,8 +1153,6 @@
-
-
-
@@ -1188,8 +1168,6 @@
-
-
-
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/34900-34999.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/34900-34999.xml
index f23ee199d8..56f29e633b 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/34900-34999.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/34900-34999.xml
@@ -1777,8 +1777,6 @@
-
-
-
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38100-38199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38100-38199.xml
index f5b31fa328..fa64438ca7 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38100-38199.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38100-38199.xml
@@ -515,8 +515,6 @@
-
-
-
@@ -545,8 +543,6 @@
-
-
-
@@ -575,8 +571,6 @@
-
-
-
@@ -604,8 +598,6 @@
-
-
-
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38400-38499.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38400-38499.xml
index 8d0f11b2b9..7f25e40a77 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38400-38499.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38400-38499.xml
@@ -940,8 +940,6 @@
-
-
-
@@ -970,8 +968,6 @@
-
-
-
@@ -1000,8 +996,6 @@
-
-
-
@@ -1029,8 +1023,6 @@
-
-
-
@@ -1085,8 +1077,6 @@
-
-
-
@@ -1115,8 +1105,6 @@
-
-
-
@@ -1145,8 +1133,6 @@
-
-
-
@@ -1174,8 +1160,6 @@
-
-
-
@@ -1230,8 +1214,6 @@
-
-
-
@@ -1260,8 +1242,6 @@
-
-
-
@@ -1290,8 +1270,6 @@
-
-
-
@@ -1319,8 +1297,6 @@
-
-
-
@@ -1375,8 +1351,6 @@
-
-
-
@@ -1405,8 +1379,6 @@
-
-
-
@@ -1435,8 +1407,6 @@
-
-
-
@@ -1464,8 +1434,6 @@
-
-
-
@@ -1520,8 +1488,6 @@
-
-
-
@@ -1550,8 +1516,6 @@
-
-
-
@@ -1580,8 +1544,6 @@
-
-
-
@@ -1609,8 +1571,6 @@
-
-
-
@@ -1666,8 +1626,6 @@
-
-
-
@@ -1696,8 +1654,6 @@
-
-
-
@@ -1726,8 +1682,6 @@
-
-
-
@@ -1755,8 +1709,6 @@
-
-
-
@@ -1811,8 +1763,6 @@
-
-
-
@@ -1841,8 +1791,6 @@
-
-
-
@@ -1871,8 +1819,6 @@
-
-
-
@@ -1900,8 +1846,6 @@
-
-
-
@@ -1956,8 +1900,6 @@
-
-
-
@@ -1986,8 +1928,6 @@
-
-
-
@@ -2016,8 +1956,6 @@
-
-
-
@@ -2045,8 +1983,6 @@
-
-
-
@@ -2101,8 +2037,6 @@
-
-
-
@@ -2131,8 +2065,6 @@
-
-
-
@@ -2161,8 +2093,6 @@
-
-
-
@@ -2190,8 +2120,6 @@
-
-
-
@@ -2246,8 +2174,6 @@
-
-
-
@@ -2276,8 +2202,6 @@
-
-
-
@@ -2306,8 +2230,6 @@
-
-
-
@@ -2336,8 +2258,6 @@
-
-
-
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38500-38599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38500-38599.xml
index 32bb887b1e..67750a2907 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38500-38599.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38500-38599.xml
@@ -3,8 +3,6 @@
-
-
-
@@ -33,8 +31,6 @@
-
-
-
@@ -63,8 +59,6 @@
-
-
-
@@ -92,8 +86,6 @@
-
-
-
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38800-38899.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38800-38899.xml
index 8432363868..bc9b2b7bee 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38800-38899.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38800-38899.xml
@@ -1503,8 +1503,6 @@
-
-
-
@@ -1522,8 +1520,6 @@
-
-
-
@@ -1541,8 +1537,6 @@
-
-
-
@@ -1560,8 +1554,6 @@
-
-
-
@@ -1591,8 +1583,6 @@
-
-
-
@@ -1610,8 +1600,6 @@
-
-
-
@@ -1629,8 +1617,6 @@
-
-
-
@@ -1648,8 +1634,6 @@
-
-
-
@@ -1667,8 +1651,6 @@
-
-
-
@@ -1683,8 +1665,6 @@
-
-
-
@@ -1697,8 +1677,6 @@
-
-
-
@@ -1711,8 +1689,6 @@
-
-
-
@@ -1725,8 +1701,6 @@
-
-
-
@@ -1751,8 +1725,6 @@
-
-
-
@@ -1765,8 +1737,6 @@
-
-
-
@@ -1779,8 +1749,6 @@
-
-
-
@@ -1793,8 +1761,6 @@
-
-
-
@@ -1819,8 +1785,6 @@
-
-
-
@@ -1838,8 +1802,6 @@
-
-
-
@@ -1857,8 +1819,6 @@
-
-
-
@@ -1876,8 +1836,6 @@
-
-
-
@@ -1909,8 +1867,6 @@
-
-
-
@@ -1928,8 +1884,6 @@
-
-
-
@@ -1947,8 +1901,6 @@
-
-
-
@@ -1966,8 +1918,6 @@
-
-
-
@@ -1999,8 +1949,6 @@
-
-
-
@@ -2018,8 +1966,6 @@
-
-
-
@@ -2038,8 +1984,6 @@
-
-
-
@@ -2058,8 +2002,6 @@
-
-
-
@@ -2092,8 +2034,6 @@
-
-
-
@@ -2112,8 +2052,6 @@
-
-
-
@@ -2132,8 +2070,6 @@
-
-
-
@@ -2152,8 +2088,6 @@
-
-
-
@@ -2186,8 +2120,6 @@
-
-
-
@@ -2206,8 +2138,6 @@
-
-
-
@@ -2226,8 +2156,6 @@
-
-
-
@@ -2246,8 +2174,6 @@
-
-
-
@@ -2280,8 +2206,6 @@
-
-
-
@@ -2300,8 +2224,6 @@
-
-
-
@@ -2320,8 +2242,6 @@
-
-
-
@@ -2340,8 +2260,6 @@
-
-
-
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38900-38999.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38900-38999.xml
index 1ce01ff618..199c013fdb 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38900-38999.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38900-38999.xml
@@ -231,8 +231,6 @@
-
-
-
@@ -252,8 +250,6 @@
-
-
-
@@ -273,8 +269,6 @@
-
-
-
@@ -293,8 +287,6 @@
-