diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml
index 0d58189873..722458040f 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml
@@ -1414,8 +1414,13 @@
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
 		<reuseDelay>300000</reuseDelay>
-		<targetType>SELF</targetType>
+		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="TargetMyParty">
+				<includeMe>false</includeMe>
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="TransferDamageToPlayer">
 				<amount>
@@ -1430,11 +1435,13 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+		</effects>
+		<selfEffects>
 			<effect name="CallSkill">
 				<skillId>10022</skillId> <!-- Last Patience -->
 				<skillLevel>1</skillLevel>
 			</effect>
-		</effects>
+		</selfEffects>
 	</skill>
 	<skill id="10019" toLevel="5" name="Protection of Faith">
 		<!-- For $s1, reduces the maximum damage received by party members to approximately $s2 in inverse proportion to your P. Def and increases Speed by $s3. Makes you immune to Hold and Stun. This effect cannot be stacked with the same effect or Nigh Aegis, and a limit applies after its duration is over. Requires a shield to be equipped. -->
@@ -1485,35 +1492,32 @@
 			<effect name="TransferDamageToPlayer">
 				<amount>90</amount>
 			</effect>
-			<effect name="MagicalDefence">
+			<effect name="GetDamageLimit">
 				<amount>
-					<value level="1">5000</value>
-					<value level="2">7000</value>
-					<value level="3">8000</value>
-					<value level="4">9000</value>
-					<value level="5">10000</value>
+					<value level="1">1000</value>
+					<value level="2">900</value>
+					<value level="3">850</value>
+					<value level="4">800</value>
+					<value level="5">750</value>
 				</amount>
-				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalDefence">
-				<amount>
-					<value level="1">5000</value>
-					<value level="2">10000</value>
-					<value level="3">11000</value>
-					<value level="4">12000</value>
-					<value level="5">13000</value>
-				</amount>
-				<mode>DIFF</mode>
+			<effect name="DefenceTrait"> <!-- CONFUSION RESISTANCE -->
+				<AGGRESSION>100</AGGRESSION>
+				<SHOCK>100</SHOCK>
+				<AIRBIND>100</AIRBIND>
+				<KNOCKDOWN>100</KNOCKDOWN>
+				<KNOCKBACK>100</KNOCKBACK>
+				<PARALYZE>100</PARALYZE>
+				<PULL>100</PULL>
 			</effect>
-			<effect name="ResistAbnormalByCategory">
-				<amount>
-					<value level="1">-50</value>
-					<value level="2">-70</value>
-					<value level="3">-70</value>
-					<value level="4">-70</value>
-					<value level="5">-70</value>
-				</amount>
-				<slot>DEBUFF</slot>
+			<effect name="DefenceTrait"> <!-- OBSTRUTION RESISTANCE -->
+				<DISARM>100</DISARM>
+				<DERANGEMENT>100</DERANGEMENT>
+				<DEPORT>100</DEPORT>
+			</effect>
+			<effect name="Speed">
+				<amount>80</amount>
+				<mode>DIFF</mode>
 			</effect>
 			<effect name="Speed" fromLevel="1" toLevel="5" fromSubLevel="2001" toSubLevel="2020">
 				<amount>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml
index 120ba826c3..9ad30c9bee 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml
@@ -1414,8 +1414,13 @@
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
 		<reuseDelay>300000</reuseDelay>
-		<targetType>SELF</targetType>
+		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="TargetMyParty">
+				<includeMe>false</includeMe>
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="TransferDamageToPlayer">
 				<amount>
@@ -1430,11 +1435,13 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+		</effects>
+		<selfEffects>
 			<effect name="CallSkill">
 				<skillId>10022</skillId> <!-- Last Patience -->
 				<skillLevel>1</skillLevel>
 			</effect>
-		</effects>
+		</selfEffects>
 	</skill>
 	<skill id="10019" toLevel="5" name="Protection of Faith">
 		<!-- For $s1, reduces the maximum damage received by party members to approximately $s2 in inverse proportion to your P. Def and increases Movement Speed by $s3. Makes you immune to Hold and Stun. This effect cannot be stacked with the same effect or Nigh Aegis, and a limit applies after its duration is over. Requires a shield to be equipped. -->
@@ -1485,35 +1492,32 @@
 			<effect name="TransferDamageToPlayer">
 				<amount>90</amount>
 			</effect>
-			<effect name="MagicalDefence">
+			<effect name="GetDamageLimit">
 				<amount>
