From f2a1a43ad9572afee37b1e8571e1d1189f231bdc Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 26 Jun 2017 20:23:06 +0000
Subject: [PATCH] All elemental, reflect shirt's. Contributed by tbr.

---
 .../game/data/stats/items/23200-23299.xml     |  6 ++
 .../game/data/stats/items/23300-23399.xml     | 22 ++++++++
 .../game/data/stats/items/37700-37799.xml     | 30 +++++++---
 .../game/data/stats/items/46100-46199.xml     | 26 ++++++---
 .../game/data/stats/skills/13500-13599.xml    | 56 +++++++++++++++++--
 .../game/data/stats/skills/18400-18499.xml    | 11 ++--
 .../game/data/stats/items/23200-23299.xml     |  6 ++
 .../game/data/stats/items/23300-23399.xml     | 22 ++++++++
 .../game/data/stats/items/37700-37799.xml     | 30 +++++++---
 .../game/data/stats/items/46100-46199.xml     | 26 ++++++---
 .../game/data/stats/skills/13500-13599.xml    | 56 +++++++++++++++++--
 .../game/data/stats/skills/18400-18499.xml    | 11 ++--
 12 files changed, 252 insertions(+), 50 deletions(-)

diff --git a/L2J_Mobius_Helios/dist/game/data/stats/items/23200-23299.xml b/L2J_Mobius_Helios/dist/game/data/stats/items/23200-23299.xml
index d695708477..a74bc022e8 100644
--- a/L2J_Mobius_Helios/dist/game/data/stats/items/23200-23299.xml
+++ b/L2J_Mobius_Helios/dist/game/data/stats/items/23200-23299.xml
@@ -762,6 +762,12 @@
 		<set name="equip_reuse_delay" val="30" />
 		<set name="immediate_effect" val="true" />
 		<set name="weight" val="130" />
+		<skills>
+			<skill id="9367" level="1" type="ON_ENCHANT" type_value="7" />
+			<skill id="9367" level="1" type="ON_ENCHANT" type_value="8" />
+			<skill id="9367" level="2" type="ON_ENCHANT" type_value="9" />
+			<skill id="9367" level="2" type="ON_ENCHANT" type_value="10" />
+		</skills>
 		<stats>
 			<stat type="pDef">28</stat>
 		</stats>
diff --git a/L2J_Mobius_Helios/dist/game/data/stats/items/23300-23399.xml b/L2J_Mobius_Helios/dist/game/data/stats/items/23300-23399.xml
index 9eff324bdb..29e35a6b07 100644
--- a/L2J_Mobius_Helios/dist/game/data/stats/items/23300-23399.xml
+++ b/L2J_Mobius_Helios/dist/game/data/stats/items/23300-23399.xml
@@ -35,6 +35,16 @@
 		<set name="equip_reuse_delay" val="30" />
 		<set name="immediate_effect" val="true" />
 		<set name="weight" val="130" />
+		<skills>
+			<skill id="9371" level="1" type="ON_ENCHANT" type_value="7" />
+			<skill id="9371" level="1" type="ON_ENCHANT" type_value="8" />
+			<skill id="9371" level="1" type="ON_ENCHANT" type_value="9" />
+			<skill id="9371" level="1" type="ON_ENCHANT" type_value="10" />
+			<skill id="9373" level="1" type="ON_ENCHANT" type_value="7" />
+			<skill id="9373" level="1" type="ON_ENCHANT" type_value="8" />
+			<skill id="9373" level="2" type="ON_ENCHANT" type_value="9" />
+			<skill id="9373" level="2" type="ON_ENCHANT" type_value="10" />
+		</skills>
 		<stats>
 			<stat type="pDef">28</stat>
 		</stats>
@@ -91,6 +101,12 @@
 		<set name="equip_reuse_delay" val="30" />
 		<set name="immediate_effect" val="true" />
 		<set name="weight" val="130" />
+		<skills>
+			<skill id="9365" level="1" type="ON_ENCHANT" type_value="7" />
+			<skill id="9365" level="1" type="ON_ENCHANT" type_value="8" />
+			<skill id="9365" level="2" type="ON_ENCHANT" type_value="9" />
+			<skill id="9365" level="2" type="ON_ENCHANT" type_value="10" />
+		</skills>
 		<stats>
 			<stat type="pDef">28</stat>
 		</stats>
@@ -147,6 +163,12 @@
 		<set name="equip_reuse_delay" val="30" />
 		<set name="immediate_effect" val="true" />
 		<set name="weight" val="130" />
+		<skills>
+			<skill id="9369" level="1" type="ON_ENCHANT" type_value="7" />
+			<skill id="9369" level="1" type="ON_ENCHANT" type_value="8" />
+			<skill id="9369" level="2" type="ON_ENCHANT" type_value="9" />
+			<skill id="9369" level="2" type="ON_ENCHANT" type_value="10" />
+		</skills>
 		<stats>
 			<stat type="pDef">28</stat>
 		</stats>
diff --git a/L2J_Mobius_Helios/dist/game/data/stats/items/37700-37799.xml b/L2J_Mobius_Helios/dist/game/data/stats/items/37700-37799.xml
index 64464154c4..14db2b778e 100644
--- a/L2J_Mobius_Helios/dist/game/data/stats/items/37700-37799.xml
+++ b/L2J_Mobius_Helios/dist/game/data/stats/items/37700-37799.xml
@@ -233,7 +233,6 @@
 		<set name="bodypart" val="deco1" />
 		<set name="useSkillDisTime" val="6" />
 		<set name="equip_reuse_delay" val="30" />
-		<set name="duration" val="600" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
@@ -255,7 +254,6 @@
 		<set name="bodypart" val="deco1" />
 		<set name="useSkillDisTime" val="6" />
 		<set name="equip_reuse_delay" val="30" />
-		<set name="duration" val="600" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
@@ -283,7 +281,6 @@
 		<set name="bodypart" val="deco1" />
 		<set name="useSkillDisTime" val="6" />
 		<set name="equip_reuse_delay" val="30" />
-		<set name="duration" val="600" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
@@ -302,20 +299,34 @@
 		<!-- Sparkly magic shirt containing Einhasad's energy. It can be enchanted up to +10 using Enchant Scroll: Elemental Shirt. When enchanted to +4 or more, passive and stats are increased. When enchanted to +6 or more, various use skills are bestowed. -->
 		<set name="icon" val="icon.ainhasard_shirt" />
 		<set name="default_action" val="EQUIP" />
+		<set name="bodypart" val="underwear" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_tradable" val="false" />
-		<set name="bodypart" val="underwear" />
-		<set name="enchant_enabled" val="8" />
-		<set name="immediate_effect" val="true" />
-		<set name="equip_reuse_delay" val="30" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="commissionItemType" val="UNDERWEAR" />
 		<set name="is_private_storeable" val="false" />
+		<set name="enchant_enabled" val="8" />
 		<set name="weight" val="130" />
+		<skills>
+			<skill id="13563" level="1" type="ON_ENCHANT" type_value="6" />
+			<skill id="13563" level="2" type="ON_ENCHANT" type_value="7" />
+			<skill id="13563" level="3" type="ON_ENCHANT" type_value="8" />
+			<skill id="13563" level="4" type="ON_ENCHANT" type_value="9" />
+			<skill id="13563" level="5" type="ON_ENCHANT" type_value="10" />
+			<skill id="13564" level="1" type="ON_ENCHANT" type_value="7" />
+			<skill id="13564" level="2" type="ON_ENCHANT" type_value="8" />
+			<skill id="13564" level="3" type="ON_ENCHANT" type_value="9" /> 
+			<skill id="13564" level="4" type="ON_ENCHANT" type_value="10" /> 
+			<skill id="13565" level="1" type="ON_ENCHANT" type_value="8" /> 
+			<skill id="13565" level="2" type="ON_ENCHANT" type_value="9" /> 
+			<skill id="13565" level="3" type="ON_ENCHANT" type_value="10" /> 
+			<skill id="13566" level="1" type="ON_ENCHANT" type_value="9" /> 
+			<skill id="13566" level="2" type="ON_ENCHANT" type_value="10" />
+			<skill id="13567" level="1" type="ON_ENCHANT" type_value="10" />  
+		</skills>
 		<stats>
 			<stat type="pDef">28</stat>
 		</stats>
@@ -840,6 +851,9 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="weight" val="220" />
+		<skills>
+			<skill id="13771" level="1" />
+		</skills>
 		<stats>
 			<stat type="pDef">50</stat>
 			<stat type="mDef">40</stat>
