From a1af351f2d875ad6b580be4f9b6bb5630cd202f0 Mon Sep 17 00:00:00 2001
From: Nos <NosBit@users.noreply.github.com>
Date: Sat, 5 Oct 2013 18:25:25 +0000
Subject: [PATCH] BETA: Retail like implementation of `TriggerSkillByDamage`
 effect.

Reported by: lucan, CostyKiller, u3games, thorl2, Driad, oscard, pandragon, Maui, Konstantinos, kakaini
Reviewed by: UnAfraid, Zoey76
---
 .../effecthandlers/TriggerSkillByDamage.java  |  65 +++++-
 .../game/data/stats/skills/00400-00499.xml    |   6 +-
 .../game/data/stats/skills/00500-00599.xml    |  30 ++-
 .../game/data/stats/skills/00600-00699.xml    |  12 +-
 .../game/data/stats/skills/00700-00799.xml    |  54 ++++-
 .../game/data/stats/skills/00900-00999.xml    |   6 +-
 .../game/data/stats/skills/01400-01499.xml    |  72 +++++--
 .../game/data/stats/skills/01500-01599.xml    |  57 ++++-
 .../game/data/stats/skills/03200-03299.xml    | 186 +++++++++++++---
 .../game/data/stats/skills/03600-03699.xml    |  60 +++++-
 .../game/data/stats/skills/04400-04499.xml    |   6 +-
 .../game/data/stats/skills/05500-05599.xml    |  24 ++-
 .../game/data/stats/skills/05900-05999.xml    |   6 +-
 .../game/data/stats/skills/08100-08199.xml    |  42 +++-
 .../game/data/stats/skills/08200-08299.xml    | 198 +++++++++++++++---
 .../game/data/stats/skills/08300-08399.xml    |  36 +++-
 .../game/data/stats/skills/08400-08499.xml    |  54 ++++-
 17 files changed, 763 insertions(+), 151 deletions(-)

diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index e1fbbe34b7..68cd3632e6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -18,6 +18,12 @@
  */
 package handlers.effecthandlers;
 
+import java.util.logging.Logger;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
+import com.l2jserver.gameserver.handler.TargetHandler;
+import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.events.listeners.IDamageReceivedEventListener;
 import com.l2jserver.gameserver.model.effects.EffectTemplate;
@@ -25,6 +31,7 @@ import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.util.Rnd;
 
@@ -34,30 +41,38 @@ import com.l2jserver.util.Rnd;
  */
 public class TriggerSkillByDamage extends L2Effect implements IDamageReceivedEventListener
 {
-	private final int _minLevel;
-	private final int _maxLevel;
+	private static final Logger _log = Logger.getLogger(TriggerSkillByDamage.class.getName());
+	
+	private final int _minAttackerLevel;
+	private final int _maxAttackerLevel;
 	private final int _minDamage;
 	private final int _chance;
 	private final SkillHolder _skill;
+	private final L2TargetType _targetType;
+	private final InstanceType _attackerType;
 	
 	public TriggerSkillByDamage(Env env, EffectTemplate template)
 	{
 		super(env, template);
-		_minLevel = template.getParameters().getInt("minLevel", 1);
-		_maxLevel = template.getParameters().getInt("maxLevel", 100);
+		_minAttackerLevel = template.getParameters().getInt("minAttackerLevel", 1);
+		_maxAttackerLevel = template.getParameters().getInt("maxAttackerLevel", 100);
 		_minDamage = template.getParameters().getInt("minDamage", 1);
 		_chance = template.getParameters().getInt("chance", 100);
 		_skill = new SkillHolder(template.getParameters().getInt("skillId"), template.getParameters().getInt("skillLevel", 1));
+		_targetType = template.getParameters().getEnum("targetType", L2TargetType.class, L2TargetType.SELF);
+		_attackerType = template.getParameters().getEnum("attackerType", InstanceType.class, InstanceType.L2Character);
 	}
 	
 	public TriggerSkillByDamage(Env env, L2Effect effect)
 	{
 		super(env, effect);
-		_minLevel = effect.getEffectTemplate().getParameters().getInt("minLevel", 1);
-		_maxLevel = effect.getEffectTemplate().getParameters().getInt("maxLevel", 100);
+		_minAttackerLevel = effect.getEffectTemplate().getParameters().getInt("minAttackerLevel", 1);
+		_maxAttackerLevel = effect.getEffectTemplate().getParameters().getInt("maxAttackerLevel", 100);
 		_minDamage = effect.getEffectTemplate().getParameters().getInt("minDamage", 1);
 		_chance = effect.getEffectTemplate().getParameters().getInt("chance", 100);
 		_skill = new SkillHolder(effect.getEffectTemplate().getParameters().getInt("skillId"), effect.getEffectTemplate().getParameters().getInt("skillLevel", 1));
+		_targetType = effect.getEffectTemplate().getParameters().getEnum("targetType", L2TargetType.class, L2TargetType.SELF);
+		_attackerType = effect.getEffectTemplate().getParameters().getEnum("attackerType", InstanceType.class, InstanceType.L2Character);
 	}
 	
 	@Override
@@ -69,10 +84,42 @@ public class TriggerSkillByDamage extends L2Effect implements IDamageReceivedEve
 	@Override
 	public void onDamageReceivedEvent(L2Character attacker, L2Character target, double damage, L2Skill skill, boolean crit)
 	{
-		int level = getEffected().getLevel();
-		if (!getEffected().isInvul() && (level >= _minLevel) && (level <= _maxLevel) && (damage >= _minDamage) && (Rnd.get(100) < _chance))
+		final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType);
+		if (targetHandler == null)
+		{
+			_log.warning("Handler for target type: " + _targetType + " does not exist.");
+			return;
+		}
+		
+		if (attacker == target)
+		{
+			return;
+		}
+		
+		if ((attacker.getLevel() < _minAttackerLevel) || (attacker.getLevel() > _maxAttackerLevel))
+		{
+			return;
+		}
+		
+		if ((damage < _minDamage) || (Rnd.get(100) > _chance) || !attacker.getInstanceType().isType(_attackerType))
+		{
+			return;
+		}
+		
+		final L2Skill triggerSkill = _skill.getSkill();
+		final L2Object[] targets = targetHandler.getTargetList(triggerSkill, target, false, attacker);
+		for (L2Object triggerTarget : targets)
 		{
-			_skill.getSkill().getEffects(getEffected(), getEffected());
+			if ((triggerTarget == null) || !triggerTarget.isCharacter())
+			{
+				continue;
+			}
+			
+			final L2Character targetChar = (L2Character) triggerTarget;
+			if (!targetChar.isInvul())
+			{
+				target.makeTriggerCast(triggerSkill, targetChar);
+			}
 		}
 	}
 	
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
index c9d5032a9f..0a72670e10 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
@@ -1617,7 +1617,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param chance="80" skillId="5144" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="80" />
+				<param skillId="5144" skillLevel="1" /> <!-- Mirage -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml
index e19ba670b4..6fcfa73e65 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml
@@ -1095,7 +1095,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minDamage="100" chance="30" skillId="5425" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="30" />
+				<param skillId="5425" skillLevel="1" /> <!-- Iron Shield -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -1229,7 +1233,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minDamage="100" chance="5" skillId="5426" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="5" />
+				<param skillId="5426" skillLevel="1" /> <!-- Counter Chance -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -1241,7 +1249,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minDamage="100" chance="5" skillId="5427" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="5" />
+				<param skillId="5427" skillLevel="1" /> <!-- Counter Rapid Shot -->
+				<param targetType="PARTY" />
 			</effect>
 		</for>
 	</skill>
@@ -1253,7 +1265,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minDamage="100" chance="5" skillId="5428" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="5" />
+				<param skillId="5428" skillLevel="1" /> <!-- Counter Dash -->
+				<param targetType="PARTY" />
 			</effect>
 		</for>
 	</skill>
@@ -1265,7 +1281,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minDamage="100" chance="5" skillId="5429" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="5" />
+				<param skillId="5429" skillLevel="1" /> <!-- Counter Mind -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00600-00699.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00600-00699.xml
index 09d64033b5..9f496e87d9 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00600-00699.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00600-00699.xml
@@ -859,7 +859,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param chance="2" skillId="5573" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5573" skillLevel="1" /> <!-- Knight Ability - Defense -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -894,7 +898,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param chance="2" skillId="5576" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5576" skillLevel="1" /> <!-- Enchanter Ability - Barrier -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml
index 13b4ce6096..5129c62286 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml
@@ -1366,7 +1366,11 @@
 		<for>
 			<mul order="0x30" stat="mDef" val="1.15" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minDamage="300" chance="20" skillId="5556" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="300" />
