From 1aaf04b61c486bf12c30cbee59991920bce42de5 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 18 Oct 2017 04:46:16 +0000
Subject: [PATCH] Various skill fixes. Contributed by gamelike85.

---
 .../game/data/stats/skills/10200-10299.xml    |  23 +-
 .../game/data/stats/skills/10300-10399.xml    |  81 ++++-
 .../game/data/stats/skills/13300-13399.xml    | 307 ++++++++++++++++--
 .../game/data/stats/skills/17700-17799.xml    |   3 -
 .../game/data/stats/skills/10200-10299.xml    |  25 +-
 .../game/data/stats/skills/10300-10399.xml    |  84 ++++-
 .../game/data/stats/skills/13300-13399.xml    | 307 ++++++++++++++++--
 .../game/data/stats/skills/17700-17799.xml    |   3 -
 .../data/skillTrees/4rthClass/TyrrMaestro.xml |   4 +
 .../dist/game/data/stats/npcs/15200-15299.xml | 104 ++++++
 .../game/data/stats/skills/10200-10299.xml    |  25 +-
 .../game/data/stats/skills/10300-10399.xml    | 129 +++++++-
 .../game/data/stats/skills/13300-13399.xml    | 307 ++++++++++++++++--
 .../game/data/stats/skills/17700-17799.xml    |   3 -
 14 files changed, 1236 insertions(+), 169 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml
index 37f41d0421..4147702a2f 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml
@@ -534,7 +534,6 @@
 	<skill id="10256" toLevel="10" name="Superior HP Mastery">
 		<!-- Glory Days confirmed -->
 		<!-- Max HP + 606, Max CP + 296, HP Recovery Bonus + 12, MP Recovery Bonus + 6. When HP falls below 60%, P. Atk. + 1027. STR + 2. When receiving damage, has a chance of recovering 10% of Max HP. -->
-		<!-- TODO: Find trigger for When receiving damage, has a chance of recovering 10% of Max HP. -->
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>
@@ -554,7 +553,7 @@
 			<effect name="PAtk">
 				<amount>
 					<value level="1">1027</value>
-					<value level="2">1027</value>
+					<value level="2">1191</value>
 					<value level="3">1381</value>
 					<value level="4">1554</value>
 					<value level="5">1761</value>
@@ -569,7 +568,7 @@
 			<effect name="MaxCp">
 				<amount>
 					<value level="1">296</value>
-					<value level="2">296</value>
+					<value level="2">353</value>
 					<value level="3">411</value>
 					<value level="4">489</value>
 					<value level="5">533</value>
@@ -592,7 +591,7 @@
 			<effect name="MaxHp">
 				<amount>
 					<value level="1">606</value>
-					<value level="2">606</value>
+					<value level="2">724</value>
 					<value level="3">843</value>
 					<value level="4">1002</value>
 					<value level="5">1092</value>
@@ -604,10 +603,24 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="HpRegen">
+			<effect name="MpRegen">
 				<amount>6</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="TriggerSkillByDamage">
+				<!-- Self Heal (Warrior) - Recovers 10% of Max HP. -->
+				<attackerType>L2Character</attackerType>
+				<minAttackerLevel>1</minAttackerLevel>
+				<maxAttackerLevel>107</maxAttackerLevel>
+				<minDamage>1</minDamage>
+				<chance>20</chance>
+				<targetType>SELF</targetType>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>true</allowNormalAttack>
+				<allowWeapons>ALL</allowWeapons>
+				<skillId>10323</skillId>
+				<skillLevel>1</skillLevel>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="10257" toLevel="1" name="Superior Spirit Mastery">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10300-10399.xml
index e8d0bbdd87..ce72f7bbc0 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10300-10399.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10300-10399.xml
@@ -414,11 +414,10 @@
 		</effects>
 	</skill>
 	<skill id="10310" toLevel="1" name="Primal Rage">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 10 min., P. Atk. + 15%. Requires a sword, blunt, spear, fist weapon, dual blunt, or dual sword. -->
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>600</abnormalTime>
-		<!-- TODO abnormalType -->
+		<abnormalType>PA_UP</abnormalType>
 		<icon>icon.skill10310</icon>
 		<operateType>A2</operateType>
 		<targetType>SELF</targetType>
@@ -794,11 +793,11 @@
 		</effects>
 	</skill>
 	<skill id="10319" toLevel="3" name="Duelist's Fury">
-		<!-- TODO: AbnormalType -->
 		<!-- PvP Damage + 20%, Speed + 66, Debuff Resistance + 90%. -->
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>30</abnormalTime>
 		<abnormalVisualEffect>DUELING</abnormalVisualEffect>
+		<abnormalType>DUELIST_SPIRIT</abnormalType>
 		<magicLvl>
 			<value level="1">90</value>
 			<value level="2">95</value>
@@ -993,19 +992,46 @@
 		</effects>
 	</skill>
 	<skill id="10323" toLevel="1" name="Self Heal (Warrior)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Recovers 10% of Max HP. -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 		<mpConsume>1</mpConsume>
 		<effectPoint>100</effectPoint>
 		<reuseDelay>5000</reuseDelay>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HealPercent">
+				<power>10</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="10324" toLevel="3" name="Momentum Master">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Power of skills that consume Momentum increase by 10%. -->
 		<icon>icon.skill10324</icon>
 		<operateType>P</operateType>
+		<conditions>
+			<condition name="OpCheckSkill">
+				<skillId>261</skillId>
+				<skillId>10258</skillId>
+				<skillId>10260</skillId>
+				<skillId>10262</skillId>
+				<skillId>10265</skillId>
+				<skillId>10269</skillId>
+				<skillId>10318</skillId>
+				<affectType>CASTER</affectType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="PhysicalSkillPower">
+				<amount>
+					<value level="1">10</value>
+					<value level="2">15</value>
+					<value level="3">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="10325" toLevel="6" name="Dreadful Roar">
 		<!-- Cancels at least one buff of nearby enemies. Consumes 10 Soulstones. -->
@@ -1040,10 +1066,9 @@
 		<reuseDelay>120000</reuseDelay>
 		<effects>
 			<effect name="DispelByCategory">
-				<!-- TODO rate -->
 				<slot>BUFF</slot>
-				<rate>25
-					<value fromLevel="1" toLevel="6">80</value>
+				<rate>
+					<value fromLevel="1" toLevel="6">70</value>
 					<value fromLevel="2" toLevel="6" fromSubLevel="1001" toSubLevel="1030">{base + base / 100 * subIndex}</value>
 				</rate>
 				<max>2</max>
@@ -1051,9 +1076,13 @@
 		</effects>
 	</skill>
 	<skill id="10326" toLevel="3" name="Bloody Fury">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 30 sec., P. Atk. + 450, Skill Power + 5%, and HP Recovery is limited to 70%. -->
 		<icon>icon.skill10326</icon>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+		</abnormalLvl>
 		<operateType>A2</operateType>
 		<mpConsume>
 			<value level="1">45</value>
@@ -1065,6 +1094,19 @@
 		<effectPoint>673</effectPoint>
 		<abnormalTime>30</abnormalTime>
 		<reuseDelay>180000</reuseDelay>
+		<effects>
+			<effect name="PAtk">
+				<amount>450</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="PhysicalSkillPower">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="ManaHealPercent">
+				<power>70</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="10327" toLevel="7" name="Momentum Flash">
 		<!-- Attacks target with 17348 Power added to P. Atk. Requires a sword/dagger/blunt weapon/fist weapon. Damage increases when using Momentum, which you can use up to 3. Over-hit. Critical. -->
@@ -1306,6 +1348,7 @@
 			<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1010">{base + subIndex}</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1011" toSubLevel="1030">{base + 10 + 0.5 * subIndex}</value>
 		</abnormalTime>
+		<abnormalType>SUPER_AVOID</abnormalType>
 		<abnormalVisualEffect>LONG_BLOW</abnormalVisualEffect>
 		<icon>icon.skill10332</icon>
 		<itemConsumeCount>5</itemConsumeCount>
@@ -1345,13 +1388,13 @@
 	</skill>
 	<skill id="10333" toLevel="1" name="Winged Spear">
 		<!-- Increases P. Atk. by 30% for 60 seconds when a spear is equipped. Range of regular skills increases by 80 and has a 10% chance to Stun when striking. Consumes 5 Soulstones. -->
-		<!-- TODO abnormalType -->
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>
 			<value fromLevel="1" toLevel="1">60</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1010">{base + subIndex}</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1011" toSubLevel="1030">{base + 10 + 0.5 * subIndex}</value>
 		</abnormalTime>
+		<abnormalType>SUPER_AVOID</abnormalType>
 		<abnormalVisualEffect>LONG_BLOW</abnormalVisualEffect>
 		<icon>icon.skill10333</icon>
 		<itemConsumeCount>5</itemConsumeCount>
@@ -1420,13 +1463,13 @@
 	</skill>
 	<skill id="10334" toLevel="1" name="Furious Slasher">
 		<!-- Increases P. Atk. by 30% for 60 seconds when a two-handed sword/two-handed blunt weapon is equipped. Attack 5 enemies at the same time with a regular attack. Consumes 5 Soulstones. -->
