From 80b958045bb6c9aeae687a814e55a53b3b722d94 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Fri, 17 Dec 2021 01:02:55 -0300
Subject: [PATCH] Fixed Duelist skills

Reflect Damage (86)
Detect Animal Weakness (87)
Detect Dragon Weakness (88)
Detect Plant Weakness (104)
Triple Sonic Slash (261)
Duelist Spirit (297)
Eye of Hunter (359)
Eye of Slayer (360)
Sonic Barrier (442)
Sonic Move (451)
Maximum Focus Sonic (919)

Reported-by: palmer03
---
 .../data/stats/skills/00000-00099.xml         | 27 ++++++----
 .../data/stats/skills/00100-00199.xml         |  3 ++
 .../data/stats/skills/00200-00299.xml         | 51 +++++++++++++------
 .../data/stats/skills/00300-00399.xml         | 44 +++++++++++++---
 .../data/stats/skills/00400-00499.xml         | 14 +++--
 .../data/stats/skills/00900-00999.xml         |  2 +
 6 files changed, 106 insertions(+), 35 deletions(-)

diff --git a/src/main/resources/data/stats/skills/00000-00099.xml b/src/main/resources/data/stats/skills/00000-00099.xml
index fb7313e3e9..900fe38682 100644
--- a/src/main/resources/data/stats/skills/00000-00099.xml
+++ b/src/main/resources/data/stats/skills/00000-00099.xml
@@ -2488,36 +2488,39 @@
 		</effects>
 	</skill>
 	<skill id="86" levels="3" name="Reflect Damage" enchantGroup1="1" enchantGroup2="1">
+		<!-- High Five Confirmed -->
 		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#effectPoint"> 379 438 495 </table>
 		<table name="#magicLvl"> 40 46 52 </table>
-		<table name="#mpConsume2"> 14 17 19 </table>
 		<table name="#mpConsume1"> 4 5 5 </table>
+		<table name="#mpConsume2"> 14 17 19 </table>
 		<table name="#reflectDam"> 10 15 20 </table>
-		<table name="#ench1AbnormalTimes"> 1240 1280 1320 1360 1400 1440 1480 1520 1560 1600 1640 1680 1720 1760 1800 1840 1880 1920 1960 2000 2040 2080 2120 2160 2200 2240 2280 2320 2360 2400 </table>
-		<table name="#ench2MpConsume2"> 19 19 19 18 18 18 18 17 17 17 17 16 16 16 15 15 15 14 14 14 13 13 12 12 12 11 11 11 10 10 </table>
-		<table name="#ench2MpConsume1"> 5 5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 3 3 3 3 3 3 3 3 3 3 </table>
-		<table name="#ench2reflectDam"> 21 21 21 22 22 22 23 23 23 24 24 24 24 25 25 25 26 26 26 27 27 27 27 28 28 28 29 29 29 30 </table>
 		<table name="#enchMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
+		<table name="#ench1AbnormalTime"> 1240 1280 1320 1360 1400 1440 1480 1520 1560 1600 1640 1680 1720 1760 1800 1840 1880 1920 1960 2000 2040 2080 2120 2160 2200 2240 2280 2320 2360 2400 </table>
+		<table name="#ench2MpConsume1"> 4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 3 3 3 3 3 3 3 3 3 2 2 2 2 2 2 </table>
+		<table name="#ench2MpConsume2"> 18 18 18 17 17 17 16 16 16 15 15 15 14 14 14 13 13 13 12 12 12 12 11 11 11 10 10 10 9 9 </table>
+		<table name="#ench2ReflectDam"> 21 21 21 22 22 22 23 23 23 24 24 24 24 25 25 25 26 26 26 27 27 27 27 28 28 28 29 29 29 30 </table>
 		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="DMG_SHIELD" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="#effectPoint" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill0086" />
 		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
-		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="mpConsume1" val="#mpConsume1" />
+		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
-		<enchant1 name="abnormalTime" val="#ench1AbnormalTimes" />
+		<enchant1 name="abnormalTime" val="#ench1AbnormalTime" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
-		<enchant2 name="mpConsume2" val="#ench2MpConsume2" />
 		<enchant2 name="mpConsume1" val="#ench2MpConsume1" />
+		<enchant2 name="mpConsume2" val="#ench2MpConsume2" />
 		<effects>
 			<effect name="Buff">
 				<add stat="reflectDam" val="#reflectDam" />
