diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/17200-17299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/17200-17299.xml
index 583c4dd51f..709dcdeb1e 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/17200-17299.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/17200-17299.xml
@@ -1836,6 +1836,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -1866,6 +1867,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13296" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/17300-17399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/17300-17399.xml
index 2464ee120a..7c638c927f 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/17300-17399.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/17300-17399.xml
@@ -18,6 +18,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13301" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
@@ -772,6 +773,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -802,6 +804,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13297" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
@@ -833,6 +836,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13302" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
@@ -2053,6 +2057,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -2083,6 +2088,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13298" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
@@ -2114,6 +2120,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13303" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/17400-17499.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/17400-17499.xml
index abbab0b333..ac49ea30a9 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/17400-17499.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/17400-17499.xml
@@ -564,13 +564,14 @@
 		<set name="weight" val="1520" />
 		<set name="price" val="646636000" />
 		<set name="soulshots" val="1" />
+		<set name="spiritshots" val="1" />
 		<set name="enchant_enabled" val="1" />
 		<set name="element_enabled" val="true" />
-		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
 		<set name="isAppearanceable" val="true" />
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
-		<set name="spiritshots" val="1" />
+		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -601,6 +602,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13299" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
@@ -632,6 +634,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13304" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/35100-35199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/35100-35199.xml
index 0c4bed6de5..06405e388f 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/35100-35199.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/35100-35199.xml
@@ -124,6 +124,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8828" level="1" /> <!-- PvP Damage Increase -->
 			<skill id="13781" level="1" /> <!-- Additional Ability Health -->
@@ -157,6 +158,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8829" level="1" /> <!-- PvP Damage Increase -->
 			<skill id="13782" level="1" /> <!-- Additional Ability Health -->
@@ -191,6 +193,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8830" level="1" /> <!-- PvP Damage Increase -->
 			<skill id="13783" level="1" /> <!-- Additional Ability Health -->
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/35200-35299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/35200-35299.xml
index 6f5a906e68..475bda7eef 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/35200-35299.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/35200-35299.xml
@@ -54,6 +54,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8857" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="13795" level="1" /> <!-- Additional Ability Health -->
@@ -87,6 +88,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8858" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="13796" level="1" /> <!-- Additional Ability Health -->
@@ -121,6 +123,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8859" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="13797" level="1" /> <!-- Additional Ability Health -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/17200-17299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/17200-17299.xml
index 1b43743b9c..f43a31f015 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/17200-17299.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/17200-17299.xml
@@ -1836,6 +1836,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -1866,6 +1867,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13296" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/17300-17399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/17300-17399.xml
index 2902c054c4..7d5fa5d883 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/17300-17399.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/17300-17399.xml
@@ -18,6 +18,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13301" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
@@ -772,6 +773,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -802,6 +804,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13297" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
@@ -833,6 +836,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13302" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
@@ -2053,6 +2057,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -2083,6 +2088,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13298" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
@@ -2114,6 +2120,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13303" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/17400-17499.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/17400-17499.xml
index 39ab39b98b..25ecf2256f 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/17400-17499.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/17400-17499.xml
@@ -564,13 +564,14 @@
 		<set name="weight" val="1520" />
 		<set name="price" val="646636000" />
 		<set name="soulshots" val="1" />
+		<set name="spiritshots" val="1" />
 		<set name="enchant_enabled" val="1" />
 		<set name="element_enabled" val="true" />
-		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
 		<set name="isAppearanceable" val="true" />
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
-		<set name="spiritshots" val="1" />
+		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -601,6 +602,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13299" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
@@ -632,6 +634,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13304" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/35100-35199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/35100-35199.xml
index d6dd83ac40..633d9159a6 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/35100-35199.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/35100-35199.xml
@@ -124,6 +124,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8828" level="1" /> <!-- PvP Damage Increase -->
 			<skill id="13781" level="1" /> <!-- Additional Ability Health -->
@@ -157,6 +158,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8829" level="1" /> <!-- PvP Damage Increase -->
 			<skill id="13782" level="1" /> <!-- Additional Ability Health -->
@@ -191,6 +193,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8830" level="1" /> <!-- PvP Damage Increase -->
 			<skill id="13783" level="1" /> <!-- Additional Ability Health -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/35200-35299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/35200-35299.xml
index c8aa3586d4..1063263890 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/35200-35299.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/35200-35299.xml
@@ -54,6 +54,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8857" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="13795" level="1" /> <!-- Additional Ability Health -->
@@ -87,6 +88,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8858" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="13796" level="1" /> <!-- Additional Ability Health -->
@@ -121,6 +123,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8859" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="13797" level="1" /> <!-- Additional Ability Health -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/17200-17299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/17200-17299.xml
index 0eaf282224..b6f88d385d 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/17200-17299.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/17200-17299.xml
@@ -1836,6 +1836,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -1866,6 +1867,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13296" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/17300-17399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/17300-17399.xml
index 2902c054c4..7d5fa5d883 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/17300-17399.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/17300-17399.xml
@@ -18,6 +18,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13301" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
@@ -772,6 +773,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -802,6 +804,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13297" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
@@ -833,6 +836,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13302" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
@@ -2053,6 +2057,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -2083,6 +2088,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13298" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
@@ -2114,6 +2120,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13303" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/17400-17499.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/17400-17499.xml
index 39ab39b98b..25ecf2256f 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/17400-17499.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/17400-17499.xml
@@ -564,13 +564,14 @@
 		<set name="weight" val="1520" />
 		<set name="price" val="646636000" />
 		<set name="soulshots" val="1" />
+		<set name="spiritshots" val="1" />
 		<set name="enchant_enabled" val="1" />
 		<set name="element_enabled" val="true" />
-		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
 		<set name="isAppearanceable" val="true" />
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
-		<set name="spiritshots" val="1" />
+		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -601,6 +602,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13299" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
@@ -632,6 +634,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13304" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/35100-35199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/35100-35199.xml
index d6dd83ac40..633d9159a6 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/35100-35199.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/35100-35199.xml
@@ -124,6 +124,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8828" level="1" /> <!-- PvP Damage Increase -->
 			<skill id="13781" level="1" /> <!-- Additional Ability Health -->
@@ -157,6 +158,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8829" level="1" /> <!-- PvP Damage Increase -->
 			<skill id="13782" level="1" /> <!-- Additional Ability Health -->
@@ -191,6 +193,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8830" level="1" /> <!-- PvP Damage Increase -->
 			<skill id="13783" level="1" /> <!-- Additional Ability Health -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/35200-35299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/35200-35299.xml
index c8aa3586d4..1063263890 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/35200-35299.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/35200-35299.xml
@@ -54,6 +54,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8857" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="13795" level="1" /> <!-- Additional Ability Health -->
@@ -87,6 +88,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8858" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="13796" level="1" /> <!-- Additional Ability Health -->
@@ -121,6 +123,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8859" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="13797" level="1" /> <!-- Additional Ability Health -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/17200-17299.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/17200-17299.xml
index 0eaf282224..b6f88d385d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/17200-17299.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/17200-17299.xml
@@ -1836,6 +1836,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -1866,6 +1867,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13296" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/17300-17399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/17300-17399.xml
index 2902c054c4..7d5fa5d883 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/17300-17399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/17300-17399.xml
@@ -18,6 +18,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13301" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
@@ -772,6 +773,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -802,6 +804,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13297" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
@@ -833,6 +836,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13302" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
@@ -2053,6 +2057,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -2083,6 +2088,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13298" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
@@ -2114,6 +2120,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13303" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/17400-17499.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/17400-17499.xml
index 39ab39b98b..25ecf2256f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/17400-17499.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/17400-17499.xml
@@ -564,13 +564,14 @@
 		<set name="weight" val="1520" />
 		<set name="price" val="646636000" />
 		<set name="soulshots" val="1" />
+		<set name="spiritshots" val="1" />
 		<set name="enchant_enabled" val="1" />
 		<set name="element_enabled" val="true" />
-		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
 		<set name="isAppearanceable" val="true" />
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
-		<set name="spiritshots" val="1" />
+		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -601,6 +602,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13299" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
@@ -632,6 +634,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13304" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/35100-35199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/35100-35199.xml
index d6dd83ac40..633d9159a6 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/35100-35199.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/35100-35199.xml
@@ -124,6 +124,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8828" level="1" /> <!-- PvP Damage Increase -->
 			<skill id="13781" level="1" /> <!-- Additional Ability Health -->
@@ -157,6 +158,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8829" level="1" /> <!-- PvP Damage Increase -->
 			<skill id="13782" level="1" /> <!-- Additional Ability Health -->
@@ -191,6 +193,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8830" level="1" /> <!-- PvP Damage Increase -->
 			<skill id="13783" level="1" /> <!-- Additional Ability Health -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/35200-35299.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/35200-35299.xml
