From e7610831863ef7e609a225eda2d942b7dbb06e1b Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 22 Apr 2022 00:47:15 +0000
Subject: [PATCH] Various skill adjustments. Contributed by jimi3.

---
 .../game/data/stats/skills/00000-00099.xml    | 12 +--
 .../game/data/stats/skills/50200-50299.xml    | 74 ++++++++++++++++---
 .../game/data/stats/skills/00000-00099.xml    | 12 +--
 .../game/data/stats/skills/50200-50299.xml    | 74 ++++++++++++++++---
 .../game/data/stats/skills/00000-00099.xml    | 12 +--
 .../game/data/stats/skills/50200-50299.xml    | 74 ++++++++++++++++---
 .../game/data/stats/skills/00000-00099.xml    | 12 +--
 .../game/data/stats/skills/50200-50299.xml    | 74 ++++++++++++++++---
 8 files changed, 276 insertions(+), 68 deletions(-)

diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/00000-00099.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/00000-00099.xml
index ef283f98a8..7fc7d6a4a9 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/00000-00099.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/00000-00099.xml
@@ -766,6 +766,11 @@
 		</conditions>
 		<effects>
 			<effect name="EnergyAttack">
+				<ignoreShieldDefence>true</ignoreShieldDefence>
+				<pDefMod>0.90</pDefMod>
+				<overHit>true</overHit>
+				<chargeConsume>3</chargeConsume>
+				<criticalChance>15</criticalChance>
 				<power>
 					<value level="1">1106</value>
 					<value level="2">1183</value>
@@ -818,9 +823,6 @@
 					<value level="49">5556</value>
 					<value level="50">5623</value>
 				</power>
-				<overHit>true</overHit>
-				<chargeConsume>3</chargeConsume>
-				<criticalChance>15</criticalChance>
 			</effect>
 		</effects>
 	</skill>
@@ -1046,7 +1048,6 @@
 				</power>
 				<overHit>true</overHit>
 				<chargeConsume>2</chargeConsume>
-				<criticalChance>15</criticalChance>
 			</effect>
 			<effect name="BlockActions">
 				<allowedSkills>35016;35045;18103</allowedSkills>
@@ -1211,6 +1212,7 @@
 					<value level="30">482</value>
 					<value level="31">495</value>
 				</power>
+				<chargeConsume>2</chargeConsume>
 				<overHit>true</overHit>
 				<criticalChance>15</criticalChance>
 			</effect>
@@ -1459,7 +1461,7 @@
 					<value level="36">465</value>
 					<value level="37">469</value>
 				</power>
-				<chargeConsume>3</chargeConsume>
+				<chargeConsume>2</chargeConsume>
 				<overHit>true</overHit>
 				<criticalChance>15</criticalChance>
 			</effect>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50200-50299.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50200-50299.xml
index fd1d0facdc..998ce5b541 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50200-50299.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50200-50299.xml
@@ -2262,14 +2262,12 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="TriggerSkillBySkill">
-				<isCritical>true</isCritical>
-				<attackerType>Creature</attackerType>
+			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="11">
 				<chance>10</chance>
 				<targetType>SELF</targetType>
-				<minDamage>100</minDamage>
-				<allowWeapons>ALL</allowWeapons>
-				<skillId>50294</skillId>
+				<isCritical>true</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<skillId>50294</skillId> <!-- Elmoreden Spirit Hit -->
 				<castSkillId>50294</castSkillId>
 				<skillLevel>
 					<value level="1">1</value>
@@ -2284,15 +2282,40 @@
 					<value level="10">10</value>
 					<value level="11">11</value>
 				</skillLevel>
-			</effect>
-			<effect name="TriggerSkillByAttack">
-				<isCritical>true</isCritical>
+				<allowWeapons>ALL</allowWeapons>
 				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+			</effect>
+			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="11">
+				<chance>10</chance>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<skillId>50294</skillId> <!-- Elmoreden Spirit Hit -->
+				<castSkillId>50294</castSkillId>
+				<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>
+				</skillLevel>
+				<allowWeapons>ALL</allowWeapons>
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+			</effect>
+			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="11">
 				<chance>5</chance>
 				<targetType>SELF</targetType>
-				<minDamage>100</minDamage>
-				<allowWeapons>ALL</allowWeapons>
-				<skillId>50294</skillId>
+				<isCritical>true</isCritical>
+				<allowNormalAttack>true</allowNormalAttack>
+				<skillId>50294</skillId> <!-- Elmoreden Spirit Hit -->
 				<castSkillId>50294</castSkillId>
 				<skillLevel>
 					<value level="1">1</value>
