diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00100-00199.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00100-00199.xml
index c5a2708ae6..faa13c7eec 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00100-00199.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00100-00199.xml
@@ -4,21 +4,21 @@
 		<!-- When using a sword/ blunt weapon/ spear/ dual swords Shock Atk. Rate +$s1 -->
 		<icon>icon.skill0100</icon>
 		<magicLevel>
-			<value level="1">18</value>
-			<value level="2">19</value>
+			<value level="1">20</value>
+			<value level="2">20</value>
 			<value level="3">20</value>
-			<value level="4">22</value>
-			<value level="5">23</value>
-			<value level="6">24</value>
-			<value level="7">26</value>
-			<value level="8">27</value>
-			<value level="9">28</value>
-			<value level="10">30</value>
-			<value level="11">31</value>
-			<value level="12">32</value>
-			<value level="13">34</value>
-			<value level="14">35</value>
-			<value level="15">36</value>
+			<value level="4">20</value>
+			<value level="5">20</value>
+			<value level="6">21</value>
+			<value level="7">22</value>
+			<value level="8">23</value>
+			<value level="9">24</value>
+			<value level="10">25</value>
+			<value level="11">26</value>
+			<value level="12">27</value>
+			<value level="13">28</value>
+			<value level="14">29</value>
+			<value level="15">30</value>
 		</magicLevel>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -33,32 +33,8 @@
 			</condition>
 		</conditions>
 		<effects>
-			<effect name="TriggerSkillByAttack">
-				<!-- Stun -->
-				<attackerType>Creature</attackerType>
-				<minDamage>1</minDamage>
-				<targetType>TARGET</targetType>
-				<isCritical>false</isCritical>
-				<allowWeapons>BLUNT,SWORD,POLE,DUAL</allowWeapons>
-				<skillId>5551</skillId> <!-- Stun -->
-				<skillLevel>
-					<value level="1">1</value>
-					<value level="2">2</value>
-					<value level="3">3</value>
-					<value level="4">4</value>
-					<value level="5">5</value>
-					<value level="6">6</value>
-					<value level="7">7</value>
-					<value level="8">8</value>
-					<value level="9">9</value>
-					<value level="10">10</value>
-					<value level="11">11</value>
-					<value level="12">12</value>
-					<value level="13">12</value>
-					<value level="14">12</value>
-					<value level="15">12</value>
-				</skillLevel>
-				<chance>
+			<effect name="AttackTrait">
+				<SHOCK>
 					<value level="1">1</value>
 					<value level="2">2</value>
 					<value level="3">3</value>
@@ -74,7 +50,7 @@
 					<value level="13">13</value>
 					<value level="14">14</value>
 					<value level="15">15</value>
-				</chance>
+				</SHOCK>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00200-00299.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00200-00299.xml
index 62768f732b..68627cbd26 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00200-00299.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00200-00299.xml
@@ -7289,7 +7289,7 @@
 		<abnormalLevel>1</abnormalLevel>
 		<abnormalTime>20</abnormalTime>
 		<abnormalType>REAL_TARGET</abnormalType>
-		<affectLimit>9-10</affectLimit>
+		<affectLimit>1-20</affectLimit>
 		<affectRange>
 			<value level="1">500</value>
 			<value level="2">700</value>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00400-00499.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00400-00499.xml
index 210cead22d..f729d9cd69 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00400-00499.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00400-00499.xml
@@ -3929,7 +3929,7 @@
 			<value level="9">66</value>
 			<value level="10">70</value>
 		</mpConsume>
-		<nextAction>ATTACK</nextAction>
+		<basicProperty>PHYSICAL</basicProperty>
 		<operateType>A1</operateType>
 		<reuseDelay>1000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -3960,7 +3960,6 @@
 				<ignoreShieldDefence>true</ignoreShieldDefence>
 				<pDefMod>0.9</pDefMod>
 				<criticalChance>10</criticalChance>
-				<overHit>true</overHit>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00500-00599.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00500-00599.xml
index 22f77c50f4..71d11d73fe 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00500-00599.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00500-00599.xml
@@ -95,7 +95,7 @@
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="MAtk">
 				<amount>-23</amount>
 				<mode>PER</mode>
 			</effect>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00600-00699.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00600-00699.xml
index e3eabe5b5b..963f94fe8f 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00600-00699.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00600-00699.xml
@@ -352,7 +352,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="622" toLevel="2" name="Ultimate Escape">
+	<skill id="622" toLevel="3" name="Ultimate Escape">
 		<!-- For $s1 P. Evasion +$s2 M. Evasion +$s2 P. Skill Evasion +$s3 M. Skill Evasion +$s3 Speed +$s4 -->
 		<icon>icon.skill0622</icon>
 		<abnormalLevel>1</abnormalLevel>
@@ -361,18 +361,25 @@
 		<effectPoint>
 			<value level="1">200</value>
 			<value level="2">300</value>
+			<value level="3">400</value>
 		</effectPoint>
 		<hitTime>1500</hitTime>
 		<magicLevel>
 			<value level="1">28</value>
 			<value level="2">52</value>
+			<value level="3">76</value>
 		</magicLevel>
 		<mpConsume>
 			<value level="1">40</value>
 			<value level="2">60</value>
+			<value level="3">60</value>
 		</mpConsume>
 		<operateType>A2</operateType>
-		<reuseDelay>900000</reuseDelay>
+		<reuseDelay>
+			<value level="1">900000</value>
+			<value level="2">900000</value>
+			<value level="3">600000</value>
+		</reuseDelay>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
@@ -382,6 +389,7 @@
 				<amount>
 					<value level="1">20</value>
 					<value level="2">35</value>
+					<value level="3">35</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -389,6 +397,7 @@
 				<amount>
 					<value level="1">20</value>
 					<value level="2">35</value>
+					<value level="3">35</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -397,6 +406,7 @@
 				<amount>
 					<value level="1">20</value>
 					<value level="2">30</value>
+					<value level="3">30</value>
 				</amount>
 			</effect>
 			<effect name="SkillEvasion">
@@ -404,15 +414,32 @@
 				<amount>
 					<value level="1">20</value>
 					<value level="2">30</value>
+					<value level="3">30</value>
 				</amount>
 			</effect>
 			<effect name="Speed">
 				<amount>
 					<value level="1">30</value>
 					<value level="2">40</value>
+					<value level="3">40</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="ResistAbnormalByCategory">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">20</value>
+				</amount>
+				<slot>DEBUFF</slot>
+			</effect>
+			<effect name="DefenceTrait">
+				<ANOMALY>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">20</value>
+				</ANOMALY>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="625" toLevel="1" name="Soul Gathering">
@@ -474,7 +501,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="627" toLevel="5" name="Mental Panic Shot">
+	<skill id="627" toLevel="10" name="Mental Panic Shot">
 		<!-- <Fear Skill> The effect lasts for $s1 Frightens the enemy. -->
 		<abnormalLevel>1</abnormalLevel>
 		<abnormalTime>3</abnormalTime>
@@ -490,9 +517,14 @@
 			<value level="3">-480</value>
 			<value level="4">-490</value>
 			<value level="5">-500</value>
+			<value level="6">-500</value>
+			<value level="7">-500</value>
+			<value level="8">-500</value>
+			<value level="9">-500</value>
+			<value level="10">-500</value>
 		</effectPoint>
-		<effectRange>600</effectRange>
-		<hitTime>1500</hitTime>
+		<effectRange>900</effectRange>
+		<hitTime>1800</hitTime>
 		<icon>icon.skill0101</icon>
 		<isDebuff>true</isDebuff>
 		<lvlBonusRate>20</lvlBonusRate>
@@ -502,6 +534,11 @@
 			<value level="3">80</value>
 			<value level="4">82</value>
 			<value level="5">84</value>
+			<value level="6">86</value>
+			<value level="7">88</value>
+			<value level="8">89</value>
+			<value level="9">90</value>
+			<value level="10">91</value>
 		</magicLevel>
 		<mpConsume>
 			<value level="1">40</value>
@@ -509,6 +546,11 @@
 			<value level="3">50</value>
 			<value level="4">55</value>
 			<value level="5">60</value>
+			<value level="6">65</value>
+			<value level="7">70</value>
+			<value level="8">75</value>
+			<value level="9">80</value>
+			<value level="10">85</value>
 		</mpConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>20000</reuseDelay>
@@ -517,6 +559,20 @@
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
+			<effect name="PhysicalAttack">
+				<power>
+					<value level="1">2651</value>
+					<value level="2">2739</value>
+					<value level="3">2827</value>
+					<value level="4">2915</value>
+					<value level="5">3005</value>
+					<value level="6">7737</value>
+					<value level="7">7964</value>
+					<value level="8">8078</value>
+					<value level="9">8192</value>
+					<value level="10">8307</value>
+				</power>
+			</effect>
 			<effect name="BlockControl" />
 			<effect name="Fear" />
 		</effects>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00700-00799.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00700-00799.xml
index 77d447c39b..d5d7d1339b 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00700-00799.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00700-00799.xml
@@ -3497,8 +3497,6 @@
 		<abnormalType>PARALYZE</abnormalType>
 		<abnormalVisualEffect>PARALYZE</abnormalVisualEffect>
 		<activateRate>50</activateRate>
-		<affectLimit>6-12</affectLimit>
-		<affectRange>150</affectRange>
 		<castRange>600</castRange>
 		<basicProperty>MAGIC</basicProperty>
 		<coolTime>720</coolTime>
@@ -3532,9 +3530,8 @@
 		<soulMaxConsumeCount>5</soulMaxConsumeCount>
 		<magicCriticalRate>5</magicCriticalRate>
 		<trait>ANOMALY</trait>
-		<targetType>SELF</targetType>
-		<affectScope>POINT_BLANK</affectScope>
-		<affectObject>NOT_FRIEND</affectObject>
+		<targetType>ENEMY_ONLY</targetType>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="BlockActions" />
 		</effects>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45100-45199.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45100-45199.xml
index d48644eb12..81944c4e4a 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45100-45199.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45100-45199.xml
@@ -54,7 +54,7 @@
 					<value level="1">15</value>
 					<value level="2">23</value>
 					<value level="3">30</value>
-					<value level="3">33</value>
+					<value level="4">33</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
@@ -126,7 +126,7 @@
 			<value level="3">76</value>
 		</magicLevel>
 		<itemConsumeCount>
-			<value level="1">0</value>
+			<value level="1">3</value>
 			<value level="2">3</value>
 			<value level="3">5</value>
 		</itemConsumeCount>
@@ -142,7 +142,7 @@
 				<amount>
 					<value level="1">10</value>
 					<value level="2">20</value>