index 942ed06708..50c38ad1c2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/35200-35299.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/35200-35299.xml
@@ -54,6 +54,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8857" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="13795" level="1" /> <!-- Additional Ability Health -->
@@ -87,6 +88,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8858" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="13796" level="1" /> <!-- Additional Ability Health -->
@@ -121,6 +123,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8859" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="13797" level="1" /> <!-- Additional Ability Health -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/17200-17299.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/17200-17299.xml
index 38ff9a717f..0d09c29b1d 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/17200-17299.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/17200-17299.xml
@@ -1836,6 +1836,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -1866,6 +1867,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13296" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/17300-17399.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/17300-17399.xml
index cc1ed1b33d..25eba6db26 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/17300-17399.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/17300-17399.xml
@@ -18,6 +18,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13301" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
@@ -772,6 +773,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -802,6 +804,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13297" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
@@ -833,6 +836,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13302" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
@@ -2053,6 +2057,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -2083,6 +2088,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13298" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
@@ -2114,6 +2120,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13303" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/17400-17499.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/17400-17499.xml
index 9d8eef23d8..f9ce8ab7af 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/17400-17499.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/17400-17499.xml
@@ -564,13 +564,14 @@
 		<set name="weight" val="1520" />
 		<set name="price" val="646636000" />
 		<set name="soulshots" val="1" />
+		<set name="spiritshots" val="1" />
 		<set name="enchant_enabled" val="1" />
 		<set name="element_enabled" val="true" />
-		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
 		<set name="isAppearanceable" val="true" />
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
-		<set name="spiritshots" val="1" />
+		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -601,6 +602,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13299" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
@@ -632,6 +634,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13304" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/35100-35199.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/35100-35199.xml
index e927000494..937f6b5cf0 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/35100-35199.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/35100-35199.xml
@@ -124,6 +124,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8828" level="1" /> <!-- PvP Damage Increase -->
 			<skill id="13781" level="1" /> <!-- Additional Ability Health -->
@@ -157,6 +158,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8829" level="1" /> <!-- PvP Damage Increase -->
 			<skill id="13782" level="1" /> <!-- Additional Ability Health -->
@@ -191,6 +193,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8830" level="1" /> <!-- PvP Damage Increase -->
 			<skill id="13783" level="1" /> <!-- Additional Ability Health -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/35200-35299.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/35200-35299.xml
index 65af143ed6..9e7a7ffc73 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/35200-35299.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/35200-35299.xml
@@ -54,6 +54,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8857" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="13795" level="1" /> <!-- Additional Ability Health -->
@@ -87,6 +88,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8858" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="13796" level="1" /> <!-- Additional Ability Health -->
@@ -121,6 +123,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8859" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="13797" level="1" /> <!-- Additional Ability Health -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/17200-17299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/17200-17299.xml
index a87ac8c4c4..4d75bc5dc3 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/17200-17299.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/17200-17299.xml
@@ -1836,6 +1836,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -1866,6 +1867,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13296" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/17300-17399.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/17300-17399.xml
index ebb5e22486..f845bc5404 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/17300-17399.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/17300-17399.xml
@@ -18,6 +18,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13301" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
@@ -772,6 +773,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -802,6 +804,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13297" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
@@ -833,6 +836,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13302" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
@@ -2053,6 +2057,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -2083,6 +2088,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13298" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
@@ -2114,6 +2120,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13303" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/17400-17499.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/17400-17499.xml
index 00b5191029..b9d673dc83 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/17400-17499.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/17400-17499.xml
@@ -564,13 +564,14 @@
 		<set name="weight" val="1520" />
 		<set name="price" val="646636000" />
 		<set name="soulshots" val="1" />
+		<set name="spiritshots" val="1" />
 		<set name="enchant_enabled" val="1" />
 		<set name="element_enabled" val="true" />
-		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
 		<set name="isAppearanceable" val="true" />
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
-		<set name="spiritshots" val="1" />
+		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
 		</skills>
@@ -601,6 +602,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13299" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
 		</skills>
@@ -632,6 +634,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="13304" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
 		</skills>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/35100-35199.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/35100-35199.xml
index 6d2f4eab5d..7ead613617 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/35100-35199.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/35100-35199.xml
@@ -124,6 +124,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8828" level="1" /> <!-- PvP Damage Increase -->
 			<skill id="13781" level="1" /> <!-- Additional Ability Health -->
@@ -157,6 +158,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8829" level="1" /> <!-- PvP Damage Increase -->
 			<skill id="13782" level="1" /> <!-- Additional Ability Health -->
@@ -191,6 +193,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8830" level="1" /> <!-- PvP Damage Increase -->
 			<skill id="13783" level="1" /> <!-- Additional Ability Health -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/35200-35299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/35200-35299.xml
index 9ed298e3b8..5c063ff067 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/35200-35299.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/35200-35299.xml
@@ -54,6 +54,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8857" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="13795" level="1" /> <!-- Additional Ability Health -->
@@ -87,6 +88,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8858" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="13796" level="1" /> <!-- Additional Ability Health -->
@@ -121,6 +123,7 @@
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="spiritshots" val="1" />
+		<set name="is_magic_weapon" val="true" />
 		<skills>
 			<skill id="8859" level="1" /> <!-- PvE Damage Increase -->
 			<skill id="13797" level="1" /> <!-- Additional Ability Health -->