@@ -2525,15 +2528,18 @@
 		</effects>
 		<enchant2Effects>
 			<effect name="Buff">
-				<add stat="reflectDam" val="#ench2reflectDam" />
+				<add stat="reflectDam" val="#ench2ReflectDam" />
 			</effect>
 		</enchant2Effects>
 	</skill>
 	<skill id="87" levels="1" name="Detect Animal Weakness">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="DETECT_WEAKNESS" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="379" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill0087" />
 		<set name="magicLvl" val="40" />
@@ -2549,10 +2555,13 @@
 		</effects>
 	</skill>
 	<skill id="88" levels="1" name="Detect Dragon Weakness">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="DETECT_WEAKNESS" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="549" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill0088" />
 		<set name="magicLvl" val="58" />
diff --git a/src/main/resources/data/stats/skills/00100-00199.xml b/src/main/resources/data/stats/skills/00100-00199.xml
index 735db06939..8579477a40 100644
--- a/src/main/resources/data/stats/skills/00100-00199.xml
+++ b/src/main/resources/data/stats/skills/00100-00199.xml
@@ -241,10 +241,13 @@
 		</effects>
 	</skill>
 	<skill id="104" levels="1" name="Detect Plant Weakness">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="DETECT_WEAKNESS" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="438" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill0104" />
 		<set name="magicLvl" val="46" />
diff --git a/src/main/resources/data/stats/skills/00200-00299.xml b/src/main/resources/data/stats/skills/00200-00299.xml
index 015dbbea42..8b41d5544f 100644
--- a/src/main/resources/data/stats/skills/00200-00299.xml
+++ b/src/main/resources/data/stats/skills/00200-00299.xml
@@ -1674,21 +1674,24 @@
 		</enchant2Effects>
 	</skill>
 	<skill id="261" levels="22" name="Triple Sonic Slash" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
+		<!-- High Five Confirmed -->
 		<table name="#effectPoint"> -598 -609 -620 -631 -641 -651 -661 -671 -680 -690 -699 -708 -716 -724 -732 -739 -746 -753 -759 -765 -771 -776 </table>
+		<table name="#energyAttackPower"> 1948 2042 2138 2236 2337 2439 2544 2651 2760 2870 2982 3095 3210 3325 3442 3559 3676 3794 3911 4029 4146 4262 </table>
 		<table name="#magicLvl"> 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 </table>
 		<table name="#mpConsume2"> 103 105 108 110 113 115 118 120 121 123 125 128 130 132 134 136 139 141 143 145 146 148 </table>
-		<table name="#power"> 1948 2042 2138 2236 2337 2439 2544 2651 2760 2870 2982 3095 3210 3325 3442 3559 3676 3794 3911 4029 4146 4262 </table>
-		<table name="#ench1Power"> 4299 4338 4376 4415 4453 4491 4530 4568 4607 4645 4683 4722 4760 4799 4837 4875 4914 4952 4991 5029 5067 5106 5144 5183 5221 5259 5298 5336 5375 5413 </table>
-		<table name="#ench2MpConsume2"> 147 145 142 140 137 135 133 130 128 125 123 120 118 115 113 111 108 106 103 101 98 96 94 91 89 86 84 81 79 76 </table>
-		<table name="#ench7pvpPower"> 4336 4410 4485 4559 4634 4708 4783 4857 4932 5006 5081 5155 5230 5304 5379 5453 5527 5602 5676 5751 5825 5900 5974 6049 6123 6198 6272 6347 6347 6496 </table>
 		<table name="#enchAttributePower"> 1 3 5 6 8 10 11 13 15 16 18 20 21 23 25 26 28 30 31 33 35 36 38 40 41 43 45 46 48 50 </table>
 		<table name="#enchMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
+		<table name="#ench1EnergyAttackPower"> 4299 4338 4376 4415 4453 4491 4530 4568 4607 4645 4683 4722 4760 4799 4837 4875 4914 4952 4991 5029 5067 5106 5144 5183 5221 5259 5298 5336 5375 5413 </table>
+		<table name="#ench2MpConsume2"> 147 145 142 140 137 135 133 130 128 125 123 120 118 115 113 111 108 106 103 101 98 96 94 91 89 86 84 81 79 76 </table>
+		<table name="#ench7EnergyAttackPvpPower"> 4336 4410 4485 4559 4634 4708 4783 4857 4932 5006 5081 5155 5230 5304 5379 5453 5527 5602 5676 5751 5825 5900 5974 6049 6123 6198 6272 6347 6421 6496 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="40" />
 		<set name="chargeConsume" val="4" />
 		<set name="coolTime" val="133" />
 		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="400" />
