From 013b789b4030cf14c5096b1c4244341fb689685b Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 23 Sep 2017 00:15:27 +0000
Subject: [PATCH] Various skill fixes. Contributed by gamelike85.

---
 .../game/data/stats/skills/11200-11299.xml    |  8 +++
 .../game/data/stats/skills/11500-11599.xml    | 58 ++++++++++---------
 .../skillTrees/4rthClass/IssDominator.xml     | 10 +++-
 .../data/skillTrees/4rthClass/TyrrMaestro.xml |  9 ++-
 .../game/data/stats/skills/11200-11299.xml    |  8 +++
 .../game/data/stats/skills/11500-11599.xml    | 58 ++++++++++---------
 .../skillTrees/4rthClass/IssDominator.xml     | 10 +++-
 .../data/skillTrees/4rthClass/TyrrMaestro.xml |  9 ++-
 .../game/data/stats/skills/11200-11299.xml    |  8 +++
 .../game/data/stats/skills/11500-11599.xml    | 58 ++++++++++---------
 10 files changed, 148 insertions(+), 88 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml
index 22bb567153..1904886c61 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml
@@ -2191,6 +2191,14 @@
 				<CHANGEBODY>100</CHANGEBODY>
 				<SHOCK>100</SHOCK>
 			</effect>
+			<effect name="MagicalDefence">
+				<amount>-30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>-30</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="PhysicalDefence" fromLevel="2" toLevel="6" fromSubLevel="2001" toSubLevel="2030">
 				<amount>
 					<value fromLevel="2" toLevel="6" fromSubLevel="2001" toSubLevel="2030">{-0.6 - 0.4 * subIndex}</value>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml
index 5f75deffc8..b8f86863ef 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml
@@ -148,10 +148,6 @@
 					<item>MAGIC</item>
 				</armorType>
 			</effect>
-			<effect name="ShieldDefenceRate">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="MaxHp">
 				<amount>4636</amount>
 				<mode>DIFF</mode>
@@ -163,7 +159,7 @@
 	</skill>
 	<skill id="11503" toLevel="10" name="Superior Light Armor Mastery">
 		<!-- Glory Days confirmed -->
-		<!-- Max HP + 4636, P. Def. + 1355 when equipped with Light Armor. -->
+		<!-- Max HP + 4636, P. Def. + 1506, Atk. Spd. + 10%, Speed + 4 when equipped with Light Armor. -->
 		<icon>icon.skill10254</icon>
 		<operateType>P</operateType>
 		<magicLvl>
@@ -182,13 +178,13 @@
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
-					<value level="1">1355</value>
-					<value level="2">1488</value>
-					<value level="3">1635</value>
-					<value level="4">1763</value>
-					<value level="5">1976</value>
-					<value level="6">2051</value>
-					<value level="7">2128</value>
+					<value level="1">1506</value>
+					<value level="2">1654</value>
+					<value level="3">1817</value>
+					<value level="4">1959</value>
+					<value level="5">2196</value>
+					<value level="6">2279</value>
+					<value level="7">2365</value>
 					<value level="8">2209</value>
 					<value level="9">2302</value>
 					<value level="10">2389</value>
@@ -198,10 +194,6 @@
 					<item>LIGHT</item>
 				</armorType>
 			</effect>
-			<effect name="ShieldDefenceRate">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="MaxHp">
 				<amount>4636</amount>
 				<mode>DIFF</mode>
@@ -209,11 +201,18 @@
 					<item>LIGHT</item>
 				</armorType>
 			</effect>
+			<effect name="Speed">
+				<amount>4</amount>
+				<mode>DIFF</mode>
+				<armorType>
+					<item>LIGHT</item>
+				</armorType>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="11504" toLevel="10" name="Superior Heavy Armor Mastery">
 		<!-- Glory Days confirmed -->
-		<!-- Max HP + 4636, P. Def. + 1558 when equipped with Heavy Armor. -->
+		<!-- When heavy armor is equipped, Max HP +4636, P. Def. +1731; P. Critical Damage Received -35%. -->
 		<icon>icon.skill10002</icon>
 		<operateType>P</operateType>
 		<magicLvl>
@@ -232,13 +231,13 @@
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
-					<value level="1">1558</value>
-					<value level="2">1711</value>
-					<value level="3">1880</value>
-					<value level="4">2027</value>
-					<value level="5">2271</value>
-					<value level="6">2357</value>
-					<value level="7">2446</value>
+					<value level="1">1731</value>
+					<value level="2">1901</value>
+					<value level="3">2088</value>
+					<value level="4">2252</value>
+					<value level="5">2524</value>
+					<value level="6">2619</value>
+					<value level="7">2718</value>
 					<value level="8">2539</value>
 					<value level="9">2646</value>
 					<value level="10">2746</value>
