From 70ef34bd40c175063b7e6b49965733e09e736c89 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 31 Dec 2017 02:52:42 +0000
Subject: [PATCH] Destruction scroll fixes. Contributed by gamelike85.

---
 .../dist/game/data/EnchantItemData.xml        | 44 +++++++++++--------
 .../game/data/stats/items/33400-33499.xml     |  4 +-
 .../model/items/enchant/EnchantScroll.java    |  2 +-
 .../dist/game/data/EnchantItemData.xml        | 44 +++++++++++--------
 .../game/data/stats/items/33400-33499.xml     |  4 +-
 .../model/items/enchant/EnchantScroll.java    |  2 +-
 .../dist/game/data/EnchantItemData.xml        | 44 +++++++++++--------
 .../game/data/stats/items/33400-33499.xml     |  4 +-
 .../model/items/enchant/EnchantScroll.java    |  2 +-
 .../dist/game/data/EnchantItemData.xml        | 44 +++++++++++--------
 .../game/data/stats/items/33400-33499.xml     |  4 +-
 .../model/items/enchant/EnchantScroll.java    |  2 +-
 12 files changed, 116 insertions(+), 84 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/EnchantItemData.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/EnchantItemData.xml
index d9a8da0a51..883fc195eb 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/EnchantItemData.xml
@@ -95,27 +95,35 @@
 	<enchant id="22227" targetGrade="C" maxEnchant="15" />
 	<enchant id="22229" targetGrade="D" maxEnchant="15" />
 
-	<enchant id="33838" targetGrade="D" maxEnchant="15" />
-	<enchant id="33839" targetGrade="C" maxEnchant="15" />
-	<enchant id="33840" targetGrade="B" maxEnchant="15" />
-	<enchant id="33841" targetGrade="A" maxEnchant="15" />
-	<enchant id="33842" targetGrade="S" maxEnchant="15" />
-	<enchant id="33843" targetGrade="R" maxEnchant="15" />
+	<!-- Scroll: Enchant Weapon of Destruction -->
+	<enchant id="22221" targetGrade="S" minEnchant="15" />
+	<enchant id="22223" targetGrade="A" minEnchant="15" />
+	<enchant id="22225" targetGrade="B" minEnchant="15" />
+	<enchant id="22227" targetGrade="C" minEnchant="15" />
+	<enchant id="22229" targetGrade="D" minEnchant="15" />
+	<enchant id="33478" targetGrade="R" minEnchant="15" />
+
+	<enchant id="33838" targetGrade="D" minEnchant="15" />
+	<enchant id="33839" targetGrade="C" minEnchant="15" />
+	<enchant id="33840" targetGrade="B" minEnchant="15" />
+	<enchant id="33841" targetGrade="A" minEnchant="15" />
+	<enchant id="33842" targetGrade="S" minEnchant="15" />
+	<enchant id="33843" targetGrade="R" minEnchant="15" />
 	
 	<!-- Scroll: Enchant Armor of Destruction -->
-	<enchant id="33479" targetGrade="R" maxEnchant="6" />
-	<enchant id="22222" targetGrade="S" maxEnchant="6" />
-	<enchant id="22224" targetGrade="A" maxEnchant="6" />
-	<enchant id="22226" targetGrade="B" maxEnchant="6" />
-	<enchant id="22228" targetGrade="C" maxEnchant="6" />
-	<enchant id="22230" targetGrade="D" maxEnchant="6" />
+	<enchant id="22222" targetGrade="S" minEnchant="6" />
+	<enchant id="22224" targetGrade="A" minEnchant="6" />
+	<enchant id="22226" targetGrade="B" minEnchant="6" />
+	<enchant id="22228" targetGrade="C" minEnchant="6" />
+	<enchant id="22230" targetGrade="D" minEnchant="6" />
+	<enchant id="33479" targetGrade="R" minEnchant="6" />
 