+				<param chance="20" />
+				<param skillId="5556" skillLevel="1" /> <!-- Protection Power -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -1382,7 +1386,11 @@
 			<add order="0x40" stat="windRes" val="20" />
 			<add order="0x40" stat="earthRes" val="20" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minDamage="100" chance="20" skillId="5556" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="20" />
+				<param skillId="5556" skillLevel="1" /> <!-- Protection Power -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -1396,7 +1404,11 @@
 			<add order="0x40" stat="holyRes" val="20" />
 			<add order="0x40" stat="darkRes" val="20" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minDamage="100" chance="20" skillId="5556" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="20" />
+				<param skillId="5556" skillLevel="1" /> <!-- Protection Power -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -1489,7 +1501,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param chance="8" skillId="5561" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="1" />
+				<param chance="8" />
+				<param skillId="5561" skillLevel="1" /> <!-- Seed of Revenge -->
+				<param targetType="SELF" />
 				<add order="0x40" stat="pAtk" val="100" />
 			</effect>
 		</for>
@@ -1652,7 +1668,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param chance="5" skillId="5565" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="1" />
+				<param chance="5" />
+				<param skillId="5565" skillLevel="1" /> <!-- Expose Weak Point -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -2066,7 +2086,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param chance="20" skillId="5562" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="1" />
+				<param chance="20" />
+				<param skillId="5562" skillLevel="1" /> <!-- Spirit of Phoenix -->
+				<param targetType="SELF" />
 				<add order="0x40" stat="pDef" val="200" />
 			</effect>
 		</for>
@@ -2126,7 +2150,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param chance="20" skillId="5563" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="1" />
+				<param chance="20" />
+				<param skillId="5563" skillLevel="1" /> <!-- Eva's Will -->
+				<param targetType="SELF" />
 				<add order="0x40" stat="mDef" val="200" />
 			</effect>
 		</for>
@@ -2181,7 +2209,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param chance="20" skillId="5564" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="1" />
+				<param chance="20" />
+				<param skillId="5564" skillLevel="1" /> <!-- Pain of Shillien -->
+				<param targetType="SELF" />
 				<mul order="0x30" stat="cAtk" val="1.1" />
 			</effect>
 		</for>
@@ -2305,7 +2337,11 @@
 		<set name="targetType" val="ONE" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0" abnormalVisualEffect="poison">
-				<param chance="10" skillId="5600" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="1" />
+				<param chance="10" />
+				<param skillId="5600" skillLevel="1" /> <!-- Betrayal Mark -->
+				<param targetType="PARTY" />
 			</effect>
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml
index a7fbad80bc..1e83713921 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml
@@ -1895,7 +1895,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param chance="10" skillId="6687" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="1" />
+				<param chance="10" />
+				<param skillId="6687" skillLevel="1" /> <!-- Patience -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml
index 4ee570986f..831a1bd170 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml
@@ -2771,7 +2771,11 @@
 		<enchant2 name="power" val="#ench2Power" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0" abnormalVisualEffect="poison">
-				<param minDamage="100" chance="30" skillId="5448" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="30" />
+				<param skillId="5448" skillLevel="1" /> <!-- Oblivion -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -2817,7 +2821,11 @@
 		<enchant2 name="power" val="#ench2Power" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0" abnormalVisualEffect="poison">
-				<param minDamage="100" chance="30" skillId="5449" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="30" />
+				<param skillId="5449" skillLevel="1" /> <!-- Weak Constitution -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -2863,7 +2871,11 @@
 		<enchant2 name="power" val="#ench2Power" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0" abnormalVisualEffect="poison">
-				<param minDamage="100" chance="30" skillId="5450" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="30" />
+				<param skillId="5450" skillLevel="1" /> <!-- Tin Skin -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -2909,7 +2921,11 @@
 		<enchant2 name="power" val="#ench2Power" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0" abnormalVisualEffect="poison">
-				<param minDamage="100" chance="30" skillId="5451" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="30" />
+				<param skillId="5451" skillLevel="1" /> <!-- Enervation -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -2956,7 +2972,11 @@
 		<enchant2 name="power" val="#ench2Power" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0" abnormalVisualEffect="poison">
