From ea3c588f205bb5dd3d2d8bd20a4a995d9f180ebb Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Tue, 29 Jun 2021 22:58:55 -0300
Subject: [PATCH] Updated 40 skills

Fixed all "scroll of escape" skills.

Reported-by: Stallion

Triple Slash (1)
Double Sonic Slash (5)
Sonic Blaster (6)
Double Shot (19)
Stun Attack (100)
Long Shot (113)
Return (1050)
Soul Strike (1516)
Scroll of Escape (2013)
Blessed Scroll of Escape (2036)
Scroll of Escape: Clan Hall (2040)
Scroll of Escape: Castle (2041)
Escape: 5 minutes (2099)
Escape: 1 second (2100)
Blessed Scroll of Escape: Clan Hall (2177)
Blessed Scroll of Escape: Castle (2178)
Blessed Scroll of Escape - Event Use (2320)
Blessed Scroll of Fortress Return (2364)
Scroll of Fortress Return (2365)
Blessed Scroll of Battlefield Escape (2392)
Adventurer's Scroll of Escape (2531)
Pailaka Scroll of Escape (2594)
Gran Kain's Blessed Scroll of Escape (2595)
Item Skill: Recall (3146)
Item Skill: Recall (3147)
Blessed Escape (3264)
Blessed Ring of Escape (3408)
Little Angel Agathion Special Skill - Blessed Escape (5540)
Little Devil Agathion Special Skill - Blessed Escape (5544)
Blessed Escape (8509)
Blessed Escape (21067)
Blessed Scroll of Escape (21101)
Olf's T-shirt: Blessed Escape (21236)
Blessed Scroll of Escape (Event) (22103)
Black Majo Agathion Special Skill - Blessed Escape (23006)
Plaipitak Agathion Special Skill - Blessed Escape (23008)
Sexy Panda Agathion Special Skill - Blessed Escape (23015)
Black Maneki Neko Agathion Special Skill - Ability of Blessed Return
(23031)
Pegasus Agathion Special Skill - Ability of Blessed Return (23038)
Three Siblings' Trickery (23091)
---
 .../data/stats/skills/00000-00099.xml         | 90 +++++++++++--------
 .../data/stats/skills/00100-00199.xml         | 23 +++--
 .../data/stats/skills/01000-01099.xml         |  8 +-
 .../data/stats/skills/01500-01599.xml         | 14 +--
 .../data/stats/skills/02000-02099.xml         | 28 ++++--
 .../data/stats/skills/02100-02199.xml         | 16 ++--
 .../data/stats/skills/02300-02399.xml         | 18 +++-
 .../data/stats/skills/02500-02599.xml         | 14 ++-
 .../data/stats/skills/03100-03199.xml         | 14 ++-
 .../data/stats/skills/03200-03299.xml         |  6 +-
 .../data/stats/skills/03400-03499.xml         |  4 +-
 .../data/stats/skills/05500-05599.xml         | 14 ++-
 .../data/stats/skills/08500-08599.xml         |  7 +-
 .../data/stats/skills/21000-21099.xml         |  6 +-
 .../data/stats/skills/21100-21199.xml         |  6 +-
 .../data/stats/skills/21200-21299.xml         | 10 ++-
 .../data/stats/skills/22100-22199.xml         |  5 +-
 .../data/stats/skills/23000-23099.xml         | 64 ++++++++++---
 18 files changed, 233 insertions(+), 114 deletions(-)

diff --git a/src/main/resources/data/stats/skills/00000-00099.xml b/src/main/resources/data/stats/skills/00000-00099.xml
index 79c5094dcd..c2e345a205 100644
--- a/src/main/resources/data/stats/skills/00000-00099.xml
+++ b/src/main/resources/data/stats/skills/00000-00099.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="1" levels="37" name="Triple Slash" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
-		<table name="#effectPoints"> -213 -219 -225 -231 -237 -242 -248 -254 -260 -265 -271 -277 -283 -288 -294 -299 -305 -310 -316 -321 -326 -331 -336 -340 -345 -350 -354 -358 -362 -366 -370 -373 -377 -380 -383 -386 -388 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> -213 -219 -225 -231 -237 -242 -248 -254 -260 -265 -271 -277 -283 -288 -294 -299 -305 -310 -316 -321 -326 -331 -336 -340 -345 -350 -354 -358 -362 -366 -370 -373 -377 -380 -383 -386 -388 </table>
 		<table name="#magicLvl"> 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 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"> 42 43 45 45 46 47 49 50 52 53 55 56 58 58 59 61 62 64 65 67 68 70 71 71 73 74 75 77 78 79 80 82 83 84 85 86 86 </table>
-		<table name="#power"> 517 549 583 619 656 694 735 777 820 865 912 960 1010 1062 1115 1169 1225 1283 1342 1402 1464 1527 1591 1656 1722 1789 1857 1926 1995 2065 2135 2206 2277 2347 2417 2488 2557 </table>
-		<table name="#ench1Power"> 2581 2604 2627 2650 2673 2696 2719 2743 2766 2789 2812 2835 2858 2881 2904 2927 2950 2973 2996 3019 3042 3065 3088 3111 3134 3157 3180 3204 3227 3250 </table>
-		<table name="#ench2MpConsume2"> 84 83 81 80 78 77 75 74 73 71 70 68 67 65 64 63 61 60 58 57 55 54 53 51 50 48 47 45 44 43 </table>
-		<table name="#enchDuel"> 2602 2647 2691 2736 2781 2825 2870 2915 2959 3004 3049 3094 3138 3183 3228 3272 3317 3362 3406 3451 3496 3541 3585 3630 3675 3719 3764 3809 3853 3898 </table>
+		<table name="#physicalAttackPower"> 517 549 583 619 656 694 735 777 820 865 912 960 1010 1062 1115 1169 1225 1283 1342 1402 1464 1527 1591 1656 1722 1789 1857 1926 1995 2065 2135 2206 2277 2347 2417 2488 2557 </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="#ench1Power"> 2581 2604 2627 2650 2673 2696 2719 2743 2766 2789 2812 2835 2858 2881 2904 2927 2950 2973 2996 3019 3042 3065 3088 3111 3134 3157 3180 3204 3227 3250 </table>
+		<table name="#ench2MpConsume2"> 84 83 81 80 78 77 75 74 73 71 70 68 67 65 64 63 61 60 58 57 55 54 53 51 50 48 47 45 44 43 </table>
+		<table name="#ench7PvpPower"> 2602 2647 2691 2736 2781 2825 2870 2915 2959 3004 3049 3094 3138 3183 3228 3272 3317 3362 3406 3451 3496 3541 3585 3630 3675 3719 3764 3809 3853 3898 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="40" />
 		<set name="coolTime" val="167" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="400" />
-		<set name="hitTime" val="1730" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="1733" />
 		<set name="icon" val="icon.skill0001" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
@@ -23,7 +26,7 @@
 		<set name="overHit" val="true" />
 		<set name="reuseDelay" val="3000" />
 		<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" />
@@ -45,7 +48,7 @@
 		</cond>
 		<effects>
 			<effect name="PhysicalAttack">
-				<param power="#power" />
+				<param power="#physicalAttackPower" />
 				<param criticalChance="15" />
 				<param ignoreShieldDefence="true" />
 			</effect>
@@ -61,7 +64,7 @@
 		</enchant7Effects>
 		<enchant7pvpEffects>
 			<effect name="PhysicalAttack">
-				<param power="#enchDuel" />
+				<param power="#ench7PvpPower" />
 				<param criticalChance="15" />
 				<param ignoreShieldDefence="true" />
 			</effect>
@@ -158,21 +161,24 @@
 		</effects>
 	</skill>
 	<skill id="5" levels="31" name="Double Sonic Slash" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
-		<table name="#effectPoints"> -372 -381 -389 -398 -407 -415 -424 -432 -440 -449 -457 -465 -473 -481 -488 -496 -503 -510 -517 -524 -531 -537 -543 -549 -555 -560 -565 -570 -574 -578 -582 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> -372 -381 -389 -398 -407 -415 -424 -432 -440 -449 -457 -465 -473 -481 -488 -496 -503 -510 -517 -524 -531 -537 -543 -549 -555 -560 -565 -570 -574 -578 -582 </table>
+		<table name="#energyAttackPower"> 918 971 1025 1081 1140 1200 1262 1327 1393 1461 1531 1603 1677 1753 1830 1908 1988 2070 2153 2237 2322 2408 2494 2581 2669 2757 2846 2934 3022 3109 3196 </table>
 		<table name="#magicLvl"> 44 45 46 47 48 49 50 51 52 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"> 59 60 62 64 66 67 69 69 71 73 75 76 78 80 82 83 85 85 87 89 90 92 93 95 96 98 99 101 102 104 105 </table>
-		<table name="#power"> 918 971 1025 1081 1140 1200 1262 1327 1393 1461 1531 1603 1677 1753 1830 1908 1988 2070 2153 2237 2322 2408 2494 2581 2669 2757 2846 2934 3022 3109 3196 </table>
-		<table name="#ench1Power"> 3225 3254 3283 3312 3340 3369 3398 3427 3456 3484 3513 3542 3571 3600 3628 3657 3686 3715 3744 3772 3801 3830 3859 3888 3916 3945 3974 4003 4032 4061 </table>
-		<table name="#ench2MpConsume2"> 104 102 100 98 96 95 93 91 89 87 86 84 82 80 78 77 75 73 71 69 68 66 64 62 60 59 57 55 53 52 </table>
-		<table name="#ench7pvpPower"> 3252 3308 3364 3420 3476 3532 3587 3643 3699 3755 3811 3867 3923 3979 4034 4090 4146 4202 4258 4314 4370 4426 4481 4537 4593 4649 4705 4761 4817 4872 </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="#ench1Power"> 3225 3254 3283 3312 3340 3369 3398 3427 3456 3484 3513 3542 3571 3600 3628 3657 3686 3715 3744 3772 3801 3830 3859 3888 3916 3945 3974 4003 4032 4061 </table>
+		<table name="#ench2MpConsume2"> 104 102 100 98 96 95 93 91 89 87 86 84 82 80 78 77 75 73 71 69 68 66 64 62 60 59 57 55 53 52 </table>
+		<table name="#ench7PvpPower"> 3252 3308 3364 3420 3476 3532 3587 3643 3699 3755 3811 3867 3923 3979 4034 4090 4146 4202 4258 4314 4370 4426 4481 4537 4593 4649 4705 4761 4817 4872 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="40" />
 		<set name="chargeConsume" val="3" />
 		<set name="coolTime" val="167" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="400" />
-		<set name="hitTime" val="1730" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="1733" />
 		<set name="icon" val="icon.skill0005" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
@@ -181,7 +187,7 @@
 		<set name="overHit" val="true" />
 		<set name="reuseDelay" val="3000" />
 		<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" />