@@ -248,10 +247,6 @@
 					<item>HEAVY</item>
 				</armorType>
 			</effect>
-			<effect name="ShieldDefenceRate">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="MaxHp">
 				<amount>4636</amount>
 				<mode>DIFF</mode>
@@ -259,6 +254,13 @@
 					<item>HEAVY</item>
 				</armorType>
 			</effect>
+			<effect name="DefenceCriticalDamage">
+				<amount>-35</amount>
+				<mode>PER</mode>
+				<armorType>
+					<item>HEAVY</item>
+				</armorType>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="11505" toLevel="10" name="Superior Anti Magic">
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/skillTrees/4rthClass/IssDominator.xml b/L2J_Mobius_2.5_Underground/dist/game/data/skillTrees/4rthClass/IssDominator.xml
index ea7a5206fb..7e1d62f507 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/skillTrees/4rthClass/IssDominator.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/skillTrees/4rthClass/IssDominator.xml
@@ -18,6 +18,8 @@
 			<removeSkill id="102" /> <!-- Entangle -->
 			<removeSkill id="98" /> <!-- Sword Symphony -->
 		</skill>
+		
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="1" getLevel="85" levelUpSp="10000" />
 		<skill skillName="Assault Rush" skillId="11508" skillLvl="1" getLevel="85" levelUpSp="10000" />
 		<skill skillName="Quick Return" skillId="11563" skillLvl="1" getLevel="85" levelUpSp="10000">
 			<removeSkill id="1050" /> <!-- Return -->
@@ -266,6 +268,7 @@
 		</skill>
 		<skill skillName="Mass Shadow Blade" skillId="11514" skillLvl="3" getLevel="89" levelUpSp="100000" />
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="2" getLevel="90" levelUpSp="370000" />
 		<skill skillName="Crippling Attack" skillId="11509" skillLvl="4" getLevel="90" levelUpSp="370000" />
 		<skill skillName="Assault Rush" skillId="11508" skillLvl="3" getLevel="90" levelUpSp="370000" />
 		<skill skillName="Superior Anti Magic" skillId="11505" skillLvl="2" getLevel="90" levelUpSp="370000" />
@@ -318,6 +321,7 @@
 		<skill skillName="Mass Crippling Attack" skillId="11513" skillLvl="6" getLevel="94" levelUpSp="480000" />
 		<skill skillName="Death Strike" skillId="11511" skillLvl="6" getLevel="94" levelUpSp="480000" />
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="3" getLevel="95" levelUpSp="1000000" />
 		<skill skillName="Superior Anti Magic" skillId="11505" skillLvl="3" getLevel="95" levelUpSp="1000000" />
 		<skill skillName="Superior Light Armor Mastery" skillId="11503" skillLvl="3" getLevel="95" levelUpSp="1000000" />
 		<skill skillName="Superior Robe Mastery" skillId="11502" skillLvl="3" getLevel="95" levelUpSp="1000000" />
@@ -366,6 +370,7 @@
 		<skill skillName="Mass Crippling Attack" skillId="11513" skillLvl="8" getLevel="98" levelUpSp="4990000" />
 		<skill skillName="Death Strike" skillId="11511" skillLvl="8" getLevel="98" levelUpSp="4990000" />
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="4" getLevel="99" levelUpSp="5000000" />
 		<skill skillName="Assault Rush" skillId="11508" skillLvl="6" getLevel="99" levelUpSp="5000000" />
 		<skill skillName="Blessing Barrier" skillId="11621" skillLvl="1" getLevel="99" levelUpSp="5000000" />
 		<skill skillName="Superior Anti Magic" skillId="11505" skillLvl="4" getLevel="99" levelUpSp="5000000" />
@@ -407,6 +412,7 @@
 			<item id="39738" count="8" />
 		</skill>
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="5" getLevel="100" levelUpSp="88099899" />
 		<skill skillName="Superior Anti Magic" skillId="11505" skillLvl="5" getLevel="100" levelUpSp="88099899" />
 		<skill skillName="Superior Light Armor Mastery" skillId="11503" skillLvl="5" getLevel="100" levelUpSp="88099899" />
 		<skill skillName="Superior Robe Mastery" skillId="11502" skillLvl="5" getLevel="100" levelUpSp="88099899" />
