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 449189e65b..ca5df37261 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/EnchantItemData.xml
@@ -786,12 +786,26 @@
 	<support id="38758" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
 	<support id="38760" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
 
+	<!-- Lesser Giant's Lucky Stone: Enchant Weapon -->
+	<support id="23785" targetGrade="R" minEnchant="3" maxEnchant="9" />
+	
+	<!-- Lesser Giant's Lucky Stone: Enchant Armor -->
+	<support id="23786" targetGrade="R" minEnchant="3" maxEnchant="9" />
+	
 	<!-- Giant's Lucky Enchant Stone Weapon -->
+	<support id="23781" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="10" />
 	<support id="39463" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="10" />
 
 	<!-- Giant's Lucky Enchant Stone Armor -->
+	<support id="23782" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="15" />
 	<support id="39462" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="15" />
+	
+	<!-- Blessed Giant's Lucky Enchant Stone Weapon -->
+	<support id="23783" targetGrade="R" minEnchant="3" maxEnchant="9" />
 
+	<!-- Blessed Giant's Lucky Enchant Stone Armor -->
+	<support id="23784" targetGrade="R" minEnchant="3" maxEnchant="9" />
+	
 	<!-- Windy Lucky Enchant Stone Weapon -->
 	<support id="39465" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="20" />
 
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/23700-23799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/23700-23799.xml
index 7ff1a5ef1c..705327a4a0 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/23700-23799.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/23700-23799.xml
@@ -1194,7 +1194,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_WP" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23782" name="Giant's Lucky Enchant Stone: Armor (R-grade)" type="EtcItem">
@@ -1209,7 +1209,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_AM" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23783" name="Blessed Giant's Lucky Enchant Stone: Weapon (R-grade)" type="EtcItem">
@@ -1224,7 +1224,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_WP" />
+		<set name="etcitem_type" val="BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23784" name="Blessed Giant's Lucky Enchant Stone: Armor (R-grade)" type="EtcItem">
@@ -1239,7 +1239,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_AM" />
+		<set name="etcitem_type" val="BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23785" name="Lesser Giant's Lucky Enchant Stone: Weapon (R-grade)" type="EtcItem">
@@ -1254,7 +1254,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_WP" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23786" name="Lesser Giant's Lucky Enchant Stone: Armor (R-grade)" type="EtcItem">
@@ -1269,7 +1269,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_AM" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23787" name="Blessed Lucky Enchant Stone: Weapon (D-grade)" type="EtcItem">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38700-38799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38700-38799.xml
index c86c6a6fdc..0c249b09dc 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38700-38799.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38700-38799.xml
@@ -1414,7 +1414,7 @@
 		<set name="is_freightable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
+		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="handler" val="ItemSkills" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/39400-39499.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/39400-39499.xml
index 485cf18a90..59818f608f 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/39400-39499.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/39400-39499.xml
@@ -517,7 +517,7 @@
 		<set name="weight" val="120" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="false" />
-		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="is_stackable" val="true" />
@@ -530,7 +530,7 @@
 		<set name="icon" val="icon.giant_ench_wp_stone_r_i01" />
 		<set name="weight" val="120" />
 		<set name="is_freightable" val="false" />
-		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="is_stackable" val="true" />
@@ -543,7 +543,7 @@
 		<set name="icon" val="icon.giant_ench_armor_stone_r_i02" />
 		<set name="weight" val="120" />
 		<set name="is_freightable" val="false" />
-		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
+		<set name="etcitem_type" val="BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="is_stackable" val="true" />
@@ -556,7 +556,7 @@
 		<set name="icon" val="icon.giant_ench_wp_stone_r_i02" />
 		<set name="weight" val="120" />
 		<set name="is_freightable" val="false" />
-		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
+		<set name="etcitem_type" val="BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="is_stackable" val="true" />
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
index b6b752a604..a988fe1fec 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
@@ -46,8 +46,12 @@ public abstract class AbstractEnchantItem
 		EtcItemType.GIANT_ENCHT_WP,
 		EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM,
 		EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP,
+		EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+		EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
 		EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM,
 		EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP,
+		EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+		EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
 	};
 	
 	private final int _id;
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 432496ff24..7b3bdb6b14 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
@@ -119,6 +119,10 @@ public final class EnchantScroll extends AbstractEnchantItem
 			{
 				return false;
 			}