-		<!-- TODO abnormalType -->
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>
 			<value fromLevel="1" toLevel="1">60</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1010">{base + subIndex}</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1011" toSubLevel="1030">{base + 10 + 0.5 * subIndex}</value>
 		</abnormalTime>
+		<abnormalType>SUPER_AVOID</abnormalType>		
 		<abnormalVisualEffect>WIDE_SWORD</abnormalVisualEffect>
 		<icon>icon.skill10334</icon>
 		<itemConsumeCount>5</itemConsumeCount>
@@ -1468,7 +1511,7 @@
 	</skill>
 	<skill id="10335" toLevel="1" name="Furious Fist">
 		<!-- Increases P. Atk. by 30% and P. Critical Damage by 10% for 60 seconds when a fist weapon is equipped. Has 10% chance to decrease Fist Weapon Resistance by 30% when striking. Consumes 5 Soulstones. -->
-		<!-- TODO abnormalType -->
+		<abnormalType>SUPER_AVOID</abnormalType>
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>
 			<value fromLevel="1" toLevel="1">60</value>
@@ -1606,7 +1649,6 @@
 		</effects>
 	</skill>
 	<skill id="10340" toLevel="3" name="Blade Slasher">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Attacks enemies in front with 16214 Power added to P. Atk. If the target is stunned, attacks with 48641 power. Can be used while a sword or blunt weapon is equipped. Consumes 1 Soulstone. -->
 		<icon>
 			<value level="1">icon.skill10340</value>
@@ -1619,10 +1661,23 @@
 			<value level="2">236</value>
 			<value level="3">239</value>
 		</mpConsume>
+		<magicLvl>85</magicLvl>
 		<castRange>40</castRange>
 		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<effectPoint>-125</effectPoint>
 		<reuseDelay>10000</reuseDelay>
+		<effects>
+			<effect name="PhysicalAttack">
+				<power>
+					<value level="1">16214</value>
+					<value level="2">17094</value>
+					<value level="3">17959</value>
+				</power>
+				<overHit>true</overHit>				
+				<criticalChance>15</criticalChance>
+				<pDefMod>0.7</pDefMod>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/13300-13399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/13300-13399.xml
index 6c08d74acf..5b0321f4ba 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/13300-13399.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/13300-13399.xml
@@ -792,71 +792,126 @@
 		</effects>
 	</skill>
 	<skill id="13329" toLevel="1" name="Bestow Fire Weapon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow fire damage by 300. -->
 		<icon>icon.skill4009</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="AttackAttribute">
+				<amount>300</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13330" toLevel="1" name="Bestow Water Weapon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow water damage by 300. -->
 		<icon>icon.skill4010</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="AttackAttribute">
+				<amount>300</amount>
+				<attribute>WATER</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13331" toLevel="1" name="Bestow Wind Weapon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow wind damage by 300. -->
 		<icon>icon.skill4011</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="AttackAttribute">
+				<amount>300</amount>
+				<attribute>WIND</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13332" toLevel="1" name="Bestow Earth Weapon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow earth damage by 300. -->
 		<icon>icon.skill4012</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="AttackAttribute">
+				<amount>300</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13333" toLevel="1" name="Bestow Holy Weapon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow holy damage by 300. -->
 		<icon>icon.skill4337</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="AttackAttribute">
+				<amount>300</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13334" toLevel="1" name="Bestow Darkness Weapon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow darkness damage by 300. -->
 		<icon>icon.skill4333</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="AttackAttribute">
+				<amount>300</amount>
+				<attribute>DARK</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13335" toLevel="1" name="Bestow Fire/Wind/Darkness Armor">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow Fire/Wind/Dark Resistance by 120. -->
 		<icon>icon.skill4337</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="DefenceAttribute">
+				<amount>120</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>120</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>120</amount>
+				<attribute>DARK</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13336" toLevel="1" name="Bestow Water/Earth/Holy Armor">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow Water/Earth/Holy Resistance by 120. -->
 		<icon>icon.skill4333</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="DefenceAttribute">