-					<value level="1">5000</value>
-					<value level="2">7000</value>
-					<value level="3">8000</value>
-					<value level="4">9000</value>
-					<value level="5">10000</value>
+					<value level="1">1000</value>
+					<value level="2">900</value>
+					<value level="3">850</value>
+					<value level="4">800</value>
+					<value level="5">750</value>
 				</amount>
-				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalDefence">
-				<amount>
-					<value level="1">5000</value>
-					<value level="2">10000</value>
-					<value level="3">11000</value>
-					<value level="4">12000</value>
-					<value level="5">13000</value>
-				</amount>
-				<mode>DIFF</mode>
+			<effect name="DefenceTrait"> <!-- CONFUSION RESISTANCE -->
+				<AGGRESSION>100</AGGRESSION>
+				<SHOCK>100</SHOCK>
+				<AIRBIND>100</AIRBIND>
+				<KNOCKDOWN>100</KNOCKDOWN>
+				<KNOCKBACK>100</KNOCKBACK>
+				<PARALYZE>100</PARALYZE>
+				<PULL>100</PULL>
 			</effect>
-			<effect name="ResistAbnormalByCategory">
-				<amount>
-					<value level="1">-50</value>
-					<value level="2">-70</value>
-					<value level="3">-70</value>
-					<value level="4">-70</value>
-					<value level="5">-70</value>
-				</amount>
-				<slot>DEBUFF</slot>
+			<effect name="DefenceTrait"> <!-- OBSTRUTION RESISTANCE -->
+				<DISARM>100</DISARM>
+				<DERANGEMENT>100</DERANGEMENT>
+				<DEPORT>100</DEPORT>
+			</effect>
+			<effect name="Speed">
+				<amount>80</amount>
+				<mode>DIFF</mode>
 			</effect>
 			<effect name="Speed" fromLevel="1" toLevel="5" fromSubLevel="2001" toSubLevel="2020">
 				<amount>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml
index 1046391cd0..725630f987 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml
@@ -1477,8 +1477,13 @@
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
 		<reuseDelay>300000</reuseDelay>
-		<targetType>SELF</targetType>
+		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="TargetMyParty">
+				<includeMe>false</includeMe>
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="TransferDamageToPlayer">
 				<amount>
@@ -1493,11 +1498,13 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+		</effects>
+		<selfEffects>
 			<effect name="CallSkill">
 				<skillId>10022</skillId> <!-- Last Patience -->
 				<skillLevel>1</skillLevel>
 			</effect>
-		</effects>
+		</selfEffects>
 	</skill>
 	<skill id="10019" toLevel="7" name="Protection of Faith">
 		<!-- For $s1, reduces the maximum damage received by party members to approximately $s2 in inverse proportion to your P. Def. and increases Speed by $s3. Makes you immune to Hold and Stun. This effect cannot be stacked with the same effect or Nigh Aegis, and a limit applies after its duration is over. Requires a shield to be equipped. -->
@@ -1554,41 +1561,34 @@
 			<effect name="TransferDamageToPlayer">
 				<amount>90</amount>
 			</effect>
-			<effect name="MagicalDefence">
+			<effect name="GetDamageLimit">
 				<amount>
-					<value level="1">5000</value>
-					<value level="2">7000</value>
-					<value level="3">8000</value>
-					<value level="4">9000</value>
-					<value level="5">10000</value>
-					<value level="6">10000</value>
-					<value level="7">10000</value>
+					<value level="1">1000</value>
+					<value level="2">900</value>
+					<value level="3">850</value>
+					<value level="4">800</value>
+					<value level="5">750</value>
+					<value level="6">700</value>
+					<value level="7">650</value>
 				</amount>
-				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalDefence">
-				<amount>
-					<value level="1">5000</value>
-					<value level="2">10000</value>
-					<value level="3">11000</value>
-					<value level="4">12000</value>
-					<value level="5">13000</value>
-					<value level="6">14000</value>
-					<value level="7">15000</value>
-				</amount>
-				<mode>DIFF</mode>
+			<effect name="DefenceTrait"> <!-- CONFUSION RESISTANCE -->
+				<AGGRESSION>100</AGGRESSION>
+				<SHOCK>100</SHOCK>
+				<AIRBIND>100</AIRBIND>
+				<KNOCKDOWN>100</KNOCKDOWN>
+				<KNOCKBACK>100</KNOCKBACK>
+				<PARALYZE>100</PARALYZE>
+				<PULL>100</PULL>
 			</effect>