+			else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant()))
+			{
+				return false;
+			}
 			else if (!supportItem.isValid(itemToEnchant, supportItem))
 			{
 				return false;
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
index 5701ed0e99..97df4ff6f4 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
@@ -18,6 +18,7 @@ package com.l2jmobius.gameserver.model.items.enchant;
 
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.type.EtcItemType;
+import com.l2jmobius.gameserver.model.items.type.ItemType;
 
 /**
  * @author UnAfraid
@@ -26,12 +27,16 @@ public final class EnchantSupportItem extends AbstractEnchantItem
 {
 	private final boolean _isWeapon;
 	private final boolean _isBlessed;
+	private final boolean _isGiant;
+	private final ItemType type;
 	
 	public EnchantSupportItem(StatsSet set)
 	{
 		super(set);
-		_isWeapon = (getItem().getItemType() == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP);
-		_isBlessed = (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP);
+		type = getItem().getItemType();
+		_isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
+		_isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
+		_isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
 	}
 	
 	@Override
@@ -44,4 +49,9 @@ public final class EnchantSupportItem extends AbstractEnchantItem
 	{
 		return _isBlessed;
 	}
+	
+	public boolean isGiant()
+	{
+		return _isGiant;
+	}
 }
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
index 6d8b33ec23..42509ecb55 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
@@ -55,6 +55,10 @@ public enum EtcItemType implements ItemType
 	ENCHT_ATTR_INC_PROP_ENCHT_AM,
 	BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP,
 	BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+	BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
+	BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+	GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
+	GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
 	ENCHT_ATTR_CRYSTAL_ENCHANT_AM,
 	ENCHT_ATTR_CRYSTAL_ENCHANT_WP,
 	ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM,
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 50ad2d6463..268f576c00 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -187,7 +187,14 @@ public final class RequestEnchantItem implements IClientIncomingPacket
 					{
 						if (scrollTemplate.isGiant())
 						{
-							item.setEnchantLevel(Math.min(item.getEnchantLevel() + 1 + Rnd.get(3), scrollTemplate.getMaxEnchantLevel()));
+							if (((supportTemplate != null) && (supportTemplate.getId() == 23785)) || ((supportTemplate != null) && (supportTemplate.getId() == 23786))) // Lesser Giant's Lucky Enchant Stones. Increase from +2 to +4
+							{
+								item.setEnchantLevel(Math.min(item.getEnchantLevel() + 2 + Rnd.get(3), scrollTemplate.getMaxEnchantLevel()));
+							}
+							else
+							{
+								item.setEnchantLevel(Math.min(item.getEnchantLevel() + 1 + Rnd.get(3), scrollTemplate.getMaxEnchantLevel()));
+							}
 						}
 						else
 						{
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 9b342203dd..e0f1f45629 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/EnchantItemData.xml
@@ -812,12 +812,26 @@
 	<support id="38758" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
 	<support id="38760" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
 
+	<!-- Lesser Giant's Lucky Stone: Enchant Weapon -->
+	<support id="23785" targetGrade="R" minEnchant="3" maxEnchant="9" />
+	
+	<!-- Lesser Giant's Lucky Stone: Enchant Armor -->
+	<support id="23786" targetGrade="R" minEnchant="3" maxEnchant="9" />
+	
 	<!-- Giant's Lucky Enchant Stone Weapon -->
+	<support id="23781" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="10" />
 	<support id="39463" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="10" />
 
 	<!-- Giant's Lucky Enchant Stone Armor -->
+	<support id="23782" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="15" />
 	<support id="39462" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="15" />
+	
+	<!-- Blessed Giant's Lucky Enchant Stone Weapon -->
+	<support id="23783" targetGrade="R" minEnchant="3" maxEnchant="9" />
 
+	<!-- Blessed Giant's Lucky Enchant Stone Armor -->
+	<support id="23784" targetGrade="R" minEnchant="3" maxEnchant="9" />
+	
 	<!-- Windy Lucky Enchant Stone Weapon -->
 	<support id="39465" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="20" />
 
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/23700-23799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/23700-23799.xml
index df55d03177..e843192e32 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/23700-23799.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/23700-23799.xml
@@ -1194,7 +1194,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_WP" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23782" name="Giant's Lucky Enchant Stone: Armor (R-grade)" type="EtcItem">
@@ -1209,7 +1209,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_AM" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23783" name="Blessed Giant's Lucky Enchant Stone: Weapon (R-grade)" type="EtcItem">
@@ -1224,7 +1224,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_WP" />
+		<set name="etcitem_type" val="BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23784" name="Blessed Giant's Lucky Enchant Stone: Armor (R-grade)" type="EtcItem">
@@ -1239,7 +1239,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_AM" />
+		<set name="etcitem_type" val="BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23785" name="Lesser Giant's Lucky Enchant Stone: Weapon (R-grade)" type="EtcItem">
@@ -1254,7 +1254,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_WP" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23786" name="Lesser Giant's Lucky Enchant Stone: Armor (R-grade)" type="EtcItem">
@@ -1269,7 +1269,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_AM" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23787" name="Blessed Lucky Enchant Stone: Weapon (D-grade)" type="EtcItem">
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38700-38799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38700-38799.xml
index 2cb66ece07..132c31964a 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38700-38799.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38700-38799.xml
@@ -1414,7 +1414,7 @@
 		<set name="is_freightable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
+		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="handler" val="ItemSkills" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/39400-39499.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/39400-39499.xml
index ddb67c677f..f0219f68f9 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/39400-39499.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/39400-39499.xml
@@ -517,7 +517,7 @@
 		<set name="weight" val="120" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="false" />
-		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="is_stackable" val="true" />
@@ -530,7 +530,7 @@
 		<set name="icon" val="icon.giant_ench_wp_stone_r_i01" />
 		<set name="weight" val="120" />
 		<set name="is_freightable" val="false" />
-		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="is_stackable" val="true" />
@@ -543,7 +543,7 @@
 		<set name="icon" val="icon.giant_ench_armor_stone_r_i02" />
 		<set name="weight" val="120" />
 		<set name="is_freightable" val="false" />
-		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
+		<set name="etcitem_type" val="BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="is_stackable" val="true" />
@@ -556,7 +556,7 @@
 		<set name="icon" val="icon.giant_ench_wp_stone_r_i02" />
 		<set name="weight" val="120" />
 		<set name="is_freightable" val="false" />
-		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
+		<set name="etcitem_type" val="BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="is_stackable" val="true" />
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
index b6b752a604..a988fe1fec 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
@@ -46,8 +46,12 @@ public abstract class AbstractEnchantItem
 		EtcItemType.GIANT_ENCHT_WP,
 		EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM,
 		EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP,
+		EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+		EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
 		EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM,
 		EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP,
+		EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+		EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
 	};
 	
 	private final int _id;
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 432496ff24..7b3bdb6b14 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
@@ -119,6 +119,10 @@ public final class EnchantScroll extends AbstractEnchantItem
 			{
 				return false;
 			}
+			else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant()))
+			{
+				return false;
+			}
 			else if (!supportItem.isValid(itemToEnchant, supportItem))
 			{
 				return false;
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
index 5701ed0e99..97df4ff6f4 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
@@ -18,6 +18,7 @@ package com.l2jmobius.gameserver.model.items.enchant;
 
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.type.EtcItemType;
+import com.l2jmobius.gameserver.model.items.type.ItemType;
 
 /**
  * @author UnAfraid
@@ -26,12 +27,16 @@ public final class EnchantSupportItem extends AbstractEnchantItem
 {
 	private final boolean _isWeapon;
 	private final boolean _isBlessed;
+	private final boolean _isGiant;
+	private final ItemType type;
 	
 	public EnchantSupportItem(StatsSet set)
 	{
 		super(set);
-		_isWeapon = (getItem().getItemType() == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP);
-		_isBlessed = (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP);
+		type = getItem().getItemType();
+		_isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
+		_isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
+		_isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
 	}
 	
 	@Override
@@ -44,4 +49,9 @@ public final class EnchantSupportItem extends AbstractEnchantItem
 	{
 		return _isBlessed;
 	}
+	
+	public boolean isGiant()
+	{
+		return _isGiant;
+	}
 }
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
index 6d8b33ec23..42509ecb55 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
@@ -55,6 +55,10 @@ public enum EtcItemType implements ItemType
 	ENCHT_ATTR_INC_PROP_ENCHT_AM,
 	BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP,
 	BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+	BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
+	BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+	GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
+	GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
 	ENCHT_ATTR_CRYSTAL_ENCHANT_AM,
 	ENCHT_ATTR_CRYSTAL_ENCHANT_WP,
 	ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM,
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 50ad2d6463..268f576c00 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -187,7 +187,14 @@ public final class RequestEnchantItem implements IClientIncomingPacket
 					{
 						if (scrollTemplate.isGiant())
 						{
-							item.setEnchantLevel(Math.min(item.getEnchantLevel() + 1 + Rnd.get(3), scrollTemplate.getMaxEnchantLevel()));
+							if (((supportTemplate != null) && (supportTemplate.getId() == 23785)) || ((supportTemplate != null) && (supportTemplate.getId() == 23786))) // Lesser Giant's Lucky Enchant Stones. Increase from +2 to +4
+							{
+								item.setEnchantLevel(Math.min(item.getEnchantLevel() + 2 + Rnd.get(3), scrollTemplate.getMaxEnchantLevel()));
+							}
+							else
+							{
+								item.setEnchantLevel(Math.min(item.getEnchantLevel() + 1 + Rnd.get(3), scrollTemplate.getMaxEnchantLevel()));
+							}
 						}
 						else
 						{
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 d6a81c77bb..a95e6e484d 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/EnchantItemData.xml
@@ -695,7 +695,7 @@
 
 	<!-- Blessed Giant's Scroll: Enchant Armor -->
 	<enchant id="36284" targetGrade="R" />
-
+		
 	<!-- Lucky Enchant Stone: Weapon -->
 	<support id="12362" targetGrade="D" minEnchant="3" maxEnchant="9" bonusRate="20" />
 	<support id="12363" targetGrade="C" minEnchant="3" maxEnchant="9" bonusRate="18" />
@@ -812,12 +812,26 @@
 	<support id="38758" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
 	<support id="38760" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
 
+	<!-- Lesser Giant's Lucky Stone: Enchant Weapon -->
+	<support id="23785" targetGrade="R" minEnchant="3" maxEnchant="9" />
+	
+	<!-- Lesser Giant's Lucky Stone: Enchant Armor -->
+	<support id="23786" targetGrade="R" minEnchant="3" maxEnchant="9" />
+	
 	<!-- Giant's Lucky Enchant Stone Weapon -->
+	<support id="23781" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="10" />
 	<support id="39463" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="10" />
 
 	<!-- Giant's Lucky Enchant Stone Armor -->
+	<support id="23782" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="15" />
 	<support id="39462" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="15" />
+	
+	<!-- Blessed Giant's Lucky Enchant Stone Weapon -->
+	<support id="23783" targetGrade="R" minEnchant="3" maxEnchant="9" />
 
+	<!-- Blessed Giant's Lucky Enchant Stone Armor -->
+	<support id="23784" targetGrade="R" minEnchant="3" maxEnchant="9" />
+	
 	<!-- Windy Lucky Enchant Stone Weapon -->
 	<support id="39465" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="20" />
 	<support id="28497" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="20" />
@@ -849,5 +863,7 @@
 	<support id="23778" targetGrade="A" minEnchant="10" maxEnchant="15" bonusRate="18" />
 	<support id="23779" targetGrade="S" minEnchant="10" maxEnchant="15" bonusRate="15" />
 	<support id="23780" targetGrade="R" minEnchant="10" maxEnchant="15" bonusRate="10" />
+	
+	
 
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/23700-23799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/23700-23799.xml
index 5b0db32af7..4a278485c9 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/23700-23799.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/23700-23799.xml
@@ -1194,7 +1194,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_WP" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23782" name="Giant's Lucky Enchant Stone: Armor (R-grade)" type="EtcItem">
@@ -1209,7 +1209,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_AM" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23783" name="Blessed Giant's Lucky Enchant Stone: Weapon (R-grade)" type="EtcItem">
@@ -1224,7 +1224,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_WP" />
+		<set name="etcitem_type" val="BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23784" name="Blessed Giant's Lucky Enchant Stone: Armor (R-grade)" type="EtcItem">
@@ -1239,7 +1239,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_AM" />
+		<set name="etcitem_type" val="BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23785" name="Lesser Giant's Lucky Enchant Stone: Weapon (R-grade)" type="EtcItem">
@@ -1254,7 +1254,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_WP" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23786" name="Lesser Giant's Lucky Enchant Stone: Armor (R-grade)" type="EtcItem">
@@ -1269,7 +1269,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_AM" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23787" name="Blessed Lucky Enchant Stone: Weapon (D-grade)" type="EtcItem">
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/28400-28499.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/28400-28499.xml
index 9819c49cc9..80be62bc04 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/28400-28499.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/28400-28499.xml
@@ -970,7 +970,7 @@
 	</item>
 	<item id="28497" name="Windy Lucky Enchant Stone: Weapon (R-grade)" type="EtcItem">
 		<set name="icon" val="icon.ench_am_stone_i00" />
-		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
+		<set name="etcitem_type" val="BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_tradable" val="false" />
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/38700-38799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/38700-38799.xml
index bf3afdd2ea..fa7dcb4f29 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/38700-38799.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/38700-38799.xml
@@ -1414,7 +1414,7 @@
 		<set name="is_freightable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
+		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="handler" val="ItemSkills" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/39400-39499.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/39400-39499.xml
index ddb67c677f..f0219f68f9 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/39400-39499.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/39400-39499.xml
@@ -517,7 +517,7 @@
 		<set name="weight" val="120" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="false" />
-		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="is_stackable" val="true" />
@@ -530,7 +530,7 @@
 		<set name="icon" val="icon.giant_ench_wp_stone_r_i01" />
 		<set name="weight" val="120" />
 		<set name="is_freightable" val="false" />
-		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="is_stackable" val="true" />
@@ -543,7 +543,7 @@
 		<set name="icon" val="icon.giant_ench_armor_stone_r_i02" />
 		<set name="weight" val="120" />
 		<set name="is_freightable" val="false" />
-		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
+		<set name="etcitem_type" val="BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="is_stackable" val="true" />
@@ -556,7 +556,7 @@
 		<set name="icon" val="icon.giant_ench_wp_stone_r_i02" />
 		<set name="weight" val="120" />
 		<set name="is_freightable" val="false" />
-		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
+		<set name="etcitem_type" val="BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="is_stackable" val="true" />
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
index b6b752a604..a988fe1fec 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
@@ -46,8 +46,12 @@ public abstract class AbstractEnchantItem
 		EtcItemType.GIANT_ENCHT_WP,
 		EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM,
 		EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP,
+		EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+		EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
 		EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM,
 		EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP,
+		EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+		EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
 	};
 	
 	private final int _id;
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 432496ff24..7b3bdb6b14 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
@@ -119,6 +119,10 @@ public final class EnchantScroll extends AbstractEnchantItem
 			{
 				return false;
 			}
+			else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant()))
+			{
+				return false;
+			}
 			else if (!supportItem.isValid(itemToEnchant, supportItem))
 			{
 				return false;
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
index 5701ed0e99..97df4ff6f4 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
@@ -18,6 +18,7 @@ package com.l2jmobius.gameserver.model.items.enchant;
 
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.type.EtcItemType;
+import com.l2jmobius.gameserver.model.items.type.ItemType;
 
 /**
  * @author UnAfraid
@@ -26,12 +27,16 @@ public final class EnchantSupportItem extends AbstractEnchantItem
 {
 	private final boolean _isWeapon;
 	private final boolean _isBlessed;
+	private final boolean _isGiant;
+	private final ItemType type;
 	
 	public EnchantSupportItem(StatsSet set)
 	{
 		super(set);
-		_isWeapon = (getItem().getItemType() == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP);
-		_isBlessed = (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP);
+		type = getItem().getItemType();
+		_isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
+		_isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
+		_isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
 	}
 	
 	@Override
@@ -44,4 +49,9 @@ public final class EnchantSupportItem extends AbstractEnchantItem
 	{
 		return _isBlessed;
 	}
+	
+	public boolean isGiant()
+	{
+		return _isGiant;
+	}
 }
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
index 6d8b33ec23..42509ecb55 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
@@ -55,6 +55,10 @@ public enum EtcItemType implements ItemType
 	ENCHT_ATTR_INC_PROP_ENCHT_AM,
 	BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP,
 	BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+	BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
+	BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+	GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
+	GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
 	ENCHT_ATTR_CRYSTAL_ENCHANT_AM,
 	ENCHT_ATTR_CRYSTAL_ENCHANT_WP,
 	ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM,
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 50ad2d6463..268f576c00 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -187,7 +187,14 @@ public final class RequestEnchantItem implements IClientIncomingPacket
 					{
 						if (scrollTemplate.isGiant())
 						{
-							item.setEnchantLevel(Math.min(item.getEnchantLevel() + 1 + Rnd.get(3), scrollTemplate.getMaxEnchantLevel()));
+							if (((supportTemplate != null) && (supportTemplate.getId() == 23785)) || ((supportTemplate != null) && (supportTemplate.getId() == 23786))) // Lesser Giant's Lucky Enchant Stones. Increase from +2 to +4
+							{
+								item.setEnchantLevel(Math.min(item.getEnchantLevel() + 2 + Rnd.get(3), scrollTemplate.getMaxEnchantLevel()));
+							}
+							else
+							{
+								item.setEnchantLevel(Math.min(item.getEnchantLevel() + 1 + Rnd.get(3), scrollTemplate.getMaxEnchantLevel()));
+							}
 						}
 						else
 						{
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 d6a81c77bb..a95e6e484d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml
@@ -695,7 +695,7 @@
 
 	<!-- Blessed Giant's Scroll: Enchant Armor -->
 	<enchant id="36284" targetGrade="R" />
-
+		
 	<!-- Lucky Enchant Stone: Weapon -->
 	<support id="12362" targetGrade="D" minEnchant="3" maxEnchant="9" bonusRate="20" />
 	<support id="12363" targetGrade="C" minEnchant="3" maxEnchant="9" bonusRate="18" />
@@ -812,12 +812,26 @@
 	<support id="38758" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
 	<support id="38760" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
 
+	<!-- Lesser Giant's Lucky Stone: Enchant Weapon -->
+	<support id="23785" targetGrade="R" minEnchant="3" maxEnchant="9" />
+	
+	<!-- Lesser Giant's Lucky Stone: Enchant Armor -->
+	<support id="23786" targetGrade="R" minEnchant="3" maxEnchant="9" />
+	
 	<!-- Giant's Lucky Enchant Stone Weapon -->
+	<support id="23781" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="10" />
 	<support id="39463" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="10" />
 
 	<!-- Giant's Lucky Enchant Stone Armor -->
+	<support id="23782" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="15" />
 	<support id="39462" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="15" />
+	
+	<!-- Blessed Giant's Lucky Enchant Stone Weapon -->
+	<support id="23783" targetGrade="R" minEnchant="3" maxEnchant="9" />
 
+	<!-- Blessed Giant's Lucky Enchant Stone Armor -->
+	<support id="23784" targetGrade="R" minEnchant="3" maxEnchant="9" />
+	
 	<!-- Windy Lucky Enchant Stone Weapon -->
 	<support id="39465" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="20" />
 	<support id="28497" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="20" />
@@ -849,5 +863,7 @@
 	<support id="23778" targetGrade="A" minEnchant="10" maxEnchant="15" bonusRate="18" />
 	<support id="23779" targetGrade="S" minEnchant="10" maxEnchant="15" bonusRate="15" />
 	<support id="23780" targetGrade="R" minEnchant="10" maxEnchant="15" bonusRate="10" />
+	
+	
 
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/23700-23799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/23700-23799.xml
index 9cef35f274..0107d24542 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/23700-23799.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/23700-23799.xml
@@ -1220,7 +1220,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_WP" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23782" name="Giant's Lucky Enchant Stone: Armor (R-grade)" type="EtcItem">
@@ -1235,7 +1235,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_AM" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23783" name="Blessed Giant's Lucky Enchant Stone: Weapon (R-grade)" type="EtcItem">
@@ -1250,7 +1250,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_WP" />
+		<set name="etcitem_type" val="BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23784" name="Blessed Giant's Lucky Enchant Stone: Armor (R-grade)" type="EtcItem">
@@ -1265,7 +1265,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_AM" />
+		<set name="etcitem_type" val="BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23785" name="Lesser Giant's Lucky Enchant Stone: Weapon (R-grade)" type="EtcItem">
@@ -1280,7 +1280,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_WP" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23786" name="Lesser Giant's Lucky Enchant Stone: Armor (R-grade)" type="EtcItem">
@@ -1295,7 +1295,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
-		<set name="etcitem_type" val="MULTI_INC_PROB_ENCHT_AM" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="23787" name="Blessed Lucky Enchant Stone: Weapon (D-grade)" type="EtcItem">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/28400-28499.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/28400-28499.xml
index b01f244e3e..7a890c698a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/28400-28499.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/28400-28499.xml
@@ -1118,7 +1118,7 @@
 	<item id="28497" name="Giant's Lucky Enchant Stone: Weapon (R-grade)" additionalName="Event" type="EtcItem">
 		<!-- The Lucky Enchant Stone increases the chance of enchanting an R-grade weapon by 20% when using an Enchant Scroll. Can only be used on items that have been enchanted between + 3 and + 9. In case of Enchantment failure, the item is not Crystallized, but base Enchantment count is 0. -->
 		<set name="icon" val="BranchIcon.icon.etc_g_bm_godspirit_box" />
-		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
+		<set name="etcitem_type" val="BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_tradable" val="false" />
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/38700-38799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/38700-38799.xml
index 17dfa5b486..ede2cb6ed0 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/38700-38799.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/38700-38799.xml
@@ -1414,7 +1414,7 @@
 		<set name="is_freightable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
+		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="handler" val="ItemSkills" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/39400-39499.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/39400-39499.xml
index 139d2c7342..e2698c8892 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/39400-39499.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/39400-39499.xml
@@ -517,7 +517,7 @@
 		<set name="weight" val="120" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="false" />
-		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="is_stackable" val="true" />
@@ -530,7 +530,7 @@
 		<set name="icon" val="icon.giant_ench_wp_stone_r_i01" />
 		<set name="weight" val="120" />
 		<set name="is_freightable" val="false" />
-		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
+		<set name="etcitem_type" val="GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="is_stackable" val="true" />
@@ -543,7 +543,7 @@
 		<set name="icon" val="icon.giant_ench_armor_stone_r_i02" />
 		<set name="weight" val="120" />
 		<set name="is_freightable" val="false" />
-		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
+		<set name="etcitem_type" val="BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="is_stackable" val="true" />
@@ -556,7 +556,7 @@
 		<set name="icon" val="icon.giant_ench_wp_stone_r_i02" />
 		<set name="weight" val="120" />
 		<set name="is_freightable" val="false" />
-		<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
+		<set name="etcitem_type" val="BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="is_stackable" val="true" />
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
index b6b752a604..a988fe1fec 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
@@ -46,8 +46,12 @@ public abstract class AbstractEnchantItem
 		EtcItemType.GIANT_ENCHT_WP,
 		EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM,
 		EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP,
+		EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+		EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
 		EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM,
 		EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP,
+		EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+		EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
 	};
 	
 	private final int _id;
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 432496ff24..7b3bdb6b14 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
@@ -119,6 +119,10 @@ public final class EnchantScroll extends AbstractEnchantItem
 			{
 				return false;
 			}
+			else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant()))
+			{
+				return false;
+			}
 			else if (!supportItem.isValid(itemToEnchant, supportItem))
 			{
 				return false;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
index 5701ed0e99..97df4ff6f4 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
@@ -18,6 +18,7 @@ package com.l2jmobius.gameserver.model.items.enchant;
 
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.type.EtcItemType;
+import com.l2jmobius.gameserver.model.items.type.ItemType;
 
 /**
  * @author UnAfraid
@@ -26,12 +27,16 @@ public final class EnchantSupportItem extends AbstractEnchantItem
 {
 	private final boolean _isWeapon;
 	private final boolean _isBlessed;
+	private final boolean _isGiant;
+	private final ItemType type;
 	
 	public EnchantSupportItem(StatsSet set)
 	{
 		super(set);
-		_isWeapon = (getItem().getItemType() == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP);
-		_isBlessed = (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP);
+		type = getItem().getItemType();
+		_isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
+		_isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
+		_isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
 	}
 	
 	@Override
@@ -44,4 +49,9 @@ public final class EnchantSupportItem extends AbstractEnchantItem
 	{
 		return _isBlessed;
 	}
+	
+	public boolean isGiant()
+	{
+		return _isGiant;
+	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
index 6d8b33ec23..42509ecb55 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
@@ -55,6 +55,10 @@ public enum EtcItemType implements ItemType
 	ENCHT_ATTR_INC_PROP_ENCHT_AM,
 	BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP,
 	BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+	BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
+	BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+	GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
+	GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
 	ENCHT_ATTR_CRYSTAL_ENCHANT_AM,
 	ENCHT_ATTR_CRYSTAL_ENCHANT_WP,
 	ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM,
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 50ad2d6463..268f576c00 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -187,7 +187,14 @@ public final class RequestEnchantItem implements IClientIncomingPacket
 					{
 						if (scrollTemplate.isGiant())
 						{
-							item.setEnchantLevel(Math.min(item.getEnchantLevel() + 1 + Rnd.get(3), scrollTemplate.getMaxEnchantLevel()));
+							if (((supportTemplate != null) && (supportTemplate.getId() == 23785)) || ((supportTemplate != null) && (supportTemplate.getId() == 23786))) // Lesser Giant's Lucky Enchant Stones. Increase from +2 to +4
+							{
+								item.setEnchantLevel(Math.min(item.getEnchantLevel() + 2 + Rnd.get(3), scrollTemplate.getMaxEnchantLevel()));
+							}
+							else
+							{
+								item.setEnchantLevel(Math.min(item.getEnchantLevel() + 1 + Rnd.get(3), scrollTemplate.getMaxEnchantLevel()));
+							}
 						}
 						else
 						{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
index b6b752a604..a988fe1fec 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
@@ -46,8 +46,12 @@ public abstract class AbstractEnchantItem
 		EtcItemType.GIANT_ENCHT_WP,
 		EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM,
 		EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP,
+		EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+		EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
 		EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM,
 		EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP,
+		EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+		EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
 	};
 	
 	private final int _id;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
index bfa85178a8..f61f5ecb1e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
@@ -119,6 +119,10 @@ public final class EnchantScroll extends AbstractEnchantItem
 			{
 				return false;
 			}
+			else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant()))
+			{
+				return false;
+			}
 			else if (!supportItem.isValid(itemToEnchant, supportItem))
 			{
 				return false;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
index 5701ed0e99..97df4ff6f4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
@@ -18,6 +18,7 @@ package com.l2jmobius.gameserver.model.items.enchant;
 
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.type.EtcItemType;
+import com.l2jmobius.gameserver.model.items.type.ItemType;
 
 /**
  * @author UnAfraid
@@ -26,12 +27,16 @@ public final class EnchantSupportItem extends AbstractEnchantItem
 {
 	private final boolean _isWeapon;
 	private final boolean _isBlessed;
+	private final boolean _isGiant;
+	private final ItemType type;
 	
 	public EnchantSupportItem(StatsSet set)
 	{
 		super(set);
-		_isWeapon = (getItem().getItemType() == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP);
-		_isBlessed = (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP);
+		type = getItem().getItemType();
+		_isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
+		_isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
+		_isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
 	}
 	
 	@Override
@@ -44,4 +49,9 @@ public final class EnchantSupportItem extends AbstractEnchantItem
 	{
 		return _isBlessed;
 	}
+	
+	public boolean isGiant()
+	{
+		return _isGiant;
+	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
index 6d8b33ec23..42509ecb55 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
@@ -55,6 +55,10 @@ public enum EtcItemType implements ItemType
 	ENCHT_ATTR_INC_PROP_ENCHT_AM,
 	BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP,
 	BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+	BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
+	BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
+	GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP,
+	GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM,
 	ENCHT_ATTR_CRYSTAL_ENCHANT_AM,
 	ENCHT_ATTR_CRYSTAL_ENCHANT_WP,
 	ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM,
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 50ad2d6463..268f576c00 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -187,7 +187,14 @@ public final class RequestEnchantItem implements IClientIncomingPacket
 					{
 						if (scrollTemplate.isGiant())
 						{
-							item.setEnchantLevel(Math.min(item.getEnchantLevel() + 1 + Rnd.get(3), scrollTemplate.getMaxEnchantLevel()));
+							if (((supportTemplate != null) && (supportTemplate.getId() == 23785)) || ((supportTemplate != null) && (supportTemplate.getId() == 23786))) // Lesser Giant's Lucky Enchant Stones. Increase from +2 to +4
+							{
+								item.setEnchantLevel(Math.min(item.getEnchantLevel() + 2 + Rnd.get(3), scrollTemplate.getMaxEnchantLevel()));
+							}
+							else
+							{
+								item.setEnchantLevel(Math.min(item.getEnchantLevel() + 1 + Rnd.get(3), scrollTemplate.getMaxEnchantLevel()));
+							}
 						}
 						else
 						{