@@ -433,6 +439,7 @@
 		<skill skillName="Mass Shadow Blade" skillId="11514" skillLvl="9" getLevel="101" levelUpSp="211440000" />
 		<skill skillName="Death Strike" skillId="11511" skillLvl="9" getLevel="101" levelUpSp="211440000" />
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="6" getLevel="102" levelUpSp="507455418" />
 		<skill skillName="Superior Anti Magic" skillId="11505" skillLvl="6" getLevel="102" levelUpSp="507455418" />
 		<skill skillName="Superior Light Armor Mastery" skillId="11503" skillLvl="6" getLevel="102" levelUpSp="507455418" />
 		<skill skillName="Superior Robe Mastery" skillId="11502" skillLvl="6" getLevel="102" levelUpSp="507455418" />
@@ -458,6 +465,7 @@
 		<skill skillName="Mass Shadow Blade" skillId="11514" skillLvl="10" getLevel="103" levelUpSp="608946501" />
 		<skill skillName="Death Strike" skillId="11511" skillLvl="10" getLevel="103" levelUpSp="608946501" />
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="7" getLevel="104" levelUpSp="1461471604" />
 		<skill skillName="Superior Anti Magic" skillId="11505" skillLvl="7" getLevel="104" levelUpSp="1461471604" />
 		<skill skillName="Superior Light Armor Mastery" skillId="11503" skillLvl="7" getLevel="104" levelUpSp="1461471604" />
 		<skill skillName="Superior Robe Mastery" skillId="11502" skillLvl="7" getLevel="104" levelUpSp="1461471604" />
@@ -483,4 +491,4 @@
 		<skill skillName="Mass Shadow Blade" skillId="11514" skillLvl="11" getLevel="105" levelUpSp="1753765925" />
 		<skill skillName="Death Strike" skillId="11511" skillLvl="11" getLevel="105" levelUpSp="1753765925" />
 	</skillTree>
-</list>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml b/L2J_Mobius_2.5_Underground/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml
index 240ebad4e8..ff2596cd88 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml
@@ -19,6 +19,7 @@
 			<removeSkill id="301" /> <!-- Summon Big Boom -->
 			<removeSkill id="176" /> <!-- Frenzy -->
 		</skill>
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="1" getLevel="85" levelUpSp="10000" />
 		<skill skillName="Hurricane Rush" skillId="10267" skillLvl="1" getLevel="85" levelUpSp="10000" />
 		<skill skillName="Superior HP Mastery" skillId="10256" skillLvl="1" getLevel="85" levelUpSp="10000">
 			<removeSkill id="211" /> <!-- Boost HP -->
@@ -197,6 +198,7 @@
 		<skill skillName="Armor Destruction" skillId="10258" skillLvl="3" getLevel="89" levelUpSp="100000" />
 		<skill skillName="Giant Punch" skillId="10266" skillLvl="3" getLevel="89" levelUpSp="100000" />
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="2" getLevel="90" levelUpSp="370000" />
 		<skill skillName="Berserker" skillId="10274" skillLvl="2" getLevel="90" levelUpSp="370000" />
 		<skill skillName="Hurricane Rush" skillId="10267" skillLvl="3" getLevel="90" levelUpSp="370000" />
 		<skill skillName="Superior HP Mastery" skillId="10256" skillLvl="2" getLevel="90" levelUpSp="370000" />
@@ -259,6 +261,7 @@
 		<skill skillName="Reduce Anger" skillId="10278" skillLvl="6" getLevel="94" levelUpSp="480000" />
 		<skill skillName="Hurricane Storm" skillId="10288" skillLvl="6" getLevel="94" levelUpSp="480000" />
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="3" getLevel="95" levelUpSp="1000000" />
 		<skill skillName="Jump Attack" skillId="10269" skillLvl="5" getLevel="95" levelUpSp="1000000" />
 		<skill skillName="Berserker" skillId="10274" skillLvl="3" getLevel="95" levelUpSp="1000000" />
 		<skill skillName="Superior HP Mastery" skillId="10256" skillLvl="3" getLevel="95" levelUpSp="1000000" />
@@ -304,6 +307,7 @@
 		<skill skillName="Reduce Anger" skillId="10278" skillLvl="8" getLevel="98" levelUpSp="4990000" />
 		<skill skillName="Hurricane Storm" skillId="10288" skillLvl="8" getLevel="98" levelUpSp="4990000" />
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="4" getLevel="99" levelUpSp="5000000" />
 		<skill skillName="Divine Inspiration" skillId="1405" skillLvl="5" getLevel="99" levelUpSp="5000000">
 			<item id="40064" count="1" />
 		</skill>