@@ -2307,6 +2330,33 @@
 					<value level="10">10</value>
 					<value level="11">11</value>
 				</skillLevel>
+				<allowWeapons>ALL</allowWeapons>
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+			</effect>
+			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="11">
+				<chance>5</chance>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<allowNormalAttack>true</allowNormalAttack>
+				<skillId>50294</skillId> <!-- Elmoreden Spirit Hit -->
+				<castSkillId>50294</castSkillId>
+				<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>
+				</skillLevel>
+				<allowWeapons>ALL</allowWeapons>
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00000-00099.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00000-00099.xml
index 5d81717d9e..b53e505d9b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00000-00099.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00000-00099.xml
@@ -766,6 +766,11 @@
 		</conditions>
 		<effects>
 			<effect name="EnergyAttack">
+				<ignoreShieldDefence>true</ignoreShieldDefence>
+				<pDefMod>0.90</pDefMod>
+				<overHit>true</overHit>
+				<chargeConsume>3</chargeConsume>
+				<criticalChance>15</criticalChance>
 				<power>
 					<value level="1">1106</value>
 					<value level="2">1183</value>
@@ -818,9 +823,6 @@
 					<value level="49">5556</value>
 					<value level="50">5623</value>
 				</power>
-				<overHit>true</overHit>
-				<chargeConsume>3</chargeConsume>
-				<criticalChance>15</criticalChance>
 			</effect>
 		</effects>
 	</skill>
@@ -1038,7 +1040,6 @@
 				</power>
 				<overHit>true</overHit>
 				<chargeConsume>2</chargeConsume>
-				<criticalChance>15</criticalChance>
 			</effect>
 			<effect name="CallSkill">
 				<skillId>45496</skillId> <!-- Sonic Blaster -->
@@ -1250,6 +1251,7 @@
 					<value level="30">482</value>
 					<value level="31">495</value>
 				</power>
+				<chargeConsume>2</chargeConsume>
 				<overHit>true</overHit>
 				<criticalChance>15</criticalChance>
 			</effect>
@@ -1498,7 +1500,7 @@
 					<value level="36">465</value>
 					<value level="37">469</value>
 				</power>
-				<chargeConsume>3</chargeConsume>
+				<chargeConsume>2</chargeConsume>
 				<overHit>true</overHit>
 				<criticalChance>15</criticalChance>
 			</effect>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50200-50299.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50200-50299.xml
index a9ca81adfd..3751d3856c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50200-50299.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50200-50299.xml
@@ -3433,14 +3433,12 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="TriggerSkillBySkill">
-				<isCritical>true</isCritical>
-				<attackerType>Creature</attackerType>
+			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="11">
 				<chance>10</chance>
 				<targetType>SELF</targetType>
-				<minDamage>100</minDamage>
-				<allowWeapons>ALL</allowWeapons>
-				<skillId>50294</skillId>
+				<isCritical>true</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<skillId>50294</skillId> <!-- Elmoreden Spirit Hit -->
 				<castSkillId>50294</castSkillId>
 				<skillLevel>
 					<value level="1">1</value>
@@ -3455,15 +3453,40 @@
 					<value level="10">10</value>
 					<value level="11">11</value>
 				</skillLevel>
-			</effect>
-			<effect name="TriggerSkillByAttack">
-				<isCritical>true</isCritical>
+				<allowWeapons>ALL</allowWeapons>
 				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+			</effect>
+			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="11">
+				<chance>10</chance>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<skillId>50294</skillId> <!-- Elmoreden Spirit Hit -->
+				<castSkillId>50294</castSkillId>
+				<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>
+				</skillLevel>
+				<allowWeapons>ALL</allowWeapons>
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+			</effect>
+			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="11">
 				<chance>5</chance>
 				<targetType>SELF</targetType>
-				<minDamage>100</minDamage>
-				<allowWeapons>ALL</allowWeapons>
-				<skillId>50294</skillId>
+				<isCritical>true</isCritical>
+				<allowNormalAttack>true</allowNormalAttack>
+				<skillId>50294</skillId> <!-- Elmoreden Spirit Hit -->
 				<castSkillId>50294</castSkillId>
 				<skillLevel>
 					<value level="1">1</value>
@@ -3478,6 +3501,33 @@
 					<value level="10">10</value>
 					<value level="11">11</value>
 				</skillLevel>