diff --git a/L2J_Mobius_Helios/dist/game/data/stats/items/46100-46199.xml b/L2J_Mobius_Helios/dist/game/data/stats/items/46100-46199.xml
index 89d84bfef7..75923c9df5 100644
--- a/L2J_Mobius_Helios/dist/game/data/stats/items/46100-46199.xml
+++ b/L2J_Mobius_Helios/dist/game/data/stats/items/46100-46199.xml
@@ -1012,10 +1012,7 @@
 		<!-- Magic shirt for P. Def. Can be enchanted to +10 using Elemental Shirt Enchant Scrolls. When enchanted to +4 or more, passive and stats are increased. When enchanted to +5 or more, a P. Def. effect is given. -->
 		<set name="icon" val="icon.reflect_attack_shirt" />
 		<set name="default_action" val="EQUIP" />
-		<set name="enchant_enabled" val="8" />
-		<set name="equip_reuse_delay" val="30" />
 		<set name="bodypart" val="underwear" />
-		<set name="immediate_effect" val="true" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
@@ -1023,9 +1020,17 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="commissionItemType" val="UNDERWEAR" />
 		<set name="is_private_storeable" val="false" />
+		<set name="enchant_enabled" val="8" />
 		<set name="weight" val="130" />
+		<skills>
+			<skill id="18444" level="1" type="ON_ENCHANT" type_value="5" />
+			<skill id="18444" level="2" type="ON_ENCHANT" type_value="6" />
+			<skill id="18444" level="3" type="ON_ENCHANT" type_value="7" />
+			<skill id="18444" level="4" type="ON_ENCHANT" type_value="8" />
+			<skill id="18444" level="5" type="ON_ENCHANT" type_value="9" />
+			<skill id="18444" level="6" type="ON_ENCHANT" type_value="10" />
+		</skills>
 		<stats>
 			<stat type="pDef">28</stat>
 		</stats>
@@ -1035,9 +1040,6 @@
 		<set name="icon" val="icon.reflect_magic_shirt" />
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="underwear" />
-		<set name="enchant_enabled" val="8" />
-		<set name="immediate_effect" val="true" />
-		<set name="equip_reuse_delay" val="30" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
@@ -1045,9 +1047,17 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="commissionItemType" val="UNDERWEAR" />
 		<set name="is_private_storeable" val="false" />
+		<set name="enchant_enabled" val="8" />
 		<set name="weight" val="130" />
+		<skills>
+			<skill id="18445" level="1" type="ON_ENCHANT" type_value="5" />
+			<skill id="18445" level="2" type="ON_ENCHANT" type_value="6" />
+			<skill id="18445" level="3" type="ON_ENCHANT" type_value="7" />
+			<skill id="18445" level="4" type="ON_ENCHANT" type_value="8" />
+			<skill id="18445" level="5" type="ON_ENCHANT" type_value="9" />
+			<skill id="18445" level="6" type="ON_ENCHANT" type_value="10" />
+		</skills>
 		<stats>
 			<stat type="pDef">28</stat>
 		</stats>
diff --git a/L2J_Mobius_Helios/dist/game/data/stats/skills/13500-13599.xml b/L2J_Mobius_Helios/dist/game/data/stats/skills/13500-13599.xml
index 6ce4da2971..831776cbc1 100644
--- a/L2J_Mobius_Helios/dist/game/data/stats/skills/13500-13599.xml
+++ b/L2J_Mobius_Helios/dist/game/data/stats/skills/13500-13599.xml
@@ -743,8 +743,7 @@
 					<value level="10">5</value>
 				</amount>
 				<chance>30</chance>
-				<mode>PER</mode>
-			</effect>
+				</effect>
 			<effect name="MagicMpCost">
 				<amount>
 					<value level="1">0</value>
@@ -1012,11 +1011,50 @@
 		</effects>
 	</skill>
 	<skill id="13568" toLevel="1" name="Talisman Energy">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases resistance for all weapons by 3. When equipped with a weapon that has an attribute, the attack attribute increases + 50. -->
 		<icon>icon.r85_talisman_pa_up_passive</icon>
 		<operateType>P</operateType>
