From 9c8ee76b36738bac04cd2146e81f8d05d7ac6749 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 3 May 2022 18:57:06 +0000
Subject: [PATCH] Reworked enchant data. Contributed by fruit.

---
 .../dist/game/data/EnchantItemData.xml        | 630 ++++++------------
 .../dist/game/data/EnchantItemGroups.xml      | 423 +++++++-----
 2 files changed, 463 insertions(+), 590 deletions(-)

diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/EnchantItemData.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/EnchantItemData.xml
index b35ba41aad..f8906d33a3 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/EnchantItemData.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/EnchantItemData.xsd">
+	<!-- Weapon scrolls -->
 	<!-- Scrolls: Enchant Weapon -->
-	<enchant id="959" targetGrade="S" maxEnchant="16" safeEnchant="4" />
 	<enchant id="729" targetGrade="A" maxEnchant="16" safeEnchant="4" />
 	<enchant id="93976" targetGrade="A" maxEnchant="16" safeEnchant="4" />
 	<enchant id="947" targetGrade="B" maxEnchant="16" safeEnchant="4" />
@@ -10,345 +10,203 @@
 	<enchant id="93408" targetGrade="C" maxEnchant="16" safeEnchant="4" />
 	<enchant id="955" targetGrade="D" maxEnchant="16" safeEnchant="4" />
 	<enchant id="93410" targetGrade="D" maxEnchant="16" safeEnchant="4" />
-
-	<!-- Scrolls: Enchant Armor -->
-	<enchant id="960" targetGrade="S" maxEnchant="16" safeEnchant="4" />
-	<enchant id="730" targetGrade="A" maxEnchant="16" safeEnchant="4" />
-	<enchant id="93977" targetGrade="A" maxEnchant="16" safeEnchant="4" />
-	<enchant id="948" targetGrade="B" maxEnchant="16" safeEnchant="4" />
-	<enchant id="93407" targetGrade="B" maxEnchant="16" safeEnchant="4" />
-	<enchant id="952" targetGrade="C" maxEnchant="16" safeEnchant="4" />
-	<enchant id="93409" targetGrade="C" maxEnchant="16" safeEnchant="4" />
-	<enchant id="956" targetGrade="D" maxEnchant="16" safeEnchant="4" scrollGroupId="0" /> <!-- Default scroll groups binding. -->
-	<enchant id="93411" targetGrade="D" maxEnchant="16" safeEnchant="4" scrollGroupId="0" /> <!-- Default scroll groups binding. -->
-
-	<!-- Blessed Scrolls: Enchant Weapon -->
-	<enchant id="6577" targetGrade="S" maxEnchant="16" />
-	<enchant id="6569" targetGrade="A" maxEnchant="16" />
-	<enchant id="6571" targetGrade="B" maxEnchant="16" />
-	<enchant id="6573" targetGrade="C" maxEnchant="16" />
-	<enchant id="6575" targetGrade="D" maxEnchant="16" />
-
-	<enchant id="22221" targetGrade="S" maxEnchant="7" />
-	<enchant id="22223" targetGrade="A" maxEnchant="7" />
-	<enchant id="49486" targetGrade="B" maxEnchant="7" />
-	<enchant id="49484" targetGrade="C" maxEnchant="7" />
-	<enchant id="49482" targetGrade="D" maxEnchant="7" />
-
-	<!-- Blessed Scrolls: Enchant Armor -->
-	<enchant id="6578" targetGrade="S" maxEnchant="16" />
-	<enchant id="6570" targetGrade="A" maxEnchant="16" />
-	<enchant id="6572" targetGrade="B" maxEnchant="16" />
-	<enchant id="6574" targetGrade="C" maxEnchant="16" />
-	<enchant id="6576" targetGrade="D" maxEnchant="16" />
-
-	<enchant id="22222" targetGrade="S" maxEnchant="6" />
-	<enchant id="22224" targetGrade="A" maxEnchant="6" />
-	<enchant id="49485" targetGrade="B" maxEnchant="6" />
-	<enchant id="49483" targetGrade="C" maxEnchant="6" />
-	<enchant id="49481" targetGrade="D" maxEnchant="6" />
-
 	<!-- Improved Scrolls: Enchant Weapon -->
-	<enchant id="33810" targetGrade="S" maxEnchant="16" />
-	<enchant id="33809" targetGrade="A" maxEnchant="16" />
-	<enchant id="33808" targetGrade="B" maxEnchant="16" />
-	<enchant id="33807" targetGrade="C" maxEnchant="16" />
-	<enchant id="33806" targetGrade="D" maxEnchant="16" />
-
-	<!-- Improved Scrolls: Enchant Armor -->
-	<enchant id="33816" targetGrade="S" maxEnchant="16" />
-	<enchant id="33815" targetGrade="A" maxEnchant="16" />
-	<enchant id="33814" targetGrade="B" maxEnchant="16" />
-	<enchant id="33813" targetGrade="C" maxEnchant="16" />
-	<enchant id="33812" targetGrade="D" maxEnchant="16" />
-
-	<!-- Improved Scrolls: Enchant Armor -->
-	<enchant id="93269" targetGrade="A" maxEnchant="16" />
-	<enchant id="93256" targetGrade="A" maxEnchant="16" />
-
-	<!-- Improved Scrolls: Enchant Weapon -->
-	<enchant id="93268" targetGrade="A" maxEnchant="16" />
-	<enchant id="93255" targetGrade="A" maxEnchant="16" />
-
+	<enchant id="93255" targetGrade="A" maxEnchant="6" safeEnchant="4" randomEnchantMin="1" randomEnchantMax="2" />
+	<enchant id="93268" targetGrade="A" maxEnchant="6" safeEnchant="4" randomEnchantMin="1" randomEnchantMax="2" />
 	<!-- Cursed Scrolls: Enchant Weapon -->
