From 03702eb60b437a5b305c60ecefdb5d48aa9192ce Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 21 Nov 2021 13:35:16 +0000
Subject: [PATCH] Heir Radiance related update. Contributed by CostyKiller.

---
 .../dist/game/data/stats/armorsets/Sets.xml   | 206 +++++++++++++++---
 .../game/data/stats/skills/29300-29399.xml    |  53 +++--
 .../game/data/stats/skills/29400-29499.xml    | 153 ++++++++-----
 .../dist/game/data/stats/armorsets/Sets.xml   | 206 +++++++++++++++---
 .../game/data/stats/skills/29300-29399.xml    |  53 +++--
 .../game/data/stats/skills/29400-29499.xml    | 153 ++++++++-----
 .../dist/game/data/stats/armorsets/Sets.xml   | 206 +++++++++++++++---
 .../game/data/stats/skills/29300-29399.xml    |  53 +++--
 .../game/data/stats/skills/29400-29499.xml    | 153 ++++++++-----
 9 files changed, 939 insertions(+), 297 deletions(-)

diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/armorsets/Sets.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/armorsets/Sets.xml
index 07923686aa..e770ace183 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/armorsets/Sets.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/armorsets/Sets.xml
@@ -8117,18 +8117,32 @@
 	</set>
 	<set id="322" minimumPieces="2">
 		<requiredItems>
-			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->
-			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
-			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
-			<item id="29899" /> <!-- Heir's Radiance Lv. 5 (PvE) -->
-			<item id="29900" /> <!-- Heir's Radiance Lv. 6 (PvE) -->
-			<item id="29901" /> <!-- Heir's Radiance Lv. 7 (PvE) -->		
+			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->		
 			<item id="29755" /> <!-- Heir's Radiance Lv. 2 (PvP) -->
+			<item id="48202" /> <!-- Warrior's Circlet -->
+			<item id="48203" /> <!-- Noble Warrior's Circlet -->
+			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29393" level="1" minimumPieces="2" /> <!-- Warrior's Heir -->
+		</skills>
+	</set>
+	<set id="323" minimumPieces="2">
+		<requiredItems>
+			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
 			<item id="29756" /> <!-- Heir's Radiance Lv. 3 (PvP) -->
+			<item id="48202" /> <!-- Warrior's Circlet -->
+			<item id="48203" /> <!-- Noble Warrior's Circlet -->
+			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29393" level="2" minimumPieces="2" /> <!-- Warrior's Heir -->
+		</skills>
+	</set>
+	<set id="324" minimumPieces="2">
+		<requiredItems>
+			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
 			<item id="29757" /> <!-- Heir's Radiance Lv. 4 (PvP) -->
-			<item id="29902" /> <!-- Heir's Radiance Lv. 5 (PvP) -->
-			<item id="29903" /> <!-- Heir's Radiance Lv. 6 (PvP) -->
-			<item id="29904" /> <!-- Heir's Radiance Lv. 7 (PvP) -->
 			<item id="48202" /> <!-- Warrior's Circlet -->
 			<item id="48203" /> <!-- Noble Warrior's Circlet -->
 			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
@@ -8137,20 +8151,70 @@
 			<skill id="29393" level="3" minimumPieces="2" /> <!-- Warrior's Heir -->
 		</skills>
 	</set>
-	<set id="323" minimumPieces="2">
+	<set id="325" minimumPieces="2">
 		<requiredItems>
-			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->
-			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
-			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
 			<item id="29899" /> <!-- Heir's Radiance Lv. 5 (PvE) -->
-			<item id="29900" /> <!-- Heir's Radiance Lv. 6 (PvE) -->
-			<item id="29901" /> <!-- Heir's Radiance Lv. 7 (PvE) -->		
-			<item id="29755" /> <!-- Heir's Radiance Lv. 2 (PvP) -->
-			<item id="29756" /> <!-- Heir's Radiance Lv. 3 (PvP) -->
-			<item id="29757" /> <!-- Heir's Radiance Lv. 4 (PvP) -->
 			<item id="29902" /> <!-- Heir's Radiance Lv. 5 (PvP) -->
+			<item id="48202" /> <!-- Warrior's Circlet -->
+			<item id="48203" /> <!-- Noble Warrior's Circlet -->
+			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29393" level="4" minimumPieces="2" /> <!-- Warrior's Heir -->
+		</skills>
+	</set>
+	<set id="326" minimumPieces="2">
+		<requiredItems>
+			<item id="29900" /> <!-- Heir's Radiance Lv. 6 (PvE) -->
 			<item id="29903" /> <!-- Heir's Radiance Lv. 6 (PvP) -->
+			<item id="48202" /> <!-- Warrior's Circlet -->
+			<item id="48203" /> <!-- Noble Warrior's Circlet -->
+			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29393" level="5" minimumPieces="2" /> <!-- Warrior's Heir -->
+		</skills>
+	</set>
+	<set id="327" minimumPieces="2">
+		<requiredItems>
+			<item id="29901" /> <!-- Heir's Radiance Lv. 7 (PvE) -->
 			<item id="29904" /> <!-- Heir's Radiance Lv. 7 (PvP) -->
+			<item id="48202" /> <!-- Warrior's Circlet -->
+			<item id="48203" /> <!-- Noble Warrior's Circlet -->
+			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29393" level="6" minimumPieces="2" /> <!-- Warrior's Heir -->
+		</skills>
+	</set>
+	<set id="328" minimumPieces="2">
+		<requiredItems>
+			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->		
+			<item id="29755" /> <!-- Heir's Radiance Lv. 2 (PvP) -->
+			<item id="48205" /> <!-- Wizard's Circlet -->
+			<item id="48206" /> <!-- Noble Wizard's Circlet -->
+			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29394" level="1" minimumPieces="2" /> <!-- Wizard's Heir -->
+		</skills>
+	</set>	
+	<set id="329" minimumPieces="2">
+		<requiredItems>
+			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
+			<item id="29756" /> <!-- Heir's Radiance Lv. 3 (PvP) -->
+			<item id="48205" /> <!-- Wizard's Circlet -->
+			<item id="48206" /> <!-- Noble Wizard's Circlet -->
+			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29394" level="2" minimumPieces="2" /> <!-- Wizard's Heir -->
+		</skills>
+	</set>	
+	<set id="330" minimumPieces="2">
+		<requiredItems>
+			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
+			<item id="29757" /> <!-- Heir's Radiance Lv. 4 (PvP) -->
 			<item id="48205" /> <!-- Wizard's Circlet -->
 			<item id="48206" /> <!-- Noble Wizard's Circlet -->
 			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