-					<value level="2">30</value>
+					<value level="3">30</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -210,7 +210,7 @@
 			<value level="3">76</value>
 		</magicLevel>
 		<itemConsumeCount>
-			<value level="1">0</value>
+			<value level="1">3</value>
 			<value level="2">3</value>
 			<value level="3">5</value>
 		</itemConsumeCount>
@@ -318,7 +318,7 @@
 					<value level="1">25</value>
 					<value level="2">30</value>
 					<value level="3">35</value>
-					<value level="3">38</value>
+					<value level="4">38</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
@@ -339,7 +339,7 @@
 		<hitTime>1000</hitTime>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<itemConsumeCount>
-			<value level="1">0</value>
+			<value level="1">3</value>
 			<value level="2">3</value>
 			<value level="3">5</value>
 		</itemConsumeCount>
@@ -3263,6 +3263,19 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<itemConsumeCount>
+			<value level="1">2</value>
+			<value level="2">2</value>
+			<value level="3">2</value>
+			<value level="4">2</value>
+			<value level="5">2</value>
+			<value level="6">3</value>
+			<value level="7">3</value>
+			<value level="8">3</value>
+			<value level="9">4</value>
+			<value level="10">5</value>
+		</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -3343,32 +3356,35 @@
 			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="5">
 				<attackerType>Creature</attackerType>
 				<minDamage>1</minDamage>
-				<chance>80</chance>
+				<chance>100</chance>
 				<targetType>ENEMY</targetType>
 				<isCritical>false</isCritical>
 				<allowWeapons>BOW</allowWeapons>
 				<skillId>45173</skillId> <!-- Aim Guidance -->
 				<skillLevel>1</skillLevel>
+				<allowedSkills>true</allowedSkills>
 			</effect>
 			<effect name="TriggerSkillByAttack" fromLevel="6" toLevel="8">
 				<attackerType>Creature</attackerType>
 				<minDamage>1</minDamage>
-				<chance>80</chance>
+				<chance>100</chance>
 				<targetType>ENEMY</targetType>
 				<isCritical>false</isCritical>
 				<allowWeapons>BOW</allowWeapons>
 				<skillId>45173</skillId> <!-- Aim Guidance -->
 				<skillLevel>2</skillLevel>
+				<allowedSkills>true</allowedSkills>
 			</effect>
 			<effect name="TriggerSkillByAttack" fromLevel="9" toLevel="9">
 				<attackerType>Creature</attackerType>
 				<minDamage>1</minDamage>
-				<chance>80</chance>
+				<chance>100</chance>
 				<targetType>ENEMY</targetType>
 				<isCritical>false</isCritical>
 				<allowWeapons>BOW</allowWeapons>
 				<skillId>45173</skillId> <!-- Aim Guidance -->
 				<skillLevel>3</skillLevel>
+				<allowedSkills>true</allowedSkills>
 			</effect>
 		</effects>
 	</skill>
@@ -3376,15 +3392,17 @@
 		<!-- Bow Resistance -$s1. -->
 		<icon>icon.skill0506</icon>
 		<operateType>A2</operateType>
+		<abnormalType>REAL_TARGET</abnormalType>
+		<abnormalVisualEffect>REAL_TARGET</abnormalVisualEffect>
 		<isDebuff>true</isDebuff>
-		<castRange>1100</castRange>
-		<effectRange>1400</effectRange>
-		<hitTime>1000</hitTime>
 		<reuseDelay>10000</reuseDelay>
 		<isTriggeredSkill>true</isTriggeredSkill>
-		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>15</abnormalTime>
-		<activateRate>-1</activateRate>
+		<abnormalLevel>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+		</abnormalLevel>
+		<abnormalTime>30</abnormalTime>
 		<effectPoint>
 			<value level="1">-400</value>
 			<value level="2">-500</value>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45200-45299.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45200-45299.xml
index 330c6f4108..b243330f48 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45200-45299.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45200-45299.xml
@@ -6407,12 +6407,33 @@
 	</skill>
 	<skill id="45251" toLevel="1" name="Enhanced Assault">
 		<!-- When the Rush skill is used, the stun effect is added (Cooldown: 20 sec.) Increases a chance to stun the enemy after using the Rush Impact skill (Cooldown: 20 sec.) -->
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>76</magicLevel>
+		<effects>
+			<effect name="ReplaceSkillBySkill">
+				<existingSkillId>994</existingSkillId> <!-- Rush -->
+				<replacementSkillId>45252</replacementSkillId> <!-- Rush -->
+			</effect>
+		</effects>
 	</skill>
 	<skill id="45252" toLevel="3" name="Rush">
 		<!-- <Shock skill> Charges into the target. With a certain chance, stuns them. Can be used if the distance between the target and the character is more than $s1. -->
 		<icon>icon.skill0493</icon>
-		<operateType>DA1</operateType>
+		<operateType>DA2</operateType>
+		<reuseDelay>3000</reuseDelay>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<castRange>
+			<value level="1">400</value>
+			<value level="2">450</value>
+			<value level="3">500</value>
+		</castRange>
+		<coolTime>200</coolTime>
+		<effectRange>600</effectRange>
+		<hitTime>800</hitTime>
 		<effectPoint>
 			<value level="1">-300</value>
 			<value level="2">-400</value>
@@ -6423,6 +6444,32 @@
 			<value level="2">40</value>
 			<value level="3">45</value>
 		</mpConsume>