@@ -206,7 +212,7 @@
 		</cond>
 		<effects>
 			<effect name="EnergyAttack">
-				<param power="#power" />
+				<param power="#energyAttackPower" />
 				<param criticalChance="15" />
 			</effect>
 		</effects>
@@ -220,7 +226,7 @@
 		</enchant7Effects>
 		<enchant7pvpEffects>
 			<effect name="EnergyAttack">
-				<param power="#ench7pvpPower" />
+				<param power="#ench7PvpPower" />
 				<param criticalChance="15" />
 			</effect>
 		</enchant7pvpEffects>
@@ -232,19 +238,22 @@
 		</enchant7pveEffects>
 	</skill>
 	<skill id="6" levels="37" name="Sonic Blaster" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
-		<table name="#effectPoints"> -183 -188 -193 -198 -203 -208 -213 -218 -223 -228 -233 -237 -242 -247 -252 -257 -261 -266 -271 -275 -279 -284 -288 -292 -296 -300 -304 -307 -311 -314 -317 -320 -323 -326 -328 -331 -333 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> -183 -188 -193 -198 -203 -208 -213 -218 -223 -228 -233 -237 -242 -247 -252 -257 -261 -266 -271 -275 -279 -284 -288 -292 -296 -300 -304 -307 -311 -314 -317 -320 -323 -326 -328 -331 -333 </table>
+		<table name="#energyAttackPower"> 369 392 417 442 469 496 525 555 586 618 651 686 722 758 796 835 875 916 959 1002 1046 1091 1136 1183 1230 1278 1327 1376 1425 1475 1525 1576 1626 1677 1727 1777 1827 </table>
 		<table name="#magicLvl"> 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 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"> 25 26 27 27 28 29 30 30 31 32 33 34 35 35 36 37 38 38 39 40 41 42 43 43 44 45 45 46 47 48 48 49 50 51 51 52 53 </table>
-		<table name="#power"> 369 392 417 442 469 496 525 555 586 618 651 686 722 758 796 835 875 916 959 1002 1046 1091 1136 1183 1230 1278 1327 1376 1425 1475 1525 1576 1626 1677 1727 1777 1827 </table>
-		<table name="#ench1Power"> 1843 1860 1876 1893 1909 1925 1942 1958 1975 1991 2008 2024 2041 2057 2074 2090 2107 2123 2139 2156 2172 2189 2205 2222 2238 2255 2271 2288 2304 2321 </table>
-		<table name="#ench2pvePower"> 1858 1890 1922 1954 1986 2018 2050 2082 2114 2146 2178 2210 2242 2274 2306 2338 2369 2401 2433 2465 2497 2529 2561 2593 2625 2657 2689 2721 2753 2785 </table>
-		<table name="#ench7pvpPower"> 1874 1921 1969 2016 2064 2111 2158 2206 2253 2301 2348 2395 2443 2490 2538 2585 2632 2680 2727 2775 2822 2869 2917 2964 3012 3059 3106 3154 3201 3248 </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="#ench1Power"> 1843 1860 1876 1893 1909 1925 1942 1958 1975 1991 2008 2024 2041 2057 2074 2090 2107 2123 2139 2156 2172 2189 2205 2222 2238 2255 2271 2288 2304 2321 </table>
+		<table name="#ench2PvePower"> 1858 1890 1922 1954 1986 2018 2050 2082 2114 2146 2178 2210 2242 2274 2306 2338 2369 2401 2433 2465 2497 2529 2561 2593 2625 2657 2689 2721 2753 2785 </table>
+		<table name="#ench7PvpPower"> 1874 1921 1969 2016 2064 2111 2158 2206 2253 2301 2348 2395 2443 2490 2538 2585 2632 2680 2727 2775 2822 2869 2917 2964 3012 3059 3106 3154 3201 3248 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="chargeConsume" val="2" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1900" />
 		<set name="icon" val="icon.skill0006" />
 		<set name="magicLvl" val="#magicLvl" />
@@ -253,7 +262,7 @@
 		<set name="overHit" val="true" />
 		<set name="reuseDelay" val="3000" />
 		<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" />
 		<enchant3 name="attributeType" val="FIRE" />
@@ -277,7 +286,7 @@
 		</cond>
 		<effects>
 			<effect name="EnergyAttack">
-				<param power="#power" />
+				<param power="#energyAttackPower" />
 				<param criticalChance="15" />
 			</effect>
 		</effects>
@@ -297,7 +306,7 @@
 		</enchant2pvpEffects>
 		<enchant2pveEffects>
 			<effect name="EnergyAttack">
-				<param power="#ench2pvePower" />
+				<param power="#ench2PvePower" />
 				<param criticalChance="15" />
 			</effect>
 		</enchant2pveEffects>
@@ -305,7 +314,7 @@
 		</enchant7Effects>
 		<enchant7pvpEffects>
 			<effect name="EnergyAttack">
-				<param power="#ench7pvpPower" />
+				<param power="#ench7PvpPower" />
 				<param criticalChance="15" />
 			</effect>
 		</enchant7pvpEffects>
@@ -820,19 +829,22 @@
 		</enchant3Effects>
 	</skill>
 	<skill id="19" levels="37" name="Double Shot" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