-		<set name="hitTime" val="1670" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="1667" />
 		<set name="icon" val="icon.skill0261" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
@@ -1697,7 +1700,7 @@
 		<set name="overHit" val="true" />
 		<set name="reuseDelay" val="5000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="ENEMY" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="mpConsume2" val="#ench2MpConsume2" />
@@ -1717,39 +1720,39 @@
 		<cond msgId="113" addName="1">
 			<and>
 				<using kind="DUAL" />
-				<player Charges="4" /> <!-- Need to recharge 4th stage of Sword Energy. -->
+				<player Charges="4" />
 			</and>
 		</cond>
 		<effects>
 			<effect name="EnergyAttack">
-				<param power="#power" />
+				<param power="#energyAttackPower" />
 				<param criticalChance="15" />
 				<param ignoreShieldDefence="true" />
 			</effect>
 		</effects>
 		<enchant1Effects>
 			<effect name="EnergyAttack">
-				<param power="#ench1Power" />
+				<param power="#ench1EnergyAttackPower" />
 				<param criticalChance="15" />
 				<param ignoreShieldDefence="true" />
 			</effect>
 		</enchant1Effects>
 		<enchant7Effects>
 		</enchant7Effects>
-		<enchant7pvpEffects>
+		<enchant7pveEffects>
 			<effect name="EnergyAttack">
-				<param power="#ench7pvpPower" />
+				<param power="4262" />
 				<param criticalChance="15" />
 				<param ignoreShieldDefence="true" />
 			</effect>
-		</enchant7pvpEffects>
-		<enchant7pveEffects>
+		</enchant7pveEffects>
+		<enchant7pvpEffects>
 			<effect name="EnergyAttack">
-				<param power="4262" />
+				<param power="#ench7EnergyAttackPvpPower" />
 				<param criticalChance="15" />
 				<param ignoreShieldDefence="true" />
 			</effect>
-		</enchant7pveEffects>
+		</enchant7pvpEffects>
 	</skill>
 	<skill id="262" levels="37" name="Divine Blessing" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2">
 		<!-- High Five Confirmed -->
@@ -3206,18 +3209,22 @@
 		</effects>
 	</skill>
 	<skill id="297" levels="2" name="Duelist Spirit" enchantGroup1="1" enchantGroup2="1">
+		<!-- High Five Confirmed -->
 		<table name="#abnormalLvl"> 1 2 </table>
 		<table name="#effectPoint"> 597 646 </table>
 		<table name="#magicLvl"> 64 72 </table>
 		<table name="#mpConsume2"> 30 34 </table>
 		<table name="#pAtkSpd"> 1.08 1.12 </table>
 		<table name="#pvp"> 1.05 1.1 </table>
+		<table name="#enchMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<table name="#ench1pAtkSpd"> 1.121 1.122 1.123 1.124 1.125 1.126 1.127 1.128 1.129 1.13 1.131 1.132 1.133 1.134 1.135 1.136 1.137 1.138 1.139 1.14 1.141 1.142 1.143 1.144 1.145 1.146 1.147 1.148 1.149 1.15 </table>
 		<table name="#ench2pvpDmg"> 1.11 1.11 1.12 1.12 1.13 1.13 1.14 1.14 1.15 1.15 1.16 1.16 1.17 1.17 1.18 1.18 1.18 1.19 1.19 1.2 1.2 1.21 1.21 1.22 1.22 1.23 1.23 1.24 1.24 1.25 </table>
 		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="60" />
 		<set name="abnormalType" val="DUELIST_SPIRIT" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="#effectPoint" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill0297" />
 		<set name="magicLvl" val="#magicLvl" />
@@ -3226,12 +3233,18 @@
 		<set name="reuseDelay" val="30000" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<enchant1 name="magicLvl" val="#enchMagicLvl" />
+		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="#pAtkSpd">
 					<using kind="DUAL" />
 				</mul>
