Support for enchant limit on items, limits for kaliel bracelets and correction for AbstractEnchant Condition

Index: java/org/l2jmobius/gameserver/model/items/Item.java
===================================================================
--- java/org/l2jmobius/gameserver/model/items/Item.java (revision 7857)
+++ java/org/l2jmobius/gameserver/model/items/Item.java (working copy)
@@ -143,6 +143,7 @@
    private boolean _tradeable;
    private boolean _depositable;
    private int _enchantable;
+   private int _enchantLimit;
    private boolean _elementable;
    private boolean _questItem;
    private boolean _freightable;
@@ -219,6 +220,7 @@

        _elementable = set.getBoolean("element_enabled", false);
        _enchantable = set.getInt("enchant_enabled", 0);
+       _enchantLimit = set.getInt("enchant_limit", 0);
        _freightable = set.getBoolean("is_freightable", false);
        _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false);
        _isOlyRestricted = set.getBoolean("is_oly_restricted", false);
@@ -624,6 +626,15 @@
    }

    /**
+    * Returns the enchantment limit of the item
+    * @return int
+    */
+   public int getEnchantLimit()
+   {
+       return _enchantLimit > 0 ? _enchantLimit : 0;
+   }
+
+   /**
     * @return {@code true} if the item can be elemented, {@code false} otherwise.
     */
    public boolean isElementable()

Index: java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
===================================================================
--- java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java  (revision 7857)
+++ java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java  (working copy)
@@ -142,7 +142,7 @@
        {
            return false;
        }
-       else if (itemToEnchant.isEnchantable() == 0)
+       else if ((itemToEnchant.isEnchantable() == 0) || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit())))
        {
            return false;
        }
@@ -150,7 +150,7 @@
        {
            return false;
        }
-       else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) && ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel)))
+       else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel)))
        {
            return false;
        }

Index: java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
===================================================================
--- java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java (revision 7857)
+++ java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java (working copy)
@@ -119,7 +119,7 @@
        }

        // first validation check - also over enchant check
-       if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && (item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel())))
+       if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getItem().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getItem().getEnchantLimit())))))
        {
            client.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
            player.removeRequest(request.getClass());

Index: dist/game/data/EnchantItemData.xml
===================================================================
--- dist/game/data/EnchantItemData.xml  (revision 7855)
+++ dist/game/data/EnchantItemData.xml  (working copy)
@@ -19,13 +19,9 @@
    </enchant>

    <!-- Enchant Scroll: Blessed Bracelet -->
-   <enchant id="80838" maxEnchant="5">
+   <enchant id="80838" maxEnchant="10">
        <item id="80835" />
        <item id="80836" />
-   </enchant>
-
-   <!-- Enchant Scroll: Blessed Bracelet -->
-   <enchant id="80838" maxEnchant="10">
        <item id="80837" />
    </enchant>

Index: dist/game/data/xsd/items.xsd
===================================================================
--- dist/game/data/xsd/items.xsd    (revision 7857)
+++ dist/game/data/xsd/items.xsd    (working copy)
@@ -71,6 +71,7 @@
                    <xs:enumeration value="duration" />
                    <xs:enumeration value="element_enabled" />
                    <xs:enumeration value="enchant_enabled" />
+                   <xs:enumeration value="enchant_limit" />
                    <xs:enumeration value="enchant4_skill" />
                    <xs:enumeration value="enchanted" />
                    <xs:enumeration value="equip_condition" />

Index: dist/game/data/stats/items/80800-80899.xml
===================================================================
--- dist/game/data/stats/items/80800-80899.xml  (revision 7857)
+++ dist/game/data/stats/items/80800-80899.xml  (working copy)
@@ -455,6 +455,7 @@
        <set name="immediate_effect" val="true" />
        <set name="commissionItemType" val="BRACELET" />
        <set name="enchant_enabled" val="1" />
+       <set name="enchant_limit" val="5" />
        <skills>
            <skill id="35524" level="1" /> <!-- Kaliel's Bracelet -->
            <skill id="35524" level="2" type="ON_ENCHANT" type_value="1" /> <!-- Kaliel's Bracelet +1 -->
@@ -473,6 +474,7 @@
        <set name="immediate_effect" val="true" />
        <set name="commissionItemType" val="BRACELET" />
        <set name="enchant_enabled" val="1" />
+       <set name="enchant_limit" val="5" />
        <skills>
            <skill id="35525" level="1" /> <!-- Kaliel's Greater Bracelet -->
            <skill id="35525" level="2" type="ON_ENCHANT" type_value="1" /> <!-- Kaliel's Greater Bracelet +1 -->