-		<table name="#effectPoints"> -366 -375 -385 -395 -405 -415 -425 -435 -445 -455 -465 -474 -484 -494 -503 -513 -522 -532 -541 -550 -558 -567 -575 -583 -591 -599 -607 -614 -621 -627 -634 -640 -646 -651 -656 -661 -665 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> -366 -375 -385 -395 -405 -415 -425 -435 -445 -455 -465 -474 -484 -494 -503 -513 -522 -532 -541 -550 -558 -567 -575 -583 -591 -599 -607 -614 -621 -627 -634 -640 -646 -651 -656 -661 -665 </table>
 		<table name="#magicLvl"> 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 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"> 72 74 76 76 79 81 83 86 88 91 93 96 99 99 101 104 106 109 111 114 116 119 121 122 124 126 129 131 133 135 138 140 142 144 146 148 150 </table>
-		<table name="#power"> 984 1046 1110 1178 1249 1322 1399 1479 1562 1647 1736 1828 1923 2021 2123 2227 2333 2443 2555 2670 2788 2908 3030 3154 3280 3408 3537 3668 3800 3933 4067 4201 4336 4470 4604 4738 4870 </table>
-		<table name="#ench1Power"> 4915 4959 5003 5047 5090 5134 5178 5222 5266 5310 5354 5398 5442 5486 5529 5573 5617 5561 5705 5749 5793 5837 5881 5925 5968 6012 6056 6100 6144 6188 </table>
-		<table name="#ench2MpConsume2"> 148 145 143 140 138 135 133 130 128 125 122 120 118 115 112 110 108 105 102 100 98 95 93 90 88 85 83 80 78 75 </table>
-		<table name="#enchDuel"> 4977 5083 5188 5294 5400 5506 5611 5717 5823 5929 6034 6140 6246 6352 6458 6563 6669 6775 6881 6986 7092 7198 7304 7410 7515 7621 7727 7833 7938 8044 </table>
+		<table name="#physicalAttackPower"> 984 1046 1110 1178 1249 1322 1399 1479 1562 1647 1736 1828 1923 2021 2123 2227 2333 2443 2555 2670 2788 2908 3030 3154 3280 3408 3537 3668 3800 3933 4067 4201 4336 4470 4604 4738 4870 </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="#ench1Power"> 4915 4959 5003 5047 5090 5134 5178 5222 5266 5310 5354 5398 5442 5486 5529 5573 5617 5661 5705 5749 5793 5837 5881 5925 5968 6012 6056 6100 6144 6188 </table>
+		<table name="#ench2MpConsume2"> 148 145 143 140 138 135 132 130 127 125 122 120 117 115 112 110 107 105 102 100 97 95 92 90 87 85 82 80 77 75 </table>
+		<table name="#ench7PvpPower"> 4977 5083 5188 5294 5400 5506 5611 5717 5823 5929 6034 6140 6246 6352 6458 6563 6669 6775 6881 6986 7092 7198 7304 7410 7515 7621 7727 7833 7938 8044 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="900" />
 		<set name="coolTime" val="1000" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1400" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill0019" />
 		<set name="magicLvl" val="#magicLvl" />
@@ -841,7 +853,7 @@
 		<set name="overHit" val="true" />
 		<set name="reuseDelay" val="3000" />
 		<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" />
@@ -863,7 +875,7 @@
 		</cond>
 		<effects>
 			<effect name="PhysicalAttack">
-				<param power="#power" />
+				<param power="#physicalAttackPower" />
 				<param criticalChance="15" />
 			</effect>
 		</effects>
@@ -877,7 +889,7 @@
 		</enchant7Effects>
 		<enchant7pvpEffects>
 			<effect name="PhysicalAttack">
-				<param power="#enchDuel" />
+				<param power="#ench7PvpPower" />
 				<param criticalChance="15" />
 			</effect>
 		</enchant7pvpEffects>
diff --git a/src/main/resources/data/stats/skills/00100-00199.xml b/src/main/resources/data/stats/skills/00100-00199.xml
index 17b769ac4f..c2b194cfa7 100644
--- a/src/main/resources/data/stats/skills/00100-00199.xml
+++ b/src/main/resources/data/stats/skills/00100-00199.xml
@@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="100" levels="15" name="Stun Attack" enchantGroup1="2">
-		<table name="#effectPoints"> -96 -100 -104 -111 -115 -119 -128 -132 -136 -145 -150 -154 -164 -169 -173 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> -96 -100 -104 -111 -115 -119 -128 -132 -136 -145 -150 -154 -164 -169 -173 </table>
 		<table name="#magicLvl"> 18 19 20 22 23 24 26 27 28 30 31 32 34 35 36 </table>
 		<table name="#mpConsume2"> 19 19 20 21 21 22 24 25 26 27 28 29 31 32 33 </table>
-		<table name="#power"> 36 39 42 49 53 57 66 71 77 88 94 101 115 123 131 </table>
+		<table name="#physicalAttackPower"> 36 39 42 49 53 57 66 71 77 88 94 101 115 123 131 </table>
+		<table name="#ench1MagicLvl"> 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="#ench1Power"> 794 799 803 808 813 817 822 827 831 836 840 845 850 854 859 864 868 873 878 882 887 891 896 901 905 910 915 919 924 928 </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>
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="9" />
 		<set name="abnormalType" val="STUN" />
 		<set name="abnormalVisualEffect" val="STUN" />
 		<set name="activateRate" val="50" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="CON" />
 		<set name="castRange" val="40" />
 		<set name="coolTime" val="720" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="400" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1080" />
 		<set name="icon" val="icon.skill0100" />
 		<set name="isDebuff" val="true" />
@@ -28,15 +31,15 @@
 		<set name="overHit" val="true" />
 		<set name="reuseDelay" val="3000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="ENEMY" />
 		<set name="trait" val="SHOCK" />