+				<amount>120</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>120</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>120</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13337" toLevel="1" name="Talisman (R-grade) - M. Def. (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 10 seconds, increases M. Def. + 50% through the power of the talisman. -->
 		<icon>icon.r_talisman_mm_up_active</icon>
 		<operateType>A2</operateType>
@@ -875,9 +930,14 @@
 		<reuseDelay>120000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="MagicalDefence">
+				<amount>50</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13338" toLevel="1" name="Talisman (R-grade) - Ranged P. Def. (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 10 seconds, increases Bow/Crossbow Resistance + 80% through the power of Talisman. -->
 		<icon>icon.r85_sp_talisman_ad_ex_passive</icon>
 		<operateType>A2</operateType>
@@ -896,6 +956,12 @@
 		<reuseDelay>120000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<BOW>80</BOW>
+				<CROSSBOW>80</CROSSBOW>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13339" toLevel="3" name="Enchant Heavy Armor Set + 6 (R-grade)">
 		<!-- Set item is enchanted. P. Def. + 93, and MP Recovery Bonus + 32 when standing/ sitting. -->
@@ -1271,7 +1337,6 @@
 		</conditions>
 	</skill>
 	<skill id="13349" toLevel="1" name="Talisman (R-grade) - Damage Reflect Resistance (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 30 seconds, increases Damage Reflect Resistance by 10 through the power of the talisman. -->
 		<icon>icon.r85_talisman_md_up_passive</icon>
 		<operateType>A2</operateType>
@@ -1290,9 +1355,14 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DamageShieldResist">
+				<amount>10</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13350" toLevel="1" name="Talisman (R-grade) - Lethal Strike Resistance (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 15 seconds, increases lethal strike resistance by 30 through the power of the talisman. -->
 		<icon>icon.r85_talisman_md_up_passive</icon>
 		<operateType>A2</operateType>
@@ -1311,6 +1381,11 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="InstantKillResist">
+				<amount>90</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13351" toLevel="1" name="Notifier">
 		<!-- AUTO GENERATED SKILL -->
@@ -1413,15 +1488,19 @@
 		</effects>
 	</skill>
 	<skill id="13356" toLevel="1" name="Player Commendation - Talisman - M. Atk.">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases M. Atk. by 37 when equipped. -->
 		<icon>icon.r85_talisman_ma_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="MagicalAttack">
+				<amount>37</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13357" toLevel="1" name="Player Commendation - Talisman - P. Atk. (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases P. Atk. by 111 momentarily through the power of the talisman. -->
 		<icon>icon.r85_talisman_pa_up_active</icon>
 		<operateType>A2</operateType>
@@ -1440,17 +1519,27 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PhysicalAttack">
+				<amount>111</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13358" toLevel="1" name="Player Commendation - Talisman - P. Atk.">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases P. Atk by 37 when equipped. -->
 		<icon>icon.r85_talisman_pa_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="PhysicalAttack">
+				<amount>37</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13359" toLevel="1" name="Player Commendation - Talisman - P. Def. (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases P. Def. by 114 momentarily through the power of the talisman. -->
 		<icon>icon.r85_talisman_pd_up_active</icon>
 		<operateType>A2</operateType>
@@ -1469,17 +1558,27 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PhysicalDefence">
+				<amount>114</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13360" toLevel="1" name="Player Commendation - Talisman - P. Def.">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases P. Def. by 38 when equipped. -->
 		<icon>icon.r85_talisman_pd_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="PhysicalDefence">
+				<amount>38</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13361" toLevel="1" name="Player Commendation - Talisman - Max CP (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Max CP by 297 momentarily through the power of the talisman. -->
 		<icon>icon.r85_talisman_cp_up_active</icon>
 		<operateType>A2</operateType>
@@ -1498,17 +1597,27 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="MaxCp">
+				<amount>279</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13362" toLevel="1" name="Player Commendation - Talisman - Max CP">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Max CP by 99 when equipped. -->
 		<icon>icon.r85_talisman_cp_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="MaxCp">
+				<amount>99</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13363" toLevel="1" name="Player Commendation - Talisman - Max HP (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Max HP by 657 momentarily through the power of the talisman. -->
 		<icon>icon.r85_talisman_hp_up_active</icon>
 		<operateType>A2</operateType>
@@ -1527,17 +1636,27 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="MaxHp">
+				<amount>657</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13364" toLevel="1" name="Player Commendation - Talisman - Max HP">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Max HP by 219 when equipped. -->
 		<icon>icon.r85_talisman_hp_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="MaxHp">
+				<amount>219</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13365" toLevel="1" name="Player Commendation - Talisman - Max MP (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Max MP by 327 momentarily through the power of the talisman. -->
 		<icon>icon.r85_talisman_mp_up_active</icon>
 		<operateType>A2</operateType>
@@ -1556,17 +1675,27 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="MaxMp">
+				<amount>327</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13366" toLevel="1" name="Player Commendation - Talisman - Max MP">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Max MP by 119 when equipped. -->
 		<icon>icon.r85_talisman_mp_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="MaxMp">
+				<amount>119</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13367" toLevel="1" name="Talisman (R-grade) - Half-kill/Lethal Strike Resistance (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Momentarily increases Half-kill/Lethal Strike Resistance by 30 through the power of the talisman. -->
 		<icon>icon.r85_talisman_md_up_passive</icon>
 		<operateType>A2</operateType>
@@ -1585,62 +1714,150 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="InstantKillResist">
+				<amount>30</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13368" toLevel="1" name="Talisman (R-grade) - Half-kill/Lethal Strike Resistance">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Half-kill/Lethal Strike Resistance by 10 when a talisman is equipped. -->
 		<icon>icon.r85_talisman_md_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="InstantKillResist">
+				<amount>10</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13369" toLevel="1" name="Squash Ring (Warrior)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases P. Critical attack power by 15% and P. Accuracy by 2. -->
 		<icon>icon.accessory_ring_of_gourd_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>75</magicLvl>
+		<effects>
+			<effect name="CriticalDamage">
+				<amount>15</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Accuracy">
+				<amount>2</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13370" toLevel="1" name="Squash Ring (Wizard)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases M. Critical Rate by 2% and M. Accuracy by 2. -->
 		<icon>icon.accessory_ring_of_gourd_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>75</magicLvl>
+		<effects>
+			<effect name="MagicCriticalRate">
+				<amount>2</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicAccuracy">
+				<amount>2</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13371" toLevel="1" name="Squash Earring (Warrior)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases P. Atk. Spd. by 4%. and Speed by 5. -->
 		<icon>icon.accessory_earring_of_gourd_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>75</magicLvl>
+		<effects>
+			<effect name="PhysicalAttackSpeed">
+				<amount>4</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Speed">
+				<amount>5</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13372" toLevel="1" name="Squash Earring (Wizard)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Casting Spd. by 4% and Speed by 5. -->
 		<icon>icon.accessory_earring_of_gourd_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>75</magicLvl>
+		<effects>
+			<effect name="MagicalAttackSpeed">
+				<amount>4</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Speed">
+				<amount>5</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13373" toLevel="1" name="Squash Necklace">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Sleep/Paralysis/Stun/Poison/Bleed resistance and attack rate by 20%. Decreases skill Cooldown by 5% and skill MP Consumption by 5%. -->
 		<icon>icon.accessory_necklace_of_gourd_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>75</magicLvl>
+		<effects>
+			<effect name="DefenceTrait">
+				<BLEED>20</BLEED>
+				<SHOCK>20</SHOCK>
+				<POISON>20</POISON>
+				<PARALYZE>20</PARALYZE>
+				<SLEEP>20</SLEEP>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>3</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>3</magicType>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13374" toLevel="1" name="Circlet of Earthquake">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Earth resistance by 60. -->
 		<icon>icon.armor_leather_helmet_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="DefenceAttribute">
+				<amount>60</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13375" toLevel="1" name="Release Agathion's Seal - XP Bottle">
 		<!-- AUTO GENERATED SKILL -->
@@ -2053,35 +2270,55 @@
 		</effects>
 	</skill>
 	<skill id="13396" toLevel="1" name="Rabbit Ears: STR">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- STR + 1 -->
 		<icon>icon.accessory_rabbit_ear_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>1</magicLvl>
+		<effects>		
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>STR</stat>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13397" toLevel="1" name="Rabbit Ears: DEX">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- DEX + 1 -->
 		<icon>icon.accessory_rabbit_ear_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>1</magicLvl>
+		<effects>		
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>DEX</stat>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13398" toLevel="1" name="Rabbit Ears: WIT">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- WIT + 1 -->
 		<icon>icon.accessory_rabbit_ear_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>1</magicLvl>
+		<effects>		
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>WIT</stat>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13399" toLevel="1" name="Rabbit Ears: INT">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- INT + 1 -->
 		<icon>icon.accessory_rabbit_ear_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>1</magicLvl>
+		<effects>		
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>INT</stat>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17700-17799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17700-17799.xml
index 286a5d3262..d7905add1e 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17700-17799.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17700-17799.xml
@@ -25,9 +25,6 @@
 		<reuseDelay>30000</reuseDelay>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
-		<targetConditions>
-			<condition name="OpCheckFlag" />
-		</targetConditions>
 		<effects>
 			<effect name="BlockSkill">
 				<magicTypes>1;3</magicTypes>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml
index a0f3ac1a89..0704039dd1 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml
@@ -534,7 +534,6 @@
 	<skill id="10256" toLevel="10" name="Superior HP Mastery">
 		<!-- Glory Days confirmed -->
 		<!-- Max HP + 606, Max CP + 296, HP Recovery Bonus + 12, MP Recovery Bonus + 6. When HP falls below 60%, P. Atk. + 1027. STR + 2. When receiving damage, has a chance of recovering 10% of Max HP. -->
-		<!-- TODO: Find trigger for When receiving damage, has a chance of recovering 10% of Max HP. -->
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>
@@ -554,7 +553,7 @@
 			<effect name="PAtk">
 				<amount>
 					<value level="1">1027</value>
-					<value level="2">1027</value>
+					<value level="2">1191</value>
 					<value level="3">1381</value>
 					<value level="4">1554</value>
 					<value level="5">1761</value>
@@ -569,7 +568,7 @@
 			<effect name="MaxCp">
 				<amount>
 					<value level="1">296</value>
-					<value level="2">296</value>
+					<value level="2">353</value>
 					<value level="3">411</value>
 					<value level="4">489</value>
 					<value level="5">533</value>
@@ -592,7 +591,7 @@
 			<effect name="MaxHp">
 				<amount>
 					<value level="1">606</value>
-					<value level="2">606</value>
+					<value level="2">724</value>
 					<value level="3">843</value>
 					<value level="4">1002</value>
 					<value level="5">1092</value>
@@ -604,13 +603,27 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="HpRegen">
+			<effect name="MpRegen">
 				<amount>6</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="TriggerSkillByDamage">
+				<!-- Self Heal (Warrior) - Recovers 10% of Max HP. -->
+				<attackerType>L2Character</attackerType>
+				<minAttackerLevel>1</minAttackerLevel>
+				<maxAttackerLevel>107</maxAttackerLevel>
+				<minDamage>1</minDamage>
+				<chance>20</chance>
+				<targetType>SELF</targetType>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>true</allowNormalAttack>
+				<allowWeapons>ALL</allowWeapons>
+				<skillId>10323</skillId>
+				<skillLevel>1</skillLevel>
+			</effect>
 		</effects>
 	</skill>
-	<skill id="10257" toLevel="1" name="Self Heal (Warrior)">
+	<skill id="10257" toLevel="1" name="Superior Spirit Mastery">
 		<!-- Glory Days confirmed -->
 		<!-- STR + 2 and Hold/Sleep/Bleed/Mind/Poison Resistance + 30. -->
 		<operateType>P</operateType>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10300-10399.xml
index 7e68746479..f87e4330dd 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10300-10399.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10300-10399.xml
@@ -421,11 +421,10 @@
 		</effects>
 	</skill>
 	<skill id="10310" toLevel="1" name="Primal Rage">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 10 min., P. Atk. + 15%. Requires a sword, blunt, spear, fist weapon, dual blunt, or dual sword. -->
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>600</abnormalTime>
-		<!-- TODO abnormalType -->
+		<abnormalType>PA_UP</abnormalType>
 		<icon>icon.skill10310</icon>
 		<operateType>A2</operateType>
 		<targetType>SELF</targetType>
@@ -807,11 +806,11 @@
 		</effects>
 	</skill>
 	<skill id="10319" toLevel="3" name="Duelist's Fury">
-		<!-- TODO: AbnormalType -->
 		<!-- PvP Damage + 20%, Speed + 66, Debuff Resistance + 90%. -->
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>30</abnormalTime>
 		<abnormalVisualEffect>DUELING</abnormalVisualEffect>
+		<abnormalType>DUELIST_SPIRIT</abnormalType>
 		<magicLvl>
 			<value level="1">90</value>
 			<value level="2">95</value>
@@ -1021,19 +1020,46 @@
 		</effects>
 	</skill>
 	<skill id="10323" toLevel="1" name="Self Heal (Warrior)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Recovers 10% of Max HP. -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 		<mpConsume>1</mpConsume>
 		<effectPoint>100</effectPoint>
 		<reuseDelay>5000</reuseDelay>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HealPercent">
+				<power>10</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="10324" toLevel="3" name="Momentum Master">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Power of skills that consume Momentum increase by 10%. -->
 		<icon>icon.skill10324</icon>
 		<operateType>P</operateType>
+		<conditions>
+			<condition name="OpCheckSkill">
+				<skillId>261</skillId>
+				<skillId>10258</skillId>
+				<skillId>10260</skillId>
+				<skillId>10262</skillId>
+				<skillId>10265</skillId>
+				<skillId>10269</skillId>
+				<skillId>10318</skillId>
+				<affectType>CASTER</affectType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="PhysicalSkillPower">
+				<amount>
+					<value level="1">10</value>
+					<value level="2">15</value>
+					<value level="3">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="10325" toLevel="6" name="Dreadful Roar">
 		<!-- Cancels at least one buff of nearby enemies. Consumes 10 Soulstones. -->
@@ -1069,8 +1095,8 @@
 		<effects>
 			<effect name="DispelByCategory">
 				<slot>BUFF</slot>
-				<rate> <!-- TODO rate -->
-					<value fromLevel="1" toLevel="6">80</value>
+				<rate>
+					<value fromLevel="1" toLevel="6">70</value>
 					<value fromLevel="2" toLevel="6" fromSubLevel="1001" toSubLevel="1030">{base + base / 100 * subIndex}</value>
 				</rate>
 				<max>2</max>
@@ -1078,9 +1104,13 @@
 		</effects>
 	</skill>
 	<skill id="10326" toLevel="3" name="Bloody Fury">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 30 sec., P. Atk. + 450, Skill Power + 5%, and HP Recovery is limited to 70%. -->
 		<icon>icon.skill10326</icon>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+		</abnormalLvl>
 		<operateType>A2</operateType>
 		<mpConsume>
 			<value level="1">45</value>
@@ -1092,6 +1122,19 @@
 		<effectPoint>673</effectPoint>
 		<abnormalTime>30</abnormalTime>
 		<reuseDelay>180000</reuseDelay>
+		<effects>
+			<effect name="PAtk">
+				<amount>450</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="PhysicalSkillPower">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="ManaHealPercent">
+				<power>70</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="10327" toLevel="7" name="Momentum Flash">
 		<!-- Attacks target with 17348 Power added to P. Atk. Requires a sword/dagger/blunt weapon/fist weapon. Damage increases when using Momentum, which you can use up to 3. Over-hit. Critical. -->
@@ -1336,6 +1379,7 @@
 			<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1010">{base + subIndex}</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1011" toSubLevel="1030">{base + 10 + 0.5 * subIndex}</value>
 		</abnormalTime>
+		<abnormalType>SUPER_AVOID</abnormalType>
 		<abnormalVisualEffect>LONG_BLOW</abnormalVisualEffect>
 		<icon>icon.skill10332</icon>
 		<itemConsumeCount>5</itemConsumeCount>
@@ -1375,13 +1419,13 @@
 	</skill>
 	<skill id="10333" toLevel="1" name="Winged Spear">
 		<!-- Increases P. Atk. by 30% for 60 seconds when a spear is equipped. Range of regular skills increases by 80 and has a 10% chance to Stun when striking. Consumes 5 Soulstones. -->
-		<!-- TODO abnormalType -->
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>
 			<value fromLevel="1" toLevel="1">60</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1010">{base + subIndex}</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1011" toSubLevel="1030">{base + 10 + 0.5 * subIndex}</value>
 		</abnormalTime>
+		<abnormalType>SUPER_AVOID</abnormalType>
 		<abnormalVisualEffect>LONG_BLOW</abnormalVisualEffect>
 		<icon>icon.skill10333</icon>
 		<itemConsumeCount>5</itemConsumeCount>
@@ -1450,13 +1494,13 @@
 	</skill>
 	<skill id="10334" toLevel="1" name="Furious Slasher">
 		<!-- Increases P. Atk. by 30% for 60 seconds when a two-handed sword/two-handed blunt weapon is equipped. Attack 5 enemies at the same time with a regular attack. Consumes 5 Soulstones. -->
-		<!-- TODO abnormalType -->
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>
 			<value fromLevel="1" toLevel="1">60</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1010">{base + subIndex}</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1011" toSubLevel="1030">{base + 10 + 0.5 * subIndex}</value>
 		</abnormalTime>
+		<abnormalType>SUPER_AVOID</abnormalType>		
 		<abnormalVisualEffect>WIDE_SWORD</abnormalVisualEffect>
 		<icon>icon.skill10334</icon>
 		<itemConsumeCount>5</itemConsumeCount>
@@ -1498,7 +1542,7 @@
 	</skill>
 	<skill id="10335" toLevel="1" name="Furious Fist">
 		<!-- Increases P. Atk. by 30% and P. Critical Damage by 10% for 60 seconds when a fist weapon is equipped. Has 10% chance to decrease Fist Weapon Resistance by 30% when striking. Consumes 5 Soulstones. -->
-		<!-- TODO abnormalType -->
+		<abnormalType>SUPER_AVOID</abnormalType>
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>
 			<value fromLevel="1" toLevel="1">60</value>
@@ -1636,7 +1680,6 @@
 		</effects>
 	</skill>
 	<skill id="10340" toLevel="3" name="Blade Slasher">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Attacks enemies in front with 16214 Power added to P. Atk. If the target is stunned, attacks with 48641 power. Can be used while a sword or blunt weapon is equipped. Consumes 1 Soulstone. -->
 		<icon>
 			<value level="1">icon.skill10340</value>
@@ -1649,10 +1692,27 @@
 			<value level="2">236</value>
 			<value level="3">239</value>
 		</mpConsume>
+		<magicLvl>
+			<value level="1">101</value>
+			<value level="2">103</value>
+			<value level="3">105</value>
+		</magicLvl>
 		<castRange>40</castRange>
 		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<effectPoint>-125</effectPoint>
 		<reuseDelay>10000</reuseDelay>
+		<effects>
+			<effect name="PhysicalAttack">
+				<power>
+					<value level="1">16214</value>
+					<value level="2">17094</value>
+					<value level="3">17959</value>
+				</power>
+				<overHit>true</overHit>				
+				<criticalChance>15</criticalChance>
+				<pDefMod>0.7</pDefMod>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13300-13399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13300-13399.xml
index 93d194269d..9c686ad854 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13300-13399.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13300-13399.xml
@@ -792,71 +792,126 @@
 		</effects>
 	</skill>
 	<skill id="13329" toLevel="1" name="Bestow Fire Weapon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow fire damage by 300. -->
 		<icon>icon.skill4009</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="AttackAttribute">
+				<amount>300</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13330" toLevel="1" name="Bestow Water Weapon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow water damage by 300. -->
 		<icon>icon.skill4010</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="AttackAttribute">
+				<amount>300</amount>
+				<attribute>WATER</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13331" toLevel="1" name="Bestow Wind Weapon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow wind damage by 300. -->
 		<icon>icon.skill4011</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="AttackAttribute">
+				<amount>300</amount>
+				<attribute>WIND</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13332" toLevel="1" name="Bestow Earth Weapon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow earth damage by 300. -->
 		<icon>icon.skill4012</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="AttackAttribute">
+				<amount>300</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13333" toLevel="1" name="Bestow Holy Weapon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow holy damage by 300. -->
 		<icon>icon.skill4337</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="AttackAttribute">
+				<amount>300</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13334" toLevel="1" name="Bestow Darkness Weapon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow darkness damage by 300. -->
 		<icon>icon.skill4333</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="AttackAttribute">
+				<amount>300</amount>
+				<attribute>DARK</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13335" toLevel="1" name="Bestow Fire/Wind/Darkness Armor">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow Fire/Wind/Dark Resistance by 120. -->
 		<icon>icon.skill4337</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="DefenceAttribute">
+				<amount>120</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>120</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>120</amount>
+				<attribute>DARK</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13336" toLevel="1" name="Bestow Water/Earth/Holy Armor">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow Water/Earth/Holy Resistance by 120. -->
 		<icon>icon.skill4333</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="DefenceAttribute">
+				<amount>120</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>120</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>120</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13337" toLevel="1" name="Talisman (R-grade) - M. Def. (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 10 seconds, increases M. Def. + 50% through the power of the talisman. -->
 		<icon>icon.r_talisman_mm_up_active</icon>
 		<operateType>A2</operateType>
@@ -875,9 +930,14 @@
 		<reuseDelay>120000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="MagicalDefence">
+				<amount>50</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13338" toLevel="1" name="Talisman (R-grade) - Ranged P. Def. (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 10 seconds, increases Bow/Crossbow Resistance + 80% through the power of Talisman. -->
 		<icon>icon.r85_sp_talisman_ad_ex_passive</icon>
 		<operateType>A2</operateType>
@@ -896,6 +956,12 @@
 		<reuseDelay>120000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<BOW>80</BOW>
+				<CROSSBOW>80</CROSSBOW>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13339" toLevel="3" name="Enchant Heavy Armor Set + 6 (R-grade)">
 		<!-- Set item is enchanted. P. Def. + 93, and MP Recovery Bonus + 32 when standing/ sitting. -->
@@ -1271,7 +1337,6 @@
 		</conditions>
 	</skill>
 	<skill id="13349" toLevel="1" name="Talisman (R-grade) - Damage Reflect Resistance (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 30 seconds, increases Damage Reflect Resistance by 10 through the power of the talisman. -->
 		<icon>icon.r85_talisman_md_up_passive</icon>
 		<operateType>A2</operateType>
@@ -1290,9 +1355,14 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DamageShieldResist">
+				<amount>10</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13350" toLevel="1" name="Talisman (R-grade) - Lethal Strike Resistance (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 15 seconds, increases lethal strike resistance by 30 through the power of the talisman. -->
 		<icon>icon.r85_talisman_md_up_passive</icon>
 		<operateType>A2</operateType>
@@ -1311,6 +1381,11 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="InstantKillResist">
+				<amount>90</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13351" toLevel="1" name="Notifier">
 		<!-- AUTO GENERATED SKILL -->
@@ -1413,15 +1488,19 @@
 		</effects>
 	</skill>
 	<skill id="13356" toLevel="1" name="Player Commendation - Talisman - M. Atk.">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases M. Atk. by 37 when equipped. -->
 		<icon>icon.r85_talisman_ma_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="MagicalAttack">
+				<amount>37</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13357" toLevel="1" name="Player Commendation - Talisman - P. Atk. (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases P. Atk. by 111 momentarily through the power of the talisman. -->
 		<icon>icon.r85_talisman_pa_up_active</icon>
 		<operateType>A2</operateType>
@@ -1440,17 +1519,27 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PhysicalAttack">
+				<amount>111</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13358" toLevel="1" name="Player Commendation - Talisman - P. Atk.">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases P. Atk by 37 when equipped. -->
 		<icon>icon.r85_talisman_pa_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="PhysicalAttack">
+				<amount>37</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13359" toLevel="1" name="Player Commendation - Talisman - P. Def. (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases P. Def. by 114 momentarily through the power of the talisman. -->
 		<icon>icon.r85_talisman_pd_up_active</icon>
 		<operateType>A2</operateType>
@@ -1469,17 +1558,27 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PhysicalDefence">
+				<amount>114</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13360" toLevel="1" name="Player Commendation - Talisman - P. Def.">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases P. Def. by 38 when equipped. -->
 		<icon>icon.r85_talisman_pd_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="PhysicalDefence">
+				<amount>38</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13361" toLevel="1" name="Player Commendation - Talisman - Max CP (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Max CP by 297 momentarily through the power of the talisman. -->
 		<icon>icon.r85_talisman_cp_up_active</icon>
 		<operateType>A2</operateType>
@@ -1498,17 +1597,27 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="MaxCp">
+				<amount>279</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13362" toLevel="1" name="Player Commendation - Talisman - Max CP">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Max CP by 99 when equipped. -->
 		<icon>icon.r85_talisman_cp_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="MaxCp">
+				<amount>99</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13363" toLevel="1" name="Player Commendation - Talisman - Max HP (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Max HP by 657 momentarily through the power of the talisman. -->
 		<icon>icon.r85_talisman_hp_up_active</icon>
 		<operateType>A2</operateType>
@@ -1527,17 +1636,27 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="MaxHp">
+				<amount>657</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13364" toLevel="1" name="Player Commendation - Talisman - Max HP">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Max HP by 219 when equipped. -->
 		<icon>icon.r85_talisman_hp_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="MaxHp">
+				<amount>219</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13365" toLevel="1" name="Player Commendation - Talisman - Max MP (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Max MP by 327 momentarily through the power of the talisman. -->
 		<icon>icon.r85_talisman_mp_up_active</icon>
 		<operateType>A2</operateType>
@@ -1556,17 +1675,27 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="MaxMp">
+				<amount>327</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13366" toLevel="1" name="Player Commendation - Talisman - Max MP">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Max MP by 119 when equipped. -->
 		<icon>icon.r85_talisman_mp_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="MaxMp">
+				<amount>119</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13367" toLevel="1" name="Talisman (R-grade) - Half-kill/Lethal Strike Resistance (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Momentarily increases Half-kill/Lethal Strike Resistance by 30 through the power of the talisman. -->
 		<icon>icon.r85_talisman_md_up_passive</icon>
 		<operateType>A2</operateType>
@@ -1585,62 +1714,150 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="InstantKillResist">
+				<amount>30</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13368" toLevel="1" name="Talisman (R-grade) - Half-kill/Lethal Strike Resistance">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Half-kill/Lethal Strike Resistance by 10 when a talisman is equipped. -->
 		<icon>icon.r85_talisman_md_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="InstantKillResist">
+				<amount>10</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13369" toLevel="1" name="Squash Ring (Warrior)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases P. Critical attack power by 15% and P. Accuracy by 2. -->
 		<icon>icon.accessory_ring_of_gourd_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>75</magicLvl>
+		<effects>
+			<effect name="CriticalDamage">
+				<amount>15</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Accuracy">
+				<amount>2</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13370" toLevel="1" name="Squash Ring (Wizard)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases M. Critical Rate by 2% and M. Accuracy by 2. -->
 		<icon>icon.accessory_ring_of_gourd_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>75</magicLvl>
+		<effects>
+			<effect name="MagicCriticalRate">
+				<amount>2</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicAccuracy">
+				<amount>2</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13371" toLevel="1" name="Squash Earring (Warrior)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases P. Atk. Spd. by 4%. and Speed by 5. -->
 		<icon>icon.accessory_earring_of_gourd_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>75</magicLvl>
+		<effects>
+			<effect name="PhysicalAttackSpeed">
+				<amount>4</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Speed">
+				<amount>5</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13372" toLevel="1" name="Squash Earring (Wizard)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Casting Spd. by 4% and Speed by 5. -->
 		<icon>icon.accessory_earring_of_gourd_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>75</magicLvl>
+		<effects>
+			<effect name="MagicalAttackSpeed">
+				<amount>4</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Speed">
+				<amount>5</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13373" toLevel="1" name="Squash Necklace">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Sleep/Paralysis/Stun/Poison/Bleed resistance and attack rate by 20%. Decreases skill Cooldown by 5% and skill MP Consumption by 5%. -->
 		<icon>icon.accessory_necklace_of_gourd_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>75</magicLvl>
+		<effects>
+			<effect name="DefenceTrait">
+				<BLEED>20</BLEED>
+				<SHOCK>20</SHOCK>
+				<POISON>20</POISON>
+				<PARALYZE>20</PARALYZE>
+				<SLEEP>20</SLEEP>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>3</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>3</magicType>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13374" toLevel="1" name="Circlet of Earthquake">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Earth resistance by 60. -->
 		<icon>icon.armor_leather_helmet_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="DefenceAttribute">
+				<amount>60</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13375" toLevel="1" name="Release Agathion's Seal - XP Bottle">
 		<!-- AUTO GENERATED SKILL -->
@@ -2053,35 +2270,55 @@
 		</effects>
 	</skill>
 	<skill id="13396" toLevel="1" name="Rabbit Ears: STR">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- STR + 1 -->
 		<icon>icon.accessory_rabbit_ear_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>1</magicLvl>
+		<effects>		
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>STR</stat>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13397" toLevel="1" name="Rabbit Ears: DEX">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- DEX + 1 -->
 		<icon>icon.accessory_rabbit_ear_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>1</magicLvl>
+		<effects>		
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>DEX</stat>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13398" toLevel="1" name="Rabbit Ears: WIT">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- WIT + 1 -->
 		<icon>icon.accessory_rabbit_ear_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>1</magicLvl>
+		<effects>		
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>WIT</stat>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13399" toLevel="1" name="Rabbit Ears: INT">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- INT + 1 -->
 		<icon>icon.accessory_rabbit_ear_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>1</magicLvl>
+		<effects>		
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>INT</stat>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17700-17799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17700-17799.xml
index d65fbcf45f..e0b30d2cad 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17700-17799.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17700-17799.xml
@@ -25,9 +25,6 @@
 		<reuseDelay>30000</reuseDelay>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
-		<targetConditions>
-			<condition name="OpCheckFlag" />
-		</targetConditions>
 		<effects>
 			<effect name="BlockSkill">
 				<magicTypes>1;3</magicTypes>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml b/L2J_Mobius_3.0_Helios/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml
index ff2596cd88..8f42bf2bee 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml
@@ -314,6 +314,7 @@
 		<skill skillName="Divine Inspiration" skillId="1405" skillLvl="6" getLevel="99" levelUpSp="5000000">
 			<item id="40065" count="1" />
 		</skill>
+		<skill skillName="Summon Burning Mechanic Golem" skillId="10341" skillLvl="1" getLevel="99" levelUpSp="5000000" />	
 		<skill skillName="Jump Attack" skillId="10269" skillLvl="7" getLevel="99" levelUpSp="5000000" />
 		<skill skillName="Berserker" skillId="10274" skillLvl="4" getLevel="99" levelUpSp="5000000" />
 		<skill skillName="Hurricane Rush" skillId="10267" skillLvl="6" getLevel="99" levelUpSp="5000000" />
@@ -349,6 +350,7 @@
 		<skill skillName="Superior Heavy Armor Mastery" skillId="10253" skillLvl="5" getLevel="100" levelUpSp="88099899" />
 		<skill skillName="Superior Resistance" skillId="10286" skillLvl="5" getLevel="100" levelUpSp="88099899" />
 		
+		<skill skillName="Summon Burning Mechanic Golem" skillId="10341" skillLvl="2" getLevel="101" levelUpSp="211440000" />	
 		<skill skillName="Jump Attack" skillId="10269" skillLvl="8" getLevel="101" levelUpSp="211440000" />
 		<skill skillName="Hurricane Rush" skillId="10267" skillLvl="7" getLevel="101" levelUpSp="211440000" />
 		<skill skillName="Eruption" skillId="10265" skillLvl="9" getLevel="101" levelUpSp="211440000" />
@@ -372,6 +374,7 @@
 		<skill skillName="Superior Heavy Armor Mastery" skillId="10253" skillLvl="6" getLevel="102" levelUpSp="507455418" />
 		<skill skillName="Superior Resistance" skillId="10286" skillLvl="6" getLevel="102" levelUpSp="507455418" />
 		
+		<skill skillName="Summon Burning Mechanic Golem" skillId="10341" skillLvl="3" getLevel="103" levelUpSp="608946501" />	
 		<skill skillName="Jump Attack" skillId="10269" skillLvl="9" getLevel="103" levelUpSp="608946501" />
 		<skill skillName="Hurricane Rush" skillId="10267" skillLvl="8" getLevel="103" levelUpSp="608946501" />
 		<skill skillName="Eruption" skillId="10265" skillLvl="10" getLevel="103" levelUpSp="608946501" />
@@ -395,6 +398,7 @@
 		<skill skillName="Superior Heavy Armor Mastery" skillId="10253" skillLvl="7" getLevel="104" levelUpSp="1461471604" />
 		<skill skillName="Superior Resistance" skillId="10286" skillLvl="7" getLevel="104" levelUpSp="1461471604" />
 		
+		<skill skillName="Summon Burning Mechanic Golem" skillId="10341" skillLvl="4" getLevel="105" levelUpSp="1753765925" />	
 		<skill skillName="Jump Attack" skillId="10269" skillLvl="10" getLevel="105" levelUpSp="1753765925" />
 		<skill skillName="Hurricane Rush" skillId="10267" skillLvl="9" getLevel="105" levelUpSp="1753765925" />
 		<skill skillName="Eruption" skillId="10265" skillLvl="11" getLevel="105" levelUpSp="1753765925" />
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/15200-15299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/15200-15299.xml
index 7500deaa7c..0fbc8202ef 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/15200-15299.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/15200-15299.xml
@@ -96,4 +96,108 @@
 			<height normal="67.5" />
 		</collision>
 	</npc>
+	<npc id="15203" level="99" type="L2Servitor" name="Burning Mechanic Golem">
+		<race>CONSTRUCT</race>
+		<sex>MALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="13073" hpRegen="9" mp="1236" mpRegen="6.5" />
+			<speed>
+				<walk ground="30" />
+				<run ground="198" />
+			</speed>
+			<attack physical="2822.6" magical="1164.3" critical="4" attackSpeed="283" range="40" />
+			<defence physical="1043.7" magical="729.3" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="false" undying="false" />
+		<skill_list>
+			<skill id="4416" level="2" /> <!-- CONSTRUCT -->
+		</skill_list>
+		<shots soul="1" spirit="1" />
+		<collision>
+			<radius normal="5" />
+			<height normal="19" />
+		</collision>
+	</npc>
+	<npc id="15204" level="101" type="L2Servitor" name="Burning Mechanic Golem">
+		<race>CONSTRUCT</race>
+		<sex>MALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="14027" hpRegen="9" mp="1275" mpRegen="6.5" />
+			<speed>
+				<walk ground="30" />
+				<run ground="198" />
+			</speed>
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="283" range="40" />
+			<defence physical="1131.655" magical="805.8765" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="false" undying="false" />
+		<skill_list>
+			<skill id="4416" level="2" /> <!-- CONSTRUCT -->
+		</skill_list>
+		<shots soul="1" spirit="1" />
+		<collision>
+			<radius normal="5" />
+			<height normal="19" />
+		</collision>
+	</npc>
+	<npc id="15205" level="103" type="L2Servitor" name="Burning Mechanic Golem">
+		<race>CONSTRUCT</race>
+		<sex>MALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="14301" hpRegen="9" mp="1316" mpRegen="6.5" />
+			<speed>
+				<walk ground="30" />
+				<run ground="198" />
+			</speed>
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="283" range="40" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="false" undying="false" />
+		<skill_list>
+			<skill id="4416" level="2" /> <!-- CONSTRUCT -->
+		</skill_list>
+		<shots soul="1" spirit="1" />
+		<collision>
+			<radius normal="5" />
+			<height normal="19" />
+		</collision>
+	</npc>
+	<npc id="15206" level="105" type="L2Servitor" name="Burning Mechanic Golem">
+		<race>CONSTRUCT</race>
+		<sex>MALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="14583" hpRegen="9" mp="1356" mpRegen="6.5" />
+			<speed>
+				<walk ground="30" />
+				<run ground="198" />
+			</speed>
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="283" range="40" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="false" undying="false" />
+		<skill_list>
+			<skill id="4416" level="2" /> <!-- CONSTRUCT -->
+		</skill_list>
+		<shots soul="1" spirit="1" />
+		<collision>
+			<radius normal="5" />
+			<height normal="19" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml
index 148179118c..768547d2db 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml
@@ -534,7 +534,6 @@
 	<skill id="10256" toLevel="10" name="Superior HP Mastery">
 		<!-- Glory Days confirmed -->
 		<!-- Max HP + 606, Max CP + 296, HP Recovery Bonus + 12, MP Recovery Bonus + 6. When HP falls below 60%, P. Atk. + 1027. STR + 2. When receiving damage, has a chance of recovering 10% of Max HP. -->
-		<!-- TODO: Find trigger for When receiving damage, has a chance of recovering 10% of Max HP. -->
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>
@@ -554,7 +553,7 @@
 			<effect name="PAtk">
 				<amount>
 					<value level="1">1027</value>
-					<value level="2">1027</value>
+					<value level="2">1191</value>
 					<value level="3">1381</value>
 					<value level="4">1554</value>
 					<value level="5">1761</value>
@@ -569,7 +568,7 @@
 			<effect name="MaxCp">
 				<amount>
 					<value level="1">296</value>
-					<value level="2">296</value>
+					<value level="2">353</value>
 					<value level="3">411</value>
 					<value level="4">489</value>
 					<value level="5">533</value>
@@ -592,7 +591,7 @@
 			<effect name="MaxHp">
 				<amount>
 					<value level="1">606</value>
-					<value level="2">606</value>
+					<value level="2">724</value>
 					<value level="3">843</value>
 					<value level="4">1002</value>
 					<value level="5">1092</value>
@@ -604,13 +603,27 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="HpRegen">
+			<effect name="MpRegen">
 				<amount>6</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="TriggerSkillByDamage">
+				<!-- Self Heal (Warrior) - Recovers 10% of Max HP. -->
+				<attackerType>L2Character</attackerType>
+				<minAttackerLevel>1</minAttackerLevel>
+				<maxAttackerLevel>107</maxAttackerLevel>
+				<minDamage>1</minDamage>
+				<chance>20</chance>
+				<targetType>SELF</targetType>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>true</allowNormalAttack>
+				<allowWeapons>ALL</allowWeapons>
+				<skillId>10323</skillId>
+				<skillLevel>1</skillLevel>
+			</effect>
 		</effects>
 	</skill>
-	<skill id="10257" toLevel="1" name="Self Heal (Warrior)">
+	<skill id="10257" toLevel="1" name="Superior Spirit Mastery">
 		<!-- Glory Days confirmed -->
 		<!-- STR + 2 and Hold/Sleep/Bleed/Mind/Poison Resistance + 30. -->
 		<operateType>P</operateType>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10300-10399.xml
index a1f5d5daca..24e5496494 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10300-10399.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10300-10399.xml
@@ -422,11 +422,10 @@
 		</effects>
 	</skill>
 	<skill id="10310" toLevel="1" name="Primal Rage">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 10 min., P. Atk. + 15%. Requires a sword, blunt, spear, fist weapon, dual blunt, or dual sword. -->
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>600</abnormalTime>
-		<!-- TODO abnormalType -->
+		<abnormalType>PA_UP</abnormalType>
 		<icon>icon.skill10310</icon>
 		<operateType>A2</operateType>
 		<targetType>SELF</targetType>
@@ -808,11 +807,11 @@
 		</effects>
 	</skill>
 	<skill id="10319" toLevel="3" name="Duelist's Fury">
-		<!-- TODO: AbnormalType -->
 		<!-- PvP Damage + 20%, Speed + 66, Debuff Resistance + 90%. -->
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>30</abnormalTime>
 		<abnormalVisualEffect>DUELING</abnormalVisualEffect>
+		<abnormalType>DUELIST_SPIRIT</abnormalType>
 		<magicLvl>
 			<value level="1">90</value>
 			<value level="2">95</value>
@@ -1022,19 +1021,46 @@
 		</effects>
 	</skill>
 	<skill id="10323" toLevel="1" name="Self Heal (Warrior)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Recovers 10% of Max HP. -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 		<mpConsume>1</mpConsume>
 		<effectPoint>100</effectPoint>
 		<reuseDelay>5000</reuseDelay>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HealPercent">
+				<power>10</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="10324" toLevel="3" name="Momentum Master">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Power of skills that consume Momentum increase by 10%. -->
 		<icon>icon.skill10324</icon>
 		<operateType>P</operateType>
+		<conditions>
+			<condition name="OpCheckSkill">
+				<skillId>261</skillId>
+				<skillId>10258</skillId>
+				<skillId>10260</skillId>
+				<skillId>10262</skillId>
+				<skillId>10265</skillId>
+				<skillId>10269</skillId>
+				<skillId>10318</skillId>
+				<affectType>CASTER</affectType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="PhysicalSkillPower">
+				<amount>
+					<value level="1">10</value>
+					<value level="2">15</value>
+					<value level="3">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="10325" toLevel="6" name="Dreadful Roar">
 		<!-- Cancels at least one buff of nearby enemies. Consumes 10 Soulstones. -->
@@ -1070,8 +1096,8 @@
 		<effects>
 			<effect name="DispelByCategory">
 				<slot>BUFF</slot>
-				<rate> <!-- TODO rate -->
-					<value fromLevel="1" toLevel="6">80</value>
+				<rate>
+					<value fromLevel="1" toLevel="6">70</value>
 					<value fromLevel="2" toLevel="6" fromSubLevel="1001" toSubLevel="1030">{base + base / 100 * subIndex}</value>
 				</rate>
 				<max>2</max>
@@ -1079,9 +1105,13 @@
 		</effects>
 	</skill>
 	<skill id="10326" toLevel="3" name="Bloody Fury">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 30 sec., P. Atk. + 450, Skill Power + 5%, and HP Recovery is limited to 70%. -->
 		<icon>icon.skill10326</icon>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+		</abnormalLvl>
 		<operateType>A2</operateType>
 		<mpConsume>
 			<value level="1">45</value>
@@ -1093,6 +1123,19 @@
 		<effectPoint>673</effectPoint>
 		<abnormalTime>30</abnormalTime>
 		<reuseDelay>180000</reuseDelay>
+		<effects>
+			<effect name="PAtk">
+				<amount>450</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="PhysicalSkillPower">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="ManaHealPercent">
+				<power>70</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="10327" toLevel="7" name="Momentum Flash">
 		<!-- Attacks target with 17348 Power added to P. Atk. Requires a sword/dagger/blunt weapon/fist weapon. Damage increases when using Momentum, which you can use up to 3. Over-hit. Critical. -->
@@ -1337,6 +1380,7 @@
 			<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1010">{base + subIndex}</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1011" toSubLevel="1030">{base + 10 + 0.5 * subIndex}</value>
 		</abnormalTime>
+		<abnormalType>SUPER_AVOID</abnormalType>
 		<abnormalVisualEffect>LONG_BLOW</abnormalVisualEffect>
 		<icon>icon.skill10332</icon>
 		<itemConsumeCount>5</itemConsumeCount>
@@ -1376,13 +1420,13 @@
 	</skill>
 	<skill id="10333" toLevel="1" name="Winged Spear">
 		<!-- Increases P. Atk. by 30% for 60 seconds when a spear is equipped. Range of regular skills increases by 80 and has a 10% chance to Stun when striking. Consumes 5 Soulstones. -->
-		<!-- TODO abnormalType -->
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>
 			<value fromLevel="1" toLevel="1">60</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1010">{base + subIndex}</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1011" toSubLevel="1030">{base + 10 + 0.5 * subIndex}</value>
 		</abnormalTime>
+		<abnormalType>SUPER_AVOID</abnormalType>
 		<abnormalVisualEffect>LONG_BLOW</abnormalVisualEffect>
 		<icon>icon.skill10333</icon>
 		<itemConsumeCount>5</itemConsumeCount>
@@ -1451,13 +1495,13 @@
 	</skill>
 	<skill id="10334" toLevel="1" name="Furious Slasher">
 		<!-- Increases P. Atk. by 30% for 60 seconds when a two-handed sword/two-handed blunt weapon is equipped. Attack 5 enemies at the same time with a regular attack. Consumes 5 Soulstones. -->
-		<!-- TODO abnormalType -->
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>
 			<value fromLevel="1" toLevel="1">60</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1010">{base + subIndex}</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1011" toSubLevel="1030">{base + 10 + 0.5 * subIndex}</value>
 		</abnormalTime>
+		<abnormalType>SUPER_AVOID</abnormalType>		
 		<abnormalVisualEffect>WIDE_SWORD</abnormalVisualEffect>
 		<icon>icon.skill10334</icon>
 		<itemConsumeCount>5</itemConsumeCount>
@@ -1499,7 +1543,7 @@
 	</skill>
 	<skill id="10335" toLevel="1" name="Furious Fist">
 		<!-- Increases P. Atk. by 30% and P. Critical Damage by 10% for 60 seconds when a fist weapon is equipped. Has 10% chance to decrease Fist Weapon Resistance by 30% when striking. Consumes 5 Soulstones. -->
-		<!-- TODO abnormalType -->
+		<abnormalType>SUPER_AVOID</abnormalType>
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>
 			<value fromLevel="1" toLevel="1">60</value>
@@ -1637,7 +1681,6 @@
 		</effects>
 	</skill>
 	<skill id="10340" toLevel="3" name="Blade Slasher">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Attacks enemies in front with 16214 Power added to P. Atk. If the target is stunned, attacks with 48641 power. Can be used while a sword or blunt weapon is equipped. Consumes 1 Soulstone. -->
 		<icon>
 			<value level="1">icon.skill10340</value>
@@ -1650,16 +1693,76 @@
 			<value level="2">236</value>
 			<value level="3">239</value>
 		</mpConsume>
+		<magicLvl>
+			<value level="1">101</value>
+			<value level="2">103</value>
+			<value level="3">105</value>
+		</magicLvl>
 		<castRange>40</castRange>
 		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<effectPoint>-125</effectPoint>
 		<reuseDelay>10000</reuseDelay>
+		<effects>
+			<effect name="PhysicalAttack">
+				<power>
+					<value level="1">16214</value>
+					<value level="2">17094</value>
+					<value level="3">17959</value>
+				</power>
+				<overHit>true</overHit>				
+				<criticalChance>15</criticalChance>
+				<pDefMod>0.7</pDefMod>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="10341" toLevel="4" name="Summon Burning Mechanic Golem">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<hitTime>15000</hitTime>
+		<itemConsumeCount>
+			<value level="1">5</value>
+			<value level="2">5</value>
+			<value level="3">5</value>
+			<value level="4">5</value>
+		</itemConsumeCount>
+		<itemConsumeId>
+			<value level="1">17371</value>
+			<value level="2">17371</value>
+			<value level="3">17371</value>
+			<value level="4">17371</value>
+		</itemConsumeId>
+		<magicLvl>
+			<value level="1">99</value>
+			<value level="2">101</value>
+			<value level="3">103</value>
+			<value level="4">105</value>
+		</magicLvl>
+		<mpConsume>
+			<value level="1">173</value>
+			<value level="2">178</value>
+			<value level="3">185</value>
+			<value level="4">191</value>
+		</mpConsume>
+		<operateType>A1</operateType>
+		<reuseDelay>5000</reuseDelay>
+		<rideState>NONE</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="CanSummon" />
+		</conditions>
+		<effects>
+			<effect name="Summon">
+				<npcId>
+					<value level="1">15203</value>
+					<value level="2">12204</value>
+					<value level="3">15205</value>
+					<value level="4">15206</value>
+				</npcId>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="10342" toLevel="1" name="Angry Golem">
 		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13300-13399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13300-13399.xml
index 7599c51ef7..4e10e6402e 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13300-13399.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13300-13399.xml
@@ -792,71 +792,126 @@
 		</effects>
 	</skill>
 	<skill id="13329" toLevel="1" name="Bestow Fire Weapon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow fire damage by 300. -->
 		<icon>icon.skill4009</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="AttackAttribute">
+				<amount>300</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13330" toLevel="1" name="Bestow Water Weapon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow water damage by 300. -->
 		<icon>icon.skill4010</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="AttackAttribute">
+				<amount>300</amount>
+				<attribute>WATER</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13331" toLevel="1" name="Bestow Wind Weapon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow wind damage by 300. -->
 		<icon>icon.skill4011</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="AttackAttribute">
+				<amount>300</amount>
+				<attribute>WIND</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13332" toLevel="1" name="Bestow Earth Weapon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow earth damage by 300. -->
 		<icon>icon.skill4012</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="AttackAttribute">
+				<amount>300</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13333" toLevel="1" name="Bestow Holy Weapon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow holy damage by 300. -->
 		<icon>icon.skill4337</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="AttackAttribute">
+				<amount>300</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13334" toLevel="1" name="Bestow Darkness Weapon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow darkness damage by 300. -->
 		<icon>icon.skill4333</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="AttackAttribute">
+				<amount>300</amount>
+				<attribute>DARK</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13335" toLevel="1" name="Bestow Fire/Wind/Darkness Armor">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow Fire/Wind/Dark Resistance by 120. -->
 		<icon>icon.skill4337</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="DefenceAttribute">
+				<amount>120</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>120</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>120</amount>
+				<attribute>DARK</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13336" toLevel="1" name="Bestow Water/Earth/Holy Armor">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Bestow Water/Earth/Holy Resistance by 120. -->
 		<icon>icon.skill4333</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="DefenceAttribute">
+				<amount>120</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>120</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>120</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13337" toLevel="1" name="Talisman (R-grade) - M. Def. (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 10 seconds, increases M. Def. + 50% through the power of the talisman. -->
 		<icon>icon.r_talisman_mm_up_active</icon>
 		<operateType>A2</operateType>
@@ -875,9 +930,14 @@
 		<reuseDelay>120000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="MagicalDefence">
+				<amount>50</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13338" toLevel="1" name="Talisman (R-grade) - Ranged P. Def. (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 10 seconds, increases Bow/Crossbow Resistance + 80% through the power of Talisman. -->
 		<icon>icon.r85_sp_talisman_ad_ex_passive</icon>
 		<operateType>A2</operateType>
@@ -896,6 +956,12 @@
 		<reuseDelay>120000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<BOW>80</BOW>
+				<CROSSBOW>80</CROSSBOW>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13339" toLevel="5" name="Enchant Heavy Armor Set + 6 +7 +8 +9 +10 (R,R95,R99 Grade)">
 		<!-- Set item is enchanted. P. Def. + 93, and MP Recovery Bonus + 32 when standing/ sitting. -->
@@ -1505,7 +1571,6 @@
 		</conditions>
 	</skill>
 	<skill id="13349" toLevel="1" name="Talisman (R-grade) - Damage Reflect Resistance (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 30 seconds, increases Damage Reflect Resistance by 10 through the power of the talisman. -->
 		<icon>icon.r85_talisman_md_up_passive</icon>
 		<operateType>A2</operateType>
@@ -1524,9 +1589,14 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DamageShieldResist">
+				<amount>10</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13350" toLevel="1" name="Talisman (R-grade) - Lethal Strike Resistance (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 15 seconds, increases lethal strike resistance by 30 through the power of the talisman. -->
 		<icon>icon.r85_talisman_md_up_passive</icon>
 		<operateType>A2</operateType>
@@ -1545,6 +1615,11 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="InstantKillResist">
+				<amount>90</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13351" toLevel="1" name="Notifier">
 		<!-- AUTO GENERATED SKILL -->
@@ -1647,15 +1722,19 @@
 		</effects>
 	</skill>
 	<skill id="13356" toLevel="1" name="Player Commendation - Talisman - M. Atk.">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases M. Atk. by 37 when equipped. -->
 		<icon>icon.r85_talisman_ma_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="MagicalAttack">
+				<amount>37</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13357" toLevel="1" name="Player Commendation - Talisman - P. Atk. (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases P. Atk. by 111 momentarily through the power of the talisman. -->
 		<icon>icon.r85_talisman_pa_up_active</icon>
 		<operateType>A2</operateType>
@@ -1674,17 +1753,27 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PhysicalAttack">
+				<amount>111</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13358" toLevel="1" name="Player Commendation - Talisman - P. Atk.">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases P. Atk by 37 when equipped. -->
 		<icon>icon.r85_talisman_pa_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="PhysicalAttack">
+				<amount>37</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13359" toLevel="1" name="Player Commendation - Talisman - P. Def. (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases P. Def. by 114 momentarily through the power of the talisman. -->
 		<icon>icon.r85_talisman_pd_up_active</icon>
 		<operateType>A2</operateType>
@@ -1703,17 +1792,27 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PhysicalDefence">
+				<amount>114</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13360" toLevel="1" name="Player Commendation - Talisman - P. Def.">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases P. Def. by 38 when equipped. -->
 		<icon>icon.r85_talisman_pd_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="PhysicalDefence">
+				<amount>38</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13361" toLevel="1" name="Player Commendation - Talisman - Max CP (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Max CP by 297 momentarily through the power of the talisman. -->
 		<icon>icon.r85_talisman_cp_up_active</icon>
 		<operateType>A2</operateType>
@@ -1732,17 +1831,27 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="MaxCp">
+				<amount>279</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13362" toLevel="1" name="Player Commendation - Talisman - Max CP">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Max CP by 99 when equipped. -->
 		<icon>icon.r85_talisman_cp_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="MaxCp">
+				<amount>99</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13363" toLevel="1" name="Player Commendation - Talisman - Max HP (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Max HP by 657 momentarily through the power of the talisman. -->
 		<icon>icon.r85_talisman_hp_up_active</icon>
 		<operateType>A2</operateType>
@@ -1761,17 +1870,27 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="MaxHp">
+				<amount>657</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13364" toLevel="1" name="Player Commendation - Talisman - Max HP">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Max HP by 219 when equipped. -->
 		<icon>icon.r85_talisman_hp_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="MaxHp">
+				<amount>219</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13365" toLevel="1" name="Player Commendation - Talisman - Max MP (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Max MP by 327 momentarily through the power of the talisman. -->
 		<icon>icon.r85_talisman_mp_up_active</icon>
 		<operateType>A2</operateType>
@@ -1790,17 +1909,27 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="MaxMp">
+				<amount>327</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13366" toLevel="1" name="Player Commendation - Talisman - Max MP">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Max MP by 119 when equipped. -->
 		<icon>icon.r85_talisman_mp_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="MaxMp">
+				<amount>119</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13367" toLevel="1" name="Talisman (R-grade) - Half-kill/Lethal Strike Resistance (Active)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Momentarily increases Half-kill/Lethal Strike Resistance by 30 through the power of the talisman. -->
 		<icon>icon.r85_talisman_md_up_passive</icon>
 		<operateType>A2</operateType>
@@ -1819,62 +1948,150 @@
 		<reuseDelay>360000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="InstantKillResist">
+				<amount>30</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13368" toLevel="1" name="Talisman (R-grade) - Half-kill/Lethal Strike Resistance">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Half-kill/Lethal Strike Resistance by 10 when a talisman is equipped. -->
 		<icon>icon.r85_talisman_md_up_passive</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="InstantKillResist">
+				<amount>10</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13369" toLevel="1" name="Squash Ring (Warrior)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases P. Critical attack power by 15% and P. Accuracy by 2. -->
 		<icon>icon.accessory_ring_of_gourd_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>75</magicLvl>
+		<effects>
+			<effect name="CriticalDamage">
+				<amount>15</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Accuracy">
+				<amount>2</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13370" toLevel="1" name="Squash Ring (Wizard)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases M. Critical Rate by 2% and M. Accuracy by 2. -->
 		<icon>icon.accessory_ring_of_gourd_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>75</magicLvl>
+		<effects>
+			<effect name="MagicCriticalRate">
+				<amount>2</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicAccuracy">
+				<amount>2</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13371" toLevel="1" name="Squash Earring (Warrior)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases P. Atk. Spd. by 4%. and Speed by 5. -->
 		<icon>icon.accessory_earring_of_gourd_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>75</magicLvl>
+		<effects>
+			<effect name="PhysicalAttackSpeed">
+				<amount>4</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Speed">
+				<amount>5</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13372" toLevel="1" name="Squash Earring (Wizard)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Casting Spd. by 4% and Speed by 5. -->
 		<icon>icon.accessory_earring_of_gourd_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>75</magicLvl>
+		<effects>
+			<effect name="MagicalAttackSpeed">
+				<amount>4</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Speed">
+				<amount>5</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13373" toLevel="1" name="Squash Necklace">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Sleep/Paralysis/Stun/Poison/Bleed resistance and attack rate by 20%. Decreases skill Cooldown by 5% and skill MP Consumption by 5%. -->
 		<icon>icon.accessory_necklace_of_gourd_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>75</magicLvl>
+		<effects>
+			<effect name="DefenceTrait">
+				<BLEED>20</BLEED>
+				<SHOCK>20</SHOCK>
+				<POISON>20</POISON>
+				<PARALYZE>20</PARALYZE>
+				<SLEEP>20</SLEEP>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>3</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>3</magicType>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13374" toLevel="1" name="Circlet of Earthquake">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Earth resistance by 60. -->
 		<icon>icon.armor_leather_helmet_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
+		<effects>
+			<effect name="DefenceAttribute">
+				<amount>60</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13375" toLevel="1" name="Release Agathion's Seal - XP Bottle">
 		<!-- AUTO GENERATED SKILL -->
@@ -2287,35 +2504,55 @@
 		</effects>
 	</skill>
 	<skill id="13396" toLevel="1" name="Rabbit Ears: STR">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- STR + 1 -->
 		<icon>icon.accessory_rabbit_ear_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>1</magicLvl>
+		<effects>		
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>STR</stat>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13397" toLevel="1" name="Rabbit Ears: DEX">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- DEX + 1 -->
 		<icon>icon.accessory_rabbit_ear_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>1</magicLvl>
+		<effects>		
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>DEX</stat>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13398" toLevel="1" name="Rabbit Ears: WIT">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- WIT + 1 -->
 		<icon>icon.accessory_rabbit_ear_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>1</magicLvl>
+		<effects>		
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>WIT</stat>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="13399" toLevel="1" name="Rabbit Ears: INT">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- INT + 1 -->
 		<icon>icon.accessory_rabbit_ear_i00</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>1</magicLvl>
+		<effects>		
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>INT</stat>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17700-17799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17700-17799.xml
index 075ee7ba80..dc0675d5c9 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17700-17799.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17700-17799.xml
@@ -27,9 +27,6 @@
 		<reuseDelay>30000</reuseDelay>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
-		<targetConditions>
-			<condition name="OpCheckFlag" />
-		</targetConditions>
 		<effects>
 			<effect name="BlockSkill">
 				<magicTypes>1;3</magicTypes>