-	<enchant id="33844" targetGrade="D" maxEnchant="6" />
-	<enchant id="33845" targetGrade="C" maxEnchant="6" />
-	<enchant id="33846" targetGrade="B" maxEnchant="6" />
-	<enchant id="33847" targetGrade="A" maxEnchant="6" />
-	<enchant id="33848" targetGrade="S" maxEnchant="6" />
-	<enchant id="33849" targetGrade="R" maxEnchant="6" />
+	<enchant id="33844" targetGrade="D" minEnchant="6" />
+	<enchant id="33845" targetGrade="C" minEnchant="6" />
+	<enchant id="33846" targetGrade="B" minEnchant="6" />
+	<enchant id="33847" targetGrade="A" minEnchant="6" />
+	<enchant id="33848" targetGrade="S" minEnchant="6" />
+	<enchant id="33849" targetGrade="R" minEnchant="6" />
 
 	<!-- Master Yogi's Scroll: Enchant Weapon -->
 	<enchant id="13540" maxEnchant="15">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/33400-33499.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/33400-33499.xml
index b8d1ad6e44..b7a968f5f0 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/33400-33499.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/33400-33499.xml
@@ -2059,7 +2059,7 @@
 		<set name="icon" val="icon.scroll_of_enchant_weapon_i06" />
 		<set name="is_stackable" val="true" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="BLESS_ENCHT_WP" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
 		<set name="handler" val="EnchantScrolls" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
@@ -2072,7 +2072,7 @@
 		<set name="icon" val="icon.scroll_of_enchant_armor_i06" />
 		<set name="is_stackable" val="true" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
 		<set name="handler" val="EnchantScrolls" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
index 06040c0806..f7595701a1 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
@@ -47,7 +47,7 @@ public final class EnchantScroll extends AbstractEnchantItem
 		final ItemType type = getItem().getItemType();
 		_isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP);
 		_isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP);
-		_isSafe = (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP);
+		_isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP);
 		_isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP);
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/EnchantItemData.xml b/L2J_Mobius_2.5_Underground/dist/game/data/EnchantItemData.xml
index 6d11e2ff6f..46bbffe5b4 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/EnchantItemData.xml
@@ -119,27 +119,35 @@
 	<enchant id="22227" targetGrade="C" maxEnchant="15" />
 	<enchant id="22229" targetGrade="D" maxEnchant="15" />
 
-	<enchant id="33838" targetGrade="D" maxEnchant="15" />
-	<enchant id="33839" targetGrade="C" maxEnchant="15" />
-	<enchant id="33840" targetGrade="B" maxEnchant="15" />
-	<enchant id="33841" targetGrade="A" maxEnchant="15" />
-	<enchant id="33842" targetGrade="S" maxEnchant="15" />
-	<enchant id="33843" targetGrade="R" maxEnchant="15" />
+	<!-- Scroll: Enchant Weapon of Destruction -->
+	<enchant id="22221" targetGrade="S" minEnchant="15" />
+	<enchant id="22223" targetGrade="A" minEnchant="15" />
+	<enchant id="22225" targetGrade="B" minEnchant="15" />
+	<enchant id="22227" targetGrade="C" minEnchant="15" />
+	<enchant id="22229" targetGrade="D" minEnchant="15" />
+	<enchant id="33478" targetGrade="R" minEnchant="15" />
+
+	<enchant id="33838" targetGrade="D" minEnchant="15" />
+	<enchant id="33839" targetGrade="C" minEnchant="15" />
+	<enchant id="33840" targetGrade="B" minEnchant="15" />
+	<enchant id="33841" targetGrade="A" minEnchant="15" />
+	<enchant id="33842" targetGrade="S" minEnchant="15" />
+	<enchant id="33843" targetGrade="R" minEnchant="15" />
 	
 	<!-- Scroll: Enchant Armor of Destruction -->