-				<param minDamage="100" chance="30" skillId="5452" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="30" />
+				<param skillId="5452" skillLevel="1" /> <!-- Spite -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -3003,7 +3023,11 @@
 		<enchant2 name="power" val="#ench2Power" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0" abnormalVisualEffect="poison">
-				<param minDamage="100" chance="30" skillId="5453" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="30" />
+				<param skillId="5453" skillLevel="1" /> <!-- Mental Impoverish -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -3114,7 +3138,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param chance="2" skillId="5577" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5577" skillLevel="1" /> <!-- Healer Ability - Heal -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -3127,7 +3155,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param chance="2" skillId="5578" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5578" skillLevel="1" /> <!-- Summoner Ability - Spirit -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -3149,7 +3181,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param chance="10" skillId="5567" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="1" />
+				<param chance="10" />
+				<param skillId="5567" skillLevel="1" /> <!-- Flame Armor -->
+				<param targetType="ONE" />
 				<add order="0x40" stat="fireRes" val="60" />
 			</effect>
 		</for>
@@ -3172,7 +3208,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param chance="10" skillId="5568" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="1" />
+				<param chance="10" />
+				<param skillId="5568" skillLevel="1" /> <!-- Frost Armor -->
+				<param targetType="ONE" />
 				<add order="0x40" stat="waterRes" val="60" />
 			</effect>
 		</for>
@@ -3195,7 +3235,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param chance="10" skillId="5569" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="1" />
+				<param chance="10" />
+				<param skillId="5569" skillLevel="1" /> <!-- Hurricane Armor -->
+				<param targetType="ONE" />
 				<add order="0x40" stat="windRes" val="60" />
 			</effect>
 		</for>
@@ -3264,7 +3308,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minDamage="100" chance="30" skillId="5570" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="30" />
+				<param skillId="5570" skillLevel="1" /> <!-- Excessive Royalty -->
+				<param targetType="SUMMON" />
 			</effect>
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml
index 5b20e3370a..33b10e9b25 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml
@@ -358,7 +358,11 @@
 		<enchant2 name="power" val="#ench2Chance" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0" abnormalVisualEffect="poison">
-				<param minDamage="100" chance="30" skillId="5591" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="30" />
+				<param skillId="5591" skillLevel="#triggeredLevel" /> <!-- Light Flow -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -528,22 +532,38 @@
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minDamage="100" chance="20" skillId="5592" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="20" />
+				<param skillId="5592" skillLevel="1" /> <!-- Lightning Barrier -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 		<enchant1for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minDamage="100" chance="#ench1Chance" skillId="5592" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="#ench1Chance" />
+				<param skillId="5592" skillLevel="1" /> <!-- Lightning Barrier -->
+				<param targetType="ONE" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minDamage="100" chance="#ench2Chance" skillId="5592" skillLevel="#ench2Trigger" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="#ench2Chance" />
+				<param skillId="5592" skillLevel="#ench2Trigger" /> <!-- Lightning Barrier -->
+				<param targetType="ONE" />
 			</effect>
 		</enchant2for>
 		<enchant3for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minDamage="100" chance="20" skillId="5592" skillLevel="#ench3Trigger" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="20" />
+				<param skillId="5592" skillLevel="#ench3Trigger" /> <!-- Lightning Barrier -->
+				<param targetType="ONE" />
 			</effect>
 		</enchant3for>
 	</skill>
@@ -1005,12 +1025,20 @@
 		<enchant2 name="mpConsume" val="54" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minDamage="60" chance="60" skillId="5698" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="60" />
+				<param chance="60" />
+				<param skillId="5698" skillLevel="#triggeredLevel" /> <!-- Bless the Blood -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 		<enchant1for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minDamage="60" chance="60" skillId="5698" skillLevel="#ench1triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="60" />
+				<param chance="60" />
+				<param skillId="5698" skillLevel="#ench1triggeredLevel" /> <!-- Bless the Blood -->
+				<param targetType="SELF" />
 			</effect>
 		</enchant1for>
 	</skill>
@@ -1320,7 +1348,11 @@
 		<set name="targetType" val="ONE" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" minDamage="300" chance="80" skillId="6059" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="300" />