-		<enchant1 name="magicLvl" val="#enchMagicLvl" />
+		<enchant1 name="magicLvl" val="#ench1MagicLvl" />
 		<cond msgId="113" addName="1">
 			<using kind="BLUNT" />
 		</cond>
 		<effects>
 			<effect name="PhysicalAttack">
-				<param power="#power" />
+				<param power="#physicalAttackPower" />
 			</effect>
 			<effect name="Stun" />
 		</effects>
@@ -556,15 +559,17 @@
 		</enchant2Effects>
 	</skill>
 	<skill id="113" levels="2" name="Long Shot">
-		<table name="#dist"> 200 400 </table>
+		<!-- High Five Confirmed -->
 		<table name="#magicLvl"> 20 40 </table>
+		<table name="#pAtkRange"> 200 400 </table>
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.skill0113" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="Buff">
-				<add stat="pAtkRange" val="#dist">
+				<add stat="pAtkRange" val="#pAtkRange">
 					<using kind="BOW" />
 				</add>
 			</effect>
diff --git a/src/main/resources/data/stats/skills/01000-01099.xml b/src/main/resources/data/stats/skills/01000-01099.xml
index e3fabbc9fa..b093f7515d 100644
--- a/src/main/resources/data/stats/skills/01000-01099.xml
+++ b/src/main/resources/data/stats/skills/01000-01099.xml
@@ -1311,18 +1311,20 @@
 		</effects>
 	</skill>
 	<skill id="1050" levels="2" name="Return">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<table name="#hitTime"> 20000 1500 </table>
 		<table name="#magicLvl"> 40 56 </table>
-		<table name="#mpConsume2"> 84 122 </table>
 		<table name="#mpConsume1"> 21 31 </table>
+		<table name="#mpConsume2"> 84 122 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="#hitTime" />
 		<set name="icon" val="icon.skill1050" />
 		<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="A1" />
 		<set name="reuseDelay" val="75000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
diff --git a/src/main/resources/data/stats/skills/01500-01599.xml b/src/main/resources/data/stats/skills/01500-01599.xml
index 4a95509c0d..46beff3e2b 100644
--- a/src/main/resources/data/stats/skills/01500-01599.xml
+++ b/src/main/resources/data/stats/skills/01500-01599.xml
@@ -708,24 +708,26 @@
 		</enchant3Effects>
 	</skill>
 	<skill id="1516" levels="1" name="Soul Strike" enchantGroup1="6" enchantGroup2="6">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
-		<table name="#ench1Power"> 167 168 169 170 171 173 174 175 176 177 178 180 181 182 183 </table>
-		<table name="#ench2Duel"> 168 170 172 174 176 178 180 182 184 186 188 190 192 194 196 </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="#ench1Power"> 167 168 169 170 171 173 174 175 176 177 178 180 181 182 183 </table>
+		<table name="#ench1PvpPower"> 168 170 172 174 176 178 180 182 184 186 188 190 192 194 196 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="750" />
 		<set name="effectPoint" val="-662" />
 		<set name="effectRange" val="1250" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill1516" />
 		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="76" />
-		<set name="mpConsume2" val="27" />
 		<set name="mpConsume1" val="7" />
+		<set name="mpConsume2" val="27" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="15000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="soulMaxConsumeCount" val="5" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="ENEMY" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<effects>
@@ -742,7 +744,7 @@
 		</enchant2Effects>
 		<enchant2pvpEffects>
 			<effect name="MagicalSoulAttack">
-				<param power="#ench2Duel" />
+				<param power="#ench1PvpPower" />
 			</effect>
 		</enchant2pvpEffects>
 		<enchant2pveEffects>
diff --git a/src/main/resources/data/stats/skills/02000-02099.xml b/src/main/resources/data/stats/skills/02000-02099.xml
index 615cc30bb3..8745348f7b 100644
--- a/src/main/resources/data/stats/skills/02000-02099.xml
+++ b/src/main/resources/data/stats/skills/02000-02099.xml
@@ -148,12 +148,14 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="2013" levels="1" name="Scroll Of Escape">
-		<!-- Confirmed CT2.5 -->
+	<skill id="2013" levels="1" name="Scroll of Escape">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="20000" />
 		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
-		<set name="itemConsumeId" val="736" /> <!-- Scroll of Escape -->
+		<set name="itemConsumeId" val="736" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -392,8 +394,9 @@
 		</effects>
 	</skill>
 	<skill id="2036" levels="2" name="Blessed Scroll of Escape">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<table name="#itemConsumeId"> 1538 3958 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="hitTime" val="200" />
 		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
@@ -454,14 +457,16 @@
 		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="2040" levels="1" name="Scroll of Escape: Clan Hall">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="20000" />
 		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
-		<set name="itemConsumeId" val="1829" /> <!-- Scroll of Escape: Clan Hall -->
+		<set name="itemConsumeId" val="1829" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="rideState" val="NONE;STRIDER;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="113" addName="1">
 			<and>
@@ -478,11 +483,13 @@
 		</effects>
 	</skill>
 	<skill id="2041" levels="1" name="Scroll of Escape: Castle">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="20000" />
 		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
-		<set name="itemConsumeId" val="1830" /> <!-- Scroll of Escape: Castle -->
+		<set name="itemConsumeId" val="1830" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -1420,7 +1427,10 @@
 		</effects>
 	</skill>
 	<skill id="2099" levels="1" name="Escape: 5 minutes">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="300000" />
 		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