@@ -8158,21 +8222,71 @@
 		<skills>
 			<skill id="29394" level="3" minimumPieces="2" /> <!-- Wizard's Heir -->
 		</skills>
-	</set>
-	<set id="324" minimumPieces="2">
+	</set>	
+	<set id="331" minimumPieces="2">
 		<requiredItems>
-			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->
-			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
-			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
 			<item id="29899" /> <!-- Heir's Radiance Lv. 5 (PvE) -->
-			<item id="29900" /> <!-- Heir's Radiance Lv. 6 (PvE) -->
-			<item id="29901" /> <!-- Heir's Radiance Lv. 7 (PvE) -->		
-			<item id="29755" /> <!-- Heir's Radiance Lv. 2 (PvP) -->
-			<item id="29756" /> <!-- Heir's Radiance Lv. 3 (PvP) -->
-			<item id="29757" /> <!-- Heir's Radiance Lv. 4 (PvP) -->
 			<item id="29902" /> <!-- Heir's Radiance Lv. 5 (PvP) -->
+			<item id="48205" /> <!-- Wizard's Circlet -->
+			<item id="48206" /> <!-- Noble Wizard's Circlet -->
+			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29394" level="4" minimumPieces="2" /> <!-- Wizard's Heir -->
+		</skills>
+	</set>	
+	<set id="332" minimumPieces="2">
+		<requiredItems>
+			<item id="29900" /> <!-- Heir's Radiance Lv. 6 (PvE) -->
 			<item id="29903" /> <!-- Heir's Radiance Lv. 6 (PvP) -->
+			<item id="48205" /> <!-- Wizard's Circlet -->
+			<item id="48206" /> <!-- Noble Wizard's Circlet -->
+			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29394" level="5" minimumPieces="2" /> <!-- Wizard's Heir -->
+		</skills>
+	</set>	
+	<set id="333" minimumPieces="2">
+		<requiredItems>
+			<item id="29901" /> <!-- Heir's Radiance Lv. 7 (PvE) -->
 			<item id="29904" /> <!-- Heir's Radiance Lv. 7 (PvP) -->
+			<item id="48205" /> <!-- Wizard's Circlet -->
+			<item id="48206" /> <!-- Noble Wizard's Circlet -->
+			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29394" level="6" minimumPieces="2" /> <!-- Wizard's Heir -->
+		</skills>
+	</set>
+	<set id="334" minimumPieces="2">
+		<requiredItems>
+			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->	
+			<item id="29755" /> <!-- Heir's Radiance Lv. 2 (PvP) -->
+			<item id="48208" /> <!-- Knight's Circlet -->
+			<item id="48209" /> <!-- Noble Knight's Circlet -->
+			<item id="48210" /> <!-- Radiant Knight's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29395" level="1" minimumPieces="2" /> <!-- Knight's Heir -->
+		</skills>
+	</set>
+	<set id="335" minimumPieces="2">
+		<requiredItems>
+			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
+			<item id="29756" /> <!-- Heir's Radiance Lv. 3 (PvP) -->
+			<item id="48208" /> <!-- Knight's Circlet -->
+			<item id="48209" /> <!-- Noble Knight's Circlet -->
+			<item id="48210" /> <!-- Radiant Knight's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29395" level="2" minimumPieces="2" /> <!-- Knight's Heir -->
+		</skills>
+	</set>
+	<set id="336" minimumPieces="2">
+		<requiredItems>
+			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
+			<item id="29757" /> <!-- Heir's Radiance Lv. 4 (PvP) -->
 			<item id="48208" /> <!-- Knight's Circlet -->
 			<item id="48209" /> <!-- Noble Knight's Circlet -->
 			<item id="48210" /> <!-- Radiant Knight's Circlet -->
@@ -8181,4 +8295,40 @@
 			<skill id="29395" level="3" minimumPieces="2" /> <!-- Knight's Heir -->
 		</skills>
 	</set>
+	<set id="337" minimumPieces="2">
+		<requiredItems>
+			<item id="29899" /> <!-- Heir's Radiance Lv. 5 (PvE) -->
+			<item id="29902" /> <!-- Heir's Radiance Lv. 5 (PvP) -->
+			<item id="48208" /> <!-- Knight's Circlet -->
+			<item id="48209" /> <!-- Noble Knight's Circlet -->
+			<item id="48210" /> <!-- Radiant Knight's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29395" level="4" minimumPieces="2" /> <!-- Knight's Heir -->
+		</skills>
+	</set>
+	<set id="338" minimumPieces="2">
+		<requiredItems>
+			<item id="29900" /> <!-- Heir's Radiance Lv. 6 (PvE) -->
+			<item id="29903" /> <!-- Heir's Radiance Lv. 6 (PvP) -->
+			<item id="48208" /> <!-- Knight's Circlet -->
+			<item id="48209" /> <!-- Noble Knight's Circlet -->
+			<item id="48210" /> <!-- Radiant Knight's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29395" level="5" minimumPieces="2" /> <!-- Knight's Heir -->
+		</skills>
+	</set>
+	<set id="339" minimumPieces="2">
+		<requiredItems>
+			<item id="29901" /> <!-- Heir's Radiance Lv. 7 (PvE) -->
+			<item id="29904" /> <!-- Heir's Radiance Lv. 7 (PvP) -->
+			<item id="48208" /> <!-- Knight's Circlet -->
+			<item id="48209" /> <!-- Noble Knight's Circlet -->
+			<item id="48210" /> <!-- Radiant Knight's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29395" level="6" minimumPieces="2" /> <!-- Knight's Heir -->
+		</skills>
+	</set>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/29300-29399.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/29300-29399.xml
index f2133e8112..73c8320771 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/29300-29399.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/29300-29399.xml
@@ -1016,7 +1016,13 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVE</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
 			<value level="2">0</value>
@@ -1101,19 +1107,15 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="VitalityPointUp">
-				<value>
-					<value level="1">0</value>
-					<value level="2">0</value>
-					<value level="3">0</value>
-					<value level="4">0</value>
-					<value level="5">35000</value>
-				</value>
-			</effect>
 			<effect name="BlockAbnormalSlot">
 				<slot>HEIR_PVP</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVE,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29390</skillId> <!-- Heir's Radiance - PvE Lv. 1 -->
@@ -1137,7 +1139,13 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVP</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
 			<value level="2">0</value>
@@ -1255,6 +1263,11 @@
 				<slot>HEIR_PVE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVP,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29391</skillId> <!-- Heir's Radiance - PvP Lv. 1 -->