@@ -336,6 +340,7 @@
 		<skill skillName="Infinity Strike" skillId="10275" skillLvl="1" getLevel="99" levelUpSp="5000000" />
 		<skill skillName="Giant Punch" skillId="10266" skillLvl="8" getLevel="99" levelUpSp="5000000" />
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="5" getLevel="100" levelUpSp="88099899" />
 		<skill skillName="Superior HP Mastery" skillId="10256" skillLvl="5" getLevel="100" levelUpSp="88099899" />
 		<skill skillName="Superior Light Armor Mastery" skillId="10254" skillLvl="5" getLevel="100" levelUpSp="88099899" />
 		<skill skillName="Superior Weapon Mastery" skillId="10251" skillLvl="5" getLevel="100" levelUpSp="88099899" />
@@ -358,6 +363,7 @@
 		<skill skillName="Giant Punch" skillId="10266" skillLvl="9" getLevel="101" levelUpSp="211440000" />
 		<skill skillName="Hurricane Storm" skillId="10288" skillLvl="9" getLevel="101" levelUpSp="211440000" />
 		
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="6" getLevel="102" levelUpSp="507455418" />
 		<skill skillName="Superior HP Mastery" skillId="10256" skillLvl="6" getLevel="102" levelUpSp="507455418" />
 		<skill skillName="Superior Light Armor Mastery" skillId="10254" skillLvl="6" getLevel="102" levelUpSp="507455418" />
 		<skill skillName="Superior Weapon Mastery" skillId="10251" skillLvl="6" getLevel="102" levelUpSp="507455418" />
@@ -380,6 +386,7 @@
 		<skill skillName="Giant Punch" skillId="10266" skillLvl="10" getLevel="103" levelUpSp="608946501" />
 		<skill skillName="Hurricane Storm" skillId="10288" skillLvl="10" getLevel="103" levelUpSp="608946501" />
 		
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="7" getLevel="104" levelUpSp="1461471604" />
 		<skill skillName="Superior HP Mastery" skillId="10256" skillLvl="7" getLevel="104" levelUpSp="1461471604" />
 		<skill skillName="Superior Light Armor Mastery" skillId="10254" skillLvl="7" getLevel="104" levelUpSp="1461471604" />
 		<skill skillName="Superior Weapon Mastery" skillId="10251" skillLvl="7" getLevel="104" levelUpSp="1461471604" />
@@ -402,4 +409,4 @@
 		<skill skillName="Giant Punch" skillId="10266" skillLvl="11" getLevel="105" levelUpSp="1753765925" />
 		<skill skillName="Hurricane Storm" skillId="10288" skillLvl="11" getLevel="105" levelUpSp="1753765925" />
 	</skillTree>
-</list>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml
index 4861e1d718..192733fba6 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml
@@ -2204,6 +2204,14 @@
 				<CHANGEBODY>100</CHANGEBODY>
 				<SHOCK>100</SHOCK>
 			</effect>
+			<effect name="MagicalDefence">
+				<amount>-30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>-30</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="PhysicalDefence" fromLevel="2" toLevel="6" fromSubLevel="2001" toSubLevel="2030">
 				<amount>
 					<value fromLevel="2" toLevel="6" fromSubLevel="2001" toSubLevel="2030">{-0.6 - 0.4 * subIndex}</value>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml
index dafc307dc9..06c39b541f 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml
@@ -148,10 +148,6 @@
 					<item>MAGIC</item>
 				</armorType>
 			</effect>
-			<effect name="ShieldDefenceRate">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="MaxHp">
 				<amount>4636</amount>
 				<mode>DIFF</mode>
@@ -163,7 +159,7 @@
 	</skill>
 	<skill id="11503" toLevel="10" name="Superior Light Armor Mastery">
 		<!-- Glory Days confirmed -->
-		<!-- Max HP + 4636, P. Def. + 1355 when equipped with Light Armor. -->
+		<!-- Max HP + 4636, P. Def. + 1506, Atk. Spd. + 10%, Speed + 4 when equipped with Light Armor. -->
 		<icon>icon.skill10254</icon>
 		<operateType>P</operateType>
 		<magicLvl>