-	<enchant id="93257" targetGrade="A" minEnchant="2" maxEnchant="16" safeEnchant="16"/>
-	<enchant id="93270" targetGrade="A" minEnchant="2" maxEnchant="16" safeEnchant="16"/>
-	<enchant id="95700" targetGrade="B" minEnchant="2" maxEnchant="16" safeEnchant="16"/>
-	<enchant id="95706" targetGrade="B" minEnchant="2" maxEnchant="16" safeEnchant="16"/>
-	<enchant id="95702" targetGrade="C" minEnchant="2" maxEnchant="16" safeEnchant="16"/>
-	<enchant id="95708" targetGrade="C" minEnchant="2" maxEnchant="16" safeEnchant="16"/>
-	<enchant id="95704" targetGrade="D" minEnchant="2" maxEnchant="16" safeEnchant="16"/>
-	<enchant id="95710" targetGrade="D" minEnchant="2" maxEnchant="16" safeEnchant="16"/>
-
+	<enchant id="93257" targetGrade="A" minEnchant="2" maxEnchant="16" safeEnchant="16" />
+	<enchant id="93270" targetGrade="A" minEnchant="2" maxEnchant="16" safeEnchant="16" />
+	<enchant id="95700" targetGrade="B" minEnchant="2" maxEnchant="16" safeEnchant="16" />
+	<enchant id="95706" targetGrade="B" minEnchant="2" maxEnchant="16" safeEnchant="16" />
+	<enchant id="95702" targetGrade="C" minEnchant="2" maxEnchant="16" safeEnchant="16" />
+	<enchant id="95708" targetGrade="C" minEnchant="2" maxEnchant="16" safeEnchant="16" />
+	<enchant id="95704" targetGrade="D" minEnchant="2" maxEnchant="16" safeEnchant="16" />
+	<enchant id="95710" targetGrade="D" minEnchant="2" maxEnchant="16" safeEnchant="16" />
+	<!-- Scroll: Enchant Aden Weapon -->
+	<enchant id="93038" targetGrade="D" safeEnchant="4" maxEnchant="16" scrollGroupId="1">
+		<item id="93028" /> <!-- Aden's Sword -->
+		<item id="93029" /> <!-- Aden's Dagger -->
+		<item id="93030" /> <!-- Aden's Bow -->
+		<item id="93031" /> <!-- Aden's Club -->
+		<item id="93032" /> <!-- Aden's Two-handed Sword -->
+		<item id="93033" /> <!-- Aden's Two-handed Blunt Weapon -->
+		<item id="93034" /> <!-- Aden's Spear -->
+		<item id="93035" /> <!-- Aden's Fists -->
+		<item id="93036" /> <!-- Aden's Rapier -->
+		<item id="93037" /> <!-- Aden's Ancient Sword -->
+		<item id="94897" /> <!-- Aden's Pistols -->
+		<item id="95691" /> <!-- Aden's Dual Swords -->
+	</enchant>
+	<!-- Scroll: Enchant Death Knight's Flame Sword -->
+	<enchant id="93931" targetGrade="A" maxEnchant="3" scrollGroupId="2">
+		<item id="93864" /> <!-- Death Knight's Flame Sword -->
+	</enchant>
+	<!-- Sealed Scroll: Enchant Death Knight's Flame Sword -->
+	<enchant id="93932" targetGrade="A" maxEnchant="3" scrollGroupId="2">
+		<item id="93864" /> <!-- Death Knight's Flame Sword -->
+	</enchant>
+	<!-- Armor scrolls -->
+	<!-- Scrolls: Enchant Armor -->
+	<enchant id="730" targetGrade="A" maxEnchant="10" safeEnchant="4" />
+	<enchant id="93977" targetGrade="A" maxEnchant="10" safeEnchant="4" />
+	<enchant id="948" targetGrade="B" maxEnchant="10" safeEnchant="4" />
+	<enchant id="93407" targetGrade="B" maxEnchant="10" safeEnchant="4" />
+	<enchant id="952" targetGrade="C" maxEnchant="10" safeEnchant="4" />
+	<enchant id="93409" targetGrade="C" maxEnchant="10" safeEnchant="4" />
+	<enchant id="956" targetGrade="D" maxEnchant="10" safeEnchant="4" />
+	<enchant id="93411" targetGrade="D" maxEnchant="10" safeEnchant="4" />
+	<!-- Improved Scrolls: Enchant Armor -->
+	<enchant id="93256" targetGrade="A" maxEnchant="6" safeEnchant="4" randomEnchantMin="1" randomEnchantMax="2" />
+	<enchant id="93269" targetGrade="A" maxEnchant="6" safeEnchant="4" randomEnchantMin="1" randomEnchantMax="2" />
 	<!-- Cursed Scrolls: Enchant Armor -->
-	<enchant id="93258" targetGrade="A" minEnchant="2" maxEnchant="16" safeEnchant="16"/>
-	<enchant id="93271" targetGrade="A" minEnchant="2" maxEnchant="16" safeEnchant="16"/>
-	<enchant id="95701" targetGrade="B" minEnchant="2" maxEnchant="16" safeEnchant="16"/>
-	<enchant id="95707" targetGrade="B" minEnchant="2" maxEnchant="16" safeEnchant="16"/>
-	<enchant id="95703" targetGrade="C" minEnchant="2" maxEnchant="16" safeEnchant="16"/>
-	<enchant id="95709" targetGrade="C" minEnchant="2" maxEnchant="16" safeEnchant="16"/>
-	<enchant id="95705" targetGrade="D" minEnchant="2" maxEnchant="16" safeEnchant="16"/>
-	<enchant id="95711" targetGrade="D" minEnchant="2" maxEnchant="16" safeEnchant="16"/>
-
-	<!-- Fire Dragon Pendant -->
-	<enchant id="49469" maxEnchant="10" safeEnchant="3">
-		<item id="49467" />
-		<item id="49468" />
+	<enchant id="93258" targetGrade="A" minEnchant="2" maxEnchant="16" safeEnchant="16" />
+	<enchant id="93271" targetGrade="A" minEnchant="2" maxEnchant="16" safeEnchant="16" />
+	<enchant id="95701" targetGrade="B" minEnchant="2" maxEnchant="16" safeEnchant="16" />
+	<enchant id="95707" targetGrade="B" minEnchant="2" maxEnchant="16" safeEnchant="16" />
+	<enchant id="95703" targetGrade="C" minEnchant="2" maxEnchant="16" safeEnchant="16" />
+	<enchant id="95709" targetGrade="C" minEnchant="2" maxEnchant="16" safeEnchant="16" />
+	<enchant id="95705" targetGrade="D" minEnchant="2" maxEnchant="16" safeEnchant="16" />
+	<enchant id="95711" targetGrade="D" minEnchant="2" maxEnchant="16" safeEnchant="16" />
+	<!-- Accessories scrolls -->
+	<!-- Scroll: Enchant Rare Accessories -->
+	<enchant id="94383" maxEnchant="5" safeEnchant="1" scrollGroupId="3">
+		<item id="6660" /> <!-- Queen Ant's Ring -->
+		<item id="6661" /> <!-- Orfen's Earring -->
+		<item id="6662" /> <!-- Ring of Core -->
+		<item id="49580" /> <!-- Baium's Ring -->
+		<item id="90763" /> <!-- Zaken's Earring -->
+		<item id="90992" /> <!-- Antharas' Earring -->
+		<item id="91550" /> <!-- Frintezza's Necklace -->
+		<item id="96600" /> <!-- Beleth' Ring -->
 	</enchant>
-
-	<!-- Fire Dragon Pendant -->
-	<enchant id="49470" maxEnchant="8" safeEnchant="3">
-		<item id="49467" />
-		<item id="49468" />
+	<!-- Scroll: Enchant Rare Accessories (Event) -->
+	<enchant id="94384" maxEnchant="5" safeEnchant="1" scrollGroupId="3">
+		<item id="6660" /> <!-- Queen Ant's Ring -->
+		<item id="6661" /> <!-- Orfen's Earring -->
+		<item id="6662" /> <!-- Ring of Core -->
+		<item id="49580" /> <!-- Baium's Ring -->
+		<item id="90763" /> <!-- Zaken's Earring -->
+		<item id="90992" /> <!-- Antharas' Earring -->
+		<item id="91550" /> <!-- Frintezza's Necklace -->
+		<item id="96600" /> <!-- Beleth' Ring -->
 	</enchant>
-	<!-- Pendant Matte Varnish -->
-	<enchant id="90137" maxEnchant="6" safeEnchant="3">
-		<item id="49467" />
-		<item id="49468" />
+	<!-- Improved Scroll: Enchant Rare Accessories -->
+	<enchant id="94385" maxEnchant="3" safeEnchant="1" randomEnchantMin="1" randomEnchantMax="2" scrollGroupId="3">
+		<item id="6660" /> <!-- Queen Ant's Ring -->
+		<item id="6661" /> <!-- Orfen's Earring -->
+		<item id="6662" /> <!-- Ring of Core -->
+		<item id="49580" /> <!-- Baium's Ring -->
+		<item id="90763" /> <!-- Zaken's Earring -->
+		<item id="90992" /> <!-- Antharas' Earring -->
+		<item id="91550" /> <!-- Frintezza's Necklace -->
+		<item id="96600" /> <!-- Beleth' Ring -->
 	</enchant>
-	<!-- Pendant Shiny Varnish -->
-	<enchant id="90138" maxEnchant="9" safeEnchant="3">
-		<item id="49467" />
-		<item id="49468" />
+	<!-- Improved Scroll: Enchant Rare Accessories (Event) -->
+	<enchant id="94386" maxEnchant="3" safeEnchant="1" randomEnchantMin="1" randomEnchantMax="2" scrollGroupId="3">
+		<item id="6660" /> <!-- Queen Ant's Ring -->
+		<item id="6661" /> <!-- Orfen's Earring -->
+		<item id="6662" /> <!-- Ring of Core -->
+		<item id="49580" /> <!-- Baium's Ring -->
+		<item id="90763" /> <!-- Zaken's Earring -->
+		<item id="90992" /> <!-- Antharas' Earring -->
+		<item id="91550" /> <!-- Frintezza's Necklace -->
+		<item id="96600" /> <!-- Beleth' Ring -->
 	</enchant>