-		<isMagic>3</isMagic>
+		<magicLvl>3</magicLvl>
+		<operateType>P</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<effects>
+		<effect name="AttackAttribute">
+				<amount>50</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>50</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>50</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>50</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>50</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>50</amount>
+				<attribute>DARK</attribute>
+			</effect>
+		<effect name="DefenceTrait">
+				<BLUNT>3</BLUNT>
+				<SWORD>3</SWORD>
+				<DUAL>3</DUAL>
+				<ANCIENTSWORD>3</ANCIENTSWORD>
+				<DAGGER>3</DAGGER>
+				<RAPIER>3</RAPIER>
+				<DUALFIST>3</DUALFIST>
+				<DUALDAGGER>3</DUALDAGGER>
+				<BOW>3</BOW>
+				<CROSSBOW>3</CROSSBOW>
+			</effect>
+			</effects>
 	</skill>
 	<skill id="13569" toLevel="3" name="Talisman - Lilith">
 		<!-- Increase M. Def. + 552, MP recovery + 3, dark resistance + 10, and damage reflect resistance + 6. -->
@@ -1062,7 +1100,7 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="DamageShield">
+			<effect name="DamageShieldResist">
 				<amount>
 					<value level="1">6</value>
 					<value level="2">6</value>
@@ -1110,6 +1148,14 @@
 				</amount>
 				<attribute>HOLY</attribute>
 			</effect>
+			<effect name="DefenceAttribute">
+				<amount>
+					<value level="1">10</value>
+					<value level="2">10</value>
+					<value level="3">10</value>
+				</amount>
+				<attribute>DARK</attribute>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="13570" toLevel="1" name="Hero's Weapon: Dagger">
diff --git a/L2J_Mobius_Helios/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_Helios/dist/game/data/stats/skills/18400-18499.xml
index 768025a0cc..8a327b2f7d 100644
--- a/L2J_Mobius_Helios/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_Helios/dist/game/data/stats/skills/18400-18499.xml
@@ -230,7 +230,7 @@
 		<icon>icon.reflect_attack_shirt</icon>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="DefenceCriticalDamage">
+			<effect name="DefenceMagicCriticalDamage">
 				<amount>
 					<value level="2">8</value>
 					<value level="3">12</value>
@@ -249,7 +249,7 @@
 				</amount>
 				<type>PHYSICAL</type>
 			</effect>
-			<effect name="MagicalDefence">
+			<effect name="PhysicalDefence">
 				<amount>
 					<value level="1">5</value>
 					<value level="2">6</value>
@@ -453,8 +453,11 @@
 				<amount>
 					<value level="4">1</value>
 					<value level="5">2</value>
-					<value fromLevel="6" toLevel="7">3</value>
-					<value fromLevel="8" toLevel="10">4</value>
+					<value level="6">3</value>
+					<value level="7">3</value>
+					<value level="8">4</value>
+					<value level="9">4</value>
+					<value level="10">4</value>
 				</amount>
 				<stat>STR</stat>
 			</effect>
diff --git a/L2J_Mobius_Underground/dist/game/data/stats/items/23200-23299.xml b/L2J_Mobius_Underground/dist/game/data/stats/items/23200-23299.xml
index dd62d083d4..4a07cf1fc5 100644
--- a/L2J_Mobius_Underground/dist/game/data/stats/items/23200-23299.xml
+++ b/L2J_Mobius_Underground/dist/game/data/stats/items/23200-23299.xml
@@ -762,6 +762,12 @@
 		<set name="equip_reuse_delay" val="30" />
 		<set name="immediate_effect" val="true" />
 		<set name="weight" val="130" />
+		<skills>
+			<skill id="9367" level="1" type="ON_ENCHANT" type_value="7" />
+			<skill id="9367" level="1" type="ON_ENCHANT" type_value="8" />
+			<skill id="9367" level="2" type="ON_ENCHANT" type_value="9" />
+			<skill id="9367" level="2" type="ON_ENCHANT" type_value="10" />
+		</skills>
 		<stats>
 			<stat type="pDef">28</stat>
 		</stats>
diff --git a/L2J_Mobius_Underground/dist/game/data/stats/items/23300-23399.xml b/L2J_Mobius_Underground/dist/game/data/stats/items/23300-23399.xml
index 05023b3d0c..d5f566f6d1 100644
--- a/L2J_Mobius_Underground/dist/game/data/stats/items/23300-23399.xml
+++ b/L2J_Mobius_Underground/dist/game/data/stats/items/23300-23399.xml
@@ -35,6 +35,16 @@
 		<set name="equip_reuse_delay" val="30" />
 		<set name="immediate_effect" val="true" />
 		<set name="weight" val="130" />