@@ -182,13 +178,13 @@
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
-					<value level="1">1355</value>
-					<value level="2">1488</value>
-					<value level="3">1635</value>
-					<value level="4">1763</value>
-					<value level="5">1976</value>
-					<value level="6">2051</value>
-					<value level="7">2128</value>
+					<value level="1">1506</value>
+					<value level="2">1654</value>
+					<value level="3">1817</value>
+					<value level="4">1959</value>
+					<value level="5">2196</value>
+					<value level="6">2279</value>
+					<value level="7">2365</value>
 					<value level="8">2209</value>
 					<value level="9">2302</value>
 					<value level="10">2389</value>
@@ -198,10 +194,6 @@
 					<item>LIGHT</item>
 				</armorType>
 			</effect>
-			<effect name="ShieldDefenceRate">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="MaxHp">
 				<amount>4636</amount>
 				<mode>DIFF</mode>
@@ -209,11 +201,18 @@
 					<item>LIGHT</item>
 				</armorType>
 			</effect>
+			<effect name="Speed">
+				<amount>4</amount>
+				<mode>DIFF</mode>
+				<armorType>
+					<item>LIGHT</item>
+				</armorType>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="11504" toLevel="10" name="Superior Heavy Armor Mastery">
 		<!-- Glory Days confirmed -->
-		<!-- Max HP + 4636, P. Def. + 1558 when equipped with Heavy Armor. -->
+		<!-- When heavy armor is equipped, Max HP +4636, P. Def. +1731; P. Critical Damage Received -35%. -->
 		<icon>icon.skill10002</icon>
 		<operateType>P</operateType>
 		<magicLvl>
@@ -232,13 +231,13 @@
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
-					<value level="1">1558</value>
-					<value level="2">1711</value>
-					<value level="3">1880</value>
-					<value level="4">2027</value>
-					<value level="5">2271</value>
-					<value level="6">2357</value>
-					<value level="7">2446</value>
+					<value level="1">1731</value>
+					<value level="2">1901</value>
+					<value level="3">2088</value>
+					<value level="4">2252</value>
+					<value level="5">2524</value>
+					<value level="6">2619</value>
+					<value level="7">2718</value>
 					<value level="8">2539</value>
 					<value level="9">2646</value>
 					<value level="10">2746</value>
@@ -248,10 +247,6 @@
 					<item>HEAVY</item>
 				</armorType>
 			</effect>
-			<effect name="ShieldDefenceRate">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="MaxHp">
 				<amount>4636</amount>
 				<mode>DIFF</mode>
@@ -259,6 +254,13 @@
 					<item>HEAVY</item>
 				</armorType>
 			</effect>
+			<effect name="DefenceCriticalDamage">
+				<amount>-35</amount>
+				<mode>PER</mode>
+				<armorType>
+					<item>HEAVY</item>
+				</armorType>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="11505" toLevel="10" name="Superior Anti Magic">
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/skillTrees/4rthClass/IssDominator.xml b/L2J_Mobius_3.0_Helios/dist/game/data/skillTrees/4rthClass/IssDominator.xml
index ea7a5206fb..7e1d62f507 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/skillTrees/4rthClass/IssDominator.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/skillTrees/4rthClass/IssDominator.xml
@@ -18,6 +18,8 @@
 			<removeSkill id="102" /> <!-- Entangle -->
 			<removeSkill id="98" /> <!-- Sword Symphony -->
 		</skill>
+		
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="1" getLevel="85" levelUpSp="10000" />
 		<skill skillName="Assault Rush" skillId="11508" skillLvl="1" getLevel="85" levelUpSp="10000" />
 		<skill skillName="Quick Return" skillId="11563" skillLvl="1" getLevel="85" levelUpSp="10000">
 			<removeSkill id="1050" /> <!-- Return -->
@@ -266,6 +268,7 @@
 		</skill>
 		<skill skillName="Mass Shadow Blade" skillId="11514" skillLvl="3" getLevel="89" levelUpSp="100000" />
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="2" getLevel="90" levelUpSp="370000" />
 		<skill skillName="Crippling Attack" skillId="11509" skillLvl="4" getLevel="90" levelUpSp="370000" />
 		<skill skillName="Assault Rush" skillId="11508" skillLvl="3" getLevel="90" levelUpSp="370000" />
 		<skill skillName="Superior Anti Magic" skillId="11505" skillLvl="2" getLevel="90" levelUpSp="370000" />
@@ -318,6 +321,7 @@
 		<skill skillName="Mass Crippling Attack" skillId="11513" skillLvl="6" getLevel="94" levelUpSp="480000" />
 		<skill skillName="Death Strike" skillId="11511" skillLvl="6" getLevel="94" levelUpSp="480000" />
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="3" getLevel="95" levelUpSp="1000000" />
 		<skill skillName="Superior Anti Magic" skillId="11505" skillLvl="3" getLevel="95" levelUpSp="1000000" />
 		<skill skillName="Superior Light Armor Mastery" skillId="11503" skillLvl="3" getLevel="95" levelUpSp="1000000" />
 		<skill skillName="Superior Robe Mastery" skillId="11502" skillLvl="3" getLevel="95" levelUpSp="1000000" />
@@ -366,6 +370,7 @@
 		<skill skillName="Mass Crippling Attack" skillId="11513" skillLvl="8" getLevel="98" levelUpSp="4990000" />
 		<skill skillName="Death Strike" skillId="11511" skillLvl="8" getLevel="98" levelUpSp="4990000" />
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="4" getLevel="99" levelUpSp="5000000" />
 		<skill skillName="Assault Rush" skillId="11508" skillLvl="6" getLevel="99" levelUpSp="5000000" />
 		<skill skillName="Blessing Barrier" skillId="11621" skillLvl="1" getLevel="99" levelUpSp="5000000" />
 		<skill skillName="Superior Anti Magic" skillId="11505" skillLvl="4" getLevel="99" levelUpSp="5000000" />
@@ -407,6 +412,7 @@
 			<item id="39738" count="8" />
 		</skill>
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="5" getLevel="100" levelUpSp="88099899" />
 		<skill skillName="Superior Anti Magic" skillId="11505" skillLvl="5" getLevel="100" levelUpSp="88099899" />
 		<skill skillName="Superior Light Armor Mastery" skillId="11503" skillLvl="5" getLevel="100" levelUpSp="88099899" />
 		<skill skillName="Superior Robe Mastery" skillId="11502" skillLvl="5" getLevel="100" levelUpSp="88099899" />
@@ -433,6 +439,7 @@
 		<skill skillName="Mass Shadow Blade" skillId="11514" skillLvl="9" getLevel="101" levelUpSp="211440000" />
 		<skill skillName="Death Strike" skillId="11511" skillLvl="9" getLevel="101" levelUpSp="211440000" />
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="6" getLevel="102" levelUpSp="507455418" />
 		<skill skillName="Superior Anti Magic" skillId="11505" skillLvl="6" getLevel="102" levelUpSp="507455418" />
 		<skill skillName="Superior Light Armor Mastery" skillId="11503" skillLvl="6" getLevel="102" levelUpSp="507455418" />
 		<skill skillName="Superior Robe Mastery" skillId="11502" skillLvl="6" getLevel="102" levelUpSp="507455418" />
@@ -458,6 +465,7 @@
 		<skill skillName="Mass Shadow Blade" skillId="11514" skillLvl="10" getLevel="103" levelUpSp="608946501" />
 		<skill skillName="Death Strike" skillId="11511" skillLvl="10" getLevel="103" levelUpSp="608946501" />
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="7" getLevel="104" levelUpSp="1461471604" />
 		<skill skillName="Superior Anti Magic" skillId="11505" skillLvl="7" getLevel="104" levelUpSp="1461471604" />
 		<skill skillName="Superior Light Armor Mastery" skillId="11503" skillLvl="7" getLevel="104" levelUpSp="1461471604" />
 		<skill skillName="Superior Robe Mastery" skillId="11502" skillLvl="7" getLevel="104" levelUpSp="1461471604" />
@@ -483,4 +491,4 @@
 		<skill skillName="Mass Shadow Blade" skillId="11514" skillLvl="11" getLevel="105" levelUpSp="1753765925" />
 		<skill skillName="Death Strike" skillId="11511" skillLvl="11" getLevel="105" levelUpSp="1753765925" />
 	</skillTree>
-</list>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml b/L2J_Mobius_3.0_Helios/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml
index 240ebad4e8..ff2596cd88 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml
@@ -19,6 +19,7 @@
 			<removeSkill id="301" /> <!-- Summon Big Boom -->
 			<removeSkill id="176" /> <!-- Frenzy -->
 		</skill>
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="1" getLevel="85" levelUpSp="10000" />
 		<skill skillName="Hurricane Rush" skillId="10267" skillLvl="1" getLevel="85" levelUpSp="10000" />
 		<skill skillName="Superior HP Mastery" skillId="10256" skillLvl="1" getLevel="85" levelUpSp="10000">
 			<removeSkill id="211" /> <!-- Boost HP -->