+		<abnormalLevel>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+		</abnormalLevel>
+		<abnormalTime>3</abnormalTime>
+		<abnormalType>STUN</abnormalType>
+		<abnormalVisualEffect>STUN</abnormalVisualEffect>
+		<activateRate>60</activateRate>
+		<isDebuff>true</isDebuff>
+		<lvlBonusRate>20</lvlBonusRate>
+		<trait>ANOMALY</trait>
+		<conditions>
+			<condition name="OpCheckCastRange">
+				<distance>
+					<value level="1">150</value>
+					<value level="2">120</value>
+					<value level="3">100</value>
+				</distance>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="BlockActions">
+				<allowedSkills>35016</allowedSkills>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="45253" toLevel="3" name="Rush Impact">
 		<!-- <Shock skill> Rushes forward to attack enemies at the front with $s1 power. Stuns them for $s2 Can be used if the distance to the target is more than $s3. -->
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45300-45399.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45300-45399.xml
index 539bdd9e08..c65e773759 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45300-45399.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45300-45399.xml
@@ -1915,6 +1915,14 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<itemConsumeCount>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">2</value>
+			<value level="4">3</value>
+			<value level="5">3</value>
+		</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<conditions>
 			<condition name="DeathPoints">
 				<amount>20</amount>
@@ -1965,6 +1973,11 @@
 		<magicCriticalRate>-5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<itemConsumeCount>
+			<value level="1">3</value>
+			<value level="2">5</value>
+		</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<conditions>
 			<condition name="DeathPoints">
 				<amount>100</amount>
@@ -2032,6 +2045,8 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<itemConsumeCount>3</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<conditions>
 			<condition name="DeathPoints">
 				<amount>150</amount>
@@ -2105,6 +2120,14 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<itemConsumeCount>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">2</value>
+			<value level="4">3</value>
+			<value level="5">3</value>
+		</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<effects>
 			<effect name="PAtk">
 				<amount>
@@ -4174,6 +4197,19 @@
 	<skill id="45365" toLevel="1" name="Amazing Soul Smash Mastery">
 		<!-- Soul Smash is enhanced and replaced by Amazing Soul Smash. <Amazing Soul Smash Effect> Number of attacks is increased. Defense Ignore is increased. -->
 		<icon>icon.skill0477</icon>
+		<magicLevel>76</magicLevel>
+		<operateType>P</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<effects>
+			<effect name="ReplaceSkillBySkill">
+				<existingSkillId>477</existingSkillId> <!-- Soul Smash -->
+				<replacementSkillId>45366</replacementSkillId> <!-- Amazing Soul Smash -->
+			</effect>
+		</effects>
+	</skill>
+	<skill id="45366" toLevel="10" name="Amazing Soul Smash">
+		<!-- Attacks the target twice with $s1 power. Ignores Shield Defense. Ignores $s2 of the target's defense. Critical. -->
+		<icon>icon.skill10013</icon>
 		<castRange>40</castRange>
 		<coolTime>500</coolTime>
 		<effectPoint>
@@ -4214,7 +4250,7 @@
 			<value level="9">66</value>
 			<value level="10">70</value>
 		</mpConsume>
-		<nextAction>ATTACK</nextAction>
+		<basicProperty>PHYSICAL</basicProperty>
 		<operateType>A1</operateType>
 		<reuseDelay>1000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -4228,83 +4264,6 @@
 				</weaponType>
 			</condition>
 		</conditions>
-		<effects>
-			<effect name="PhysicalAttack">
-				<power>
-					<value level="1">310</value>
-					<value level="2">430</value>
-					<value level="3">981</value>
-					<value level="4">1720</value>
-					<value level="5">2484</value>
-					<value level="6">3271</value>
-					<value level="7">3671</value>
-					<value level="8">4715</value>
-					<value level="9">5035</value>
-					<value level="10">5356</value>
-				</power>
-				<ignoreShieldDefence>true</ignoreShieldDefence>
-				<pDefMod>1.2</pDefMod>
-				<criticalChance>10</criticalChance>
-				<overHit>true</overHit>
-			</effect>
-		</effects>
-	</skill>
-	<skill id="45366" toLevel="10" name="Amazing Soul Smash">
-		<!-- Attacks the target twice with $s1 power. Ignores Shield Defense. Ignores $s2 of the target's defense. Critical. -->
-		<castRange>40</castRange>
-		<coolTime>300</coolTime>
-		<effectPoint>
-			<value level="1">-183</value>
-			<value level="2">-188</value>
-			<value level="3">-193</value>
-			<value level="4">-198</value>
-			<value level="5">-203</value>
-			<value level="6">-208</value>
-			<value level="7">-213</value>
-			<value level="8">-218</value>
-			<value level="9">-223</value>
-			<value level="10">-228</value>
-		</effectPoint>
-		<effectRange>400</effectRange>
-		<hitTime>2100</hitTime>
-		<magicLevel>
-			<value level="1">38</value>
-			<value level="2">39</value>
-			<value level="3">40</value>
-			<value level="4">41</value>
-			<value level="5">42</value>
-			<value level="6">43</value>
-			<value level="7">44</value>
-			<value level="8">45</value>
-			<value level="9">46</value>
-			<value level="10">47</value>
-		</magicLevel>
-		<mpConsume>
-			<value level="1">18</value>
-			<value level="2">25</value>
-			<value level="3">33</value>
-			<value level="4">40</value>
-			<value level="5">48</value>
-			<value level="6">55</value>
-			<value level="7">59</value>
-			<value level="8">63</value>
-			<value level="9">66</value>
-			<value level="10">70</value>
-		</mpConsume>
-		<nextAction>ATTACK</nextAction>
-		<operateType>A1</operateType>
-		<reuseDelay>3000</reuseDelay>
-		<magicCriticalRate>5</magicCriticalRate>
-		<targetType>ENEMY</targetType>
-		<affectScope>SINGLE</affectScope>
-		<conditions>
-			<condition name="Op2hWeapon">
-				<weaponType>
-					<item>SWORD</item>
-					<item>ANCIENTSWORD</item>
-				</weaponType>
-			</condition>
-		</conditions>
 		<effects>
 			<effect name="PhysicalAttack">
 				<power>
