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 345b3eba28..051233a086 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
@@ -928,6 +928,12 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19564</skillId> <!-- Wave Barrier -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10013" toLevel="11" name="Rising Smash">
 		<!-- Attacks nearby targets with $s1 Power added to P. Atk and Heal Received is reduced by $s3 for $s2. Can be used while a sword or blunt weapon is equipped. Over-hit. Critical. -->
@@ -1586,6 +1592,12 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="BlockAbnormalSlot">
+				<slot>DMG_SHIELD</slot>
+			</effect>
+			<effect name="DispelBySlot">
+				<dispel>DMG_SHIELD,9</dispel>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="10021" toLevel="7" name="Raise Shield">
@@ -1663,6 +1675,12 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="BlockAbnormalSlot">
+				<slot>DMG_SHIELD</slot>
+			</effect>
+			<effect name="DispelBySlot">
+				<dispel>DMG_SHIELD,9</dispel>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="10022" toLevel="1" name="Last Patience">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19500-19599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19500-19599.xml
index a1485e8186..84f1055b9e 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19500-19599.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19500-19599.xml
@@ -1791,6 +1791,9 @@
 		<!-- For 10 seconds, P. Def +50% and reflects damage when hit. Cannot be applied together with any Shield Block skill. -->
 		<icon>icon.skill3584</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>10</abnormalTime>
+		<abnormalType>DMG_SHIELD</abnormalType>
 		<effectPoint>379</effectPoint>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -1798,10 +1801,6 @@
 		<isMagic>1</isMagic>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
-		<reuseDelay>60000</reuseDelay>
-		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>10</abnormalTime>
-		<abnormalType>DMG_SHIELD</abnormalType>
 		<effects>
 			<effect name="TriggerSkillByDamage">
 				<attackerType>Creature</attackerType>
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 664b93b412..cc53a7b324 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
@@ -928,6 +928,12 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19564</skillId> <!-- Wave Barrier -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10013" toLevel="11" name="Rising Smash">
 		<!-- Attacks nearby targets with $s1 Power added to P. Atk and Heal Received -$s3 for $s2. Can be used while a sword or blunt weapon is equipped. Over-hit. Critical. -->
@@ -1586,6 +1592,12 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="BlockAbnormalSlot">
+				<slot>DMG_SHIELD</slot>
+			</effect>
+			<effect name="DispelBySlot">
+				<dispel>DMG_SHIELD,9</dispel>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="10021" toLevel="7" name="Raise Shield">
@@ -1663,6 +1675,12 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="BlockAbnormalSlot">
+				<slot>DMG_SHIELD</slot>
+			</effect>
+			<effect name="DispelBySlot">
+				<dispel>DMG_SHIELD,9</dispel>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="10022" toLevel="1" name="Last Patience">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19500-19599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19500-19599.xml
index ee1bd0102b..8343f6f691 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19500-19599.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19500-19599.xml
@@ -1792,6 +1792,9 @@
 		<!-- For 10 sec., P. Def +50% and reflects damage when hit. Cannot be applied together with any Shield Block skill. -->
 		<icon>icon.skill3584</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>10</abnormalTime>
+		<abnormalType>DMG_SHIELD</abnormalType>
 		<effectPoint>379</effectPoint>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -1799,10 +1802,6 @@
 		<isMagic>1</isMagic>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
-		<reuseDelay>60000</reuseDelay>
-		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>10</abnormalTime>
-		<abnormalType>DMG_SHIELD</abnormalType>
 		<effects>
 			<effect name="TriggerSkillByDamage">
 				<attackerType>Creature</attackerType>
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 7e6113d374..7560c6bbea 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
@@ -961,6 +961,12 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19564</skillId> <!-- Wave Barrier -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10013" toLevel="13" name="Rising Smash">
 		<!-- Attacks nearby targets with $s1 Power added to P. Atk. and Received Healing -$s3 for $s2 Can be used while a sword or blunt weapon is equipped. Over-hit. Critical. -->