+			</effect>
+			<effect name="Buff">
 				<mul stat="pvpPhysDmg" val="#pvp" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="pvpPhysSkillsDmg" val="#pvp" />
 			</effect>
 		</effects>
@@ -3240,7 +3253,11 @@
 				<mul stat="pAtkSpd" val="#ench1pAtkSpd">
 					<using kind="DUAL" />
 				</mul>
+			</effect>
+			<effect name="Buff">
 				<mul stat="pvpPhysDmg" val="1.1" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="pvpPhysSkillsDmg" val="1.1" />
 			</effect>
 		</enchant1Effects>
@@ -3249,7 +3266,11 @@
 				<mul stat="pAtkSpd" val="1.12">
 					<using kind="DUAL" />
 				</mul>
+			</effect>
+			<effect name="Buff">
 				<mul stat="pvpPhysDmg" val="#ench2pvpDmg" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="pvpPhysSkillsDmg" val="#ench2pvpDmg" />
 			</effect>
 		</enchant2Effects>
diff --git a/src/main/resources/data/stats/skills/00300-00399.xml b/src/main/resources/data/stats/skills/00300-00399.xml
index 6a212f0dd5..fceb5aa974 100644
--- a/src/main/resources/data/stats/skills/00300-00399.xml
+++ b/src/main/resources/data/stats/skills/00300-00399.xml
@@ -2387,14 +2387,17 @@
 		</enchant1Effects>
 	</skill>
 	<skill id="359" levels="1" name="Eye of Hunter" enchantGroup1="5" enchantGroup2="5">
+		<!-- High Five Confirmed -->
+		<table name="#enchMagicLvl"> 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<table name="#ench1Traits"> 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 </table>
-		<table name="#ench2AbnormalTimes"> 640 680 720 760 800 840 880 920 960 1000 1040 1080 1120 1160 1200 </table>
+		<table name="#ench2AbnormalTime"> 640 680 720 760 800 840 880 920 960 1000 1040 1080 1120 1160 1200 </table>
 		<table name="#ench2Traits"> 31 31 31 32 32 32 33 33 33 34 34 34 34 35 35 </table>
-		<table name="#enchMagicLvl"> 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="DETECT_WEAKNESS" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="666" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill0359" />
 		<set name="magicLvl" val="77" />
@@ -2404,62 +2407,89 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
-		<enchant2 name="abnormalTime" val="#ench2AbnormalTimes" />
+		<enchant2 name="abnormalTime" val="#ench2AbnormalTime" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<effects>
 			<effect name="AttackTrait">
 				<param BUG_WEAKNESS="30" />
+			</effect>
+			<effect name="AttackTrait">
 				<param PLANT_WEAKNESS="30" />
+			</effect>
+			<effect name="AttackTrait">
 				<param ANIMAL_WEAKNESS="30" />
 			</effect>
 		</effects>
 		<enchant1Effects>
 			<effect name="AttackTrait">
 				<param BUG_WEAKNESS="#ench1Traits" />
+			</effect>
+			<effect name="AttackTrait">
 				<param PLANT_WEAKNESS="#ench1Traits" />
+			</effect>
+			<effect name="AttackTrait">
 				<param ANIMAL_WEAKNESS="#ench1Traits" />
 			</effect>
 		</enchant1Effects>
 		<enchant2Effects>
 			<effect name="AttackTrait">
 				<param BUG_WEAKNESS="#ench2Traits" />
+			</effect>
+			<effect name="AttackTrait">
 				<param PLANT_WEAKNESS="#ench2Traits" />
+			</effect>
+			<effect name="AttackTrait">
 				<param ANIMAL_WEAKNESS="#ench2Traits" />
 			</effect>
 		</enchant2Effects>
 	</skill>
 	<skill id="360" levels="1" name="Eye of Slayer" enchantGroup1="5" enchantGroup2="5">
-		<table name="#ench1Traits"> 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 </table>
-		<table name="#ench2AbnormalTimes"> 640 680 720 760 800 840 880 920 960 1000 1040 1080 1120 1160 1200 </table>
+		<!-- High Five Confirmed -->
 		<table name="#enchMagicLvl"> 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