@@ -1277,7 +1290,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="29393" toLevel="3" name="Warrior's Heir">
+	<skill id="29393" toLevel="6" name="Warrior's Heir">
 		<!-- P. Atk. +$s1. -->
 		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
 		<operateType>P</operateType>
@@ -1287,12 +1300,15 @@
 					<value level="1">1</value>
 					<value level="2">3</value>
 					<value level="3">7</value>
+					<value level="4">10</value>
+					<value level="5">12</value>
+					<value level="6">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
-	<skill id="29394" toLevel="3" name="Wizard's Heir">
+	<skill id="29394" toLevel="6" name="Wizard's Heir">
 		<!-- M. Atk. +$s1. -->
 		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
 		<operateType>P</operateType>
@@ -1302,12 +1318,15 @@
 					<value level="1">1</value>
 					<value level="2">3</value>
 					<value level="3">7</value>
+					<value level="4">10</value>
+					<value level="5">12</value>
+					<value level="6">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
-	<skill id="29395" toLevel="3" name="Knight's Heir">
+	<skill id="29395" toLevel="6" name="Knight's Heir">
 		<!-- P./ M. Def. +$s1. -->
 		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
 		<operateType>P</operateType>
@@ -1317,6 +1336,9 @@
 					<value level="1">1</value>
 					<value level="2">3</value>
 					<value level="3">7</value>
+					<value level="4">10</value>
+					<value level="5">12</value>
+					<value level="6">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
@@ -1325,6 +1347,9 @@
 					<value level="1">1</value>
 					<value level="2">3</value>
 					<value level="3">7</value>
+					<value level="4">10</value>
+					<value level="5">12</value>
+					<value level="6">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/29400-29499.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/29400-29499.xml
index 0420b54c43..2031fff123 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/29400-29499.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/29400-29499.xml
@@ -927,13 +927,19 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVE</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
-			<value level="2">21600000</value>
-			<value level="3">21600000</value>
-			<value level="4">21600000</value>
-			<value level="5">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
 		</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
@@ -1012,19 +1018,15 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="VitalityPointUp">
-				<value>
-					<value level="1">35000</value>
-					<value level="2">35000</value>
-					<value level="3">35000</value>
-					<value level="4">35000</value>
-					<value level="5">35000</value>
-				</value>
-			</effect>
 			<effect name="BlockAbnormalSlot">
 				<slot>HEIR_PVP</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVE,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29429</skillId> <!-- Heir's Radiance - PvE Lv. 2 -->
@@ -1048,13 +1050,19 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVP</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
-			<value level="2">21600000</value>
-			<value level="3">21600000</value>
-			<value level="4">21600000</value>
-			<value level="5">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
 		</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
@@ -1166,6 +1174,11 @@
 				<slot>HEIR_PVE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVP,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29430</skillId> <!-- Heir's Radiance - PvP Lv. 2 -->
@@ -1185,13 +1198,19 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVE</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
-			<value level="2">21600000</value>
-			<value level="3">21600000</value>
-			<value level="4">21600000</value>
-			<value level="5">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
 		</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
@@ -1270,19 +1289,15 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="VitalityPointUp">
-				<value>
-					<value level="1">35000</value>
-					<value level="2">35000</value>
-					<value level="3">35000</value>
-					<value level="4">35000</value>
-					<value level="5">35000</value>
-				</value>
-			</effect>
 			<effect name="BlockAbnormalSlot">
 				<slot>HEIR_PVP</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVE,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29431</skillId> <!-- Heir's Radiance - PvE Lv. 3 -->
@@ -1306,13 +1321,19 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVP</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
-			<value level="2">21600000</value>
-			<value level="3">21600000</value>
-			<value level="4">21600000</value>
-			<value level="5">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
 		</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
@@ -1424,6 +1445,11 @@
 				<slot>HEIR_PVE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVP,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29432</skillId> <!-- Heir's Radiance - PvP Lv. 3 -->
@@ -1443,13 +1469,19 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVE</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
-			<value level="2">21600000</value>
-			<value level="3">21600000</value>
-			<value level="4">21600000</value>
-			<value level="5">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
 		</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
@@ -1528,19 +1560,15 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="VitalityPointUp">
-				<value>
-					<value level="1">35000</value>
-					<value level="2">35000</value>
-					<value level="3">35000</value>
-					<value level="4">35000</value>
-					<value level="5">35000</value>
-				</value>
-			</effect>
 			<effect name="BlockAbnormalSlot">
 				<slot>HEIR_PVP</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVE,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29433</skillId> <!-- Heir's Radiance - PvE Lv. 4 -->
@@ -1564,13 +1592,19 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVP</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
-			<value level="2">21600000</value>
-			<value level="3">21600000</value>
-			<value level="4">21600000</value>
-			<value level="5">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
 		</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
@@ -1682,6 +1716,11 @@
 				<slot>HEIR_PVE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVP,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29434</skillId> <!-- Heir's Radiance - PvP Lv. 4 -->
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/armorsets/Sets.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/armorsets/Sets.xml
index 948faa021c..7317c50cdc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/armorsets/Sets.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/armorsets/Sets.xml
@@ -8133,18 +8133,32 @@
 	</set>
 	<set id="322" minimumPieces="2">
 		<requiredItems>
-			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->
-			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
-			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
-			<item id="29899" /> <!-- Heir's Radiance Lv. 5 (PvE) -->
-			<item id="29900" /> <!-- Heir's Radiance Lv. 6 (PvE) -->
-			<item id="29901" /> <!-- Heir's Radiance Lv. 7 (PvE) -->		
+			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->		
 			<item id="29755" /> <!-- Heir's Radiance Lv. 2 (PvP) -->
+			<item id="48202" /> <!-- Warrior's Circlet -->
+			<item id="48203" /> <!-- Noble Warrior's Circlet -->
+			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29393" level="1" minimumPieces="2" /> <!-- Warrior's Heir -->
+		</skills>
+	</set>
+	<set id="323" minimumPieces="2">
+		<requiredItems>
+			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
 			<item id="29756" /> <!-- Heir's Radiance Lv. 3 (PvP) -->
+			<item id="48202" /> <!-- Warrior's Circlet -->
+			<item id="48203" /> <!-- Noble Warrior's Circlet -->
+			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29393" level="2" minimumPieces="2" /> <!-- Warrior's Heir -->
+		</skills>
+	</set>
+	<set id="324" minimumPieces="2">
+		<requiredItems>
+			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
 			<item id="29757" /> <!-- Heir's Radiance Lv. 4 (PvP) -->