+				<allowWeapons>ALL</allowWeapons>
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+			</effect>
+			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="11">
+				<chance>5</chance>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<allowNormalAttack>true</allowNormalAttack>
+				<skillId>50294</skillId> <!-- Elmoreden Spirit Hit -->
+				<castSkillId>50294</castSkillId>
+				<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>
+				</skillLevel>
+				<allowWeapons>ALL</allowWeapons>
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/00000-00099.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/00000-00099.xml
index 319bfa48fa..7793efbdca 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/00000-00099.xml
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/00000-00099.xml
@@ -770,6 +770,11 @@
 		</conditions>
 		<effects>
 			<effect name="EnergyAttack">
+				<ignoreShieldDefence>true</ignoreShieldDefence>
+				<pDefMod>0.90</pDefMod>
+				<overHit>true</overHit>
+				<chargeConsume>3</chargeConsume>
+				<criticalChance>15</criticalChance>
 				<power>
 					<value level="1">1106</value>
 					<value level="2">1183</value>
@@ -822,9 +827,6 @@
 					<value level="49">5556</value>
 					<value level="50">5623</value>
 				</power>
-				<overHit>true</overHit>
-				<chargeConsume>3</chargeConsume>
-				<criticalChance>15</criticalChance>
 			</effect>
 		</effects>
 	</skill>
@@ -1042,7 +1044,6 @@
 				</power>
 				<overHit>true</overHit>
 				<chargeConsume>2</chargeConsume>
-				<criticalChance>15</criticalChance>
 			</effect>
 			<effect name="CallSkill">
 				<skillId>45496</skillId> <!-- Sonic Blaster -->
@@ -1254,6 +1255,7 @@
 					<value level="30">482</value>
 					<value level="31">495</value>
 				</power>
+				<chargeConsume>2</chargeConsume>
 				<overHit>true</overHit>
 				<criticalChance>15</criticalChance>
 			</effect>
@@ -1502,7 +1504,7 @@
 					<value level="36">465</value>
 					<value level="37">469</value>
 				</power>
-				<chargeConsume>3</chargeConsume>
+				<chargeConsume>2</chargeConsume>
 				<overHit>true</overHit>
 				<criticalChance>15</criticalChance>
 			</effect>
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50200-50299.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50200-50299.xml
index a9ca81adfd..3751d3856c 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50200-50299.xml
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50200-50299.xml
@@ -3433,14 +3433,12 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="TriggerSkillBySkill">
-				<isCritical>true</isCritical>
-				<attackerType>Creature</attackerType>
+			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="11">
 				<chance>10</chance>
 				<targetType>SELF</targetType>
-				<minDamage>100</minDamage>
-				<allowWeapons>ALL</allowWeapons>
-				<skillId>50294</skillId>
+				<isCritical>true</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<skillId>50294</skillId> <!-- Elmoreden Spirit Hit -->
 				<castSkillId>50294</castSkillId>
 				<skillLevel>
 					<value level="1">1</value>
@@ -3455,15 +3453,40 @@
 					<value level="10">10</value>
 					<value level="11">11</value>
 				</skillLevel>
-			</effect>
-			<effect name="TriggerSkillByAttack">
-				<isCritical>true</isCritical>
+				<allowWeapons>ALL</allowWeapons>
 				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+			</effect>
+			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="11">
+				<chance>10</chance>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<skillId>50294</skillId> <!-- Elmoreden Spirit Hit -->
+				<castSkillId>50294</castSkillId>
+				<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>
+				</skillLevel>
+				<allowWeapons>ALL</allowWeapons>
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+			</effect>
+			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="11">
 				<chance>5</chance>
 				<targetType>SELF</targetType>
-				<minDamage>100</minDamage>
-				<allowWeapons>ALL</allowWeapons>
-				<skillId>50294</skillId>
+				<isCritical>true</isCritical>
+				<allowNormalAttack>true</allowNormalAttack>
+				<skillId>50294</skillId> <!-- Elmoreden Spirit Hit -->
 				<castSkillId>50294</castSkillId>
 				<skillLevel>
 					<value level="1">1</value>
@@ -3478,6 +3501,33 @@
 					<value level="10">10</value>
 					<value level="11">11</value>
 				</skillLevel>