@@ -1661,6 +1667,12 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="BlockAbnormalSlot">
+				<slot>DMG_SHIELD</slot>
+			</effect>
+			<effect name="DispelBySlot">
+				<dispel>DMG_SHIELD,9</dispel>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="10021" toLevel="7" name="Raise Shield">
@@ -1738,6 +1750,12 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="BlockAbnormalSlot">
+				<slot>DMG_SHIELD</slot>
+			</effect>
+			<effect name="DispelBySlot">
+				<dispel>DMG_SHIELD,9</dispel>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="10022" toLevel="1" name="Last Patience">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19500-19599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19500-19599.xml
index 38908db173..c96a3f0897 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19500-19599.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19500-19599.xml
@@ -1850,6 +1850,9 @@
 		<!-- For 10 sec., P. Def. +50% and reflects damage when hit. Cannot be applied together with any Shield Block skill. -->
 		<icon>icon.skill3584</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>10</abnormalTime>
+		<abnormalType>DMG_SHIELD</abnormalType>
 		<effectPoint>379</effectPoint>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -1857,10 +1860,6 @@
 		<isMagic>1</isMagic>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
-		<reuseDelay>60000</reuseDelay>
-		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>10</abnormalTime>
-		<abnormalType>DMG_SHIELD</abnormalType>
 		<effects>
 			<effect name="TriggerSkillByDamage">
 				<attackerType>Creature</attackerType>
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 1ddc6ed241..807f6d31f8 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
@@ -961,6 +961,12 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19564</skillId> <!-- Wave Barrier -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10013" toLevel="13" name="Rising Smash">
 		<!-- Attacks nearby targets with $s1 Power added to P. Atk. and Received Healing -$s3 for $s2 Can be used while a sword or blunt weapon is equipped. Over-hit. Critical. -->
@@ -1661,6 +1667,12 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="BlockAbnormalSlot">
+				<slot>DMG_SHIELD</slot>
+			</effect>
+			<effect name="DispelBySlot">
+				<dispel>DMG_SHIELD,9</dispel>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="10021" toLevel="7" name="Raise Shield">
@@ -1738,6 +1750,12 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="BlockAbnormalSlot">
+				<slot>DMG_SHIELD</slot>
+			</effect>
+			<effect name="DispelBySlot">
+				<dispel>DMG_SHIELD,9</dispel>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="10022" toLevel="1" name="Last Patience">
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml
index 60e47b56cb..4e1379d476 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml
@@ -2192,7 +2192,7 @@
 		</effects>
 	</skill>
 	<skill id="11526" toLevel="10" name="Superior Sword/ Blunt Weapon Mastery">
-		<!-- P. Atk. +$s1, additional P. Atk. +$s2, Atk. Spd. +$s3, P. Critical Damage +$s4 when a sword or blunt weapon is equipped. -->
+		<!-- P. Atk. +30%, additional P. Atk. +1689, Atk. Spd. +30%, P. Critical Damage +15% when a sword or blunt weapon is equipped. -->
 		<icon>icon.skill10001</icon>
 		<operateType>P</operateType>
 		<magicLvl>
@@ -2219,16 +2219,16 @@
 			</effect>
 			<effect name="PAtk">
 				<amount>
-					<value level="1">1027</value>
-					<value level="2">1191</value>
-					<value level="3">1381</value>
-					<value level="4">1554</value>
-					<value level="5">1761</value>
-					<value level="6">1869</value>
-					<value level="7">1982</value>
-					<value level="8">2103</value>
-					<value level="9">2231</value>
-					<value level="10">2367</value>
+					<value level="1">1689</value>
+					<value level="2">1958</value>
+					<value level="3">2270</value>
+					<value level="4">2555</value>
+					<value level="5">2895</value>
+					<value level="6">3071</value>
+					<value level="7">3258</value>
+					<value level="8">3457</value>
+					<value level="9">3667</value>
+					<value level="10">3890</value>
 				</amount>
 				<mode>DIFF</mode>
 				<weaponType>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19500-19599.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19500-19599.xml
index e602dd9445..65a8c9218e 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19500-19599.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19500-19599.xml
@@ -1809,6 +1809,9 @@
 		<!-- For 10 sec., P. Def. +50% and reflects damage when hit. Cannot be applied together with any Shield Block skill. -->
 		<icon>icon.skill3584</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>10</abnormalTime>
+		<abnormalType>DMG_SHIELD</abnormalType>
 		<effectPoint>379</effectPoint>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -1816,10 +1819,6 @@
 		<isMagic>1</isMagic>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
-		<reuseDelay>60000</reuseDelay>
-		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>10</abnormalTime>
-		<abnormalType>DMG_SHIELD</abnormalType>
 		<effects>
 			<effect name="TriggerSkillByDamage">
 				<attackerType>Creature</attackerType>