-			<item id="29902" /> <!-- Heir's Radiance Lv. 5 (PvP) -->
-			<item id="29903" /> <!-- Heir's Radiance Lv. 6 (PvP) -->
-			<item id="29904" /> <!-- Heir's Radiance Lv. 7 (PvP) -->
 			<item id="48202" /> <!-- Warrior's Circlet -->
 			<item id="48203" /> <!-- Noble Warrior's Circlet -->
 			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
@@ -8153,20 +8167,70 @@
 			<skill id="29393" level="3" minimumPieces="2" /> <!-- Warrior's Heir -->
 		</skills>
 	</set>
-	<set id="323" minimumPieces="2">
+	<set id="325" minimumPieces="2">
 		<requiredItems>
-			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->
-			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
-			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
 			<item id="29899" /> <!-- Heir's Radiance Lv. 5 (PvE) -->
-			<item id="29900" /> <!-- Heir's Radiance Lv. 6 (PvE) -->
-			<item id="29901" /> <!-- Heir's Radiance Lv. 7 (PvE) -->		
-			<item id="29755" /> <!-- Heir's Radiance Lv. 2 (PvP) -->
-			<item id="29756" /> <!-- Heir's Radiance Lv. 3 (PvP) -->
-			<item id="29757" /> <!-- Heir's Radiance Lv. 4 (PvP) -->
 			<item id="29902" /> <!-- Heir's Radiance Lv. 5 (PvP) -->
+			<item id="48202" /> <!-- Warrior's Circlet -->
+			<item id="48203" /> <!-- Noble Warrior's Circlet -->
+			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29393" level="4" minimumPieces="2" /> <!-- Warrior's Heir -->
+		</skills>
+	</set>
+	<set id="326" minimumPieces="2">
+		<requiredItems>
+			<item id="29900" /> <!-- Heir's Radiance Lv. 6 (PvE) -->
 			<item id="29903" /> <!-- Heir's Radiance Lv. 6 (PvP) -->
+			<item id="48202" /> <!-- Warrior's Circlet -->
+			<item id="48203" /> <!-- Noble Warrior's Circlet -->
+			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29393" level="5" minimumPieces="2" /> <!-- Warrior's Heir -->
+		</skills>
+	</set>
+	<set id="327" minimumPieces="2">
+		<requiredItems>
+			<item id="29901" /> <!-- Heir's Radiance Lv. 7 (PvE) -->
 			<item id="29904" /> <!-- Heir's Radiance Lv. 7 (PvP) -->
+			<item id="48202" /> <!-- Warrior's Circlet -->
+			<item id="48203" /> <!-- Noble Warrior's Circlet -->
+			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29393" level="6" minimumPieces="2" /> <!-- Warrior's Heir -->
+		</skills>
+	</set>
+	<set id="328" minimumPieces="2">
+		<requiredItems>
+			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->		
+			<item id="29755" /> <!-- Heir's Radiance Lv. 2 (PvP) -->
+			<item id="48205" /> <!-- Wizard's Circlet -->
+			<item id="48206" /> <!-- Noble Wizard's Circlet -->
+			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29394" level="1" minimumPieces="2" /> <!-- Wizard's Heir -->
+		</skills>
+	</set>	
+	<set id="329" minimumPieces="2">
+		<requiredItems>
+			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
+			<item id="29756" /> <!-- Heir's Radiance Lv. 3 (PvP) -->
+			<item id="48205" /> <!-- Wizard's Circlet -->
+			<item id="48206" /> <!-- Noble Wizard's Circlet -->
+			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29394" level="2" minimumPieces="2" /> <!-- Wizard's Heir -->
+		</skills>
+	</set>	
+	<set id="330" minimumPieces="2">
+		<requiredItems>
+			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
+			<item id="29757" /> <!-- Heir's Radiance Lv. 4 (PvP) -->
 			<item id="48205" /> <!-- Wizard's Circlet -->
 			<item id="48206" /> <!-- Noble Wizard's Circlet -->
 			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
@@ -8174,21 +8238,71 @@
 		<skills>
 			<skill id="29394" level="3" minimumPieces="2" /> <!-- Wizard's Heir -->
 		</skills>
-	</set>
-	<set id="324" minimumPieces="2">
+	</set>	
+	<set id="331" minimumPieces="2">
 		<requiredItems>
-			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->
-			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
-			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
 			<item id="29899" /> <!-- Heir's Radiance Lv. 5 (PvE) -->
-			<item id="29900" /> <!-- Heir's Radiance Lv. 6 (PvE) -->
-			<item id="29901" /> <!-- Heir's Radiance Lv. 7 (PvE) -->		
-			<item id="29755" /> <!-- Heir's Radiance Lv. 2 (PvP) -->
-			<item id="29756" /> <!-- Heir's Radiance Lv. 3 (PvP) -->
-			<item id="29757" /> <!-- Heir's Radiance Lv. 4 (PvP) -->
 			<item id="29902" /> <!-- Heir's Radiance Lv. 5 (PvP) -->
+			<item id="48205" /> <!-- Wizard's Circlet -->
+			<item id="48206" /> <!-- Noble Wizard's Circlet -->
+			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29394" level="4" minimumPieces="2" /> <!-- Wizard's Heir -->
+		</skills>
+	</set>	
+	<set id="332" minimumPieces="2">
+		<requiredItems>
+			<item id="29900" /> <!-- Heir's Radiance Lv. 6 (PvE) -->
 			<item id="29903" /> <!-- Heir's Radiance Lv. 6 (PvP) -->
+			<item id="48205" /> <!-- Wizard's Circlet -->
+			<item id="48206" /> <!-- Noble Wizard's Circlet -->
+			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29394" level="5" minimumPieces="2" /> <!-- Wizard's Heir -->
+		</skills>
+	</set>	
+	<set id="333" minimumPieces="2">
+		<requiredItems>
+			<item id="29901" /> <!-- Heir's Radiance Lv. 7 (PvE) -->
 			<item id="29904" /> <!-- Heir's Radiance Lv. 7 (PvP) -->