-	<enchant id="33479" targetGrade="R" maxEnchant="6" />
-	<enchant id="22222" targetGrade="S" maxEnchant="6" />
-	<enchant id="22224" targetGrade="A" maxEnchant="6" />
-	<enchant id="22226" targetGrade="B" maxEnchant="6" />
-	<enchant id="22228" targetGrade="C" maxEnchant="6" />
-	<enchant id="22230" targetGrade="D" maxEnchant="6" />
+	<enchant id="22222" targetGrade="S" minEnchant="6" />
+	<enchant id="22224" targetGrade="A" minEnchant="6" />
+	<enchant id="22226" targetGrade="B" minEnchant="6" />
+	<enchant id="22228" targetGrade="C" minEnchant="6" />
+	<enchant id="22230" targetGrade="D" minEnchant="6" />
+	<enchant id="33479" targetGrade="R" minEnchant="6" />
 
-	<enchant id="33844" targetGrade="D" maxEnchant="6" />
-	<enchant id="33845" targetGrade="C" maxEnchant="6" />
-	<enchant id="33846" targetGrade="B" maxEnchant="6" />
-	<enchant id="33847" targetGrade="A" maxEnchant="6" />
-	<enchant id="33848" targetGrade="S" maxEnchant="6" />
-	<enchant id="33849" targetGrade="R" maxEnchant="6" />
+	<enchant id="33844" targetGrade="D" minEnchant="6" />
+	<enchant id="33845" targetGrade="C" minEnchant="6" />
+	<enchant id="33846" targetGrade="B" minEnchant="6" />
+	<enchant id="33847" targetGrade="A" minEnchant="6" />
+	<enchant id="33848" targetGrade="S" minEnchant="6" />
+	<enchant id="33849" targetGrade="R" minEnchant="6" />
 
 	<!-- Master Yogi's Scroll: Enchant Weapon -->
 	<enchant id="13540" maxEnchant="15">
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/33400-33499.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/33400-33499.xml
index 47a560675b..805c7d59a1 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/33400-33499.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/33400-33499.xml
@@ -2059,7 +2059,7 @@
 		<set name="icon" val="icon.scroll_of_enchant_weapon_i06" />
 		<set name="is_stackable" val="true" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="BLESS_ENCHT_WP" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
 		<set name="handler" val="EnchantScrolls" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
@@ -2072,7 +2072,7 @@
 		<set name="icon" val="icon.scroll_of_enchant_armor_i06" />
 		<set name="is_stackable" val="true" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
 		<set name="handler" val="EnchantScrolls" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
index 06040c0806..f7595701a1 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
@@ -47,7 +47,7 @@ public final class EnchantScroll extends AbstractEnchantItem
 		final ItemType type = getItem().getItemType();
 		_isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP);
 		_isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP);
-		_isSafe = (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP);
+		_isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP);
 		_isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP);
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/EnchantItemData.xml b/L2J_Mobius_3.0_Helios/dist/game/data/EnchantItemData.xml
index 7fa7c268bc..86032e819f 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/EnchantItemData.xml
@@ -119,27 +119,35 @@
 	<enchant id="22227" targetGrade="C" maxEnchant="15" />
 	<enchant id="22229" targetGrade="D" maxEnchant="15" />
 
-	<enchant id="33838" targetGrade="D" maxEnchant="15" />
-	<enchant id="33839" targetGrade="C" maxEnchant="15" />
-	<enchant id="33840" targetGrade="B" maxEnchant="15" />
-	<enchant id="33841" targetGrade="A" maxEnchant="15" />
-	<enchant id="33842" targetGrade="S" maxEnchant="15" />
-	<enchant id="33843" targetGrade="R" maxEnchant="15" />
+	<!-- Scroll: Enchant Weapon of Destruction -->
+	<enchant id="22221" targetGrade="S" minEnchant="15" />
+	<enchant id="22223" targetGrade="A" minEnchant="15" />
+	<enchant id="22225" targetGrade="B" minEnchant="15" />
+	<enchant id="22227" targetGrade="C" minEnchant="15" />
+	<enchant id="22229" targetGrade="D" minEnchant="15" />
+	<enchant id="33478" targetGrade="R" minEnchant="15" />
+
+	<enchant id="33838" targetGrade="D" minEnchant="15" />
+	<enchant id="33839" targetGrade="C" minEnchant="15" />
+	<enchant id="33840" targetGrade="B" minEnchant="15" />
+	<enchant id="33841" targetGrade="A" minEnchant="15" />
+	<enchant id="33842" targetGrade="S" minEnchant="15" />
+	<enchant id="33843" targetGrade="R" minEnchant="15" />
 	
 	<!-- Scroll: Enchant Armor of Destruction -->