+		<table name="#ench1Traits"> 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 </table>
+		<table name="#ench2AbnormalTime"> 640 680 720 760 800 840 880 920 960 1000 1040 1080 1120 1160 1200 </table>
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="DETECT_WEAKNESS" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="669" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill0360" />
-		<set name="magicLvl" val="77" />
+		<set name="magicLvl" val="78" />
 		<set name="mpConsume2" val="71" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="3000" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
-		<enchant2 name="abnormalTime" val="#ench2AbnormalTimes" />
+		<enchant2 name="abnormalTime" val="#ench2AbnormalTime" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<effects>
 			<effect name="AttackTrait">
 				<param BEAST_WEAKNESS="30" />
+			</effect>
+			<effect name="AttackTrait">
 				<param CONSTRUCT_WEAKNESS="30" />
+			</effect>
+			<effect name="AttackTrait">
 				<param GIANT_WEAKNESS="30" />
+			</effect>
+			<effect name="AttackTrait">
 				<param DRAGON_WEAKNESS="30" />
 			</effect>
 		</effects>
 		<enchant1Effects>
 			<effect name="AttackTrait">
 				<param BEAST_WEAKNESS="#ench1Traits" />
+			</effect>
+			<effect name="AttackTrait">
 				<param CONSTRUCT_WEAKNESS="#ench1Traits" />
+			</effect>
+			<effect name="AttackTrait">
 				<param GIANT_WEAKNESS="#ench1Traits" />
+			</effect>
+			<effect name="AttackTrait">
 				<param DRAGON_WEAKNESS="#ench1Traits" />
 			</effect>
 		</enchant1Effects>
diff --git a/src/main/resources/data/stats/skills/00400-00499.xml b/src/main/resources/data/stats/skills/00400-00499.xml
index 59128be9bf..164b159553 100644
--- a/src/main/resources/data/stats/skills/00400-00499.xml
+++ b/src/main/resources/data/stats/skills/00400-00499.xml
@@ -1815,12 +1815,15 @@
 		</effects>
 	</skill>
 	<skill id="442" levels="1" name="Sonic Barrier">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="10" />
 		<set name="abnormalType" val="INVINCIBILITY" />
 		<set name="abnormalVisualEffect" val="INVINCIBILITY" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="chargeConsume" val="5" />
 		<set name="effectPoint" val="673" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill0442" />
 		<set name="magicLvl" val="79" />
@@ -1831,20 +1834,20 @@
 		<set name="targetType" val="SELF" />
 		<cond msgId="113" addName="1">
 			<and>
-				<using kind="DUAL" /> <!-- Requires a dualsword weapon -->
-				<player Charges="5" /> <!-- Requires 5th stage Sword Energy -->
+				<using kind="DUAL" />
+				<player Charges="5" />
 			</and>
 		</cond>
 		<effects>
+			<effect name="BlockDebuff" />
 			<effect name="BlockDamage">
 				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
 				<param block="MP" />
 			</effect>
-			<effect name="BlockDebuff" />
 			<effect name="Buff">
-				<sub stat="cancelVuln" val="100" />
+				<mul stat="cancelVuln" val="0" />
 			</effect>
 		</effects>
 	</skill>
@@ -2101,6 +2104,7 @@
 		</enchant3Effects>
 	</skill>
 	<skill id="451" levels="2" name="Sonic Move">
+		<!-- High Five Confirmed -->
 		<table name="#chargeConsume"> 2 3 </table>
 		<table name="#effectPoint"> 582 624 </table>
 		<table name="#magicLvl"> 62 68 </table>
@@ -2109,8 +2113,10 @@
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="SPEED_UP_SPECIAL" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="chargeConsume" val="#chargeConsume" />
 		<set name="effectPoint" val="#effectPoint" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill0451" />
 		<set name="magicLvl" val="#magicLvl" />
diff --git a/src/main/resources/data/stats/skills/00900-00999.xml b/src/main/resources/data/stats/skills/00900-00999.xml
index f3a1ed67c5..eec2a413e5 100644
--- a/src/main/resources/data/stats/skills/00900-00999.xml
+++ b/src/main/resources/data/stats/skills/00900-00999.xml
@@ -670,7 +670,9 @@
 	</skill>
 	<skill id="919" levels="1" name="Maximum Focus Sonic">
 		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="150" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="900" />
 		<set name="hpConsume" val="80" />
 		<set name="icon" val="icon.skill0919" />
-- 
GitLab