+			<item id="48205" /> <!-- Wizard's Circlet -->
+			<item id="48206" /> <!-- Noble Wizard's Circlet -->
+			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29394" level="6" minimumPieces="2" /> <!-- Wizard's Heir -->
+		</skills>
+	</set>
+	<set id="334" minimumPieces="2">
+		<requiredItems>
+			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->	
+			<item id="29755" /> <!-- Heir's Radiance Lv. 2 (PvP) -->
+			<item id="48208" /> <!-- Knight's Circlet -->
+			<item id="48209" /> <!-- Noble Knight's Circlet -->
+			<item id="48210" /> <!-- Radiant Knight's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29395" level="1" minimumPieces="2" /> <!-- Knight's Heir -->
+		</skills>
+	</set>
+	<set id="335" minimumPieces="2">
+		<requiredItems>
+			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
+			<item id="29756" /> <!-- Heir's Radiance Lv. 3 (PvP) -->
+			<item id="48208" /> <!-- Knight's Circlet -->
+			<item id="48209" /> <!-- Noble Knight's Circlet -->
+			<item id="48210" /> <!-- Radiant Knight's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29395" level="2" minimumPieces="2" /> <!-- Knight's Heir -->
+		</skills>
+	</set>
+	<set id="336" minimumPieces="2">
+		<requiredItems>
+			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
+			<item id="29757" /> <!-- Heir's Radiance Lv. 4 (PvP) -->
 			<item id="48208" /> <!-- Knight's Circlet -->
 			<item id="48209" /> <!-- Noble Knight's Circlet -->
 			<item id="48210" /> <!-- Radiant Knight's Circlet -->
@@ -8197,4 +8311,40 @@
 			<skill id="29395" level="3" minimumPieces="2" /> <!-- Knight's Heir -->
 		</skills>
 	</set>
+	<set id="337" minimumPieces="2">
+		<requiredItems>
+			<item id="29899" /> <!-- Heir's Radiance Lv. 5 (PvE) -->
+			<item id="29902" /> <!-- Heir's Radiance Lv. 5 (PvP) -->
+			<item id="48208" /> <!-- Knight's Circlet -->
+			<item id="48209" /> <!-- Noble Knight's Circlet -->
+			<item id="48210" /> <!-- Radiant Knight's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29395" level="4" minimumPieces="2" /> <!-- Knight's Heir -->
+		</skills>
+	</set>
+	<set id="338" minimumPieces="2">
+		<requiredItems>
+			<item id="29900" /> <!-- Heir's Radiance Lv. 6 (PvE) -->
+			<item id="29903" /> <!-- Heir's Radiance Lv. 6 (PvP) -->
+			<item id="48208" /> <!-- Knight's Circlet -->
+			<item id="48209" /> <!-- Noble Knight's Circlet -->
+			<item id="48210" /> <!-- Radiant Knight's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29395" level="5" minimumPieces="2" /> <!-- Knight's Heir -->
+		</skills>
+	</set>
+	<set id="339" minimumPieces="2">
+		<requiredItems>
+			<item id="29901" /> <!-- Heir's Radiance Lv. 7 (PvE) -->
+			<item id="29904" /> <!-- Heir's Radiance Lv. 7 (PvP) -->
+			<item id="48208" /> <!-- Knight's Circlet -->
+			<item id="48209" /> <!-- Noble Knight's Circlet -->
+			<item id="48210" /> <!-- Radiant Knight's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29395" level="6" minimumPieces="2" /> <!-- Knight's Heir -->
+		</skills>
+	</set>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/29300-29399.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/29300-29399.xml
index 31f763454d..b9e79990f1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/29300-29399.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/29300-29399.xml
@@ -1016,7 +1016,13 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVE</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
 			<value level="2">0</value>
@@ -1101,19 +1107,15 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="VitalityPointUp">
-				<value>
-					<value level="1">0</value>
-					<value level="2">0</value>
-					<value level="3">0</value>
-					<value level="4">0</value>
-					<value level="5">35000</value>
-				</value>
-			</effect>
 			<effect name="BlockAbnormalSlot">
 				<slot>HEIR_PVP</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVE,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29390</skillId> <!-- Heir's Radiance - PvE Lv. 1 -->
@@ -1137,7 +1139,13 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVP</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
 			<value level="2">0</value>
@@ -1255,6 +1263,11 @@
 				<slot>HEIR_PVE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVP,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29391</skillId> <!-- Heir's Radiance - PvP Lv. 1 -->
@@ -1277,7 +1290,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="29393" toLevel="3" name="Warrior's Heir">
+	<skill id="29393" toLevel="6" name="Warrior's Heir">
 		<!-- P. Atk. +$s1. -->
 		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
 		<operateType>P</operateType>
@@ -1287,12 +1300,15 @@
 					<value level="1">1</value>
 					<value level="2">3</value>
 					<value level="3">7</value>
+					<value level="4">10</value>
+					<value level="5">12</value>
+					<value level="6">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
-	<skill id="29394" toLevel="3" name="Wizard's Heir">
+	<skill id="29394" toLevel="6" name="Wizard's Heir">
 		<!-- M. Atk. +$s1. -->
 		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
 		<operateType>P</operateType>
@@ -1302,12 +1318,15 @@
 					<value level="1">1</value>
 					<value level="2">3</value>
 					<value level="3">7</value>
+					<value level="4">10</value>
+					<value level="5">12</value>
+					<value level="6">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
-	<skill id="29395" toLevel="3" name="Knight's Heir">
+	<skill id="29395" toLevel="6" name="Knight's Heir">
 		<!-- P./ M. Def. +$s1. -->
 		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
 		<operateType>P</operateType>
@@ -1317,6 +1336,9 @@
 					<value level="1">1</value>
 					<value level="2">3</value>
 					<value level="3">7</value>
+					<value level="4">10</value>
+					<value level="5">12</value>
+					<value level="6">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
@@ -1325,6 +1347,9 @@
 					<value level="1">1</value>
 					<value level="2">3</value>
 					<value level="3">7</value>
+					<value level="4">10</value>
+					<value level="5">12</value>
+					<value level="6">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/29400-29499.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/29400-29499.xml
index f23c7bbcb0..73d6e3e7e3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/29400-29499.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/29400-29499.xml
@@ -937,13 +937,19 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVE</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
-			<value level="2">21600000</value>
-			<value level="3">21600000</value>
-			<value level="4">21600000</value>
-			<value level="5">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
 		</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
@@ -1022,19 +1028,15 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="VitalityPointUp">
-				<value>
-					<value level="1">35000</value>
-					<value level="2">35000</value>
-					<value level="3">35000</value>
-					<value level="4">35000</value>
-					<value level="5">35000</value>
-				</value>
-			</effect>
 			<effect name="BlockAbnormalSlot">
 				<slot>HEIR_PVP</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVE,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29429</skillId> <!-- Heir's Radiance - PvE Lv. 2 -->
@@ -1058,13 +1060,19 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVP</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
-			<value level="2">21600000</value>
-			<value level="3">21600000</value>
-			<value level="4">21600000</value>
-			<value level="5">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
 		</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