+		<skills>
+			<skill id="9371" level="1" type="ON_ENCHANT" type_value="7" />
+			<skill id="9371" level="1" type="ON_ENCHANT" type_value="8" />
+			<skill id="9371" level="1" type="ON_ENCHANT" type_value="9" />
+			<skill id="9371" level="1" type="ON_ENCHANT" type_value="10" />
+			<skill id="9373" level="1" type="ON_ENCHANT" type_value="7" />
+			<skill id="9373" level="1" type="ON_ENCHANT" type_value="8" />
+			<skill id="9373" level="2" type="ON_ENCHANT" type_value="9" />
+			<skill id="9373" level="2" type="ON_ENCHANT" type_value="10" />
+		</skills>
 		<stats>
 			<stat type="pDef">28</stat>
 		</stats>
@@ -91,6 +101,12 @@
 		<set name="equip_reuse_delay" val="30" />
 		<set name="immediate_effect" val="true" />
 		<set name="weight" val="130" />
+		<skills>
+			<skill id="9365" level="1" type="ON_ENCHANT" type_value="7" />
+			<skill id="9365" level="1" type="ON_ENCHANT" type_value="8" />
+			<skill id="9365" level="2" type="ON_ENCHANT" type_value="9" />
+			<skill id="9365" level="2" type="ON_ENCHANT" type_value="10" />
+		</skills>
 		<stats>
 			<stat type="pDef">28</stat>
 		</stats>
@@ -147,6 +163,12 @@
 		<set name="equip_reuse_delay" val="30" />
 		<set name="immediate_effect" val="true" />
 		<set name="weight" val="130" />
+		<skills>
+			<skill id="9369" level="1" type="ON_ENCHANT" type_value="7" />
+			<skill id="9369" level="1" type="ON_ENCHANT" type_value="8" />
+			<skill id="9369" level="2" type="ON_ENCHANT" type_value="9" />
+			<skill id="9369" level="2" type="ON_ENCHANT" type_value="10" />
+		</skills>
 		<stats>
 			<stat type="pDef">28</stat>
 		</stats>
diff --git a/L2J_Mobius_Underground/dist/game/data/stats/items/37700-37799.xml b/L2J_Mobius_Underground/dist/game/data/stats/items/37700-37799.xml
index 211d8130e6..e24a870bce 100644
--- a/L2J_Mobius_Underground/dist/game/data/stats/items/37700-37799.xml
+++ b/L2J_Mobius_Underground/dist/game/data/stats/items/37700-37799.xml
@@ -233,7 +233,6 @@
 		<set name="bodypart" val="deco1" />
 		<set name="useSkillDisTime" val="6" />
 		<set name="equip_reuse_delay" val="30" />
-		<set name="duration" val="600" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
@@ -255,7 +254,6 @@
 		<set name="bodypart" val="deco1" />
 		<set name="useSkillDisTime" val="6" />
 		<set name="equip_reuse_delay" val="30" />
-		<set name="duration" val="600" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
@@ -283,7 +281,6 @@
 		<set name="bodypart" val="deco1" />
 		<set name="useSkillDisTime" val="6" />
 		<set name="equip_reuse_delay" val="30" />
-		<set name="duration" val="600" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
@@ -302,20 +299,34 @@
 		<!-- Sparkly magic shirt containing Einhasad's energy. It can be enchanted up to +10 using Enchant Scroll: Elemental Shirt. When enchanted to +4 or more, passive and stats are increased. When enchanted to +6 or more, various use skills are bestowed. -->
 		<set name="icon" val="icon.ainhasard_shirt" />
 		<set name="default_action" val="EQUIP" />
+		<set name="bodypart" val="underwear" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_tradable" val="false" />
-		<set name="bodypart" val="underwear" />
-		<set name="enchant_enabled" val="8" />
-		<set name="immediate_effect" val="true" />
-		<set name="equip_reuse_delay" val="30" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="commissionItemType" val="UNDERWEAR" />
 		<set name="is_private_storeable" val="false" />
+		<set name="enchant_enabled" val="8" />
 		<set name="weight" val="130" />
+		<skills>
+			<skill id="13563" level="1" type="ON_ENCHANT" type_value="6" />
+			<skill id="13563" level="2" type="ON_ENCHANT" type_value="7" />
+			<skill id="13563" level="3" type="ON_ENCHANT" type_value="8" />
+			<skill id="13563" level="4" type="ON_ENCHANT" type_value="9" />
+			<skill id="13563" level="5" type="ON_ENCHANT" type_value="10" />
+			<skill id="13564" level="1" type="ON_ENCHANT" type_value="7" />
+			<skill id="13564" level="2" type="ON_ENCHANT" type_value="8" />
+			<skill id="13564" level="3" type="ON_ENCHANT" type_value="9" /> 
+			<skill id="13564" level="4" type="ON_ENCHANT" type_value="10" /> 
+			<skill id="13565" level="1" type="ON_ENCHANT" type_value="8" /> 
+			<skill id="13565" level="2" type="ON_ENCHANT" type_value="9" /> 
+			<skill id="13565" level="3" type="ON_ENCHANT" type_value="10" /> 
+			<skill id="13566" level="1" type="ON_ENCHANT" type_value="9" /> 
+			<skill id="13566" level="2" type="ON_ENCHANT" type_value="10" />
+			<skill id="13567" level="1" type="ON_ENCHANT" type_value="10" />  
+		</skills>
 		<stats>
 			<stat type="pDef">28</stat>
 		</stats>
@@ -840,6 +851,9 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="weight" val="220" />
+		<skills>
+			<skill id="13771" level="1" />
+		</skills>
 		<stats>
 			<stat type="pDef">50</stat>
 			<stat type="mDef">40</stat>
diff --git a/L2J_Mobius_Underground/dist/game/data/stats/items/46100-46199.xml b/L2J_Mobius_Underground/dist/game/data/stats/items/46100-46199.xml
index e1452692cc..4052abb7e3 100644
--- a/L2J_Mobius_Underground/dist/game/data/stats/items/46100-46199.xml
+++ b/L2J_Mobius_Underground/dist/game/data/stats/items/46100-46199.xml
@@ -1012,10 +1012,7 @@
 		<!-- Magic shirt for P. Def. Can be enchanted to +10 using Elemental Shirt Enchant Scrolls. When enchanted to +4 or more, passive and stats are increased. When enchanted to +5 or more, a P. Def. effect is given. -->
 		<set name="icon" val="icon.reflect_attack_shirt" />
 		<set name="default_action" val="EQUIP" />
-		<set name="enchant_enabled" val="8" />
-		<set name="equip_reuse_delay" val="30" />
 		<set name="bodypart" val="underwear" />
-		<set name="immediate_effect" val="true" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
@@ -1023,9 +1020,17 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="commissionItemType" val="UNDERWEAR" />
 		<set name="is_private_storeable" val="false" />
+		<set name="enchant_enabled" val="8" />
 		<set name="weight" val="130" />
+		<skills>
+			<skill id="18444" level="1" type="ON_ENCHANT" type_value="5" />
+			<skill id="18444" level="2" type="ON_ENCHANT" type_value="6" />
+			<skill id="18444" level="3" type="ON_ENCHANT" type_value="7" />
+			<skill id="18444" level="4" type="ON_ENCHANT" type_value="8" />
+			<skill id="18444" level="5" type="ON_ENCHANT" type_value="9" />
+			<skill id="18444" level="6" type="ON_ENCHANT" type_value="10" />
+		</skills>
 		<stats>
 			<stat type="pDef">28</stat>
 		</stats>
@@ -1035,9 +1040,6 @@
 		<set name="icon" val="icon.reflect_magic_shirt" />
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="underwear" />
-		<set name="enchant_enabled" val="8" />
-		<set name="immediate_effect" val="true" />
-		<set name="equip_reuse_delay" val="30" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
@@ -1045,9 +1047,17 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
-		<set name="commissionItemType" val="UNDERWEAR" />
 		<set name="is_private_storeable" val="false" />
+		<set name="enchant_enabled" val="8" />
 		<set name="weight" val="130" />
+		<skills>
+			<skill id="18445" level="1" type="ON_ENCHANT" type_value="5" />
+			<skill id="18445" level="2" type="ON_ENCHANT" type_value="6" />
+			<skill id="18445" level="3" type="ON_ENCHANT" type_value="7" />
+			<skill id="18445" level="4" type="ON_ENCHANT" type_value="8" />
+			<skill id="18445" level="5" type="ON_ENCHANT" type_value="9" />
+			<skill id="18445" level="6" type="ON_ENCHANT" type_value="10" />
+		</skills>
 		<stats>
 			<stat type="pDef">28</stat>
 		</stats>