-
-	<!-- Savior Scroll: Enchant Weapon -->
-	<enchant id="90149" targetGrade="C" maxEnchant="10">
-		<item id="90150" />
-		<item id="90151" />
-		<item id="90152" />
-		<item id="90153" />
-		<item id="90154" />
-		<item id="90867" />
-		<item id="90868" />
-		<item id="90869" />
-		<item id="90870" />
-		<item id="90871" />
+	<!-- Scroll: Enchannt Hellbound Ring -->
+	<enchant id="94719" maxEnchant="10" scrollGroupId="3">
+		<item id="94718" /> <!-- Hellbound Ring -->
 	</enchant>
-
-	<!-- Scroll: Enchant Fishing Weapon -->
-	<enchant id="90958" maxEnchant="17">
-		<item id="90957" />
+	<!-- Scroll: Enchant Ring of Insolence -->
+	<enchant id="91966" maxEnchant="10" scrollGroupId="3">
+		<item id="91952" /> <!-- Ring of Insolence -->
+		<item id="95718" /> <!-- Ring of Insolence - Sealed -->
 	</enchant>
-
-	<!-- Improved Scroll: Enchant Fishing Weapon -->
-	<enchant id="90959" maxEnchant="17" randomEnchantMin="1" randomEnchantMax="3">
-		<item id="90957" />
+	<!-- Scroll: Enchant Ring of Insolence - Sealed -->
+	<enchant id="95720" maxEnchant="10" scrollGroupId="3">
+		<item id="91952" /> <!-- Ring of Insolence -->
+		<item id="95718" /> <!-- Ring of Insolence - Sealed -->
 	</enchant>
-
-	<!-- Scroll: Enchant Savior's Earring -->
-	<enchant id="90990" maxEnchant="7">
-		<item id="90987" />
-		<item id="90988" />
-		<item id="91243" />
+	<!-- Scroll: Enchant Dragon Valley's Earring -->
+	<enchant id="91967" maxEnchant="10" scrollGroupId="3">
+		<item id="91953" /> <!-- Dragon Valley's Earring -->
+		<item id="95719" /> <!-- Dragon Valley's Earring - Sealed -->
 	</enchant>
-
-	<!-- Balthus Knights' Varnish -->
-	<enchant id="90995" maxEnchant="10">
-		<item id="90993" />
-		<item id="90994" />
-		<item id="91006" />
+	<!-- Scroll: Enchant Dragon Valley's Earring - Sealed -->
+	<enchant id="95721" maxEnchant="10" scrollGroupId="3">
+		<item id="91953" /> <!-- Dragon Valley's Earring -->
+		<item id="95719" /> <!-- Dragon Valley's Earring - Sealed -->
 	</enchant>
-	<!-- Balthus Knights' Shining Varnish -->
-	<enchant id="90997" maxEnchant="8">
-		<item id="90993" />
-		<item id="90994" />
-		<item id="91006" />
-	</enchant>
-	<!-- Balthus Knights' Glittering Varnish -->
-	<enchant id="90998" maxEnchant="9">
-		<item id="90993" />
-		<item id="90994" />
-		<item id="91006" />
-	</enchant>
-
-	<!-- Sibi's Weapon Enchant Scroll -->
-	<enchant id="91155" maxEnchant="23">
-		<item id="91154" />
-	</enchant>
-
-	<!-- Radiant Spirit's Varnish -->
-	<enchant id="91124" maxEnchant="9">
+	<!-- Scroll: Enchant Necklace of Spirits -->
+	<enchant id="94683" maxEnchant="10" scrollGroupId="3">
 		<item id="94682" />
 	</enchant>
-
-	<!-- Spirit's Varnish -->
-	<enchant id="91187" maxEnchant="10">
-		<item id="94682" />
+	<!-- Talismans scrolls -->
+	<!-- Scroll: Enchant Adventurer's Talisman -->
+	<enchant id="95688" maxEnchant="1" safeEnchant="1">
+		<item id="91937" />
 	</enchant>
-
-	<!-- Blessed Spirit's Varnish -->
-	<enchant id="91188" maxEnchant="10">
-		<item id="94682" />
-	</enchant>
-
-	<!-- Sayha's Cloak -->
-	<enchant id="91213" maxEnchant="10">
-		<item id="91210" />
-		<item id="91211" />
-		<item id="91212" />
-	</enchant>
-
-	<!-- Sayha's Cloak -->
-	<enchant id="91214" maxEnchant="9">
-		<item id="91210" />
-		<item id="91211" />
-		<item id="91212" />
-	</enchant>
-
-	<!-- Sayha's Cloak -->
-	<enchant id="91215" maxEnchant="7">
-		<item id="91210" />
-		<item id="91211" />
-		<item id="91212" />
-	</enchant>
-
-	<!-- Dragon Varnish -->
-	<enchant id="91249" maxEnchant="5">
-		<item id="91244" />
-		<item id="91245" />
-		<item id="91246" />
-		<item id="91247" />
-	</enchant>
-	<!-- Radiant Dragon Varnish -->
-	<enchant id="91250" maxEnchant="5">
-		<item id="91244" />
-		<item id="91245" />
-		<item id="91246" />
-		<item id="91247" />
-	</enchant>
-
-	<!-- Scroll: Enchant Excalibur -->
-	<enchant id="91575" maxEnchant="15">
-		<item id="91574" />
-	</enchant>
-
-	<!-- Scroll: Enchant Special Sayha's Cloak -->
-	<enchant id="91722" maxEnchant="10">
-		<item id="91719" />
-		<item id="91720" />
-		<item id="91721" />
-	</enchant>
-
-	<!-- Talisman of Aden -->
+	<!-- Scroll: Enchant Talisman of Aden -->
 	<enchant id="91756" maxEnchant="10" safeEnchant="1">
 		<item id="91745" />
 	</enchant>
-
-	<!-- Dragon Belt -->
-	<enchant id="91863" maxEnchant="10">
-		<item id="91862" />
-	</enchant>
-	<!-- Scroll: Enchant Dragon Belt -->
-	<enchant id="95596" maxEnchant="9">
-		<item id="91862" />
-	</enchant>
-
-	<!-- Enchant Scroll (PA Event) -->
-	<enchant id="91867" maxEnchant="10">
-		<item id="91866" />
-	</enchant>
-
-	<!-- Special Enchant Scroll (PA Event) -->
-	<enchant id="91868" maxEnchant="7">
-		<item id="91866" />
-	</enchant>
-
-	<!-- Talisman of Baium -->
-	<enchant id="91951" maxEnchant="5">
-		<item id="49683" />
-		<item id="94119" />
-	</enchant>
-
-	<!-- Scroll: Enchant Ring of Insolence -->
-	<enchant id="91966" maxEnchant="10">
-		<item id="91952" />
-		<item id="95718" />
-	</enchant>
-	<!-- Scroll: Enchant Ring of Insolence - Sealed -->
-	<enchant id="95720" maxEnchant="10">
-		<item id="91952" />
-		<item id="95718" />
-	</enchant>
-
-	<!-- Scroll: Enchant Dragon Valley's Earring -->
-	<enchant id="91967" maxEnchant="10">
-		<item id="91953" />
-		<item id="95719" />
-	</enchant>
-	<!-- Scroll: Enchant Dragon Valley's Earring - Sealed -->
-	<enchant id="95721" maxEnchant="10">
-		<item id="91953" />
-		<item id="95719" />
-	</enchant>
-
 	<!-- Scroll: Enchant Talisman of Eva -->
 	<enchant id="92017" maxEnchant="10">
 		<item id="92018" />
 	</enchant>
-
-	<!-- Talisman of Speed -->
+	<!-- Scroll: Enchant Talisman of Speed -->
 	<enchant id="92402" maxEnchant="10">
 		<item id="92403" />
 	</enchant>