@@ -4320,8 +4279,25 @@
 					<value level="10">2812</value>
 				</power>
 				<pDefMod>0.85</pDefMod>
-				<overHit>true</overHit>
 				<ignoreShieldDefence>true</ignoreShieldDefence>
+				<criticalChance>15</criticalChance>
+			</effect>
+			<effect name="PhysicalAttack">
+				<power>
+					<value level="1">163</value>
+					<value level="2">226</value>
+					<value level="3">515</value>
+					<value level="4">903</value>
+					<value level="5">1305</value>
+					<value level="6">1717</value>
+					<value level="7">1927</value>
+					<value level="8">2475</value>
+					<value level="9">2643</value>
+					<value level="10">2812</value>
+				</power>
+				<pDefMod>0.85</pDefMod>
+				<ignoreShieldDefence>true</ignoreShieldDefence>
+				<criticalChance>10</criticalChance>
 			</effect>
 			<!-- TODO: A new effect is needed for this, "increased damage if the target is stunned". -->
 		</effects>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47000-47099.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47000-47099.xml
index 5b64b7b376..3e3714e1da 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47000-47099.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47000-47099.xml
@@ -2352,6 +2352,8 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<itemConsumeCount>2</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47300-47399.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47300-47399.xml
index 9b21a058af..9f6195932c 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47300-47399.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47300-47399.xml
@@ -3128,33 +3128,38 @@
 					<value level="3">15</value>
 				</SUPPRESSION>
 			</effect>
-			<effect name="TriggerSkillBySkillAttack" fromLevel="1" toLevel="3">
-				<attackSkillId>19</attackSkillId> <!-- Double Shot -->
+			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="1">
 				<attackerType>Creature</attackerType>
-				<minDamage>100</minDamage>
+				<minDamage>1</minDamage>
 				<chance>100</chance>
 				<targetType>ENEMY</targetType>
+				<isCritical>false</isCritical>
 				<allowWeapons>BOW</allowWeapons>
 				<skillId>47397</skillId> <!-- Bow Vulnerability -->
-				<skillLevel>
-					<value level="1">1</value>
-					<value level="2">2</value>
-					<value level="3">3</value>
-				</skillLevel>
+				<skillLevel>1</skillLevel>
+				<allowSkillAttack>true</allowSkillAttack>
 			</effect>
-			<effect name="TriggerSkillBySkillAttack" fromLevel="1" toLevel="3">
-				<attackSkillId>343</attackSkillId> <!-- Lethal Shot -->
+			<effect name="TriggerSkillByAttack" fromLevel="2" toLevel="2">
 				<attackerType>Creature</attackerType>
-				<minDamage>100</minDamage>
+				<minDamage>1</minDamage>
 				<chance>100</chance>
 				<targetType>ENEMY</targetType>
+				<isCritical>false</isCritical>
 				<allowWeapons>BOW</allowWeapons>
 				<skillId>47397</skillId> <!-- Bow Vulnerability -->
-				<skillLevel>
-					<value level="1">1</value>
-					<value level="2">2</value>
-					<value level="3">3</value>
-				</skillLevel>
+				<skillLevel>2</skillLevel>
+				<allowSkillAttack>true</allowSkillAttack>
+			</effect>
+			<effect name="TriggerSkillByAttack" fromLevel="3" toLevel="3">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<chance>100</chance>
+				<targetType>ENEMY</targetType>
+				<isCritical>false</isCritical>
+				<allowWeapons>BOW</allowWeapons>
+				<skillId>47397</skillId> <!-- Bow Vulnerability -->
+				<skillLevel>3</skillLevel>
+				<allowSkillAttack>true</allowSkillAttack>
 			</effect>
 		</effects>
 	</skill>
@@ -3172,8 +3177,8 @@
 		</effectPoint>
 		<effectRange>1200</effectRange>
 		<abnormalTime>30</abnormalTime>
-		<abnormalType>TRUE_AIM</abnormalType>
-		<abnormalVisualEffect>REAL_TARGET</abnormalVisualEffect>
+		<abnormalType>REAL_TARGET</abnormalType>
+		<abnormalVisualEffect>V_ARCHER_TRUE_TARGET_AVE</abnormalVisualEffect>
 		<operateType>A2</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<basicProperty>NONE</basicProperty>
@@ -3198,13 +3203,171 @@
 		</effects>
 	</skill>
 	<skill id="47398" toLevel="3" name="Deadly Shooter">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
 		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<abnormalLevel>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+		</abnormalLevel>
