From 28ff9b2844ccf76878bd7efbb27c1366b041bf37 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 14 Nov 2017 11:32:55 +0000
Subject: [PATCH] Update some items to Grand Crusade. Contributed by
 gamelike85.

---
 .../game/data/stats/items/23800-23899.xml     |   12 +-
 .../game/data/stats/items/24300-24399.xml     |   16 +-
 .../game/data/stats/items/26400-26499.xml     |    8 +
 .../game/data/stats/items/46300-46399.xml     |    1 +
 .../game/data/stats/items/47800-47899.xml     |  385 +++---
 .../game/data/stats/skills/13800-13899.xml    |    4 +
 .../game/data/stats/skills/21300-21399.xml    | 1130 ++++++++++++++---
 .../gameserver/model/skills/AbnormalType.java |    1 +
 8 files changed, 1192 insertions(+), 365 deletions(-)

diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/23800-23899.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/23800-23899.xml
index 391f336f77..4046a39a5f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/23800-23899.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/23800-23899.xml
@@ -440,8 +440,9 @@
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
 		<skills>
-			<skill id="21373" level="1" />
 			<skill id="21364" level="5" />
+			<skill id="21365" level="1" type="ON_EQUIP" /> 
+			<skill id="21373" level="1" type="ON_UNEQUIP" /> 
 		</skills>
 	</item>
 	<item id="23838" name="Talisman - Slaughterer" additionalName="Abundance" type="Armor">
@@ -454,8 +455,9 @@
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
 		<skills>
-			<skill id="21374" level="1" />
 			<skill id="21364" level="6" />
+			<skill id="21370" level="1" type="ON_EQUIP" />
+			<skill id="21374" level="1" type="ON_UNEQUIP" /> 
 		</skills>
 	</item>
 	<item id="23839" name="Talisman - Conquerer" additionalName="Abundance" type="Armor">
@@ -468,8 +470,9 @@
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
 		<skills>
-			<skill id="21375" level="1" />
 			<skill id="21364" level="7" />
+			<skill id="21371" level="1" type="ON_EQUIP" />
+			<skill id="21375" level="1" type="ON_UNEQUIP" /> 
 		</skills>
 	</item>
 	<item id="23840" name="Talisman - Outlaw" additionalName="Abundance" type="Armor">
@@ -482,8 +485,9 @@
 		<set name="is_commissionable" val="false" />
 		<set name="is_sellable" val="false" />
 		<skills>
-			<skill id="21376" level="1" />
 			<skill id="21364" level="8" />
+			<skill id="21372" level="1" type="ON_EQUIP" />
+			<skill id="21376" level="1" type="ON_UNEQUIP" /> 
 		</skills>
 	</item>
 	<item id="23841" name="Abundance Gift Box" additionalName="War" type="EtcItem">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/24300-24399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/24300-24399.xml
index 11a28af89d..7200e1cceb 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/24300-24399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/24300-24399.xml
@@ -706,7 +706,9 @@
 		<set name="time" val="4320" />
 		<set name="useSkillDisTime" val="1" />
 		<skills>
-			<skill id="21365" level="1" /> 
+			<skill id="21364" level="5" />
+			<skill id="21365" level="1" type="ON_EQUIP" /> 
+			<skill id="21373" level="1" type="ON_UNEQUIP" /> 
 		</skills>
 	</item>
 	<item id="24352" name="Talisman - Slaughterer" additionalName="Abundance / 3-day" type="Armor">
@@ -726,7 +728,9 @@
 		<set name="time" val="4320" />
 		<set name="useSkillDisTime" val="1" />
 		<skills>
-			<skill id="21370" level="1" /> 
+			<skill id="21364" level="6" />
+			<skill id="21370" level="1" type="ON_EQUIP" />
+			<skill id="21374" level="1" type="ON_UNEQUIP" /> 
 		</skills>
 	</item>
 	<item id="24353" name="Talisman - Conquerer" additionalName="Abundance / 3-day" type="Armor">
@@ -746,7 +750,9 @@
 		<set name="time" val="4320" />
 		<set name="useSkillDisTime" val="1" />
 		<skills>
-			<skill id="21371" level="1" /> 
+			<skill id="21364" level="7" />
+			<skill id="21371" level="1" type="ON_EQUIP" />
+			<skill id="21375" level="1" type="ON_UNEQUIP" /> 
 		</skills>
 	</item>
 	<item id="24354" name="Talisman - Outlaw" additionalName="Abundance / 3-day" type="Armor">
@@ -766,7 +772,9 @@
 		<set name="time" val="4320" />
 		<set name="useSkillDisTime" val="1" />
 		<skills>
-			<skill id="21372" level="1" /> 
+			<skill id="21364" level="8" />
+			<skill id="21372" level="1" type="ON_EQUIP" />
+			<skill id="21376" level="1" type="ON_UNEQUIP" /> 
 		</skills>
 	</item>
 	<item id="24355" name="Premium Account: Art of Seduction" type="EtcItem">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/26400-26499.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/26400-26499.xml
index a61a3b0375..16203f89cb 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/26400-26499.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/26400-26499.xml
@@ -547,6 +547,8 @@
 		<set name="is_sellable" val="false" />
 		<skills>
 			<skill id="21364" level="5" />
+			<skill id="21365" level="1" type="ON_EQUIP" /> 
+			<skill id="21373" level="1" type="ON_UNEQUIP" /> 
 		</skills>
 	</item>
 	<item id="26452" name="Talisman - Abundance" additionalName="Slaughterer" type="Armor">
@@ -560,6 +562,8 @@
 		<set name="is_sellable" val="false" />
 		<skills>
 			<skill id="21364" level="6" />
+			<skill id="21370" level="1" type="ON_EQUIP" />
+			<skill id="21374" level="1" type="ON_UNEQUIP" /> 
 		</skills>
 	</item>
 	<item id="26453" name="Talisman - Abundance" additionalName="Conquerer" type="Armor">
@@ -573,6 +577,8 @@
 		<set name="is_sellable" val="false" />
 		<skills>
 			<skill id="21364" level="7" />
+			<skill id="21371" level="1" type="ON_EQUIP" />
+			<skill id="21375" level="1" type="ON_UNEQUIP" /> 
 		</skills>
 	</item>
 	<item id="26454" name="Talisman - Abundance" additionalName="Outlaw" type="Armor">
@@ -586,6 +592,8 @@
 		<set name="is_sellable" val="false" />
 		<skills>
 			<skill id="21364" level="8" />
+			<skill id="21372" level="1" type="ON_EQUIP" />
+			<skill id="21376" level="1" type="ON_UNEQUIP" /> 
 		</skills>
 	</item>
 	<item id="26455" name="Talisman - Abundance Lv. 1 (High-grade)" type="Armor">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/46300-46399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/46300-46399.xml
index f1a8265aae..2c72feffa5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/46300-46399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/46300-46399.xml
@@ -587,6 +587,7 @@
 		<set name="is_freightable" val="false" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
+		<set name="bodypart" val="lrhand" />
 		<set name="weight" val="1580" />
 		<skills>
 			<skill id="13844" level="12" /> <!-- Shadow Shooter -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47800-47899.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47800-47899.xml
index 2adbafad85..1575cb10e9 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47800-47899.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47800-47899.xml
@@ -622,376 +622,439 @@
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="47867" name="Frenzied Tauti's One-handed Axe" type="Weapon">
-		<!-- A weapon made using Tauti's Fragment Augment. When equipped, increases PVP Damage by 15%, Max HP by 25%, P. Atk. by 10%, Atk. Spd. by 15%, P. Critical Rate and Attack Attribute by 150, and P. Skill Atk. by 5%. <Active Skill>. Frenzied Tauti's Authority. Enchantment, Appearance Modification, Crystallization cannot be done. 1 Special Soul Crystal, Augment, Attribute Assignment can be used. -->
+		<!-- A weapon made using Tauti's Fragment Augment. When equipped, increases PVP Damage by 15%, Max HP by 25%, P. Atk. by 10%, Atk. Spd. by 15%, P. Critical Rate and Attack Attribute by 150, and P. Skill Atk. by 5%.\n\n&lt;Active Skill&gt;\nFrenzied Tauti's Authority\n\nEnchantment, Appearance Modification, Crystallization cannot be done. 1 Special Soul Crystal, Augment, Attribute Assignment can be used. -->
 		<set name="icon" val="icon.tauti_weapon_one_hand_axe_high" />
 		<set name="default_action" val="EQUIP" />
-		<set name="weapon_type" val="BLUNT" />
 		<set name="bodypart" val="rhand" />
-		<set name="immediate_effect" val="true" />
+		<set name="weapon_type" val="BLUNT" />
 		<set name="crystal_type" val="R" />
-		<set name="material" val="FINE_STEEL" />
 		<set name="weight" val="1000" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
+		<set name="damage_range" val="0;0;40;120" />
+		<set name="is_freightable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="commissionItemType" val="BLUNT_WEAPON" />
+		<set name="immediate_effect" val="true" />
+		<set name="element_enabled" val="true" />
+		<set name="isAppearanceable" val="false" />
+		<skills>
+			<skill id="8878" level="2" /> <!-- Frenzied Tauti's One-handed Axe -->
+			<skill id="9460" level="1" /> <!-- Frenzied Tauti's Authority -->
+		</skills>
 		<stats>
-			<stat type="pAtk">833</stat>
-			<stat type="mAtk">363</stat>
-			<stat type="rCrit">8</stat>
-			<stat type="accCombat">8</stat>
-			<stat type="pAtkSpd">379</stat>
-			<stat type="randomDamage">10</stat>
+			<stat type="pAtk">833.0</stat>
+			<stat type="mAtk">363.0</stat>
+			<stat type="pAtkSpd">379.0</stat>
+			<stat type="rCrit">8.0</stat>
+			<stat type="accCombat">8.0</stat>
 			<stat type="pAtkRange">40</stat>
+			<stat type="randomDamage">10</stat>
 		</stats>
 	</item>
 	<item id="47868" name="Frenzied Tauti's Two-handed Axe" type="Weapon">
-		<!-- A weapon made using Tauti's Fragment Augment. When equipped, increases PVP Damage by 15%, Max HP by 25%, P. Atk. by 10%, Atk. Spd. by 15%, and P. Critical Rate and Attack Attribute by 150, and P. Skill Atk. by 5%. <Active Skill>. Frenzied Tauti's Authority. Enchantment, Appearance Modification, Crystallization cannot be done. 1 Special Soul Crystal, Augment, Attribute Assignment can be used. -->
+		<!-- A weapon made using Tauti's Fragment Augment. When equipped, increases PVP Damage by 15%, Max HP by 25%, P. Atk. by 10%, Atk. Spd. by 15%, and P. Critical Rate and Attack Attribute by 150, and P. Skill Atk. by 5%.\n\n&lt;Active Skill&gt;\nFrenzied Tauti's Authority\n\nEnchantment, Appearance Modification, Crystallization cannot be done. 1 Special Soul Crystal, Augment, Attribute Assignment can be used. -->
 		<set name="icon" val="icon.tauti_weapon_two_hand_axe_high" />
 		<set name="default_action" val="EQUIP" />
-		<set name="weapon_type" val="BLUNT" />
 		<set name="bodypart" val="lrhand" />
-		<set name="immediate_effect" val="true" />
+		<set name="weapon_type" val="BLUNT" />
 		<set name="crystal_type" val="R" />
-		<set name="material" val="STEEL" />
 		<set name="weight" val="1000" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
+		<set name="damage_range" val="0;0;40;120" />
+		<set name="is_freightable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="commissionItemType" val="TWO_HAND_SWORD" />
+		<set name="immediate_effect" val="true" />
+		<set name="element_enabled" val="true" />
+		<set name="isAppearanceable" val="false" />
+		<skills>
+			<skill id="8878" level="2" /> <!-- Frenzied Tauti's Two-handed Axe -->
+			<skill id="9460" level="1" /> <!-- Frenzied Tauti's Authority -->
+		</skills>
 		<stats>
-			<stat type="pAtk">1013</stat>
-			<stat type="mAtk">363</stat>
-			<stat type="rCrit">8</stat>
-			<stat type="accCombat">8</stat>
-			<stat type="pAtkSpd">325</stat>
+			<stat type="pAtk">1013.0</stat>
+			<stat type="mAtk">363.0</stat>
+			<stat type="pAtkSpd">325.0</stat>
+			<stat type="rCrit">8.0</stat>
+			<stat type="accCombat">8.0</stat>
 			<stat type="randomDamage">10</stat>
 			<stat type="pAtkRange">40</stat>
 		</stats>
 	</item>
 	<item id="47869" name="Frenzied Tauti's Dual Axe" type="Weapon">
-		<!-- A weapon made using Tauti's Fragment Augment. When equipped, increases PVP Damage by 15%, Max HP by 25%, P. Atk. by 10%, Atk. Spd. by 15%, P. Critical Rate and Attack Attribute by 150, and P. Skill Atk. by 5%. <Active Skill>. Frenzied Tauti's Authority. Enchantment, Appearance Modification, Crystallization cannot be done. 1 Special Soul Crystal, Augment, Attribute Assignment can be used. -->
+		<!-- A weapon made using Tauti's Fragment Augment. When equipped, increases PVP Damage by 15%, Max HP by 25%, P. Atk. by 10%, Atk. Spd. by 15%, P. Critical Rate and Attack Attribute by 150, and P. Skill Atk. by 5%.\n\n&lt;Active Skill&gt;\nFrenzied Tauti's Authority\n\nEnchantment, Appearance Modification, Crystallization cannot be done. 1 Special Soul Crystal, Augment, Attribute Assignment can be used. -->
 		<set name="icon" val="icon.tauti_weapon_dual_axe_high" />
 		<set name="default_action" val="EQUIP" />
-		<set name="weapon_type" val="DUALBLUNT" />
 		<set name="bodypart" val="lrhand" />
-		<set name="immediate_effect" val="true" />
+		<set name="weapon_type" val="DUALBLUNT" />
 		<set name="crystal_type" val="R" />
-		<set name="material" val="FINE_STEEL" />
 		<set name="weight" val="1700" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
+		<set name="damage_range" val="0;0;40;120" />
+		<set name="is_freightable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="commissionItemType" val="DUAL_BLUNT_WEAPON" />
+		<set name="immediate_effect" val="true" />
+		<set name="element_enabled" val="true" />
+		<set name="isAppearanceable" val="false" />
+		<skills>
+			<skill id="8878" level="2" /> <!-- Frenzied Tauti's Dual Axe -->
+			<skill id="9460" level="1" /> <!-- Frenzied Tauti's Authority -->
+		</skills>
 		<stats>
-			<stat type="pAtk">1013</stat>
-			<stat type="mAtk">363</stat>
-			<stat type="rCrit">8</stat>
-			<stat type="accCombat">8</stat>
-			<stat type="pAtkSpd">325</stat>
+			<stat type="pAtk">1013.0</stat>
+			<stat type="mAtk">363.0</stat>
+			<stat type="pAtkSpd">325.0</stat>
+			<stat type="rCrit">8.0</stat>
+			<stat type="accCombat">8.0</stat>
 			<stat type="randomDamage">10</stat>
 			<stat type="pAtkRange">40</stat>
 		</stats>
 	</item>
 	<item id="47870" name="Insane Kelbim's Dagger" type="Weapon">
-		<!-- Kelbim's Dagger made using Kelbim's Fragment Augment. When equipped, increases PVP Damage by 15%, Max HP by 25%, P. Atk. by 10%, Atk. Spd. by 15%, and P. Critical Damage by 15%, P. Skill Power by 5%, and Attack Attribute by 150. <Active Skill>. Spirit of Kelbim. Enchantment, Appearance Modification, Crystallization cannot be done. 1 Special Soul Crystal, Augment, Attribute Assignment can be used. -->
+		<!-- Kelbim's Dagger made using Kelbim's Fragment Augment. When equipped, increases PVP Damage by 15%, Max HP by 25%, P. Atk. by 10%, Atk. Spd. by 15%, and P. Critical Damage by 15%, P. Skill Power by 5%, and Attack Attribute by 150.\n\n&lt;Active Skill&gt;\nSpirit of Kelbim\n\nEnchantment, Appearance Modification, Crystallization cannot be done. 1 Special Soul Crystal, Augment, Attribute Assignment can be used. -->
 		<set name="icon" val="icon.kelbim_weapon_cutter_high" />
 		<set name="default_action" val="EQUIP" />
-		<set name="weapon_type" val="DAGGER" />
 		<set name="bodypart" val="rhand" />
-		<set name="immediate_effect" val="true" />
+		<set name="weapon_type" val="DAGGER" />
 		<set name="crystal_type" val="R" />
-		<set name="material" val="FINE_STEEL" />
 		<set name="weight" val="1520" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
+		<set name="damage_range" val="0;0;40;120" />
+		<set name="is_freightable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="immediate_effect" val="true" />
+		<set name="element_enabled" val="true" />
+		<set name="isAppearanceable" val="false" />
+		<skills>
+			<skill id="13816" level="2" /> <!-- Insane Kelbim's Dagger -->
+			<skill id="13820" level="1" /> <!-- Spirit of Kelbim -->
+		</skills>
 		<stats>
-			<stat type="pAtk">773</stat>
-			<stat type="mAtk">384</stat>
-			<stat type="rCrit">12</stat>
+			<stat type="pAtk">773.0</stat>
+			<stat type="mAtk">384.0</stat>
+			<stat type="pAtkSpd">433.0</stat>
+			<stat type="rCrit">12.0</stat>
 			<stat type="accCombat">-3.75</stat>
-			<stat type="pAtkSpd">433</stat>
-			<stat type="randomDamage">5</stat>
 			<stat type="pAtkRange">40</stat>
+			<stat type="randomDamage">5</stat>
 		</stats>
 	</item>
 	<item id="47871" name="Insane Kelbim's Dual Dagger" type="Weapon">
-		<!-- Kelbim's Dual Dagger made using Kelbim's Fragment Augment. When equipped, increases PVP Damage by 15%, Max HP by 25%, P. Atk. by 10%, Atk. Spd. by 15%, P. Critical Damage by 15%, P. Skill Power by 5%, and Attack Attribute by 150. <Active Skill>. Spirit of Kelbim. Enchantment, Appearance Modification, Crystallization cannot be done. 1 Special Soul Crystal, Augment, Attribute Assignment can be used. -->
+		<!-- Kelbim's Dual Dagger made using Kelbim's Fragment Augment. When equipped, increases PVP Damage by 15%, Max HP by 25%, P. Atk. by 10%, Atk. Spd. by 15%, P. Critical Damage by 15%, P. Skill Power by 5%, and Attack Attribute by 150.\n\n&lt;Active Skill&gt;\nSpirit of Kelbim\n\nEnchantment, Appearance Modification, Crystallization cannot be done. 1 Special Soul Crystal, Augment, Attribute Assignment can be used. -->
 		<set name="icon" val="icon.kelbim_weapon_dual_dagger_high" />
 		<set name="default_action" val="EQUIP" />
-		<set name="weapon_type" val="DUALDAGGER" />
 		<set name="bodypart" val="lrhand" />
-		<set name="immediate_effect" val="true" />
+		<set name="weapon_type" val="DUALDAGGER" />
 		<set name="crystal_type" val="R" />
-		<set name="material" val="FINE_STEEL" />
 		<set name="weight" val="2050" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
+		<set name="damage_range" val="0;0;44;120" />
+		<set name="is_freightable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="immediate_effect" val="true" />
+		<set name="element_enabled" val="true" />
+		<set name="isAppearanceable" val="false" />
+		<skills>
+			<skill id="13817" level="2" /> <!-- Insane Kelbim's Dual Dagger -->
+			<skill id="13820" level="1" /> <!-- Spirit of Kelbim -->
+		</skills>
 		<stats>
-			<stat type="pAtk">884</stat>
-			<stat type="mAtk">384</stat>
-			<stat type="rCrit">12</stat>
+			<stat type="pAtk">884.0</stat>
+			<stat type="mAtk">384.0</stat>
+			<stat type="pAtkSpd">433.0</stat>
+			<stat type="rCrit">12.0</stat>
 			<stat type="accCombat">-3.75</stat>
-			<stat type="pAtkSpd">433</stat>
-			<stat type="randomDamage">10</stat>
 			<stat type="pAtkRange">40</stat>
+			<stat type="randomDamage">10</stat>
 		</stats>
 	</item>
 	<item id="47872" name="Insane Kelbim's Bow" type="Weapon">
-		<!-- Kelbim's Bow made using Kelbim's Fragment Augment. When equipped, increases PVP Damage by 15%, Max HP by 25%, P. Atk. by 10%, Atk. Spd. by 15%, P. Critical Damage by 15%, P. Skill Power by 5%, and Attack Attribute by 150. <Active Skill>. Spirit of Kelbim. Enchantment, Appearance Modification, Crystallization cannot be done. 1 Special Soul Crystal, Augment, Attribute Assignment can be used. -->
+		<!-- Kelbim's Bow made using Kelbim's Fragment Augment. When equipped, increases PVP Damage by 15%, Max HP by 25%, P. Atk. by 10%, Atk. Spd. by 15%, P. Critical Damage by 15%, P. Skill Power by 5%, and Attack Attribute by 150.\n\n&lt;Active Skill&gt;\nSpirit of Kelbim\n\nEnchantment, Appearance Modification, Crystallization cannot be done. 1 Special Soul Crystal, Augment, Attribute Assignment can be used. -->
 		<set name="icon" val="icon.kelbim_weapon_bow_high" />
 		<set name="default_action" val="EQUIP" />
-		<set name="weapon_type" val="BOW" />
 		<set name="bodypart" val="lrhand" />
-		<set name="immediate_effect" val="true" />
+		<set name="weapon_type" val="BOW" />
 		<set name="crystal_type" val="R" />
-		<set name="material" val="FINE_STEEL" />
 		<set name="weight" val="1520" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
+		<set name="damage_range" val="0;0;10;0" />
+		<set name="is_freightable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="immediate_effect" val="true" />
+		<set name="element_enabled" val="true" />
+		<set name="isAppearanceable" val="false" />
+		<skills>
+			<skill id="13818" level="2" /> <!-- Insane Kelbim's Bow -->
+			<skill id="13820" level="1" /> <!-- Spirit of Kelbim -->
+		</skills>
 		<stats>
-			<stat type="pAtk">1740</stat>
-			<stat type="mAtk">384</stat>
-			<stat type="rCrit">12</stat>
+			<stat type="pAtk">1740.0</stat>
+			<stat type="mAtk">384.0</stat>
+			<stat type="rCrit">12.0</stat>
 			<stat type="accCombat">-3.75</stat>
-			<stat type="pAtkSpd">293</stat>
-			<stat type="randomDamage">5</stat>
 			<stat type="pAtkRange">500</stat>
+			<stat type="randomDamage">5</stat>
+			<stat type="pAtkSpd">293.0</stat>
 		</stats>
 	</item>
 	<item id="47873" name="Insane Kelbim's Crossbow" type="Weapon">
-		<!-- Kelbim's Crossbow made using Kelbim's Fragment Augment. When equipped, increases PVP Damage by 15%, Max HP by 25%, P. Atk. by 10%, Atk. Spd. by 15%, P. Critical Damage by 15%, P. Skill Power by 5%, and Attack Attribute by 150. <Active Skill>. Spirit of Kelbim. Enchantment, Appearance Modification, Crystallization cannot be done. 1 Special Soul Crystal, Augment, Attribute Assignment can be used. -->
+		<!-- Kelbim's Crossbow made using Kelbim's Fragment Augment. When equipped, increases PVP Damage by 15%, Max HP by 25%, P. Atk. by 10%, Atk. Spd. by 15%, P. Critical Damage by 15%, P. Skill Power by 5%, and Attack Attribute by 150.\n\n&lt;Active Skill&gt;\nSpirit of Kelbim\n\nEnchantment, Appearance Modification, Crystallization cannot be done. 1 Special Soul Crystal, Augment, Attribute Assignment can be used. -->
 		<set name="icon" val="icon.kelbim_weapon_crossbow_high" />
 		<set name="default_action" val="EQUIP" />
-		<set name="weapon_type" val="CROSSBOW" />
 		<set name="bodypart" val="lrhand" />
-		<set name="immediate_effect" val="true" />
+		<set name="weapon_type" val="CROSSBOW" />
 		<set name="crystal_type" val="R" />
-		<set name="material" val="FINE_STEEL" />
 		<set name="weight" val="1580" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
+		<set name="damage_range" val="0;0;40;120" />
+		<set name="is_freightable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="immediate_effect" val="true" />
+		<set name="element_enabled" val="true" />
+		<set name="isAppearanceable" val="false" />
+		<skills>
+			<skill id="13819" level="2" /> <!-- Insane Kelbim Crossbow -->
+			<skill id="13820" level="1" /> <!-- Spirit of Kelbim -->
+		</skills>
 		<stats>
-			<stat type="pAtk">1567</stat>
-			<stat type="mAtk">384</stat>
-			<stat type="rCrit">12</stat>
+			<stat type="pAtk">1567.0</stat>
+			<stat type="mAtk">384.0</stat>
+			<stat type="pAtkSpd">325.0</stat>
+			<stat type="rCrit">12.0</stat>
 			<stat type="accCombat">-3.75</stat>
-			<stat type="pAtkSpd">325</stat>
-			<stat type="randomDamage">5</stat>
 			<stat type="pAtkRange">400</stat>
+			<stat type="randomDamage">5</stat>
 		</stats>
 	</item>
 	<item id="47874" name="Enhanced Shadow Shaper" type="Weapon">
-		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon. When equipped, increases PVE Damage 10%, Max HP/MP 15%, P. Atk. 10%, P. Critical Rate 50, P. Critical Damage 10%, Atk. Spd. 15%, Attack Attribute 150. Enchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
+		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon.\nWhen equipped, increases PVE Damage 10%, Max HP/MP 15%, P. Atk. 10%, P. Critical Rate 50, P. Critical Damage 10%, Atk. Spd. 15%, Attack Attribute 150. \n\nEnchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
 		<set name="icon" val="icon.shadow_dagger_1_high" />
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="DAGGER" />
-		<set name="bodypart" val="rhand" />
-		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="R" />
-		<set name="material" val="STEEL" />
+		<set name="bodypart" val="rhand" />
 		<set name="weight" val="1520" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
+		<skills>
+			<skill id="13842" level="13" /> <!-- Enhanced Shadow Shaper -->
+			<skill id="13847" level="1" /> <!-- PvE Damage Increase 10% -->
+		</skills>
 		<stats>
-			<stat type="pAtk">728</stat>
-			<stat type="mAtk">363</stat>
-			<stat type="rCrit">12</stat>
-			<stat type="accCombat">-3.75</stat>
-			<stat type="pAtkSpd">433</stat>
+			<stat type="pAtk">728.0</stat>
+			<stat type="mAtk">363.0</stat>
 			<stat type="randomDamage">5</stat>
-			<stat type="pAtkRange">40</stat>
+			<stat type="pAtkSpd">433.0</stat>
+			<stat type="rCrit">12.0</stat>
 		</stats>
 	</item>
 	<item id="47875" name="Enhanced Shadow Cutter" type="Weapon">
-		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon. When equipped, increases PVE Damage 10%, Max HP/MP 15%, P. Atk. 10%, P. Critical Rate 100, P. Critical Damage 5%, Atk. Spd. 15%, Attack Attribute 150. Enchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
+		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon.\nWhen equipped, increases PVE Damage 10%, Max HP/MP 15%, P. Atk. 10%, P. Critical Rate 100, P. Critical Damage 5%, Atk. Spd. 15%, Attack Attribute 150. \n\nEnchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
 		<set name="icon" val="icon.shadow_onehand_sword_1_high" />
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="SWORD" />
-		<set name="bodypart" val="rhand" />
-		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="R" />
-		<set name="material" val="STEEL" />
+		<set name="bodypart" val="rhand" />
 		<set name="weight" val="1520" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
+		<skills>
+			<skill id="13837" level="13" /> <!-- Enhanced Shadow Cutter -->
+			<skill id="13847" level="1" /> <!-- PvE Damage Increase 10% -->
+		</skills>
 		<stats>
-			<stat type="pAtk">833</stat>
-			<stat type="mAtk">363</stat>
-			<stat type="rCrit">8</stat>
-			<stat type="pAtkSpd">379</stat>
+			<stat type="pAtk">833.0</stat>
+			<stat type="mAtk">363.0</stat>
 			<stat type="randomDamage">10</stat>
-			<stat type="pAtkRange">40</stat>
+			<stat type="pAtkSpd">379.0</stat>
+			<stat type="rCrit">8.0</stat>
 		</stats>
 	</item>
 	<item id="47876" name="Enhanced Shadow Slasher" type="Weapon">
-		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon. When equipped, increases PVE Damage 10%, Max HP/MP 15%, P. Atk. 10%, P. Critical Rate 100, P. Critical Damage 5%, Atk. Spd. 15%, Attack Attribute 150. Enchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
+		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon.\nWhen equipped, increases PVE Damage 10%, Max HP/MP 15%, P. Atk. 10%, P. Critical Rate 100, P. Critical Damage 5%, Atk. Spd. 15%, Attack Attribute 150. \n\nEnchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
 		<set name="icon" val="icon.shadow_twohand_sword_1_high" />
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="SWORD" />
-		<set name="bodypart" val="lrhand" />
-		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="R" />
-		<set name="material" val="STEEL" />
+		<set name="bodypart" val="lrhand" />
 		<set name="weight" val="1740" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
+		<skills>
+			<skill id="13838" level="13" /> <!-- Enhanced Shadow Slasher -->
+			<skill id="13847" level="1" /> <!-- PvE Damage Increase 10% -->
+		</skills>
 		<stats>
-			<stat type="pAtk">1013</stat>
-			<stat type="mAtk">363</stat>
-			<stat type="rCrit">8</stat>
-			<stat type="pAtkSpd">325</stat>
+			<stat type="pAtk">1013.0</stat>
+			<stat type="mAtk">363.0</stat>
 			<stat type="randomDamage">10</stat>
-			<stat type="pAtkRange">40</stat>
+			<stat type="pAtkSpd">325.0</stat>
+			<stat type="rCrit">8.0</stat>
 		</stats>
 	</item>
 	<item id="47877" name="Enhanced Shadow Fighter" type="Weapon">
-		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon. When equipped, increases PVE Damage 10%, Max HP/MP 15%, P. Atk. 10%, P. Critical Rate 100, P. Critical Damage 5%, Atk. Spd. 15%, Attack Attribute 150. Enchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
+		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon.\nWhen equipped, increases PVE Damage 10%, Max HP/MP 15%, P. Atk. 10%, P. Critical Rate 100, P. Critical Damage 5%, Atk. Spd. 15%, Attack Attribute 150. \n\nEnchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
 		<set name="icon" val="icon.shadow_fist_1_high" />
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="DUALFIST" />
-		<set name="bodypart" val="lrhand" />
-		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="R" />
-		<set name="material" val="STEEL" />
+		<set name="bodypart" val="lrhand" />
 		<set name="weight" val="1550" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
+		<skills>
+			<skill id="13839" level="13" /> <!-- Enhanced Shadow Fighter -->
+			<skill id="13847" level="1" /> <!-- PvE Damage Increase 10% -->
+		</skills>
 		<stats>
-			<stat type="pAtk">1013</stat>
-			<stat type="mAtk">363</stat>
-			<stat type="rCrit">6</stat>
-			<stat type="accCombat">8</stat>
-			<stat type="pAtkSpd">325</stat>
+			<stat type="pAtk">1013.0</stat>
+			<stat type="mAtk">363.0</stat>
 			<stat type="randomDamage">5</stat>
-			<stat type="pAtkRange">40</stat>
+			<stat type="pAtkSpd">325.0</stat>
+			<stat type="accCombat">8.0</stat>
+			<stat type="rCrit">6.0</stat>
 		</stats>
 	</item>
 	<item id="47878" name="Enhanced Shadow Stormer" type="Weapon">
-		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon. When equipped, increases PVE Damage 10%, Max HP/MP 15%, P. Atk. 10%, P. Critical Rate 100, P. Critical Damage 5%, Atk. Spd. 15%, Attack Attribute 150. Enchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
+		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon.\nWhen equipped, increases PVE Damage 10%, Max HP/MP 15%, P. Atk. 10%, P. Critical Rate 100, P. Critical Damage 5%, Atk. Spd. 15%, Attack Attribute 150. \n\nEnchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
 		<set name="icon" val="icon.shadow_spear_1_high" />
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="POLE" />
-		<set name="bodypart" val="lrhand" />
-		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="R" />
-		<set name="material" val="BRONZE" />
+		<set name="bodypart" val="lrhand" />
 		<set name="weight" val="2010" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
 		<skills>
-			<skill id="3599" level="1" /> <!-- Polearm Multi-attack -->
+			<skill id="13840" level="13" /> <!-- Enhanced Shadow Stormer -->
+			<skill id="13847" level="1" /> <!-- PvE Damage Increase 10% -->
 		</skills>
 		<stats>
-			<stat type="pAtk">833</stat>
-			<stat type="mAtk">363</stat>
-			<stat type="rCrit">8</stat>
-			<stat type="accCombat">-3.75</stat>
-			<stat type="pAtkSpd">325</stat>
+			<stat type="pAtk">833.0</stat>
+			<stat type="mAtk">363.0</stat>
 			<stat type="randomDamage">10</stat>
-			<stat type="pAtkRange">80</stat>
+			<stat type="pAtkSpd">325.0</stat>
+			<stat type="rCrit">8.0</stat>
 		</stats>
 	</item>
 	<item id="47879" name="Enhanced Shadow Thrower" type="Weapon">
-		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon. When equipped, increases PVE Damage 10%, Max HP/MP 15%, P. Atk. 10%, P. Critical Rate 50, P. Critical Damage 10%, Atk. Spd. 15%, Attack Attribute 150. Enchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
+		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon.\nWhen equipped, increases PVE Damage 10%, Max HP/MP 15%, P. Atk. 10%, P. Critical Rate 50, P. Critical Damage 10%, Atk. Spd. 15%, Attack Attribute 150. \n\nEnchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
 		<set name="icon" val="icon.shadow_bow_1_high" />
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="BOW" />
-		<set name="bodypart" val="lrhand" />
-		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="R" />
-		<set name="material" val="STEEL" />
+		<set name="bodypart" val="lrhand" />
 		<set name="weight" val="1520" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
+		<skills>
+			<skill id="13843" level="13" /> <!-- Enhanced Shadow Thrower -->
+			<skill id="13847" level="1" /> <!-- PvE Damage Increase 10% -->
+		</skills>
 		<stats>
-			<stat type="pAtk">1640</stat>
-			<stat type="mAtk">363</stat>
-			<stat type="rCrit">12</stat>
-			<stat type="accCombat">-3.75</stat>
-			<stat type="pAtkSpd">293</stat>
+			<stat type="pAtk">1640.0</stat>
+			<stat type="mAtk">363.0</stat>
 			<stat type="randomDamage">5</stat>
-			<stat type="pAtkRange">500</stat>
+			<stat type="pAtkSpd">293.0</stat>
+			<stat type="rCrit">12.0</stat>
 		</stats>
 	</item>
 	<item id="47880" name="Enhanced Shadow Shooter" type="Weapon">
-		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon. When equipped, increases PVE Damage 10%, Max HP/MP 15%, P. Atk. 10%, P. Critical Rate 50, P. Critical Damage 10%, Atk. Spd. 15%, Attack Attribute 150. Enchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
+		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon.\nWhen equipped, increases PVE Damage 10%, Max HP/MP 15%, P. Atk. 10%, P. Critical Rate 50, P. Critical Damage 10%, Atk. Spd. 15%, Attack Attribute 150. \n\nEnchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
 		<set name="icon" val="icon.shadow_crossbow_1_high" />
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="TWOHANDCROSSBOW" />
-		<set name="bodypart" val="lrhand" />
-		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="R" />
-		<set name="material" val="STEEL" />
+		<set name="bodypart" val="lrhand" />
 		<set name="weight" val="1580" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
+		<skills>
+			<skill id="13844" level="13" /> <!-- Enhanced Shadow Shooter -->
+			<skill id="13847" level="1" /> <!-- PvE Damage Increase 10% -->
+		</skills>
 		<stats>
-			<stat type="pAtk">1476</stat>
-			<stat type="mAtk">363</stat>
-			<stat type="rCrit">12</stat>
-			<stat type="accCombat">-3.75</stat>
-			<stat type="pAtkSpd">325</stat>
+			<stat type="pAtk">1476.0</stat>
+			<stat type="mAtk">363.0</stat>
 			<stat type="randomDamage">5</stat>