-
-	<!-- Scroll Enchant Aden Weapon -->
-	<enchant id="93038" targetGrade="D" safeEnchant="4" maxEnchant="10" bonusRate="100">
-		<item id="93028" />
-		<item id="93029" />
-		<item id="93030" />
-		<item id="93031" />
-		<item id="93032" />
-		<item id="93033" />
-		<item id="93034" />
-		<item id="93035" />
-		<item id="93036" />
-		<item id="94897" />
-	</enchant>
-
-	<!-- Traveler's Agathion - Griffin -->
-	<enchant id="93040" maxEnchant="10" safeEnchant="3">
-		<item id="91935" />
-	</enchant>
-
-	<!-- Adventurer's Sheep Hat -->
-	<enchant id="93043" maxEnchant="10" safeEnchant="4">
-		<item id="93044" />
-	</enchant>
-
-	<!-- Adventurer's Cloak -->
-	<enchant id="93045" maxEnchant="10" safeEnchant="3">
-		<item id="93041" />
-	</enchant>
-
-	<!-- Adventurer's Belt -->
-	<enchant id="93046" maxEnchant="10" safeEnchant="3">
-		<item id="93042" />
-	</enchant>
-
-	<!-- Cloak of Protection -->
-	<enchant id="93302" maxEnchant="10">
-		<item id="93301" />
-	</enchant>
-	<!-- Cloak of Protection -->
-	<enchant id="95597" maxEnchant="9">
-		<item id="93301" />
-	</enchant>
-
-	<!-- Talisman of Authority -->
+	<!-- Scroll: Enchant Talisman of Authority -->
 	<enchant id="93329" maxEnchant="10">
 		<item id="91061" />
 	</enchant>
-
-	<!-- Scroll: Enchant Death Knight's Flame Sword -->
-	<enchant id="93931" targetGrade="A" maxEnchant="10">
-		<item id="93864" /> <!-- Death Knight's Flame Sword -->
+	<!-- Scroll: Enchant Talisman of Baium -->
+	<enchant id="91951" maxEnchant="5">
+		<item id="49683" />
+		<item id="94119" />
 	</enchant>
-	<enchant id="93932" targetGrade="A" maxEnchant="10">
-		<item id="93864" /> <!-- Death Knight's Flame Sword -->
+	<!-- Other scrolls -->
+	<!-- Traveler's Agathion - Griffin -->
+	<enchant id="93040" maxEnchant="1" safeEnchant="1">
+		<item id="91935" />
 	</enchant>
-
-	<!-- Circlet of Hero -->
+	<!-- Adventurer's Cloak -->
+	<enchant id="93045" maxEnchant="1" safeEnchant="1">
+		<item id="93041" />
+	</enchant>
+	<!-- Adventurer's Belt -->
+	<enchant id="93046" maxEnchant="1" safeEnchant="1">
+		<item id="93042" />
+	</enchant>
+	<!-- Adventurer's Sheep Hat -->
+	<enchant id="93043" maxEnchant="1" safeEnchant="1">
+		<item id="93044" />
+	</enchant>
+	<!-- Scroll: Enchant Dragon Belt -->
+	<enchant id="91863" maxEnchant="10">
+		<item id="91862" /> <!-- Dragon Belt -->
+		<item id="94621" /> <!-- Blessed Dragon Belt -->
+	</enchant>
+	<!-- Scroll: Enchant Dragon Belt -->
+	<enchant id="95596" maxEnchant="9">
+		<item id="91862" /> <!-- Dragon Belt -->
+		<item id="94621" /> <!-- Blessed Dragon Belt -->
+	</enchant>
+	<!-- Scroll: Enchant Cloak of Protection -->
+	<enchant id="93302" maxEnchant="10">
+		<item id="93301" />
+	</enchant>
+	<!-- Scroll: Enchant Cloak of Protection -->
+	<enchant id="95597" maxEnchant="9">
+		<item id="93301" />
+	</enchant>
+	<!-- Scroll: Enchant Clan Equipment -->
+	<enchant id="95638" maxEnchant="10">
+		<item id="95636" /> <!-- Clan Cloak -->
+		<item id="95637" /> <!-- Clan Circlet -->
+	</enchant>
+	<!-- Scroll: Enchant Circlet of Hero -->
 	<enchant id="94169" maxEnchant="10">
 		<item id="94166" />
 	</enchant>
@@ -356,147 +214,49 @@
 	<enchant id="95598" maxEnchant="9">
 		<item id="94166" />
 	</enchant>
-
-	<!-- Scroll: Enchant Rare Accessories -->
-	<enchant id="94383" maxEnchant="5" safeEnchant="1">
-		<item id="6660" /> <!-- Queen Ant's Ring -->
-		<item id="6661" /> <!-- Orfen's Earring -->
-		<item id="6662" /> <!-- Ring of Core -->
-		<item id="49580" /> <!-- Baium's Ring -->
-		<item id="90763" /> <!-- Zaken's Earring -->
-		<item id="90992" /> <!-- Antharas' Earring -->
-		<item id="91550" /> <!-- Frintezza's Necklace -->
-	</enchant>
-
-	<!-- Scroll: Enchant Rare Accessories (Event) -->
-	<enchant id="94384" maxEnchant="5" safeEnchant="1">
-		<item id="6660" /> <!-- Queen Ant's Ring -->
-		<item id="6661" /> <!-- Orfen's Earring -->
-		<item id="6662" /> <!-- Ring of Core -->
-		<item id="49580" /> <!-- Baium's Ring -->
-		<item id="90763" /> <!-- Zaken's Earring -->
-		<item id="90992" /> <!-- Antharas' Earring -->
-		<item id="91550" /> <!-- Frintezza's Necklace -->
-	</enchant>
-
-	<!-- Improved Scroll: Enchant Rare Accessories -->
-	<enchant id="94385" maxEnchant="5" safeEnchant="1">
-		<item id="49580" /> <!-- Baium's Ring -->
-		<item id="91550" /> <!-- Frintezza's Necklace -->
-		<item id="90992" /> <!-- Antharas' Earring -->
-	</enchant>
-
-	<!-- Improved Scroll: Enchant Rare Accessories (Event) -->
-	<enchant id="94386" maxEnchant="5" safeEnchant="1">
-		<item id="49580" /> <!-- Baium's Ring -->
-		<item id="90992" /> <!-- Antharas' Earring -->
-		<item id="91550" /> <!-- Frintezza's Necklace -->
-	</enchant>
-
-	<!-- Scroll: Enchant Necklace of Spirits -->
-	<enchant id="94683" maxEnchant="10" safeEnchant="1">
-		<item id="94682" />
-	</enchant>
-
-	<!-- Enchannt Hellbound Ring -->
-	<enchant id="94719" maxEnchant="10">
-		<item id="94718" /> <!-- Hellbound Ring -->
-	</enchant>
-
 	<!-- Scroll: Enchant Clan Equipment -->
-	<enchant id="95638" maxEnchant="10">
+	<enchant id="95638" maxEnchant="10" safeEnchant="1">
 		<item id="95636" />
 		<item id="95637" />
 	</enchant>
-
-	<!-- Adventurer's Talisman -->
-	<enchant id="95688" maxEnchant="1" safeEnchant="1">
-		<item id="91937" />
-	</enchant>
-
-	<!-- Enchant Spirit - Zodiac Agathion -->
+	<!-- Scroll: Enchant Agathion -->
 	<enchant id="48046" maxEnchant="10" safeEnchant="3">
 		<item id="93128" /> <!-- Agathion Ignis -->
 		<item id="93129" /> <!-- Agathion Nebula -->
 		<item id="93130" /> <!-- Agathion Procella -->
 		<item id="93131" /> <!-- Agathion Petram -->
 		<item id="93132" /> <!-- Agathion Joy -->
-		<item id="48048" /> <!-- Agathion Virgo -->
-		<item id="48049" /> <!-- Agathion Capricorn -->
-		<item id="48050" /> <!-- Agathion Libra -->
-		<item id="48052" /> <!-- Agathion Taurus -->
-		<item id="48053" /> <!-- Agathion Leo -->
-		<item id="48054" /> <!-- Agathion Gemini -->
-		<item id="48055" /> <!-- Agathion Scorpio -->
-		<item id="48056" /> <!-- Agathion Aquarius -->
-		<item id="48058" /> <!-- Agathion Sagittarius -->
 	</enchant>
-	<!-- Quality Agathion Enchant Scroll -->
-	<enchant id="48047" maxEnchant="8" safeEnchant="3" randomEnchantMin="1" randomEnchantMax="3">
-		<item id="93128" /> <!-- Agathion Ignis -->
-		<item id="93129" /> <!-- Agathion Nebula -->
-		<item id="93130" /> <!-- Agathion Procella -->
-		<item id="93131" /> <!-- Agathion Petram -->
-		<item id="93132" /> <!-- Agathion Joy -->
-		<item id="48048" /> <!-- Agathion Virgo -->
-		<item id="48049" /> <!-- Agathion Capricorn -->
-		<item id="48050" /> <!-- Agathion Libra -->
-		<item id="48052" /> <!-- Agathion Taurus -->
-		<item id="48053" /> <!-- Agathion Leo -->
-		<item id="48054" /> <!-- Agathion Gemini -->
-		<item id="48055" /> <!-- Agathion Scorpio -->
-		<item id="48056" /> <!-- Agathion Aquarius -->
-		<item id="48058" /> <!-- Agathion Sagittarius -->
-	</enchant>
-	<!-- Solid Scroll: Enchant Agathion -->
-	<enchant id="90963" maxEnchant="10" safeEnchant="3">
-		<item id="93128" /> <!-- Agathion Ignis -->
-		<item id="93129" /> <!-- Agathion Nebula -->
-		<item id="93130" /> <!-- Agathion Procella -->
-		<item id="93131" /> <!-- Agathion Petram -->
-		<item id="93132" /> <!-- Agathion Joy -->
-		<item id="48048" /> <!-- Agathion Virgo -->
-		<item id="48049" /> <!-- Agathion Capricorn -->
-		<item id="48050" /> <!-- Agathion Libra -->
-		<item id="48052" /> <!-- Agathion Taurus -->
-		<item id="48053" /> <!-- Agathion Leo -->
-		<item id="48054" /> <!-- Agathion Gemini -->
-		<item id="48055" /> <!-- Agathion Scorpio -->
-		<item id="48056" /> <!-- Agathion Aquarius -->
-		<item id="48058" /> <!-- Agathion Sagittarius -->
-	</enchant>
-	<!-- Stable Scroll: Enchant High Quality Agathion -->
-	<enchant id="91623" maxEnchant="10" safeEnchant="3">
-		<item id="93128" /> <!-- Agathion Ignis -->
-		<item id="93129" /> <!-- Agathion Nebula -->
-		<item id="93130" /> <!-- Agathion Procella -->
-		<item id="93131" /> <!-- Agathion Petram -->
-		<item id="93132" /> <!-- Agathion Joy -->
-		<item id="48048" /> <!-- Agathion Virgo -->
-		<item id="48049" /> <!-- Agathion Capricorn -->
-		<item id="48050" /> <!-- Agathion Libra -->
-		<item id="48052" /> <!-- Agathion Taurus -->
-		<item id="48053" /> <!-- Agathion Leo -->
-		<item id="48054" /> <!-- Agathion Gemini -->
-		<item id="48055" /> <!-- Agathion Scorpio -->
-		<item id="48056" /> <!-- Agathion Aquarius -->
-		<item id="48058" /> <!-- Agathion Sagittarius -->
-	</enchant>
-	<!-- Scroll: Enchant Agathion -->
+	<!-- Scroll: Enchant Agathion Sealed -->
 	<enchant id="93133" maxEnchant="10" safeEnchant="3">
 		<item id="93128" /> <!-- Agathion Ignis -->
 		<item id="93129" /> <!-- Agathion Nebula -->
 		<item id="93130" /> <!-- Agathion Procella -->
 		<item id="93131" /> <!-- Agathion Petram -->
 		<item id="93132" /> <!-- Agathion Joy -->
-		<item id="48048" /> <!-- Agathion Virgo -->
-		<item id="48049" /> <!-- Agathion Capricorn -->
-		<item id="48050" /> <!-- Agathion Libra -->
-		<item id="48052" /> <!-- Agathion Taurus -->
-		<item id="48053" /> <!-- Agathion Leo -->
-		<item id="48054" /> <!-- Agathion Gemini -->
-		<item id="48055" /> <!-- Agathion Scorpio -->
-		<item id="48056" /> <!-- Agathion Aquarius -->
-		<item id="48058" /> <!-- Agathion Sagittarius -->
+	</enchant>
+	<!-- Scroll: Enchant High-grade Agathion -->
+	<enchant id="48047" maxEnchant="5" safeEnchant="3" randomEnchantMin="1" randomEnchantMax="3">
+		<item id="93128" /> <!-- Agathion Ignis -->
+		<item id="93129" /> <!-- Agathion Nebula -->
+		<item id="93130" /> <!-- Agathion Procella -->
+		<item id="93131" /> <!-- Agathion Petram -->
+		<item id="93132" /> <!-- Agathion Joy -->
+	</enchant>
+	<!-- Stable Scroll: Enchant Agathion -->
+	<enchant id="90963" maxEnchant="10" safeEnchant="3">
+		<item id="93128" /> <!-- Agathion Ignis -->
+		<item id="93129" /> <!-- Agathion Nebula -->
+		<item id="93130" /> <!-- Agathion Procella -->
+		<item id="93131" /> <!-- Agathion Petram -->
+		<item id="93132" /> <!-- Agathion Joy -->
+	</enchant>
+	<!-- Stable Scroll: Enchant High-grade Agathion -->
+	<enchant id="91623" maxEnchant="10" safeEnchant="3">
+		<item id="93128" /> <!-- Agathion Ignis -->
+		<item id="93129" /> <!-- Agathion Nebula -->
+		<item id="93130" /> <!-- Agathion Procella -->
+		<item id="93131" /> <!-- Agathion Petram -->
+		<item id="93132" /> <!-- Agathion Joy -->
 	</enchant>
 </list>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/EnchantItemGroups.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/EnchantItemGroups.xml
index da20e378a4..8df24a46ad 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/EnchantItemGroups.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/EnchantItemGroups.xml
@@ -1,104 +1,133 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/EnchantItemGroups.xsd">
-	<!-- General armor enchant group. -->
-	<enchantRateGroup name="ARMOR_GROUP">
-		<current enchant="0-2" chance="100" />
-		<current enchant="3-15" chance="66.67" />
-		<current enchant="16-19" chance="33" />
-		<current enchant="20-29" chance="20" />
-		<current enchant="30-65535" chance="0" />
-	</enchantRateGroup>
-
-	<!-- General full armor enchant group. -->
-	<enchantRateGroup name="FULL_ARMOR_GROUP">
-		<current enchant="0-3" chance="100" />
-		<current enchant="4-15" chance="66.67" />
-		<current enchant="16-19" chance="33" />
-		<current enchant="20-29" chance="20" />
-		<current enchant="30-65535" chance="0" />
-	</enchantRateGroup>
-
-	<!-- General fighter weapon enchant group. -->
+	<!-- Weapon - chances of enchant -->
 	<enchantRateGroup name="FIGHTER_WEAPON_GROUP">