@@ -1176,6 +1184,11 @@
 				<slot>HEIR_PVE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVP,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29430</skillId> <!-- Heir's Radiance - PvP Lv. 2 -->
@@ -1195,13 +1208,19 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVE</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
-			<value level="2">21600000</value>
-			<value level="3">21600000</value>
-			<value level="4">21600000</value>
-			<value level="5">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
 		</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
@@ -1280,19 +1299,15 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="VitalityPointUp">
-				<value>
-					<value level="1">35000</value>
-					<value level="2">35000</value>
-					<value level="3">35000</value>
-					<value level="4">35000</value>
-					<value level="5">35000</value>
-				</value>
-			</effect>
 			<effect name="BlockAbnormalSlot">
 				<slot>HEIR_PVP</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVE,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29431</skillId> <!-- Heir's Radiance - PvE Lv. 3 -->
@@ -1316,13 +1331,19 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVP</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
-			<value level="2">21600000</value>
-			<value level="3">21600000</value>
-			<value level="4">21600000</value>
-			<value level="5">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
 		</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
@@ -1434,6 +1455,11 @@
 				<slot>HEIR_PVE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVP,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29432</skillId> <!-- Heir's Radiance - PvP Lv. 3 -->
@@ -1453,13 +1479,19 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVE</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
-			<value level="2">21600000</value>
-			<value level="3">21600000</value>
-			<value level="4">21600000</value>
-			<value level="5">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
 		</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
@@ -1538,19 +1570,15 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="VitalityPointUp">
-				<value>
-					<value level="1">35000</value>
-					<value level="2">35000</value>
-					<value level="3">35000</value>
-					<value level="4">35000</value>
-					<value level="5">35000</value>
-				</value>
-			</effect>
 			<effect name="BlockAbnormalSlot">
 				<slot>HEIR_PVP</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVE,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29433</skillId> <!-- Heir's Radiance - PvE Lv. 4 -->
@@ -1574,13 +1602,19 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVP</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
-			<value level="2">21600000</value>
-			<value level="3">21600000</value>
-			<value level="4">21600000</value>
-			<value level="5">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
 		</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
@@ -1692,6 +1726,11 @@
 				<slot>HEIR_PVE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVP,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29434</skillId> <!-- Heir's Radiance - PvP Lv. 4 -->
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/armorsets/Sets.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/armorsets/Sets.xml
index 948faa021c..7317c50cdc 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/armorsets/Sets.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/armorsets/Sets.xml
@@ -8133,18 +8133,32 @@
 	</set>
 	<set id="322" minimumPieces="2">
 		<requiredItems>
-			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->
-			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
-			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
-			<item id="29899" /> <!-- Heir's Radiance Lv. 5 (PvE) -->
-			<item id="29900" /> <!-- Heir's Radiance Lv. 6 (PvE) -->
-			<item id="29901" /> <!-- Heir's Radiance Lv. 7 (PvE) -->		
+			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->		
 			<item id="29755" /> <!-- Heir's Radiance Lv. 2 (PvP) -->
+			<item id="48202" /> <!-- Warrior's Circlet -->
+			<item id="48203" /> <!-- Noble Warrior's Circlet -->
+			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29393" level="1" minimumPieces="2" /> <!-- Warrior's Heir -->
+		</skills>
+	</set>
+	<set id="323" minimumPieces="2">
+		<requiredItems>
+			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
 			<item id="29756" /> <!-- Heir's Radiance Lv. 3 (PvP) -->
+			<item id="48202" /> <!-- Warrior's Circlet -->
+			<item id="48203" /> <!-- Noble Warrior's Circlet -->
+			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29393" level="2" minimumPieces="2" /> <!-- Warrior's Heir -->
+		</skills>
+	</set>
+	<set id="324" minimumPieces="2">
+		<requiredItems>
+			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
 			<item id="29757" /> <!-- Heir's Radiance Lv. 4 (PvP) -->
-			<item id="29902" /> <!-- Heir's Radiance Lv. 5 (PvP) -->
-			<item id="29903" /> <!-- Heir's Radiance Lv. 6 (PvP) -->
-			<item id="29904" /> <!-- Heir's Radiance Lv. 7 (PvP) -->
 			<item id="48202" /> <!-- Warrior's Circlet -->
 			<item id="48203" /> <!-- Noble Warrior's Circlet -->
 			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
@@ -8153,20 +8167,70 @@
 			<skill id="29393" level="3" minimumPieces="2" /> <!-- Warrior's Heir -->
 		</skills>
 	</set>
-	<set id="323" minimumPieces="2">
+	<set id="325" minimumPieces="2">
 		<requiredItems>
-			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->
-			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
-			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
 			<item id="29899" /> <!-- Heir's Radiance Lv. 5 (PvE) -->
-			<item id="29900" /> <!-- Heir's Radiance Lv. 6 (PvE) -->
-			<item id="29901" /> <!-- Heir's Radiance Lv. 7 (PvE) -->		
-			<item id="29755" /> <!-- Heir's Radiance Lv. 2 (PvP) -->
-			<item id="29756" /> <!-- Heir's Radiance Lv. 3 (PvP) -->
-			<item id="29757" /> <!-- Heir's Radiance Lv. 4 (PvP) -->
 			<item id="29902" /> <!-- Heir's Radiance Lv. 5 (PvP) -->
+			<item id="48202" /> <!-- Warrior's Circlet -->
+			<item id="48203" /> <!-- Noble Warrior's Circlet -->
+			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29393" level="4" minimumPieces="2" /> <!-- Warrior's Heir -->
+		</skills>
+	</set>
+	<set id="326" minimumPieces="2">
+		<requiredItems>
+			<item id="29900" /> <!-- Heir's Radiance Lv. 6 (PvE) -->
 			<item id="29903" /> <!-- Heir's Radiance Lv. 6 (PvP) -->
+			<item id="48202" /> <!-- Warrior's Circlet -->
+			<item id="48203" /> <!-- Noble Warrior's Circlet -->
+			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29393" level="5" minimumPieces="2" /> <!-- Warrior's Heir -->
+		</skills>
+	</set>
+	<set id="327" minimumPieces="2">
+		<requiredItems>
+			<item id="29901" /> <!-- Heir's Radiance Lv. 7 (PvE) -->
 			<item id="29904" /> <!-- Heir's Radiance Lv. 7 (PvP) -->