-			<stat type="pAtkRange">500</stat>
+			<stat type="pAtkSpd">325.0</stat>
+			<stat type="rCrit">12.0</stat>
 		</stats>
 	</item>
 	<item id="47881" name="Enhanced Shadow Buster" type="Weapon">
-		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon. When equipped, increases PVE Damage 10%, Max HP/MP 15%, P. Atk. 10%, P. Critical Rate 50, P. Critical Damage 10%, Atk. Spd. 15%, Attack Attribute 150. Enchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
+		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon.\nWhen equipped, increases PVE Damage 10%, Max HP/MP 15%, P. Atk. 10%, P. Critical Rate 50, P. Critical Damage 10%, Atk. Spd. 15%, Attack Attribute 150. \n\nEnchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
 		<set name="icon" val="icon.shadow_onehand_magic_sword_1_high" />
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="SWORD" />
-		<set name="bodypart" val="rhand" />
-		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="R" />
-		<set name="material" val="STEEL" />
+		<set name="bodypart" val="rhand" />
 		<set name="weight" val="1520" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
+		<skills>
+			<skill id="13845" level="13" /> <!-- Enhanced Shadow Buster -->
+			<skill id="13847" level="1" /> <!-- PvE Damage Increase 10% -->
+		</skills>
 		<stats>
-			<stat type="pAtk">666</stat>
-			<stat type="mAtk">484</stat>
-			<stat type="rCrit">8</stat>
-			<stat type="pAtkSpd">379</stat>
+			<stat type="pAtk">666.0</stat>
+			<stat type="mAtk">484.0</stat>
 			<stat type="randomDamage">10</stat>
-			<stat type="pAtkRange">40</stat>
+			<stat type="pAtkSpd">379.0</stat>
+			<stat type="rCrit">8.0</stat>
 		</stats>
 	</item>
 	<item id="47882" name="Enhanced Shadow Retributer" type="Weapon">
-		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon. When equipped, increases PVE Damage 10%, Max HP/MP 15%, P./M. Atk. 10%, P./M. Critical Damage 10%, Atk./Magic Spd. 15%, Attack Attribute 150. Enchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
+		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon.\nWhen equipped, increases PVE Damage 10%, Max HP/MP 15%, P./M. Atk. 10%, P./M. Critical Damage 10%, Atk./Magic Spd. 15%, Attack Attribute 150. \n\nEnchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
 		<set name="icon" val="icon.shadow_twohand_magic_blunt_1_high" />
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="BLUNT" />
-		<set name="bodypart" val="lrhand" />
-		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="R" />
-		<set name="material" val="WOOD" />
+		<set name="bodypart" val="lrhand" />
 		<set name="weight" val="1080" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
+		<skills>
+			<skill id="13846" level="13" /> <!-- Enhanced Shadow Retributer -->
+			<skill id="13847" level="1" /> <!-- PvE Damage Increase 10% -->
+		</skills>
 		<stats>
-			<stat type="pAtk">811</stat>
-			<stat type="mAtk">532</stat>
-			<stat type="rCrit">6</stat>
-			<stat type="accCombat">8</stat>
-			<stat type="pAtkSpd">325</stat>
+			<stat type="pAtk">811.0</stat>
+			<stat type="mAtk">532.0</stat>
 			<stat type="randomDamage">20</stat>
-			<stat type="pAtkRange">40</stat>
+			<stat type="pAtkSpd">325.0</stat>
+			<stat type="accCombat">8.0</stat>
+			<stat type="accMagic">8.0</stat>
+			<stat type="rCrit">6.0</stat>
 		</stats>
 	</item>
 	<item id="47883" name="Enhanced Shadow Dualsword" type="Weapon">
-		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon. When equipped, increases PVE Damage 10%, Max HP/MP 15%, P. Atk. 10%, P. Critical Rate 100, P. Critical Damage 5%, Atk. Spd. 15%, Attack Attribute 150. Enchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
+		<!-- Ashen Shadow Revolutionaries Weapon created through research by Shadai, Ishuma, and the Blacksmith of Mammon.\nWhen equipped, increases PVE Damage 10%, Max HP/MP 15%, P. Atk. 10%, P. Critical Rate 100, P. Critical Damage 5%, Atk. Spd. 15%, Attack Attribute 150. \n\nEnchantment, Crystallization, Appearance Modification cannot be used. Special Soul Crystal 1, Augment, Attribute Assignment can be used. -->
 		<set name="icon" val="icon.shadow_dual_sword_1_high" />
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="DUAL" />
-		<set name="bodypart" val="lrhand" />
-		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="R" />
-		<set name="material" val="STEEL" />
+		<set name="bodypart" val="lrhand" />
 		<set name="weight" val="1520" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
+		<skills>
+			<skill id="13841" level="13" /> <!-- Enhanced Shadow Dualsword -->
+			<skill id="13847" level="1" /> <!-- PvE Damage Increase 10% -->
+		</skills>
 		<stats>
-			<stat type="pAtk">1013</stat>
-			<stat type="mAtk">363</stat>
-			<stat type="rCrit">8</stat>
-			<stat type="pAtkSpd">325</stat>
+			<stat type="pAtk">1013.0</stat>
+			<stat type="mAtk">363.0</stat>
 			<stat type="randomDamage">10</stat>
-			<stat type="pAtkRange">40</stat>
+			<stat type="pAtkSpd">325.0</stat>
+			<stat type="rCrit">8.0</stat>
 		</stats>
 	</item>
 	<item id="47884" name="Frenzied Tauti's Fragment" type="EtcItem">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13800-13899.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13800-13899.xml
index 1d5f191fef..b4161d4fef 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13800-13899.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13800-13899.xml
@@ -1039,6 +1039,10 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="HitNumber">
+				<amount>5</amount>
+				<mode>DIFF</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="13841" toLevel="13" name="Shadow Dual Sword">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/21300-21399.xml
index dc1a891d5b..f9b1e8402d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/21300-21399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/21300-21399.xml
@@ -1235,7 +1235,7 @@
 		<!-- Level 9 : Max HP/MP/CP + 510, P. Def. + 971, M. Def. + 552, P. Evasion/M. Evasion + 7, Attribute Resistance + 15, Debuff Resistance + 15%, Received P. Critical Damage - 15%, PVP Damage - 15% when equipped. Can use the Power of Abundance skill. (P. Atk. + 15%, M. Atk. + 15%, Skill Power + 15%, Skill Critical Rate + 15%. Duration 1 minute. Cooldown 10 minutes.). Note: Effect for the Talisman of Abundance does not stack even when 2 or more are equipped. -->
 		<!-- Level 10: HP/MP/CP + 531, P. Def. + 1051, M. Def. + 609, P. Evasion/M. Evasion + 8, Attribute Resistance + 17, Debuff Resistance + 15%, Received P. Critical Damage - 15%, PVP Damage - 15% when equipped. Can use the Power of Abundance skill. (P. Atk. + 16%, M. Atk. + 16%, Skill Power + 16%, Skill Critical Rate + 16%. Duration 1 minute. Cooldown 10 minutes.). Note: Effect for the Talisman of Abundance does not stack even when 2 or more are equipped. -->
 		<!-- Level 11: Max HP/MP/CP + 563, P. Def. + 1184, M. Def. + 706, P. Evasion/M. Evasion + 9, Attribute Resistance + 20, Debuff Resistance + 15%, Received P. Critical Damage - 15%, PVP Damage - 15% when equipped. Can use the Power of Abundance skill. (P. Atk. + 17%, M. Atk. + 17%, Skill Power + 17%, Skill Critical Rate + 17%. Duration 1 minute. Cooldown 10 minutes.). Note: Effect for the Talisman of Abundance does not stack even when 2 or more are equipped. -->
-		<!-- LEvel 12: HP/MP/CP + 591, P. Def. + 1307, M. Def. + 799, P. Evasion/M. Evasion + 10, Attribute Resistance + 25, Debuff Resistance + 15%, Received P. Critical Damage - 15%, PVP Damage - 15% when equipped. Can use the Power of Abundance skill. (P. Atk. + 20%, M. Atk. + 20%, Skill Power + 20%, Skill Critical Rate + 20%. Duration 1 minute. Cooldown 10 minutes.). Note: Effect for the Talisman of Abundance does not stack even when 2 or more are equipped. -->
+		<!-- Level 12: HP/MP/CP + 591, P. Def. + 1307, M. Def. + 799, P. Evasion/M. Evasion + 10, Attribute Resistance + 25, Debuff Resistance + 15%, Received P. Critical Damage - 15%, PVP Damage - 15% when equipped. Can use the Power of Abundance skill. (P. Atk. + 20%, M. Atk. + 20%, Skill Power + 20%, Skill Critical Rate + 20%. Duration 1 minute. Cooldown 10 minutes.). Note: Effect for the Talisman of Abundance does not stack even when 2 or more are equipped. -->
 		<icon>
 			<value level="1">BranchSys2.icon.g_giant_gem</value>
 			<value level="2">BranchSys2.icon.g_giant_gem</value>
@@ -1682,66 +1682,248 @@
 		</effects>
 	</skill>
 	<skill id="21365" toLevel="5" name="Talisman - Hunter">