-		<current enchant="0-2" chance="100" />
-		<current enchant="3-15" chance="66.67" />
-		<current enchant="16-19" chance="33" />
-		<current enchant="20-29" chance="20" />
-		<current enchant="30-65535" chance="0" />
+		<current enchant="0-3" chance="100" />
+		<current enchant="4" chance="60" />
+		<current enchant="5" chance="60" />
+		<current enchant="6" chance="55" />
+		<current enchant="7" chance="55" />
+		<current enchant="8" chance="50" />
+		<current enchant="9" chance="45" />
+		<current enchant="10" chance="45" />
+		<current enchant="11" chance="45" />
+		<current enchant="12" chance="45" />
+		<current enchant="13" chance="55" />
+		<current enchant="14" chance="55" />
+		<current enchant="15" chance="40" />
 	</enchantRateGroup>
-
-	<!-- General mage weapon enchant group. -->
 	<enchantRateGroup name="MAGE_WEAPON_GROUP">
-		<current enchant="0-2" chance="100" />
-		<current enchant="3-15" chance="66.67" />
-		<current enchant="16-19" chance="33" />
-		<current enchant="20-29" chance="20" />
-		<current enchant="30-65535" chance="0" />
+		<current enchant="0-3" chance="100" />
+		<current enchant="4" chance="60" />
+		<current enchant="5" chance="60" />
+		<current enchant="6" chance="55" />
+		<current enchant="7" chance="55" />
+		<current enchant="8" chance="50" />
+		<current enchant="9" chance="45" />
+		<current enchant="10" chance="45" />
+		<current enchant="11" chance="45" />
+		<current enchant="12" chance="45" />
+		<current enchant="13" chance="55" />
+		<current enchant="14" chance="55" />
+		<current enchant="15" chance="40" />
 	</enchantRateGroup>
-
-	<!-- Spirits Agathion enchant group. -->
-	<enchantRateGroup name="SPIRITS_AGATHION">
-		<current enchant="0-2" chance="100" />
-		<current enchant="3" chance="65" />
-		<current enchant="4" chance="50" />
-		<current enchant="5" chance="35" />
-		<current enchant="6" chance="24" />
-		<current enchant="7" chance="18" />
-		<current enchant="8" chance="14" />
-		<current enchant="9" chance="8" />
+	<enchantRateGroup name="DK_FLAME_SWORD"> <!-- Death Knight's Flame Sword -->
+		<current enchant="0" chance="23" />
+		<current enchant="1" chance="13" />
+		<current enchant="2" chance="3" />
 	</enchantRateGroup>
-
-	<!-- Zodiac Agathion enchant group. -->
-	<enchantRateGroup name="ZODIACS_AGATHION">
-		<current enchant="0-2" chance="100" />
-		<current enchant="3" chance="65" />
-		<current enchant="4" chance="50" />
-		<current enchant="5" chance="35" />
-		<current enchant="6" chance="12" />
-		<current enchant="7" chance="9" />
-		<current enchant="8" chance="7" />
-		<current enchant="9" chance="4" />
+	<enchantRateGroup name="ADEN_WEAPON_GROUP">
+		<current enchant="0-3" chance="100" />
+		<current enchant="4" chance="70" />
+		<current enchant="5" chance="70" />
+		<current enchant="6" chance="50" />
+		<current enchant="7" chance="50" />
+		<current enchant="8" chance="30" />
+		<current enchant="9" chance="20" />
+		<current enchant="10" chance="20" />
+		<current enchant="11" chance="15" />
+		<current enchant="12" chance="15" />
+		<current enchant="13" chance="10" />
+		<current enchant="14" chance="10" />
+		<current enchant="15" chance="5" />
 	</enchantRateGroup>
-
-	<!-- Rare Accessories enchant group. -->
-	<enchantRateGroup name="RARE_ACCESSORIES_GROUP">
+	<!-- Armor - chances of enchant -->
+	<enchantRateGroup name="ARMOR"> <!-- Shield, Sigil, Helmet, Armor upper body, Full armor, Armor lower body, Boots, Gloves -->
+		<current enchant="0-3" chance="100" />
+		<current enchant="4" chance="60" />
+		<current enchant="5" chance="60" />
+		<current enchant="6" chance="55" />
+		<current enchant="7" chance="45" />
+		<current enchant="8" chance="45" />
+		<current enchant="9" chance="40" />
+	</enchantRateGroup>
+	<!-- Accessories - chances of enchant -->
+	<enchantRateGroup name="D_C_B_A_ACCESSORIES"> <!-- D, C, B, A grades accessories -->
+		<current enchant="0-3" chance="100" />
+		<current enchant="4" chance="60" />
+		<current enchant="5" chance="60" />
+		<current enchant="6" chance="55" />
+		<current enchant="7" chance="45" />
+		<current enchant="8" chance="45" />
+		<current enchant="9" chance="40" />
+	</enchantRateGroup>
+	<enchantRateGroup name="RARE_ACCESSORIES"> <!-- Rare Accessories -->
 		<current enchant="0" chance="100" />
 		<current enchant="1" chance="50" />
 		<current enchant="2" chance="40" />
 		<current enchant="3" chance="30" />
 		<current enchant="4" chance="20" />
 	</enchantRateGroup>
-
-	<!-- Dragon Belt enchant group. -->
-	<enchantRateGroup name="DRAGON_BELT">
-		<current enchant="0" chance="60" />
-		<current enchant="1" chance="50" />
-		<current enchant="2" chance="40" />
-		<current enchant="3" chance="35" />
-		<current enchant="4" chance="30" />
-		<current enchant="5" chance="28" />
-		<current enchant="6" chance="26" />
-		<current enchant="7" chance="24" />
-		<current enchant="8" chance="22" />
-		<current enchant="9" chance="20" />
+	<enchantRateGroup name="HELLBOUND_RING"> <!-- Hellbound Ring -->
+		<current enchant="0" chance="100" />
+		<current enchant="1" chance="90" />
+		<current enchant="2" chance="80" />
+		<current enchant="3" chance="60" />
+		<current enchant="4" chance="50" />
+		<current enchant="5" chance="40" />
+		<current enchant="6" chance="30" />
+		<current enchant="7" chance="20" />
+		<current enchant="8" chance="10" />
+		<current enchant="9" chance="5" />
 	</enchantRateGroup>
-
-	<!-- Hellbound Ring enchant group. -->
-	<enchantRateGroup name="HELLBOUND_RING_GROUP">
-		<current enchant="0" chance="60" />
-		<current enchant="1" chance="50" />
-		<current enchant="2" chance="40" />
-		<current enchant="3" chance="35" />
-		<current enchant="4" chance="30" />
-		<current enchant="5" chance="28" />
-		<current enchant="6" chance="26" />
-		<current enchant="7" chance="24" />
-		<current enchant="8" chance="22" />
-		<current enchant="9" chance="20" />
+	<enchantRateGroup name="INSOLENCE_RING"> <!-- Ring of Insolence -->
+		<current enchant="0" chance="100" />
+		<current enchant="1" chance="90" />
+		<current enchant="2" chance="80" />
+		<current enchant="3" chance="60" />
+		<current enchant="4" chance="50" />
+		<current enchant="5" chance="40" />
+		<current enchant="6" chance="30" />
+		<current enchant="7" chance="20" />
+		<current enchant="8" chance="10" />
+		<current enchant="9" chance="5" />
 	</enchantRateGroup>
-	
-	<!-- Talisman of Aden -->
-	<enchantRateGroup name="TALISMAN_ADEN">
+	<enchantRateGroup name="DV_EARRING"> <!-- Dragon Valley's Earring -->
+		<current enchant="0" chance="100" />
+		<current enchant="1" chance="90" />
+		<current enchant="2" chance="80" />
+		<current enchant="3" chance="60" />
+		<current enchant="4" chance="50" />
+		<current enchant="5" chance="40" />
+		<current enchant="6" chance="30" />
+		<current enchant="7" chance="20" />
+		<current enchant="8" chance="10" />
+		<current enchant="9" chance="5" />
+	</enchantRateGroup>
+	<enchantRateGroup name="SPIRITS_NECK"> <!-- Necklace of Spirits -->
+		<current enchant="0" chance="100" />
+		<current enchant="1" chance="90" />
+		<current enchant="2" chance="80" />
+		<current enchant="3" chance="60" />
+		<current enchant="4" chance="50" />
+		<current enchant="5" chance="40" />
+		<current enchant="6" chance="30" />
+		<current enchant="7" chance="20" />
+		<current enchant="8" chance="10" />
+		<current enchant="9" chance="5" />
+	</enchantRateGroup>
+	<!-- Talismans - chances of enchant -->
+	<enchantRateGroup name="TALISMAN_ADEN">	<!-- Talisman of Aden -->
 		<current enchant="0" chance="100" />
 		<current enchant="1" chance="80" />
 		<current enchant="2" chance="70" />
@@ -110,9 +139,7 @@
 		<current enchant="8" chance="10" />
 		<current enchant="9" chance="10" />
 	</enchantRateGroup>
-
-	<!-- Talisman of Eva -->
-	<enchantRateGroup name="TALISMAN_EVA">
+	<enchantRateGroup name="TALISMAN_EVA"> <!-- Talisman of Eva -->
 		<current enchant="0" chance="60" />
 		<current enchant="1" chance="50" />
 		<current enchant="2" chance="40" />
@@ -124,9 +151,7 @@
 		<current enchant="8" chance="22" />
 		<current enchant="9" chance="20" />
 	</enchantRateGroup>
-
-	<!-- Talisman of Speed -->
-	<enchantRateGroup name="TALISMAN_SPEED">
+	<enchantRateGroup name="TALISMAN_SPEED"> <!-- Talisman of Speed -->
 		<current enchant="0" chance="60" />
 		<current enchant="1" chance="50" />
 		<current enchant="2" chance="45" />
@@ -138,9 +163,7 @@
 		<current enchant="8" chance="10" />
 		<current enchant="9" chance="5" />
 	</enchantRateGroup>
-
-	<!-- Talisman of Authority -->
-	<enchantRateGroup name="TALISMAN_AUTHORITY">
+	<enchantRateGroup name="TALISMAN_AUTHORITY"> <!-- Talisman of Authority -->
 		<current enchant="0" chance="60" />
 		<current enchant="1" chance="50" />
 		<current enchant="2" chance="40" />
@@ -152,14 +175,18 @@
 		<current enchant="8" chance="22" />
 		<current enchant="9" chance="20" />
 	</enchantRateGroup>
-
-	<!-- Adventurer's Talisman -->
-	<enchantRateGroup name="TALISMAN_ADVENTURERS">
+	<enchantRateGroup name="TALISMAN_BAIUM"> <!-- Talisman of Baium -->
+		<current enchant="0" chance="90" />
+		<current enchant="1" chance="80" />
+		<current enchant="2" chance="70" />
+		<current enchant="3" chance="30" />
+		<current enchant="4" chance="5" />
+	</enchantRateGroup>
+	<!-- Other - chances of enchant -->
+	<enchantRateGroup name="ADVENTURERS_EQUIPMENT"> <!-- Adventurer's Cloak, Adventurer's Belt, Adventurer's Sheep Hat, Adventurer's Talisman -->
 		<current enchant="0" chance="100" />
 	</enchantRateGroup>
-	
-	<!-- Hair Accesory enchant group. -->
-	<enchantRateGroup name="CIRCLET_GROUP">
+	<enchantRateGroup name="DRAGON_BELT"> <!-- Dragon Belt, Blessed Dragon Belt -->
 		<current enchant="0" chance="60" />
 		<current enchant="1" chance="50" />
 		<current enchant="2" chance="40" />
@@ -171,87 +198,173 @@
 		<current enchant="8" chance="22" />
 		<current enchant="9" chance="20" />
 	</enchantRateGroup>
-
-	<!-- Default scrolls enchanting route line. -->
+	<enchantRateGroup name="CIRCLET_HERO"> <!-- Circlet of Hero -->
+		<current enchant="0" chance="60" />
+		<current enchant="1" chance="50" />
+		<current enchant="2" chance="40" />
+		<current enchant="3" chance="35" />
+		<current enchant="4" chance="30" />
+		<current enchant="5" chance="28" />
+		<current enchant="6" chance="26" />
+		<current enchant="7" chance="24" />
+		<current enchant="8" chance="22" />
+		<current enchant="9" chance="20" />
+	</enchantRateGroup>
+	<enchantRateGroup name="CLOAK_PROTECTION"> <!-- Cloak of protection -->
+		<current enchant="0" chance="85" />
+		<current enchant="1" chance="80" />
+		<current enchant="2" chance="75" />
+		<current enchant="3" chance="60" />
+		<current enchant="4" chance="50" />
+		<current enchant="5" chance="40" />
+		<current enchant="6" chance="30" />
+		<current enchant="7" chance="20" />
+		<current enchant="8" chance="15" />
+		<current enchant="9" chance="7" />
+	</enchantRateGroup>
+	<enchantRateGroup name="CLAN_CLOAK"> <!-- Clan Cloak -->
+		<current enchant="0" chance="85" />
+		<current enchant="1" chance="80" />
+		<current enchant="2" chance="75" />
+		<current enchant="3" chance="60" />
+		<current enchant="4" chance="50" />
+		<current enchant="5" chance="40" />
+		<current enchant="6" chance="30" />
+		<current enchant="7" chance="20" />
+		<current enchant="8" chance="15" />
+		<current enchant="9" chance="7" />
+	</enchantRateGroup>
+	<enchantRateGroup name="CLAN_CIRCLET"> <!-- Clan Circlet -->
+		<current enchant="0" chance="85" />
+		<current enchant="1" chance="80" />
+		<current enchant="2" chance="75" />
+		<current enchant="3" chance="60" />
+		<current enchant="4" chance="50" />
+		<current enchant="5" chance="40" />
+		<current enchant="6" chance="30" />
+		<current enchant="7" chance="20" />
+		<current enchant="8" chance="15" />
+		<current enchant="9" chance="7" />
+	</enchantRateGroup>
+	<enchantRateGroup name="SPIRITS_AGATHION"> <!-- Spirits Agathion -->
+		<current enchant="0-2" chance="100" />
+		<current enchant="3" chance="65" />
+		<current enchant="4" chance="50" />
+		<current enchant="5" chance="35" />
+		<current enchant="6" chance="24" />
+		<current enchant="7" chance="18" />
+		<current enchant="8" chance="14" />
+		<current enchant="9" chance="8" />
+	</enchantRateGroup>
+	<!-- Default scrolls enchanting route line -->
 	<enchantScrollGroup id="0">
-		<!-- Bind armor group to all item slots except full armor. -->
-		<enchantRate group="ARMOR_GROUP">
-			<item slot="lhand" /> <!-- Left hand: Shields, Sigils -->
-			<item slot="head" /> <!-- Head: Helmet -->
-			<item slot="chest" /> <!-- Chest: Armor upper body. -->
-			<item slot="legs" /> <!-- Legs: Armor lower body. -->
-			<item slot="feet" /> <!-- Feet: Boots -->
-			<item slot="gloves" /> <!-- Gloves: Gloves -->
-			<item slot="neck" /> <!-- Neck: Necklaces -->
-			<item slot="rear;lear" /> <!-- Right ear, Left ear: Earrings -->
-			<item slot="rfinger;lfinger" /> <!-- Right finger, Left finger: Rings -->
-			<item slot="belt" /> <!-- Belt: Belts -->
-			<item slot="shirt" /> <!-- Shirt: Shirts -->
-			<item slot="back" /> <!-- Cloaks -->
-			<item slot="rbracelet" /> <!-- Bracelet -->
-			<item slot="lbracelet" /> <!-- Evolved Agathion Bracelet -->
-		</enchantRate>
-		<!-- Bind only full armor group to to full armor slot items. -->
-		<enchantRate group="FULL_ARMOR_GROUP">
-			<item slot="fullarmor" /> <!-- Full Armor: Full armor pants are included. -->
-		</enchantRate>
-		<!-- Bind only fighter weapon group to all fighter weapons. -->
+		<!-- Weapon -->
 		<enchantRate group="FIGHTER_WEAPON_GROUP">
 			<item slot="rhand" magicWeapon="false" /> <!-- Right hand: Weapons, Non magic weapon -->
 			<item slot="lrhand" magicWeapon="false" /> <!-- Two hands: Weapons, Non magic weapon -->
 		</enchantRate>