-	<enchant id="33479" targetGrade="R" maxEnchant="6" />
-	<enchant id="22222" targetGrade="S" maxEnchant="6" />
-	<enchant id="22224" targetGrade="A" maxEnchant="6" />
-	<enchant id="22226" targetGrade="B" maxEnchant="6" />
-	<enchant id="22228" targetGrade="C" maxEnchant="6" />
-	<enchant id="22230" targetGrade="D" maxEnchant="6" />
+	<enchant id="22222" targetGrade="S" minEnchant="6" />
+	<enchant id="22224" targetGrade="A" minEnchant="6" />
+	<enchant id="22226" targetGrade="B" minEnchant="6" />
+	<enchant id="22228" targetGrade="C" minEnchant="6" />
+	<enchant id="22230" targetGrade="D" minEnchant="6" />
+	<enchant id="33479" targetGrade="R" minEnchant="6" />
 
-	<enchant id="33844" targetGrade="D" maxEnchant="6" />
-	<enchant id="33845" targetGrade="C" maxEnchant="6" />
-	<enchant id="33846" targetGrade="B" maxEnchant="6" />
-	<enchant id="33847" targetGrade="A" maxEnchant="6" />
-	<enchant id="33848" targetGrade="S" maxEnchant="6" />
-	<enchant id="33849" targetGrade="R" maxEnchant="6" />
+	<enchant id="33844" targetGrade="D" minEnchant="6" />
+	<enchant id="33845" targetGrade="C" minEnchant="6" />
+	<enchant id="33846" targetGrade="B" minEnchant="6" />
+	<enchant id="33847" targetGrade="A" minEnchant="6" />
+	<enchant id="33848" targetGrade="S" minEnchant="6" />
+	<enchant id="33849" targetGrade="R" minEnchant="6" />
 
 	<!-- Master Yogi's Scroll: Enchant Weapon -->
 	<enchant id="13540" maxEnchant="15">
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/33400-33499.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/33400-33499.xml
index c3c4ea3a06..33d9b7c0ab 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/33400-33499.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/33400-33499.xml
@@ -2059,7 +2059,7 @@
 		<set name="icon" val="icon.scroll_of_enchant_weapon_i06" />
 		<set name="is_stackable" val="true" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="BLESS_ENCHT_WP" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
 		<set name="handler" val="EnchantScrolls" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
@@ -2072,7 +2072,7 @@
 		<set name="icon" val="icon.scroll_of_enchant_armor_i06" />
 		<set name="is_stackable" val="true" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
 		<set name="handler" val="EnchantScrolls" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
index 06040c0806..f7595701a1 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
@@ -47,7 +47,7 @@ public final class EnchantScroll extends AbstractEnchantItem
 		final ItemType type = getItem().getItemType();
 		_isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP);
 		_isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP);
-		_isSafe = (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP);
+		_isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP);
 		_isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP);
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml
index ae713c9a9c..6f7f9c4ac2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml
@@ -147,27 +147,35 @@
 	<enchant id="22227" targetGrade="C" maxEnchant="15" />
 	<enchant id="22229" targetGrade="D" maxEnchant="15" />
 