diff --git a/L2J_Mobius_Underground/dist/game/data/stats/skills/13500-13599.xml b/L2J_Mobius_Underground/dist/game/data/stats/skills/13500-13599.xml
index 6ce4da2971..831776cbc1 100644
--- a/L2J_Mobius_Underground/dist/game/data/stats/skills/13500-13599.xml
+++ b/L2J_Mobius_Underground/dist/game/data/stats/skills/13500-13599.xml
@@ -743,8 +743,7 @@
 					<value level="10">5</value>
 				</amount>
 				<chance>30</chance>
-				<mode>PER</mode>
-			</effect>
+				</effect>
 			<effect name="MagicMpCost">
 				<amount>
 					<value level="1">0</value>
@@ -1012,11 +1011,50 @@
 		</effects>
 	</skill>
 	<skill id="13568" toLevel="1" name="Talisman Energy">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases resistance for all weapons by 3. When equipped with a weapon that has an attribute, the attack attribute increases + 50. -->
 		<icon>icon.r85_talisman_pa_up_passive</icon>
 		<operateType>P</operateType>
-		<isMagic>3</isMagic>
+		<magicLvl>3</magicLvl>
+		<operateType>P</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<effects>
+		<effect name="AttackAttribute">
+				<amount>50</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>50</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>50</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>50</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>50</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>50</amount>
+				<attribute>DARK</attribute>
+			</effect>
+		<effect name="DefenceTrait">
+				<BLUNT>3</BLUNT>
+				<SWORD>3</SWORD>
+				<DUAL>3</DUAL>
+				<ANCIENTSWORD>3</ANCIENTSWORD>
+				<DAGGER>3</DAGGER>
+				<RAPIER>3</RAPIER>
+				<DUALFIST>3</DUALFIST>
+				<DUALDAGGER>3</DUALDAGGER>
+				<BOW>3</BOW>
+				<CROSSBOW>3</CROSSBOW>
+			</effect>
+			</effects>
 	</skill>
 	<skill id="13569" toLevel="3" name="Talisman - Lilith">
 		<!-- Increase M. Def. + 552, MP recovery + 3, dark resistance + 10, and damage reflect resistance + 6. -->
@@ -1062,7 +1100,7 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="DamageShield">
+			<effect name="DamageShieldResist">
 				<amount>
 					<value level="1">6</value>
 					<value level="2">6</value>
@@ -1110,6 +1148,14 @@
 				</amount>
 				<attribute>HOLY</attribute>
 			</effect>
+			<effect name="DefenceAttribute">
+				<amount>
+					<value level="1">10</value>
+					<value level="2">10</value>
+					<value level="3">10</value>
+				</amount>
+				<attribute>DARK</attribute>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="13570" toLevel="1" name="Hero's Weapon: Dagger">
diff --git a/L2J_Mobius_Underground/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_Underground/dist/game/data/stats/skills/18400-18499.xml
index 768025a0cc..8a327b2f7d 100644
--- a/L2J_Mobius_Underground/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_Underground/dist/game/data/stats/skills/18400-18499.xml
@@ -230,7 +230,7 @@
 		<icon>icon.reflect_attack_shirt</icon>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="DefenceCriticalDamage">
+			<effect name="DefenceMagicCriticalDamage">
 				<amount>
 					<value level="2">8</value>
 					<value level="3">12</value>
@@ -249,7 +249,7 @@
 				</amount>
 				<type>PHYSICAL</type>
 			</effect>
-			<effect name="MagicalDefence">
+			<effect name="PhysicalDefence">
 				<amount>
 					<value level="1">5</value>
 					<value level="2">6</value>
@@ -453,8 +453,11 @@
 				<amount>
 					<value level="4">1</value>
 					<value level="5">2</value>
-					<value fromLevel="6" toLevel="7">3</value>
-					<value fromLevel="8" toLevel="10">4</value>
+					<value level="6">3</value>
+					<value level="7">3</value>
+					<value level="8">4</value>
+					<value level="9">4</value>
+					<value level="10">4</value>
 				</amount>
 				<stat>STR</stat>
 			</effect>