-		<!-- P. Atk. + 231, M. Atk. + 271, P./M. Evasion + 7, Attribute Resistance + 15, Debuff Resistance + 13%, P./M. Critical Rate + 13%. Received Critical Damage -15%, Received Skill Damage during PVP - 15%. Extra defense against skill damage in PvP. Note: Equipping 2 will give the effect of 1. -->
+		<!-- Updated to Helios -->
 		<!-- The Talisman's effect has increased. -->
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+			<value level="4">4</value>
+			<value level="5">5</value>
+		</abnormalLvl>
+		<abnormalType>TALISMAN_TRIGGER_SPECIAL</abnormalType>
 		<icon>BranchSys2.icon.g_twilight_gem</icon>
-		<magicLvl>55</magicLvl>
-		<operateType>P</operateType>
+		<isTriggeredSkill>true</isTriggeredSkill>
 		<magicCriticalRate>5</magicCriticalRate>
-		<effects>
-			<effect name="MAtk">
-				<amount>271</amount>
+		<magicLvl>85</magicLvl>
+		<operateType>A2</operateType>
+		<effectPoint>1</effectPoint>
+		<rideState>NONE</rideState>
+		<isMagic>1</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitCancelTime>0</hitCancelTime>
+		<abnormalTime>-1</abnormalTime>
+		<pvpEffects>			
+			<effect name="PAtk">
+				<amount>
+					<value level="1">23</value>
+					<value level="2">46</value>
+					<value level="3">69</value>
+					<value level="4">92</value>
+					<value level="5">116</value>
+				</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PAtk">
-				<amount>231</amount>
+			<effect name="MAtk">
+				<amount>
+					<value level="1">27</value>
+					<value level="2">54</value>
+					<value level="3">81</value>
+					<value level="4">108</value>
+					<value level="5">135</value>
+				</amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="PhysicalEvasion">
-				<amount>7</amount>
+				<amount>
+					<value level="1">1</value>
+					<value level="2">1</value>
+					<value level="3">2</value>
+					<value level="4">3</value>
+					<value level="5">3</value>
+				</amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="MagicalEvasion">
-				<amount>7</amount>
+				<amount>
+					<value level="1">1</value>
+					<value level="2">1</value>
+					<value level="3">2</value>
+					<value level="4">3</value>
+					<value level="5">3</value>
+				</amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="DefenceAttribute">
-				<amount>15</amount>
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">6</value>
+				</amount>
 				<attribute>FIRE</attribute>
 			</effect>
 			<effect name="DefenceAttribute">
-				<amount>15</amount>
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">6</value>
+				</amount>
 				<attribute>WATER</attribute>
 			</effect>
 			<effect name="DefenceAttribute">
-				<amount>15</amount>
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">6</value>
+				</amount>
 				<attribute>WIND</attribute>
 			</effect>
 			<effect name="DefenceAttribute">
-				<amount>15</amount>
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">6</value>
+				</amount>
 				<attribute>EARTH</attribute>
 			</effect>
+			<effect name="DefenceAttribute">
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">6</value>
+				</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">6</value>
+				</amount>
+				<attribute>DARK</attribute>
+			</effect>
 			<effect name="ResistAbnormalByCategory">
-				<amount>-13</amount>
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">5</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+				</amount>
 				<slot>DEBUFF</slot>
 			</effect>
 			<effect name="CriticalRate">
-				<amount>13</amount>
+				<amount>
+					<value level="1">1</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">7</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicCriticalRate">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">7</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="DefenceCriticalDamage">
-				<amount>-15</amount>
+				<amount>
+					<value level="1">-1</value>
+					<value level="2">-2.6</value>
+					<value level="3">-3.9</value>
+					<value level="4">-5.2</value>
+					<value level="5">-6.5</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">7</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PvpMagicalSkillDefenceBonus">
-				<amount>-15</amount>
+				<amount>
+					<value level="1">1</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">7</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PvpPhysicalSkillDamageBonus">
-				<amount>-15</amount>
+			<effect name="PvpPhysicalAttackDamageBonus">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">7</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
-		</effects>
+			<effect name="TriggerSkillByAttack">
+				<!-- Talisman - Hunter -->
+				<minDamage>1</minDamage>
+				<skillId>21365</skillId>
+				<skillLevel>2</skillLevel>
+				<chance>50</chance>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+				<targetType>SELF</targetType>
+				<affectScope>SINGLE</affectScope>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<!-- Talisman - Hunter -->
+				<minDamage>1</minDamage>
+				<skillId>21365</skillId>
+				<skillLevel>3</skillLevel>
+				<chance>30</chance>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+				<targetType>SELF</targetType>
+				<affectScope>SINGLE</affectScope>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<!-- Talisman - Hunter -->
+				<minDamage>1</minDamage>
+				<skillId>21365</skillId>
+				<skillLevel>4</skillLevel>
+				<chance>10</chance>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+				<targetType>SELF</targetType>
+				<affectScope>SINGLE</affectScope>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<!-- Talisman - Hunter -->
+				<minDamage>1</minDamage>
+				<skillId>21365</skillId>
+				<skillLevel>5</skillLevel>
+				<chance>5</chance>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+				<targetType>SELF</targetType>
+				<affectScope>SINGLE</affectScope>
+			</effect>
+		</pvpEffects>
 	</skill>
 	<skill id="21366" toLevel="1" name="Wondrous Hunt Dye">
 		<!-- When HP is 90% or above, P. Def. + 20% and Speed + 33 in the Olympiad and the Ceremony of Chaos. -->
@@ -1883,250 +2065,806 @@
 		<effectPoint>1</effectPoint>
 	</skill>
 	<skill id="21370" toLevel="5" name="Talisman - Slaughterer">
+		<!-- Updated to Helios -->
 		<!-- The Talisman's effect has increased. -->
-		<!-- P. Atk. + 231, M. Atk. + 271, P./M. Evasion + 7, Attribute Resistance + 15, Debuff Resistance + 13%, Max HP/MP/CP + 490, HP/MP/CP Recovery Bonus + 7. Note: Equipping 2 will give the effect of 1. -->
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+			<value level="4">4</value>
+			<value level="5">5</value>
+		</abnormalLvl>
+		<abnormalType>TALISMAN_TRIGGER_SPECIAL</abnormalType>
 		<icon>BranchSys2.icon.g_twilight_gem</icon>
-		<magicLvl>55</magicLvl>
-		<operateType>P</operateType>
+		<isTriggeredSkill>true</isTriggeredSkill>
 		<magicCriticalRate>5</magicCriticalRate>
-		<effects>
-			<effect name="MAtk">
-				<amount>271</amount>
-				<mode>DIFF</mode>
-			</effect>
+		<magicLvl>85</magicLvl>
+		<operateType>A2</operateType>
+		<effectPoint>1</effectPoint>
+		<rideState>NONE</rideState>
+		<isMagic>1</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitCancelTime>0</hitCancelTime>
+		<abnormalTime>-1</abnormalTime>
+		<pvpEffects>
 			<effect name="PAtk">
-				<amount>231</amount>
+				<amount>
+					<value level="1">23</value>
+					<value level="2">46</value>
+					<value level="3">69</value>
+					<value level="4">92</value>
+					<value level="5">116</value>
+				</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="DefenceAttribute">
-				<amount>15</amount>
-				<attribute>FIRE</attribute>
-			</effect>
-			<effect name="DefenceAttribute">
-				<amount>15</amount>
-				<attribute>WATER</attribute>
-			</effect>
-			<effect name="DefenceAttribute">
-				<amount>15</amount>
-				<attribute>WIND</attribute>
-			</effect>
-			<effect name="DefenceAttribute">
-				<amount>15</amount>
-				<attribute>EARTH</attribute>
-			</effect>
-			<effect name="ResistAbnormalByCategory">
-				<amount>-13</amount>
-				<slot>DEBUFF</slot>
-			</effect>
-			<effect name="DispelBySlotProbability">
-				<dispel>IMPROVE_HP_MP_UP;MAX_HP_UP;MAX_MP_UP;HP_REGEN_UP</dispel>
-				<rate>100</rate>
-			</effect>
-			<effect name="BlockAbnormalSlot">
-				<slot>IMPROVE_HP_MP_UP;MAX_HP_UP;MAX_MP_UP;HP_REGEN_UP</slot>
-			</effect>
-			<effect name="MaxHp">
-				<amount>490</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MaxCp">
-				<amount>490</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MaxMp">
-				<amount>490</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="HpRegen">
-				<amount>7</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MpRegen">
-				<amount>7</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="CpRegen">
-				<amount>7</amount>
-				<mode>PER</mode>
-			</effect>
-		</effects>
-	</skill>
-	<skill id="21371" toLevel="5" name="Talisman - Conquerer">
-		<!-- The Talisman's effect has increased. -->
-		<!-- P. Atk. + 231, M. Atk. + 271, P./M. Evasion + 7, P./M. Critical Rate + 13%, Max HP/MP/CP + 490, HP/MP/CP Recovery Bonus + 7. Received Critical Damage -15%, Received Skill Damage during PVP - 15%. Note: Equipping 2 will give the effect of 1. -->
-		<icon>BranchSys2.icon.g_twilight_gem</icon>
-		<magicLvl>55</magicLvl>
-		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
-		<effects>
 			<effect name="MAtk">