+				<param chance="80" />
+				<param skillId="6059" skillLevel="1" /> <!-- Counter Critical -->
+				<param targetType="SELF" />
 				<mul order="0x30" stat="critVuln" val="0.7" />
 			</effect>
 		</for>
@@ -1888,8 +1920,13 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<!-- FIXME: activationChance unconfirmed -->
-			<effect name="ChanceSkillTrigger" val="0" activationChance="3" chanceType="ON_HIT" triggeredId="6706" />
+			<effect name="TriggerSkillByDamage" val="0">
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="1" />
+				<param chance="5" />
+				<param skillId="6921" skillLevel="1" /> <!-- Penetration Attack -->
+				<param targetType="ONE" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1565" levels="6" name="Mana Pump" enchantGroup1="1">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/03200-03299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/03200-03299.xml
index 705d31244a..a2c9b78a43 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/03200-03299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/03200-03299.xml
@@ -169,7 +169,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5146" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5146" skillLevel="#triggeredLevel" /> <!-- Heal -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -183,7 +187,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="1" skillId="5147" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="1" />
+				<param skillId="5147" skillLevel="#triggeredLevel" /> <!-- Blessed Body -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -197,7 +205,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="1" skillId="5148" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="1" />
+				<param skillId="5148" skillLevel="#triggeredLevel" /> <!-- Prayer -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -211,7 +223,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="1" skillId="5149" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="1" />
+				<param skillId="5149" skillLevel="#triggeredLevel" /> <!-- Recharge -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -225,7 +241,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="1" skillId="5150" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="1" />
+				<param skillId="5150" skillLevel="#triggeredLevel" /> <!-- Blessed Soul -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -239,7 +259,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="1" skillId="5151" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="1" />
+				<param skillId="5151" skillLevel="#triggeredLevel" /> <!-- Mana Gain -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -253,7 +277,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5152" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5152" skillLevel="#triggeredLevel" /> <!-- Ritual -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -267,7 +295,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5153" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5153" skillLevel="#triggeredLevel" /> <!-- Cheer -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -281,7 +313,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="1" skillId="5154" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="1" />
+				<param skillId="5154" skillLevel="#triggeredLevel" /> <!-- Might -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -295,7 +331,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="1" skillId="5156" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="1" />
+				<param skillId="5156" skillLevel="#triggeredLevel" /> <!-- Empower -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -308,7 +348,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="1" skillId="5157" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="1" />
+				<param skillId="5157" skillLevel="#triggeredLevel" /> <!-- Duel Might -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -322,7 +366,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="1" skillId="5158" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="1" />
+				<param skillId="5158" skillLevel="#triggeredLevel" /> <!-- Shield -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -336,7 +384,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="1" skillId="5159" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="1" />
+				<param skillId="5159" skillLevel="#triggeredLevel" /> <!-- Magic Barrier -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -350,7 +402,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="1" skillId="5160" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="1" />
+				<param skillId="5160" skillLevel="#triggeredLevel" /> <!-- Duel Weakness -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -364,7 +420,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="1" skillId="5161" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="1" />
+				<param skillId="5161" skillLevel="#triggeredLevel" /> <!-- Agility -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -378,7 +438,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="1" skillId="5162" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="1" />
+				<param skillId="5162" skillLevel="#triggeredLevel" /> <!-- Guidance -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -392,7 +456,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="1" skillId="5163" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="1" />
+				<param skillId="5163" skillLevel="#triggeredLevel" /> <!-- Focus -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -406,7 +474,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="1" skillId="5164" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="1" />
+				<param skillId="5164" skillLevel="#triggeredLevel" /> <!-- Wild Magic -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -420,7 +492,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="1" skillId="5165" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="1" />
+				<param skillId="5165" skillLevel="#triggeredLevel" /> <!-- Charm -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -434,7 +510,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5166" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5166" skillLevel="#triggeredLevel" /> <!-- Slow -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -448,7 +528,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="4" skillId="5167" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="4" />
+				<param skillId="5167" skillLevel="#triggeredLevel" /> <!-- Winter -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -462,7 +546,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="4" skillId="5168" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="4" />
+				<param skillId="5168" skillLevel="#triggeredLevel" /> <!-- Stun -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -476,7 +564,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="4" skillId="5169" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="4" />
+				<param skillId="5169" skillLevel="#triggeredLevel" /> <!-- Hold -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -490,7 +582,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="4" skillId="5170" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="4" />
+				<param skillId="5170" skillLevel="#triggeredLevel" /> <!-- Sleep -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -504,7 +600,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="4" skillId="5171" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="4" />
+				<param skillId="5171" skillLevel="#triggeredLevel" /> <!-- Paralyze -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -518,7 +618,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="4" skillId="5172" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="4" />
+				<param skillId="5172" skillLevel="#triggeredLevel" /> <!-- Medusa -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -532,7 +636,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="4" skillId="5173" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="4" />
+				<param skillId="5173" skillLevel="#triggeredLevel" /> <!-- Fear -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -546,7 +654,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="4" skillId="5174" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="4" />
+				<param skillId="5174" skillLevel="#triggeredLevel" /> <!-- Poison -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -560,7 +672,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="4" skillId="5175" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="4" />
+				<param skillId="5175" skillLevel="#triggeredLevel" /> <!-- Bleed -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -574,7 +690,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="4" skillId="5176" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="4" />
+				<param skillId="5176" skillLevel="#triggeredLevel" /> <!-- Silence -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -588,7 +708,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="4" skillId="5177" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="4" />
+				<param skillId="5177" skillLevel="#triggeredLevel" /> <!-- Doom -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/03600-03699.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/03600-03699.xml
index 3ca2b3846d..e9aa00f63e 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/03600-03699.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/03600-03699.xml
@@ -174,7 +174,11 @@
 			<mul order="0x30" stat="MagicalMpConsumeRate" val="#mpConsumeRate" />
 			<mul order="0x30" stat="DanceMpConsumeRate" val="#mpConsumeRate" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minDamage="50" chance="10" skillId="5605" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="50" />