+				<allowWeapons>ALL</allowWeapons>
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+			</effect>
+			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="11">
+				<chance>5</chance>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<allowNormalAttack>true</allowNormalAttack>
+				<skillId>50294</skillId> <!-- Elmoreden Spirit Hit -->
+				<castSkillId>50294</castSkillId>
+				<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>
+				</skillLevel>
+				<allowWeapons>ALL</allowWeapons>
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00000-00099.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00000-00099.xml
index 319bfa48fa..7793efbdca 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00000-00099.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00000-00099.xml
@@ -770,6 +770,11 @@
 		</conditions>
 		<effects>
 			<effect name="EnergyAttack">
+				<ignoreShieldDefence>true</ignoreShieldDefence>
+				<pDefMod>0.90</pDefMod>
+				<overHit>true</overHit>
+				<chargeConsume>3</chargeConsume>
+				<criticalChance>15</criticalChance>
 				<power>
 					<value level="1">1106</value>
 					<value level="2">1183</value>
@@ -822,9 +827,6 @@
 					<value level="49">5556</value>
 					<value level="50">5623</value>
 				</power>
-				<overHit>true</overHit>
-				<chargeConsume>3</chargeConsume>
-				<criticalChance>15</criticalChance>
 			</effect>
 		</effects>
 	</skill>
@@ -1042,7 +1044,6 @@
 				</power>
 				<overHit>true</overHit>
 				<chargeConsume>2</chargeConsume>
-				<criticalChance>15</criticalChance>
 			</effect>
 			<effect name="CallSkill">
 				<skillId>45496</skillId> <!-- Sonic Blaster -->
@@ -1254,6 +1255,7 @@
 					<value level="30">482</value>
 					<value level="31">495</value>
 				</power>
+				<chargeConsume>2</chargeConsume>
 				<overHit>true</overHit>
 				<criticalChance>15</criticalChance>
 			</effect>
@@ -1502,7 +1504,7 @@
 					<value level="36">465</value>
 					<value level="37">469</value>
 				</power>
-				<chargeConsume>3</chargeConsume>
+				<chargeConsume>2</chargeConsume>
 				<overHit>true</overHit>
 				<criticalChance>15</criticalChance>
 			</effect>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50200-50299.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50200-50299.xml
index f7016588a6..f88b79d6a8 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50200-50299.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50200-50299.xml
@@ -3433,14 +3433,12 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="TriggerSkillBySkill">
-				<isCritical>true</isCritical>
-				<attackerType>Creature</attackerType>
+			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="11">
 				<chance>10</chance>
 				<targetType>SELF</targetType>
-				<minDamage>100</minDamage>
-				<allowWeapons>ALL</allowWeapons>
-				<skillId>50294</skillId>
+				<isCritical>true</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<skillId>50294</skillId> <!-- Elmoreden Spirit Hit -->
 				<castSkillId>50294</castSkillId>
 				<skillLevel>
 					<value level="1">1</value>
@@ -3455,15 +3453,40 @@
 					<value level="10">10</value>
 					<value level="11">11</value>
 				</skillLevel>
-			</effect>
-			<effect name="TriggerSkillByAttack">
-				<isCritical>true</isCritical>
+				<allowWeapons>ALL</allowWeapons>
 				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+			</effect>
+			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="11">
+				<chance>10</chance>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
+				<skillId>50294</skillId> <!-- Elmoreden Spirit Hit -->
+				<castSkillId>50294</castSkillId>
+				<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>
+				</skillLevel>
+				<allowWeapons>ALL</allowWeapons>
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+			</effect>
+			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="11">
 				<chance>5</chance>
 				<targetType>SELF</targetType>
-				<minDamage>100</minDamage>
-				<allowWeapons>ALL</allowWeapons>
-				<skillId>50294</skillId>
+				<isCritical>true</isCritical>
+				<allowNormalAttack>true</allowNormalAttack>
+				<skillId>50294</skillId> <!-- Elmoreden Spirit Hit -->
 				<castSkillId>50294</castSkillId>
 				<skillLevel>
 					<value level="1">1</value>
@@ -3478,6 +3501,33 @@
 					<value level="10">10</value>
 					<value level="11">11</value>
 				</skillLevel>
+				<allowWeapons>ALL</allowWeapons>
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+			</effect>
+			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="11">
+				<chance>5</chance>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<allowNormalAttack>true</allowNormalAttack>
+				<skillId>50294</skillId> <!-- Elmoreden Spirit Hit -->
+				<castSkillId>50294</castSkillId>
+				<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>
+				</skillLevel>
+				<allowWeapons>ALL</allowWeapons>
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
 			</effect>
 		</effects>
 	</skill>