+		<abnormalTime>1200</abnormalTime>
+		<abnormalType>DEADLY_SHOOTER</abnormalType>
+		<operateType>A2</operateType>
+		<hitTime>2500</hitTime>
+		<reuseDelay>10000</reuseDelay>
+		<magicLevel>
+			<value level="1">85</value>
+			<value level="2">88</value>
+			<value level="3">91</value>
+		</magicLevel>
+		<mpConsume>
+			<value level="1">85</value>
+			<value level="2">88</value>
+			<value level="3">91</value>
+		</mpConsume>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<itemConsumeCount>
+			<value level="1">8</value>
+			<value level="2">9</value>
+			<value level="3">10</value>
+		</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>BOW</item>
+				</weaponType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="PAtk">
+				<amount>
+					<value level="1">8</value>
+					<value level="2">12</value>
+					<value level="3">20</value>
+				</amount>
+				<mode>PER</mode>
+				<weaponType>
+					<item>BOW</item>
+				</weaponType>
+			</effect>
+			<effect name="PhysicalSkillPower">
+				<amount>
+					<value level="1">16</value>
+					<value level="2">16</value>
+					<value level="3">18</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="AttackTrait">
+				<FEAR>
+					<value level="1">5</value>
+					<value level="2">8</value>
+					<value level="3">15</value>
+				</FEAR>
+				<HOLD>
+					<value level="1">5</value>
+					<value level="2">8</value>
+					<value level="3">15</value>
+				</HOLD>
+			</effect>
+			<effect name="Accuracy">
+				<amount>10</amount>
+				<mode>DIFF</mode>
+				<weaponType>
+					<item>BOW</item>
+				</weaponType>
+			</effect>
+			<effect name="PAtk">
+				<amount>
+					<value level="1">400</value>
+					<value level="2">450</value>
+					<value level="3">500</value>
+				</amount>
+				<mode>DIFF</mode>
+				<weaponType>
+					<item>BOW</item>
+				</weaponType>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<amount>
+					<value level="1">50</value>
+					<value level="2">70</value>
+					<value level="3">90</value>
+				</amount>
+				<mode>DIFF</mode>
+				<weaponType>
+					<item>BOW</item>
+				</weaponType>
+			</effect>
+			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="1">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<chance>100</chance>
+				<targetType>ENEMY</targetType>
+				<isCritical>false</isCritical>
+				<allowWeapons>BOW</allowWeapons>
+				<skillId>47399</skillId> <!-- Aim Guidance -->
+				<skillLevel>1</skillLevel>
+				<allowSkillAttack>true</allowSkillAttack>
+			</effect>
+			<effect name="TriggerSkillByAttack" fromLevel="2" toLevel="2">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<chance>100</chance>
+				<targetType>ENEMY</targetType>
+				<isCritical>false</isCritical>
+				<allowWeapons>BOW</allowWeapons>
+				<skillId>47399</skillId> <!-- Aim Guidance -->
+				<skillLevel>2</skillLevel>
+				<allowSkillAttack>true</allowSkillAttack>
+			</effect>
+			<effect name="TriggerSkillByAttack" fromLevel="3" toLevel="3">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<chance>100</chance>
+				<targetType>ENEMY</targetType>
+				<isCritical>false</isCritical>
+				<allowWeapons>BOW</allowWeapons>
+				<skillId>47399</skillId> <!-- Aim Guidance -->
+				<skillLevel>3</skillLevel>
+				<allowSkillAttack>true</allowSkillAttack>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="47399" toLevel="3" name="Aim Guidance">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
 		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalType>REAL_TARGET</abnormalType>
+		<abnormalVisualEffect>V_ARCHER_SHAPE_SHOOTER_AVE</abnormalVisualEffect>
+		<isDebuff>true</isDebuff>
+		<reuseDelay>10000</reuseDelay>
+		<isTriggeredSkill>true</isTriggeredSkill>
+		<effectRange>1200</effectRange>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<abnormalLevel>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+		</abnormalLevel>
+		<abnormalTime>30</abnormalTime>
+		<effectPoint>
+			<value level="1">-400</value>
+			<value level="2">-500</value>
+			<value level="3">-600</value>
+		</effectPoint>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<BOW>
+					<value level="1">-30</value>
+					<value level="2">-33</value>
+					<value level="3">-40</value>
+				</BOW>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47400-47499.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47400-47499.xml
index f65f84390f..9f29baa607 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47400-47499.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47400-47499.xml
@@ -77,14 +77,88 @@
 		</effects>
 	</skill>
 	<skill id="47402" toLevel="3" name="Chain Arrest">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
 		<icon>icon.skill0000</icon>
+		<affectLimit>1-20</affectLimit>
+		<affectRange>200</affectRange>
+		<castRange>900</castRange>
+		<effectPoint>
+			<value level="1">-405</value>
+			<value level="2">-405</value>
+			<value level="3">-405</value>
+		</effectPoint>
+		<effectRange>1200</effectRange>
+		<hitTime>2000</hitTime>
+		<magicLevel>
+			<value level="1">82</value>
+			<value level="2">85</value>
+			<value level="3">88</value>
+		</magicLevel>
+		<mpConsume>
+			<value level="1">131</value>
+			<value level="2">139</value>
+			<value level="3">147</value>
+		</mpConsume>
 		<operateType>A1</operateType>
+		<reuseDelay>30000</reuseDelay>
+		<magicCriticalRate>5</magicCriticalRate>
+		<basicProperty>PHYSICAL</basicProperty>
+		<targetType>ENEMY_ONLY</targetType>
+		<affectScope>RANGE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>BOW</item>
+				</weaponType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="PhysicalAttack">
+				<power>
+					<value level="1">9750</value>
+					<value level="2">10520</value>
+					<value level="3">11304</value>
+				</power>
+				<criticalChance>15</criticalChance>
+				<ignoreShieldDefence>true</ignoreShieldDefence>
+				<pDefMod>0.85</pDefMod>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>47403</skillId> <!-- Chain Arrest -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+				</skillLevel>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="47403" toLevel="3" name="Chain Arrest">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
 		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<abnormalLevel>1</abnormalLevel>
+		<abnormalTime>3</abnormalTime>
+		<abnormalType>ROOT_PHYSICALLY</abnormalType>
+		<abnormalVisualEffect>ROOT</abnormalVisualEffect>
+		<activateRate>80</activateRate>
+		<affectLimit>1-20</affectLimit>
+		<affectRange>200</affectRange>
+		<basicProperty>PHYSICAL</basicProperty>
+		<effectPoint>
+			<value level="1">-405</value>
+			<value level="2">-405</value>
+			<value level="3">-405</value>
+		</effectPoint>
+		<isDebuff>true</isDebuff>
+		<operateType>A2</operateType>
+		<reuseDelay>30000</reuseDelay>
+		<magicCriticalRate>5</magicCriticalRate>
+		<trait>ANOMALY</trait>
+		<targetType>ENEMY_ONLY</targetType>
+		<affectScope>RANGE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<effects>
+			<effect name="Root" />
+		</effects>
 	</skill>
 	<skill id="47404" toLevel="2" name="Flame Arrow">
 		<icon>icon.skill0000</icon>
@@ -386,9 +460,49 @@
 		</effects>
 	</skill>
 	<skill id="47410" toLevel="2" name="Devious Shot">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
 		<icon>icon.skill0000</icon>
+		<affectLimit>1-20</affectLimit>
+		<affectRange>200</affectRange>
+		<castRange>900</castRange>
+		<coolTime>500</coolTime>
+		<effectPoint>
+			<value level="1">-620</value>
+			<value level="2">-770</value>
+		</effectPoint>
+		<effectRange>1200</effectRange>
+		<hitTime>2500</hitTime>
+		<magicLevel>
+			<value level="1">85</value>
+			<value level="2">88</value>
+		</magicLevel>
+		<mpConsume>
+			<value level="1">101</value>
+			<value level="2">108</value>
+		</mpConsume>
 		<operateType>A1</operateType>
+		<reuseDelay>20000</reuseDelay>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>ENEMY</targetType>
+		<affectScope>RANGE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>BOW</item>
+				</weaponType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="PhysicalAttack">
+				<power>
+					<value level="1">9147</value>
+					<value level="2">10361</value>
+				</power>
+				<criticalChance>15</criticalChance>
+				<ignoreShieldDefence>true</ignoreShieldDefence>
+				<pDefMod>0.90</pDefMod>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="47411" toLevel="3" name="Steady Aim">
 		<icon>icon.skill0000</icon>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50400-50499.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50400-50499.xml
index 98ae4e6549..6227bcea5b 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50400-50499.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50400-50499.xml
@@ -1712,6 +1712,14 @@
 		</effects>
 	</skill>
 	<skill id="50444" toLevel="6" name="Queen Ant's Ring">
+		<!-- 
+		Lv. 1 Max MP +9, P.Accuracy +1, M.Accuracy +1, P.Atk. +4%, M.Atk. +4%, Infection Atk. Rate +10%, Infection Resistance +10%
+		Lv. 2 Max MP +15, P.Accuracy +2, M.Accuracy +2, P.Atk. +6%, M.Atk. +6%, Infection Atk. Rate +15%, Infection Resistance +15%
+		Lv. 3 Max MP +21, P.Accuracy +3, M.Accuracy +3, P.Atk. +7%, M.Atk. +7%, P. Def +35, M.Def +35, P. Critical Damage +10%, M. Skill Critical Damage +5%, Infection Atk. Rate +20%, Infection Resistance +20%
+		Lv. 4 Max MP +30, P.Accuracy +4, M.Accuracy +4, P.Atk. +9%, M.Atk. +9%, P. Def +65, M.Def +65, All Critical Damage +10%, Infection Atk. Rate +20%, Infection Resistance +20%
+		Lv. 5 Max MP +40, P.Accuracy +6, M.Accuracy +6, P.Atk. +11%, M.Atk. +11%, P. Def +95, M.Def +95, All Critical Damage +15%, Infection Atk. Rate +20%, Infection Resistance +20%
+		Lv. 6 Max MP +50, P.Accuracy +10, M.Accuracy +10, P.Atk. +15%, M.Atk. +15%, P. Def +125, M.Def +125, All Critical Damage +20%, Potion Atk. Rate +20%, Infection Atk. Rate +20%, Infection Resistance +20%, Applies the Queen Ant Power buff when hit. (Cooldown: 300 sec.)
+		-->
 		<icon>icon.skill0000</icon>
 		<operateType>P</operateType>
 		<effects>
@@ -1799,18 +1807,9 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalSkillCriticalDamage" fromLevel="3" toLevel="6">
-				<amount>
-					<value level="3">10</value>
-					<value level="4">10</value>
-					<value level="5">15</value>
-					<value level="6">20</value>
-				</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="MagicCriticalDamage" fromLevel="3" toLevel="6">
 				<amount>