diff --git a/src/main/resources/data/stats/skills/02100-02199.xml b/src/main/resources/data/stats/skills/02100-02199.xml
index 9edea4e92c..2b8b061b1c 100644
--- a/src/main/resources/data/stats/skills/02100-02199.xml
+++ b/src/main/resources/data/stats/skills/02100-02199.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="2100" levels="1" name="Escape: 1 second">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
@@ -1118,14 +1120,15 @@
 		</effects>
 	</skill>
 	<skill id="2177" levels="1" name="Blessed Scroll of Escape: Clan Hall">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="hitTime" val="200" />
 		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
-		<set name="itemConsumeId" val="5858" /> <!-- Blessed Scroll of Escape: Clan Hall -->
+		<set name="itemConsumeId" val="5858" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="rideState" val="NONE;STRIDER;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="113" addName="1">
 			<and>
@@ -1143,11 +1146,12 @@
 		</effects>
 	</skill>
 	<skill id="2178" levels="1" name="Blessed Scroll of Escape: Castle">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="hitTime" val="200" />
 		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
-		<set name="itemConsumeId" val="5859" /> <!-- Blessed Scroll of Escape: Castle -->
+		<set name="itemConsumeId" val="5859" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
diff --git a/src/main/resources/data/stats/skills/02300-02399.xml b/src/main/resources/data/stats/skills/02300-02399.xml
index 3c0473b732..4797d7171b 100644
--- a/src/main/resources/data/stats/skills/02300-02399.xml
+++ b/src/main/resources/data/stats/skills/02300-02399.xml
@@ -410,10 +410,12 @@
 		</effects>
 	</skill>
 	<skill id="2320" levels="1" name="Blessed Scroll of Escape - Event Use">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="hitTime" val="200" />
 		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
-		<set name="itemConsumeId" val="9156" /> <!-- Blessed Scroll of Escape -->
+		<set name="itemConsumeId" val="9156" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -1280,10 +1282,12 @@
 		</effects>
 	</skill>
 	<skill id="2364" levels="1" name="Blessed Scroll of Fortress Return">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="hitTime" val="200" />
 		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
-		<set name="itemConsumeId" val="10130" /> <!-- Blessed Scroll of Escape: Fortress -->
+		<set name="itemConsumeId" val="10130" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -1304,10 +1308,13 @@
 		</effects>
 	</skill>
 	<skill id="2365" levels="1" name="Scroll of Fortress Return">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="20000" />
 		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
-		<set name="itemConsumeId" val="10129" /> <!-- Scroll of Escape: Fortress -->
+		<set name="itemConsumeId" val="10129" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -1865,9 +1872,12 @@
 		</effects>
 	</skill>
 	<skill id="2392" levels="1" name="Blessed Scroll of Battlefield Escape">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="hitTime" val="200" />
 		<set name="isMagic" val="2" />
+		<set name="itemConsumeCount" val="1" />
+		<set name="itemConsumeId" val="10149" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
diff --git a/src/main/resources/data/stats/skills/02500-02599.xml b/src/main/resources/data/stats/skills/02500-02599.xml
index f65875b6ba..36f2834621 100644
--- a/src/main/resources/data/stats/skills/02500-02599.xml
+++ b/src/main/resources/data/stats/skills/02500-02599.xml
@@ -519,10 +519,13 @@
 		</effects>
 	</skill>
 	<skill id="2531" levels="1" name="Adventurer's Scroll of Escape">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="20000" />
 		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
-		<set name="itemConsumeId" val="10650" /> <!-- Adventurer's Scroll of Escape -->
+		<set name="itemConsumeId" val="10650" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -1779,10 +1782,13 @@
 		</effects>
 	</skill>
 	<skill id="2594" levels="1" name="Pailaka Scroll of Escape">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="20000" />
 		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
-		<set name="itemConsumeId" val="13129" /> <!-- Scroll of Escape: Pailaka -->
+		<set name="itemConsumeId" val="13129" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -1802,10 +1808,12 @@
 		</effects>
 	</skill>
 	<skill id="2595" levels="1" name="Gran Kain's Blessed Scroll of Escape">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="hitTime" val="200" />
 		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
-		<set name="itemConsumeId" val="13258" /> <!-- Gran Kain's Blessed Scroll of Escape -->
+		<set name="itemConsumeId" val="13258" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
diff --git a/src/main/resources/data/stats/skills/03100-03199.xml b/src/main/resources/data/stats/skills/03100-03199.xml
index 2711f28a96..428888224c 100644
--- a/src/main/resources/data/stats/skills/03100-03199.xml
+++ b/src/main/resources/data/stats/skills/03100-03199.xml
@@ -1286,16 +1286,19 @@
 		</effects>
 	</skill>
 	<skill id="3146" levels="1" name="Item Skill: Recall">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="20000" />
 		<set name="icon" val="icon.skill3123" />
 		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="40" />
-		<set name="mpConsume2" val="88" />
 		<set name="mpConsume1" val="22" />
+		<set name="mpConsume2" val="88" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="3600000" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="113" addName="1">
@@ -1313,16 +1316,19 @@
 		</effects>
 	</skill>
 	<skill id="3147" levels="1" name="Item Skill: Recall">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill3123" />
 		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="56" />
-		<set name="mpConsume2" val="127" />
 		<set name="mpConsume1" val="32" />
+		<set name="mpConsume2" val="127" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="3600000" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="113" addName="1">
diff --git a/src/main/resources/data/stats/skills/03200-03299.xml b/src/main/resources/data/stats/skills/03200-03299.xml
index 6e84ff585a..6156a1cce3 100644
--- a/src/main/resources/data/stats/skills/03200-03299.xml
+++ b/src/main/resources/data/stats/skills/03200-03299.xml
@@ -1111,15 +1111,15 @@
 		</effects>
 	</skill>
 	<skill id="3264" levels="1" name="Blessed Escape">
-		<!-- Allows the use of Blessed Escape. -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="hitTime" val="200" />
 		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
-		<set name="mpConsume2" val="122" />
-		<set name="mpConsume1" val="31" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1800000" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="113" addName="1">
diff --git a/src/main/resources/data/stats/skills/03400-03499.xml b/src/main/resources/data/stats/skills/03400-03499.xml
index 9c14bad541..ec1b6b9904 100644
--- a/src/main/resources/data/stats/skills/03400-03499.xml
+++ b/src/main/resources/data/stats/skills/03400-03499.xml
@@ -101,13 +101,15 @@
 		</effects>
 	</skill>
 	<skill id="3408" levels="1" name="Blessed Ring of Escape">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="hitTime" val="200" />
 		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="60000" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="113" addName="1">
diff --git a/src/main/resources/data/stats/skills/05500-05599.xml b/src/main/resources/data/stats/skills/05500-05599.xml
index 6306c831d1..4af1b722b5 100644
--- a/src/main/resources/data/stats/skills/05500-05599.xml
+++ b/src/main/resources/data/stats/skills/05500-05599.xml
@@ -922,7 +922,9 @@
 			<player agathionId="16031" />
 		</cond>
 	</skill>
-	<skill id="5540" levels="1" name="Little Angel Agathion Special Skill - Power of Blessed Return">
+	<skill id="5540" levels="1" name="Little Angel Agathion Special Skill - Blessed Escape">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="hitTime" val="200" />
 		<set name="icon" val="icon.skill_agathion_special" />
@@ -930,10 +932,11 @@
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="86400000" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="2292">
-			<player agathionId="16031" />
+			<player hasAgathion="true" />
 		</cond>
 		<cond msgId="113" addName="1">
 			<and>
@@ -1004,7 +1007,9 @@
 			<player agathionId="16032" />
 		</cond>
 	</skill>
-	<skill id="5544" levels="1" name="Little Devil Agathion Special Skill - Power of Blessed Return">
+	<skill id="5544" levels="1" name="Little Devil Agathion Special Skill - Blessed Escape">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="hitTime" val="200" />
 		<set name="icon" val="icon.skill_agathion_special" />
@@ -1012,10 +1017,11 @@
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="86400000" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="2292">
-			<player agathionId="16032" />
+			<player hasAgathion="true" />
 		</cond>
 		<cond msgId="113" addName="1">
 			<and>
diff --git a/src/main/resources/data/stats/skills/08500-08599.xml b/src/main/resources/data/stats/skills/08500-08599.xml
index c89f1d4a48..f93e82099f 100644
--- a/src/main/resources/data/stats/skills/08500-08599.xml
+++ b/src/main/resources/data/stats/skills/08500-08599.xml
@@ -113,8 +113,9 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="8509" levels="1" name="High Angel Circlet">
-		<!-- Confirmed CT2.5 -->
+	<skill id="8509" levels="1" name="Blessed Escape">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="hitTime" val="200" />
 		<set name="icon" val="icon.accessory_highangel_circlet_i00" />
@@ -122,6 +123,8 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="3600000" />
+		<set name="reuseDelayLock" val="true" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="113" addName="1">
diff --git a/src/main/resources/data/stats/skills/21000-21099.xml b/src/main/resources/data/stats/skills/21000-21099.xml
index 177b0bcfb9..4f10735a7e 100644
--- a/src/main/resources/data/stats/skills/21000-21099.xml
+++ b/src/main/resources/data/stats/skills/21000-21099.xml
@@ -1183,8 +1183,9 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="21067" levels="1" name="Blessed Escape Ability">
-		<!-- Confirmed CT2.5 -->
+	<skill id="21067" levels="1" name="Blessed Escape">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="hitTime" val="200" />
 		<set name="icon" val="BranchSys.icon.br_plastic_hair_f_i00" />
@@ -1192,6 +1193,7 @@
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="43200000" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="113" addName="1">
diff --git a/src/main/resources/data/stats/skills/21100-21199.xml b/src/main/resources/data/stats/skills/21100-21199.xml
index 5602f1fa67..955f93607d 100644
--- a/src/main/resources/data/stats/skills/21100-21199.xml
+++ b/src/main/resources/data/stats/skills/21100-21199.xml
@@ -24,8 +24,9 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="21101" levels="1" name="Blessed Escape">
-		<!-- Can use the ability of Blessed Return. Reuse Delay 12 hours. -->
+	<skill id="21101" levels="1" name="Blessed Scroll of Escape">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="hitTime" val="200" />
 		<set name="icon" val="BranchSys.icon.br_babypanda_cap_i00" />
@@ -33,6 +34,7 @@
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="43200000" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="113" addName="1">
diff --git a/src/main/resources/data/stats/skills/21200-21299.xml b/src/main/resources/data/stats/skills/21200-21299.xml
index e2a4ba57cd..2debf7ade1 100644
--- a/src/main/resources/data/stats/skills/21200-21299.xml
+++ b/src/main/resources/data/stats/skills/21200-21299.xml
@@ -428,12 +428,18 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="21236" levels="1" name="7th Anniversary T-shirt: Blessed Escape Ability">
-		<!-- High Five Skill -->
+	<skill id="21236" levels="1" name="Olf's T-shirt: Blessed Escape">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="blockedInOlympiad" val="true" />
 		<set name="hitTime" val="200" />