-			<effect name="ResistAbnormalByCategory">
-				<amount>
-					<value level="1">-50</value>
-					<value level="2">-70</value>
-					<value level="3">-70</value>
-					<value level="4">-70</value>
-					<value level="5">-70</value>
-					<value level="6">-70</value>
-					<value level="7">-70</value>
-				</amount>
-				<slot>DEBUFF</slot>
+			<effect name="DefenceTrait"> <!-- OBSTRUTION RESISTANCE -->
+				<DISARM>100</DISARM>
+				<DERANGEMENT>100</DERANGEMENT>
+				<DEPORT>100</DEPORT>
+			</effect>
+			<effect name="Speed">
+				<amount>80</amount>
+				<mode>DIFF</mode>
 			</effect>
 			<effect name="Speed" fromLevel="1" toLevel="7" fromSubLevel="2001" toSubLevel="2020">
 				<amount>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml
index 51747311ba..9f2ba5d29d 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml
@@ -1477,8 +1477,13 @@
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
 		<reuseDelay>300000</reuseDelay>
-		<targetType>SELF</targetType>
+		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="TargetMyParty">
+				<includeMe>false</includeMe>
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="TransferDamageToPlayer">
 				<amount>
@@ -1493,14 +1498,16 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+		</effects>
+		<selfEffects>
 			<effect name="CallSkill">
 				<skillId>10022</skillId> <!-- Last Patience -->
 				<skillLevel>1</skillLevel>
 			</effect>
-		</effects>
+		</selfEffects>
 	</skill>
 	<skill id="10019" toLevel="7" name="Protection of Faith">
-		<!-- For $s1, reduces the maximum damage received by party members to approximately $s2 depending on your P. Def. Speed +$s3. Makes you immune to obstruction and confusion. The effect cannot be stacked with the same effect or Nine Aegis. When it is over, the Limit of Sigel effect is applied. Requires a shield. -->
+		<!-- For 15 sec., reduces the maximum damage received by party members to approximately 1000 depending on your P. Def. Speed +80. Makes you immune to obstruction and confusion. The effect cannot be stacked with the same effect or Nine Aegis. When it is over, the Limit of Sigel effect is applied. Requires a shield. -->
 		<icon>icon.skill10019</icon>
 		<affectRange>1000</affectRange>
 		<abnormalLvl>2</abnormalLvl>
@@ -1554,41 +1561,34 @@
 			<effect name="TransferDamageToPlayer">
 				<amount>90</amount>
 			</effect>
-			<effect name="MagicalDefence">
+			<effect name="GetDamageLimit">
 				<amount>
-					<value level="1">5000</value>
-					<value level="2">7000</value>
-					<value level="3">8000</value>
-					<value level="4">9000</value>
-					<value level="5">10000</value>
-					<value level="6">10000</value>
-					<value level="7">10000</value>
+					<value level="1">1000</value>
+					<value level="2">900</value>
+					<value level="3">850</value>
+					<value level="4">800</value>
+					<value level="5">750</value>
+					<value level="6">700</value>
+					<value level="7">650</value>
 				</amount>
-				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalDefence">
-				<amount>
-					<value level="1">5000</value>
-					<value level="2">10000</value>
-					<value level="3">11000</value>
-					<value level="4">12000</value>
-					<value level="5">13000</value>
-					<value level="6">14000</value>
-					<value level="7">15000</value>
-				</amount>
-				<mode>DIFF</mode>
+			<effect name="DefenceTrait"> <!-- CONFUSION RESISTANCE -->
+				<AGGRESSION>100</AGGRESSION>
+				<SHOCK>100</SHOCK>
+				<AIRBIND>100</AIRBIND>
+				<KNOCKDOWN>100</KNOCKDOWN>
+				<KNOCKBACK>100</KNOCKBACK>
+				<PARALYZE>100</PARALYZE>
+				<PULL>100</PULL>
 			</effect>
-			<effect name="ResistAbnormalByCategory">
-				<amount>
-					<value level="1">-50</value>
-					<value level="2">-70</value>
-					<value level="3">-70</value>
-					<value level="4">-70</value>
-					<value level="5">-70</value>
-					<value level="6">-70</value>
-					<value level="7">-70</value>
-				</amount>
-				<slot>DEBUFF</slot>
+			<effect name="DefenceTrait"> <!-- OBSTRUTION RESISTANCE -->
+				<DISARM>100</DISARM>
+				<DERANGEMENT>100</DERANGEMENT>
+				<DEPORT>100</DEPORT>
+			</effect>
+			<effect name="Speed">
+				<amount>80</amount>
+				<mode>DIFF</mode>
 			</effect>
 			<effect name="Speed" fromLevel="1" toLevel="7" fromSubLevel="2001" toSubLevel="2020">
 				<amount>