+			<item id="48202" /> <!-- Warrior's Circlet -->
+			<item id="48203" /> <!-- Noble Warrior's Circlet -->
+			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29393" level="6" minimumPieces="2" /> <!-- Warrior's Heir -->
+		</skills>
+	</set>
+	<set id="328" minimumPieces="2">
+		<requiredItems>
+			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->		
+			<item id="29755" /> <!-- Heir's Radiance Lv. 2 (PvP) -->
+			<item id="48205" /> <!-- Wizard's Circlet -->
+			<item id="48206" /> <!-- Noble Wizard's Circlet -->
+			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29394" level="1" minimumPieces="2" /> <!-- Wizard's Heir -->
+		</skills>
+	</set>	
+	<set id="329" minimumPieces="2">
+		<requiredItems>
+			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
+			<item id="29756" /> <!-- Heir's Radiance Lv. 3 (PvP) -->
+			<item id="48205" /> <!-- Wizard's Circlet -->
+			<item id="48206" /> <!-- Noble Wizard's Circlet -->
+			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29394" level="2" minimumPieces="2" /> <!-- Wizard's Heir -->
+		</skills>
+	</set>	
+	<set id="330" minimumPieces="2">
+		<requiredItems>
+			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
+			<item id="29757" /> <!-- Heir's Radiance Lv. 4 (PvP) -->
 			<item id="48205" /> <!-- Wizard's Circlet -->
 			<item id="48206" /> <!-- Noble Wizard's Circlet -->
 			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
@@ -8174,21 +8238,71 @@
 		<skills>
 			<skill id="29394" level="3" minimumPieces="2" /> <!-- Wizard's Heir -->
 		</skills>
-	</set>
-	<set id="324" minimumPieces="2">
+	</set>	
+	<set id="331" minimumPieces="2">
 		<requiredItems>
-			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->
-			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
-			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
 			<item id="29899" /> <!-- Heir's Radiance Lv. 5 (PvE) -->
-			<item id="29900" /> <!-- Heir's Radiance Lv. 6 (PvE) -->
-			<item id="29901" /> <!-- Heir's Radiance Lv. 7 (PvE) -->		
-			<item id="29755" /> <!-- Heir's Radiance Lv. 2 (PvP) -->
-			<item id="29756" /> <!-- Heir's Radiance Lv. 3 (PvP) -->
-			<item id="29757" /> <!-- Heir's Radiance Lv. 4 (PvP) -->
 			<item id="29902" /> <!-- Heir's Radiance Lv. 5 (PvP) -->
+			<item id="48205" /> <!-- Wizard's Circlet -->
+			<item id="48206" /> <!-- Noble Wizard's Circlet -->
+			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29394" level="4" minimumPieces="2" /> <!-- Wizard's Heir -->
+		</skills>
+	</set>	
+	<set id="332" minimumPieces="2">
+		<requiredItems>
+			<item id="29900" /> <!-- Heir's Radiance Lv. 6 (PvE) -->
 			<item id="29903" /> <!-- Heir's Radiance Lv. 6 (PvP) -->
+			<item id="48205" /> <!-- Wizard's Circlet -->
+			<item id="48206" /> <!-- Noble Wizard's Circlet -->
+			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29394" level="5" minimumPieces="2" /> <!-- Wizard's Heir -->
+		</skills>
+	</set>	
+	<set id="333" minimumPieces="2">
+		<requiredItems>
+			<item id="29901" /> <!-- Heir's Radiance Lv. 7 (PvE) -->
 			<item id="29904" /> <!-- Heir's Radiance Lv. 7 (PvP) -->
+			<item id="48205" /> <!-- Wizard's Circlet -->
+			<item id="48206" /> <!-- Noble Wizard's Circlet -->
+			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29394" level="6" minimumPieces="2" /> <!-- Wizard's Heir -->
+		</skills>
+	</set>
+	<set id="334" minimumPieces="2">
+		<requiredItems>
+			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->	
+			<item id="29755" /> <!-- Heir's Radiance Lv. 2 (PvP) -->
+			<item id="48208" /> <!-- Knight's Circlet -->
+			<item id="48209" /> <!-- Noble Knight's Circlet -->
+			<item id="48210" /> <!-- Radiant Knight's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29395" level="1" minimumPieces="2" /> <!-- Knight's Heir -->
+		</skills>
+	</set>
+	<set id="335" minimumPieces="2">
+		<requiredItems>
+			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
+			<item id="29756" /> <!-- Heir's Radiance Lv. 3 (PvP) -->
+			<item id="48208" /> <!-- Knight's Circlet -->
+			<item id="48209" /> <!-- Noble Knight's Circlet -->
+			<item id="48210" /> <!-- Radiant Knight's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29395" level="2" minimumPieces="2" /> <!-- Knight's Heir -->
+		</skills>
+	</set>
+	<set id="336" minimumPieces="2">
+		<requiredItems>
+			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
+			<item id="29757" /> <!-- Heir's Radiance Lv. 4 (PvP) -->
 			<item id="48208" /> <!-- Knight's Circlet -->
 			<item id="48209" /> <!-- Noble Knight's Circlet -->
 			<item id="48210" /> <!-- Radiant Knight's Circlet -->
@@ -8197,4 +8311,40 @@
 			<skill id="29395" level="3" minimumPieces="2" /> <!-- Knight's Heir -->
 		</skills>
 	</set>
+	<set id="337" minimumPieces="2">
+		<requiredItems>
+			<item id="29899" /> <!-- Heir's Radiance Lv. 5 (PvE) -->
+			<item id="29902" /> <!-- Heir's Radiance Lv. 5 (PvP) -->
+			<item id="48208" /> <!-- Knight's Circlet -->
+			<item id="48209" /> <!-- Noble Knight's Circlet -->
+			<item id="48210" /> <!-- Radiant Knight's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29395" level="4" minimumPieces="2" /> <!-- Knight's Heir -->
+		</skills>
+	</set>
+	<set id="338" minimumPieces="2">
+		<requiredItems>
+			<item id="29900" /> <!-- Heir's Radiance Lv. 6 (PvE) -->
+			<item id="29903" /> <!-- Heir's Radiance Lv. 6 (PvP) -->
+			<item id="48208" /> <!-- Knight's Circlet -->
+			<item id="48209" /> <!-- Noble Knight's Circlet -->
+			<item id="48210" /> <!-- Radiant Knight's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29395" level="5" minimumPieces="2" /> <!-- Knight's Heir -->
+		</skills>
+	</set>
+	<set id="339" minimumPieces="2">
+		<requiredItems>
+			<item id="29901" /> <!-- Heir's Radiance Lv. 7 (PvE) -->
+			<item id="29904" /> <!-- Heir's Radiance Lv. 7 (PvP) -->
+			<item id="48208" /> <!-- Knight's Circlet -->
+			<item id="48209" /> <!-- Noble Knight's Circlet -->
+			<item id="48210" /> <!-- Radiant Knight's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29395" level="6" minimumPieces="2" /> <!-- Knight's Heir -->
+		</skills>
+	</set>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/29300-29399.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/29300-29399.xml
index 31f763454d..b9e79990f1 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/29300-29399.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/29300-29399.xml
@@ -1016,7 +1016,13 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVE</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
 			<value level="2">0</value>