+		<set name="icon" val="icon.skill1050" />
 		<set name="isMagic" val="2" />
+		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="72000000" />
+		<set name="reuseDelayLock" val="true" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="113" addName="1">
diff --git a/src/main/resources/data/stats/skills/22100-22199.xml b/src/main/resources/data/stats/skills/22100-22199.xml
index dc839891cb..1deb7a5d6d 100644
--- a/src/main/resources/data/stats/skills/22100-22199.xml
+++ b/src/main/resources/data/stats/skills/22100-22199.xml
@@ -105,12 +105,13 @@
 		</effects>
 	</skill>
 	<skill id="22103" levels="1" name="Blessed Scroll of Escape (Event)">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="hitTime" val="200" />
 		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
-		<set name="itemConsumeId" val="20583" /> <!-- Blessed Scroll of Escape (event) -->
+		<set name="itemConsumeId" val="20583" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
diff --git a/src/main/resources/data/stats/skills/23000-23099.xml b/src/main/resources/data/stats/skills/23000-23099.xml
index f65e4af473..078f450a66 100644
--- a/src/main/resources/data/stats/skills/23000-23099.xml
+++ b/src/main/resources/data/stats/skills/23000-23099.xml
@@ -93,7 +93,9 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="23006" levels="1" name="Black Majo Agathion Special Skill - Power of Blessed Return">
+	<skill id="23006" levels="1" name="Black Majo Agathion Special Skill - Blessed Escape">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="hitTime" val="200" />
 		<set name="icon" val="icon.skill_agathion_special" />
@@ -101,10 +103,11 @@
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="43200000" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="2292">
-			<player agathionId="1503" />
+			<player hasAgathion="true" />
 		</cond>
 		<cond msgId="113" addName="1">
 			<and>
@@ -140,7 +143,9 @@
 			<player agathionId="1504" />
 		</cond>
 	</skill>
-	<skill id="23008" levels="1" name="Plaipitak Agathion Special Skill - Power of Blessed Return">
+	<skill id="23008" levels="1" name="Plaipitak Agathion Special Skill - Blessed Escape">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="hitTime" val="200" />
 		<set name="icon" val="icon.skill_agathion_special" />
@@ -148,10 +153,11 @@
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="43200000" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="2292">
-			<player agathionId="1504" />
+			<player hasAgathion="true" />
 		</cond>
 		<cond msgId="113" addName="1">
 			<and>
@@ -273,7 +279,9 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="23015" levels="1" name="Sexy Panda Agathion Special Skill - Power of Blessed Return">
+	<skill id="23015" levels="1" name="Sexy Panda Agathion Special Skill - Blessed Escape">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="hitTime" val="200" />
 		<set name="icon" val="icon.skill_agathion_special" />
@@ -281,10 +289,11 @@
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="43200000" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="2292">
-			<player agathionId="1507" />
+			<player hasAgathion="true" />
 		</cond>
 		<cond msgId="113" addName="1">
 			<and>
@@ -642,6 +651,8 @@
 		</effects>
 	</skill>
 	<skill id="23031" levels="1" name="Black Maneki Neko Agathion Special Skill - Ability of Blessed Return">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="hitTime" val="200" />
 		<set name="icon" val="icon.skill_agathion_special" />
@@ -649,10 +660,11 @@
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="43200000" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="2292">
-			<player agathionId="1511" />
+			<player hasAgathion="true" />
 		</cond>
 		<cond msgId="113" addName="1">
 			<and>
@@ -796,7 +808,9 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="23038" levels="1" name="Pegasus Agathion Special Skill - Blessed Return Ability">
+	<skill id="23038" levels="1" name="Pegasus Agathion Special Skill - Ability of Blessed Return">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="hitTime" val="200" />
 		<set name="icon" val="icon.skill_agathion_special" />
@@ -804,10 +818,11 @@
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="43200000" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="2292">
-			<player agathionId="1514" />
+			<player hasAgathion="true" />
 		</cond>
 		<cond msgId="113" addName="1">
 			<and>
@@ -1167,6 +1182,8 @@
 		</cond>
 	</skill>
 	<skill id="23061" levels="1" name="Button-Eyed Bear Doll Agathion Special Skill - Ability of Blessed Return">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="hitTime" val="200" />
 		<set name="icon" val="icon.skill_agathion_special" />
@@ -1174,10 +1191,11 @@
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="43200000" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="2292">
-			<player agathionId="1522" />
+			<player hasAgathion="true" />
 		</cond>
 		<cond msgId="113" addName="1">
 			<and>
@@ -1919,19 +1937,39 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="23091" levels="1" name="Trick of Halloween Children">
-		<!-- By trick of Halloween Children, increase max HP/MP/CP by 40% for 10 seconds. -->
+	<skill id="23091" levels="1" name="Three Siblings' Trickery">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="10" />
 		<set name="abnormalType" val="BIG_HEAD" />
 		<set name="abnormalVisualEffect" val="BIG_HEAD" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="buffProtectLevel" val="1" />
+		<set name="castRange" val="600" />
+		<set name="effectRange" val="600" />
+		<set name="hitTime" val="500" />
+		<set name="irreplaceableBuff" val="true" />
 		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
 		<set name="trait" val="ETC" />
+		<effects>
+			<effect name="MaxCp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxHp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="40" />
+				<param type="PER" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23092" levels="1" name="Jack O'Lantern Card">
 		<!-- High Five Confirmed -->
-- 
GitLab