-	<enchant id="33838" targetGrade="D" maxEnchant="15" />
-	<enchant id="33839" targetGrade="C" maxEnchant="15" />
-	<enchant id="33840" targetGrade="B" maxEnchant="15" />
-	<enchant id="33841" targetGrade="A" maxEnchant="15" />
-	<enchant id="33842" targetGrade="S" maxEnchant="15" />
-	<enchant id="33843" targetGrade="R" maxEnchant="15" />
+	<!-- Scroll: Enchant Weapon of Destruction -->
+	<enchant id="22221" targetGrade="S" minEnchant="15" />
+	<enchant id="22223" targetGrade="A" minEnchant="15" />
+	<enchant id="22225" targetGrade="B" minEnchant="15" />
+	<enchant id="22227" targetGrade="C" minEnchant="15" />
+	<enchant id="22229" targetGrade="D" minEnchant="15" />
+	<enchant id="33478" targetGrade="R" minEnchant="15" />
+
+	<enchant id="33838" targetGrade="D" minEnchant="15" />
+	<enchant id="33839" targetGrade="C" minEnchant="15" />
+	<enchant id="33840" targetGrade="B" minEnchant="15" />
+	<enchant id="33841" targetGrade="A" minEnchant="15" />
+	<enchant id="33842" targetGrade="S" minEnchant="15" />
+	<enchant id="33843" targetGrade="R" minEnchant="15" />
 	
 	<!-- Scroll: Enchant Armor of Destruction -->
-	<enchant id="33479" targetGrade="R" maxEnchant="6" />
-	<enchant id="22222" targetGrade="S" maxEnchant="6" />
-	<enchant id="22224" targetGrade="A" maxEnchant="6" />
-	<enchant id="22226" targetGrade="B" maxEnchant="6" />
-	<enchant id="22228" targetGrade="C" maxEnchant="6" />
-	<enchant id="22230" targetGrade="D" maxEnchant="6" />
+	<enchant id="22222" targetGrade="S" minEnchant="6" />
+	<enchant id="22224" targetGrade="A" minEnchant="6" />
+	<enchant id="22226" targetGrade="B" minEnchant="6" />
+	<enchant id="22228" targetGrade="C" minEnchant="6" />
+	<enchant id="22230" targetGrade="D" minEnchant="6" />
+	<enchant id="33479" targetGrade="R" minEnchant="6" />
 
-	<enchant id="33844" targetGrade="D" maxEnchant="6" />
-	<enchant id="33845" targetGrade="C" maxEnchant="6" />
-	<enchant id="33846" targetGrade="B" maxEnchant="6" />
-	<enchant id="33847" targetGrade="A" maxEnchant="6" />
-	<enchant id="33848" targetGrade="S" maxEnchant="6" />
-	<enchant id="33849" targetGrade="R" maxEnchant="6" />
+	<enchant id="33844" targetGrade="D" minEnchant="6" />
+	<enchant id="33845" targetGrade="C" minEnchant="6" />
+	<enchant id="33846" targetGrade="B" minEnchant="6" />
+	<enchant id="33847" targetGrade="A" minEnchant="6" />
+	<enchant id="33848" targetGrade="S" minEnchant="6" />
+	<enchant id="33849" targetGrade="R" minEnchant="6" />
 
 	<!-- Master Yogi's Scroll: Enchant Weapon -->
 	<enchant id="13540" maxEnchant="15">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/33400-33499.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/33400-33499.xml
index c3c4ea3a06..33d9b7c0ab 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/33400-33499.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/33400-33499.xml
@@ -2059,7 +2059,7 @@
 		<set name="icon" val="icon.scroll_of_enchant_weapon_i06" />
 		<set name="is_stackable" val="true" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="BLESS_ENCHT_WP" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
 		<set name="handler" val="EnchantScrolls" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
@@ -2072,7 +2072,7 @@
 		<set name="icon" val="icon.scroll_of_enchant_armor_i06" />
 		<set name="is_stackable" val="true" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
 		<set name="handler" val="EnchantScrolls" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
index 06040c0806..f7595701a1 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
@@ -47,7 +47,7 @@ public final class EnchantScroll extends AbstractEnchantItem
 		final ItemType type = getItem().getItemType();
 		_isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP);
 		_isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP);
-		_isSafe = (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP);
+		_isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP);
 		_isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP);
 	}