@@ -197,6 +198,7 @@
 		<skill skillName="Armor Destruction" skillId="10258" skillLvl="3" getLevel="89" levelUpSp="100000" />
 		<skill skillName="Giant Punch" skillId="10266" skillLvl="3" getLevel="89" levelUpSp="100000" />
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="2" getLevel="90" levelUpSp="370000" />
 		<skill skillName="Berserker" skillId="10274" skillLvl="2" getLevel="90" levelUpSp="370000" />
 		<skill skillName="Hurricane Rush" skillId="10267" skillLvl="3" getLevel="90" levelUpSp="370000" />
 		<skill skillName="Superior HP Mastery" skillId="10256" skillLvl="2" getLevel="90" levelUpSp="370000" />
@@ -259,6 +261,7 @@
 		<skill skillName="Reduce Anger" skillId="10278" skillLvl="6" getLevel="94" levelUpSp="480000" />
 		<skill skillName="Hurricane Storm" skillId="10288" skillLvl="6" getLevel="94" levelUpSp="480000" />
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="3" getLevel="95" levelUpSp="1000000" />
 		<skill skillName="Jump Attack" skillId="10269" skillLvl="5" getLevel="95" levelUpSp="1000000" />
 		<skill skillName="Berserker" skillId="10274" skillLvl="3" getLevel="95" levelUpSp="1000000" />
 		<skill skillName="Superior HP Mastery" skillId="10256" skillLvl="3" getLevel="95" levelUpSp="1000000" />
@@ -304,6 +307,7 @@
 		<skill skillName="Reduce Anger" skillId="10278" skillLvl="8" getLevel="98" levelUpSp="4990000" />
 		<skill skillName="Hurricane Storm" skillId="10288" skillLvl="8" getLevel="98" levelUpSp="4990000" />
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="4" getLevel="99" levelUpSp="5000000" />
 		<skill skillName="Divine Inspiration" skillId="1405" skillLvl="5" getLevel="99" levelUpSp="5000000">
 			<item id="40064" count="1" />
 		</skill>
@@ -336,6 +340,7 @@
 		<skill skillName="Infinity Strike" skillId="10275" skillLvl="1" getLevel="99" levelUpSp="5000000" />
 		<skill skillName="Giant Punch" skillId="10266" skillLvl="8" getLevel="99" levelUpSp="5000000" />
 
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="5" getLevel="100" levelUpSp="88099899" />
 		<skill skillName="Superior HP Mastery" skillId="10256" skillLvl="5" getLevel="100" levelUpSp="88099899" />
 		<skill skillName="Superior Light Armor Mastery" skillId="10254" skillLvl="5" getLevel="100" levelUpSp="88099899" />
 		<skill skillName="Superior Weapon Mastery" skillId="10251" skillLvl="5" getLevel="100" levelUpSp="88099899" />
@@ -358,6 +363,7 @@
 		<skill skillName="Giant Punch" skillId="10266" skillLvl="9" getLevel="101" levelUpSp="211440000" />
 		<skill skillName="Hurricane Storm" skillId="10288" skillLvl="9" getLevel="101" levelUpSp="211440000" />
 		
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="6" getLevel="102" levelUpSp="507455418" />
 		<skill skillName="Superior HP Mastery" skillId="10256" skillLvl="6" getLevel="102" levelUpSp="507455418" />
 		<skill skillName="Superior Light Armor Mastery" skillId="10254" skillLvl="6" getLevel="102" levelUpSp="507455418" />
 		<skill skillName="Superior Weapon Mastery" skillId="10251" skillLvl="6" getLevel="102" levelUpSp="507455418" />
@@ -380,6 +386,7 @@
 		<skill skillName="Giant Punch" skillId="10266" skillLvl="10" getLevel="103" levelUpSp="608946501" />
 		<skill skillName="Hurricane Storm" skillId="10288" skillLvl="10" getLevel="103" levelUpSp="608946501" />
 		
+		<skill skillName="Superior Shield Mastery" skillId="11620" skillLvl="7" getLevel="104" levelUpSp="1461471604" />
 		<skill skillName="Superior HP Mastery" skillId="10256" skillLvl="7" getLevel="104" levelUpSp="1461471604" />
 		<skill skillName="Superior Light Armor Mastery" skillId="10254" skillLvl="7" getLevel="104" levelUpSp="1461471604" />
 		<skill skillName="Superior Weapon Mastery" skillId="10251" skillLvl="7" getLevel="104" levelUpSp="1461471604" />