+				<param chance="10" />
+				<param skillId="5605" skillLevel="#triggeredLevel" /> <!-- Power of Apella -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -195,7 +199,11 @@
 			<mul order="0x30" stat="MagicalMpConsumeRate" val="#mpConsumeRate" />
 			<mul order="0x30" stat="DanceMpConsumeRate" val="#mpConsumeRate" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" minDamage="50" chance="10" skillId="5607" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="50" />
+				<param chance="10" />
+				<param skillId="5607" skillLevel="#triggeredLevel" /> <!-- Power of Apella -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -216,7 +224,11 @@
 			<mul order="0x30" stat="MagicalMpConsumeRate" val="#mpConsumeRate" />
 			<mul order="0x30" stat="DanceMpConsumeRate" val="#mpConsumeRate" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" minDamage="50" chance="10" skillId="5608" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="50" />
+				<param chance="10" />
+				<param skillId="5608" skillLevel="#triggeredLevel" /> <!-- Power of Apella -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -929,7 +941,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" minDamage="50" chance="5" skillId="5685" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="50" />
+				<param chance="5" />
+				<param skillId="5685" skillLevel="1" /> <!-- PvP Weapon - Casting -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -971,7 +987,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" minDamage="40" chance="10" skillId="5689" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="40" />
+				<param chance="10" />
+				<param skillId="5689" skillLevel="1" /> <!-- PvP Shield - Reflect Damage -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -983,7 +1003,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" minDamage="50" chance="20" skillId="5690" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="50" />
+				<param chance="20" />
+				<param skillId="5690" skillLevel="1" /> <!-- PvP Armor - Damage Down -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -995,7 +1019,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" minDamage="50" chance="20" skillId="5691" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="50" />
+				<param chance="20" />
+				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
@@ -1017,7 +1045,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" minDamage="50" chance="10" skillId="5693" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="50" />
+				<param chance="10" />
+				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -1029,7 +1061,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" minDamage="50" chance="25" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="50" />
+				<param chance="25" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -1086,7 +1122,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" minDamage="20" chance="2" skillId="5695" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="20" />
+				<param chance="2" />
+				<param skillId="5695" skillLevel="1" /> <!-- Talisman - Increase Force -->
+				<param targetType="SELF" />
 			</effect>
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04400-04499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04400-04499.xml
index 75b197f76d..8c058f672b 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04400-04499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04400-04499.xml
@@ -1641,7 +1641,11 @@
 		<set name="targetType" val="ONE" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="50" skillId="5520" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="50" />