-					<value level="3">10</value>
+					<value level="3">5</value>
 					<value level="4">10</value>
 					<value level="5">15</value>
 					<value level="6">20</value>
@@ -1917,37 +1916,64 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="DamageByAttack">
+			<effect name="PvePhysicalAttackDamageBonus">
 				<amount>
-					<value level="1">-2</value>
-					<value level="2">-4</value>
-					<value level="3">-6</value>
-					<value level="4">-8</value>
-					<value level="5">-10</value>
-					<value level="6">-15</value>
-				</amount>
-				<type>PK</type>
-			</effect>
-			<effect name="DamageByAttack">
-				<amount>
-					<value level="1">-2</value>
-					<value level="2">-4</value>
-					<value level="3">-6</value>
-					<value level="4">-8</value>
-					<value level="5">-10</value>
-					<value level="6">-15</value>
+					<value level="1">2</value>
+					<value level="2">4</value>
+					<value level="3">6</value>
+					<value level="4">8</value>
+					<value level="5">10</value>
+					<value level="6">15</value>
 				</amount>
 				<type>ENEMY_ALL</type>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvePhysicalSkillDamageBonus">
+				<amount>
+					<value level="1">2</value>
+					<value level="2">4</value>
+					<value level="3">6</value>
+					<value level="4">8</value>
+					<value level="5">10</value>
+					<value level="6">15</value>
+				</amount>
+				<type>ENEMY_ALL</type>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalAttackDamageBonus">
+				<amount>
+					<value level="1">2</value>
+					<value level="2">4</value>
+					<value level="3">6</value>
+					<value level="4">8</value>
+					<value level="5">10</value>
+					<value level="6">15</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDamageBonus">
+				<amount>
+					<value level="1">2</value>
+					<value level="2">4</value>
+					<value level="3">6</value>
+					<value level="4">8</value>
+					<value level="5">10</value>
+					<value level="6">15</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDamageBonus">
+				<amount>
+					<value level="1">2</value>
+					<value level="2">4</value>
+					<value level="3">6</value>
+					<value level="4">8</value>
+					<value level="5">10</value>
+					<value level="6">15</value>
+				</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="AttackTrait">
-				<SILENCE>
-					<value level="1">10</value>
-					<value level="2">15</value>
-					<value level="3">20</value>
-					<value level="4">20</value>
-					<value level="5">20</value>
-					<value level="6">20</value>
-				</SILENCE>
 				<FEAR>
 					<value level="1">10</value>
 					<value level="2">15</value>
@@ -1958,22 +1984,14 @@
 				</FEAR>
 			</effect>
 			<effect name="DefenceTrait">
-				<SILENCE>
+				<SLEEP>
 					<value level="1">10</value>
 					<value level="2">15</value>
 					<value level="3">20</value>
 					<value level="4">20</value>
 					<value level="5">20</value>
 					<value level="6">20</value>
-				</SILENCE>
-				<FEAR>
-					<value level="1">10</value>
-					<value level="2">15</value>
-					<value level="3">20</value>
-					<value level="4">20</value>
-					<value level="5">20</value>
-					<value level="6">20</value>
-				</FEAR>
+				</SLEEP>
 			</effect>
 			<effect name="PAtk">
 				<amount>
@@ -1995,20 +2013,20 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="TriggerSkillByDamage" fromLevel="6" toLevel="6">
+			<effect name="TriggerSkillByAttack" fromLevel="6" toLevel="6">
 				<attackerType>Creature</attackerType>
 				<minDamage>1</minDamage>
 				<chance>3</chance>
-				<targetType>SELF</targetType>
+				<targetType>ENEMY_ONLY</targetType>
 				<isCritical>false</isCritical>
 				<skillId>50452</skillId> <!-- Core Power -->
 				<skillLevel>1</skillLevel>
 			</effect>
-			<effect name="TriggerSkillByDamage" fromLevel="6" toLevel="6">
+			<effect name="TriggerSkillByAttack" fromLevel="6" toLevel="6">
 				<attackerType>Creature</attackerType>
 				<minDamage>1</minDamage>
 				<chance>3</chance>
-				<targetType>SELF</targetType>
+				<targetType>ENEMY_ONLY</targetType>
 				<isCritical>true</isCritical>
 				<skillId>50452</skillId> <!-- Core Power -->
 				<skillLevel>1</skillLevel>
@@ -2151,16 +2169,6 @@
 					<value level="6">23</value>
 				</amount>
 			</effect>
-			<effect name="PhysicalSkillCriticalDamage">
-				<amount>
-					<value level="1">0</value>
-					<value level="2">0</value>
-					<value level="3">10</value>
-					<value level="4">15</value>
-					<value level="5">18</value>
-					<value level="6">23</value>
-				</amount>
-			</effect>
 			<effect name="MagicCriticalDamage">
 				<amount>
 					<value level="1">0</value>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/skill/AbnormalType.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/skill/AbnormalType.java
index f6820e6e1b..283a8ffdc9 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/skill/AbnormalType.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/skill/AbnormalType.java
@@ -258,6 +258,7 @@ public enum AbnormalType
 	STEADY_AIM(-1),
 	ALACRITY(-1),
 	EAGLE_EYE(-1),
+	DEADLY_SHOOTER(-1),
 	LEGENDARY_ARCHER(-1),
 	AB_HAWK_EYE(0),
 	ALL_ATTACK_DOWN(1),