diff --git a/src/main/resources/data/stats/skills/03300-03399.xml b/src/main/resources/data/stats/skills/03300-03399.xml
index 97ead5ed315dbbd3f25121a6236b0eaa7f9035dd..cb2ca57f98e2acc409512efc93e3f65c68c93457 100644
--- a/src/main/resources/data/stats/skills/03300-03399.xml
+++ b/src/main/resources/data/stats/skills/03300-03399.xml
@@ -238,6 +238,8 @@
 		</effects>
 	</skill>
 	<skill id="3319" levels="1" name="Divine Protection of Ring">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="magicLvl" val="86" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
@@ -610,54 +612,74 @@
 		</effects>
 	</skill>
 	<skill id="3338" levels="1" name="Shield Master">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="3339" levels="1" name="Bard">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="3340" levels="1" name="Weapon Master">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="3341" levels="1" name="Force Master">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="3342" levels="1" name="Bow Master">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="3343" levels="1" name="Dagger Master">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="3344" levels="1" name="Wizard">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="3345" levels="1" name="Summoner">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="3346" levels="1" name="Healer">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="3347" levels="1" name="Enchanter">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="3348" levels="1" name="Dynasty Breast Plate - Shield Master">
 		<!-- Confirmed CT2.5 -->
diff --git a/src/main/resources/data/stats/skills/03700-03799.xml b/src/main/resources/data/stats/skills/03700-03799.xml
index 9a2c65be3a52f35a0fb578e31191a2f6824de3fa..d227221b4daf0fc63119ab2f1c8bd8108b497d85 100644
--- a/src/main/resources/data/stats/skills/03700-03799.xml
+++ b/src/main/resources/data/stats/skills/03700-03799.xml
@@ -1014,18 +1014,21 @@
 		</effects>
 	</skill>
 	<skill id="3764" levels="1" name="Armor of Nightmare">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.armor_t80_ul_i00" />
 		<set name="magicLvl" val="67" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="pAtk" val="1.1708" />
+			<effect name="DefenceTrait">
+				<param HOLD="29.16" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="29.16" />
-				<param HOLD="29.16" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.1708" />
 			</effect>
 		</effects>
 	</skill>
@@ -1077,21 +1080,26 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="3768" levels="1" name="Nightmarish Leather Armor">
-		<!-- Confirmed CT2.5 -->
+	<skill id="3768" levels="1" name="Leather Armor of Nightmare">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.armor_t81_ul_i00" />
 		<set name="magicLvl" val="67" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<add stat="absorbDam" val="3" />
-				<mul stat="mDef" val="1.0827" />
-			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="29.16" />
+			</effect>
+			<effect name="DefenceTrait">
 				<param HOLD="29.16" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.0827" />
+			</effect>
+			<effect name="Buff">
+				<add stat="absorbDam" val="3" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="3769" levels="1" name="Gauntlet of Nightmare">
@@ -1143,21 +1151,26 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="3772" levels="1" name="Nightmare Robe">
-		<!-- Confirmed CT2.5 -->
+	<skill id="3772" levels="1" name="Robe of Nightmare">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.armor_t82_ul_i00" />
 		<set name="magicLvl" val="67" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="mAtk" val="1.0827" />
-				<mul stat="regMp" val="1.0827" />
-			</effect>
 			<effect name="DefenceTrait">
 				<param SLEEP="29.16" />
+			</effect>
+			<effect name="DefenceTrait">
 				<param HOLD="29.16" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.0827" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="regMp" val="1.0827" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="3773" levels="1" name="Boots of Nightmare">
@@ -1224,19 +1237,25 @@
 		</effects>
 	</skill>
 	<skill id="3777" levels="1" name="Draconic Leather Armor">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.armor_t89_ul_i00" />
 		<set name="magicLvl" val="75" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="1.0580001" />
+			</effect>
 			<effect name="MaxMp">
 				<param power="630" />
+				<param type="DIFF" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.0580001" />
 			</effect>
 			<effect name="Buff">
 				<add stat="weightPenalty" val="8159" />
-				<mul stat="pAtk" val="1.058" />
-				<mul stat="pAtkSpd" val="1.058" />
 			</effect>
 		</effects>
 	</skill>
@@ -1276,20 +1295,27 @@
 		</effects>
 	</skill>
 	<skill id="3780" levels="1" name="Major Arcana Robe">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.armor_t90_ul_i00" />
 		<set name="magicLvl" val="75" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="DefenceTrait">
+				<param SHOCK="20.83" />
+			</effect>
 			<effect name="Buff">
-				<sub stat="cancel" val="21" />
-				<add stat="weightPenalty" val="8159" />
 				<mul stat="mAtk" val="1.1603" />
-				<mul stat="runSpd" val="1.0991" />
 			</effect>
-			<effect name="DefenceTrait">
-				<param SHOCK="20.83" />
+			<effect name="Buff">
+				<sub stat="cancel" val="21" />
+			</effect>
+			<effect name="Buff">
+				<add stat="runSpd" val="9.91" />
+			</effect>
+			<effect name="Buff">
+				<add stat="weightPenalty" val="8159" />
 			</effect>
 		</effects>
 	</skill>
@@ -1418,36 +1444,44 @@
 		</effects>
 	</skill>
 	<skill id="3788" levels="1" name="Imperial Crusader Breastplate">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.armor_t88_u_i00" />
 		<set name="magicLvl" val="75" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="DefenceTrait">
+				<param SLEEP="28" />
+			</effect>
+			<effect name="DefenceTrait">
+				<param HOLD="28" />
+			</effect>
 			<effect name="MaxHp">
 				<param power="889" />
+				<param type="DIFF" />
 			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.0724" />
 			</effect>
-			<effect name="DefenceTrait">
-				<param SLEEP="28" />
-				<param HOLD="28" />
-			</effect>
 		</effects>
 	</skill>
 	<skill id="3789" levels="1" name="Dynasty Breastplate">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.armor_t91_uf_i00" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="Buff">
+				<add stat="darkRes" val="3.2" />
+			</effect>
 			<effect name="MaxHp">
 				<param power="984" />
+				<param type="DIFF" />
 			</effect>
 			<effect name="Buff">
-				<add stat="darkRes" val="3.2" />
 				<mul stat="pDef" val="1.0724" />
 			</effect>
 		</effects>
@@ -1529,21 +1563,29 @@
 		</effects>
 	</skill>
 	<skill id="3795" levels="1" name="Dynasty Leather Armor">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.armor_t92_ud_i00" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="MaxMp">
-				<param power="492" />
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="1.0476999" />
 			</effect>
 			<effect name="Buff">
-				<add stat="accCombat" val="3.4" />
-				<add stat="darkRes" val="3.2" />
-				<mul stat="pAtkSpd" val="1.0477" />
 				<add stat="rEvas" val="3.4" />
 			</effect>
+			<effect name="Buff">
+				<add stat="darkRes" val="3.2" />
+			</effect>
+			<effect name="Buff">
+				<add stat="accCombat" val="3.4" />
+			</effect>
+			<effect name="MaxHp">
+				<param power="492" />
+				<param type="DIFF" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="3796" levels="1" name="Dynasty Leather Leggings">
@@ -1601,7 +1643,8 @@
 		</effects>
 	</skill>
 	<skill id="3799" levels="1" name="Dynasty Tunic">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.armor_t93_uw_i00" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />