From 472c5b6d6c1dc69dd485c622833e5b9a32c791b7 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Sat, 26 Jun 2021 22:39:05 -0300
Subject: [PATCH] Skills update

Dash (4)
Sonic Focus (8)
Trick (12)
Self Heal (1216)
Magic Impulse (1479)
Super Haste (7029)
Mana Drug (10000)
Mana Potion (10001)
---
 .../data/stats/skills/00000-00099.xml         | 34 +++++++++-------
 .../data/stats/skills/01200-01299.xml         |  6 ++-
 .../data/stats/skills/01400-01499.xml         | 39 +++++++++++--------
 .../data/stats/skills/07000-07099.xml         | 32 +++++++++++----
 .../data/stats/skills/custom/10000-10099.xml  |  2 +
 5 files changed, 74 insertions(+), 39 deletions(-)

diff --git a/src/main/resources/data/stats/skills/00000-00099.xml b/src/main/resources/data/stats/skills/00000-00099.xml
index 88a9f64e50..79c5094dcd 100644
--- a/src/main/resources/data/stats/skills/00000-00099.xml
+++ b/src/main/resources/data/stats/skills/00000-00099.xml
@@ -131,15 +131,18 @@
 		</effects>
 	</skill>
 	<skill id="4" levels="2" name="Dash">
-		<table name="#abnormalLvls"> 1 2 </table>
-		<table name="#effectPoints"> 204 438 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 </table>
+		<table name="#effectPoint"> 204 438 </table>
 		<table name="#magicLvl"> 20 46 </table>
 		<table name="#mpConsume2"> 10 21 </table>
-		<table name="#spd"> 40 66 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#runSpd"> 40 66 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="SPEED_UP_SPECIAL" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="effectPoint" val="#effectPoint" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill0004" />
 		<set name="magicLvl" val="#magicLvl" />
@@ -150,7 +153,7 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="Buff">
-				<add stat="runSpd" val="#spd" />
+				<add stat="runSpd" val="#runSpd" />
 			</effect>
 		</effects>
 	</skill>
@@ -393,10 +396,12 @@
 		</enchant7pveEffects>
 	</skill>
 	<skill id="8" levels="8" name="Sonic Focus">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<table name="#focusEnergyCharge"> 1 2 3 4 5 6 7 8 </table>
 		<table name="#magicLvl"> 40 43 49 55 60 66 70 79 </table>
-		<table name="#maxCharges"> 1 2 3 4 5 6 7 8 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="900" />
 		<set name="hpConsume" val="25" />
 		<set name="icon" val="icon.skill0008" />
@@ -410,12 +415,12 @@
 		</cond>
 		<cond msgId="324">
 			<not>
-				<player Charges="#maxCharges" />
+				<player Charges="#focusEnergyCharge" />
 			</not>
 		</cond>
 		<effects>
 			<effect name="FocusEnergy">
-				<param charge="#maxCharges" />
+				<param charge="#focusEnergyCharge" />
 			</effect>
 		</effects>
 	</skill>
@@ -534,15 +539,16 @@
 		</enchant1Effects>
 	</skill>
 	<skill id="11" levels="12" name="Trick">
-		<!-- Confirmed CT2.5 -->
-		<!-- NOTE: skill desc says "Requires a dagger" but is client typo -->
-		<table name="#effectPoints"> -119 -126 -133 -140 -144 -148 -152 -156 -159 -162 -164 -167 </table>
+		<!-- High Five Confirmed -->
+		<!-- Note: skill desc says "Requires a dagger" but is client typo. -->
+		<table name="#effectPoint"> -119 -126 -133 -140 -144 -148 -152 -156 -159 -162 -164 -167 </table>
 		<table name="#magicLvl"> 49 52 55 58 60 62 64 66 68 70 72 74 </table>
 		<table name="#mpConsume2"> 22 24 25 27 28 29 30 31 32 33 34 34 </table>
 		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1200" />
 		<set name="icon" val="icon.skill0011" />
 		<set name="magicLvl" val="#magicLvl" />
diff --git a/src/main/resources/data/stats/skills/01200-01299.xml b/src/main/resources/data/stats/skills/01200-01299.xml
index 4bc1915d49..8a3726ac88 100644
--- a/src/main/resources/data/stats/skills/01200-01299.xml
+++ b/src/main/resources/data/stats/skills/01200-01299.xml
@@ -307,14 +307,16 @@
 		</effects>
 	</skill>
 	<skill id="1216" levels="1" name="Self Heal">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="10" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="5000" />
 		<set name="icon" val="icon.skill1216" />
 		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
-		<set name="mpConsume2" val="7" />
 		<set name="mpConsume1" val="2" />
+		<set name="mpConsume2" val="7" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="3000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
diff --git a/src/main/resources/data/stats/skills/01400-01499.xml b/src/main/resources/data/stats/skills/01400-01499.xml
index 4a524400c4..20ae356e10 100644
--- a/src/main/resources/data/stats/skills/01400-01499.xml
+++ b/src/main/resources/data/stats/skills/01400-01499.xml
@@ -3172,46 +3172,53 @@
 		</effects>
 	</skill>
 	<skill id="1479" levels="3" name="Magic Impulse" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1">
-		<!-- Confirmed CT2.5 -->
-		<table name="#effectPoints"> 523 582 624 </table>
-		<table name="#magicLvl"> 55 62 68 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> 523 582 624 </table>
 		<table name="#mAtk"> 1.75 1.85 1.95 </table>
 		<table name="#mCritRate"> 2 3 4 </table>
-		<table name="#mpConsume2"> 80 92 101 </table>
+		<table name="#magicLvl"> 55 62 68 </table>
 		<table name="#mpConsume1"> 20 23 26 </table>
-		<table name="#ench1MpConsume2"> 99 97 95 94 92 90 89 87 85 84 82 80 78 77 75 73 72 70 68 67 65 63 62 60 58 57 55 53 52 50 </table>
-		<table name="#ench1MpConsume1"> 24 24 23 23 23 22 22 21 21 21 20 20 19 19 18 18 18 17 17 16 16 15 15 15 14 14 13 13 13 12 </table>
-		<table name="#ench2AbnormalTimes"> 15 16 16 17 17 18 18 19 19 20 20 21 21 22 22 23 23 24 24 25 25 26 26 27 27 28 28 29 29 30 </table>
-		<table name="#ench3Reuse"> 295000 290000 285000 280000 275000 270000 265000 260000 255000 250000 245000 240000 235000 230000 225000 220000 215000 210000 205000 200000 195000 190000 185000 180000 175000 170000 165000 160000 155000 150000 </table>
+		<table name="#mpConsume2"> 80 92 101 </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="#ench1MpConsume1"> 24 24 23 23 23 22 22 21 21 21 20 20 19 19 18 18 18 17 17 16 16 15 15 15 14 14 13 13 13 12 </table>
+		<table name="#ench1MpConsume2"> 99 97 95 94 92 90 89 87 85 84 82 80 78 77 75 73 72 70 68 67 65 63 62 60 58 57 55 53 52 50 </table>
+		<table name="#ench2AbnormalTime"> 15 16 16 17 17 18 18 19 19 20 20 21 21 22 22 23 23 24 24 25 25 26 26 27 27 28 28 29 29 30 </table>
+		<table name="#ench3ReuseDelay"> 295000 290000 285000 280000 275000 270000 265000 260000 255000 250000 245000 240000 235000 230000 225000 220000 215000 210000 205000 200000 195000 190000 185000 180000 175000 170000 165000 160000 155000 150000 </table>
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="INSTINCT" />
+		<set name="affectObject" val="FRIEND" />
 		<set name="affectRange" val="600" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="affectScope" val="PARTY" />
+		<set name="effectPoint" val="#effectPoint" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2500" />
 		<set name="icon" val="icon.skill1479" />
 		<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="300000" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="reuseDelayLock" val="true" />
-		<set name="targetType" val="PARTY" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
-		<enchant1 name="mpConsume2" val="#ench1MpConsume2" />
 		<enchant1 name="mpConsume1" val="#ench1MpConsume1" />
-		<enchant2 name="abnormalTime" val="#ench2AbnormalTimes" />
+		<enchant1 name="mpConsume2" val="#ench1MpConsume2" />
+		<enchant2 name="abnormalTime" val="#ench2AbnormalTime" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
-		<enchant3 name="reuseDelay" val="#ench3Reuse" />
+		<enchant3 name="reuseDelay" val="#ench3ReuseDelay" />
 		<effects>
+			<effect name="Buff">
+				<mul stat="mCritRate" val="#mCritRate" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.15" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="mAtk" val="#mAtk" />
-				<mul stat="mCritRate" val="#mCritRate" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/src/main/resources/data/stats/skills/07000-07099.xml b/src/main/resources/data/stats/skills/07000-07099.xml
index 7e3711e4fd..f6f70dc6ac 100644
--- a/src/main/resources/data/stats/skills/07000-07099.xml
+++ b/src/main/resources/data/stats/skills/07000-07099.xml
@@ -375,6 +375,7 @@
 		</effects>
 	</skill>
 	<skill id="7029" levels="4" name="Super Haste">
+		<!-- High Five Confirmed -->
 		<!-- GM Skill -->
 		<table name="#amount"> 1 1 1 2 </table>
 		<table name="#mAtkSpd"> 2 3 3 2 </table>
@@ -386,6 +387,7 @@
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="ATTACK_TIME_DOWN" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="1" />
 		<set name="icon" val="icon.skill7029" />
 		<set name="magicLvl" val="1" />
@@ -393,19 +395,35 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<effects>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="#pAtkSpd" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="#mAtkSpd" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mReuse" val="#reuse" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pReuse" val="#reuse" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="#pAtk" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="runSpd" val="#runSpd" />
+			</effect>
 			<effect name="MaxMp">
 				<param power="#maxMp" />
 				<param type="PER" />
 			</effect>
 			<effect name="Buff">
-				<mul stat="pAtkSpd" val="#pAtkSpd" />
-				<mul stat="runSpd" val="#runSpd" />
-				<mul stat="mAtkSpd" val="#mAtkSpd" />
-				<mul stat="pAtk" val="#pAtk" />
-				<mul stat="pReuse" val="#reuse" />
-				<mul stat="mReuse" val="#reuse" />
-				<mul stat="regHp" val="#amount" />
 				<mul stat="regMp" val="#amount" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="regHp" val="#amount" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="weightLimit" val="#amount" />
 			</effect>
 		</effects>
diff --git a/src/main/resources/data/stats/skills/custom/10000-10099.xml b/src/main/resources/data/stats/skills/custom/10000-10099.xml
index a7d256f942..2887156459 100644
--- a/src/main/resources/data/stats/skills/custom/10000-10099.xml
+++ b/src/main/resources/data/stats/skills/custom/10000-10099.xml
@@ -2,6 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/skills.xsd">
 	<skill id="10000" levels="1" name="Mana Drug">
 		<set name="abnormalTime" val="15" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="displayId" val="2288" />
 		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
@@ -18,6 +19,7 @@
 		</effects>
 	</skill>
 	<skill id="10001" levels="1" name="Mana Potion">
+		<set name="affectScope" val="SINGLE" />
 		<set name="displayId" val="2288" />
 		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
-- 
GitLab