@@ -1101,19 +1107,15 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="VitalityPointUp">
-				<value>
-					<value level="1">0</value>
-					<value level="2">0</value>
-					<value level="3">0</value>
-					<value level="4">0</value>
-					<value level="5">35000</value>
-				</value>
-			</effect>
 			<effect name="BlockAbnormalSlot">
 				<slot>HEIR_PVP</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVE,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29390</skillId> <!-- Heir's Radiance - PvE Lv. 1 -->
@@ -1137,7 +1139,13 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVP</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
 			<value level="2">0</value>
@@ -1255,6 +1263,11 @@
 				<slot>HEIR_PVE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVP,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29391</skillId> <!-- Heir's Radiance - PvP Lv. 1 -->
@@ -1277,7 +1290,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="29393" toLevel="3" name="Warrior's Heir">
+	<skill id="29393" toLevel="6" name="Warrior's Heir">
 		<!-- P. Atk. +$s1. -->
 		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
 		<operateType>P</operateType>
@@ -1287,12 +1300,15 @@
 					<value level="1">1</value>
 					<value level="2">3</value>
 					<value level="3">7</value>
+					<value level="4">10</value>
+					<value level="5">12</value>
+					<value level="6">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
-	<skill id="29394" toLevel="3" name="Wizard's Heir">
+	<skill id="29394" toLevel="6" name="Wizard's Heir">
 		<!-- M. Atk. +$s1. -->
 		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
 		<operateType>P</operateType>
@@ -1302,12 +1318,15 @@
 					<value level="1">1</value>
 					<value level="2">3</value>
 					<value level="3">7</value>
+					<value level="4">10</value>
+					<value level="5">12</value>
+					<value level="6">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
-	<skill id="29395" toLevel="3" name="Knight's Heir">
+	<skill id="29395" toLevel="6" name="Knight's Heir">
 		<!-- P./ M. Def. +$s1. -->
 		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
 		<operateType>P</operateType>
@@ -1317,6 +1336,9 @@
 					<value level="1">1</value>
 					<value level="2">3</value>
 					<value level="3">7</value>
+					<value level="4">10</value>
+					<value level="5">12</value>
+					<value level="6">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
@@ -1325,6 +1347,9 @@
 					<value level="1">1</value>
 					<value level="2">3</value>
 					<value level="3">7</value>
+					<value level="4">10</value>
+					<value level="5">12</value>
+					<value level="6">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/29400-29499.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/29400-29499.xml
index f23c7bbcb0..73d6e3e7e3 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/29400-29499.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/29400-29499.xml
@@ -937,13 +937,19 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVE</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
-			<value level="2">21600000</value>
-			<value level="3">21600000</value>
-			<value level="4">21600000</value>
-			<value level="5">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
 		</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
@@ -1022,19 +1028,15 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="VitalityPointUp">
-				<value>
-					<value level="1">35000</value>
-					<value level="2">35000</value>
-					<value level="3">35000</value>
-					<value level="4">35000</value>
-					<value level="5">35000</value>
-				</value>
-			</effect>
 			<effect name="BlockAbnormalSlot">
 				<slot>HEIR_PVP</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVE,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29429</skillId> <!-- Heir's Radiance - PvE Lv. 2 -->
@@ -1058,13 +1060,19 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVP</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
-			<value level="2">21600000</value>
-			<value level="3">21600000</value>
-			<value level="4">21600000</value>
-			<value level="5">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
 		</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
@@ -1176,6 +1184,11 @@
 				<slot>HEIR_PVE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVP,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29430</skillId> <!-- Heir's Radiance - PvP Lv. 2 -->
@@ -1195,13 +1208,19 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVE</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
-			<value level="2">21600000</value>
-			<value level="3">21600000</value>
-			<value level="4">21600000</value>
-			<value level="5">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
 		</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
@@ -1280,19 +1299,15 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="VitalityPointUp">
-				<value>
-					<value level="1">35000</value>
-					<value level="2">35000</value>
-					<value level="3">35000</value>
-					<value level="4">35000</value>
-					<value level="5">35000</value>
-				</value>
-			</effect>
 			<effect name="BlockAbnormalSlot">
 				<slot>HEIR_PVP</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVE,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29431</skillId> <!-- Heir's Radiance - PvE Lv. 3 -->
@@ -1316,13 +1331,19 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVP</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
-			<value level="2">21600000</value>
-			<value level="3">21600000</value>
-			<value level="4">21600000</value>
-			<value level="5">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
 		</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
@@ -1434,6 +1455,11 @@
 				<slot>HEIR_PVE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVP,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29432</skillId> <!-- Heir's Radiance - PvP Lv. 3 -->
@@ -1453,13 +1479,19 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVE</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
-			<value level="2">21600000</value>
-			<value level="3">21600000</value>
-			<value level="4">21600000</value>
-			<value level="5">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
 		</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
@@ -1538,19 +1570,15 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="VitalityPointUp">
-				<value>
-					<value level="1">35000</value>
-					<value level="2">35000</value>
-					<value level="3">35000</value>
-					<value level="4">35000</value>
-					<value level="5">35000</value>
-				</value>
-			</effect>
 			<effect name="BlockAbnormalSlot">
 				<slot>HEIR_PVP</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVE,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29433</skillId> <!-- Heir's Radiance - PvE Lv. 4 -->
@@ -1574,13 +1602,19 @@
 		<operateType>A2</operateType>
 		<abnormalType>HEIR_PVP</abnormalType>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>3600</abnormalTime>
+		<abnormalTime>
+			<value level="1">21600</value>
+			<value level="2">3600</value>
+			<value level="3">3600</value>
+			<value level="4">3600</value>
+			<value level="5">3600</value>
+		</abnormalTime>
 		<reuseDelay>
 			<value level="1">21600000</value>
-			<value level="2">21600000</value>
-			<value level="3">21600000</value>
-			<value level="4">21600000</value>
-			<value level="5">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
 		</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
@@ -1692,6 +1726,11 @@
 				<slot>HEIR_PVE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HEIR_PVP,1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>29434</skillId> <!-- Heir's Radiance - PvP Lv. 4 -->