-				<amount>271</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="PAtk">
-				<amount>231</amount>
+				<amount>
+					<value level="1">27</value>
+					<value level="2">54</value>
+					<value level="3">81</value>
+					<value level="4">108</value>
+					<value level="5">135</value>
+				</amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="PhysicalEvasion">
-				<amount>7</amount>
+				<amount>
+					<value level="1">1</value>
+					<value level="2">1</value>
+					<value level="3">2</value>
+					<value level="4">3</value>
+					<value level="5">3</value>
+				</amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="MagicalEvasion">
-				<amount>7</amount>
+				<amount>
+					<value level="1">1</value>
+					<value level="2">1</value>
+					<value level="3">2</value>
+					<value level="4">3</value>
+					<value level="5">3</value>
+				</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="CriticalRate">
-				<amount>13</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="DispelBySlotProbability">
-				<dispel>IMPROVE_HP_MP_UP;MAX_HP_UP;MAX_MP_UP;HP_REGEN_UP</dispel>
-				<rate>100</rate>
-			</effect>
-			<effect name="BlockAbnormalSlot">
-				<slot>IMPROVE_HP_MP_UP;MAX_HP_UP;MAX_MP_UP;HP_REGEN_UP</slot>
-			</effect>
-			<effect name="MaxHp">
-				<amount>490</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MaxCp">
-				<amount>490</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MaxMp">
-				<amount>490</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="HpRegen">
-				<amount>7</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MpRegen">
-				<amount>7</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="CpRegen">
-				<amount>7</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="DefenceCriticalDamage">
-				<amount>-15</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PvpMagicalSkillDefenceBonus">
-				<amount>-15</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PvpPhysicalSkillDamageBonus">
-				<amount>-15</amount>
-				<mode>PER</mode>
-			</effect>
-		</effects>
-	</skill>
-	<skill id="21372" toLevel="5" name="Talisman - Outlaw">
-		<!-- The Talisman's effect has increased. -->
-		<!-- Attribute Resistance + 15, Debuff Resistance + 13%, P./M. Critical Rate + 13%, Max HP/MP/CP + 490, HP/MP/CP Recovery Bonus + 7. Received Critical Damage -15%, Received Skill Damage during PVP - 15%. Note: Equipping 2 will give the effect of 1. -->
-		<icon>BranchSys2.icon.g_twilight_gem</icon>
-		<magicLvl>55</magicLvl>
-		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
-		<effects>
 			<effect name="DefenceAttribute">
-				<amount>15</amount>
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">6</value>
+				</amount>
 				<attribute>FIRE</attribute>
 			</effect>
 			<effect name="DefenceAttribute">
-				<amount>15</amount>
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">6</value>
+				</amount>
 				<attribute>WATER</attribute>
 			</effect>
 			<effect name="DefenceAttribute">
-				<amount>15</amount>
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">6</value>
+				</amount>
 				<attribute>WIND</attribute>
 			</effect>
 			<effect name="DefenceAttribute">
-				<amount>15</amount>
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">6</value>
+				</amount>
 				<attribute>EARTH</attribute>
 			</effect>
+			<effect name="DefenceAttribute">
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">6</value>
+				</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">6</value>
+				</amount>
+				<attribute>DARK</attribute>
+			</effect>
 			<effect name="ResistAbnormalByCategory">
-				<amount>-13</amount>
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">5</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+				</amount>
 				<slot>DEBUFF</slot>
 			</effect>
-			<effect name="CriticalRate">
-				<amount>13</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="DispelBySlotProbability">
-				<dispel>IMPROVE_HP_MP_UP;MAX_HP_UP;MAX_MP_UP;HP_REGEN_UP</dispel>
-				<rate>100</rate>
-			</effect>
-			<effect name="BlockAbnormalSlot">
-				<slot>IMPROVE_HP_MP_UP;MAX_HP_UP;MAX_MP_UP;HP_REGEN_UP</slot>
-			</effect>
 			<effect name="MaxHp">
-				<amount>490</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MaxCp">
-				<amount>490</amount>
+				<amount>
+					<value level="1">40</value>
+					<value level="2">80</value>
+					<value level="3">120</value>
+					<value level="4">160</value>
+					<value level="5">200</value>
+				</amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="MaxMp">
-				<amount>490</amount>
+				<amount>
+					<value level="1">40</value>
+					<value level="2">80</value>
+					<value level="3">120</value>
+					<value level="4">160</value>
+					<value level="5">200</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MaxCp">
+				<amount>
+					<value level="1">40</value>
+					<value level="2">80</value>
+					<value level="3">120</value>
+					<value level="4">160</value>
+					<value level="5">200</value>
+				</amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="HpRegen">
-				<amount>7</amount>
-				<mode>PER</mode>
+				<amount>
+					<value level="1">0.7</value>
+					<value level="2">1.4</value>
+					<value level="3">2.1</value>
+					<value level="4">2.8</value>
+					<value level="5">3.5</value>
+				</amount>
+				<mode>DIFF</mode>
 			</effect>
 			<effect name="MpRegen">
-				<amount>7</amount>
-				<mode>PER</mode>
+				<amount>
+					<value level="1">0.7</value>
+					<value level="2">1.4</value>
+					<value level="3">2.1</value>
+					<value level="4">2.8</value>
+					<value level="5">3.5</value>
+				</amount>
+				<mode>DIFF</mode>
 			</effect>
 			<effect name="CpRegen">
-				<amount>7</amount>
+				<amount>
+					<value level="1">0.7</value>
+					<value level="2">1.4</value>
+					<value level="3">2.1</value>
+					<value level="4">2.8</value>
+					<value level="5">3.5</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<!-- Talisman - Hunter -->
+				<minDamage>1</minDamage>
+				<skillId>21370</skillId>
+				<skillLevel>2</skillLevel>
+				<chance>50</chance>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+				<targetType>SELF</targetType>
+				<affectScope>SINGLE</affectScope>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<!-- Talisman - Hunter -->
+				<minDamage>1</minDamage>
+				<skillId>21370</skillId>
+				<skillLevel>3</skillLevel>
+				<chance>30</chance>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+				<targetType>SELF</targetType>
+				<affectScope>SINGLE</affectScope>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<!-- Talisman - Hunter -->
+				<minDamage>1</minDamage>
+				<skillId>21370</skillId>
+				<skillLevel>4</skillLevel>
+				<chance>10</chance>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+				<targetType>SELF</targetType>
+				<affectScope>SINGLE</affectScope>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<!-- Talisman - Hunter -->
+				<minDamage>1</minDamage>
+				<skillId>21370</skillId>
+				<skillLevel>5</skillLevel>
+				<chance>5</chance>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+				<targetType>SELF</targetType>
+				<affectScope>SINGLE</affectScope>
+			</effect>
+		</pvpEffects>
+	</skill>
+	<skill id="21371" toLevel="5" name="Talisman - Conquerer">
+		<!-- Updated to Helios -->
+		<!-- The Talisman's effect has increased. -->
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+			<value level="4">4</value>
+			<value level="5">5</value>
+		</abnormalLvl>
+		<abnormalType>TALISMAN_TRIGGER_SPECIAL</abnormalType> <!-- TODO: find retail value -->
+		<icon>BranchSys2.icon.g_twilight_gem</icon>
+		<isTriggeredSkill>true</isTriggeredSkill>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLvl>85</magicLvl>
+		<operateType>A2</operateType>
+		<effectPoint>1</effectPoint>
+		<rideState>NONE</rideState>
+		<isMagic>1</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitCancelTime>0</hitCancelTime>
+		<abnormalTime>-1</abnormalTime>
+		<pvpEffects>
+			<effect name="PAtk">
+				<amount>
+					<value level="1">23</value>
+					<value level="2">46</value>
+					<value level="3">69</value>
+					<value level="4">92</value>
+					<value level="5">116</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>
+					<value level="1">27</value>
+					<value level="2">54</value>
+					<value level="3">81</value>
+					<value level="4">108</value>
+					<value level="5">135</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="PhysicalEvasion">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">1</value>
+					<value level="3">2</value>
+					<value level="4">3</value>
+					<value level="5">3</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicalEvasion">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">1</value>
+					<value level="3">2</value>
+					<value level="4">3</value>
+					<value level="5">3</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="CriticalRate">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">7</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="MagicCriticalRate">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">7</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxHp">
+				<amount>
+					<value level="1">40</value>
+					<value level="2">80</value>
+					<value level="3">120</value>
+					<value level="4">160</value>
+					<value level="5">200</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MaxMp">
+				<amount>
+					<value level="1">40</value>
+					<value level="2">80</value>
+					<value level="3">120</value>
+					<value level="4">160</value>
+					<value level="5">200</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MaxCp">
+				<amount>
+					<value level="1">40</value>
+					<value level="2">80</value>
+					<value level="3">120</value>
+					<value level="4">160</value>
+					<value level="5">200</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="HpRegen">
+				<amount>
+					<value level="1">0.7</value>
+					<value level="2">1.4</value>
+					<value level="3">2.1</value>
+					<value level="4">2.8</value>
+					<value level="5">3.5</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MpRegen">
+				<amount>
+					<value level="1">0.7</value>
+					<value level="2">1.4</value>
+					<value level="3">2.1</value>
+					<value level="4">2.8</value>
+					<value level="5">3.5</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="CpRegen">
+				<amount>
+					<value level="1">0.7</value>
+					<value level="2">1.4</value>
+					<value level="3">2.1</value>
+					<value level="4">2.8</value>
+					<value level="5">3.5</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
 			<effect name="DefenceCriticalDamage">