+				<param skillId="5022" skillLevel="#triggeredLevel" /> <!-- Decrease Speed -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05500-05599.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05500-05599.xml
index 939762d1f8..2a79547133 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05500-05599.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05500-05599.xml
@@ -1066,7 +1066,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="#activationChance" skillId="5561" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="#activationChance" />
+				<param skillId="5561" skillLevel="#triggeredLevel" /> <!-- Seed of Revenge -->
+				<param targetType="SELF" />
 				<add order="0x40" stat="pAtk" val="300" />
 				<basemul order="0x30" stat="rCrit" val="#rCrit" />
 				<mul order="0x30" stat="cAtk" val="#cAtk" />
@@ -1093,7 +1097,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="#activationChance" skillId="5562" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="#activationChance" />
+				<param skillId="5562" skillLevel="#triggeredLevel" /> <!-- Spirit of Phoenix -->
+				<param targetType="SELF" />
 				<add order="0x40" stat="pDef" val="500" />
 				<add order="0x40" stat="fireRes" val="#elementRes" />
 				<add order="0x40" stat="darkRes" val="#elementRes" />
@@ -1121,7 +1129,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="#activationChance" skillId="5563" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="#activationChance" />
+				<param skillId="5563" skillLevel="#triggeredLevel" /> <!-- Eva's Will -->
+				<param targetType="SELF" />
 				<add order="0x40" stat="mDef" val="400" />
 				<add order="0x40" stat="waterPower" val="#waterPower" />
 				<basemul order="0x30" stat="rCrit" val="#rCrit" />
@@ -1148,7 +1160,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="#activationChance" skillId="5564" skillLevel="#triggeredLevel" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="#activationChance" />
+				<param skillId="5564" skillLevel="#triggeredLevel" /> <!-- Pain of Shillien -->
+				<param targetType="SELF" />
 				<mul order="0x30" stat="cAtk" val="1.2" />
 				<add order="0x40" stat="windPower" val="#windPower" />
 				<add order="0x40" stat="absorbDam" val="#absorbDam" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05900-05999.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05900-05999.xml
index 4e9ec70ed5..eaad53333e 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05900-05999.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05900-05999.xml
@@ -1362,7 +1362,11 @@
 		<for>
 			<effect name="MagicalAttack" noicon="1" val="0" />
 			<effect name="TriggerSkillByDamage" val="0" abnormalVisualEffect="poison">
-				<param minLevel="1" maxLevel="100" chance="90" skillId="5902" />
+				<param attackerType="L2Attackable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="90" />
+				<param skillId="5902" skillLevel="1" /> <!-- NPC Trigger Target Cancel -->
+				<param targetType="SELF" />
 			</effect>
 			<effect name="Mute" noicon="1" val="0" />
 			<effect name="PhysicalMute" noicon="1" val="0" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/08100-08199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/08100-08199.xml
index 09f8ac1d6a..7e599eb900 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/08100-08199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/08100-08199.xml
@@ -1058,7 +1058,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5693" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
+				<param targetType="ONE" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param SLEEP="70" />
@@ -1078,7 +1082,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5693" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
+				<param targetType="ONE" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param SHOCK="50" />
@@ -1098,7 +1106,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param SLEEP="70" />
@@ -1119,7 +1131,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param SHOCK="50" />
@@ -1142,7 +1158,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5691" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
+				<param targetType="SELF" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param SLEEP="70" />
@@ -1163,7 +1183,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5691" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
+				<param targetType="SELF" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param SHOCK="50" />
@@ -1184,7 +1208,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5693" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
+				<param targetType="ONE" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param SLEEP="70" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/08200-08299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/08200-08299.xml
index 1ecc3d0ad2..56920d4257 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/08200-08299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/08200-08299.xml
@@ -15,7 +15,11 @@
 			<mul order="0x30" stat="pvpMagicalDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -27,7 +31,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5691" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