@@ -402,4 +409,4 @@
 		<skill skillName="Giant Punch" skillId="10266" skillLvl="11" getLevel="105" levelUpSp="1753765925" />
 		<skill skillName="Hurricane Storm" skillId="10288" skillLvl="11" getLevel="105" levelUpSp="1753765925" />
 	</skillTree>
-</list>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml
index 5e27c8728b..2c07a26589 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml
@@ -2210,6 +2210,14 @@
 				<CHANGEBODY>100</CHANGEBODY>
 				<SHOCK>100</SHOCK>
 			</effect>
+			<effect name="MagicalDefence">
+				<amount>-30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>-30</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="PhysicalDefence" fromLevel="2" toLevel="6" fromSubLevel="2001" toSubLevel="2030">
 				<amount>
 					<value fromLevel="2" toLevel="6" fromSubLevel="2001" toSubLevel="2030">{-0.6 - 0.4 * subIndex}</value>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml
index b6c0de8966..c8730a80a3 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml
@@ -148,10 +148,6 @@
 					<item>MAGIC</item>
 				</armorType>
 			</effect>
-			<effect name="ShieldDefenceRate">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="MaxHp">
 				<amount>4636</amount>
 				<mode>DIFF</mode>
@@ -163,7 +159,7 @@
 	</skill>
 	<skill id="11503" toLevel="10" name="Superior Light Armor Mastery">
 		<!-- Glory Days confirmed -->
-		<!-- Max HP + 4636, P. Def. + 1355 when equipped with Light Armor. -->
+		<!-- Max HP + 4636, P. Def. + 1506, Atk. Spd. + 10%, Speed + 4 when equipped with Light Armor. -->
 		<icon>icon.skill10254</icon>
 		<operateType>P</operateType>
 		<magicLvl>
@@ -182,13 +178,13 @@
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
-					<value level="1">1355</value>
-					<value level="2">1488</value>
-					<value level="3">1635</value>
-					<value level="4">1763</value>
-					<value level="5">1976</value>
-					<value level="6">2051</value>
-					<value level="7">2128</value>
+					<value level="1">1506</value>
+					<value level="2">1654</value>
+					<value level="3">1817</value>
+					<value level="4">1959</value>
+					<value level="5">2196</value>
+					<value level="6">2279</value>
+					<value level="7">2365</value>
 					<value level="8">2209</value>
 					<value level="9">2302</value>
 					<value level="10">2389</value>
@@ -198,10 +194,6 @@
 					<item>LIGHT</item>
 				</armorType>
 			</effect>
-			<effect name="ShieldDefenceRate">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="MaxHp">
 				<amount>4636</amount>
 				<mode>DIFF</mode>
@@ -209,11 +201,18 @@
 					<item>LIGHT</item>
 				</armorType>
 			</effect>
+			<effect name="Speed">
+				<amount>4</amount>
+				<mode>DIFF</mode>
+				<armorType>
+					<item>LIGHT</item>
+				</armorType>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="11504" toLevel="10" name="Superior Heavy Armor Mastery">
 		<!-- Glory Days confirmed -->
-		<!-- Max HP + 4636, P. Def. + 1558 when equipped with Heavy Armor. -->
+		<!-- When heavy armor is equipped, Max HP +4636, P. Def. +1731; P. Critical Damage Received -35%. -->
 		<icon>icon.skill10002</icon>
 		<operateType>P</operateType>
 		<magicLvl>
@@ -232,13 +231,13 @@
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
-					<value level="1">1558</value>
-					<value level="2">1711</value>
-					<value level="3">1880</value>
-					<value level="4">2027</value>
-					<value level="5">2271</value>
-					<value level="6">2357</value>
-					<value level="7">2446</value>
+					<value level="1">1731</value>
+					<value level="2">1901</value>
+					<value level="3">2088</value>
+					<value level="4">2252</value>
+					<value level="5">2524</value>
+					<value level="6">2619</value>
+					<value level="7">2718</value>
 					<value level="8">2539</value>
 					<value level="9">2646</value>
 					<value level="10">2746</value>
@@ -248,10 +247,6 @@
 					<item>HEAVY</item>
 				</armorType>
 			</effect>
-			<effect name="ShieldDefenceRate">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="MaxHp">
 				<amount>4636</amount>
 				<mode>DIFF</mode>
@@ -259,6 +254,13 @@
 					<item>HEAVY</item>
 				</armorType>
 			</effect>
+			<effect name="DefenceCriticalDamage">
+				<amount>-35</amount>
+				<mode>PER</mode>
+				<armorType>
+					<item>HEAVY</item>
+				</armorType>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="11505" toLevel="10" name="Superior Anti Magic">