-				<amount>-15</amount>
+				<amount>
+					<value level="1">-1.3</value>
+					<value level="2">-2.6</value>
+					<value level="3">-3.9</value>
+					<value level="4">-5.2</value>
+					<value level="5">-6.5</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">7</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PvpMagicalSkillDefenceBonus">
-				<amount>-15</amount>
+				<amount>
+					<value level="1">1</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">7</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PvpPhysicalSkillDamageBonus">
-				<amount>-15</amount>
+			<effect name="TriggerSkillByAttack">
+				<!-- Talisman - Hunter -->
+				<minDamage>1</minDamage>
+				<skillId>21371</skillId>
+				<skillLevel>2</skillLevel>
+				<chance>50</chance>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+				<targetType>SELF</targetType>
+				<affectScope>SINGLE</affectScope>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<!-- Talisman - Hunter -->
+				<minDamage>1</minDamage>
+				<skillId>21371</skillId>
+				<skillLevel>3</skillLevel>
+				<chance>30</chance>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+				<targetType>SELF</targetType>
+				<affectScope>SINGLE</affectScope>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<!-- Talisman - Hunter -->
+				<minDamage>1</minDamage>
+				<skillId>21371</skillId>
+				<skillLevel>4</skillLevel>
+				<chance>10</chance>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+				<targetType>SELF</targetType>
+				<affectScope>SINGLE</affectScope>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<!-- Talisman - Hunter -->
+				<minDamage>1</minDamage>
+				<skillId>21371</skillId>
+				<skillLevel>5</skillLevel>
+				<chance>5</chance>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+				<targetType>SELF</targetType>
+				<affectScope>SINGLE</affectScope>
+			</effect>
+		</pvpEffects>
+	</skill>
+	<skill id="21372" toLevel="5" name="Talisman - Outlaw">
+		<!-- Updated to Helios -->
+		<!-- The Talisman's effect has increased. -->
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+			<value level="4">4</value>
+			<value level="5">5</value>
+		</abnormalLvl>
+		<abnormalType>TALISMAN_TRIGGER_SPECIAL</abnormalType> <!-- TODO: find retail value -->
+		<icon>BranchSys2.icon.g_twilight_gem</icon>
+		<isTriggeredSkill>true</isTriggeredSkill>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLvl>85</magicLvl>
+		<operateType>A2</operateType>
+		<effectPoint>1</effectPoint>
+		<rideState>NONE</rideState>
+		<isMagic>1</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitCancelTime>0</hitCancelTime>
+		<abnormalTime>-1</abnormalTime>
+		<pvpEffects>
+			<effect name="DefenceAttribute">
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">6</value>
+				</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">6</value>
+				</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">6</value>
+				</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">6</value>
+				</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">6</value>
+				</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">6</value>
+				</amount>
+				<attribute>DARK</attribute>
+			</effect>
+			<effect name="ResistAbnormalByCategory">
+				<amount>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">5</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+				</amount>
+				<slot>DEBUFF</slot>
+			</effect>
+			<effect name="CriticalRate">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">7</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="MagicCriticalRate">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">7</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxHp">
+				<amount>
+					<value level="1">40</value>
+					<value level="2">80</value>
+					<value level="3">120</value>
+					<value level="4">160</value>
+					<value level="5">200</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MaxMp">
+				<amount>
+					<value level="1">40</value>
+					<value level="2">80</value>
+					<value level="3">120</value>
+					<value level="4">160</value>
+					<value level="5">200</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MaxCp">
+				<amount>
+					<value level="1">40</value>
+					<value level="2">80</value>
+					<value level="3">120</value>
+					<value level="4">160</value>
+					<value level="5">200</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="HpRegen">
+				<amount>
+					<value level="1">0.7</value>
+					<value level="2">1.4</value>
+					<value level="3">2.1</value>
+					<value level="4">2.8</value>
+					<value level="5">3.5</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MpRegen">
+				<amount>
+					<value level="1">0.7</value>
+					<value level="2">1.4</value>
+					<value level="3">2.1</value>
+					<value level="4">2.8</value>
+					<value level="5">3.5</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="CpRegen">
+				<amount>
+					<value level="1">0.7</value>
+					<value level="2">1.4</value>
+					<value level="3">2.1</value>
+					<value level="4">2.8</value>
+					<value level="5">3.5</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="DefenceCriticalDamage">
+				<amount>
+					<value level="1">-1.3</value>
+					<value level="2">-2.6</value>
+					<value level="3">-3.9</value>
+					<value level="4">-5.2</value>
+					<value level="5">-6.5</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">7</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+					<value level="5">7</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<!-- Talisman - Hunter -->
+				<minDamage>1</minDamage>
+				<skillId>21372</skillId>
+				<skillLevel>2</skillLevel>
+				<chance>50</chance>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+				<targetType>SELF</targetType>
+				<affectScope>SINGLE</affectScope>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<!-- Talisman - Hunter -->
+				<minDamage>1</minDamage>
+				<skillId>21372</skillId>
+				<skillLevel>3</skillLevel>
+				<chance>30</chance>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+				<targetType>SELF</targetType>
+				<affectScope>SINGLE</affectScope>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<!-- Talisman - Hunter -->
+				<minDamage>1</minDamage>
+				<skillId>21372</skillId>
+				<skillLevel>4</skillLevel>
+				<chance>10</chance>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+				<targetType>SELF</targetType>
+				<affectScope>SINGLE</affectScope>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<!-- Talisman - Hunter -->
+				<minDamage>1</minDamage>
+				<skillId>21372</skillId>
+				<skillLevel>5</skillLevel>
+				<chance>5</chance>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+				<targetType>SELF</targetType>
+				<affectScope>SINGLE</affectScope>
+			</effect>
+		</pvpEffects>
+	</skill>
+	<skill id="21373" toLevel="1" name="Unequip Talisman - Hunter">
+		<!-- Updated to Helios -->
+		<!-- The Talisman's power fades. -->
+		<icon>BranchSys2.icon.g_twilight_gem</icon>
+		<operateType>A1</operateType>
+		<effectPoint>1</effectPoint>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLvl>99</magicLvl>
+		<trait>HOLD</trait>
+		<isMagic>2</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DispelBySlot">
+				<dispel>TALISMAN_TRIGGER_SPECIAL,-1</dispel>
+			</effect>
 		</effects>
 	</skill>
-	<skill id="21373" toLevel="1" name="Unequip Talisman - Hunter">
-		<!-- The Talisman's power fades. -->
-		<icon>BranchSys2.icon.g_twilight_gem</icon>
-		<operateType>P</operateType>
-		<effectPoint>1</effectPoint>
-	</skill>
 	<skill id="21374" toLevel="1" name="Unequip Talisman - Slaughterer">
-		<!-- AUTO GENERATED SKILL -->
+		<!-- Updated to Helios -->
 		<!-- The Talisman's power fades. -->
 		<icon>BranchSys2.icon.g_twilight_gem</icon>
 		<operateType>A1</operateType>
 		<effectPoint>1</effectPoint>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLvl>99</magicLvl>
+		<trait>HOLD</trait>
+		<isMagic>2</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DispelBySlot">
+				<dispel>TALISMAN_TRIGGER_SPECIAL,-1</dispel>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="21375" toLevel="1" name="Unequip Talisman - Conquerer">
-		<!-- AUTO GENERATED SKILL -->
+		<!-- Updated to Helios -->
 		<!-- The Talisman's power fades. -->
 		<icon>BranchSys2.icon.g_twilight_gem</icon>
 		<operateType>A1</operateType>
 		<effectPoint>1</effectPoint>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLvl>99</magicLvl>
+		<trait>HOLD</trait>
+		<isMagic>2</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DispelBySlot">
+				<dispel>TALISMAN_TRIGGER_SPECIAL,-1</dispel>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="21376" toLevel="1" name="Unequip Talisman - Outlaw">
-		<!-- AUTO GENERATED SKILL -->
+		<!-- Updated to Helios -->
 		<!-- The Talisman's power fades. -->
 		<icon>BranchSys2.icon.g_twilight_gem</icon>
 		<operateType>A1</operateType>
 		<effectPoint>1</effectPoint>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLvl>99</magicLvl>
+		<trait>HOLD</trait>
+		<isMagic>2</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DispelBySlot">
+				<dispel>TALISMAN_TRIGGER_SPECIAL,-1</dispel>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="21377" toLevel="3" name="Adenian Tattoo: Protection">
 		<!-- Active Skill: P./ M. Def. + 5%, Max HP/CP + 200. Lasts 1 min. Cooldown is 1 hr. Can be used in the Olympiad. -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
index d15e7e80b2..3c47a311bf 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -225,6 +225,7 @@ public enum AbnormalType
 	SYNERGY_TIR(-1),
 	SYNERGY_WYNN(-1),
 	SYNERGY_YR(-1),
+	TALISMAN_TRIGGER_SPECIAL(-1),
 	TIME_BOMB(-1),
 	TURN_CRYSTAL(-1),
 	VAMPIRIC_ATTACK_SPECIAL(-1),