-		<!-- Bind only mage weapon group to all magic weapons. -->
 		<enchantRate group="MAGE_WEAPON_GROUP">
 			<item slot="rhand" magicWeapon="true" /> <!-- Right hand: Weapons, Magic weapon -->
 			<item slot="lrhand" magicWeapon="true" /> <!-- Two hands: Weapons, Magic weapon -->
 		</enchantRate>
-		<!-- Rare Accessories -->
-		<enchantRate group="RARE_ACCESSORIES_GROUP">
+		<!-- Armor -->
+		<enchantRate group="ARMOR">
+			<item slot="lhand" /> <!-- Left hand: Shields, Sigils -->
+			<item slot="head" /> <!-- Head: Helmet -->
+			<item slot="chest" /> <!-- Chest: Armor upper body. -->
+			<item slot="fullarmor" /> <!-- Full Armor: Full armor pants are included. -->
+			<item slot="legs" /> <!-- Legs: Armor lower body. -->
+			<item slot="feet" /> <!-- Feet: Boots -->
+			<item slot="gloves" /> <!-- Gloves: Gloves -->
+		</enchantRate>
+		<!-- Accessories -->
+		<enchantRate group="D_C_B_A_ACCESSORIES">
 			<item slot="neck" /> <!-- Neck: Necklaces -->
 			<item slot="rear;lear" /> <!-- Right ear, Left ear: Earrings -->
 			<item slot="rfinger;lfinger" /> <!-- Right finger, Left finger: Rings -->
 		</enchantRate>
-		<!-- Dragon Belt -->
-		<enchantRate group="DRAGON_BELT">
-			<item slot="belt" /> <!-- Belt: Belts -->
-		</enchantRate>
-		<!-- Hellbound Ring -->
-		<enchantRate group="HELLBOUND_RING_GROUP">
-			<item slot="rfinger;lfinger" /> <!-- Right finger, Left finger: Rings -->
-		</enchantRate>
-		<!-- Spirits Agathion -->
-		<enchantRate group="SPIRITS_AGATHION">
-			<item slot="agathion" /> <!-- Agathion: agathion -->
-		</enchantRate>
-		<!-- Zodiacs Agathion -->
-		<enchantRate group="ZODIACS_AGATHION">
-			<item slot="agathion" /> <!-- Agathion: agathion -->
-		</enchantRate>
-		<!-- Talisman of Aden -->
+		<!-- Talismans -->
 		<enchantRate group="TALISMAN_ADEN">
 			<item itemId="91745" /> <!-- Talisman of Aden -->
 		</enchantRate>
-		<!-- Talisman of Eva -->
 		<enchantRate group="TALISMAN_EVA">
 			<item itemId="92018" /> <!-- Talisman of Eva -->
 		</enchantRate>
-		<!-- Talisman of Speed -->
 		<enchantRate group="TALISMAN_SPEED">
 			<item itemId="92403" /> <!-- Talisman of Speed -->
 		</enchantRate>
-		<!-- Talisman of Authority -->
 		<enchantRate group="TALISMAN_AUTHORITY">
 			<item itemId="91061" /> <!-- Talisman of Authority -->
 		</enchantRate>
-		<!-- Adventurer's Talisman -->
-		<enchantRate group="TALISMAN_ADVENTURERS">
-			<item itemId="91937" /> <!-- Adventurer's Talisman -->
+		<enchantRate group="TALISMAN_BAIUM">
+			<item itemId="49683" /> <!-- Talisman of Baium -->
+			<item itemId="94119" /> <!-- Talisman of Baium Sealed-->
 		</enchantRate>
-		<!-- Circlets Group -->
-		<enchantRate group="CIRCLET_GROUP">
-			<item slot="hair" /> <!-- Hair Accessories -->
-			<item slot="hair2" /> <!-- Hair Accessories -->
-			<item slot="hairall" /> <!-- Hair Accessories -->
+		<!-- Other -->
+		<enchantRate group="ADVENTURERS_EQUIPMENT">
+			<item itemId="91937" /> <!-- Adventurer's Talisman -->
+			<item itemId="93041" /> <!-- Adventurer's Cloak -->
+			<item itemId="93042" /> <!-- Adventurer's Belt -->
+			<item itemId="93044" /> <!-- Adventurer's Sheep Hat -->
+		</enchantRate>
+		<enchantRate group="DRAGON_BELT">
+			<item itemId="91862" /> <!-- Dragon Belt -->
+			<item itemId="94621" /> <!-- Blessed Dragon Belt -->
+		</enchantRate>
+		<enchantRate group="CIRCLET_HERO">
+			<item itemId="94166" /> <!-- Circlet of Hero -->
+		</enchantRate>
+		<enchantRate group="CLOAK_PROTECTION">
+			<item itemId="93301" /> <!-- Cloak of Protection -->
+		</enchantRate>
+		<enchantRate group="CLAN_CLOAK">
+			<item itemId="95636" /> <!-- Clan Cloak -->
+		</enchantRate>
+		<enchantRate group="CLAN_CIRCLET">
+			<item itemId="95637" /> <!-- Clan Circlet -->
+		</enchantRate>
+		<enchantRate group="SPIRITS_AGATHION">
+			<item slot="agathion" /> <!-- Agathion: agathion -->
+		</enchantRate>
+	</enchantScrollGroup>
+	<!-- Aden weapons scrolls enchanting route line -->
+	<enchantScrollGroup id="1">
+		<enchantRate group="ADEN_WEAPON_GROUP">
+			<item slot="rhand" /> <!-- Right hand: Weapons -->
+			<item slot="lrhand" /> <!-- Two hands: Weapons -->
+		</enchantRate>
+	</enchantScrollGroup>
+	<!-- Death Knight's Flame Sword scrolls enchanting route line -->
+	<enchantScrollGroup id="2">
+		<enchantRate group="DK_FLAME_SWORD">
+			<item itemId="93864" /> <!-- Death Knight's Flame Sword -->
+		</enchantRate>
+	</enchantScrollGroup>
+	<!-- Rare Accessories scrolls enchanting route line -->
+	<enchantScrollGroup id="3">
+		<enchantRate group="RARE_ACCESSORIES">
+			<item itemId="6660" /> <!-- Queen Ant's Ring -->
+			<item itemId="6661" /> <!-- Orfen's Earring -->
+			<item itemId="6662" /> <!-- Ring of Core -->
+			<item itemId="49580" /> <!-- Baium's Ring -->
+			<item itemId="90763" /> <!-- Zaken's Earring -->
+			<item itemId="90992" /> <!-- Antharas' Earring -->
+			<item itemId="91550" /> <!-- Frintezza's Necklace -->
+			<item itemId="96600" /> <!-- Beleth' Ring -->
+		</enchantRate>
+		<enchantRate group="HELLBOUND_RING">
+			<item itemId="94718" /> <!-- Hellbound Ring -->
+		</enchantRate>
+		<enchantRate group="INSOLENCE_RING">
+			<item itemId="91952" /> <!-- Ring of Insolence -->
+			<item itemId="95718" /> <!-- Ring of Insolence - Sealed -->
+		</enchantRate>
+		<enchantRate group="DV_EARRING">
+			<item itemId="91953" /> <!-- Dragon Valley's Earring -->
+			<item itemId="95719" /> <!-- Dragon Valley's Earring - Sealed -->
+		</enchantRate>
+		<enchantRate group="SPIRITS_NECK">
+			<item itemId="94682" /> <!-- Necklace of Spirits -->
 		</enchantRate>
 	</enchantScrollGroup>
 </list>
\ No newline at end of file