+				<param targetType="SELF" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param SHOCK="50" />
@@ -55,7 +63,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5693" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
+				<param targetType="ONE" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -68,7 +80,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5693" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
+				<param targetType="ONE" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param SHOCK="13" />
@@ -99,7 +115,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5693" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
+				<param targetType="ONE" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -119,7 +139,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5693" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
+				<param targetType="ONE" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -139,7 +163,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5693" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
+				<param targetType="ONE" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -159,7 +187,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -172,7 +204,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param HOLD="13" />
@@ -203,7 +239,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -222,7 +262,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5691" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
+				<param targetType="SELF" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -243,7 +287,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5691" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
+				<param targetType="SELF" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -264,7 +312,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5691" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
+				<param targetType="SELF" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -285,7 +337,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5691" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
+				<param targetType="SELF" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -305,7 +361,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5691" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
+				<param targetType="SELF" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -325,7 +385,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -346,7 +410,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -367,7 +435,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -388,7 +460,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -401,7 +477,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5693" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
+				<param targetType="ONE" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param SHOCK="15" />
@@ -432,7 +512,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5693" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
+				<param targetType="ONE" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -452,7 +536,11 @@
 			<mul order="0x30" stat="pvpMagicalDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5693" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
+				<param targetType="ONE" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -472,7 +560,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5693" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
+				<param targetType="ONE" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -485,7 +577,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param HOLD="15" />
@@ -516,7 +612,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -536,7 +636,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -557,7 +661,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -578,7 +686,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -599,7 +711,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -620,7 +736,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5691" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
+				<param targetType="SELF" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -641,7 +761,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5691" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
+				<param targetType="SELF" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -662,7 +786,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5691" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
+				<param targetType="SELF" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
@@ -682,7 +810,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5691" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
+				<param targetType="SELF" />
 			</effect>
 			<add order="0x10" stat="cloak" val="1" /> <!-- Opens cloak slot -->
 		</for>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/08300-08399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/08300-08399.xml
index d426ea131c..4a4710c07f 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/08300-08399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/08300-08399.xml
@@ -17,7 +17,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" minDamage="50" chance="10" skillId="5693" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="50" />
+				<param chance="10" />
+				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
+				<param targetType="ONE" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param HOLD="70" />
@@ -39,7 +43,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" minDamage="50" chance="10" skillId="5693" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="50" />
+				<param chance="10" />
+				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
+				<param targetType="ONE" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param HOLD="70" />
@@ -72,7 +80,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" minDamage="50" chance="25" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="50" />
+				<param chance="25" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -94,7 +106,11 @@
 			<mul order="0x30" stat="pvpPhysSkillsDef" val="1.05" />
 			<mul order="0x30" stat="pvpPhysDef" val="1.05" />
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" minDamage="50" chance="25" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="50" />
+				<param chance="25" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
@@ -106,7 +122,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" minDamage="50" chance="25" skillId="5691" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="50" />
+				<param chance="25" />
+				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
+				<param targetType="SELF" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param SHOCK="50" />
@@ -128,7 +148,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" minDamage="50" chance="25" skillId="5691" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="50" />
+				<param chance="25" />
+				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
+				<param targetType="SELF" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param SHOCK="50" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/08400-08499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/08400-08499.xml
index 49dcfe8b9f..5c6ad37f89 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/08400-08499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/08400-08499.xml
@@ -146,7 +146,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5693" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
+				<param targetType="ONE" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param SHOCK="50" />
@@ -172,7 +176,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param HOLD="50" />
@@ -198,7 +206,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5691" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
+				<param targetType="SELF" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param PARALYZE="50" />
@@ -223,7 +235,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5693" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
+				<param targetType="ONE" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param BLEED="50" />
@@ -254,7 +270,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param SHOCK="50" />
@@ -283,7 +303,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5691" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
+				<param targetType="SELF" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param SHOCK="50" />
@@ -311,7 +335,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5693" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5693" skillLevel="1" /> <!-- PvP Armor - Speed Down -->
+				<param targetType="ONE" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param BLEED="50" />
@@ -341,7 +369,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5694" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5694" skillLevel="1" /> <!-- PvP Armor - Mirage -->
+				<param targetType="ONE" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param PARALYZE="50" />
@@ -368,7 +400,11 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage" val="0">
-				<param minLevel="1" maxLevel="100" chance="2" skillId="5691" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param minDamage="1" />
+				<param chance="2" />
+				<param skillId="5691" skillLevel="1" /> <!-- PvP Armor - Critical Down -->
+				<param targetType="SELF" />
 			</effect>
 			<effect name="DefenceTrait" val="0" noicon="1">
 				<param SHOCK="50" />
-- 
GitLab