From 2105b16a4d6ca2dd9d6797558585c12abcba0a3e Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Fri, 15 Jan 2021 00:01:24 -0300
Subject: [PATCH] Target System (Part 1)

Implemented effect InstantDispelByName.
Implemented target handler Enemy Not.
Implemented target handler Target.
Added missing mpConsume1.
Added hitCancelTime.
Changed to targetType TARGET.
Added missing affectScope.
Split multiple effects in several effects.
Added official-like operate conditions.
Official like GM skills.
Implemented 84 missing or broken skills.
Updated over 500 skills t match High Five official values.

Added missing skills:
Reducing P. Def Stun (4600)
NPC Monster Hate (4697)
NPC - Ultra Bomb (5039)
NPC Remove Death Penalty (5077)
Stun (5112)
Presentation - Balor 10 (5410)
Presentation - Balor 11 (5411)
Presentation - Balor 12 (5412)
Invincible Blow (5419)
Presentation - Gathering of Evil Power (5433)
Increase Recovery Rate (5436)
NPC Full Recover (5457)
Paralysis (5459)
Fear (5460)
Endurance Defense Up (5484)
Endurance Defense Up (5485)
Endurance Offense Up (5486)
Counter Critical Damage Up (5488)
Counter Critical Rate Up (5489)
Fungus Hub (6623)
Shock (6624)
Energy of Enchant (6632)
Energy of Casting Speed (6634)
Vampiric Aura (6637)
Presentation - Ice Knight (6647)
Komodo Heal (6648)
Tarsque Carapace (6655)
Lavasaurus Firstborn Attack (6656)
Lavasaurus Firstborn Heal (6657)
Feral Shield (6666)
Feral Wind Walk (6667)
Feral Death Whisper (6668)
Feral Body Bless (6669)
Feral Vampiric Rage (6670)
Feral Berserker Spirit (6671)
Feral Bless Shield (6672)
Presentation - Attain Noblesse (6673)
Lavasaurus Firstborn Attack (6675)
Absorb HP MP (6689)
Ball Trapping Gnosian Agathion Cute Trick (6699)
Resist Holy of Elcadia (6729)
Etis Shadow (6731)
Antharas's Stigma (6733)
Energy of Destruction (6734)
Petrify (6735)
Blow Attack (6751)
Power Strike (6844)
Energy Abundance Effect (6883)
Morale Boost (6884)
Test - Charge (7065)
Test Stun Charge (7066)
Test Range Charge (7067)
Test Steal Abnormal State(7068)
Test Abnormal State DD (7069)
Test - Soul Transfer (7071)
Beast Training - Release (8362)
Christmas Festival (23017)
Reset Consecutive Wins (23023)
Jack's game - Target (23122)
Gwanseum Nyang Nyang Agathion Special Skill - Blessing of Mercy (23126)
Blue Opera Agathion Special Skill - Sword of Recovery (23128)
Blue Opera Agathion Special Skill - Sword of Water (23129)
Red Opera Agathion Special Skill - Spear of Flames (23131)
Prominent Outsider Adventurer's Ability (23153)
Hand of Warmth (23155)
Gift of Thanks (23156)
Donateloph's Blessing (23157)
Raphaeloph's Blessing (23158)
Leonardoph's Blessing (23159)
Michelangeloph's Blessing (23160)
Rudolph Girl's Blessing - Maintain Vitality (23161)
Turkey's Big Mistake (23163)
Opera Agathion Special Skill - Sword of Life (23164)
Inadequate Affection (23165)
Energized Rose Spirit (23166)
Rosy Seduction (23167)
Critical Seduction (23168)
Mesmerization (23169)
Mesmerization (23170)
Narrow Escape (23174)
Soul Stealth (23175)
Hide (23176)
Soul Stealth (23177)
Soul Stealth (23178)

Updated skills:
Sacrifice (69)
Divine Blessing (262)
Shift Target (489)
Light of Heal (567)
Divine Rogue Agility (690)
Divine Healer Major Heal (698)
Divine Healer Battle Heal (699)
Divine Healer Group Heal (700)
Divine Healer Resurrection (701)
Divine Healer Clans (702)
Sacrifice Healer (703)
Divine Enchanter Water Spirit (704) added missing effects.
Divine Enchanter Fire Spirit (705)
Divine Enchanter Wind Spirit (706)
Divine Enchanter Hero Spirit (707)
Zaken Vampiric Rage (719)
Heretic Heal (738)
Heretic Battle Heal (739)
Veil Master Dark Cure (745)
Doll Blader Clairvoyance (754)
Dread Pool (774)
Sharp Edge (825)
Spike (826)
Restring (827)
Case Harden (828)
Hard Tanning (829)
Embroider (830)
Might (871)
Empower (875)
Star Stone Gathering (932)
Special Motion (941)
Special Motion (942)
Special Motion (943)
Special Motion (944)
Magician's Will (945)
Special Motion (966)
Challenge for Fate (985)
Soul Shield (1010)
Heal (1011)
Cure Poison (1012)
Recharge (1013)
Battle Heal (1015)
Purify (1018)
Vitalize (1020)
Invigor (1032)
Resist Poison (1033)
Mental Shield (1035)
Shield (1040)
Regeneration (1044)
Empower (1059)
Berserker Spirit (1062)
Might (1068)
Focus (1077)
Concentration (1078)
Major Heal (1401)
Cleanse (1409)
Salvation (1410)
Mystic Immunity (1411)
Celestial Shield (1418)
Protection from Darkness (1442)
Dark Weapon (1443)
Pride of Kamael (1444)
Mana Gain (1460)
Fire Weapon (1463)
Ice Weapon (1464)
Wind Weapon (1465)
Earth Weapon (1466)
Soul Sucking (1472)
Erase Mark (1475)
Restoration Impact (1488)
Flame Armor (1492)
Improved Combat (1499)
Improved Magic (1500)
Improved Condition (1501)
Improved Critical Attack (1502)
Improved Shield Defense (1503)
Improved Movement (1504)
Lord of Vampire (1507)
Soul Cleanse (1510)
Blessed Blood (1531)
Counter Critical (1542)
Soul Sucking (1545)
Resist Earth (1548)
Chain Heal (1553)
Scroll: Cancel Sleep (2170)
Petrifaction Scroll (2239)
Hot Spring Nectar (2240)
Hot Spring Mineral Water (2241)
Hot Spring Fountain Water (2242)
Hot Spring Sulfur (2243)
Presentation - Collect Items (2630)
Wild Magic (2890)
Forgiveness (3261)
Heal Queen Ant1 (4020)
Queen Ant (4021)
Body of Nurse Ant (4022)
Body of Royal Guard Ant (4023)
Heal Queen Ant2 (4024)
Master Recharge (4025)
Gludio Flame (4026)
Gludio Heal (4027)
NPC Might (4028)
NPC Shield (4029)
NPC Clan Might (4030)
NPC Clan Aegis (4031)
Partisan Heal (4044)
NPC Dash (4048)
Cubic Heal (4051)
NPC Heal (4065)
Decrease Atk. Spd. (4070)
NPC Haste (4074)
Dark Heal (4080)
NPC Bear Spirit Totem (4089)
NPC Wolf Spirit Totem (4090)
NPC Ogre Spirit Totem (4091)
NPC Puma Spirit Totem (4092)
NPC Hawkeye (4096)
NPC Chant of Life (4097)
Silence (4098)
NPC Berserk (4099)
NPC Prominence (4100)
NPC Spinning Slash (4101)
Surrender To Fire (4102)
NPC Ultimate Evasion (4103)
Aden Heal (4115)
Reduction in recovery time (4126)
Baium: General Attack (4127)
Stun (4131)
Spear: Pound the Ground (4132)
Angel Heal (4133)
Seal Skill (4134)
Baium Heal (4135)
Contract Payment (4140)
Decrease P. Atk. (4145)
Decrease P. Def. (4146)
Area Dispel (4147)
Poison (4148)
Bleed (4149)
Flame (4150)
Decrease Atk. Spd. (4162)
NPC Self-Damage Shield (4163)
Paralysis (4164)
BOSS Might (4173)
BOSS Shield (4174)
BOSS Haste (4175)
BOSS Reflect Damage (4176)
BOSS Heal (4209)
BOSS Chant of Life (4210)
Increase Rage Might (4317)
Ultimate Buff (4318)
Adventurer's Wind Walk (4322)
Adventurer's Shield (4323)
Adventurer's Bless the Body (4324)
Adventurer's Vampiric Rage (4325)
Adventurer's Regeneration (4326)
Adventurer's Haste (4327)
Adventurer's Bless the Soul (4328)
Adventurer's Acumen (4329)
Adventurer's Concentration (4330)
Adventurer's Empower (4331)
Mental Aegis (4332)
Resist Dark Attack (4333)
SSQ Cancel (4334)
Adventurer's Life Cubic (4338)
Mimir's Elixir (4339)
Ultimate Buff, 2nd (4340)
Ultimate Buff, 3rd (4341)
Wind Walk (4342)
Decrease Weight (4343)
Shield (4344)
Might (4345)
Mental Shield (4346)
Blessed Body (4347)
Blessed Soul (4348)
Magic Barrier (4349)
Resist Stun (4350)
Concentration (4351)
Berserker Spirit (4352)
Bless Shield (4353)
Vampiric Rage (4354)
Acumen (4355)
Empower (4356)
Haste (4357)
Guidance (4358)
Focus (4359)
Death Whisper (4360)
Curse of Destruction (4361)
Curse of Destruction (4362)
Curse of Destruction (4363)
Blessing of Revelations (4364)
Blessing of Revelations (4365)
Blessing of Prophecy (4366)
Clan Hall Manager Buff (4367)
Clan Hall Manager Buff (4368)
Clan Hall Manager Buff (4369)
Clan Hall Manager Buff (4370)
Clan Hall Manager Buff (4371)
Clan Hall Manager Buff (4372)
Clan Hall Manager Buff (4373)
Clan Hall Manager Buff (4374)
Clan Hall Manager Buff (4375)
Strong Resistance to P. Atk. (4376)
Wield Temper (4377)
Self Damage Shield (4378)
Resist Spear Weapons (4379)
Arena: CP Recovery (4380)
Magic Skill Block (4381)
Curse of Lake Ghost (4382)
NPC Hate Stone (4383)
Scapegoat's Grace (4384)
Scapegoat's Grace (4385)
Scapegoat's Grace (4386)
Scapegoat's Grace (4387)
Resist Paralysis Attacks (4388)
Resist Mental Attacks (4389)
NPC Abnormal Immunity (4390)
Wind Walk (4391)
Shield (4392)
Might (4393)
Blessed Body (4394)
Blessed Soul (4395)
Magic Barrier (4396)
Berserker Spirit (4397)
Bless Shield (4398)
Vampiric Rage (4399)
Acumen (4400)
Empower (4401)
Haste (4402)
Guidance (4403)
Focus (4404)
Death Whisper (4405)
Agility (4406)
Area Buff - Wind Walk (4468)
NPC Spoils (4470)
Area Heal - Per (4474)
Perfect Resist Bleeding (4475)
Silent Move (4476)
Ice Fairy Resist Cold (4479)
Ice Fairy Curse Gloom (4480)
Ice Fairy Hex (4481)
Ice Fairy Silence (4482)
Hold (4483)
Eating Follower Heal (4484)
Eating Follower (4485)
NPC Debuff Shield Slow (4493)
Orfen Heal (4516)
Eye of Assassin (4522)
Quest - BOSS Inc HP to Summoned (4527)
Quest - BOSS Movement to Summoned (4528)
Dance of Resistance (4533)
Dance of Nihil (4534)
Dance of Weakness (4535)
Song of Seduce (4536)
Song of Sweet Whisper (4537)
Song of Temptation (4538)
Curse of Vague (4539)
Curse of Weakness (4540)
Curse of Nihil (4541)
Quest - Commune to Slate (4546)
Gaze of Watcher (4547)
Quest - Dispel Watcher Gaze (4548)
Quest - Unsealed Altar (4549)
Quest - Cursed Altar (4550)
Hot Springs Rheumatism (4551)
Hot Springs Cholera (4552)
Hot Springs Flu (4553)
Hot Spring Malaria (4554)
NPC Resist Mutant (4555)
Dispel Hot Spring Disease A_D (4556)
Dispel Hot Spring Disease B_D (4557)
Dispel Hot Spring Disease C_D (4558)
Hot Spring Illusion (4559)
Fake Petrificiation (4616)
Dispel Petrification (4617)
NPC Dispel Sleep (4619)
Decrease HP Regeneration Rate (4624)
Decrease Speed (4625)
NPC Buff - Physical Barrier (4626)
NPC Buff - Magical Barrier (4627)
Mysterious Aura (4628)
NPC MR - HP Drain (4629)
NPC MR - Twister (4630)
NPC Buff - Acumen Shield WildMagic (4631)
NPC Buff - Acumen Empower WildMagic (4632)
NPC Buff - Acumen Empower Berserk (4633)
NPC Buff - Acumen Empower DamageShield (4634)
NPC Buff - Acumen Berserk WildMagic (4635)
NPC Buff - Acumen Berserk DamageShield (4636)
NPC Buff - Acumen WildMagic DamageShield (4637)
Area Buff - Haste (4644)
Area Buff - Focus (4645)
Area Buff - Death Whisper (4646)
Area Buff - Might (4647)
Area Buff - Shield (4648)
AV - Teleport (4671)
NPC Corpse Remove (4672)
Valakas Lava Skin (4680)
Valakas Tail Stomp (4687)
Valakas Regeneration (4691)
Quest BOSS Big Body (4692)
Quest BOSS Dispel Big Body (4693)
Ultimate Debuff (4694)
Ultimate Debuff (4695)
Ultimate Debuff (4696)
Area Buff - HP Regeneration (4698)
Blessing of Queen (4699)
Shade Sacrifice (4707)
Wild Defense (4711)
Bright Heal (4713)
Heal Trick (4717)
Greater Heal Trick (4718)
BOSS Heal (4779)
BOSS Heal (4780)
BOSS Heal (4781)
BOSS Heal (4782)
BOSS Heal (4783)
BOSS Chant of Life (4784)
BOSS Chant of Life (4785)
BOSS Chant of Life (4786)
BOSS Chant of Life (4787)
BOSS Chant of Life (4788)
Frintezza's Ghost Summoning (5005)
NPC - Healing Potion (5040)
Charm of Courage (5041)
Representation - Enter the Sailren Nest Quest (5089)
Sailren Production (5090)
Production - Clan / Transfer (5103)
Production - Clan Gate (5109)
Blessing of Protection (5182)
Pet Haste (5186)
Pet Vampiric Rage (5187)
Pet Regeneration (5188)
Pet Blessed Body (5189)
Pet Blessed Soul (5190)
Pet Guidance (5191)
Pet Wind Walk (5192)
Pet Acumen (5193)
Pet Empower (5194)
Pet Greater Heal (5195)
Pet Wind Shackle (5196)
Pet Hex (5197)
Pet Slow (5198)
Pet Curse Gloom (5199)
Pet Concentration (5201)
Boss Regeneration (5205)
Event Wind walk (5208)
Event Shield (5209)
Event Bless the body (5210)
Event Vampiric rage (5211)
Event Regeneration (5212)
Event Haste (5213)
Event Bless the soul (5214)
Event Acumen (5215)
Event Concentration (5216)
Event Empower (5217)
Production: Event Teleport (5218)
Physical Up (5244)
Magical Up (5245)
Heat of Desert (5399)
Presentation - Balor 4 (5404)
Presentation - Demonic 1 (5405)
Presentation - Demonic 2 (5406)
Presentation - Crystalline Golem 1 (5407)
Presentation - Crystalline Golem 2 (5408)
Presentation - Crystalline Golem 3 (5409)
Performing Agathion - Beast Farm (5413)
Balor Invincible Removal (5480)
Naia Production (5493)
Chain Buff - Power Up (5519)
Chain Buff - Vampiric Shield (5520)
Chain Buff - Critical Sense (5521)
Chain Magic - Dark Explosion (5522)
Chain Magic - Unholy Castle (5523)
Chain Buff - Resistance to Bow and Magic attacks (5524)
Chain Buff - Resistance to Melee Attacks (5525)
Challenger's Blessing (5526)
Flame Armor (5567)
Frost Armor (5568)
Major Heal (5835)
Maguen Plasma (6620)
Maguen Plasma (6621)
Shock (6622)
Energy of Life (6625)
Energy of Mana (6628)
Energy of Power (6631)
Energy of Attack Speed (6633)
Energy of Crt Rate (6635)
Energy of Speed (6636)
Aura of Mystery (6638)
Bane of Auras - Damage (6639)
Vitalizing Aura (6640)
Treykan Transformation (6649)
Level 85 Raid Boss (6652)
Level 85 Raid Boss (6653)
Level 85 Raid Boss (6654)
Energy of Range Increment (6674)
Magician's Perversity (6676)
Maguen Speed Walk (6681)
Elite Maguen Speed Walk (6682)
Maguen Recall (6683)
Maguen Party Recall (6684)
Santa Claus's Gift (6685)
Sacred Protector Cancel (6686)
Patience (6687)
Soup of Failure (6688)
Presentation - Quest Done (6696)
Eternal Blizzard (6697)
Pillar of Frozen - Eternal Ice (6698)
Wind Walk of Elcadia (6714)
Haste of Elcadia (6715)
Might of Elcadia (6716)
Berserker Spirit of Elcadia (6717)
Death Whisper of Elcadia (6718)
Guidance of Elcadia 6719
Focus of Elcadia (6720)
Empower of Elcadia (6721)
Acumen of Elcadia (6722)
Concentration of Elcadia (6723)
Greater Heal of Elcadia (6724)
Bless the Blood of Elcadia (6725)
Bless the Blood (6726)
Vampiric Rage of Elcadia (6727)
Recharge of Elcadia (6728)
Greater Battle Heal of Elcadia (6730)
Summon Subordinate (6841)
Enhance (6842)
Morale Boost (6885)
NPC Default (7000)
Dispel Buff (7001)
Dispel Debuff (7002)
Dispel All (7003)
Master's Blessing - Focus (7041)
Master's Blessing - Death Whisper (7042)
Master's Blessing - Haste (7043)
Master's Blessing - Guidance (7044)
Master's Blessing - Blessed Body (7045)
Master's Blessing - Blessed Soul (7046)
Master's Blessing - Agility (7047)
Master's Blessing - Acumen (7048)
Master's Blessing - Decrease Weight (7049)
Master's Blessing - Might (7050)
Master's Blessing - Shield (7051)
Master's Blessing - Magic Barrier (7052)
Master's Blessing - Vampiric Rage (7053)
Master's Blessing - Empower (7054)
Master's Blessing - Wind Walk (7055)
Master's Blessing - Berserker Spirit (7056)
Master's Blessing - Greater Might (7057)
Master's Blessing - Greater Shield (7058)
Master's Blessing - Wild Magic (7059)
Master's Blessing - Clarity (7060)
Master's Blessing - Prophecy of Water (7061)
Master's Blessing - Prophecy of Fire (7062)
Master's Blessing - Prophecy of Wind (7063)
Master's Blessing - Chant of Victory (7064)
Master's Blessing - Improve Combat (7088)
Master's Blessing - Improve Magic (7089)
Master's Blessing - Improve Condition (7090)
Master's Blessing - Improve Critical (7091)
Master's Blessing - Improve Shield Defense (7092)
Master's Blessing - Improve Movement (7093)
Master's Blessing - Sharpen Edge (7094)
Master's Blessing - Face Harden (7095)
Master's Blessing - Blessing of Noblesse (7096)
Awful Soup (9075)
Freesia Bouquet - Event (9150)
Baby's Breath Bouquet - Event (9151)
Pink Lady - Event (9152)
June Bug - Event (9153)
Soft Cheese Cake - Event (9154)
Freshly-Baked Baguette - Event (9155)
Sweet Cream-filled Bread - Event (9156)
White Day Candy - Event (9157)
Baby Food Skill (22126)
Scissors (23019)
Start attacking the Turkey (23020)
Turkey's Attack Scissors (23021)
First win (23022)
Switch State (23073)
Icy Air Explosion (23074)
Jack O'Lantern Card - Confirm Skill (23094)
Rotten Jack O'Lantern Card - Confirm Skill (23095)
Halloween Defeat (23096)
First win (23097)
2nd Consecutive Win (23098)
3rd Consecutive Win (23099)
4th Consecutive Win (23100)
5th Consecutive Win (23101)
6th Consecutive Win (23102)
7th Consecutive Win (23103)
8th Consecutive Win (23104)
9th Consecutive Win (23105)
10th Consecutive Win (23106)
11th Consecutive Win (23107)
12th Consecutive Win (23108)
13th Consecutive Win (23109)
14th Consecutive Win (23110)
15th Consecutive Win (23111)
16th Consecutive Win (23112)
17th Consecutive Win (23113)
18th Consecutive Win (23114)
19th Consecutive Win (23115)
20th Consecutive Win (23116)
Frozen Corpse Agathion Cute Trick (23117)
Gwangong Agathion Cute Trick (23123)
Ladder Snow Agathion Cute Trick (23139)
Kadomas Special Skill - Fireworks (23154)
Rudolph Girl's Blessing - Replenish Energy (23162)
Phoenix Agathion Cute Trick (23171)
Phoenix Agathion Special Skill - Nirvana Cycle (23172)
Phoenix Agathion Special Skill - Mountain Echoes (23173)
---
 .settings/org.eclipse.jdt.core.prefs          |   6 +
 .../handlers/EffectMasterHandler.java         |   2 +
 .../datapack/handlers/MasterHandler.java      |   6 +-
 .../effecthandlers/instant/InstantBetray.java |   5 +-
 .../instant/InstantDispelByName.java          |  61 ++
 .../effecthandlers/instant/SummonNpc.java     |   6 +-
 .../pump/TriggerSkillByAttack.java            |  17 +-
 .../pump/TriggerSkillByAvoid.java             |  16 +-
 .../pump/TriggerSkillByDamage.java            |  10 +-
 .../pump/TriggerSkillBySkill.java             |  15 +-
 .../handlers/targethandlers/Area.java         |   8 +-
 .../targethandlers/AreaCorpseMob.java         |   8 +-
 .../handlers/targethandlers/AreaFriendly.java |   8 +-
 .../handlers/targethandlers/AreaSummon.java   |   8 +-
 .../handlers/targethandlers/Aura.java         |   8 +-
 .../targethandlers/AuraCorpseMob.java         |   8 +-
 .../handlers/targethandlers/AuraFriendly.java |   8 +-
 .../targethandlers/AuraUndeadEnemy.java       |   8 +-
 .../handlers/targethandlers/BehindArea.java   |   8 +-
 .../handlers/targethandlers/BehindAura.java   |   8 +-
 .../handlers/targethandlers/Clan.java         |   8 +-
 .../handlers/targethandlers/ClanMember.java   |   8 +-
 .../targethandlers/CommandChannel.java        |   8 +-
 .../handlers/targethandlers/CorpseClan.java   |   8 +-
 .../handlers/targethandlers/CorpseMob.java    |   8 +-
 .../handlers/targethandlers/Enemy.java        |   8 +-
 .../handlers/targethandlers/EnemyNot.java     |  59 ++
 .../handlers/targethandlers/EnemyOnly.java    |   6 +-
 .../handlers/targethandlers/EnemySummon.java  |   8 +-
 .../handlers/targethandlers/FlagPole.java     |   8 +-
 .../handlers/targethandlers/FrontArea.java    |   8 +-
 .../handlers/targethandlers/FrontAura.java    |   8 +-
 .../handlers/targethandlers/Ground.java       |   8 +-
 .../handlers/targethandlers/Holy.java         |   8 +-
 .../datapack/handlers/targethandlers/One.java |   8 +-
 .../handlers/targethandlers/OwnerPet.java     |   8 +-
 .../handlers/targethandlers/Party.java        |   6 +-
 .../handlers/targethandlers/PartyClan.java    |   8 +-
 .../handlers/targethandlers/PartyMember.java  |   6 +-
 .../handlers/targethandlers/PartyNotMe.java   |   8 +-
 .../handlers/targethandlers/PartyOther.java   |   8 +-
 .../handlers/targethandlers/PcBody.java       |   8 +-
 .../datapack/handlers/targethandlers/Pet.java |   8 +-
 .../handlers/targethandlers/Self.java         |   8 +-
 .../handlers/targethandlers/Servitor.java     |   8 +-
 .../handlers/targethandlers/Summon.java       |   8 +-
 .../handlers/targethandlers/Target.java       |  55 +
 .../handlers/targethandlers/TargetParty.java  |   8 +-
 .../handlers/targethandlers/Unlockable.java   |   8 +-
 .../CrystalCaverns/CrystalCaverns.java        |   8 +-
 .../PailakaDevilsLegacy.java                  |   7 +-
 .../data/stats/skills/00000-00099.xml         |  17 +-
 .../data/stats/skills/00200-00299.xml         |  32 +-
 .../data/stats/skills/00400-00499.xml         |  23 +-
 .../data/stats/skills/00500-00599.xml         |  16 +-
 .../data/stats/skills/00600-00699.xml         |  30 +-
 .../data/stats/skills/00700-00799.xml         | 332 ++++--
 .../data/stats/skills/00800-00899.xml         |  94 +-
 .../data/stats/skills/00900-00999.xml         |  57 +-
 .../data/stats/skills/01000-01099.xml         | 467 +++++----
 .../data/stats/skills/01400-01499.xml         | 365 ++++---
 .../data/stats/skills/01500-01599.xml         | 242 +++--
 .../data/stats/skills/02100-02199.xml         |   6 +-
 .../data/stats/skills/02200-02299.xml         |  51 +-
 .../data/stats/skills/02600-02699.xml         |   9 +-
 .../data/stats/skills/02800-02899.xml         |   8 +-
 .../data/stats/skills/03200-03299.xml         |   9 +-
 .../data/stats/skills/04000-04099.xml         | 345 ++++---
 .../data/stats/skills/04100-04199.xml         | 259 +++--
 .../data/stats/skills/04200-04299.xml         |  41 +-
 .../data/stats/skills/04300-04399.xml         | 971 +++++++++++-------
 .../data/stats/skills/04400-04499.xml         | 220 ++--
 .../data/stats/skills/04500-04599.xml         | 285 +++--
 .../data/stats/skills/04600-04699.xml         | 603 +++++++----
 .../data/stats/skills/04700-04799.xml         | 240 +++--
 .../data/stats/skills/05000-05099.xml         |  57 +-
 .../data/stats/skills/05100-05199.xml         | 282 ++---
 .../data/stats/skills/05200-05299.xml         | 114 +-
 .../data/stats/skills/05300-05399.xml         |   6 +-
 .../data/stats/skills/05400-05499.xml         | 197 +++-
 .../data/stats/skills/05500-05599.xml         | 145 ++-
 .../data/stats/skills/05800-05899.xml         |   9 +-
 .../data/stats/skills/06600-06699.xml         | 588 ++++++++---
 .../data/stats/skills/06700-06799.xml         | 392 ++++---
 .../data/stats/skills/06800-06899.xml         | 197 ++--
 .../data/stats/skills/06900-06999.xml         |   4 +-
 .../data/stats/skills/07000-07099.xml         | 950 +++++++++++------
 .../data/stats/skills/08300-08399.xml         |  14 +-
 .../data/stats/skills/09000-09099.xml         |   8 +-
 .../data/stats/skills/09100-09199.xml         |  72 +-
 .../data/stats/skills/21000-21099.xml         |   8 +-
 .../data/stats/skills/22100-22199.xml         |   7 +-
 .../data/stats/skills/23000-23099.xml         | 145 ++-
 .../data/stats/skills/23100-23199.xml         | 741 ++++++++++---
 src/main/resources/data/xsd/skills.xsd        |   4 +-
 .../instant/InstantBetrayTest.java            |  21 +-
 .../instant/InstantDispelByNameTest.java      |  83 ++
 .../handlers/targethandlers/EnemyNotTest.java |  95 ++
 .../handlers/targethandlers/EnemyTest.java    |  18 +-
 .../handlers/targethandlers/TargetTest.java   | 108 ++
 .../l2jserver/datapack/test/AbstractTest.java |  11 +-
 101 files changed, 6391 insertions(+), 3170 deletions(-)
 create mode 100644 src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantDispelByName.java
 create mode 100644 src/main/java/com/l2jserver/datapack/handlers/targethandlers/EnemyNot.java
 create mode 100644 src/main/java/com/l2jserver/datapack/handlers/targethandlers/Target.java
 create mode 100644 src/test/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantDispelByNameTest.java
 create mode 100644 src/test/java/com/l2jserver/datapack/handlers/targethandlers/EnemyNotTest.java
 create mode 100644 src/test/java/com/l2jserver/datapack/handlers/targethandlers/TargetTest.java

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index d4739701ce..924f474baf 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -8,6 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=14
+org.eclipse.jdt.core.compiler.compliance=14
 org.eclipse.jdt.core.compiler.problem.APILeak=warning
 org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
@@ -19,6 +21,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -63,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -101,6 +105,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=14
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/src/main/java/com/l2jserver/datapack/handlers/EffectMasterHandler.java b/src/main/java/com/l2jserver/datapack/handlers/EffectMasterHandler.java
index 466f2917d6..d3765c2805 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/EffectMasterHandler.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/EffectMasterHandler.java
@@ -90,6 +90,7 @@ import com.l2jserver.datapack.handlers.effecthandlers.instant.HpDrain;
 import com.l2jserver.datapack.handlers.effecthandlers.instant.HpPerMax;
 import com.l2jserver.datapack.handlers.effecthandlers.instant.InstantAgathionEnergy;
 import com.l2jserver.datapack.handlers.effecthandlers.instant.InstantBetray;
+import com.l2jserver.datapack.handlers.effecthandlers.instant.InstantDispelByName;
 import com.l2jserver.datapack.handlers.effecthandlers.instant.Lethal;
 import com.l2jserver.datapack.handlers.effecthandlers.instant.MagicalAttack;
 import com.l2jserver.datapack.handlers.effecthandlers.instant.MagicalAttackByAbnormal;
@@ -273,6 +274,7 @@ public final class EffectMasterHandler {
 		ImmobilePetBuff.class,
 		InstantAgathionEnergy.class,
 		InstantBetray.class,
+		InstantDispelByName.class,
 		Lethal.class,
 		Lucky.class,
 		MagicalAttack.class,
diff --git a/src/main/java/com/l2jserver/datapack/handlers/MasterHandler.java b/src/main/java/com/l2jserver/datapack/handlers/MasterHandler.java
index 5efeda62a8..af3379cf8a 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/MasterHandler.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/MasterHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -215,6 +215,7 @@ import com.l2jserver.datapack.handlers.targethandlers.CommandChannel;
 import com.l2jserver.datapack.handlers.targethandlers.CorpseClan;
 import com.l2jserver.datapack.handlers.targethandlers.CorpseMob;
 import com.l2jserver.datapack.handlers.targethandlers.Enemy;
+import com.l2jserver.datapack.handlers.targethandlers.EnemyNot;
 import com.l2jserver.datapack.handlers.targethandlers.EnemyOnly;
 import com.l2jserver.datapack.handlers.targethandlers.EnemySummon;
 import com.l2jserver.datapack.handlers.targethandlers.FlagPole;
@@ -234,6 +235,7 @@ import com.l2jserver.datapack.handlers.targethandlers.Pet;
 import com.l2jserver.datapack.handlers.targethandlers.Self;
 import com.l2jserver.datapack.handlers.targethandlers.Servitor;
 import com.l2jserver.datapack.handlers.targethandlers.Summon;
+import com.l2jserver.datapack.handlers.targethandlers.Target;
 import com.l2jserver.datapack.handlers.targethandlers.TargetParty;
 import com.l2jserver.datapack.handlers.targethandlers.Unlockable;
 import com.l2jserver.datapack.handlers.telnethandlers.ChatsHandler;
@@ -521,6 +523,7 @@ public class MasterHandler {
 		CorpseClan.class,
 		CorpseMob.class,
 		Enemy.class,
+		EnemyNot.class,
 		EnemyOnly.class,
 		EnemySummon.class,
 		FlagPole.class,
@@ -540,6 +543,7 @@ public class MasterHandler {
 		Self.class,
 		Servitor.class,
 		Summon.class,
+		Target.class,
 		TargetParty.class,
 		Unlockable.class,
 	};
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantBetray.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantBetray.java
index bf370b197e..f4fe1cf00e 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantBetray.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantBetray.java
@@ -76,9 +76,10 @@ public final class InstantBetray extends AbstractEffect {
 			return;
 		}
 		
-		effected.getAI().setIntention(AI_INTENTION_ATTACK, target);
+		final var effectedAI = effected.getAI();
+		effectedAI.setIntention(AI_INTENTION_ATTACK, target);
 		
-		ThreadPoolManager.getInstance().scheduleAiAtFixedRate(() -> effected.getAI().setIntention(AI_INTENTION_IDLE, target), 0, time, SECONDS);
+		ThreadPoolManager.getInstance().scheduleAiAtFixedRate(() -> effectedAI.setIntention(AI_INTENTION_IDLE, target), 0, time, SECONDS);
 	}
 	
 	@Override
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantDispelByName.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantDispelByName.java
new file mode 100644
index 0000000000..94c13871fb
--- /dev/null
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantDispelByName.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2004-2021 L2J DataPack
+ * 
+ * This file is part of L2J DataPack.
+ * 
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.datapack.handlers.effecthandlers.instant;
+
+import static com.l2jserver.gameserver.model.effects.L2EffectType.DISPEL;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.effects.AbstractEffect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+
+/**
+ * Dispel By Name instant effect.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class InstantDispelByName extends AbstractEffect {
+	
+	private final int id;
+	
+	public InstantDispelByName(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) {
+		super(attachCond, applyCond, set, params);
+		this.id = params.getInt("id");
+	}
+	
+	@Override
+	public boolean isInstant() {
+		return true;
+	}
+	
+	@Override
+	public void onStart(BuffInfo info) {
+		final var effected = info.getEffected();
+		if (effected == null) {
+			return;
+		}
+		effected.getEffectList().stopSkillEffects(true, id);
+	}
+	
+	@Override
+	public L2EffectType getEffectType() {
+		return DISPEL;
+	}
+}
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/SummonNpc.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/SummonNpc.java
index 741120826c..6c002bbe12 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/SummonNpc.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/SummonNpc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 
 /**
  * Summon Npc effect implementation.
@@ -108,7 +108,7 @@ public final class SummonNpc extends AbstractEffect {
 				int y = player.getY();
 				int z = player.getZ();
 				
-				if (info.getSkill().getTargetType() == L2TargetType.GROUND) {
+				if (info.getSkill().getTargetType() == TargetType.GROUND) {
 					final Location wordPosition = player.getActingPlayer().getCurrentSkillWorldPosition();
 					if (wordPosition != null) {
 						x = wordPosition.getX();
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByAttack.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByAttack.java
index ef1137ebea..129232d181 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByAttack.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByAttack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -34,7 +34,7 @@ import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.items.type.WeaponType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
@@ -47,18 +47,11 @@ public final class TriggerSkillByAttack extends AbstractEffect {
 	private final int _minDamage;
 	private final int _chance;
 	private final SkillHolder _skill;
-	private final L2TargetType _targetType;
+	private final TargetType _targetType;
 	private final InstanceType _attackerType;
 	private int _allowWeapons;
 	private final boolean _isCritical;
 	
-	/**
-	 * @param attachCond
-	 * @param applyCond
-	 * @param set
-	 * @param params
-	 */
-	
 	public TriggerSkillByAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) {
 		super(attachCond, applyCond, set, params);
 		
@@ -67,7 +60,7 @@ public final class TriggerSkillByAttack extends AbstractEffect {
 		_minDamage = params.getInt("minDamage", 1);
 		_chance = params.getInt("chance", 100);
 		_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
-		_targetType = params.getEnum("targetType", L2TargetType.class, L2TargetType.SELF);
+		_targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF);
 		_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.L2Character);
 		_isCritical = params.getBoolean("isCritical", false);
 		
@@ -85,7 +78,7 @@ public final class TriggerSkillByAttack extends AbstractEffect {
 			return;
 		}
 		
-		if (((_targetType == L2TargetType.SELF) && (_skill.getSkill().getCastRange() > 0)) && (Util.calculateDistance(event.getAttacker(), event.getTarget(), true, false) > _skill.getSkill().getCastRange())) {
+		if (((_targetType == TargetType.SELF) && (_skill.getSkill().getCastRange() > 0)) && (Util.calculateDistance(event.getAttacker(), event.getTarget(), true, false) > _skill.getSkill().getCastRange())) {
 			return;
 		}
 		
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByAvoid.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByAvoid.java
index 08f434a15d..b3177b1b10 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByAvoid.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByAvoid.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.model.events.listeners.ConsumerEventListener;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
@@ -42,20 +42,14 @@ import com.l2jserver.gameserver.util.Util;
 public final class TriggerSkillByAvoid extends AbstractEffect {
 	private final int _chance;
 	private final SkillHolder _skill;
-	private final L2TargetType _targetType;
+	private final TargetType _targetType;
 	
-	/**
-	 * @param attachCond
-	 * @param applyCond
-	 * @param set
-	 * @param params
-	 */
 	public TriggerSkillByAvoid(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) {
 		super(attachCond, applyCond, set, params);
 		
 		_chance = params.getInt("chance", 100);
 		_skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0));
-		_targetType = params.getEnum("targetType", L2TargetType.class, L2TargetType.ONE);
+		_targetType = params.getEnum("targetType", TargetType.class, TargetType.ONE);
 	}
 	
 	public void onAvoidEvent(OnCreatureAttackAvoid event) {
@@ -63,7 +57,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect {
 			return;
 		}
 		
-		if (((_targetType == L2TargetType.SELF) && (_skill.getSkill().getCastRange() > 0)) && (Util.calculateDistance(event.getAttacker(), event.getTarget(), true, false) > _skill.getSkill().getCastRange())) {
+		if (((_targetType == TargetType.SELF) && (_skill.getSkill().getCastRange() > 0)) && (Util.calculateDistance(event.getAttacker(), event.getTarget(), true, false) > _skill.getSkill().getCastRange())) {
 			return;
 		}
 		
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByDamage.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByDamage.java
index 6f39ee932e..e7cab1d586 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByDamage.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByDamage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -33,7 +33,7 @@ import com.l2jserver.gameserver.model.events.listeners.ConsumerEventListener;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
@@ -46,7 +46,7 @@ public final class TriggerSkillByDamage extends AbstractEffect {
 	private final int _minDamage;
 	private final int _chance;
 	private final SkillHolder _skill;
-	private final L2TargetType _targetType;
+	private final TargetType _targetType;
 	private final InstanceType _attackerType;
 	
 	public TriggerSkillByDamage(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) {
@@ -57,7 +57,7 @@ public final class TriggerSkillByDamage extends AbstractEffect {
 		_minDamage = params.getInt("minDamage", 1);
 		_chance = params.getInt("chance", 100);
 		_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
-		_targetType = params.getEnum("targetType", L2TargetType.class, L2TargetType.SELF);
+		_targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF);
 		_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.L2Character);
 	}
 	
@@ -66,7 +66,7 @@ public final class TriggerSkillByDamage extends AbstractEffect {
 			return;
 		}
 		
-		if (((_targetType == L2TargetType.SELF) && (_skill.getSkill().getCastRange() > 0)) && (Util.calculateDistance(event.getAttacker(), event.getTarget(), true, false) > _skill.getSkill().getCastRange())) {
+		if (((_targetType == TargetType.SELF) && (_skill.getSkill().getCastRange() > 0)) && (Util.calculateDistance(event.getAttacker(), event.getTarget(), true, false) > _skill.getSkill().getCastRange())) {
 			return;
 		}
 		
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillBySkill.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillBySkill.java
index 06a2378746..52eb6a9b65 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillBySkill.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillBySkill.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.model.events.listeners.ConsumerEventListener;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 
 /**
  * Trigger Skill By Skill effect implementation.
@@ -42,14 +42,7 @@ public final class TriggerSkillBySkill extends AbstractEffect {
 	private final int _castSkillId;
 	private final int _chance;
 	private final SkillHolder _skill;
-	private final L2TargetType _targetType;
-	
-	/**
-	 * @param attachCond
-	 * @param applyCond
-	 * @param set
-	 * @param params
-	 */
+	private final TargetType _targetType;
 	
 	public TriggerSkillBySkill(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) {
 		super(attachCond, applyCond, set, params);
@@ -57,7 +50,7 @@ public final class TriggerSkillBySkill extends AbstractEffect {
 		_castSkillId = params.getInt("castSkillId", 0);
 		_chance = params.getInt("chance", 100);
 		_skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0));
-		_targetType = params.getEnum("targetType", L2TargetType.class, L2TargetType.ONE);
+		_targetType = params.getEnum("targetType", TargetType.class, TargetType.ONE);
 	}
 	
 	public void onSkillUseEvent(OnCreatureSkillUse event) {
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Area.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Area.java
index 72021dbf38..f05dd0b89f 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Area.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Area.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.util.Util;
@@ -95,7 +95,7 @@ public class Area implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.AREA;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.AREA;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaCorpseMob.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaCorpseMob.java
index 16e0b6b8b0..dbe064e088 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaCorpseMob.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaCorpseMob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.util.Util;
@@ -72,7 +72,7 @@ public class AreaCorpseMob implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.AREA_CORPSE_MOB;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.AREA_CORPSE_MOB;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaFriendly.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaFriendly.java
index 441cb90c5d..5c2ce91fa3 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaFriendly.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaFriendly.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
@@ -151,7 +151,7 @@ public class AreaFriendly implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.AREA_FRIENDLY;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.AREA_FRIENDLY;
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaSummon.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaSummon.java
index 9d13c17e5b..9989898c96 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaSummon.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaSummon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.util.Util;
 
@@ -84,7 +84,7 @@ public class AreaSummon implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.AREA_SUMMON;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.AREA_SUMMON;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Aura.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Aura.java
index 9adc9b330f..f584082549 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Aura.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Aura.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
@@ -69,7 +69,7 @@ public class Aura implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.AURA;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.AURA;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraCorpseMob.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraCorpseMob.java
index b21de4802b..2ca76e80a9 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraCorpseMob.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraCorpseMob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 
 /**
  * @author UnAfraid
@@ -57,7 +57,7 @@ public class AuraCorpseMob implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.AURA_CORPSE_MOB;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.AURA_CORPSE_MOB;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraFriendly.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraFriendly.java
index ae4786ce27..558da2b211 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraFriendly.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraFriendly.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
@@ -97,7 +97,7 @@ public class AuraFriendly implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.AURA_FRIENDLY;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.AURA_FRIENDLY;
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraUndeadEnemy.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraUndeadEnemy.java
index 200a91b6fa..ae53373450 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraUndeadEnemy.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraUndeadEnemy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -25,7 +25,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 
 /**
  * Aura Undead Enemy target handler implementation.
@@ -56,7 +56,7 @@ public class AuraUndeadEnemy implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.AURA_UNDEAD_ENEMY;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.AURA_UNDEAD_ENEMY;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/BehindArea.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/BehindArea.java
index 52f5504386..eeec7257bf 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/BehindArea.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/BehindArea.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.util.Util;
@@ -99,7 +99,7 @@ public class BehindArea implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.BEHIND_AREA;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.BEHIND_AREA;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/BehindAura.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/BehindAura.java
index e5cad3e215..1a81175e7c 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/BehindAura.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/BehindAura.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
@@ -67,7 +67,7 @@ public class BehindAura implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.BEHIND_AURA;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.BEHIND_AURA;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Clan.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Clan.java
index 26936d3cb5..92920c7aef 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Clan.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Clan.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
@@ -146,7 +146,7 @@ public class Clan implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.CLAN;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.CLAN;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/ClanMember.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/ClanMember.java
index 65417d9053..7ad1468b85 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/ClanMember.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/ClanMember.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
@@ -68,7 +68,7 @@ public class ClanMember implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.CLAN_MEMBER;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.CLAN_MEMBER;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/CommandChannel.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/CommandChannel.java
index 0a9a312e08..78f731eecd 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/CommandChannel.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/CommandChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.model.L2Party;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 
 /**
  * @author UnAfraid
@@ -77,7 +77,7 @@ public class CommandChannel implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.COMMAND_CHANNEL;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.COMMAND_CHANNEL;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/CorpseClan.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/CorpseClan.java
index 1abb48a1fe..d8a9801861 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/CorpseClan.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/CorpseClan.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.util.Util;
 
@@ -136,7 +136,7 @@ public class CorpseClan implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.CORPSE_CLAN;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.CORPSE_CLAN;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/CorpseMob.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/CorpseMob.java
index 96bad579f5..1fac59deed 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/CorpseMob.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/CorpseMob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 /**
@@ -55,7 +55,7 @@ public class CorpseMob implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.CORPSE_MOB;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.CORPSE_MOB;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Enemy.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Enemy.java
index ed38876728..ce2a648569 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Enemy.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Enemy.java
@@ -18,7 +18,7 @@
  */
 package com.l2jserver.datapack.handlers.targethandlers;
 
-import static com.l2jserver.gameserver.model.skills.targets.L2TargetType.ENEMY;
+import static com.l2jserver.gameserver.model.skills.targets.TargetType.ENEMY;
 import static com.l2jserver.gameserver.network.SystemMessageId.INCORRECT_TARGET;
 
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
@@ -26,12 +26,12 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 
 /**
  * Enemy target type handler.
  * @author Zoey76
- * @since 2.6.0.0
+ * @version 2.6.2.0
  */
 public class Enemy implements ITargetTypeHandler {
 	@Override
@@ -72,7 +72,7 @@ public class Enemy implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
+	public Enum<TargetType> getTargetType() {
 		return ENEMY;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/EnemyNot.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/EnemyNot.java
new file mode 100644
index 0000000000..79855cc8f1
--- /dev/null
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/EnemyNot.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2021 L2J DataPack
+ * 
+ * This file is part of L2J DataPack.
+ * 
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.datapack.handlers.targethandlers;
+
+import static com.l2jserver.gameserver.model.skills.targets.TargetType.ENEMY_NOT;
+import static com.l2jserver.gameserver.network.SystemMessageId.INCORRECT_TARGET;
+
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
+
+/**
+ * Enemy Not target type handler.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class EnemyNot implements ITargetTypeHandler {
+	@Override
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) {
+		if (target == null) {
+			return EMPTY_TARGET_LIST;
+		}
+		
+		if (target.isDead()) {
+			activeChar.sendPacket(INCORRECT_TARGET);
+			return EMPTY_TARGET_LIST;
+		}
+		
+		if (target.isAutoAttackable(activeChar)) {
+			activeChar.sendPacket(INCORRECT_TARGET);
+			return EMPTY_TARGET_LIST;
+		}
+		
+		return skill.getAffectScope().affectTargets(activeChar, target, skill).toArray(EMPTY_TARGET_LIST);
+	}
+	
+	@Override
+	public Enum<TargetType> getTargetType() {
+		return ENEMY_NOT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/EnemyOnly.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/EnemyOnly.java
index 95381e8aa2..0225980827 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/EnemyOnly.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/EnemyOnly.java
@@ -19,7 +19,7 @@
 package com.l2jserver.datapack.handlers.targethandlers;
 
 import static com.l2jserver.gameserver.model.skills.targets.AffectScope.SINGLE;
-import static com.l2jserver.gameserver.model.skills.targets.L2TargetType.ENEMY_ONLY;
+import static com.l2jserver.gameserver.model.skills.targets.TargetType.ENEMY_ONLY;
 import static com.l2jserver.gameserver.model.zone.ZoneId.PVP;
 import static com.l2jserver.gameserver.network.SystemMessageId.INCORRECT_TARGET;
 
@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.instancemanager.DuelManager;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 
 /**
  * Enemy Only target type handler.
@@ -157,7 +157,7 @@ public class EnemyOnly implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
+	public Enum<TargetType> getTargetType() {
 		return ENEMY_ONLY;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/EnemySummon.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/EnemySummon.java
index c18069e3d7..92a81459e7 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/EnemySummon.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/EnemySummon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
@@ -48,7 +48,7 @@ public class EnemySummon implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.ENEMY_SUMMON;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.ENEMY_SUMMON;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FlagPole.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FlagPole.java
index 32cd38cca9..d182fcd35e 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FlagPole.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FlagPole.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -22,7 +22,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 
 /**
  * @author UnAfraid
@@ -40,7 +40,7 @@ public class FlagPole implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.FLAGPOLE;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.FLAGPOLE;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FrontArea.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FrontArea.java
index 1f936a7c87..34e752a4d0 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FrontArea.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FrontArea.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.util.Util;
@@ -99,7 +99,7 @@ public class FrontArea implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.FRONT_AREA;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.FRONT_AREA;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FrontAura.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FrontAura.java
index e436cdc64a..58ed24ee58 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FrontAura.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FrontAura.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
@@ -67,7 +67,7 @@ public class FrontAura implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.FRONT_AURA;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.FRONT_AURA;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Ground.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Ground.java
index 3ec77e1c8c..f940675a4d 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Ground.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Ground.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
@@ -67,7 +67,7 @@ public class Ground implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.GROUND;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.GROUND;
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Holy.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Holy.java
index 828569c63e..60ef4feba2 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Holy.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Holy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2ArtefactInstance;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 
 /**
  * @author UnAfraid
@@ -41,7 +41,7 @@ public class Holy implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.HOLY;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.HOLY;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/One.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/One.java
index 2ebb19d863..c5f4745e0e 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/One.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/One.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -22,7 +22,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 /**
@@ -44,7 +44,7 @@ public class One implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.ONE;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.ONE;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/OwnerPet.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/OwnerPet.java
index 1a8d4b47ff..43332f7024 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/OwnerPet.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/OwnerPet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 
 /**
  * @author UnAfraid
@@ -43,7 +43,7 @@ public class OwnerPet implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.OWNER_PET;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.OWNER_PET;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Party.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Party.java
index b684dd4d3a..b23a059d0e 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Party.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Party.java
@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 
 /**
  * @author UnAfraid
@@ -75,7 +75,7 @@ public class Party implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.PARTY;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.PARTY;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyClan.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyClan.java
index 658b5aa819..2355da1605 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyClan.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyClan.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 
 /**
  * @author UnAfraid
@@ -133,7 +133,7 @@ public class PartyClan implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.PARTY_CLAN;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.PARTY_CLAN;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyMember.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyMember.java
index e75f5f0f0f..ba1c3d8c07 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyMember.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyMember.java
@@ -22,7 +22,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 /**
@@ -47,7 +47,7 @@ public class PartyMember implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.PARTY_MEMBER;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.PARTY_MEMBER;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyNotMe.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyNotMe.java
index 72b94808a0..d7b33510cd 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyNotMe.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyNotMe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
@@ -62,7 +62,7 @@ public class PartyNotMe implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.PARTY_NOTME;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.PARTY_NOTME;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyOther.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyOther.java
index 6eca3f5db2..d77eb2fda6 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyOther.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyOther.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -22,7 +22,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 /**
@@ -63,7 +63,7 @@ public class PartyOther implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.PARTY_OTHER;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.PARTY_OTHER;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PcBody.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PcBody.java
index 3f73d9652e..875a3c895d 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PcBody.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PcBody.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
@@ -96,7 +96,7 @@ public class PcBody implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.PC_BODY;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.PC_BODY;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Pet.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Pet.java
index 9cb1535997..0fd0ba7c1f 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Pet.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Pet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -22,7 +22,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 
 /**
  * Target Pet handler.
@@ -40,7 +40,7 @@ public class Pet implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.PET;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.PET;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Self.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Self.java
index df0780eb95..b94cdec9cf 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Self.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Self.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -22,7 +22,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 
 /**
  * @author UnAfraid
@@ -37,7 +37,7 @@ public class Self implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.SELF;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.SELF;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Servitor.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Servitor.java
index 71f13050cf..cd743fa18e 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Servitor.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Servitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -22,7 +22,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 
 /**
  * Target Servitor handler.
@@ -40,7 +40,7 @@ public class Servitor implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.SERVITOR;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.SERVITOR;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Summon.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Summon.java
index d328ea3621..a67392a973 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Summon.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Summon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -22,7 +22,7 @@ import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 
 /**
  * Target Summon handler.
@@ -40,7 +40,7 @@ public class Summon implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.SUMMON;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.SUMMON;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Target.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Target.java
new file mode 100644
index 0000000000..f523c9f0ec
--- /dev/null
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Target.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2021 L2J DataPack
+ * 
+ * This file is part of L2J DataPack.
+ * 
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.datapack.handlers.targethandlers;
+
+import static com.l2jserver.gameserver.model.skills.targets.TargetType.TARGET;
+import static com.l2jserver.gameserver.network.SystemMessageId.INCORRECT_TARGET;
+
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
+
+/**
+ * Target target type handler.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class Target implements ITargetTypeHandler {
+	@Override
+	public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) {
+		if (target == null) {
+			return EMPTY_TARGET_LIST;
+		}
+		
+		final var player = activeChar.getActingPlayer();
+		if ((player != null) && !player.getCurrentSkill().isCtrlPressed() && target.isAutoAttackable(activeChar)) {
+			activeChar.sendPacket(INCORRECT_TARGET);
+			return EMPTY_TARGET_LIST;
+		}
+		
+		return skill.getAffectScope().affectTargets(activeChar, target, skill).toArray(EMPTY_TARGET_LIST);
+	}
+	
+	@Override
+	public Enum<TargetType> getTargetType() {
+		return TARGET;
+	}
+}
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/TargetParty.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/TargetParty.java
index aa044009f0..ae428015c3 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/TargetParty.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/TargetParty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 /**
@@ -67,7 +67,7 @@ public class TargetParty implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.TARGET_PARTY;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.TARGET_PARTY;
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Unlockable.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Unlockable.java
index 9dcd3e9286..aed0af71bb 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Unlockable.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Unlockable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2ChestInstance;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
 
 /**
  * @author UnAfraid
@@ -41,7 +41,7 @@ public class Unlockable implements ITargetTypeHandler {
 	}
 	
 	@Override
-	public Enum<L2TargetType> getTargetType() {
-		return L2TargetType.UNLOCKABLE;
+	public Enum<TargetType> getTargetType() {
+		return TargetType.UNLOCKABLE;
 	}
 }
diff --git a/src/main/java/com/l2jserver/datapack/instances/CrystalCaverns/CrystalCaverns.java b/src/main/java/com/l2jserver/datapack/instances/CrystalCaverns/CrystalCaverns.java
index 39820005a6..e3fc97dcbb 100644
--- a/src/main/java/com/l2jserver/datapack/instances/CrystalCaverns/CrystalCaverns.java
+++ b/src/main/java/com/l2jserver/datapack/instances/CrystalCaverns/CrystalCaverns.java
@@ -50,7 +50,6 @@ import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -937,12 +936,7 @@ public final class CrystalCaverns extends AbstractInstance {
 				} else if (world.tears != npc) {
 					return "";
 				} else if (!world.copys.isEmpty()) {
-					boolean notAOE = true;
-					if ((skill != null) && ((skill.getTargetType() == L2TargetType.AREA) || (skill.getTargetType() == L2TargetType.FRONT_AREA) || (skill.getTargetType() == L2TargetType.BEHIND_AREA) || (skill.getTargetType() == L2TargetType.AURA) || (skill.getTargetType() == L2TargetType.FRONT_AURA)
-						|| (skill.getTargetType() == L2TargetType.BEHIND_AURA))) {
-						notAOE = false;
-					}
-					if (notAOE) {
+					if ((skill == null) || !skill.isAOE()) {
 						for (L2Npc copy : world.copys) {
 							copy.onDecay();
 						}
diff --git a/src/main/java/com/l2jserver/datapack/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/src/main/java/com/l2jserver/datapack/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
index 82f37908de..ad386b9171 100644
--- a/src/main/java/com/l2jserver/datapack/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
+++ b/src/main/java/com/l2jserver/datapack/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
@@ -251,7 +251,12 @@ public final class PailakaDevilsLegacy extends AbstractInstance {
 	@Override
 	public void onMoveFinished(L2Npc npc) {
 		if (npc.getLocation() == LEMATAN_PORT_POINT) {
-			npc.doCast(AV_TELEPORT);
+			final var target = npc.getTarget();
+			if (target != null) {
+				npc.doCast(AV_TELEPORT);
+				npc.teleToLocation(target);
+				((L2Character) target).setTarget(npc);
+			}
 			startQuestTimer("LEMATAN_TELEPORT", 2000, npc, null);
 		}
 	}
diff --git a/src/main/resources/data/stats/skills/00000-00099.xml b/src/main/resources/data/stats/skills/00000-00099.xml
index c939706db6..08b789ff7e 100644
--- a/src/main/resources/data/stats/skills/00000-00099.xml
+++ b/src/main/resources/data/stats/skills/00000-00099.xml
@@ -1925,26 +1925,29 @@
 		</effects>
 	</skill>
 	<skill id="69" levels="25" name="Sacrifice" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2">
-		<table name="#amount"> 741 762 782 802 822 843 863 882 902 922 941 960 979 997 1015 1033 1050 1067 1083 1099 1115 1129 1144 1157 1170 </table>
-		<table name="#effectPoints"> 494 508 521 535 549 562 575 589 602 615 628 640 653 665 677 689 700 711 722 733 743 753 763 772 780 </table>
-		<table name="#hpConsume"> 988 1015 1042 1069 1096 1123 1150 1176 1203 1229 1254 1280 1305 1329 1353 1377 1400 1422 1444 1465 1486 1506 1525 1543 1560 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> 494 508 521 535 549 562 575 589 602 615 628 640 653 665 677 689 700 711 722 733 743 753 763 772 780 </table>
+		<table name="#healPower"> 741 762 782 802 823 843 863 883 902 922 941 960 979 997 1015 1033 1050 1067 1083 1099 1115 1129 1144 1157 1170 </table>
+		<table name="#hpConsume"> 988 1015 1042 1070 1097 1123 1150 1177 1203 1229 1255 1280 1305 1329 1353 1377 1400 1422 1444 1465 1486 1506 1525 1543 1560 </table>
 		<table name="#magicLvl"> 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="#ench1amount"> 1231 1292 1353 1415 1476 1537 1598 1659 1720 1781 1842 1903 1964 2025 2086 2147 2208 2269 2331 2392 2453 2514 2575 2636 2697 2758 2819 2880 2941 3002 </table>
 		<table name="#ench2HpConsume"> 1534 1508 1482 1456 1430 1404 1378 1352 1326 1300 1274 1248 1222 1196 1170 1144 1118 1092 1066 1040 1014 988 962 936 910 884 858 832 806 780 </table>
 		<table name="#ench34HpConsume"> 1544 1528 1513 1497 1482 1466 1450 1435 1419 1404 1388 1372 1357 1341 1326 1310 1294 1279 1263 1248 1232 1216 1201 1185 1170 1154 1138 1123 1107 1092 </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="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="hpConsume" val="#hpConsume" />
 		<set name="icon" val="icon.skill0069" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="hpConsume" val="#ench2HpConsume" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
@@ -1954,7 +1957,7 @@
 		<enchant4 name="magicLvl" val="#enchMagicLvl" />
 		<effects>
 			<effect name="Heal">
-				<param power="#amount" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 		<enchant1Effects>
diff --git a/src/main/resources/data/stats/skills/00200-00299.xml b/src/main/resources/data/stats/skills/00200-00299.xml
index 33ea90efc5..de971f907f 100644
--- a/src/main/resources/data/stats/skills/00200-00299.xml
+++ b/src/main/resources/data/stats/skills/00200-00299.xml
@@ -276,7 +276,7 @@
 			</effect>
 			<effect name="Buff">
 				<mul stat="regHp" val="#enchreg" />
-			</effect>			
+			</effect>
 		</enchant3Effects>
 		<enchant4Effects>
 			<effect name="MaxHp">
@@ -1724,37 +1724,47 @@
 			</effect>
 		</enchant7pveEffects>
 	</skill>
-	<skill id="262" levels="37" name="Holy Blessing" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2">
-		<table name="#amount"> 236 245 254 262 271 281 290 299 308 318 327 337 346 356 365 375 384 393 403 412 421 430 439 448 457 466 474 482 490 498 506 513 520 527 534 540 546 </table>
-		<table name="#effectPoints"> 337 349 362 375 388 401 414 427 440 454 467 481 494 508 521 535 549 562 575 589 602 615 628 640 653 665 677 689 700 711 722 733 743 753 763 772 780 </table>
+	<skill id="262" levels="37" name="Divine Blessing" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2">
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> 337 349 362 375 388 401 414 427 440 454 467 481 494 508 521 535 549 562 575 589 602 615 628 640 653 665 677 689 700 711 722 733 743 753 763 772 780 </table>
+		<table name="#healPower"> 236 245 254 262 271 281 290 299 308 318 327 337 346 356 365 375 384 393 403 412 421 430 439 448 457 466 474 482 490 498 506 513 520 527 534 540 546 </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"> 115 119 122 122 127 130 134 139 143 148 152 157 159 159 164 168 173 177 180 185 189 193 195 195 199 203 207 210 214 218 222 224 228 230 233 237 239 </table>
+		<table name="#mpConsume1"> 23 24 25 25 26 26 27 28 29 30 31 32 32 32 33 34 35 36 36 37 38 39 39 39 40 41 42 42 43 44 45 45 46 46 47 48 48 </table>
+		<table name="#mpConsume2"> 92 95 97 97 101 104 107 111 114 118 121 125 127 127 131 134 138 141 144 148 151 154 156 156 159 162 165 168 171 174 177 179 182 184 186 189 191 </table>
 		<table name="#ench1amount"> 583 619 656 692 729 765 802 838 875 911 947 984 1020 1057 1093 1130 1166 1203 1239 1276 1312 1348 1385 1421 1458 1494 1531 1567 1604 1640 </table>
-		<table name="#ench2MpConsume2"> 233 230 226 222 218 215 211 206 202 198 195 191 187 183 178 175 171 167 163 160 156 151 147 143 140 136 132 127 123 120 </table>
-		<table name="#ench34MpConsume2"> 236 233 231 228 226 223 221 218 216 215 212 210 207 205 202 200 197 195 192 190 188 186 183 181 178 176 173 171 168 166 </table>
+		<table name="#ench2MpConsume1"> 46 46 45 44 43 43 42 41 40 39 39 38 37 36 35 35 34 33 32 32 31 30 29 28 28 27 26 25 24 24 </table>
+		<table name="#ench2MpConsume2"> 187 184 181 178 175 172 169 165 162 159 156 153 150 147 143 140 137 134 131 128 125 121 118 115 112 109 106 102 99 96 </table>
+		<table name="#ench34MpConsume1"> 47 46 46 45 45 44 44 43 43 43 42 42 41 41 40 40 39 39 38 38 37 37 36 36 35 35 34 34 33 33 </table>
+		<table name="#ench34MpConsume2"> 189 187 185 183 181 179 177 175 173 172 170 168 166 164 162 160 158 156 154 152 151 149 147 145 143 141 139 137 135 133 </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="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="5000" />
 		<set name="icon" val="icon.skill0262" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="3000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
+		<enchant2 name="mpConsume1" val="#ench2MpConsume1" />
 		<enchant2 name="mpConsume2" val="#ench2MpConsume2" />
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
+		<enchant3 name="mpConsume1" val="#ench34MpConsume1" />
 		<enchant3 name="mpConsume2" val="#ench34MpConsume2" />
 		<enchant4 name="magicLvl" val="#enchMagicLvl" />
+		<enchant4 name="mpConsume1" val="#ench34MpConsume1" />
 		<enchant4 name="mpConsume2" val="#ench34MpConsume2" />
 		<effects>
 			<effect name="Heal">
-				<param power="#amount" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 		<enchant1Effects>
diff --git a/src/main/resources/data/stats/skills/00400-00499.xml b/src/main/resources/data/stats/skills/00400-00499.xml
index 4cf1e3977c..78b3c0011e 100644
--- a/src/main/resources/data/stats/skills/00400-00499.xml
+++ b/src/main/resources/data/stats/skills/00400-00499.xml
@@ -345,7 +345,7 @@
 		<table name="#magicLvl"> 55 58 60 62 64 66 68 70 72 74 </table>
 		<table name="#mpConsume2"> 50 53 55 58 59 61 63 65 67 68 </table>
 		<table name="#ench1Cost"> 66 65 64 63 62 61 60 58 57 56 55 54 53 52 51 49 48 47 46 45 44 43 41 40 39 38 37 36 35 34 </table>
-		<table name="#ench2Power"> 30 31 32 32 33 34 34 35 36 36 37 38 38 39 40 40 41 42 42 43 44 44 45 46 46 47 48 48 49 50 </table> 
+		<table name="#ench2Power"> 30 31 32 32 33 34 34 35 36 36 37 38 38 39 40 40 41 42 42 43 44 44 45 46 46 47 48 48 49 50 </table>
 		<table name="#ench2LethalStrikeRate"> 25 25 25 26 26 26 26 27 27 27 27 28 28 28 29 29 29 29 30 30 30 30 31 31 31 31 32 32 32 33 </table>
 		<table name="#ench3Attack"> 191 196 201 206 211 216 221 227 232 237 242 247 252 257 263 268 273 278 283 288 293 298 304 309 314 319 324 329 334 340 </table>
 		<table name="#ench4HolyAttack"> 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 </table>
@@ -1730,10 +1730,10 @@
 		</cond>
 		<effects>
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockDebuff" />
 			<effect name="Buff">
@@ -1764,10 +1764,10 @@
 		</cond>
 		<effects>
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockDebuff" />
 			<effect name="Buff">
@@ -2987,11 +2987,14 @@
 		</effects>
 	</skill>
 	<skill id="489" levels="1" name="Shift Target">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectObject" val="NOT_FRIEND" />
 		<set name="affectRange" val="300" />
+		<set name="affectScope" val="POINT_BLANK" />
 		<set name="castRange" val="40" />
 		<set name="effectPoint" val="-1" />
 		<set name="effectRange" val="200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2500" />
 		<set name="icon" val="icon.skill0489" />
 		<set name="magicLvl" val="40" />
@@ -2999,14 +3002,14 @@
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="5000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" /> <!-- FIXME: should be AREA -->
+		<set name="targetType" val="TARGET" />
 		<set name="trait" val="DERANGEMENT" />
-		<cond>
-			<target myPartyExceptMe="true" />
-		</cond>
 		<cond msgId="113" addName="1">
 			<using kind="CROSSBOW" />
 		</cond>
+		<cond msgId="113" addName="1">
+			<target myParty="EXCEPT_ME" />
+		</cond>
 		<effects>
 			<effect name="TransferHate">
 				<param chance="80" />
diff --git a/src/main/resources/data/stats/skills/00500-00599.xml b/src/main/resources/data/stats/skills/00500-00599.xml
index 250d3e56d9..2e994ede74 100644
--- a/src/main/resources/data/stats/skills/00500-00599.xml
+++ b/src/main/resources/data/stats/skills/00500-00599.xml
@@ -2302,27 +2302,29 @@
 		</effects>
 	</skill>
 	<skill id="567" levels="4" name="Light of Heal">
-		<!-- Confirmed CT2.5 -->
-		<table name="#amount"> 690 731 770 806 </table>
+		<!-- High Five Confirmed -->
+		<table name="#healPower"> 690 731 770 806 </table>
 		<table name="#magicLvl"> 60 63 66 69 </table>
-		<table name="#mpConsume2"> 64 72 80 90 </table>
 		<table name="#mpConsume1"> 16 18 20 23 </table>
+		<table name="#mpConsume2"> 64 72 80 90 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2500" />
 		<set name="icon" val="icon.skill_transform_etc" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="3000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
-				<param power="#amount" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/src/main/resources/data/stats/skills/00600-00699.xml b/src/main/resources/data/stats/skills/00600-00699.xml
index a6c890ba03..eb5d18f4cf 100644
--- a/src/main/resources/data/stats/skills/00600-00699.xml
+++ b/src/main/resources/data/stats/skills/00600-00699.xml
@@ -1892,21 +1892,25 @@
 		</effects>
 	</skill>
 	<skill id="690" levels="1" name="Divine Rogue Agility">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="AVOID_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="676" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill_transform_buff" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="80" />
-		<set name="mpConsume2" val="73" />
+		<set name="mpConsume1" val="15" />
+		<set name="mpConsume2" val="58" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="rEvas" val="4" />
@@ -2109,18 +2113,22 @@
 		</selfEffects>
 	</skill>
 	<skill id="698" levels="1" name="Divine Healer Major Heal">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="826" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="5000" />
 		<set name="icon" val="icon.skill_transform_etc" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="80" />
-		<set name="mpConsume2" val="84" />
+		<set name="mpConsume1" val="17" />
+		<set name="mpConsume2" val="67" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
 				<param power="946" />
@@ -2128,18 +2136,22 @@
 		</effects>
 	</skill>
 	<skill id="699" levels="1" name="Divine Healer Battle Heal">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="661" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill_transform_etc" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="80" />
-		<set name="mpConsume2" val="189" />
+		<set name="mpConsume1" val="38" />
+		<set name="mpConsume2" val="151" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
 				<param power="826" />
diff --git a/src/main/resources/data/stats/skills/00700-00799.xml b/src/main/resources/data/stats/skills/00700-00799.xml
index f066c8f164..afbd2f75aa 100644
--- a/src/main/resources/data/stats/skills/00700-00799.xml
+++ b/src/main/resources/data/stats/skills/00700-00799.xml
@@ -1,40 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="700" levels="1" name="Divine Healer Group Heal">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="5" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="LIFE_FORCE_OTHERS" />
 		<set name="activateRate" val="0" />
+		<set name="affectObject" val="FRIEND" />
 		<set name="affectRange" val="1000" />
+		<set name="affectScope" val="PARTY" />
 		<set name="effectPoint" val="661" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="7000" />
 		<set name="icon" val="icon.skill_transform_buff" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="80" />
-		<set name="mpConsume2" val="252" />
+		<set name="mpConsume1" val="51" />
+		<set name="mpConsume2" val="201" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="6000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="PARTY" />
 		<effects>
+			<effect name="Heal">
+				<param power="400" />
+			</effect>
 			<effect name="TickHp">
 				<param power="27" />
 				<param ticks="1" />
-			</effect>
-			<effect name="Heal">
-				<param power="400" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="701" levels="1" name="Divine Healer Resurrection">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="661" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="6000" />
 		<set name="icon" val="icon.skill_transform_etc" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="80" />
-		<set name="mpConsume2" val="252" />
+		<set name="mpConsume1" val="51" />
+		<set name="mpConsume2" val="201" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="30000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -48,19 +58,23 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="702" levels="1" name="Divine Healer Cleanse">
+	<skill id="702" levels="1" name="Divine Healer Clans">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="676" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill_transform_etc" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="80" />
-		<set name="mpConsume2" val="59" />
+		<set name="mpConsume1" val="12" />
+		<set name="mpConsume2" val="47" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelByCategory">
 				<param slot="DEBUFF" rate="100" max="10" />
@@ -68,17 +82,20 @@
 		</effects>
 	</skill>
 	<skill id="703" levels="1" name="Sacrifice Healer">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectObject" val="FRIEND" />
 		<set name="affectRange" val="300" />
+		<set name="affectScope" val="PARTY" />
 		<set name="effectPoint" val="676" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill_transform_etc" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1800000" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="reuseDelayLock" val="true" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="PARTY" />
 		<cond msgId="113" addName="1">
 			<player mp="10" />
@@ -98,150 +115,260 @@
 		</selfEffects>
 	</skill>
 	<skill id="704" levels="1" name="Divine Enchanter Water Spirit">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="MULTI_BUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="669" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="600" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill_transform_buff" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="itemConsumeCount" val="10" />
 		<set name="itemConsumeId" val="3031" /> <!-- Spirit Ore -->
 		<set name="magicLvl" val="80" />
-		<set name="mpConsume2" val="73" />
+		<set name="mpConsume1" val="15" />
+		<set name="mpConsume2" val="58" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="4000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="PARTY_MEMBER" />
+		<set name="targetType" val="TARGET" />
+		<cond msgId="113" addName="1">
+			<target myParty="INCLUDE_ME" />
+		</cond>
 		<effects>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="1.2" />
+			</effect>
 			<effect name="Buff">
 				<add stat="mCritRate" val="2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="physicalMpConsumeRate" val="0.95" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="magicalMpConsumeRate" val="0.95" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="danceMpConsumeRate" val="0.95" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.2" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="regMp" val="1.2" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="pAtk" val="1.1" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="pDef" val="1.2" />
-				<mul stat="pAtkSpd" val="1.2" />
-				<mul stat="mAtk" val="1.2" />
-				<mul stat="mDef" val="1.2" />
-				<mul stat="mAtkSpd" val="1.2" />
-				<sub stat="debuffVuln" val="10" />
+			</effect>
+			<effect name="Debuff">
+				<mul stat="debuffVuln" val="0.9" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="runSpd" val="0.8" />
-				<mul stat="magicalMpConsumeRate" val="0.95" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="705" levels="1" name="Divine Enchanter Fire Spirit">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="MULTI_BUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="669" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="600" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill_transform_buff" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="itemConsumeCount" val="10" />
 		<set name="itemConsumeId" val="3031" /> <!-- Spirit Ore -->
 		<set name="magicLvl" val="80" />
-		<set name="mpConsume2" val="73" />
+		<set name="mpConsume1" val="15" />
+		<set name="mpConsume2" val="58" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="4000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="PARTY_MEMBER" />
+		<set name="targetType" val="TARGET" />
+		<cond msgId="113" addName="1">
+			<target myParty="INCLUDE_ME" />
+		</cond>
 		<effects>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="critDmg" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="regHp" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<add stat="mCritRate" val="2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.2" />
+			</effect>
 			<effect name="MaxMp">
 				<param power="20" />
 				<param type="PER" />
 			</effect>
 			<effect name="Buff">
-				<mul stat="regHp" val="1.2" />
-				<add stat="mCritRate" val="2" />
-				<mul stat="critDmg" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="pDef" val="1.2" />
-				<mul stat="pAtkSpd" val="1.2" />
-				<mul stat="mAtk" val="1.2" />
-				<mul stat="mDef" val="1.2" />
-				<mul stat="mAtkSpd" val="1.2" />
-				<add stat="accCombat" val="4" />
-				<sub stat="debuffVuln" val="10" />
+			</effect>
+			<effect name="Debuff">
+				<mul stat="debuffVuln" val="0.9" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="runSpd" val="0.8" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="706" levels="1" name="Divine Enchanter Wind Spirit">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="MULTI_BUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="669" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="600" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill_transform_buff" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="itemConsumeCount" val="10" />
 		<set name="itemConsumeId" val="3031" /> <!-- Spirit Ore -->
 		<set name="magicLvl" val="80" />
-		<set name="mpConsume2" val="73" />
+		<set name="mpConsume1" val="15" />
+		<set name="mpConsume2" val="58" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="4000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="PARTY_MEMBER" />
+		<set name="targetType" val="TARGET" />
+		<cond msgId="113" addName="1">
+			<target myParty="INCLUDE_ME" />
+		</cond>
 		<effects>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="critRate" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mCritPower" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.2" />
+			</effect>
 			<effect name="MaxHp">
 				<param power="20" />
 				<param type="PER" />
 			</effect>
 			<effect name="Buff">
-				<mul stat="critRate" val="1.2" />
-				<mul stat="mCritPower" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="pDef" val="1.2" />
-				<mul stat="pAtkSpd" val="1.2" />
-				<mul stat="mAtk" val="1.2" />
-				<mul stat="mDef" val="1.2" />
-				<mul stat="mAtkSpd" val="1.2" />
-				<sub stat="debuffVuln" val="10" />
+			</effect>
+			<effect name="Debuff">
+				<mul stat="debuffVuln" val="0.9" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="runSpd" val="0.8" />
-				<add stat="absorbDam" val="5" /> <!-- absorb 5% HP from damage inflicted on enemies -->
+			</effect>
+			<effect name="Buff">
+				<add stat="absorbDam" val="5" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="707" levels="1" name="Divine Enchanter Hero Spirit">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="MULTI_BUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="669" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="600" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2500" />
 		<set name="icon" val="icon.skill_transform_buff" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="itemConsumeCount" val="10" />
 		<set name="itemConsumeId" val="3031" /> <!-- Spirit Ore -->
 		<set name="magicLvl" val="80" />
-		<set name="mpConsume2" val="73" />
+		<set name="mpConsume1" val="15" />
+		<set name="mpConsume2" val="58" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="4000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="PARTY_MEMBER" />
+		<set name="targetType" val="TARGET" />
+		<cond msgId="113" addName="1">
+			<target myParty="INCLUDE_ME" />
+		</cond>
 		<effects>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="critDmg" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<add stat="mCritRate" val="2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.2" />
+			</effect>
 			<effect name="MaxHp">
 				<param power="20" />
 				<param type="PER" />
 			</effect>
 			<effect name="Buff">
-				<add stat="mCritRate" val="2" />
-				<mul stat="critDmg" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="pDef" val="1.2" />
-				<mul stat="pAtkSpd" val="1.2" />
-				<mul stat="mAtk" val="1.2" />
-				<mul stat="mDef" val="1.2" />
-				<mul stat="mAtkSpd" val="1.2" />
-				<sub stat="debuffVuln" val="10" />
-				<add stat="accCombat" val="4" />
+			</effect>
+			<effect name="Debuff">
+				<mul stat="debuffVuln" val="0.9" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="runSpd" val="0.8" />
 			</effect>
 		</effects>
@@ -473,7 +600,7 @@
 			</effect>
 			<effect name="Mp">
 				<param amount="#amount" />
- 			</effect>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="716" levels="4" name="Zaken Hold">
@@ -556,26 +683,28 @@
 		</effects>
 	</skill>
 	<skill id="719" levels="1" name="Zaken Vampiric Rage">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="VAMPIRIC_ATTACK" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="604" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill_transform_buff" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="65" />
-		<set name="mpConsume2" val="48" />
 		<set name="mpConsume1" val="12" />
+		<set name="mpConsume2" val="48" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<add stat="absorbDam" val="9" /> <!-- absorb 9% HP from damage inflicted on enemies -->
+				<add stat="absorbDam" val="15" />
 			</effect>
 		</effects>
 	</skill>
@@ -1018,51 +1147,55 @@
 		</effects>
 	</skill>
 	<skill id="738" levels="3" name="Heretic Heal">
-		<!-- Confirmed CT2.5 -->
-		<table name="#amount"> 892 926 956 </table>
+		<!-- High Five Confirmed -->
+		<table name="#healPower"> 892 926 956 </table>
 		<table name="#magicLvl"> 70 73 76 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="575" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="5000" />
 		<set name="icon" val="icon.skill_transform_etc" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
-		<set name="mpConsume2" val="48" />
 		<set name="mpConsume1" val="12" />
+		<set name="mpConsume2" val="48" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
-				<param power="#amount" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="739" levels="3" name="Heretic Battle Heal">
-		<!-- Confirmed CT2.5 -->
-		<table name="#amount"> 743 772 796 </table>
-		<table name="#effectPoints"> 595 617 637 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> 595 617 637 </table>
+		<table name="#healPower"> 743 772 796 </table>
 		<table name="#magicLvl"> 70 73 76 </table>
-		<table name="#mpConsume2"> 136 142 146 </table>
 		<table name="#mpConsume1"> 34 36 37 </table>
+		<table name="#mpConsume2"> 136 142 146 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill_transform_etc" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
-				<param power="#amount" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 	</skill>
@@ -1216,25 +1349,26 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="745" levels="3" name="Vale Master Dark Cure">
-		<!-- Confirmed CT2.5 -->
-		<table name="#effectPoints"> 635 650 662 </table>
+	<skill id="745" levels="3" name="Veil Master Dark Cure">
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> 635 650 662 </table>
 		<table name="#magicLvl"> 70 73 76 </table>
 		<table name="#mpConsume2"> 21 22 23 </table>
-		<table name="#mpConsume1"> 6 6 6 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill_transform_etc" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="6" />
 		<set name="mpConsume2" val="#mpConsume2" />
-		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelByCategory">
 				<param slot="DEBUFF" rate="100" max="10" />
@@ -1474,23 +1608,25 @@
 		</effects>
 	</skill>
 	<skill id="754" levels="1" name="Doll Blader Clairvoyance">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="CRITICAL_PROB_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="635" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill_transform_buff" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="70" />
-		<set name="mpConsume2" val="52" />
 		<set name="mpConsume1" val="13" />
+		<set name="mpConsume2" val="52" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="critRate" val="1.3" />
@@ -2002,10 +2138,12 @@
 		<set name="abnormalVisualEffect" val="TURN_FLEE" />
 		<set name="activateRate" val="90" />
 		<set name="affectLimit" val="10-10" />
+		<set name="affectObject" val="NOT_FRIEND" />
 		<set name="affectRange" val="200" />
 		<set name="affectScope" val="POINT_BLANK" />
 		<set name="basicProperty" val="MEN" />
 		<set name="effectPoint" val="-655" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill0774" />
 		<set name="isDebuff" val="true" />
@@ -2018,12 +2156,12 @@
 		<set name="targetType" val="AURA" />
 		<set name="trait" val="DERANGEMENT" />
 		<effects>
-			<effect name="Fear" />
 			<effect name="Debuff">
-				<mul stat="pDef" val="0.67" />
+				<sub stat="rEvas" val="10" />
 			</effect>
+			<effect name="Fear" />
 			<effect name="Debuff">
-				<sub stat="rEvas" val="10" />
+				<mul stat="pDef" val="0.67" />
 			</effect>
 			<effect name="Debuff">
 				<mul stat="runSpd" val="0.67" />
diff --git a/src/main/resources/data/stats/skills/00800-00899.xml b/src/main/resources/data/stats/skills/00800-00899.xml
index 0f126101c4..b672505a48 100644
--- a/src/main/resources/data/stats/skills/00800-00899.xml
+++ b/src/main/resources/data/stats/skills/00800-00899.xml
@@ -563,14 +563,16 @@
 		</effects>
 	</skill>
 	<skill id="825" levels="1" name="Sharp Edge">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="DWARF_ATTACK_BUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="coolTime" val="500" />
 		<set name="effectPoint" val="467" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill0825" />
 		<set name="magicLvl" val="49" />
@@ -578,27 +580,31 @@
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="pAtk" val="1.05">
+				<mul stat="critRate" val="1.2">
 					<using kind="SWORD,DAGGER,DUALDAGGER,POLE,RAPIER,ANCIENTSWORD,DUAL,DUALFIST" />
 				</mul>
-				<mul stat="critRate" val="1.2">
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.05">
 					<using kind="SWORD,DAGGER,DUALDAGGER,POLE,RAPIER,ANCIENTSWORD,DUAL,DUALFIST" />
 				</mul>
 			</effect>
 		</effects>
 	</skill>
 	<skill id="826" levels="1" name="Spike">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="DWARF_ATTACK_BUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="coolTime" val="500" />
 		<set name="effectPoint" val="467" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill0826" />
 		<set name="magicLvl" val="49" />
@@ -606,27 +612,29 @@
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="AttackTrait">
+				<param SHOCK="8" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.05">
 					<using kind="BLUNT" />
 				</mul>
 			</effect>
-			<effect name="AttackTrait">
-				<param SHOCK="8" />
-			</effect>
 		</effects>
 	</skill>
 	<skill id="827" levels="1" name="Restring">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="DWARF_ATTACK_BUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="coolTime" val="500" />
 		<set name="effectPoint" val="467" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill0827" />
 		<set name="magicLvl" val="49" />
@@ -634,27 +642,31 @@
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="pAtk" val="1.05">
-					<using kind="BOW,CROSSBOW" />
-				</mul>
 				<add stat="pAtkRange" val="100">
 					<using kind="BOW,CROSSBOW" />
 				</add>
 			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.05">
+					<using kind="BOW,CROSSBOW" />
+				</mul>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="828" levels="1" name="Case Harden">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="DWARF_DEFENCE_BUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="coolTime" val="500" />
 		<set name="effectPoint" val="438" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill0828" />
 		<set name="magicLvl" val="46" />
@@ -662,7 +674,7 @@
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.1">
@@ -672,14 +684,16 @@
 		</effects>
 	</skill>
 	<skill id="829" levels="1" name="Hard Tanning">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="DWARF_DEFENCE_BUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="coolTime" val="500" />
 		<set name="effectPoint" val="438" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill0829" />
 		<set name="magicLvl" val="46" />
@@ -687,27 +701,29 @@
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="Buff">
+				<add stat="rEvas" val="2" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.05">
 					<using kind="LIGHT" />
 				</mul>
-				<add stat="rEvas" val="2">
-					<using kind="LIGHT" />
-				</add>
 			</effect>
 		</effects>
 	</skill>
 	<skill id="830" levels="1" name="Embroider">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="DWARF_DEFENCE_BUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="coolTime" val="500" />
 		<set name="effectPoint" val="438" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill0830" />
 		<set name="magicLvl" val="46" />
@@ -715,16 +731,18 @@
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="pDef" val="1.05">
-					<using kind="MAGIC" />
-				</mul>
 				<add stat="regMp" val="2">
 					<using kind="MAGIC" />
 				</add>
 			</effect>
+			<effect name="Buff">
+				<mul stat="pDef" val="1.05">
+					<using kind="MAGIC" />
+				</mul>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="831" levels="1" name="Summon Merchant Golem">
@@ -882,10 +900,10 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockDebuff" />
 		</effects>
@@ -1569,23 +1587,25 @@
 		</effects>
 	</skill>
 	<skill id="871" levels="1" name="Might">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="PA_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1068" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="80" />
-		<set name="mpConsume2" val="28" />
 		<set name="mpConsume1" val="7" />
+		<set name="mpConsume2" val="28" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.15" />
@@ -1668,23 +1688,25 @@
 		</effects>
 	</skill>
 	<skill id="875" levels="1" name="Empower">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="MA_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1059" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="70" />
-		<set name="mpConsume2" val="56" />
 		<set name="mpConsume1" val="14" />
+		<set name="mpConsume2" val="56" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mAtk" val="1.75" />
diff --git a/src/main/resources/data/stats/skills/00900-00999.xml b/src/main/resources/data/stats/skills/00900-00999.xml
index 14966dbfbe..211d269de8 100644
--- a/src/main/resources/data/stats/skills/00900-00999.xml
+++ b/src/main/resources/data/stats/skills/00900-00999.xml
@@ -948,16 +948,18 @@
 		</effects>
 	</skill>
 	<skill id="932" levels="9" name="Star Stone Gathering">
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="100" />
-		<set name="effectRange" val="600" />
+		<set name="effectRange" val="400" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="6000" />
 		<set name="icon" val="icon.skill_agathion_cute" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
-		<set name="magicLvl" val="81" />
+		<set name="isMagic" val="2" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<cond msgId="113" addName="1">
 			<player flyMounted="true" />
 		</cond>
@@ -1129,18 +1131,24 @@
 		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="941" levels="1" name="Special Motion">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
-		<set name="effectRange" val="1200" />
+		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill_transform_s_attack" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="942" levels="1" name="Special Motion">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill_transform_s_attack" />
 		<set name="magicLvl" val="80" />
@@ -1149,26 +1157,32 @@
 		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="943" levels="1" name="Special Motion">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
-		<set name="effectRange" val="1200" />
+		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill_transform_s_attack" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="944" levels="1" name="Special Motion">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
-		<set name="effectRange" val="1200" />
+		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill_transform_s_attack" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="945" levels="1" name="Magician's Will">
 		<set name="icon" val="icon.skill0945" />
@@ -1630,18 +1644,21 @@
 		<set name="abnormalTime" val="20" />
 		<set name="abnormalType" val="STEALTH" />
 		<set name="abnormalVisualEffect" val="STEALTH" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="679" />
+		<set name="hitCancelTime" val="500" />
 		<set name="icon" val="icon.skill_transform_buff" />
 		<set name="magicLvl" val="1" />
-		<set name="mpConsume2" val="19" />
 		<set name="mpConsume1" val="5" />
+		<set name="mpConsume2" val="19" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="15000" />
-		<set name="rideState" val="NONE" />
 		<set name="reuseDelayLock" val="true" />
+		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="SilentMove">
+			<effect name="SilentMove" />
+			<effect name="Debuff">
 				<mul stat="runSpd" val="0.7" />
 			</effect>
 		</effects>
@@ -1668,16 +1685,18 @@
 		<set name="targetType" val="ONE" />
 	</skill>
 	<skill id="966" levels="1" name="Special Motion">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill_transform_s_attack" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="967" levels="1" name="Cursed Body">
 		<!-- Cursed body. Recovery is not possible. -->
@@ -2172,25 +2191,27 @@
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="TARGET_LOCK" />
 		<set name="affectLimit" val="10-0" />
-		<set name="affectRange" val="400" />
+		<set name="affectObject" val="NOT_FRIEND" />
+		<set name="affectScope" val="FAN" />
 		<set name="castRange" val="400" />
 		<set name="coolTime" val="200" />
 		<set name="effectPoint" val="-10330" />
 		<set name="effectRange" val="900" />
 		<set name="fanRange" val="0,0,400,60" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill0985" />
 		<set name="isDebuff" val="true" />
 		<set name="magicLvl" val="83" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="45000" />
-		<set name="rideState" val="NONE" />
 		<set name="reuseDelayLock" val="true" />
+		<set name="rideState" val="NONE" />
 		<set name="targetType" val="FRONT_AREA" />
 		<set name="trait" val="DERANGEMENT" />
 		<effects>
-			<effect name="TargetMe" />
 			<effect name="GetAgro" />
+			<effect name="TargetMe" />
 		</effects>
 		<selfEffects>
 			<effect name="CallSkill">
diff --git a/src/main/resources/data/stats/skills/01000-01099.xml b/src/main/resources/data/stats/skills/01000-01099.xml
index 93b5e51678..3b1c7cf4e9 100644
--- a/src/main/resources/data/stats/skills/01000-01099.xml
+++ b/src/main/resources/data/stats/skills/01000-01099.xml
@@ -332,37 +332,40 @@
 		</effects>
 	</skill>
 	<skill id="1010" levels="3" name="Soul Shield" enchantGroup1="1" enchantGroup2="1">
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#effectPoints"> 121 243 331 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
+		<table name="#effectPoint"> 121 243 331 </table>
 		<table name="#magicLvl"> 7 25 35 </table>
-		<table name="#mpConsume2"> 8 18 24 </table>
 		<table name="#mpConsume1"> 2 5 6 </table>
+		<table name="#mpConsume2"> 8 18 24 </table>
 		<table name="#pDef"> 1.08 1.12 1.15 </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"> 23 23 22 22 22 21 21 20 20 20 19 19 18 18 18 17 17 16 16 16 15 15 14 14 14 13 13 12 12 12 </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"> 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="#ench2MpConsume2"> 23 23 22 22 22 21 21 20 20 20 19 19 18 18 18 17 17 16 16 16 15 15 14 14 14 13 13 12 12 12 </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="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="PD_UP" />
+		<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="2500" />
 		<set name="icon" val="icon.skill1010" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
-		<enchant1 name="abnormalTime" val="#ench1AbnormalTimes" />
+		<set name="targetType" val="TARGET" />
+		<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">
 				<mul stat="pDef" val="#pDef" />
@@ -370,48 +373,55 @@
 		</effects>
 	</skill>
 	<skill id="1011" levels="18" name="Heal">
-		<table name="#effectPoints"> 50 58 67 83 95 107 121 135 151 176 185 195 224 234 245 278 289 301 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> 50 58 67 83 95 107 121 135 151 176 185 195 224 234 245 278 289 301 </table>
+		<table name="#healPower"> 50 58 67 83 95 107 121 135 151 176 185 195 224 234 245 278 289 301 </table>
 		<table name="#magicLvl"> 3 5 7 10 12 14 16 18 20 23 24 25 28 29 30 33 34 35 </table>
-		<table name="#mpConsume2"> 8 10 11 13 15 17 19 21 24 26 28 29 33 35 35 38 40 41 </table>
 		<table name="#mpConsume1"> 2 3 3 4 4 5 5 6 6 7 7 8 9 9 9 10 10 11 </table>
+		<table name="#mpConsume2"> 8 10 11 13 15 17 19 21 24 26 28 29 33 35 35 38 40 41 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="5000" />
 		<set name="icon" val="icon.skill1011" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="3000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
-				<param power="#effectPoints" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="1012" levels="3" name="Cure Poison">
+		<!-- High Five Confirmed -->
 		<table name="#dispelAbnormals"> POISON,3 POISON,7 POISON,9 </table>
-		<table name="#effectPoints"> 121 331 566 </table>
+		<table name="#effectPoint"> 121 331 566 </table>
 		<table name="#magicLvl"> 7 35 58 </table>
-		<table name="#mpConsume2"> 8 24 44 </table>
 		<table name="#mpConsume1"> 2 6 11 </table>
+		<table name="#mpConsume2"> 8 24 44 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1012" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="4000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelBySlot">
 				<param dispel="#dispelAbnormals" />
@@ -419,28 +429,31 @@
 		</effects>
 	</skill>
 	<skill id="1013" levels="32" name="Recharge" enchantGroup1="2" enchantGroup2="2">
-		<table name="#amount"> 49 52 57 60 66 70 73 77 81 86 90 94 98 102 104 106 108 110 113 115 116 118 120 122 124 126 128 129 131 133 134 136 </table>
-		<table name="#effectPoints"> 268 285 313 331 360 379 399 418 438 457 477 495 514 532 541 549 558 566 574 582 590 597 604 611 617 624 630 635 641 646 650 655 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> 268 285 313 331 360 379 399 418 438 457 477 495 514 532 541 549 558 566 574 582 590 597 604 611 617 624 630 635 641 646 650 655 </table>
 		<table name="#magicLvl"> 28 30 33 35 38 40 42 44 46 48 50 52 54 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 </table>
-		<table name="#mpConsume2"> 39 42 45 48 53 56 59 62 65 69 72 75 78 82 83 85 87 88 90 92 93 95 96 98 99 101 102 104 105 106 108 109 </table>
+		<table name="#manaHealByLevelPower"> 49 52 57 60 66 70 73 77 81 86 90 94 98 102 104 106 108 110 113 115 116 118 120 122 124 126 128 129 131 133 134 136 </table>
 		<table name="#mpConsume1"> 10 11 12 12 14 14 15 16 17 18 18 19 20 21 21 22 22 22 23 23 24 24 24 25 25 26 26 26 27 27 27 28 </table>
+		<table name="#mpConsume2"> 39 42 45 48 53 56 59 62 65 69 72 75 78 82 83 85 87 88 90 92 93 95 96 98 99 101 102 104 105 106 108 109 </table>
 		<table name="#ench1amount"> 137 137 138 139 139 140 141 141 142 143 143 144 145 146 146 147 148 148 149 150 150 151 152 152 153 154 154 155 156 156 </table>
 		<table name="#ench2MpConsume2"> 108 107 106 105 104 103 102 100 99 98 97 96 95 94 93 92 91 90 89 88 87 86 85 84 83 82 81 80 79 78 </table>
 		<table name="#ench2MpConsume1"> 27 26 26 26 26 25 25 25 24 24 24 24 23 23 23 23 22 22 22 22 21 21 21 21 20 20 20 20 19 19 </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="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="6000" />
 		<set name="icon" val="icon.skill1013" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="3000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="mpConsume2" val="#ench2MpConsume2" />
@@ -452,7 +465,7 @@
 		</cond>
 		<effects>
 			<effect name="ManaHealByLevel">
-				<param power="#amount" />
+				<param power="#manaHealByLevelPower" />
 			</effect>
 		</effects>
 		<enchant1Effects>
@@ -462,27 +475,30 @@
 		</enchant1Effects>
 	</skill>
 	<skill id="1015" levels="15" name="Battle Heal">
-		<table name="#amount"> 83 95 107 121 135 151 176 185 195 224 234 245 278 289 301 </table>
-		<table name="#effectPoints"> 66 76 86 97 108 121 141 148 156 179 188 196 222 231 241 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> 66 76 86 97 108 121 141 148 156 179 188 196 222 231 241 </table>
+		<table name="#healPower"> 83 95 107 121 135 151 176 185 195 224 234 245 278 289 301 </table>
 		<table name="#magicLvl"> 10 12 14 16 18 20 23 24 25 28 29 30 33 34 35 </table>
-		<table name="#mpConsume2"> 20 22 25 28 32 35 39 41 43 49 52 53 57 59 62 </table>
 		<table name="#mpConsume1"> 5 6 7 7 8 9 10 11 11 13 13 14 15 15 16 </table>
+		<table name="#mpConsume2"> 20 22 25 28 32 35 39 41 43 49 52 53 57 59 62 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill1015" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
-				<param power="#amount" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 	</skill>
@@ -517,69 +533,74 @@
 	</skill>
 	<skill id="1018" levels="3" name="Purify">
 		<!-- High Five Confirmed -->
-		<table name="#dispelAbnormals"> POISON,3;BLEEDING,3;PARALYZE,1 POISON,7;BLEEDING,7;PARALYZE,1;TURN_STONE,1 POISON,9;BLEEDING,9;PARALYZE,1;TURN_STONE,1 </table>
-		<table name="#effectPoints"> 418 495 566 </table>
+		<table name="#dispelAbnormal"> POISON,3;BLEEDING,3;PARALYZE,1 POISON,7;BLEEDING,7;PARALYZE,1;TURN_STONE,1 POISON,9;BLEEDING,9;PARALYZE,1;TURN_STONE,1 </table>
+		<table name="#effectPoint"> 418 495 566 </table>
 		<table name="#magicLvl"> 44 52 62 </table>
-		<table name="#mpConsume2"> 31 38 44 </table>
 		<table name="#mpConsume1"> 8 10 11 </table>
+		<table name="#mpConsume2"> 31 38 44 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill1018" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="4000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelBySlot">
-				<param dispel="#dispelAbnormals" />
+				<param dispel="#dispelAbnormal" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="1020" levels="27" name="Vitalize" enchantGroup1="2" enchantGroup2="2">
-		<table name="#amount"> 440 454 467 494 508 521 548 562 575 588 602 615 627 640 653 665 677 689 700 711 722 733 743 753 763 772 780 </table>
-		<table name="#dispelAbnormals"> POISON,3;BLEEDING,3 POISON,3;BLEEDING,3 POISON,3;BLEEDING,3 POISON,3;BLEEDING,3 POISON,3;BLEEDING,3 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,9;BLEEDING,9 POISON,9;BLEEDING,9 POISON,9;BLEEDING,9 POISON,9;BLEEDING,9 POISON,9;BLEEDING,9 POISON,9;BLEEDING,9 POISON,9;BLEEDING,9 POISON,9;BLEEDING,9 POISON,9;BLEEDING,9 </table>
-		<table name="#effectPoints"> 528 544 561 593 609 626 658 674 690 706 722 737 753 768 783 798 812 826 840 854 867 879 892 904 915 926 936 </table>
+		<!-- High Five Confirmed -->
+		<table name="#dispelAbnormal"> POISON,3;BLEEDING,3 POISON,3;BLEEDING,3 POISON,3;BLEEDING,3 POISON,3;BLEEDING,3 POISON,3;BLEEDING,3 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,7;BLEEDING,7 POISON,9;BLEEDING,9 POISON,9;BLEEDING,9 POISON,9;BLEEDING,9 POISON,9;BLEEDING,9 POISON,9;BLEEDING,9 POISON,9;BLEEDING,9 POISON,9;BLEEDING,9 POISON,9;BLEEDING,9 POISON,9;BLEEDING,9 </table>
+		<table name="#effectPoint"> 528 544 561 593 609 626 658 674 690 706 722 737 753 768 783 798 812 826 840 854 867 879 892 904 915 926 936 </table>
+		<table name="#healPower"> 440 454 467 494 508 521 549 562 575 589 602 615 628 640 653 665 677 689 700 711 722 733 743 753 763 772 780 </table>
 		<table name="#magicLvl"> 46 47 48 50 51 52 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"> 69 71 73 77 77 79 83 85 87 89 91 93 94 94 96 98 99 101 103 105 106 108 109 111 112 113 115 </table>
 		<table name="#mpConsume1"> 18 18 19 20 20 20 21 22 22 23 23 24 24 24 24 25 25 26 26 27 27 27 28 28 28 29 29 </table>
-		<table name="#ench1amount"> 785 789 794 798 803 807 812 816 821 825 829 834 838 843 847 852 856 861 865 870 874 879 883 887 892 896 901 905 910 914 </table>
-		<table name="#ench2MpConsume2"> 113 112 111 110 109 108 107 106 105 104 103 102 101 100 99 98 97 96 95 94 93 92 91 90 89 88 87 86 85 84 </table>
-		<table name="#ench2MpConsume1"> 28 28 27 27 27 27 26 26 26 26 25 25 25 25 24 24 24 24 23 23 23 23 22 22 22 22 21 21 21 21 </table>
+		<table name="#mpConsume2"> 69 71 73 77 77 79 83 85 87 89 91 93 94 94 96 98 99 101 103 105 106 108 109 111 112 113 115 </table>
+		<table name="#ench1HealPower"> 785 789 794 798 803 807 812 816 821 825 829 834 838 843 847 852 856 861 865 870 874 879 883 887 892 896 901 905 910 914 </table>
+		<table name="#ench2MpConsume1"> 28 27 27 26 26 25 25 24 24 23 23 22 22 21 21 20 20 20 19 19 18 18 17 17 16 16 15 15 14 14 </table>
+		<table name="#ench2MpConsume2"> 113 111 109 107 105 103 101 99 97 95 93 91 89 87 85 83 82 80 78 76 74 72 70 68 66 64 62 60 58 56 </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="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill1020" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="3000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<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="Heal">
-				<param power="#amount" />
-			</effect>
 			<effect name="DispelBySlot">
-				<param dispel="#dispelAbnormals" />
+				<param dispel="#dispelAbnormal" />
+			</effect>
+			<effect name="Heal">
+				<param power="#healPower" />
 			</effect>
 		</effects>
 		<enchant1Effects>
 			<effect name="Heal">
-				<param power="#ench1amount" />
+				<param power="#ench1HealPower" />
 			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="POISON,9;BLEEDING,9" />
@@ -694,78 +715,85 @@
 		</effects>
 	</skill>
 	<skill id="1032" levels="3" name="Invigor" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1">
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#effectPoints"> 379 457 532 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
+		<table name="#defenceTraitPower"> 30 40 50 </table>
+		<table name="#effectPoint"> 379 457 532 </table>
 		<table name="#magicLvl"> 40 48 56 </table>
-		<table name="#mpConsume2"> 28 35 41 </table>
 		<table name="#mpConsume1"> 7 9 11 </table>
-		<table name="#trait_bleed"> 30 40 50 </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"> 40 39 38 38 37 36 36 35 34 34 33 32 32 31 30 30 29 28 28 27 26 25 25 24 23 23 22 21 21 20 </table>
+		<table name="#mpConsume2"> 28 35 41 </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"> 10 10 10 10 10 9 9 9 9 9 8 8 8 8 8 8 7 7 7 7 7 6 6 6 6 6 6 5 5 5 </table>
-		<table name="#ench3abnormalLvl"> 3 3 3 3 3 3 3 3 3 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5 5 6 </table>
-		<table name="#ench3Trait_bleed"> 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 </table>
+		<table name="#ench2MpConsume2"> 40 39 38 38 37 36 36 35 34 34 33 32 32 31 30 30 29 28 28 27 26 25 25 24 23 23 22 21 21 20 </table>
+		<table name="#ench3AbnormalLvl"> 3 3 3 3 3 3 3 3 3 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5 5 6 </table>
+		<table name="#ench3TraitBleed"> 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 </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="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="RESIST_BLEEDING" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1032" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<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="ONE" />
-		<enchant1 name="abnormalTime" val="#ench1AbnormalTimes" />
+		<set name="targetType" val="TARGET" />
+		<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="DefenceTrait">
-				<param BLEED="#trait_bleed" />
+				<param BLEED="#defenceTraitPower" />
 			</effect>
 		</effects>
 		<enchant3Effects>
 			<effect name="DefenceTrait">
-				<param BLEED="#ench3Trait_bleed" />
+				<param BLEED="#ench3TraitBleed" />
 			</effect>
 		</enchant3Effects>
 	</skill>
 	<skill id="1033" levels="3" name="Resist Poison" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1">
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#effectPoints"> 331 379 418 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
+		<table name="#defenceTraitPower"> 30 40 50 </table>
+		<table name="#effectPoint"> 331 379 418 </table>
 		<table name="#magicLvl"> 35 40 44 </table>
-		<table name="#mpConsume2"> 24 28 31 </table>
 		<table name="#mpConsume1"> 6 7 8 </table>
-		<table name="#trait_poison"> 30 40 50 </table>
+		<table name="#mpConsume2"> 24 28 31 </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"> 30 29 29 28 28 27 27 26 26 25 25 24 24 23 23 22 22 21 21 20 20 19 19 18 18 17 17 16 16 15 </table>
 		<table name="#ench2MpConsume1"> 7 7 7 7 7 7 7 6 6 6 6 6 6 6 6 5 5 5 5 5 5 5 4 4 4 4 4 4 4 4 </table>
 		<table name="#ench3abnormalLvl"> 3 3 3 3 3 3 3 3 3 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5 5 6 </table>
-		<table name="#ench3Trait_poison"> 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 </table>
+		<table name="#ench3TraitPoison"> 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 </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="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="RESIST_POISON" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1033" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="ONE" />
+		<set name="targetType" val="TARGET" />
 		<enchant1 name="abnormalTime" val="#ench1AbnormalTimes" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
@@ -774,12 +802,12 @@
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
 		<effects>
 			<effect name="DefenceTrait">
-				<param POISON="#trait_poison" />
+				<param POISON="#defenceTraitPower" />
 			</effect>
 		</effects>
 		<enchant3Effects>
 			<effect name="DefenceTrait">
-				<param POISON="#ench3Trait_poison" />
+				<param POISON="#ench3TraitPoison" />
 			</effect>
 		</enchant3Effects>
 	</skill>
@@ -820,42 +848,45 @@
 		</enchant1Effects>
 	</skill>
 	<skill id="1035" levels="4" name="Mental Shield" enchantGroup1="1" enchantGroup2="1">
-		<table name="#abnormalLvls"> 1 2 3 4 </table>
-		<table name="#effectPoints"> 243 379 457 532 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 </table>
+		<table name="#defenceTraitPower"> 20 30 40 50 </table>
+		<table name="#effectPoint"> 243 379 457 532 </table>
 		<table name="#magicLvl"> 25 40 48 56 </table>
-		<table name="#mpConsume2"> 18 28 35 41 </table>
 		<table name="#mpConsume1"> 5 7 9 11 </table>
-		<table name="#traits"> 20 30 40 50 </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"> 40 39 38 38 37 36 36 35 34 34 33 32 32 31 30 30 29 28 28 27 26 25 25 24 23 23 22 21 21 20 </table>
+		<table name="#mpConsume2"> 18 28 35 41 </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"> 10 10 10 10 10 9 9 9 9 9 8 8 8 8 8 8 7 7 7 7 7 6 6 6 6 6 6 5 5 5 </table>
+		<table name="#ench2MpConsume2"> 40 39 38 38 37 36 36 35 34 34 33 32 32 31 30 30 29 28 28 27 26 25 25 24 23 23 22 21 21 20 </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="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="RESIST_DERANGEMENT" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1035" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="ONE" />
-		<enchant1 name="abnormalTime" val="#ench1AbnormalTimes" />
+		<set name="targetType" val="TARGET" />
+		<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="DefenceTrait">
-				<param HOLD="#traits" />
-				<param SLEEP="#traits" />
-				<param DERANGEMENT="#traits" />
+				<param HOLD="#defenceTraitPower" />
+				<param SLEEP="#defenceTraitPower" />
+				<param DERANGEMENT="#defenceTraitPower" />
 			</effect>
 		</effects>
 	</skill>
@@ -898,32 +929,35 @@
 		</effects>
 	</skill>
 	<skill id="1040" levels="3" name="Shield" enchantGroup1="1" enchantGroup2="1">
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#effectPoints"> 121 243 418 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
+		<table name="#effectPoint"> 121 243 418 </table>
 		<table name="#magicLvl"> 7 25 44 </table>
-		<table name="#mpConsume2"> 8 18 31 </table>
 		<table name="#mpConsume1"> 2 5 8 </table>
-		<table name="#rate"> 1.08 1.12 1.15 </table>
+		<table name="#mpConsume2"> 8 18 31 </table>
+		<table name="#pDef"> 1.08 1.12 1.15 </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"> 30 29 29 28 28 27 27 26 26 25 25 24 24 23 23 22 22 21 21 20 20 19 19 18 18 17 17 16 16 15 </table>
 		<table name="#ench2MpConsume1"> 7 7 7 7 7 7 7 6 6 6 6 6 6 6 6 5 5 5 5 5 5 5 4 4 4 4 4 4 4 4 </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="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="PD_UP" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1040" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="ONE" />
+		<set name="targetType" val="TARGET" />
 		<enchant1 name="abnormalTime" val="#ench1AbnormalTimes" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
@@ -931,7 +965,7 @@
 		<enchant2 name="mpConsume1" val="#ench2MpConsume1" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="pDef" val="#rate" />
+				<mul stat="pDef" val="#pDef" />
 			</effect>
 		</effects>
 	</skill>
@@ -1020,40 +1054,43 @@
 		</effects>
 	</skill>
 	<skill id="1044" levels="3" name="Regeneration" enchantGroup1="1" enchantGroup2="1">
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#effectPoints"> 331 457 532 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
+		<table name="#effectPoint"> 331 457 532 </table>
 		<table name="#magicLvl"> 35 48 56 </table>
-		<table name="#mpConsume2"> 24 35 41 </table>
 		<table name="#mpConsume1"> 6 9 11 </table>
-		<table name="#rate"> 1.1 1.15 1.2 </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="#mpConsume2"> 24 35 41 </table>
+		<table name="#regHp"> 1.1 1.15 1.2 </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="#ench2MpConsume2"> 40 39 38 38 37 36 36 35 34 34 33 32 32 31 30 30 29 28 28 27 26 25 25 24 23 23 22 21 21 20 </table>
 		<table name="#ench2MpConsume1"> 10 10 10 10 10 9 9 9 9 9 8 8 8 8 8 8 7 7 7 7 7 6 6 6 6 6 6 5 5 5 </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="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="HP_REGEN_UP" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1044" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="ONE" />
-		<enchant1 name="abnormalTime" val="#ench1AbnormalTimes" />
+		<set name="targetType" val="TARGET" />
+		<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">
-				<mul stat="regHp" val="#rate" />
+				<mul stat="regHp" val="#regHp" />
 			</effect>
 		</effects>
 	</skill>
@@ -1262,37 +1299,40 @@
 		</effects>
 	</skill>
 	<skill id="1059" levels="3" name="Empower" enchantGroup1="1" enchantGroup2="1">
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#effectPoints"> 243 418 495 </table>
-		<table name="#magicLvl"> 25 44 52 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
+		<table name="#effectPoint"> 243 418 495 </table>
 		<table name="#mAtk"> 1.55 1.65 1.75 </table>
-		<table name="#mpConsume2"> 18 31 38 </table>
+		<table name="#magicLvl"> 25 44 52 </table>
 		<table name="#mpConsume1"> 5 8 10 </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="#mpConsume2"> 18 31 38 </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="#ench2MpConsume2"> 37 36 36 35 34 34 33 32 32 31 31 30 29 29 28 27 27 26 25 25 24 24 23 22 22 21 20 20 19 19 </table>
 		<table name="#ench2MpConsume1"> 9 9 9 9 9 9 8 8 8 8 8 8 7 7 7 7 7 7 6 6 6 6 6 6 5 5 5 5 5 5 </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="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="MA_UP" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1059" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="ONE" />
-		<enchant1 name="abnormalTime" val="#ench1AbnormalTimes" />
+		<set name="targetType" val="TARGET" />
+		<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">
 				<mul stat="mAtk" val="#mAtk" />
@@ -1300,54 +1340,74 @@
 		</effects>
 	</skill>
 	<skill id="1062" levels="2" name="Berserker Spirit" enchantGroup1="1" enchantGroup2="1">
-		<table name="#abnormalLvls"> 1 2 </table>
-		<table name="#effectPoints"> 331 495 </table>
-		<table name="#magicLvl"> 35 52 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 </table>
+		<table name="#effectPoint"> 331 495 </table>
 		<table name="#mAtk"> 1.1 1.16 </table>
 		<table name="#mAtkSpd"> 1.05 1.08 </table>
 		<table name="#mDef"> 0.9 0.84 </table>
-		<table name="#mpConsume2"> 24 38 </table>
+		<table name="#magicLvl"> 35 52 </table>
 		<table name="#mpConsume1"> 6 10 </table>
+		<table name="#mpConsume2"> 24 38 </table>
 		<table name="#pAtk"> 1.05 1.08 </table>
 		<table name="#pAtkSpd"> 1.05 1.08 </table>
 		<table name="#pDef"> 0.95 0.92 </table>
 		<table name="#rEvas"> 2 4 </table>
 		<table name="#runSpd"> 5 8 </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"> 37 36 36 35 34 34 33 32 32 31 31 30 29 29 28 27 27 26 25 25 24 24 23 22 22 21 20 20 19 19 </table>
 		<table name="#ench2MpConsume1"> 9 9 9 9 9 9 8 8 8 8 8 8 7 7 7 7 7 7 6 6 6 6 6 6 5 5 5 5 5 5 </table>
+		<table name="#ench2MpConsume2"> 37 36 36 35 34 34 33 32 32 31 31 30 29 29 28 27 27 26 25 25 24 24 23 22 22 21 20 20 19 19 </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="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="BERSERKER" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1062" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="PARTY_MEMBER" />
+		<set name="targetType" val="TARGET" />
 		<enchant1 name="abnormalTime" val="#ench1AbnormalTimes" />
 		<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" />
+		<cond msgId="113" addName="1">
+			<target myParty="INCLUDE_ME" />
+		</cond>
 		<effects>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="#pAtkSpd" />
+			</effect>
+			<effect name="Buff">
+				<sub stat="rEvas" val="#rEvas" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="#mAtkSpd" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtk" val="#mAtk" />
-				<mul stat="pAtk" val="#pAtk" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="mDef" val="#mDef" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="#pAtk" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="pDef" val="#pDef" />
-				<mul stat="mAtkSpd" val="#mAtkSpd" />
-				<mul stat="pAtkSpd" val="#pAtkSpd" />
+			</effect>
+			<effect name="Buff">
 				<add stat="runSpd" val="#runSpd" />
-				<sub stat="rEvas" val="#rEvas" />
 			</effect>
 		</effects>
 	</skill>
@@ -1395,40 +1455,43 @@
 		</effects>
 	</skill>
 	<skill id="1068" levels="3" name="Might" enchantGroup1="1" enchantGroup2="1">
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#effectPoints"> 121 204 379 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
+		<table name="#effectPoint"> 121 204 379 </table>
 		<table name="#magicLvl"> 7 20 40 </table>
-		<table name="#mpConsume2"> 8 16 28 </table>
 		<table name="#mpConsume1"> 2 4 7 </table>
-		<table name="#rate"> 1.08 1.12 1.15 </table>
+		<table name="#mpConsume2"> 8 16 28 </table>
+		<table name="#pAtk"> 1.08 1.12 1.15 </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"> 27 27 26 26 25 25 24 24 23 23 22 22 21 21 21 20 20 19 19 18 18 17 17 16 16 15 15 14 14 14 </table>
 		<table name="#ench2MpConsume1"> 6 6 6 6 6 6 6 6 5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 4 4 3 3 3 3 3 </table>
+		<table name="#ench2MpConsume2"> 27 27 26 26 25 25 24 24 23 23 22 22 21 21 21 20 20 19 19 18 18 17 17 16 16 15 15 14 14 14 </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="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="PA_UP" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1068" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="ONE" />
+		<set name="targetType" val="TARGET" />
 		<enchant1 name="abnormalTime" val="#ench1AbnormalTimes" />
 		<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">
-				<mul stat="pAtk" val="#rate" />
+				<mul stat="pAtk" val="#pAtk" />
 			</effect>
 		</effects>
 	</skill>
@@ -1694,71 +1757,81 @@
 		</effects>
 	</skill>
 	<skill id="1077" levels="3" name="Focus" enchantGroup1="1" enchantGroup2="1">
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#effectPoints"> 243 418 495 </table>
-		<table name="#mpConsume2"> 18 31 38 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
+		<table name="#critRate"> 1.2 1.25 1.3 </table>
+		<table name="#effectPoint"> 243 418 495 </table>
+		<table name="#magicLvl"> 25 44 52 </table>
 		<table name="#mpConsume1"> 5 8 10 </table>
-		<table name="#rCrit"> 1.2 1.25 1.3 </table>
+		<table name="#mpConsume2"> 18 31 38 </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"> 37 36 36 35 34 34 33 32 32 31 31 30 29 29 28 27 27 26 25 25 24 24 23 22 22 21 20 20 19 19 </table>
 		<table name="#ench2MpConsume1"> 9 9 9 9 9 9 8 8 8 8 8 8 7 7 7 7 7 7 6 6 6 6 6 6 5 5 5 5 5 5 </table>
+		<table name="#ench2MpConsume2"> 37 36 36 35 34 34 33 32 32 31 31 30 29 29 28 27 27 26 25 25 24 24 23 22 22 21 20 20 19 19 </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="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="CRITICAL_PROB_UP" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1077" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="mpConsume2" val="#mpConsume2" />
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="#magicLvl" />
 		<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="ONE" />
+		<set name="targetType" val="TARGET" />
 		<enchant1 name="abnormalTime" val="#ench1AbnormalTimes" />
 		<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">
-				<mul stat="critRate" val="#rCrit" />
+				<mul stat="critRate" val="#critRate" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="1078" levels="6" name="Concentration" enchantGroup1="1" enchantGroup2="1">
-		<table name="#abnormalLvls"> 1 2 3 4 5 6 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 </table>
 		<table name="#cancel"> 18 25 36 42 48 53 </table>
-		<table name="#effectPoints"> 204 285 418 495 566 624 </table>
-		<table name="#mpConsume2"> 16 21 31 38 44 51 </table>
+		<table name="#effectPoint"> 204 285 418 495 566 624 </table>
+		<table name="#magicLvl"> 20 30 44 52 60 68 </table>
 		<table name="#mpConsume1"> 4 6 8 10 11 13 </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"> 51 50 49 48 47 46 45 45 44 43 42 41 40 39 39 38 37 36 35 34 33 32 32 31 31 30 29 28 27 26 </table>
-		<table name="#ench2MpConsume1"> 12 12 12 12 11 11 11 11 11 10 10 10 10 9 9 9 9 9 8 8 8 8 8 7 7 7 7 7 6 6 </table>
+		<table name="#mpConsume2"> 16 21 31 38 44 51 </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"> 12 12 12 12 11 11 11 11 11 10 10 10 10 9 9 9 9 9 8 8 8 8 8 7 7 7 7 6 6 6 </table>
+		<table name="#ench2MpConsume2"> 50 49 48 47 46 45 45 44 43 42 41 40 39 39 38 37 36 35 34 34 33 32 31 30 29 28 28 27 26 25 </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="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="CANCEL_PROB_DOWN" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1078" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="mpConsume2" val="#mpConsume2" />
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="#magicLvl" />
 		<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="ONE" />
-		<enchant1 name="abnormalTime" val="#ench1AbnormalTimes" />
+		<set name="targetType" val="TARGET" />
+		<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">
 				<sub stat="cancel" val="#cancel" />
diff --git a/src/main/resources/data/stats/skills/01400-01499.xml b/src/main/resources/data/stats/skills/01400-01499.xml
index bf58ee1da6..702bb46afc 100644
--- a/src/main/resources/data/stats/skills/01400-01499.xml
+++ b/src/main/resources/data/stats/skills/01400-01499.xml
@@ -82,38 +82,40 @@
 		</enchant3Effects>
 	</skill>
 	<skill id="1401" levels="11" name="Major Heal" enchantGroup1="2" enchantGroup2="2">
-		<!-- Confirmed CT2.5 -->
-		<table name="#amount"> 690 722 753 783 812 840 867 892 915 936 946 </table>
-		<table name="#effectPoints"> 403 421 439 457 474 490 506 520 534 546 546 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> 403 421 439 457 474 490 506 520 534 546 546 </table>
+		<table name="#healPower"> 690 722 753 783 812 840 867 892 915 936 946 </table>
 		<table name="#magicLvl"> 56 58 60 62 64 66 68 70 72 74 75 </table>
-		<table name="#mpConsume2"> 48 51 52 53 55 57 59 61 62 64 64 </table>
 		<table name="#mpConsume1"> 12 13 13 14 14 15 15 16 16 16 16 </table>
+		<table name="#mpConsume2"> 48 51 52 53 55 57 59 61 62 64 64 </table>
 		<table name="#ench1amount"> 958 972 985 999 1012 1026 1039 1053 1067 1080 1094 1107 1121 1134 1148 1162 1175 1189 1202 1216 1229 1243 1257 1270 1284 1297 1311 1324 1338 1352 </table>
-		<table name="#ench2MpConsume2"> 62 61 60 59 58 57 56 55 54 53 52 51 50 49 48 46 45 44 43 42 41 40 39 38 37 36 35 34 33 32 </table>
 		<table name="#ench2MpConsume1"> 15 15 15 14 14 14 14 13 13 13 13 12 12 12 12 11 11 11 10 10 10 10 9 9 9 9 8 8 8 8 </table>
+		<table name="#ench2MpConsume2"> 62 61 60 59 58 57 56 55 54 53 52 51 50 49 48 46 45 44 43 42 41 40 39 38 37 36 35 34 33 32 </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="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="5000" />
 		<set name="icon" val="icon.skill1401" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="3031" /> <!-- Spirit Ore -->
 		<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="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<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="Heal">
-				<param power="#amount" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 		<enchant1Effects>
@@ -198,7 +200,7 @@
 		<set name="targetType" val="ONE" />
 		<cond>
 			<and>
-				<target myPartyExceptMe="true" />
+				<target myParty="EXCEPT_ME" />
 				<player callPc="true" />
 			</and>
 		</cond>
@@ -232,7 +234,7 @@
 		<set name="targetType" val="ONE" />
 		<cond>
 			<and>
-				<target myPartyExceptMe="true" />
+				<target myParty="EXCEPT_ME" />
 				<player callPc="true" />
 			</and>
 		</cond>
@@ -373,21 +375,24 @@
 		</enchant1Effects>
 	</skill>
 	<skill id="1409" levels="1" name="Cleanse">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1409" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="8874" /> <!-- Einhasad's Holy Water -->
 		<set name="magicLvl" val="78" />
-		<set name="mpConsume2" val="46" />
 		<set name="mpConsume1" val="12" />
+		<set name="mpConsume2" val="46" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelByCategory">
 				<param slot="DEBUFF" rate="100" max="10" />
@@ -395,26 +400,28 @@
 		</effects>
 	</skill>
 	<skill id="1410" levels="1" name="Salvation">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="RESURRECTION_SPECIAL" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1410" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="itemConsumeCount" val="2" />
 		<set name="itemConsumeId" val="8874" /> <!-- Einhasad's Holy Water -->
 		<set name="magicLvl" val="79" />
-		<set name="mpConsume2" val="69" />
 		<set name="mpConsume1" val="18" />
+		<set name="mpConsume2" val="69" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="3600000" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="reuseDelayLock" val="true" />
-		<set name="targetType" val="ONE" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="ResurrectionSpecial">
 				<param resPower="100" />
@@ -423,21 +430,28 @@
 		</effects>
 	</skill>
 	<skill id="1411" levels="1" name="Mystic Immunity">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="30" />
 		<set name="abnormalType" val="ABNORMAL_INVINCIBILITY" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1411" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="79" />
-		<set name="mpConsume2" val="73" />
+		<set name="mpConsume1" val="15" />
+		<set name="mpConsume2" val="58" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="150000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="PARTY_MEMBER" />
+		<set name="targetType" val="TARGET" />
+		<cond msgId="113" addName="1">
+			<target myParty="INCLUDE_ME" />
+		</cond>
 		<effects>
 			<effect name="BlockDebuff" />
 		</effects>
@@ -704,33 +718,37 @@
 		</enchant2Effects>
 	</skill>
 	<skill id="1418" levels="1" name="Celestial Shield">
+		<!-- 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="castRange" val="400" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1418" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="64" />
-		<set name="mpConsume2" val="60" />
+		<set name="mpConsume1" val="12" />
+		<set name="mpConsume2" val="48" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="600000" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="reuseDelayLock" val="true" />
-		<set name="targetType" val="ONE" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="BlockDebuff" />
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
-			<effect name="BlockDebuff" />
 			<effect name="Buff">
-				<sub stat="cancelVuln" val="100" />
+				<mul stat="cancelVuln" val="0" />
 			</effect>
 		</effects>
 	</skill>
@@ -964,10 +982,10 @@
 		<set name="targetType" val="PARTY_CLAN" />
 		<effects>
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockDebuff" />
 			<effect name="Buff">
@@ -1546,77 +1564,88 @@
 		</effects>
 	</skill>
 	<skill id="1442" levels="3" name="Protection from Darkness" enchantGroup1="1" enchantGroup2="1">
-		<!-- Confirmed CT2.5 -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#effectPoints"> 549 611 655 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
+		<table name="#darkResPower"> 15 23 30 </table>
+		<table name="#effectPoint"> 549 611 655 </table>
 		<table name="#magicLvl"> 58 66 74 </table>
-		<table name="#mpConsume2"> 43 49 55 </table>
 		<table name="#mpConsume1"> 11 13 14 </table>
-		<table name="#vuln"> 15 23 30 </table>
-		<table name="#ench1vuln"> 34 38 42 46 50 54 58 62 66 70 74 78 82 86 90 94 98 102 106 110 114 118 122 126 130 134 138 142 146 150 </table>
-		<table name="#ench2AbnormalTimes"> 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="#ench2vuln"> 31 32 32 33 34 34 35 36 36 37 37 38 39 39 40 41 41 42 43 43 44 44 45 46 46 47 48 48 49 50 </table>
-		<table name="#enchabnormalLvl"> 3 3 3 3 3 3 3 3 3 3 3 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 </table>
+		<table name="#mpConsume2"> 43 49 55 </table>
+		<table name="#ench1DarkResPower"> 34 38 42 46 50 54 58 62 66 70 74 78 82 86 90 94 98 102 106 110 114 118 122 126 130 134 138 142 146 150 </table>
+		<table name="#ench1AbnormalLvl"> 3 3 3 3 3 3 3 3 3 3 3 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 </table>
+		<table name="#ench2AbnormalTime"> 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="#ench2DarkResPower"> 31 32 32 33 34 34 35 36 36 37 37 38 39 39 40 41 41 42 43 43 44 44 45 46 46 47 48 48 49 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>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="ARMOR_UNHOLY" />
+		<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="3000" />
 		<set name="icon" val="icon.skill1442" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="ONE" />
+		<set name="targetType" val="TARGET" />
+		<enchant1 name="abnormalLvl" val="#ench1AbnormalLvl" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
-		<enchant2 name="abnormalTime" val="#ench2AbnormalTimes" />
+		<enchant2 name="abnormalTime" val="#ench2AbnormalTime" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
+		<cond msgId="113" addName="1">
+			<target myParty="INCLUDE_ME" />
+		</cond>
 		<effects>
 			<effect name="Buff">
-				<add stat="darkRes" val="#vuln" />
+				<add stat="darkRes" val="#darkResPower" />
 			</effect>
 		</effects>
 		<enchant1Effects>
 			<effect name="Buff">
-				<add stat="darkRes" val="#ench1vuln" />
+				<add stat="darkRes" val="#ench1DarkResPower" />
 			</effect>
 		</enchant1Effects>
 		<enchant2Effects>
 			<effect name="Buff">
-				<add stat="darkRes" val="#ench2vuln" />
+				<add stat="darkRes" val="#ench2DarkResPower" />
 			</effect>
 		</enchant2Effects>
 	</skill>
 	<skill id="1443" levels="1" name="Dark Weapon" enchantGroup1="1" enchantGroup2="1">
-		<!-- Confirmed CT2.5 -->
-		<table name="#ench1Power"> 30 31 32 32 33 34 34 35 36 36 37 38 38 39 40 40 41 42 42 43 44 44 45 46 46 47 48 48 49 50 </table>
-		<table name="#ench2AbnormalTimes"> 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>
+		<!-- High Five Confirmed -->
+		<table name="#ench1DarkPower"> 30 31 32 32 33 34 34 35 36 36 37 38 38 39 40 40 41 42 42 43 44 44 45 46 46 47 48 48 49 50 </table>
+		<table name="#ench2AbnormalTime"> 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="#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="1200" />
 		<set name="abnormalType" val="HOLY_ATTACK" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="438" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill1443" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="46" />
-		<set name="mpConsume2" val="33" />
 		<set name="mpConsume1" val="9" />
+		<set name="mpConsume2" val="33" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="PARTY_MEMBER" />
+		<set name="targetType" val="TARGET" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
-		<enchant2 name="abnormalTime" val="#ench2AbnormalTimes" />
+		<enchant2 name="abnormalTime" val="#ench2AbnormalTime" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
+		<cond msgId="113" addName="1">
+			<target myParty="INCLUDE_ME" />
+		</cond>
 		<effects>
 			<effect name="Buff">
 				<add stat="darkPower" val="20" />
@@ -1624,7 +1653,7 @@
 		</effects>
 		<enchant1Effects>
 			<effect name="Buff">
-				<add stat="darkPower" val="#ench1Power" />
+				<add stat="darkPower" val="#ench1DarkPower" />
 			</effect>
 		</enchant1Effects>
 		<enchant2Effects>
@@ -1634,68 +1663,89 @@
 		</enchant2Effects>
 	</skill>
 	<skill id="1444" levels="1" name="Pride of Kamael" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1" enchantGroup4="1">
-		<!-- Confirmed CT2.5 -->
-		<table name="#ench4AbnormalTimes"> 186 192 198 204 210 216 222 228 234 240 246 252 258 264 270 276 282 288 294 300 306 312 318 324 330 336 342 348 354 360 </table>
-		<table name="#enchIncrease"> 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19 1.2 1.21 1.22 1.23 1.24 1.25 1.26 1.27 1.28 1.29 1.3 1.31 1.32 1.33 1.34 1.35 1.36 1.37 1.38 1.39 1.4 </table>
+		<!-- High Five Confirmed -->
+		<table name="#ench4AbnormalTime"> 186 192 198 204 210 216 222 228 234 240 246 252 258 264 270 276 282 288 294 300 306 312 318 324 330 336 342 348 354 360 </table>
+		<table name="#enchPower"> 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19 1.2 1.21 1.22 1.23 1.24 1.25 1.26 1.27 1.28 1.29 1.3 1.31 1.32 1.33 1.34 1.35 1.36 1.37 1.38 1.39 1.4 </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="180" />
 		<set name="abnormalType" val="KAMAEL_SPECIAL" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="669" />
 		<set name="effectRange" val="600" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill1444" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="49" />
-		<set name="mpConsume2" val="35" />
 		<set name="mpConsume1" val="9" />
+		<set name="mpConsume2" val="35" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="30000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="PARTY_MEMBER" />
+		<set name="targetType" val="TARGET" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
-		<enchant4 name="abnormalTime" val="#ench4AbnormalTimes" />
+		<enchant4 name="abnormalTime" val="#ench4AbnormalTime" />
 		<enchant4 name="magicLvl" val="#enchMagicLvl" />
 		<cond msgId="109">
-			<target race="KAMAEL" />
+			<and>
+				<target myParty="INCLUDE_ME" />
+				<target race="KAMAEL" />
+			</and>
 		</cond>
 		<effects>
+			<effect name="Buff">
+				<mul stat="blowRate" val="1.1" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.1" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.1">
 					<using kind="ANCIENTSWORD,CROSSBOW,RAPIER" />
 				</mul>
-				<mul stat="mAtk" val="1.1" />
-				<mul stat="blowRate" val="1.1" />
 			</effect>
 		</effects>
 		<enchant1Effects>
 			<effect name="Buff">
-				<mul stat="pAtk" val="#enchIncrease">
+				<mul stat="blowRate" val="1.1" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.1" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="#enchPower">
 					<using kind="ANCIENTSWORD,CROSSBOW,RAPIER" />
 				</mul>
-				<mul stat="mAtk" val="1.1" />
-				<mul stat="blowRate" val="1.1" />
 			</effect>
 		</enchant1Effects>
 		<enchant2Effects>
+			<effect name="Buff">
+				<mul stat="blowRate" val="1.1" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="#enchPower" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.1">
 					<using kind="ANCIENTSWORD,CROSSBOW,RAPIER" />
 				</mul>
-				<mul stat="mAtk" val="#enchIncrease" />
-				<mul stat="blowRate" val="1.1" />
 			</effect>
 		</enchant2Effects>
 		<enchant3Effects>
+			<effect name="Buff">
+				<mul stat="blowRate" val="#enchPower" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.1" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.1">
 					<using kind="ANCIENTSWORD,CROSSBOW,RAPIER" />
 				</mul>
-				<mul stat="mAtk" val="1.1" />
-				<mul stat="blowRate" val="#enchIncrease" />
 			</effect>
 		</enchant3Effects>
 	</skill>
@@ -2352,28 +2402,31 @@
 		</enchant1Effects>
 	</skill>
 	<skill id="1460" levels="1" name="Mana Gain" enchantGroup1="5" enchantGroup2="5">
+		<!-- High Five Confirmed -->
 		<table name="#ench1AbnormalTimes"> 1240 1280 1320 1360 1400 1440 1480 1520 1560 1600 1640 1680 1720 1760 1800 </table>
-		<table name="#ench2MpConsume2"> 138 134 129 124 120 114 110 105 100 96 90 86 81 76 72 </table>
-		<table name="#ench2MpConsume1"> 35 33 32 31 30 29 27 26 25 24 23 21 20 19 18 </table>
+		<table name="#ench2MpConsume1"> 34 33 32 31 30 28 27 26 25 24 22 21 20 19 18 </table>
+		<table name="#ench2MpConsume2"> 139 134 129 124 120 115 110 105 100 96 91 86 81 76 72 </table>
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="RECHARGE_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill1460" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="79" />
-		<set name="mpConsume2" val="142" />
-		<set name="mpConsume1" val="38" />
+		<set name="mpConsume1" val="36" />
+		<set name="mpConsume2" val="144" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="150000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<enchant1 name="abnormalTime" val="#ench1AbnormalTimes" />
-		<enchant2 name="mpConsume2" val="#ench2MpConsume2" />
 		<enchant2 name="mpConsume1" val="#ench2MpConsume1" />
+		<enchant2 name="mpConsume2" val="#ench2MpConsume2" />
 		<cond msgId="113" addName="1">
 			<not>
 				<target class_id_restriction="29, 30, 105, 42, 43, 112" />
@@ -2459,22 +2512,25 @@
 		</enchant1Effects>
 	</skill>
 	<skill id="1463" levels="1" name="Fire Weapon">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="HOLY_ATTACK" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1463" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="75" />
-		<set name="mpConsume2" val="54" />
-		<set name="mpConsume1" val="15" />
+		<set name="mpConsume1" val="14" />
+		<set name="mpConsume2" val="55" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="PARTY_MEMBER" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="firePower" val="20" />
@@ -2482,22 +2538,25 @@
 		</effects>
 	</skill>
 	<skill id="1464" levels="1" name="Ice Weapon">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="HOLY_ATTACK" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1464" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="75" />
-		<set name="mpConsume2" val="54" />
-		<set name="mpConsume1" val="15" />
+		<set name="mpConsume1" val="14" />
+		<set name="mpConsume2" val="55" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="PARTY_MEMBER" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="waterPower" val="20" />
@@ -2505,22 +2564,25 @@
 		</effects>
 	</skill>
 	<skill id="1465" levels="1" name="Wind Weapon">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="HOLY_ATTACK" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1465" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="75" />
-		<set name="mpConsume2" val="54" />
-		<set name="mpConsume1" val="15" />
+		<set name="mpConsume1" val="14" />
+		<set name="mpConsume2" val="55" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="PARTY_MEMBER" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="windPower" val="20" />
@@ -2528,22 +2590,25 @@
 		</effects>
 	</skill>
 	<skill id="1466" levels="1" name="Earth Weapon">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="HOLY_ATTACK" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1466" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="75" />
-		<set name="mpConsume2" val="54" />
-		<set name="mpConsume1" val="15" />
+		<set name="mpConsume1" val="14" />
+		<set name="mpConsume2" val="55" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="PARTY_MEMBER" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="earthPower" val="20" />
@@ -2746,25 +2811,26 @@
 		</effects>
 	</skill>
 	<skill id="1472" levels="1" name="Soul Sucking">
-		<!-- Confirmed CT2.5 -->
-		<!-- Kamael Final Form Skill -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="attributePower" val="20" />
+		<set name="attributeType" val="UNHOLY" />
 		<set name="castRange" val="900" />
 		<set name="channelingTickInterval" val="2" />
 		<set name="effectPoint" val="-676" />
 		<set name="effectRange" val="1000" />
-		<set name="attributeType" val="UNHOLY" />
-		<set name="attributePower" val="20" />
+		<set name="hitCancelTime" val="4000" />
 		<set name="hitTime" val="15000" />
 		<set name="icon" val="icon.skill1472" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="79" />
 		<set name="mpConsume1" val="36" />
 		<set name="mpPerChanneling" val="30" />
 		<set name="operateType" val="CA1" />
 		<set name="reuseDelay" val="300000" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="reuseDelayLock" val="true" />
-		<set name="targetType" val="ONE" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="ENEMY" />
 		<channelingEffects>
 			<effect name="MagicalAttack">
 				<param power="30" />
@@ -2812,28 +2878,30 @@
 		</enchant1Effects>
 	</skill>
 	<skill id="1475" levels="3" name="Erase Mark">
-		<!-- Confirmed CT2.5 -->
-		<table name="#dispelAbnormals"> DEATH_MARK,3 DEATH_MARK,7 DEATH_MARK,10 </table>
-		<table name="#effectPoints"> 235 438 611 </table>
+		<!-- High Five Confirmed -->
+		<table name="#dispelBySlotLevel"> DEATH_MARK,3 DEATH_MARK,7 DEATH_MARK,10 </table>
+		<table name="#effectPoint"> 235 438 611 </table>
 		<table name="#magicLvl"> 24 46 66 </table>
-		<table name="#mpConsume2"> 12 23 35 </table>
 		<table name="#mpConsume1"> 3 6 9 </table>
+		<table name="#mpConsume2"> 12 23 35 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2500" />
 		<set name="icon" val="icon.skill1475" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="4000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelBySlot">
-				<param dispel="#dispelAbnormals" />
+				<param dispel="#dispelBySlotLevel" />
 			</effect>
 		</effects>
 	</skill>
@@ -3402,46 +3470,48 @@
 		</enchant1Effects>
 	</skill>
 	<skill id="1488" levels="3" name="Restoration Impact" enchantGroup1="1">
-		<!-- Confirmed CT2.5 -->
-		<table name="#amount"> 10 15 20 </table>
-		<table name="#effectPoints"> 701 941 1083 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> 701 941 1083 </table>
+		<table name="#hpPerMaxPower"> 10 15 20 </table>
 		<table name="#magicLvl"> 49 60 68 </table>
-		<table name="#mpConsume2"> 18 22 26 </table>
 		<table name="#mpConsume1"> 5 6 7 </table>
-		<table name="#ench1amount"> 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 </table>
+		<table name="#mpConsume2"> 18 22 26 </table>
+		<table name="#ench1HpPerMaxPower"> 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 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>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill1488" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="15000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<cond msgId="109">
 			<target active_effect_id="1487" />
 		</cond>
 		<effects>
-			<effect name="HpPerMax">
-				<param power="#amount" />
-			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="LIFE_FORCE_KAMAEL,9" />
 			</effect>
-		</effects>
-		<enchant1Effects>
 			<effect name="HpPerMax">
-				<param power="#ench1amount" />
+				<param power="#hpPerMaxPower" />
 			</effect>
+		</effects>
+		<enchant1Effects>
 			<effect name="DispelBySlot">
 				<param dispel="LIFE_FORCE_KAMAEL,9" />
 			</effect>
+			<effect name="HpPerMax">
+				<param power="#ench1HpPerMaxPower" />
+			</effect>
 		</enchant1Effects>
 	</skill>
 	<skill id="1489" levels="1" name="Summoner Ability - Resist Attribute">
@@ -3499,13 +3569,15 @@
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="ELEMENTAL_ARMOR" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="138" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill1492" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="81" />
-		<set name="mpConsume2" val="29" />
 		<set name="mpConsume1" val="8" />
+		<set name="mpConsume2" val="29" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -3646,10 +3718,10 @@
 		<set name="targetType" val="SERVITOR" />
 		<effects>
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockDebuff" />
 		</effects>
@@ -3687,34 +3759,41 @@
 		</effects>
 	</skill>
 	<skill id="1499" levels="1" name="Improved Combat">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="2400" />
 		<set name="abnormalType" val="IMPROVE_PA_PD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="679" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill1499" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="70" />
-		<set name="mpConsume2" val="21" />
 		<set name="mpConsume1" val="6" />
+		<set name="mpConsume2" val="21" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="pAtk" val="1.15" />
-				<mul stat="pDef" val="1.15" />
+			<effect name="DispelBySlot">
+				<param dispel="PA_UP,9" />
 			</effect>
 			<effect name="DispelBySlot">
-				<param dispel="PA_UP,9;PD_UP,9" />
+				<param dispel="PD_UP,9" />
 			</effect>
 			<effect name="BlockBuffSlot">
 				<param slot="PA_UP;PD_UP" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.15" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pDef" val="1.15" />
+			</effect>
 		</effects>
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/01500-01599.xml b/src/main/resources/data/stats/skills/01500-01599.xml
index b05c9041ad..f75618eff5 100644
--- a/src/main/resources/data/stats/skills/01500-01599.xml
+++ b/src/main/resources/data/stats/skills/01500-01599.xml
@@ -1,55 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="1500" levels="1" name="Improved Magic">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="2400" />
 		<set name="abnormalType" val="IMPROVE_MA_MD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="679" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill1500" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="74" />
-		<set name="mpConsume2" val="22" />
 		<set name="mpConsume1" val="6" />
+		<set name="mpConsume2" val="22" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="mAtk" val="1.75" />
-				<mul stat="mDef" val="1.3" />
+			<effect name="DispelBySlot">
+				<param dispel="MA_UP,9" />
 			</effect>
 			<effect name="DispelBySlot">
-				<param dispel="MA_UP,9;MD_UP,9" />
+				<param dispel="MD_UP,9" />
 			</effect>
 			<effect name="BlockBuffSlot">
 				<param slot="MA_UP;MD_UP" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.75" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.3" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="1501" levels="1" name="Improved Condition">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="2400" />
 		<set name="abnormalType" val="IMPROVE_HP_MP_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="679" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill1501" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="72" />
-		<set name="mpConsume2" val="22" />
 		<set name="mpConsume1" val="6" />
+		<set name="mpConsume2" val="22" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="DispelBySlot">
+				<param dispel="MAX_HP_UP,9" />
+			</effect>
+			<effect name="DispelBySlot">
+				<param dispel="MAX_MP_UP,9" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="MAX_HP_UP;MAX_MP_UP" />
+			</effect>
 			<effect name="MaxHp">
 				<param power="35" />
 				<param type="PER" />
@@ -58,105 +76,120 @@
 				<param power="35" />
 				<param type="PER" />
 			</effect>
-			<effect name="DispelBySlot">
-				<param dispel="MAX_HP_UP,9;MAX_MP_UP,9" />
-			</effect>
-			<effect name="BlockBuffSlot">
-				<param slot="MAX_HP_UP;MAX_MP_UP" />
-			</effect>
 		</effects>
 	</skill>
 	<skill id="1502" levels="1" name="Improved Critical Attack">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="2400" />
 		<set name="abnormalType" val="IMPROVE_CRT_RATE_DMG_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="679" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill1502" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="74" />
-		<set name="mpConsume2" val="22" />
 		<set name="mpConsume1" val="6" />
+		<set name="mpConsume2" val="22" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="critRate" val="1.3" />
-				<mul stat="critDmg" val="1.35" />
+			<effect name="DispelBySlot">
+				<param dispel="CRITICAL_PROB_UP,9" />
 			</effect>
 			<effect name="DispelBySlot">
-				<param dispel="CRITICAL_PROB_UP,9;CRITICAL_DMG_UP,9" />
+				<param dispel="CRITICAL_DMG_UP,9" />
 			</effect>
 			<effect name="BlockBuffSlot">
 				<param slot="CRITICAL_PROB_UP;CRITICAL_DMG_UP" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="critDmg" val="1.35" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="critRate" val="1.3" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="1503" levels="1" name="Improved Shield Defense">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="2400" />
 		<set name="abnormalType" val="IMPROVE_SHIELD_RATE_DEFENCE_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="679" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill1503" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="70" />
-		<set name="mpConsume2" val="21" />
 		<set name="mpConsume1" val="6" />
+		<set name="mpConsume2" val="21" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="rShld" val="1.3" />
-				<mul stat="sDef" val="1.5" />
+			<effect name="DispelBySlot">
+				<param dispel="SHIELD_PROB_UP,9" />
 			</effect>
 			<effect name="DispelBySlot">
-				<param dispel="SHIELD_PROB_UP,9;SHIELD_DEFENCE_UP,9" />
+				<param dispel="SHIELD_DEFENCE_UP,9" />
 			</effect>
 			<effect name="BlockBuffSlot">
 				<param slot="SHIELD_PROB_UP;SHIELD_DEFENCE_UP" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="sDef" val="1.5" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="rShld" val="1.3" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="1504" levels="1" name="Improved Movement">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="2400" />
 		<set name="abnormalType" val="IMPROVE_SPEED_AVOID_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="679" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill1504" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="72" />
-		<set name="mpConsume2" val="22" />
 		<set name="mpConsume1" val="6" />
+		<set name="mpConsume2" val="22" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="Buff">
-				<add stat="runSpd" val="33" />
-				<add stat="rEvas" val="4" />
+			<effect name="DispelBySlot">
+				<param dispel="SPEED_UP,9" />
 			</effect>
 			<effect name="DispelBySlot">
-				<param dispel="SPEED_UP,9;AVOID_UP,9" />
+				<param dispel="AVOID_UP,9" />
+			</effect>
+			<effect name="Buff">
+				<add stat="rEvas" val="4" />
 			</effect>
 			<effect name="BlockBuffSlot">
 				<param slot="SPEED_UP;AVOID_UP" />
 			</effect>
+			<effect name="Buff">
+				<add stat="runSpd" val="33" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="1505" levels="1" name="Sublime Self-Sacrifice">
@@ -180,10 +213,10 @@
 		<set name="targetType" val="AURA_FRIENDLY" />
 		<effects>
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockDebuff" />
 			<effect name="Cp">
@@ -233,22 +266,25 @@
 		</effects>
 	</skill>
 	<skill id="1507" levels="1" name="Lord of Vampire">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="5" />
 		<set name="abnormalTime" val="30" />
 		<set name="abnormalType" val="VAMPIRIC_ATTACK_SPECIAL" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="679" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1507" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="magicLvl" val="83" />
-		<set name="mpConsume2" val="29" />
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="81" />
 		<set name="mpConsume1" val="8" />
+		<set name="mpConsume2" val="29" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="150000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="absorbDam" val="80" />
@@ -325,20 +361,22 @@
 		</effects>
 	</skill>
 	<skill id="1510" levels="1" name="Soul Cleanse">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="611" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill1510" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="66" />
-		<set name="mpConsume2" val="25" />
 		<set name="mpConsume1" val="7" />
+		<set name="mpConsume2" val="25" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="15000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<cond msgId="113" addName="1">
 			<target race="KAMAEL" />
 		</cond>
@@ -1139,11 +1177,11 @@
 			</effect>
 		</enchant3pveEffects>
 	</skill>
-	<skill id="1531" levels="7" name="Bless the Blood" enchantGroup1="1" enchantGroup2="1">
-		<!-- Confirmed CT2.5 -->
+	<skill id="1531" levels="7" name="Blessed Blood" enchantGroup1="1" enchantGroup2="1">
+		<!-- High Five Confirmed -->
 		<table name="#magicLvl"> 40 48 56 60 64 68 72 </table>
-		<table name="#mpConsume2"> 28 35 41 44 48 51 53 </table>
 		<table name="#mpConsume1"> 7 9 11 11 12 13 14 </table>
+		<table name="#mpConsume2"> 28 35 41 44 48 51 53 </table>
 		<table name="#triggeredLevel"> 1 2 3 4 5 6 7 </table>
 		<table name="#ench1triggeredLevel"> 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 </table>
 		<table name="#ench2AbnormalTimes"> 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 </table>
@@ -1151,25 +1189,32 @@
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="BLESS_THE_BLOOD" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1218" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="20000" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="reuseDelayLock" val="true" />
-		<set name="targetType" val="PARTY_MEMBER" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="TARGET" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
+		<enchant1 name="mpConsume1" val="14" />
 		<enchant1 name="mpConsume2" val="54" />
 		<enchant2 name="abnormalTime" val="#ench2AbnormalTimes" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
+		<enchant2 name="mpConsume1" val="14" />
 		<enchant2 name="mpConsume2" val="54" />
+		<cond msgId="113" addName="1">
+			<target myParty="INCLUDE_ME" />
+		</cond>
 		<effects>
 			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
@@ -1448,10 +1493,10 @@
 		<effects>
 			<effect name="Stun" />
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockBuff" />
 			<effect name="BlockDebuff" />
@@ -1495,23 +1540,25 @@
 		</effects>
 	</skill>
 	<skill id="1542" levels="1" name="Counter Critical">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="COUNTER_CRITICAL" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="679" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1542" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="magicLvl" val="83" />
-		<set name="mpConsume2" val="58" />
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="81" />
 		<set name="mpConsume1" val="15" />
+		<set name="mpConsume2" val="58" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
@@ -1566,26 +1613,26 @@
 		</effects>
 	</skill>
 	<skill id="1545" levels="1" name="Soul Sucking">
-		<!-- Confirmed CT2.5 -->
-		<!-- Kamael Final Form Skill -->
-		<!-- TODO: Related with Quest "Long live the Pa'agrio Lord! -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="attributePower" val="20" />
+		<set name="attributeType" val="UNHOLY" />
 		<set name="castRange" val="900" />
 		<set name="channelingTickInterval" val="2" />
 		<set name="effectPoint" val="-676" />
 		<set name="effectRange" val="1000" />
-		<set name="attributeType" val="UNHOLY" />
-		<set name="attributePower" val="20" />
+		<set name="hitCancelTime" val="4000" />
 		<set name="hitTime" val="15000" />
 		<set name="icon" val="icon.skill1472" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="79" />
 		<set name="mpConsume1" val="36" />
 		<set name="mpPerChanneling" val="30" />
 		<set name="operateType" val="CA1" />
 		<set name="reuseDelay" val="300000" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="reuseDelayLock" val="true" />
-		<set name="targetType" val="ONE" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="ENEMY" />
 		<channelingEffects>
 			<effect name="MagicalAttack">
 				<param power="30" />
@@ -1657,41 +1704,43 @@
 		</effects>
 	</skill>
 	<skill id="1548" levels="3" name="Resist Earth" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1">
-		<!-- High Five Skill -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#earthRes"> 10 15 20 </table>
-		<table name="#effectPoints"> 285 379 418 </table>
-		<table name="#magicLvl"> 60 64 68 </table>
-		<table name="#mpConsume2"> 20 28 31 </table>
-		<table name="#mpConsume1"> 5 7 8 </table>
+		<table name="#effectPoint"> 285 379 418 </table>
+		<table name="#magicLvl"> 38 48 62 </table>
+		<table name="#mpConsume1"> 6 7 8 </table>
+		<table name="#mpConsume2"> 21 28 31 </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"> 30 29 29 28 28 27 27 26 26 25 25 24 24 23 23 22 22 21 21 20 20 19 19 18 18 17 17 16 16 15 </table>
 		<table name="#ench2MpConsume1"> 7 7 7 7 7 7 7 6 6 6 6 6 6 6 6 5 5 5 5 5 5 5 4 4 4 4 4 4 4 4 </table>
+		<table name="#ench2MpConsume2"> 30 29 29 28 28 27 27 26 26 25 25 24 24 23 23 22 22 21 21 20 20 19 19 18 18 17 17 16 16 15 </table>
 		<table name="#ench3abnormalLvl"> 3 3 3 3 3 3 3 3 3 3 3 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 </table>
 		<table name="#ench3vuln"> 24 28 33 37 41 46 50 54 59 63 67 72 76 80 85 89 93 98 102 106 111 115 119 124 128 132 137 141 145 150 </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="#enchvuln"> 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="ARMOR_EARTH" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1548" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="ONE" />
+		<set name="targetType" val="TARGET" />
 		<enchant1 name="abnormalTime" val="#ench1AbnormalTimes" />
 		<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" />
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
 		<effects>
 			<effect name="Buff">
@@ -1811,24 +1860,27 @@
 		</effects>
 	</skill>
 	<skill id="1553" levels="1" name="Chain Heal">
-		<!-- High Five Skill -->
-		<set name="affectLimit" val="5-12" />
+		<!-- High Five Confirmed -->
+		<set name="affectLimit" val="9-0" />
+		<set name="affectObject" val="FRIEND" />
 		<set name="affectRange" val="300" />
+		<set name="affectScope" val="RANGE_SORT_BY_HP" />
 		<set name="castRange" val="900" />
-		<set name="effectPoint" val="398" />
+		<set name="effectPoint" val="1301" />
 		<set name="effectRange" val="1400" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill1553" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="itemConsumeCount" val="4" />
 		<set name="itemConsumeId" val="3031" />
 		<set name="magicLvl" val="83" />
-		<set name="mpConsume2" val="156" />
-		<set name="mpConsume1" val="38" />
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="mpConsume1" val="39" />
+		<set name="mpConsume2" val="155" />
+		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="5000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="AREA_FRIENDLY" />
+		<set name="targetType" val="ENEMY_NOT" />
 		<effects>
 			<effect name="HpPerMax">
 				<param power="30" />
diff --git a/src/main/resources/data/stats/skills/02100-02199.xml b/src/main/resources/data/stats/skills/02100-02199.xml
index 804931d49b..3d5b678cb6 100644
--- a/src/main/resources/data/stats/skills/02100-02199.xml
+++ b/src/main/resources/data/stats/skills/02100-02199.xml
@@ -963,17 +963,19 @@
 		</effects>
 	</skill>
 	<skill id="2170" levels="1" name="Scroll: Cancel Sleep">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="coolTime" val="1000" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="600" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="6037" /> <!-- Waking Scroll -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelBySlot">
 				<param dispel="SLEEP,1" />
diff --git a/src/main/resources/data/stats/skills/02200-02299.xml b/src/main/resources/data/stats/skills/02200-02299.xml
index 5ba450b567..8f9674c2a1 100644
--- a/src/main/resources/data/stats/skills/02200-02299.xml
+++ b/src/main/resources/data/stats/skills/02200-02299.xml
@@ -864,55 +864,61 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="2239" levels="1" name="Petrification Scroll">
-		<!-- Confirmed CT2.5 -->
+	<skill id="2239" levels="1" name="Petrifaction Scroll">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="TURN_STONE" />
 		<set name="abnormalVisualEffect" val="FLESH_STONE" />
+		<set name="affectObject" val="FRIEND" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
 		<set name="icon" val="icon.ect_piece_of_paper_white_i00" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="8379" /> <!-- Petrification Scroll -->
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="PARTY" />
+		<set name="targetType" val="TARGET" />
 		<cond msgId="113" addName="1">
-			<player insideZoneId="2239" />
+			<and>
+				<target myParty="INCLUDE_ME" />
+				<player insideZoneId="2239" />
+			</and>
 		</cond>
 		<effects>
 			<effect name="Stun" />
+			<effect name="BlockBuff" />
+			<effect name="BlockDebuff" />
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
-			<effect name="BlockBuff" />
-			<effect name="BlockDebuff" />
 			<effect name="Buff">
 				<mul stat="regHp" val="0" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="2240" levels="1" name="Hot Spring Nectar">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="40" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="300" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="8030" /> <!-- Hot Spring Nectar -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<cond msgId="113" addName="1">
 			<and>
 				<player insideZoneId="2240123" />
@@ -921,18 +927,19 @@
 		</cond>
 	</skill>
 	<skill id="2241" levels="1" name="Hot Spring Mineral Water">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="40" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="300" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="8031" /> <!-- Hot Spring Mineral Water -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<cond msgId="113" addName="1">
 			<and>
 				<player insideZoneId="2240123" />
@@ -941,18 +948,19 @@
 		</cond>
 	</skill>
 	<skill id="2242" levels="1" name="Hot Spring Fountain Water">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="40" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="300" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="8032" /> <!-- Hot Spring Water -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<cond msgId="113" addName="1">
 			<and>
 				<player insideZoneId="2240123" />
@@ -961,18 +969,19 @@
 		</cond>
 	</skill>
 	<skill id="2243" levels="1" name="Hot Spring Sulfur">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="40" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="300" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="8033" /> <!-- Hot Spring Sulfur -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<cond msgId="113" addName="1">
 			<and>
 				<player insideZoneId="2240123" />
diff --git a/src/main/resources/data/stats/skills/02600-02699.xml b/src/main/resources/data/stats/skills/02600-02699.xml
index fedf8873bc..a66b0035c6 100644
--- a/src/main/resources/data/stats/skills/02600-02699.xml
+++ b/src/main/resources/data/stats/skills/02600-02699.xml
@@ -361,15 +361,18 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="2630" levels="1" name="Presentation - Collect Items">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="900" />
-		<set name="effectRange" val="1200" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="6000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<cond msgId="113" addName="1">
 			<and>
 				<player flyMounted="true" />
diff --git a/src/main/resources/data/stats/skills/02800-02899.xml b/src/main/resources/data/stats/skills/02800-02899.xml
index e698ddab54..14608a8d30 100644
--- a/src/main/resources/data/stats/skills/02800-02899.xml
+++ b/src/main/resources/data/stats/skills/02800-02899.xml
@@ -1967,17 +1967,19 @@
 		</effects>
 	</skill>
 	<skill id="2890" levels="1" name="Wild Magic">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MAGIC_CRITICAL_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="1" />
+		<set name="hitCancelTime" val="500" />
 		<set name="icon" val="icon.etc_fresh_milk_i00" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="70" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="mCritRate" val="2" />
diff --git a/src/main/resources/data/stats/skills/03200-03299.xml b/src/main/resources/data/stats/skills/03200-03299.xml
index ed2deaee73..ec36730ede 100644
--- a/src/main/resources/data/stats/skills/03200-03299.xml
+++ b/src/main/resources/data/stats/skills/03200-03299.xml
@@ -1036,20 +1036,23 @@
 		</effects>
 	</skill>
 	<skill id="3261" levels="1" name="Forgiveness">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="500" />
 		<set name="coolTime" val="800" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="700" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2500" />
 		<set name="icon" val="icon.skill3260" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="3000" />
+		<set name="reuseDelayLock" val="true" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="3262" levels="1" name="Pardon">
 		<!-- Confirmed CT2.5 -->
diff --git a/src/main/resources/data/stats/skills/04000-04099.xml b/src/main/resources/data/stats/skills/04000-04099.xml
index 7057945eee..2b6a203c44 100644
--- a/src/main/resources/data/stats/skills/04000-04099.xml
+++ b/src/main/resources/data/stats/skills/04000-04099.xml
@@ -254,16 +254,18 @@
 		</effects>
 	</skill>
 	<skill id="4020" levels="1" name="Heal Queen Ant1">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="35" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
 				<param power="10846" />
@@ -271,8 +273,8 @@
 		</effects>
 	</skill>
 	<skill id="4021" levels="1" name="Queen Ant">
-		<!-- Confirmed CT2.5 -->
-		<!-- Queen Ant Skills -->
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.skillboss" />
 		<set name="magicLvl" val="40" />
 		<set name="operateType" val="P" />
@@ -283,31 +285,33 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4022" levels="1" name="Body Of Nurse Ant">
-		<!-- Confirmer CT2.5 -->
-		<!-- This Skill Is Only For Description In The Client -->
+	<skill id="4022" levels="1" name="Body of Nurse Ant">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="magicLvl" val="35" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 	</skill>
-	<skill id="4023" levels="1" name="Body Of Royal Guard Ant">
-		<!-- Confirmer CT2.5 -->
-		<!-- This Skill Is Only For Description In The Client -->
+	<skill id="4023" levels="1" name="Body of Royal Guard Ant">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="magicLvl" val="35" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="4024" levels="1" name="Heal Queen Ant2">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="35" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
 				<param power="10846" />
@@ -315,40 +319,48 @@
 		</effects>
 	</skill>
 	<skill id="4025" levels="12" name="Master Recharge">
-		<!-- Freya retail confirmed -->
-		<table name="#amount"> 23 38 52 70 90 110 129 138 144 149 153 155 </table>
-		<table name="#effectPoints"> 138 204 285 379 477 566 635 659 676 689 700 709 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> 138 204 285 379 477 566 635 659 676 689 700 709 </table>
 		<table name="#magicLvl"> 17 27 37 47 57 67 77 82 87 92 97 102 </table>
-		<table name="#mpConsume2"> 24 39 53 70 90 110 130 138 145 150 153 155 </table>
+		<table name="#manaHealByLevelPower"> 23 38 52 70 90 110 129 138 144 149 153 155 </table>
+		<table name="#mpConsume1"> 5 8 11 14 18 22 26 28 29 30 31 31 </table>
+		<table name="#mpConsume2"> 19 31 42 56 72 88 104 110 116 120 122 124 </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="2500" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="OWNER_PET" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="ManaHealByLevel">
-				<param power="#amount" />
+				<param power="#manaHealByLevelPower" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4026" levels="1" name="Gludio Flame">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
+		<set name="affectObject" val="NOT_FRIEND" />
 		<set name="affectRange" val="200" />
+		<set name="affectScope" val="RANGE" />
+		<set name="attributePower" val="20" />
+		<set name="attributeType" val="FIRE" />
 		<set name="castRange" val="900" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="1400" />
-		<set name="attributeType" val="FIRE" />
-		<set name="attributePower" val="20" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
-		<set name="mpConsume2" val="28" />
+		<set name="mpConsume1" val="6" />
+		<set name="mpConsume2" val="22" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="15000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -360,18 +372,21 @@
 		</effects>
 	</skill>
 	<skill id="4027" levels="1" name="Gludio Heal">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="5000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
-		<set name="mpConsume2" val="98" />
+		<set name="mpConsume1" val="20" />
+		<set name="mpConsume2" val="78" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
 				<param power="628" />
@@ -379,23 +394,25 @@
 		</effects>
 	</skill>
 	<skill id="4028" levels="3" name="NPC Might">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#magicLvl"> 20 40 70 </table>
 		<table name="#mpConsume2"> 10 18 33 </table>
 		<table name="#pAtk"> 1.08 1.12 1.15 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="PA_UP" />
 		<set name="abnormalVisualEffect" val="BIG_BODY" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1800" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Grow">
 				<mul stat="pAtk" val="#pAtk" />
@@ -403,21 +420,24 @@
 		</effects>
 	</skill>
 	<skill id="4029" levels="3" name="NPC Shield">
-		<table name="#abnormalLvls"> 1 2 3 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#magicLvl"> 20 40 70 </table>
 		<table name="#mpConsume2"> 10 18 33 </table>
 		<table name="#pDef"> 1.08 1.12 1.15 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="PD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1800" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pDef" val="#pDef" />
@@ -426,26 +446,28 @@
 	</skill>
 	<skill id="4030" levels="3" name="NPC Clan Might">
 		<!-- High Five Confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#magicLvl"> 20 40 70 </table>
 		<table name="#mpConsume1"> 2 4 7 </table>
 		<table name="#mpConsume2"> 8 14 26 </table>
 		<table name="#pAtk"> 1.08 1.12 1.15 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="PA_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2500" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtk" val="#pAtk" />
@@ -453,26 +475,30 @@
 		</effects>
 	</skill>
 	<skill id="4031" levels="3" name="NPC Clan Aegis">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#magicLvl"> 20 40 70 </table>
-		<table name="#mpConsume2"> 10 18 33 </table>
+		<table name="#mpConsume1"> 2 4 7 </table>
+		<table name="#mpConsume2"> 8 14 26 </table>
 		<table name="#pDef"> 1.08 1.12 1.15 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="PD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2500" />
 		<set name="icon" val="icon.skill4031" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="CLAN" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pDef" val="#pDef" />
@@ -711,7 +737,7 @@
 		<effects>
 			<effect name="Mp">
 				<param amount="#amount" />
- 			</effect>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4040" levels="12" name="NPC Bow Attack">
@@ -801,18 +827,21 @@
 		</effects>
 	</skill>
 	<skill id="4044" levels="1" name="Partisan Heal">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="5000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="45" />
-		<set name="mpConsume2" val="70" />
+		<set name="mpConsume1" val="14" />
+		<set name="mpConsume2" val="56" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
 				<param power="427" />
@@ -899,18 +928,19 @@
 		</effects>
 	</skill>
 	<skill id="4048" levels="3" name="NPC Dash">
-		<!-- Freya retail confirmed -->
-		<table name="#magicLvl"> 10 10 10 </table>
+		<!-- High Five Confirmed -->
 		<table name="#runSpd"> 1.5 1.8 2 </table>
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="20" />
 		<set name="abnormalType" val="SPEED_UP_SPECIAL" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="-1" />
-		<set name="magicLvl" val="#magicLvl" />
+		<set name="hitTime" val="1000" />
+		<set name="magicLvl" val="10" />
 		<set name="mpConsume2" val="12" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="runSpd" val="#runSpd" />
@@ -955,22 +985,23 @@
 	</skill>
 	<skill id="4051" levels="20" name="Cubic Heal">
 		<!-- Cubic Skill -->
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Levels 17, 18 and 19 doesn't exist in client. -->
-		<table name="#amount"> 201 241 281 314 339 361 382 390 398 405 413 418 422 426 430 434 0 0 0 68 </table>
-		<table name="#effectPoints"> 408 467 523 566 597 624 646 653 660 667 674 677 679 682 685 687 0 0 0 1 </table>
+		<table name="#effectPoint"> 408 467 523 566 597 624 646 653 660 667 674 677 679 682 685 687 0 0 0 1 </table>
+		<table name="#healPower"> 201 241 281 314 339 361 382 390 398 405 413 418 422 426 430 434 0 0 0 68 </table>
 		<table name="#magicLvl"> 43 49 55 60 64 68 72 74 76 78 80 81 82 83 84 85 0 0 0 18 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
-				<param power="#amount" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 	</skill>
@@ -1205,26 +1236,28 @@
 		</effects>
 	</skill>
 	<skill id="4065" levels="12" name="NPC Heal">
-		<!-- Freya retail confirmed -->
-		<table name="#amount"> 83 151 245 362 494 628 743 789 826 867 895 913 </table>
+		<!-- High Five Confirmed -->
+		<table name="#healPower"> 83 151 245 362 494 628 743 789 826 867 895 913 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<table name="#mpConsume2"> 13 24 35 49 64 78 91 97 101 104 105 105 </table>
 		<table name="#mpConsume1"> 4 6 9 13 16 20 23 25 26 26 27 27 </table>
+		<table name="#mpConsume2"> 13 24 35 49 64 78 91 97 101 104 105 105 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
-				<param power="#amount" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 	</skill>
@@ -1320,12 +1353,13 @@
 		</effects>
 	</skill>
 	<skill id="4070" levels="1" name="Decrease Atk. Spd.">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="ATTACK_TIME_UP" />
 		<set name="activateRate" val="10" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="effectPoint" val="-100" />
 		<set name="icon" val="icon.skill1206" />
@@ -1334,7 +1368,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
 				<mul stat="pAtkSpd" val="0.77" />
@@ -1420,26 +1454,30 @@
 		</effects>
 	</skill>
 	<skill id="4074" levels="2" name="NPC Haste">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 </table>
 		<table name="#magicLvl"> 30 70 </table>
-		<table name="#mpConsume2"> 14 33 </table>
+		<table name="#mpConsume1"> 3 7 </table>
+		<table name="#mpConsume2"> 11 26 </table>
 		<table name="#pAtkSpd"> 1.15 1.33 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="ATTACK_TIME_DOWN" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill1086" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="#pAtkSpd" />
@@ -1575,17 +1613,20 @@
 		</effects>
 	</skill>
 	<skill id="4080" levels="1" name="Dark Heal">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="5000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
-		<set name="mpConsume2" val="98" />
+		<set name="mpConsume1" val="20" />
+		<set name="mpConsume2" val="78" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
 				<param power="628" />
@@ -1746,38 +1787,44 @@
 		</effects>
 	</skill>
 	<skill id="4089" levels="1" name="NPC Bear Spirit Totem">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="POSSESSION" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="-100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="magicLvl" val="40" />
 		<set name="mpConsume2" val="18" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="runSpd" val="0.85" />
 				<mul stat="pAtk" val="1.15" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="runSpd" val="0.85" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4090" levels="1" name="NPC Wolf Spirit Totem">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="POSSESSION" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="-100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="magicLvl" val="40" />
 		<set name="mpConsume2" val="18" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="runSpd" val="1.4" />
@@ -1785,10 +1832,10 @@
 		</effects>
 	</skill>
 	<skill id="4091" levels="3" name="NPC Ogre Spirit Totem">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<table name="#accCombat"> 3 7 7 </table>
 		<table name="#magicLvl"> 40 60 75 </table>
-		<table name="#MaxHp"> 14 21 21 </table>
+		<table name="#maxHpPower"> 14 21 21 </table>
 		<table name="#mpConsume2"> 18 18 19 </table>
 		<table name="#pAtk"> 1.05 1.15 1.15 </table>
 		<table name="#pDef"> 1.1 1.3 1.3 </table>
@@ -1798,46 +1845,62 @@
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="POSSESSION" />
 		<set name="abnormalVisualEffect" val="BIG_BODY" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="-100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Grow">
-				<mul stat="runSpd" val="#runSpd" />
-				<mul stat="pAtk" val="#pAtk" />
-				<mul stat="pDef" val="#pDef" />
 				<sub stat="rEvas" val="#rEvas" />
+			</effect>
+			<effect name="Buff">
 				<add stat="accCombat" val="#accCombat" />
 			</effect>
 			<effect name="MaxHp">
-				<param power="#MaxHp" />
+				<param power="#maxHpPower" />
 				<param type="PER" />
 				<param heal="true" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="#pAtk" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pDef" val="#pDef" />
+			</effect>
+			<effect name="Debuff">
+				<mul stat="runSpd" val="#runSpd" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4092" levels="1" name="NPC Puma Spirit Totem">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="POSSESSION" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="-100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="magicLvl" val="40" />
 		<set name="mpConsume2" val="18" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="1.3" />
+			</effect>
+			<effect name="Buff">
 				<add stat="rEvas" val="4" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="pDef" val="0.8" />
 			</effect>
 		</effects>
@@ -1888,61 +1951,71 @@
 		</effects>
 	</skill>
 	<skill id="4096" levels="3" name="NPC Hawkeye">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#accCombat"> 6 8 10 </table>
 		<table name="#magicLvl"> 20 40 70 </table>
 		<table name="#mpConsume2"> 10 18 33 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="AB_HAWK_EYE" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="6000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="accCombat" val="#accCombat" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="pDef" val="0.9" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4097" levels="12" name="NPC Chant of Life">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 4 5 6 7 8 9 10 11 12 </table>
-		<table name="#hot"> 7 12 18 27 37 46 55 23 32 42 51 58 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 7 8 9 10 11 12 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<table name="#mpConsume2"> 33 59 88 122 159 195 228 242 252 259 262 262 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume1"> 7 12 18 25 32 39 46 49 51 52 53 53 </table>
+		<table name="#mpConsume2"> 26 47 70 97 127 156 182 193 201 207 209 209 </table>
+		<table name="#tickHpPower"> 7 12 18 27 37 46 55 23 32 42 51 58 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="LIFE_FORCE_OTHERS" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill1229" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="TickHp">
-				<param power="#hot" />
+				<param power="#tickHpPower" />
 				<param ticks="1" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4098" levels="12" name="Magic Skill Block">
-		<!-- Freya retail confirmed -->
+	<skill id="4098" levels="12" name="Silence">
+		<!-- High Five Confirmed -->
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<table name="#mpConsume2"> 13 20 27 35 45 55 65 69 73 75 77 78 </table>
+		<table name="#mpConsume1"> 3 4 6 7 9 11 13 14 15 15 16 16 </table>
+		<table name="#mpConsume2"> 10 16 21 28 36 44 52 55 58 60 61 62 </table>
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="60" />
 		<set name="abnormalType" val="SILENCE" />
@@ -1953,12 +2026,14 @@
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="1500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill1064" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="lvlBonusRate" val="2" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
@@ -1970,43 +2045,61 @@
 		</effects>
 	</skill>
 	<skill id="4099" levels="2" name="NPC Berserk">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 </table>
-		<table name="#magicLvl"> 40 70 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 </table>
 		<table name="#mAtk"> 1.1 1.16 </table>
 		<table name="#mAtkSpd"> 1.05 1.08 </table>
 		<table name="#mDef"> 0.9 0.84 </table>
-		<table name="#mpConsume2"> 18 33 </table>
+		<table name="#magicLvl"> 40 70 </table>
+		<table name="#mpConsume1"> 4 7 </table>
+		<table name="#mpConsume2"> 14 26 </table>
 		<table name="#pAtk"> 1.05 1.08 </table>
 		<table name="#pAtkSpd"> 1.05 1.08 </table>
 		<table name="#pDef"> 0.95 0.92 </table>
-		<table name="#rEvas"> 5 8 </table>
+		<table name="#rEvas"> 2 4 </table>
 		<table name="#runSpd"> 5 8 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="BERSERKER" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1062" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="pAtk" val="#pAtk" />
 				<mul stat="pAtkSpd" val="#pAtkSpd" />
+			</effect>
+			<effect name="Buff">
+				<sub stat="rEvas" val="#rEvas" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="#mAtkSpd" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="mAtk" val="#mAtk" />
-				<mul stat="mAtkSpd" val="#pAtkSpd" />
-				<add stat="runSpd" val="#runSpd" />
-				<mul stat="pDef" val="#pDef" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="mDef" val="#mDef" />
-				<sub stat="rEvas" val="#rEvas" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="#pAtk" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pDef" val="#pDef" />
+			</effect>
+			<effect name="Buff">
+				<add stat="runSpd" val="#runSpd" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/src/main/resources/data/stats/skills/04100-04199.xml b/src/main/resources/data/stats/skills/04100-04199.xml
index f3c3984fee..42fb51e59c 100644
--- a/src/main/resources/data/stats/skills/04100-04199.xml
+++ b/src/main/resources/data/stats/skills/04100-04199.xml
@@ -1,37 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="4100" levels="12" name="NPC Prominence">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<table name="#mpConsume2"> 13 20 27 35 45 55 65 69 73 75 77 78 </table>
-		<table name="#power"> 18 26 38 52 68 85 102 110 116 122 126 129 </table>
+		<table name="#magicalAttackPower"> 18 26 38 52 68 85 102 110 116 122 126 129 </table>
+		<table name="#mpConsume1"> 3 4 6 7 9 11 13 14 15 15 16 16 </table>
+		<table name="#mpConsume2"> 10 16 21 28 36 44 52 55 58 60 61 62 </table>
+		<set name="affectScope" val="SINGLE" />
+		<set name="attributePower" val="20" />
+		<set name="attributeType" val="FIRE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="1100" />
-		<set name="attributeType" val="FIRE" />
-		<set name="attributePower" val="20" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="ENEMY" />
 		<effects>
 			<effect name="MagicalAttack">
-				<param power="#power" />
+				<param power="#magicalAttackPower" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4101" levels="12" name="NPC Spinning Slash">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
 		<table name="#mpConsume2"> 13 20 28 38 50 61 71 76 80 83 84 85 </table>
-		<table name="#power"> 46 105 219 417 722 1136 1626 1876 2112 2320 2487 2617 </table>
+		<table name="#physicalAttackPower"> 46 105 219 417 722 1136 1626 1876 2112 2320 2487 2617 </table>
+		<set name="affectObject" val="NOT_FRIEND" />
 		<set name="affectRange" val="150" />
+		<set name="affectScope" val="POINT_BLANK" />
 		<set name="coolTime" val="800" />
 		<set name="effectPoint" val="-100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
@@ -41,18 +48,19 @@
 		<set name="targetType" val="AURA" />
 		<effects>
 			<effect name="PhysicalAttack">
-				<param power="#power" />
+				<param power="#physicalAttackPower" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4102" levels="3" name="Become weak against line of fire">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 2 3 4 </table>
+	<skill id="4102" levels="3" name="Surrender To Fire">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 2 3 4 </table>
 		<table name="#fireRes"> 15 25 30 </table>
 		<table name="#magicLvl"> 20 40 70 </table>
-		<table name="#mpConsume2"> 20 35 65 </table>
+		<table name="#mpConsume1"> 4 7 13 </table>
+		<table name="#mpConsume2"> 16 28 52 </table>
 		<table name="#waterRes"> 7 12 15 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="30" />
 		<set name="abnormalType" val="ARMOR_FIRE" />
 		<set name="activateRate" val="80" />
@@ -61,12 +69,14 @@
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="1500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill4279_new" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="lvlBonusRate" val="2" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
@@ -75,27 +85,31 @@
 		<effects>
 			<effect name="Debuff">
 				<sub stat="fireRes" val="#fireRes" />
+			</effect>
+			<effect name="Buff">
 				<add stat="waterRes" val="#waterRes" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4103" levels="2" name="NPC Ultimate Evasion">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 </table>
 		<table name="#magicLvl"> 40 70 </table>
 		<table name="#mpConsume2"> 35 65 </table>
 		<table name="#rEvas"> 20 25 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="30" />
 		<set name="abnormalType" val="AVOID_UP_SPECIAL" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="6000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="rEvas" val="#rEvas" />
@@ -338,10 +352,10 @@
 			</effect>
 			<effect name="Stun" />
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockBuff" />
 			<effect name="BlockDebuff" />
@@ -415,18 +429,21 @@
 		</effects>
 	</skill>
 	<skill id="4115" levels="1" name="Aden Heal">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="5000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="65" />
-		<set name="mpConsume2" val="105" />
+		<set name="mpConsume1" val="21" />
+		<set name="mpConsume2" val="84" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
 				<param power="689" />
@@ -658,10 +675,11 @@
 		</effects>
 	</skill>
 	<skill id="4126" levels="1" name="Reduction in recovery time">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="10" />
 		<set name="abnormalType" val="PUBLIC_SLOT" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="icon" val="icon.skill0164" />
@@ -669,7 +687,7 @@
 		<set name="magicLvl" val="40" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pReuse" val="0.01" />
@@ -677,18 +695,21 @@
 		</effects>
 	</skill>
 	<skill id="4127" levels="1" name="Baium: General Attack">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Baium Skills -->
+		<set name="affectObject" val="NOT_FRIEND" />
 		<set name="affectRange" val="200" />
+		<set name="affectScope" val="RANGE" />
 		<set name="castRange" val="100" />
 		<set name="coolTime" val="1000" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="400" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="magicLvl" val="75" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="AREA" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="PhysicalAttack" />
 		</effects>
@@ -748,19 +769,22 @@
 		</effects>
 	</skill>
 	<skill id="4131" levels="1" name="Stun">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Baium Skills -->
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="30" />
 		<set name="abnormalType" val="PARALYZE" />
 		<set name="abnormalVisualEffect" val="PARALYZE" />
 		<set name="activateRate" val="10" />
+		<set name="affectObject" val="NOT_FRIEND" />
 		<set name="affectRange" val="150" />
+		<set name="affectScope" val="RANGE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="castRange" val="900" />
 		<set name="coolTime" val="1400" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="1500" />
 		<set name="hitTime" val="3600" />
 		<set name="icon" val="icon.skill1170" />
 		<set name="isDebuff" val="true" />
@@ -768,16 +792,19 @@
 		<set name="magicLvl" val="75" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="AREA" />
+		<set name="targetType" val="TARGET" />
 		<set name="trait" val="PARALYZE" />
 		<effects>
-			<effect name="Paralyze" />
+			<effect name="Stun" />
 		</effects>
 	</skill>
 	<skill id="4132" levels="1" name="Spear: Pound the Ground">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectObject" val="NOT_FRIEND" />
 		<set name="affectRange" val="150" />
+		<set name="affectScope" val="POINT_BLANK" />
 		<set name="effectPoint" val="-100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
 		<set name="magicLvl" val="75" />
 		<set name="operateType" val="A1" />
@@ -790,15 +817,17 @@
 		</effects>
 	</skill>
 	<skill id="4133" levels="1" name="Angel Heal">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1000" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="magicLvl" val="75" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
 				<param power="1000" />
@@ -806,20 +835,23 @@
 		</effects>
 	</skill>
 	<skill id="4134" levels="1" name="Seal Skill">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="1000" />
+		<set name="hitCancelTime" val="4500" />
 		<set name="hitTime" val="20000" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="75" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="4135" levels="1" name="Baium Heal">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Baium Skills -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="hitTime" val="100" />
 		<set name="magicLvl" val="75" />
@@ -923,29 +955,32 @@
 		</effects>
 	</skill>
 	<skill id="4140" levels="12" name="Contract Payment">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 4 5 6 7 7 8 8 9 9 </table>
-		<table name="#damage"> -1 -1.1 -1.2 -1.3 -1.4 -1.5 -1.6 -1.6 -1.7 -1.7 -1.8 -1.8 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 7 7 8 8 9 9 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#tickMpPower"> -1 -1.1 -1.2 -1.3 -1.4 -1.5 -1.6 -1.6 -1.7 -1.7 -1.8 -1.8 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="60" />
 		<set name="abnormalType" val="DOT_MP" />
 		<set name="abnormalVisualEffect" val="DOT_BLEEDING" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="icon" val="icon.skill1100" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="TickMp">
-				<param power="#damage" />
+				<param power="#tickMpPower" />
 				<param ticks="5" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
@@ -1021,14 +1056,15 @@
 		</effects>
 	</skill>
 	<skill id="4145" levels="3" name="Decrease P. Atk.">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#pAtk"> 0.83 0.8 0.77 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="PA_DOWN" />
 		<set name="activateRate" val="10" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="effectPoint" val="-100" />
 		<set name="icon" val="icon.skill4037" />
@@ -1037,22 +1073,23 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
 				<mul stat="pAtk" val="#pAtk" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4146" levels="3" name="Decrease P.Def">
-		<!-- Confirmed CT2.5 -->
+	<skill id="4146" levels="3" name="Decrease P. Def.">
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#pDef"> 0.83 0.8 0.77 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="PD_DOWN" />
 		<set name="activateRate" val="10" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="effectPoint" val="-100" />
 		<set name="icon" val="icon.skill0122" />
@@ -1061,7 +1098,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
 				<mul stat="pDef" val="#pDef" />
@@ -1069,29 +1106,31 @@
 		</effects>
 	</skill>
 	<skill id="4147" levels="7" name="Area Dispel">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="-100" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelAll" />
 		</effects>
 	</skill>
 	<skill id="4148" levels="12" name="Poison">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
-		<table name="#abnormalLvls"> 2 3 4 5 6 7 8 8 9 9 10 10 </table>
-		<table name="#dot"> -16 -24 -32 -41 -50 -58 -63 -63 -66 -66 -68 -68 </table>
+		<table name="#abnormalLvl"> 2 3 4 5 6 7 8 8 9 9 10 10 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#tickHpPower"> -16 -24 -32 -41 -50 -58 -63 -63 -66 -66 -68 -68 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="POISON" />
 		<set name="abnormalVisualEffect" val="DOT_POISON" />
 		<set name="activateRate" val="10" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="CON" />
 		<set name="effectPoint" val="-100" />
 		<set name="icon" val="icon.skill4036" />
@@ -1100,26 +1139,28 @@
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<set name="trait" val="POISON" />
 		<effects>
 			<effect name="TickHp">
-				<param power="#dot" />
+				<param power="#tickHpPower" />
 				<param ticks="5" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4149" levels="12" name="Bleed">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
-		<table name="#abnormalLvls"> 2 3 4 5 6 7 8 8 9 9 10 10 </table>
-		<table name="#dot"> -18 -25 -34 -44 -54 -62 -67 -67 -70 -70 -71 -71 </table>
+		<table name="#abnormalLvl"> 2 3 4 5 6 7 8 8 9 9 10 10 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#tickHpPower"> -18 -25 -34 -44 -54 -62 -67 -67 -70 -70 -71 -71 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="BLEEDING" />
 		<set name="abnormalVisualEffect" val="DOT_BLEEDING" />
 		<set name="activateRate" val="10" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="CON" />
 		<set name="effectPoint" val="-100" />
 		<set name="icon" val="icon.skill0096" />
@@ -1128,41 +1169,44 @@
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<set name="trait" val="BLEED" />
 		<effects>
 			<effect name="TickHp">
-				<param power="#dot" />
+				<param power="#tickHpPower" />
 				<param ticks="5" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4150" levels="12" name="Flame">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
-		<table name="#abnormalLvls"> 2 3 4 5 6 7 8 8 9 9 10 10 </table>
-		<table name="#dot"> -14 -21 -30 -40 -51 -61 -68 -68 -72 -72 -74 -74 </table>
+		<table name="#abnormalLvl"> 2 3 4 5 6 7 8 8 9 9 10 10 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#tickHpPower"> -14 -21 -30 -40 -51 -61 -68 -68 -72 -72 -74 -74 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="DOT_ATTR" />
 		<set name="abnormalVisualEffect" val="DOT_BLEEDING" />
 		<set name="activateRate" val="10" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="attributePower" val="20" />
+		<set name="attributeType" val="FIRE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="effectPoint" val="-100" />
-		<set name="attributeType" val="FIRE" />
-		<set name="attributePower" val="20" />
 		<set name="icon" val="icon.skill1100" />
 		<set name="isDebuff" val="true" />
 		<set name="lvlBonusRate" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="TickHp">
-				<param power="#dot" />
-				<param ticks="5" />
+				<param power="#tickHpPower" />
+				<param ticks="1" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
@@ -1271,7 +1315,7 @@
 		<effects>
 			<effect name="Mp">
 				<param amount="#amount" />
- 			</effect>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4155" levels="12" name="NPC Twister - Magic">
@@ -1420,15 +1464,16 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="ONE" />
 	</skill>
-	<skill id="4162" levels="3" name="Decrease P. Atk.">
-		<!-- Confirmed CT2.5 -->
+	<skill id="4162" levels="3" name="Decrease Atk. Spd.">
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#pAtkSpd"> 0.83 0.8 0.77 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="ATTACK_TIME_UP" />
 		<set name="activateRate" val="10" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="effectPoint" val="-100" />
 		<set name="icon" val="icon.skill1206" />
@@ -1437,20 +1482,21 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
 				<mul stat="pAtkSpd" val="#pAtkSpd" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4163" levels="12" name="NPC Self Damage Shield">
-		<!-- Freya retail confirmed -->
+	<skill id="4163" levels="12" name="NPC Self-Damage Shield">
+		<!-- High Five Confirmed -->
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
 		<table name="#mpConsume2"> 12 19 26 35 45 55 65 69 72 75 77 78 </table>
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="DMG_SHIELD" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="hitTime" val="1800" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
@@ -1465,29 +1511,34 @@
 		</effects>
 	</skill>
 	<skill id="4164" levels="18" name="Paralysis">
+		<!-- High Five Confirmed -->
 		<!-- Cubic skill -->
-		<!-- Confirmed CT2.5 -->
 		<table name="#magicLvl"> 40 44 48 52 56 60 64 68 72 74 76 78 80 81 82 83 84 85 </table>
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="PARALYZE" />
 		<set name="activateRate" val="40" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="icon" val="icon.skill1170" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="lvlBonusRate" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="ENEMY" />
 		<set name="trait" val="PARALYZE" />
 		<effects>
 			<effect name="Debuff">
-				<mul stat="runSpd" val="0.5" />
 				<mul stat="pAtkSpd" val="0.5" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="mAtkSpd" val="0.5" />
 			</effect>
+			<effect name="Debuff">
+				<mul stat="runSpd" val="0.5" />
+			</effect>
 		</effects>
 		<endEffects>
 			<effect name="CallSkill">
@@ -1689,21 +1740,23 @@
 		</effects>
 	</skill>
 	<skill id="4173" levels="12" name="BOSS Might">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<table name="#magicLvl"> 14 24 34 44 54 64 74 79 84 89 94 99 </table>
 		<table name="#mpConsume2"> 8 11 15 20 25 30 34 36 38 38 39 40 </table>
 		<set name="abnormalLvl" val="99" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="PA_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.5" />
@@ -1711,21 +1764,23 @@
 		</effects>
 	</skill>
 	<skill id="4174" levels="12" name="BOSS Shield">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<table name="#magicLvl"> 14 24 34 44 54 64 74 79 84 89 94 99 </table>
 		<table name="#mpConsume2"> 8 11 15 20 25 30 34 36 38 38 39 40 </table>
 		<set name="abnormalLvl" val="99" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="PD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.5" />
@@ -1733,21 +1788,23 @@
 		</effects>
 	</skill>
 	<skill id="4175" levels="12" name="BOSS Haste">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<table name="#magicLvl"> 14 24 34 44 54 64 74 79 84 89 94 99 </table>
 		<table name="#mpConsume2"> 8 11 15 20 25 30 34 36 38 38 39 40 </table>
 		<set name="abnormalLvl" val="99" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="ATTACK_TIME_DOWN" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="1.5" />
@@ -1755,21 +1812,23 @@
 		</effects>
 	</skill>
 	<skill id="4176" levels="12" name="BOSS Reflect Damage">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<table name="#magicLvl"> 14 24 34 44 54 64 74 79 84 89 94 99 </table>
 		<table name="#mpConsume2"> 8 11 15 20 25 30 34 36 38 38 39 40 </table>
 		<set name="abnormalLvl" val="99" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="DMG_SHIELD" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="reflectDam" val="20" />
diff --git a/src/main/resources/data/stats/skills/04200-04299.xml b/src/main/resources/data/stats/skills/04200-04299.xml
index 92b985f845..a182deea57 100644
--- a/src/main/resources/data/stats/skills/04200-04299.xml
+++ b/src/main/resources/data/stats/skills/04200-04299.xml
@@ -253,54 +253,61 @@
 		</effects>
 	</skill>
 	<skill id="4209" levels="12" name="BOSS Heal">
-		<!-- Freya retail confirmed -->
-		<table name="#amount"> 2516 3150 4708 7611 11465 14839 17138 18081 19008 19977 13303 13157 </table>
+		<!-- High Five Confirmed -->
+		<table name="#healPower"> 2516 3150 4708 7611 11465 14839 17138 18081 19008 19977 13303 13157 </table>
 		<table name="#magicLvl"> 14 24 34 44 54 64 74 79 84 89 94 99 </table>
 		<table name="#mpConsume2"> 21 34 50 67 86 104 119 125 129 131 131 132 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
-				<param power="#amount" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4210" levels="12" name="Life Chant">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 11 12 13 14 15 16 17 17 18 18 19 19 </table>
-		<table name="#hot"> 180 228 337 544 819 1060 1225 1292 1358 1427 951 940 </table>
+	<skill id="4210" levels="12" name="BOSS Chant of Life">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 11 12 13 14 15 16 17 17 18 18 19 19 </table>
 		<table name="#magicLvl"> 14 24 34 44 54 64 74 79 84 89 94 99 </table>
-		<table name="#mpConsume2"> 43 69 99 134 173 207 239 250 258 262 262 263 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume1"> 9 14 20 27 35 42 48 50 52 53 53 53 </table>
+		<table name="#mpConsume2"> 34 55 79 107 138 165 191 200 206 209 209 210 </table>
+		<table name="#tickHpPower"> 180 225 337 544 819 1060 1225 1292 1358 1427 951 940 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="LIFE_FORCE_OTHERS" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="TickHp">
-				<param power="#hot" />
-				<param ticks="1" />
-			</effect>
 			<effect name="HpPerMax">
 				<param power="3" />
 			</effect>
+			<effect name="TickHp">
+				<param power="#tickHpPower" />
+				<param ticks="1" />
+				<param mode="DIFF" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4211" levels="12" name="BOSS Might">
@@ -459,7 +466,7 @@
 			</effect>
 			<effect name="Mp">
 				<param amount="-274" />
- 			</effect>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4219" levels="1" name="Hold">
diff --git a/src/main/resources/data/stats/skills/04300-04399.xml b/src/main/resources/data/stats/skills/04300-04399.xml
index c9b41b8268..aba3efac51 100644
--- a/src/main/resources/data/stats/skills/04300-04399.xml
+++ b/src/main/resources/data/stats/skills/04300-04399.xml
@@ -176,19 +176,21 @@
 		</effects>
 	</skill>
 	<skill id="4317" levels="5" name="Increase Rage Might">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 4 5 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 </table>
 		<table name="#pAtk"> 1.15 1.2 1.25 1.3 1.35 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="RAGE_MIGHT" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1800" />
 		<set name="magicLvl" val="60" />
 		<set name="mpConsume2" val="50" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtk" val="#pAtk" />
@@ -196,27 +198,40 @@
 		</effects>
 	</skill>
 	<skill id="4318" levels="1" name="Ultimate Buff">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="ULTIMATE_BUFF" />
 		<set name="abnormalVisualEffect" val="BIG_BODY" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="magicLvl" val="60" />
 		<set name="mpConsume2" val="50" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Grow">
-				<mul stat="pAtk" val="1.83" />
-				<add stat="accCombat" val="4" />
-				<add stat="rEvas" val="4" />
-				<mul stat="pDef" val="1.83" />
 				<mul stat="pAtkSpd" val="1.33" />
+			</effect>
+			<effect name="Buff">
+				<add stat="rEvas" val="4" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="critRate" val="1.3" />
+			</effect>
+			<effect name="Buff">
+				<add stat="accCombat" val="4" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="mDef" val="5" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.83" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pDef" val="1.83" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4319" levels="1" name="Paralysis">
@@ -294,60 +309,66 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4322" levels="1" name="Wind Walk for Beginners">
-		<!-- Freya retail confirmed -->
+	<skill id="4322" levels="1" name="Adventurer's Wind Walk">
+		<!-- High Five Confirmed -->
 		<!-- Newbie Guide Buff -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="SPEED_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1204" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="runSpd" val="33" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4323" levels="1" name="Shield for Beginners">
-		<!-- Freya retail confirmed -->
+	<skill id="4323" levels="1" name="Adventurer's Shield">
+		<!-- High Five Confirmed -->
 		<!-- Newbie Guide Buff -->
 		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="PD_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1040" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.15" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4324" levels="1" name="Bless the Body for Beginners">
-		<!-- Freya retail confirmed -->
+	<skill id="4324" levels="1" name="Adventurer's Bless the Body">
+		<!-- High Five Confirmed -->
 		<!-- Newbie Guide Buff -->
 		<set name="abnormalLvl" val="7" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MAX_HP_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1045" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxHp">
 				<param power="35" />
@@ -355,80 +376,88 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4325" levels="1" name="Vampiric Rage for Beginners">
-		<!-- Freya retail confirmed -->
+	<skill id="4325" levels="1" name="Adventurer's Vampiric Rage">
+		<!-- High Five Confirmed -->
 		<!-- Newbie Guide Buff -->
 		<set name="abnormalLvl" val="5" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="VAMPIRIC_ATTACK" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1268" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="absorbDam" val="9" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4326" levels="1" name="Regeneration for Beginners">
-		<!-- Freya retail confirmed -->
+	<skill id="4326" levels="1" name="Adventurer's Regeneration">
+		<!-- High Five Confirmed -->
 		<!-- Newbie Guide Buff -->
 		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="HP_REGEN_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1044" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="regHp" val="1.2" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4327" levels="1" name="Haste for Beginners">
-		<!-- Freya retail confirmed -->
+	<skill id="4327" levels="1" name="Adventurer's Haste">
+		<!-- High Five Confirmed -->
 		<!-- Newbie Guide Buff -->
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="ATTACK_TIME_DOWN" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1086" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="1.15" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4328" levels="1" name="Bless the Soul for Beginners">
-		<!-- Freya retail confirmed -->
+	<skill id="4328" levels="1" name="Adventurer's Bless the Soul">
+		<!-- High Five Confirmed -->
 		<!-- Newbie Guide Buff -->
 		<set name="abnormalLvl" val="7" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MAX_MP_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1048" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxMp">
 				<param power="35" />
@@ -436,60 +465,66 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4329" levels="1" name="Acumen for Beginners">
-		<!-- Freya retail confirmed -->
+	<skill id="4329" levels="1" name="Adventurer's Acumen">
+		<!-- High Five Confirmed -->
 		<!-- Newbie Guide Buff -->
 		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="CASTING_TIME_DOWN" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1085" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.3" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4330" levels="1" name="Concentration for Beginners">
-		<!-- Freya retail confirmed -->
+	<skill id="4330" levels="1" name="Adventurer's Concentration">
+		<!-- High Five Confirmed -->
 		<!-- Newbie Guide Buff -->
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="CANCEL_PROB_DOWN" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1078" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<sub stat="cancel" val="18" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4331" levels="1" name="Empower for Beginners">
-		<!-- Freya retail confirmed -->
+	<skill id="4331" levels="1" name="Adventurer's Empower">
+		<!-- High Five Confirmed -->
 		<!-- Newbie Guide Buff -->
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MA_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1059" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mAtk" val="1.55" />
@@ -497,7 +532,8 @@
 		</effects>
 	</skill>
 	<skill id="4332" levels="1" name="Mental Aegis">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.skill1035" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
@@ -505,33 +541,40 @@
 		<effects>
 			<effect name="DefenceTrait">
 				<param HOLD="100" />
+			</effect>
+			<effect name="DefenceTrait">
 				<param SLEEP="100" />
+			</effect>
+			<effect name="DefenceTrait">
 				<param DERANGEMENT="100" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4333" levels="5" name="Resist Dark Attack">
-		<!-- Freya retail confirmed -->
-		<table name="#darkRes"> 10 20 30 40 50 </table>
+		<!-- High Five Confirmed -->
+		<table name="#darkResPower"> 10 20 30 40 50 </table>
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.skill4333" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="Buff">
-				<add stat="darkRes" val="#darkRes" />
+				<add stat="darkRes" val="#darkResPower" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4334" levels="1" name="SSQ Cancel">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectObject" val="FRIEND" />
 		<set name="affectRange" val="2000" />
+		<set name="affectScope" val="PARTY" />
 		<set name="castRange" val="1000" />
 		<set name="effectRange" val="1500" />
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="AREA" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelAll" />
 		</effects>
@@ -574,16 +617,17 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4338" levels="1" name="Life Cubic for Beginners">
+	<skill id="4338" levels="1" name="Adventurer's Life Cubic">
 		<!-- High Five Confirmed -->
 		<!-- Newbie Guide Buff -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="18" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="SummonCubic">
 				<param cubicId="3" cubicDelay="13" cubicDuration="3600" cubicMaxCount="20" />
@@ -592,26 +636,28 @@
 		</effects>
 	</skill>
 	<skill id="4339" levels="1" name="Mimir's Elixir">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="4340" levels="1" name="Ultimate Buff, 2nd">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="30" />
 		<set name="abnormalType" val="ULTIMATE_BUFF" />
 		<set name="abnormalVisualEffect" val="BIG_BODY" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="magicLvl" val="60" />
 		<set name="mpConsume2" val="50" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Grow">
 				<mul stat="pAtk" val="5" />
@@ -619,262 +665,278 @@
 		</effects>
 	</skill>
 	<skill id="4341" levels="1" name="Ultimate Buff, 3rd">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="30" />
 		<set name="abnormalType" val="ULTIMATE_BUFF" />
 		<set name="abnormalVisualEffect" val="BIG_BODY" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="magicLvl" val="60" />
 		<set name="mpConsume2" val="50" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Grow">
-				<mul stat="pDef" val="5" />
 				<mul stat="mDef" val="5" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="pDef" val="5" />
+			</effect>
 		</effects>
 	</skill>
-	<skill id="4342" levels="2" name="Clan Hall: Wind Walk">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 </table>
+	<skill id="4342" levels="2" name="Wind Walk">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 </table>
 		<table name="#mpConsume2"> 50 100 </table>
 		<table name="#runSpd"> 20 33 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="SPEED_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1204" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="runSpd" val="#runSpd" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4343" levels="3" name="Clan Hall: Decrease Weight">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
+	<skill id="4343" levels="3" name="Decrease Weight">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#mpConsume2"> 50 0 100 </table>
-		<table name="#Weight"> 3000 6000 9000 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#weightPenalty"> 3000 6000 9000 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="DECREASE_WEIGHT_PENALTY" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1257" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<add stat="weightPenalty" val="#Weight" />
+				<add stat="weightPenalty" val="#weightPenalty" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4344" levels="3" name="Clan Hall: Shield">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#magicLvl"> 7 25 44 </table>
+	<skill id="4344" levels="3" name="Shield">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#mpConsume2"> 50 0 100 </table>
-		<table name="#rate"> 1.08 1.12 1.15 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#pDef"> 1.08 1.12 1.15 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="PD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1040" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="magicLvl" val="#magicLvl" />
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="pDef" val="#rate" />
+				<mul stat="pDef" val="#pDef" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4345" levels="3" name="Clan Hall: Might">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
+	<skill id="4345" levels="3" name="Might">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#mpConsume2"> 50 0 100 </table>
-		<table name="#rate"> 1.08 1.12 1.15 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#pAtk"> 1.08 1.12 1.15 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="PA_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1068" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="pAtk" val="#rate" />
+				<mul stat="pAtk" val="#pAtk" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4346" levels="4" name="Clan Hall: Mental Shield">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 4 </table>
+	<skill id="4346" levels="4" name="Mental Shield">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 </table>
+		<table name="#defenceTraitPower"> 50 50 50 60 </table>
 		<table name="#mpConsume2"> 50 0 0 100 </table>
-		<table name="#traits"> 20 30 40 50 </table> <!-- TODO: Freya retail has still old values (50 60 70 80) here, retail bug? -->
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="RESIST_DERANGEMENT" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1035" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DefenceTrait">
-				<param HOLD="#traits" />
-				<param SLEEP="#traits" />
-				<param DERANGEMENT="#traits" />
+				<param HOLD="#defenceTraitPower" />
+			</effect>
+			<effect name="DefenceTrait">
+				<param SLEEP="#defenceTraitPower" />
+			</effect>
+			<effect name="DefenceTrait">
+				<param DERANGEMENT="#defenceTraitPower" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4347" levels="6" name="Clan Hall: Blessed Body">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 4 5 6 </table>
-		<table name="#maxHp"> 10 15 20 25 30 35 </table>
+	<skill id="4347" levels="6" name="Blessed Body">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 </table>
+		<table name="#maxHpPower"> 10 15 20 25 30 35 </table>
 		<table name="#mpConsume2"> 0 150 0 0 0 300 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="MAX_HP_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1045" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxHp">
-				<param power="#maxHp" />
+				<param power="#maxHpPower" />
 				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4348" levels="6" name="Clan Hall: Blessed Soul">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 4 5 6 </table>
-		<table name="#maxMp"> 10 15 20 25 30 35 </table>
+	<skill id="4348" levels="6" name="Blessed Soul">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 </table>
+		<table name="#maxMpPower"> 10 15 20 25 30 35 </table>
 		<table name="#mpConsume2"> 0 150 0 0 0 300 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="MAX_MP_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1048" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxMp">
-				<param power="#maxMp" />
+				<param power="#maxMpPower" />
 				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4349" levels="2" name="Clan Hall: Magic Barrier">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 2 3 </table>
+	<skill id="4349" levels="2" name="Magic Barrier">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 2 3 </table>
 		<table name="#mDef"> 1.23 1.3 </table>
 		<table name="#mpConsume2"> 150 300 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="MD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1036" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mDef" val="#mDef" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4350" levels="4" name="Clan Hall: Resist Shock">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 4 </table>
+	<skill id="4350" levels="4" name="Resist Stun">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 </table>
+		<table name="#defenceTraitPower"> 15 20 30 40 </table>
 		<table name="#mpConsume2"> 150 0 0 300 </table>
-		<table name="#trait_shock"> 15 20 30 40 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="RESIST_SHOCK" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1259" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DefenceTrait">
-				<param SHOCK="#trait_shock" />
+				<param SHOCK="#defenceTraitPower" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4351" levels="6" name="Clan Hall: Concentration">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 4 5 6 </table>
-		<table name="#cancel"> 18 25 36 42 48 53 </table>
+	<skill id="4351" levels="6" name="Concentration">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 </table>
+		<table name="#cancelPower"> 18 25 36 42 48 53 </table>
 		<table name="#mpConsume2"> 0 200 0 0 0 400 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="CANCEL_PROB_DOWN" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1078" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<sub stat="cancel" val="#cancel" />
+				<sub stat="cancel" val="#cancelPower" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4352" levels="2" name="Clan Hall: Berserker Spirit">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 </table>
+	<skill id="4352" levels="2" name="Berserker Spirit">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 </table>
 		<table name="#mAtk"> 1.1 1.16 </table>
 		<table name="#mAtkSpd"> 1.05 1.08 </table>
 		<table name="#mDef"> 0.9 0.84 </table>
@@ -884,285 +946,309 @@
 		<table name="#pDef"> 0.95 0.92 </table>
 		<table name="#rEvas"> 2 4 </table>
 		<table name="#runSpd"> 5 8 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="BERSERKER" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1062" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="#pAtkSpd" />
+			</effect>
+			<effect name="Debuff">
+				<sub stat="rEvas" val="#rEvas" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="#mAtkSpd" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtk" val="#mAtk" />
-				<mul stat="pAtk" val="#pAtk" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="mDef" val="#mDef" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="#pAtk" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="pDef" val="#pDef" />
-				<mul stat="mAtkSpd" val="#mAtkSpd" />
-				<mul stat="pAtkSpd" val="#pAtkSpd" />
+			</effect>
+			<effect name="Buff">
 				<add stat="runSpd" val="#runSpd" />
-				<sub stat="rEvas" val="#rEvas" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4353" levels="6" name="Clan Hall: Bless Shield">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 4 5 6 </table>
+	<skill id="4353" levels="6" name="Bless Shield">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 </table>
 		<table name="#mpConsume2"> 0 200 0 0 0 400 </table>
 		<table name="#rShld"> 1.05 1.1 1.15 1.2 1.25 1.3 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="SHIELD_PROB_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1243" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="rShld" val="#rShld" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4354" levels="4" name="Clan Hall: Vampiric Rage">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 4 </table>
+	<skill id="4354" levels="4" name="Vampiric Rage">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 </table>
 		<table name="#absorbDam"> 6 7 8 9 </table>
 		<table name="#mpConsume2"> 200 0 0 400 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="VAMPIRIC_ATTACK" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1268" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="absorbDam" val="#absorbDam" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4355" levels="3" name="Clan Hall: Acumen">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
+	<skill id="4355" levels="3" name="Acumen">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#mAtkSpd"> 1.15 1.23 1.3 </table>
 		<table name="#mpConsume2"> 300 0 600 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="CASTING_TIME_DOWN" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1085" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="#mAtkSpd" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4356" levels="3" name="Clan Hall: Empower">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
+	<skill id="4356" levels="3" name="Empower">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#mAtk"> 1.55 1.65 1.75 </table>
 		<table name="#mpConsume2"> 300 0 600 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="MA_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1059" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mAtk" val="#mAtk" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4357" levels="2" name="Clan Hall: Haste">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 </table>
+	<skill id="4357" levels="2" name="Haste">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 </table>
 		<table name="#mpConsume2"> 300 600 </table>
 		<table name="#pAtkSpd"> 1.15 1.33 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="ATTACK_TIME_DOWN" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1086" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="#pAtkSpd" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4358" levels="3" name="Clan Hall: Guidance">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
+	<skill id="4358" levels="3" name="Guidance">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#accCombat"> 2 3 4 </table>
 		<table name="#mpConsume2"> 200 0 400 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="HIT_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1240" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="accCombat" val="#accCombat" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4359" levels="3" name="Clan Hall: Focus">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
+	<skill id="4359" levels="3" name="Focus">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
+		<table name="#critRate"> 1.2 1.25 1.3 </table>
 		<table name="#mpConsume2"> 300 0 600 </table>
-		<table name="#rCrit"> 1.2 1.25 1.3 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="CRITICAL_PROB_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1077" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="critRate" val="#rCrit" />
+				<mul stat="critRate" val="#critRate" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4360" levels="3" name="Clan Hall: Death Whisper">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#cAtk"> 1.25 1.3 1.35 </table>
+	<skill id="4360" levels="3" name="Death Whisper">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
+		<table name="#critDmg"> 1.25 1.3 1.35 </table>
 		<table name="#mpConsume2"> 300 0 600 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="CRITICAL_DMG_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1242" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="critDmg" val="#cAtk" />
+				<mul stat="critDmg" val="#critDmg" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4361" levels="2" name="Curse of Destruction">
-		<!-- Freya retail confirmed -->
-		<!-- Fighter -->
-		<table name="#abnormalLvls"> 1 2 </table>
-		<table name="#traits"> 0 50 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 </table>
+		<table name="#defenceTraitPower"> 0 50 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="SSQ_TOWN_CURSE" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="icon" val="icon.skill0046" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
 				<sub stat="accCombat" val="12" />
 			</effect>
 			<effect name="DefenceTrait">
-				<param SLEEP="#traits" />
-				<param HOLD="#traits" />
-				<param SHOCK="#traits" />
+				<param SLEEP="#defenceTraitPower" />
+				<param HOLD="#defenceTraitPower" />
+				<param SHOCK="#defenceTraitPower" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4362" levels="2" name="Curse of Destruction">
-		<!-- Freya retail confirmed -->
-		<!-- Mage -->
-		<table name="#abnormalLvls"> 1 2 </table>
-		<table name="#traits"> 0 50 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 </table>
+		<table name="#defenceTraitPower"> 0 50 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="SSQ_TOWN_CURSE" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="icon" val="icon.skill0046" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
 				<mul stat="mAtkSpd" val="0.7" />
 			</effect>
 			<effect name="DefenceTrait">
-				<param SLEEP="#traits" />
-				<param HOLD="#traits" />
-				<param SHOCK="#traits" />
+				<param SLEEP="#defenceTraitPower" />
+				<param HOLD="#defenceTraitPower" />
+				<param SHOCK="#defenceTraitPower" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4363" levels="1" name="Curse of Destruction">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="HIT_DOWN" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="icon" val="icon.skill0046" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
 				<sub stat="accCombat" val="12" />
@@ -1170,303 +1256,350 @@
 		</effects>
 	</skill>
 	<skill id="4364" levels="2" name="Blessing of Revelations">
-		<!-- Freya retail confirmed -->
-		<!-- Fighter -->
-		<table name="#abnormalLvls"> 1 2 </table>
-		<table name="#traits"> 0 25 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 </table>
+		<table name="#defenceTraitPower"> 0 25 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="SSQ_TOWN_BLESSING" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1044" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="weightLimit" val="1.25" />
-			</effect>
 			<effect name="DefenceTrait">
 				<param POISON="25" />
+			</effect>
+			<effect name="DefenceTrait">
 				<param BLEED="25" />
-				<param HOLD="#traits" />
-				<param SHOCK="#traits" />
-				<param PARALYZE="#traits" />
+			</effect>
+			<effect name="DefenceTrait">
+				<param HOLD="#defenceTraitPower" />
+			</effect>
+			<effect name="DefenceTrait">
+				<param PARALYZE="#defenceTraitPower" />
+			</effect>
+			<effect name="DefenceTrait">
+				<param PARALYZE="#defenceTraitPower" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="weightLimit" val="1.25" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4365" levels="2" name="Blessing of Revelations">
-		<!-- Mage -->
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 </table>
-		<table name="#traits"> 0 25 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 </table>
+		<table name="#defenceTraitPower"> 0 25 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="SSQ_TOWN_BLESSING" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1044" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="Buff">
-				<sub stat="cancel" val="25" />
-			</effect>
 			<effect name="DefenceTrait">
 				<param HOLD="25" />
+			</effect>
+			<effect name="DefenceTrait">
 				<param DERANGEMENT="25" />
-				<param SHOCK="#traits" />
-				<param PARALYZE="#traits" />
+			</effect>
+			<effect name="DefenceTrait">
+				<param SHOCK="#defenceTraitPower" />
+			</effect>
+			<effect name="DefenceTrait">
+				<param PARALYZE="#defenceTraitPower" />
+			</effect>
+			<effect name="Buff">
+				<sub stat="cancel" val="25" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4366" levels="1" name="Blessing of Prophecy">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="DECREASE_WEIGHT_PENALTY" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1044" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="weightLimit" val="1.25" />
-			</effect>
 			<effect name="DefenceTrait">
 				<param POISON="25" />
+			</effect>
+			<effect name="DefenceTrait">
 				<param BLEED="25" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="weightLimit" val="1.25" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4367" levels="1" name="Clan Hall Manager Buff">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="PUBLIC_SLOT" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="TickMp">
 				<param power="9.26" />
 				<param ticks="5" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4368" levels="1" name="Clan Hall Manager Buff">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="PUBLIC_SLOT" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxMp">
 				<param power="5000" />
+				<param type="DIFF" />
 			</effect>
 			<effect name="TickMp">
 				<param power="18.52" />
 				<param ticks="5" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4369" levels="1" name="Clan Hall Manager Buff">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="PUBLIC_SLOT" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxMp">
 				<param power="10000" />
+				<param type="DIFF" />
 			</effect>
 			<effect name="TickMp">
 				<param power="27.78" />
 				<param ticks="5" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4370" levels="1" name="Clan Hall Manager Buff">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="PUBLIC_SLOT" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxMp">
 				<param power="28000" />
+				<param type="DIFF" />
 			</effect>
 			<effect name="TickMp">
 				<param power="61.11" />
 				<param ticks="5" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4371" levels="1" name="Clan Hall Manager Buff">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="PUBLIC_SLOT" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxMp">
 				<param power="58000" />
+				<param type="DIFF" />
 			</effect>
 			<effect name="TickMp">
 				<param power="116.7" />
 				<param ticks="5" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4372" levels="1" name="Clan Hall Manager Buff">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="PUBLIC_SLOT" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxMp">
 				<param power="103000" />
+				<param type="DIFF" />
 			</effect>
 			<effect name="TickMp">
 				<param power="200" />
 				<param ticks="5" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4373" levels="1" name="Clan Hall Manager Buff">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="PUBLIC_SLOT" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxMp">
 				<param power="106000" />
+				<param type="DIFF" />
 			</effect>
 			<effect name="TickMp">
 				<param power="205.6" />
 				<param ticks="5" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4374" levels="1" name="Clan Hall Manager Buff">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="PUBLIC_SLOT" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxMp">
 				<param power="151000" />
+				<param type="DIFF" />
 			</effect>
 			<effect name="TickMp">
 				<param power="288.9" />
 				<param ticks="5" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4375" levels="1" name="Clan Hall Manager Buff">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="PUBLIC_SLOT" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxMp">
 				<param power="196000" />
+				<param type="DIFF" />
 			</effect>
 			<effect name="TickMp">
 				<param power="372.2" />
 				<param ticks="5" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4376" levels="1" name="Strong Resistance to P.Atk.">
-		<!-- Freya retail confirmed -->
+	<skill id="4376" levels="1" name="Strong Resistance to P. Atk.">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.skill4376" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="pDef" val="3" /> <!-- pDef +200% -->
+				<mul stat="pDef" val="3" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4377" levels="12" name="Wield Temper">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
 		<table name="#mpConsume2"> 13 20 28 38 50 61 71 76 80 83 84 85 </table>
-		<table name="#power"> 46 105 219 417 722 1136 1626 1876 2112 2320 2487 2617 </table>
+		<table name="#physicalAttackPower"> 46 105 219 417 722 1136 1626 1876 2112 2320 2487 2617 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="40" />
 		<set name="coolTime" val="800" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="6000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="ENEMY" />
 		<effects>
 			<effect name="PhysicalAttack">
-				<param power="#power" />
+				<param power="#physicalAttackPower" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4378" levels="12" name="Self Damage Shield">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
 		<table name="#mpConsume2"> 12 19 26 35 45 55 65 69 72 75 77 78 </table>
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="DMG_SHIELD" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="1" />
 		<set name="hitTime" val="1800" />
 		<set name="icon" val="icon.action105" />
@@ -1483,104 +1616,113 @@
 		</effects>
 	</skill>
 	<skill id="4379" levels="5" name="Resist Spear Weapons">
-		<!-- Freya retail confirmed -->
-		<table name="#trait_pole"> 10 20 30 40 50 </table>
+		<!-- High Five Confirmed -->
+		<table name="#defenceTraitPower"> 10 20 30 40 50 </table>
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.skill4379" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="DefenceTrait">
-				<param POLE="#trait_pole" />
+				<param POLE="#defenceTraitPower" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4380" levels="1" name="Arena CP Recovery">
-		<!-- Confirmed CT2.5 -->
-		<!-- Arena Skill -->
+	<skill id="4380" levels="1" name="Arena: CP Recovery">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Cp">
 				<param amount="5000" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4381" levels="1" name="Magic Skill Block">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.skill4381" />
 		<set name="magicLvl" val="1" />
-		<set name="operateType" val="P" /> <!-- Just Boadcast -->
+		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="4382" levels="12" name="Curse of Lake Ghost">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
 		<table name="#mpConsume2"> 13 20 28 38 50 61 71 76 80 83 84 85 </table>
-		<table name="#power"> 46 105 219 417 722 1136 1626 1876 2112 2320 2487 2617 </table>
+		<table name="#physicalAttackPower"> 46 105 219 417 722 1136 1626 1876 2112 2320 2487 2617 </table>
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="BIG_HEAD" />
 		<set name="abnormalVisualEffect" val="BIG_HEAD" />
 		<set name="activateRate" val="80" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="40" />
 		<set name="coolTime" val="800" />
 		<set name="effectPoint" val="-100" />
+		<set name="effectRange" val="200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="isDebuff" val="true" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="ENEMY" />
 		<effects>
 			<effect name="PhysicalAttack">
-				<param power="#power" />
+				<param power="#physicalAttackPower" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4383" levels="1" name="NPC Hate Stone">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="10" />
 		<set name="abnormalType" val="TURN_STONE" />
 		<set name="abnormalVisualEffect" val="FLESH_STONE" />
+		<set name="affectObject" val="NOT_FRIEND" />
 		<set name="affectRange" val="200" />
-		<set name="effectPoint" val="-100" />
-		<set name="attributeType" val="EARTH" />
+		<set name="affectScope" val="POINT_BLANK" />
 		<set name="attributePower" val="20" />
+		<set name="attributeType" val="EARTH" />
+		<set name="effectPoint" val="-100" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="A3" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="AURA" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="TargetMeProbability">
+				<param chance="40" />
+			</effect>
 			<effect name="Stun" />
+			<effect name="BlockBuff" />
+			<effect name="BlockDebuff" />
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
-			<effect name="BlockBuff" />
-			<effect name="BlockDebuff" />
 			<effect name="Buff">
 				<mul stat="regHp" val="0" />
 			</effect>
-			<effect name="TargetMeProbability">
-				<param chance="40" />
-			</effect>
 		</effects>
 	</skill>
 	<skill id="4384" levels="1" name="Scapegoat's Grace">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="PD_DOWN" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
@@ -1588,16 +1730,17 @@
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff" />
 		</effects>
 	</skill>
 	<skill id="4385" levels="1" name="Scapegoat's Grace">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="ATTACK_TIME_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
@@ -1605,16 +1748,17 @@
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff" />
 		</effects>
 	</skill>
 	<skill id="4386" levels="1" name="Scapegoat's Grace">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="10" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="POISON" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
@@ -1622,16 +1766,17 @@
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff" />
 		</effects>
 	</skill>
 	<skill id="4387" levels="1" name="Scapegoat's Grace">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="HEAL_EFFECT_DOWN" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
@@ -1639,39 +1784,42 @@
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff" />
 		</effects>
 	</skill>
 	<skill id="4388" levels="5" name="Resist Paralysis Attacks">
-		<!-- Freya retail confirmed -->
-		<table name="#trait_paralyze"> 10 20 30 40 50 </table>
+		<!-- High Five Confirmed -->
+		<table name="#defenceTraitPower"> 10 20 30 40 50 </table>
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.skill4388" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="DefenceTrait">
-				<param PARALYZE="#trait_paralyze" />
+				<param PARALYZE="#defenceTraitPower" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4389" levels="5" name="Resist Mental Derangement">
-		<!-- Freya retail confirmed -->
-		<table name="#trait_derangement"> 10 20 30 40 50 </table>
+	<skill id="4389" levels="5" name="Resist Mental Attacks">
+		<!-- High Five Confirmed -->
+		<table name="#defenceTraitPower"> 10 20 30 40 50 </table>
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.skill4389" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="DefenceTrait">
-				<param DERANGEMENT="#trait_derangement" />
+				<param DERANGEMENT="#defenceTraitPower" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4390" levels="1" name="NPC Abnormal Immunity">
-		<!-- Freya retail confirmed -->
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
@@ -1681,21 +1829,22 @@
 		</effects>
 	</skill>
 	<skill id="4391" levels="2" name="Wind Walk">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 2 3 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 2 3 </table>
 		<table name="#runSpd"> 20 33 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="SPEED_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
-		<set name="hitTime" val="100" />
 		<set name="icon" val="icon.skill1204" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="runSpd" val="#runSpd" />
@@ -1703,43 +1852,45 @@
 		</effects>
 	</skill>
 	<skill id="4392" levels="3" name="Shield">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 2 3 4 </table>
-		<table name="#rate"> 1.08 1.12 1.15 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 2 3 4 </table>
+		<table name="#pDef"> 1.08 1.12 1.15 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="PD_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
-		<set name="hitTime" val="100" />
 		<set name="icon" val="icon.skill1040" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="pDef" val="#rate" />
+				<mul stat="pDef" val="#pDef" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4393" levels="3" name="Might">
-		<!-- Freya retail confirmed -->
-		<!-- by DrLecter -->
-		<table name="#abnormalLvls"> 2 3 4 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 2 3 4 </table>
 		<table name="#pAtk"> 1.08 1.12 1.15 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="PA_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1068" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtk" val="#pAtk" />
@@ -1747,64 +1898,70 @@
 		</effects>
 	</skill>
 	<skill id="4394" levels="6" name="Blessed Body">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 2 3 4 5 6 7 </table>
-		<table name="#maxHp"> 10 15 20 25 30 35 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 2 3 4 5 6 7 </table>
+		<table name="#maxHpPower"> 10 15 20 25 30 35 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MAX_HP_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1045" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxHp">
-				<param power="#maxHp" />
+				<param power="#maxHpPower" />
 				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4395" levels="6" name="Blessed Soul">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 2 3 4 5 6 7 </table>
-		<table name="#maxMp"> 10 15 20 25 30 35 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 2 3 4 5 6 7 </table>
+		<table name="#maxMpPower"> 10 15 20 25 30 35 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MAX_MP_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1048" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxMp">
-				<param power="#maxMp" />
+				<param power="#maxMpPower" />
 				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4396" levels="2" name="Magic Barrier">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 3 4 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 3 4 </table>
 		<table name="#mDef"> 1.23 1.3 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MD_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1036" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mDef" val="#mDef" />
@@ -1812,9 +1969,8 @@
 		</effects>
 	</skill>
 	<skill id="4397" levels="2" name="Berserker Spirit">
-		<!-- Freya retail confirmed -->
-		<!-- by DrLecter -->
-		<table name="#abnormalLvls"> 2 3 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 2 3 </table>
 		<table name="#mAtk"> 1.1 1.16 </table>
 		<table name="#mAtkSpd"> 1.05 1.08 </table>
 		<table name="#mDef"> 0.9 0.84 </table>
@@ -1823,45 +1979,63 @@
 		<table name="#pDef"> 0.95 0.92 </table>
 		<table name="#rEvas"> 2 4 </table>
 		<table name="#runSpd"> 5 8 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="BERSERKER" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1062" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="pAtk" val="#pAtk" />
 				<mul stat="pAtkSpd" val="#pAtkSpd" />
-				<mul stat="mAtk" val="#mAtk" />
-				<mul stat="mAtkSpd" val="#mAtkSpd" />
-				<add stat="runSpd" val="#runSpd" />
+			</effect>
+			<effect name="Debuff">
 				<sub stat="rEvas" val="#rEvas" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="#mAtkSpd" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="#mAtk" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="mDef" val="#mDef" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="#pAtk" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="pDef" val="#pDef" />
 			</effect>
+			<effect name="Buff">
+				<add stat="runSpd" val="#runSpd" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4398" levels="6" name="Bless Shield">
-		<!-- Freya retail confirmed -->
-		<table name="#abnormalLvls"> 2 3 4 5 6 7 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 2 3 4 5 6 7 </table>
 		<table name="#rShld"> 1.05 1.1 1.15 1.2 1.25 1.3 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="SHIELD_PROB_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1243" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="rShld" val="#rShld" />
@@ -1869,21 +2043,22 @@
 		</effects>
 	</skill>
 	<skill id="4399" levels="4" name="Vampiric Rage">
-		<!-- Freya retail confirmed -->
-		<!-- by DrLecter -->
-		<table name="#abnormalLvls"> 2 3 4 5 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 2 3 4 5 </table>
 		<table name="#absorbDam"> 6 7 8 9 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="VAMPIRIC_ATTACK" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1268" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="absorbDam" val="#absorbDam" />
diff --git a/src/main/resources/data/stats/skills/04400-04499.xml b/src/main/resources/data/stats/skills/04400-04499.xml
index 49e03e3ef5..e85036588d 100644
--- a/src/main/resources/data/stats/skills/04400-04499.xml
+++ b/src/main/resources/data/stats/skills/04400-04499.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="4400" levels="3" name="Acumen">
-		<!-- Confirmed CT2.5 -->
-		<table name="#abnormalLvls"> 2 3 4 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 2 3 4 </table>
 		<table name="#mAtkSpd"> 1.15 1.23 1.3 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="CASTING_TIME_DOWN" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1085" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="#mAtkSpd" />
@@ -22,20 +24,22 @@
 		</effects>
 	</skill>
 	<skill id="4401" levels="3" name="Empower">
-		<!-- Confirmed CT2.5 -->
-		<table name="#abnormalLvls"> 2 3 4 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 2 3 4 </table>
 		<table name="#mAtk"> 1.55 1.65 1.75 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MA_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1059" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mAtk" val="#mAtk" />
@@ -43,20 +47,22 @@
 		</effects>
 	</skill>
 	<skill id="4402" levels="2" name="Haste">
-		<!-- Confirmed CT2.5 -->
-		<table name="#abnormalLvls"> 2 3 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 2 3 </table>
 		<table name="#pAtkSpd"> 1.15 1.33 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="ATTACK_TIME_DOWN" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1086" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="#pAtkSpd" />
@@ -64,20 +70,22 @@
 		</effects>
 	</skill>
 	<skill id="4403" levels="3" name="Guidance">
-		<!-- Confirmed CT2.5 -->
-		<table name="#abnormalLvls"> 2 3 4 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 2 3 4 </table>
 		<table name="#accCombat"> 2 3 4 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="HIT_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1240" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="accCombat" val="#accCombat" />
@@ -85,62 +93,68 @@
 		</effects>
 	</skill>
 	<skill id="4404" levels="3" name="Focus">
-		<!-- Confirmed CT2.5 -->
-		<table name="#abnormalLvls"> 2 3 4 </table>
-		<table name="#rCrit"> 1.2 1.25 1.3 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 2 3 4 </table>
+		<table name="#critRate"> 1.2 1.25 1.3 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="CRITICAL_PROB_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1077" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="critRate" val="#rCrit" />
+				<mul stat="critRate" val="#critRate" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4405" levels="3" name="Death Whisper">
-		<!-- Confirmed CT2.5 -->
-		<table name="#abnormalLvls"> 2 3 4 </table>
-		<table name="#cAtk"> 1.25 1.3 1.35 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 2 3 4 </table>
+		<table name="#critDmg"> 1.25 1.3 1.35 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="CRITICAL_DMG_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1242" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="critDmg" val="#cAtk" />
+				<mul stat="critDmg" val="#critDmg" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4406" levels="3" name="Agility">
-		<!-- Confirmed CT2.5 -->
-		<table name="#abnormalLvls"> 2 3 4 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 2 3 4 </table>
 		<table name="#rEvas"> 2 3 4 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="AVOID_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1087" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="rEvas" val="#rEvas" />
@@ -1110,23 +1124,24 @@
 		</effects>
 	</skill>
 	<skill id="4468" levels="2" name="Area Buff - Wind Walk">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
-		<table name="#abnormalLvls"> 1 2 </table>
+		<table name="#abnormalLvl"> 1 2 </table>
 		<table name="#magicLvl"> 30 70 </table>
-		<table name="#speed"> 20 33 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#runSpd"> 20 33 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="SPEED_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<add stat="runSpd" val="#speed" />
+				<add stat="runSpd" val="#runSpd" />
 			</effect>
 		</effects>
 	</skill>
@@ -1138,17 +1153,19 @@
 		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="4470" levels="1" name="NPC Spoils">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="40" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="400" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1800" />
 		<set name="magicLvl" val="35" />
 		<set name="mpConsume2" val="12" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="4471" levels="12" name="NPC Anger">
 		<!-- Confirmed CT2.5 -->
@@ -1230,65 +1247,74 @@
 		</effects>
 	</skill>
 	<skill id="4474" levels="5" name="Area Heal - Per">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
-		<table name="#amount"> 20 40 60 80 100 </table>
+		<table name="#hpPerMaxPower"> 20 40 60 80 100 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="HpPerMax">
-				<param power="#amount" />
+				<param power="#hpPerMaxPower" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4475" levels="1" name="Perfect Resist Bleeding">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="10" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="BLEEDING" />
 		<set name="activateRate" val="0" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="55" />
-		<set name="mpConsume2" val="50" />
+		<set name="mpConsume1" val="10" />
+		<set name="mpConsume2" val="40" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="3000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="DispelBySlot">
+				<param dispel="BLEEDING,9" />
+			</effect>
 			<effect name="DefenceTrait">
 				<param BLEED="100" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4476" levels="5" name="Silent Move">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<table name="#abnormalTime"> 60 120 300 600 1200 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 </table>
-		<table name="#mpConsume2"> 10 16 21 28 36 </table>
 		<table name="#mpConsume1"> 3 4 6 7 9 </table>
+		<table name="#mpConsume2"> 10 16 21 28 36 </table>
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="#abnormalTime" />
 		<set name="abnormalType" val="STEALTH" />
 		<set name="activateRate" val="0" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill0221" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="3000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="SilentMove" />
 		</effects>
@@ -1342,23 +1368,25 @@
 		</effects>
 	</skill>
 	<skill id="4479" levels="1" name="Ice Fairy Resist Cold">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="1800" />
 		<set name="abnormalType" val="ARMOR_WATER" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1182" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="64" />
-		<set name="mpConsume2" val="31" />
 		<set name="mpConsume1" val="8" />
+		<set name="mpConsume2" val="31" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="6000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="waterRes" val="50" />
@@ -1366,23 +1394,25 @@
 		</effects>
 	</skill>
 	<skill id="4480" levels="1" name="Ice Fairy Curse Gloom">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="1800" />
 		<set name="abnormalType" val="MD_DOWN" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="1000" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1200" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="64" />
-		<set name="mpConsume2" val="93" />
 		<set name="mpConsume1" val="24" />
+		<set name="mpConsume2" val="93" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="6000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
 				<mul stat="mDef" val="0.8" />
@@ -1390,23 +1420,25 @@
 		</effects>
 	</skill>
 	<skill id="4481" levels="1" name="Ice Fairy Hex">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="1800" />
 		<set name="abnormalType" val="PD_DOWN" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="1000" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1200" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="64" />
-		<set name="mpConsume2" val="93" />
 		<set name="mpConsume1" val="24" />
+		<set name="mpConsume2" val="93" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="6000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
 				<mul stat="pDef" val="0.7" />
@@ -1414,11 +1446,12 @@
 		</effects>
 	</skill>
 	<skill id="4482" levels="1" name="Ice Fairy Silence">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="99" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="SILENCE_ALL" />
 		<set name="abnormalVisualEffect" val="SILENCE" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="1000" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1500" />
@@ -1428,36 +1461,40 @@
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="Mute" />
 			<effect name="PhysicalMute" />
+			<effect name="Mute" />
 		</effects>
 	</skill>
 	<skill id="4483" levels="12" name="Hold">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<table name="#isMagic"> 0 1 1 1 1 1 1 1 1 1 1 1 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<table name="#mpConsume2"> 19 31 42 56 62 88 104 110 116 120 122 124 </table>
 		<table name="#mpConsume1"> 5 8 11 14 18 22 26 28 29 30 31 31 </table>
+		<table name="#mpConsume2"> 19 31 42 56 72 88 104 110 116 120 122 124 </table>
+		<table name="#rideState"> NONE NONE;STRIDER;WYVERN;WOLF NONE;STRIDER;WYVERN;WOLF NONE;STRIDER;WYVERN;WOLF NONE;STRIDER;WYVERN;WOLF NONE;STRIDER;WYVERN;WOLF NONE;STRIDER;WYVERN;WOLF NONE;STRIDER;WYVERN;WOLF NONE;STRIDER;WYVERN;WOLF NONE;STRIDER;WYVERN;WOLF NONE;STRIDER;WYVERN;WOLF NONE;STRIDER;WYVERN;WOLF </table>
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="30" />
 		<set name="abnormalType" val="ROOT_MAGICALLY" />
 		<set name="abnormalVisualEffect" val="ROOT" />
 		<set name="activateRate" val="40" />
+		<set name="affectObject" val="NOT_FRIEND" />
 		<set name="affectRange" val="200" />
+		<set name="affectScope" val="POINT_BLANK" />
 		<set name="basicProperty" val="MEN" />
 		<set name="effectPoint" val="-100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3300" />
 		<set name="icon" val="icon.skill4047" />
 		<set name="isDebuff" val="true" />
 		<set name="isMagic" val="#isMagic" />
 		<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="8000" />
-		<set name="rideState" val="NONE" />
+		<set name="rideState" val="#rideState" />
 		<set name="targetType" val="AURA" />
 		<set name="trait" val="HOLD" />
 		<effects>
@@ -1465,7 +1502,8 @@
 		</effects>
 	</skill>
 	<skill id="4484" levels="1" name="Eating Follower Heal">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
@@ -1473,7 +1511,7 @@
 		<set name="magicLvl" val="75" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="HpPerMax">
 				<param power="50" />
@@ -1481,15 +1519,17 @@
 		</effects>
 	</skill>
 	<skill id="4485" levels="1" name="Eating Follower">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="40" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="400" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
 		<set name="magicLvl" val="75" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="4486" levels="12" name="Decrease P. Def">
 		<!-- Confirmed CT2.5 -->
@@ -1692,32 +1732,34 @@
 		</effects>
 	</skill>
 	<skill id="4493" levels="12" name="NPC Debuff Shield Slow">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<table name="#mpConsume2"> 10 16 21 28 36 44 52 55 58 60 61 62 </table>
 		<table name="#mpConsume1"> 3 4 6 7 9 11 13 14 15 15 16 16 </table>
+		<table name="#mpConsume2"> 10 16 21 28 36 44 52 55 58 60 61 62 </table>
 		<table name="#triggeredLevel"> 1 2 3 4 5 6 7 8 9 10 11 12 </table>
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="DEBUFF_SHIELD" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<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="8000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param minDamage="1" />
 				<param chance="50" />
 				<param skillId="5022" skillLevel="#triggeredLevel" /> <!-- Decrease Speed -->
-				<param targetType="ONE" />
+				<param targetType="TARGET" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/src/main/resources/data/stats/skills/04500-04599.xml b/src/main/resources/data/stats/skills/04500-04599.xml
index 40c5161524..844e6081a5 100644
--- a/src/main/resources/data/stats/skills/04500-04599.xml
+++ b/src/main/resources/data/stats/skills/04500-04599.xml
@@ -122,10 +122,10 @@
 		<effects>
 			<effect name="Stun" />
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockBuff" />
 			<effect name="BlockDebuff" />
@@ -135,20 +135,22 @@
 		</effects>
 	</skill>
 	<skill id="4516" levels="1" name="Orfen Heal">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Orfen Skills -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="99" />
-		<set name="mpConsume2" val="64" />
 		<set name="mpConsume1" val="16" />
+		<set name="mpConsume2" val="64" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
 				<param power="5600" />
@@ -230,24 +232,25 @@
 		</effects>
 	</skill>
 	<skill id="4522" levels="1" name="Eye of Assassin">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="PUBLIC_SLOT" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill0016" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="critRatePos" val="2">
 					<player behind="true" />
 				</mul>
-				<!-- TODO: Missing bonus for Rapier -->
 			</effect>
 		</effects>
 	</skill>
@@ -313,17 +316,19 @@
 		</effects>
 	</skill>
 	<skill id="4527" levels="1" name="Quest - BOSS Inc HP to Summoned">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="PUBLIC_SLOT" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxHp">
 				<param power="30" />
@@ -333,17 +338,19 @@
 		</effects>
 	</skill>
 	<skill id="4528" levels="1" name="Quest - BOSS Movement to Summoned">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="PUBLIC_SLOT" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="900" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="runSpd" val="33" />
@@ -409,196 +416,243 @@
 		</effects>
 	</skill>
 	<skill id="4533" levels="1" name="Dance of Resistance">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="DANCE_OF_INSPIRATION" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill0272" />
 		<set name="isDebuff" val="true" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
-				<mul stat="runSpd" val="0.5" />
 				<sub stat="accCombat" val="40" />
 			</effect>
+			<effect name="Debuff">
+				<mul stat="runSpd" val="0.5" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4534" levels="1" name="Dance of Nihil">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="DANCE_OF_FURY" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill0275" />
 		<set name="isDebuff" val="true" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
 				<mul stat="pAtkSpd" val="0.7" />
+			</effect>
+			<effect name="Debuff">
 				<sub stat="rEvas" val="40" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4535" levels="1" name="Dance of Weakness">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="DANCE_OF_VAMPIRE" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill0310" />
 		<set name="isDebuff" val="true" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
-				<mul stat="pDef" val="0.5" />
 				<mul stat="pAtk" val="0.5" />
 			</effect>
+			<effect name="Debuff">
+				<mul stat="pDef" val="0.5" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4536" levels="1" name="Song of Seduce">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="SONG_OF_WIND" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill0268" />
 		<set name="isDebuff" val="true" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
-				<mul stat="runSpd" val="0.5" />
 				<sub stat="accCombat" val="40" />
 			</effect>
+			<effect name="Debuff">
+				<mul stat="runSpd" val="0.5" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4537" levels="1" name="Song of Sweet Whisper">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="SONG_OF_WATER" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill0266" />
 		<set name="isDebuff" val="true" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
 				<mul stat="pAtkSpd" val="0.7" />
+			</effect>
+			<effect name="Debuff">
 				<sub stat="rEvas" val="40" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4538" levels="1" name="Song of Temptation">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="SONG_OF_VENGEANCE" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill0305" />
 		<set name="isDebuff" val="true" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
-				<mul stat="pDef" val="0.5" />
 				<mul stat="pAtk" val="0.5" />
 			</effect>
+			<effect name="Debuff">
+				<mul stat="pDef" val="0.5" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4539" levels="1" name="Curse of Vague">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="HIT_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1240" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
-				<mul stat="runSpd" val="0.5" />
 				<sub stat="accCombat" val="40" />
 			</effect>
+			<effect name="Debuff">
+				<mul stat="runSpd" val="0.5" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4540" levels="1" name="Curse of Weakness">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="PD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1040" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
 				<mul stat="pDef" val="0.5" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="runSpd" val="0.5" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4541" levels="1" name="Curse of Nihil">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="PA_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1068" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
-				<mul stat="pAtk" val="0.5" />
 				<mul stat="pAtkSpd" val="0.5" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="mAtk" val="0.5" />
 			</effect>
+			<effect name="Debuff">
+				<mul stat="pAtk" val="0.5" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4542" levels="1" name="Quest - Henchman 90% Sleep Stun Weakness">
@@ -658,41 +712,45 @@
 		</effects>
 	</skill>
 	<skill id="4546" levels="1" name="Quest - Commune to Slate">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="1000" />
 		<set name="effectRange" val="1500" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="4547" levels="1" name="Gaze of Watcher">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="WATCHER_GAZE" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="1000" />
 		<set name="effectRange" val="1500" />
 		<set name="icon" val="icon.skill0131" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<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="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff" />
 		</effects>
 	</skill>
 	<skill id="4548" levels="1" name="Quest - Dispel Watcher Gaze">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="1000" />
 		<set name="effectRange" val="1500" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelBySlot">
 				<param dispel="WATCHER_GAZE,1" />
@@ -700,211 +758,256 @@
 		</effects>
 	</skill>
 	<skill id="4549" levels="1" name="Quest - Unsealed Altar">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="4550" levels="1" name="Quest - Cursed Altar">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="4551" levels="10" name="Hot Springs Rheumatism">
-		<table name="#abnormalLvls"> 1 2 3 4 5 6 7 8 9 10 </table>
-		<table name="#pDef"> 1 0.96 0.96 0.96 0.92 0.92 0.92 0.88 0.88 0.85 </table>
-		<table name="#rCrit"> 30 50 80 100 50 0 0 0 0 0 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 7 8 9 10 </table>
+		<table name="#critRate"> 3 5 8 10 5 0 0 0 0 0 </table>
+		<table name="#pDef"> 1.00 0.96 0.96 0.96 0.92 0.92 0.92 0.88 0.88 0.85 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="SPA_DISEASE_A" />
 		<set name="abnormalVisualEffect" val="DOT_POISON" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="1100" />
 		<set name="icon" val="icon.skill1164" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="75" />
-		<set name="mpConsume2" val="55" />
 		<set name="mpConsume1" val="14" />
+		<set name="mpConsume2" val="55" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="Buff">
+				<add stat="critRate" val="#critRate" />
+			</effect>
 			<effect name="Debuff">
 				<mul stat="pDef" val="#pDef" />
-				<add stat="critRate" val="#rCrit" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4552" levels="10" name="Hot Springs Cholera">
-		<table name="#abnormalLvls"> 1 2 3 4 5 6 7 8 9 10 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 7 8 9 10 </table>
 		<table name="#accCombat"> 3 6 8 10 6 0 0 0 0 0 </table>
 		<table name="#rEvas"> 0 3 3 3 5 5 5 8 8 10 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="SPA_DISEASE_B" />
 		<set name="abnormalVisualEffect" val="DOT_POISON" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="1100" />
 		<set name="icon" val="icon.skill1164" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="75" />
-		<set name="mpConsume2" val="55" />
 		<set name="mpConsume1" val="14" />
+		<set name="mpConsume2" val="55" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="Buff">
+				<add stat="accCombat" val="#accCombat" />
+			</effect>
 			<effect name="Debuff">
 				<sub stat="rEvas" val="#rEvas" />
-				<add stat="accCombat" val="#accCombat" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4553" levels="10" name="Hot Springs Flu">
-		<table name="#abnormalLvls"> 1 2 3 4 5 6 7 8 9 10 </table>
-		<table name="#pAtk"> 1 0.96 0.96 0.96 0.92 0.92 0.92 0.88 0.88 0.85 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 7 8 9 10 </table>
+		<table name="#pAtk"> 1.00 0.96 0.96 0.96 0.92 0.92 0.92 0.88 0.88 0.85 </table>
 		<table name="#pAtkSpd"> 1.04 1.08 1.12 1.16 1.08 1 1 1 1 1 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="SPA_DISEASE_C" />
 		<set name="abnormalVisualEffect" val="DOT_POISON" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="1100" />
 		<set name="icon" val="icon.skill1164" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="75" />
-		<set name="mpConsume2" val="55" />
 		<set name="mpConsume1" val="14" />
+		<set name="mpConsume2" val="55" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="#pAtkSpd" />
+			</effect>
 			<effect name="Debuff">
 				<mul stat="pAtkSpd" val="#pAtkSpd" />
-				<mul stat="pAtk" val="#pAtk" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4554" levels="10" name="Hot Spring Malaria">
-		<table name="#abnormalLvls"> 1 2 3 4 5 6 7 8 9 10 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 7 8 9 10 </table>
 		<table name="#mAtkSpd"> 1.04 1.08 1.12 1.16 1.08 1 1 1 1 1 </table>
-		<table name="#MpConsumeRate"> 1 0.96 0.96 0.96 0.92 0.92 0.92 0.88 0.88 0.84 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#magicalMpConsumeRate"> 1.00 0.96 0.96 0.96 0.92 0.92 0.92 0.88 0.88 0.84 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="SPA_DISEASE_D" />
 		<set name="abnormalVisualEffect" val="DOT_POISON" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="1100" />
 		<set name="icon" val="icon.skill1164" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="75" />
-		<set name="mpConsume2" val="55" />
 		<set name="mpConsume1" val="14" />
+		<set name="mpConsume2" val="55" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="Debuff">
+			<effect name="Buff">
 				<mul stat="mAtkSpd" val="#mAtkSpd" />
-				<mul stat="magicalMpConsumeRate" val="#MpConsumeRate" />
+			</effect>
+			<effect name="Debuff">
+				<mul stat="magicalMpConsumeRate" val="#magicalMpConsumeRate" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4555" levels="1" name="NPC Resist Mutant">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="magicLvl" val="75" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="DefenceTrait">
 				<param POISON="20" />
+			</effect>
+			<effect name="DefenceTrait">
 				<param BLEED="20" />
+			</effect>
+			<effect name="DefenceTrait">
 				<param HOLD="20" />
+			</effect>
+			<effect name="DefenceTrait">
 				<param SHOCK="20" />
+			</effect>
+			<effect name="DefenceTrait">
 				<param PARALYZE="20" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4556" levels="1" name="Dispel Hot Spring Disease A_D">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="75" />
-		<set name="mpConsume2" val="55" />
 		<set name="mpConsume1" val="14" />
+		<set name="mpConsume2" val="55" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelBySlot">
-				<param dispel="SPA_DISEASE_A,10;SPA_DISEASE_D,10" />
+				<param dispel="SPA_DISEASE_A,10" />
+			</effect>
+			<effect name="DispelBySlot">
+				<param dispel="SPA_DISEASE_D,10" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4557" levels="1" name="Dispel Hot Spring Disease B_D">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="75" />
-		<set name="mpConsume2" val="55" />
 		<set name="mpConsume1" val="14" />
+		<set name="mpConsume2" val="55" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelBySlot">
-				<param dispel="SPA_DISEASE_B,10;SPA_DISEASE_D,10" />
+				<param dispel="SPA_DISEASE_B,10" />
+			</effect>
+			<effect name="DispelBySlot">
+				<param dispel="SPA_DISEASE_D,10" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4558" levels="1" name="Dispel Hot Spring Disease C_D">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="75" />
-		<set name="mpConsume2" val="55" />
 		<set name="mpConsume1" val="14" />
+		<set name="mpConsume2" val="55" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelBySlot">
-				<param dispel="SPA_DISEASE_C,10;SPA_DISEASE_D,10" />
+				<param dispel="SPA_DISEASE_C,10" />
+			</effect>
+			<effect name="DispelBySlot">
+				<param dispel="SPA_DISEASE_D,10" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4559" levels="1" name="Hot Spring Illusion">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="BIG_HEAD" />
 		<set name="abnormalVisualEffect" val="BIG_HEAD" />
 		<set name="activateRate" val="0" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="magicLvl" val="75" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="4560" levels="12" name="NPC Fire Burn">
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
@@ -1362,10 +1465,10 @@
 		<effects>
 			<effect name="Stun" />
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockBuff" />
 			<effect name="BlockDebuff" />
diff --git a/src/main/resources/data/stats/skills/04600-04699.xml b/src/main/resources/data/stats/skills/04600-04699.xml
index 059db60a9d..2fd607a410 100644
--- a/src/main/resources/data/stats/skills/04600-04699.xml
+++ b/src/main/resources/data/stats/skills/04600-04699.xml
@@ -1,18 +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="4600" levels="12" name="Reducing P. Def Stun">
-		<table name="#abnormalLvls"> 11 12 12 13 13 13 13 13 13 13 13 13 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 11 12 12 13 13 13 13 13 13 13 13 13 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<table name="#mpConsume2"> 24 39 54 73 94 116 136 144 152 158 161 163 </table>
+		<table name="#mpConsume2"> 24 39 54 73 94 116 136 144 152 157 161 163 </table>
 		<table name="#pDef"> 0.83 0.8 0.8 0.77 0.77 0.77 0.77 0.77 0.77 0.77 0.77 0.77 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#physicalAttackPower"> 16 35 73 139 241 379 542 626 704 774 829 873 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="9" />
 		<set name="abnormalType" val="STUN" />
 		<set name="abnormalVisualEffect" val="STUN" />
 		<set name="activateRate" val="40" />
+		<set name="affectObject" val="NOT_FRIEND" />
 		<set name="affectRange" val="150" />
+		<set name="affectScope" val="POINT_BLANK" />
 		<set name="basicProperty" val="CON" />
 		<set name="effectPoint" val="-100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1800" />
 		<set name="icon" val="icon.skill0100" />
 		<set name="isDebuff" val="true" />
@@ -22,13 +27,14 @@
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="6000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="AURA" />
+		<set name="targetType" val="TARGET" />
 		<set name="trait" val="SHOCK" />
 		<effects>
 			<effect name="PhysicalAttack">
-				<param power="16" />
+				<param power="#physicalAttackPower" />
 			</effect>
-			<effect name="Stun">
+			<effect name="Stun" />
+			<effect name="Debuff">
 				<mul stat="pDef" val="#pDef" />
 			</effect>
 		</effects>
@@ -456,44 +462,49 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="4616" levels="1" name="Fake Petrification">
+	<skill id="4616" levels="1" name="Fake Petrificiation">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="360" />
 		<set name="abnormalType" val="TURN_STONE" />
 		<set name="abnormalVisualEffect" val="FLESH_STONE" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="attributePower" val="20" />
+		<set name="attributeType" val="EARTH" />
 		<set name="effectPoint" val="100" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="80" />
-		<set name="mpConsume2" val="58" />
 		<set name="mpConsume1" val="15" />
+		<set name="mpConsume2" val="58" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Stun" />
+			<effect name="BlockBuff" />
+			<effect name="BlockDebuff" />
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
-			<effect name="BlockBuff" />
-			<effect name="BlockDebuff" />
-			<effect name="Buff">
+			<effect name="Debuff">
 				<mul stat="regHp" val="0" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4617" levels="1" name="Dispel Petrification">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="80" />
-		<set name="mpConsume2" val="58" />
 		<set name="mpConsume1" val="15" />
+		<set name="mpConsume2" val="58" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelBySlot">
 				<param dispel="TURN_STONE,2" />
@@ -520,16 +531,19 @@
 		</effects>
 	</skill>
 	<skill id="4619" levels="1" name="NPC Dispel Sleep">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="40" />
-		<set name="mpConsume2" val="35" />
+		<set name="mpConsume1" val="7" />
+		<set name="mpConsume2" val="28" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelBySlot">
 				<param dispel="SLEEP,1" />
@@ -637,23 +651,24 @@
 		</effects>
 	</skill>
 	<skill id="4624" levels="12" name="Decrease HP Regeneration Rate">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="HEAL_EFFECT_DOWN" />
 		<set name="activateRate" val="10" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="effectPoint" val="-100" />
 		<set name="icon" val="icon.skill1269" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="lvlBonusRate" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
 				<mul stat="healEffect" val="0" />
@@ -661,25 +676,26 @@
 		</effects>
 	</skill>
 	<skill id="4625" levels="12" name="Decrease Speed">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
-		<table name="#abnormalLvls"> 1 2 2 3 3 3 3 3 3 3 3 3 </table>
+		<table name="#abnormalLvl"> 1 2 2 3 3 3 3 3 3 3 3 3 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
 		<table name="#runSpd"> 0.9 0.8 0.8 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="SPEED_DOWN" />
 		<set name="activateRate" val="10" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="effectPoint" val="-100" />
 		<set name="icon" val="icon.skill1160" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="lvlBonusRate" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
 				<mul stat="runSpd" val="#runSpd" />
@@ -687,22 +703,27 @@
 		</effects>
 	</skill>
 	<skill id="4626" levels="12" name="NPC Buff - Physical Barrier">
-		<table name="#abnormalLvls"> 1 2 3 4 5 6 7 8 9 10 11 12 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 7 8 9 10 11 12 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<table name="#mpConsume2"> 7 10 14 18 23 28 33 35 37 38 39 39 </table>
-		<table name="#pDef"> 1.05 1.11 1.17 1.25 1.33 1.43 1.67 2 2.33 2.67 3 3.33 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume1"> 2 2 3 4 5 6 7 7 8 8 8 8 </table>
+		<table name="#mpConsume2"> 5 8 11 14 18 22 26 28 29 30 31 31 </table>
+		<table name="#pDef"> 1.05 1.11 1.17 1.25 1.33 1.43 1.67 2 3.33 10 10 10 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="PD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pDef" val="#pDef" />
@@ -710,22 +731,27 @@
 		</effects>
 	</skill>
 	<skill id="4627" levels="12" name="NPC Buff - Magical Barrier">
-		<table name="#abnormalLvls"> 1 2 3 4 5 6 7 8 9 10 11 12 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 7 8 9 10 11 12 </table>
+		<table name="#mDef"> 1.05 1.11 1.17 1.25 1.33 1.43 1.67 2 3.33 10 10 10 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<table name="#mDef"> 1.05 1.11 1.17 1.25 1.33 1.43 1.67 2 2.33 2.67 3 3.33 </table>
-		<table name="#mpConsume2"> 7 10 14 18 23 28 33 35 37 38 39 39 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume1"> 2 2 3 4 5 6 7 7 8 8 8 8 </table>
+		<table name="#mpConsume2"> 5 8 11 14 18 22 26 28 29 30 31 31 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="MD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mDef" val="#mDef" />
@@ -733,273 +759,388 @@
 		</effects>
 	</skill>
 	<skill id="4628" levels="1" name="Mysterious Aura">
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="4629" levels="12" name="NPC MR - HP Drain">
+		<!-- High Five Confirmed -->
+		<table name="#hpDrainPower"> 18 26 38 52 68 85 102 110 116 122 126 129 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<table name="#mpConsume2"> 18 29 40 53 68 83 98 104 109 113 115 117 </table>
-		<table name="#power"> 18 26 38 52 68 85 102 110 116 122 126 129 </table>
+		<table name="#mpConsume1"> 4 6 8 10 13 16 19 20 21 21 22 22 </table>
+		<table name="#mpConsume2"> 13 22 30 39 50 62 73 77 81 84 86 87 </table>
+		<set name="affectScope" val="SINGLE" />
+		<set name="attributePower" val="20" />
+		<set name="attributeType" val="UNHOLY" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="900" />
-		<set name="attributeType" val="UNHOLY" />
-		<set name="attributePower" val="20" />
+		<set name="hitCancelTime" val="2500" />
 		<set name="hitTime" val="4000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="3000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="ENEMY" />
 		<effects>
 			<effect name="HpDrain">
-				<param power="#power" />
-				<param drain="0.2" />
+				<param power="#hpDrainPower" />
+				<param drain="0.20" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4630" levels="12" name="NPC MR - Twister">
+		<!-- High Five Confirmed -->
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<table name="#mpConsume2"> 13 20 27 35 45 55 65 69 73 75 77 78 </table>
-		<table name="#power"> 18 26 38 52 68 85 102 110 116 122 126 129 </table>
+		<table name="#magicalAttackPower"> 18 26 38 52 68 85 102 110 116 122 126 129 </table>
+		<table name="#mpConsume1"> 3 4 6 7 9 11 13 14 15 15 16 16 </table>
+		<table name="#mpConsume2"> 10 16 21 28 36 44 52 55 58 60 61 62 </table>
+		<set name="affectScope" val="SINGLE" />
+		<set name="attributePower" val="20" />
+		<set name="attributeType" val="WIND" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="900" />
-		<set name="attributeType" val="WIND" />
-		<set name="attributePower" val="20" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="ENEMY" />
 		<effects>
 			<effect name="MagicalAttack">
-				<param power="#power" />
+				<param power="#magicalAttackPower" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4631" levels="3" name="NPC Buff - Acumen Shield WildMagic">
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#magicLvl"> 20 40 60 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#mAtkSpd"> 1.15 1.23 1.3 </table>
 		<table name="#mCritRate"> 3 4 4 </table>
-		<table name="#mpConsume2"> 29 53 83 </table>
-		<table name="#pDef"> 1.8 1.12 1.15 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#magicLvl"> 20 40 60 </table>
+		<table name="#mpConsume1"> 6 11 17 </table>
+		<table name="#mpConsume2"> 23 42 66 </table>
+		<table name="#pDef"> 1.08 1.12 1.15 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="MULTI_BUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="pDef" val="#pDef" />
-				<mul stat="mAtkSpd" val="#mAtkSpd" />
 				<mul stat="mCritRate" val="#mCritRate" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="#mAtkSpd" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pDef" val="#pDef" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4632" levels="3" name="NPC Buff - Acumen Empower WildMagic">
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#magicLvl"> 20 40 60 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#mAtk"> 1.55 1.65 1.75 </table>
 		<table name="#mAtkSpd"> 1.15 1.23 1.3 </table>
 		<table name="#mCritRate"> 3 4 4 </table>
-		<table name="#mpConsume2"> 29 53 83 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#magicLvl"> 20 40 60 </table>
+		<table name="#mpConsume1"> 6 11 17 </table>
+		<table name="#mpConsume2"> 23 42 66 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="MULTI_BUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="mAtk" val="#mAtk" />
-				<mul stat="mAtkSpd" val="#mAtkSpd" />
 				<mul stat="mCritRate" val="#mCritRate" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="#mAtkSpd" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="#mAtk" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4633" levels="3" name="NPC Buff - Acumen Empower Berserk">
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#magicLvl"> 20 40 60 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#mAtk"> 1.71 1.82 2.03 </table>
 		<table name="#mAtkSpd"> 1.21 1.29 1.4 </table>
 		<table name="#mDef"> 0.9 0.9 0.84 </table>
-		<table name="#mpConsume2"> 29 53 83 </table>
+		<table name="#magicLvl"> 20 40 60 </table>
+		<table name="#mpConsume1"> 6 11 17 </table>
+		<table name="#mpConsume2"> 23 42 66 </table>
 		<table name="#pAtk"> 1.05 1.05 1.08 </table>
 		<table name="#pAtkSpd"> 1.05 1.05 1.08 </table>
 		<table name="#pDef"> 0.95 0.95 0.92 </table>
+		<table name="#rEvas"> 2 2 4 </table>
 		<table name="#runSpd"> 5 5 8 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="MULTI_BUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="pAtk" val="#pAtk" />
 				<mul stat="pAtkSpd" val="#pAtkSpd" />
-				<mul stat="mAtk" val="#mAtk" />
+			</effect>
+			<effect name="Debuff">
+				<sub stat="rEvas" val="#rEvas" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="mAtkSpd" val="#mAtkSpd" />
-				<add stat="runSpd" val="#runSpd" />
-				<mul stat="pDef" val="#pDef" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="#mAtk" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="mDef" val="#mDef" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="#pAtk" />
+			</effect>
+			<effect name="Debuff">
+				<mul stat="pDef" val="#pDef" />
+			</effect>
+			<effect name="Buff">
+				<add stat="runSpd" val="#runSpd" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4634" levels="3" name="NPC Buff - Acumen Empower DamageShield">
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#magicLvl"> 20 40 60 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#mAtk"> 1.55 1.65 1.75 </table>
 		<table name="#mAtkSpd"> 1.15 1.23 1.3 </table>
-		<table name="#mpConsume2"> 29 53 83 </table>
-		<table name="#reflect"> 10 15 20 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#magicLvl"> 20 40 60 </table>
+		<table name="#mpConsume1"> 6 11 17 </table>
+		<table name="#mpConsume2"> 23 42 66 </table>
+		<table name="#reflectDam"> 10 15 20 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="MULTI_BUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="mAtk" val="#mAtk" />
+				<add stat="reflectDam" val="#reflectDam" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="mAtkSpd" val="#mAtkSpd" />
-				<add stat="reflectDam" val="#reflect" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="#mAtk" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4635" levels="3" name="NPC Buff - Acumen Berserk WildMagic">
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#magicLvl"> 20 40 60 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#mAtk"> 1.1 1.1 1.16 </table>
 		<table name="#mAtkSpd"> 1.21 1.29 1.4 </table>
 		<table name="#mCritRate"> 3 4 4 </table>
 		<table name="#mDef"> 0.9 0.9 0.84 </table>
-		<table name="#mpConsume2"> 29 53 83 </table>
+		<table name="#magicLvl"> 20 40 60 </table>
+		<table name="#mpConsume1"> 6 11 17 </table>
+		<table name="#mpConsume2"> 23 42 66 </table>
 		<table name="#pAtk"> 1.05 1.05 1.08 </table>
 		<table name="#pAtkSpd"> 1.05 1.05 1.08 </table>
 		<table name="#pDef"> 0.95 0.95 0.92 </table>
+		<table name="#rEvas"> 2 2 4 </table>
 		<table name="#runSpd"> 5 5 8 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="MULTI_BUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="pAtk" val="#pAtk" />
 				<mul stat="pAtkSpd" val="#pAtkSpd" />
-				<mul stat="mAtk" val="#mAtk" />
+			</effect>
+			<effect name="Debuff">
+				<sub stat="rEvas" val="#rEvas" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mCritRate" val="#mCritRate" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="mAtkSpd" val="#mAtkSpd" />
-				<add stat="runSpd" val="#runSpd" />
-				<mul stat="pDef" val="#pDef" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="#mAtk" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="mDef" val="#mDef" />
-				<mul stat="mCritRate" val="#mCritRate" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="#pAtk" />
+			</effect>
+			<effect name="Debuff">
+				<mul stat="pDef" val="#pDef" />
+			</effect>
+			<effect name="Buff">
+				<add stat="runSpd" val="#runSpd" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4636" levels="3" name="NPC Buff - Acumen Berserk DamageShield">
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#magicLvl"> 20 40 60 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#mAtk"> 1.1 1.1 1.16 </table>
 		<table name="#mAtkSpd"> 1.21 1.29 1.4 </table>
 		<table name="#mDef"> 0.9 0.9 0.84 </table>
-		<table name="#mpConsume2"> 29 53 83 </table>
+		<table name="#magicLvl"> 20 40 60 </table>
+		<table name="#mpConsume1"> 6 11 17 </table>
+		<table name="#mpConsume2"> 23 42 66 </table>
 		<table name="#pAtk"> 1.05 1.05 1.08 </table>
 		<table name="#pAtkSpd"> 1.05 1.05 1.08 </table>
 		<table name="#pDef"> 0.95 0.95 0.92 </table>
-		<table name="#reflect"> 10 15 20 </table>
+		<table name="#rEvas"> 2 2 4 </table>
+		<table name="#reflectDam"> 10 15 20 </table>
 		<table name="#runSpd"> 5 5 8 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="MULTI_BUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="pAtk" val="#pAtk" />
 				<mul stat="pAtkSpd" val="#pAtkSpd" />
-				<mul stat="mAtk" val="#mAtk" />
+			</effect>
+			<effect name="Debuff">
+				<sub stat="rEvas" val="#rEvas" />
+			</effect>
+			<effect name="Buff">
+				<add stat="reflectDam" val="#reflectDam" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="mAtkSpd" val="#mAtkSpd" />
-				<add stat="runSpd" val="#runSpd" />
-				<mul stat="pDef" val="#pDef" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="#mAtk" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="mDef" val="#mDef" />
-				<add stat="reflectDam" val="#reflect" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="#pAtk" />
+			</effect>
+			<effect name="Debuff">
+				<mul stat="pDef" val="#pDef" />
+			</effect>
+			<effect name="Buff">
+				<add stat="runSpd" val="#runSpd" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4637" levels="3" name="NPC Buff - Acumen WildMagic DamageShield">
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#magicLvl"> 20 40 60 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#mAtkSpd"> 1.15 1.23 1.3 </table>
 		<table name="#mCritRate"> 3 4 4 </table>
-		<table name="#mpConsume2"> 29 53 83 </table>
-		<table name="#reflect"> 10 15 20 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#magicLvl"> 20 40 60 </table>
+		<table name="#mpConsume1"> 6 11 17 </table>
+		<table name="#mpConsume2"> 23 42 66 </table>
+		<table name="#reflectDam"> 10 15 20 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="MULTI_BUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="mAtkSpd" val="#mAtkSpd" />
+				<add stat="reflectDam" val="#reflectDam" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="mCritRate" val="#mCritRate" />
-				<add stat="reflectDam" val="#reflect" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="#mAtkSpd" />
 			</effect>
 		</effects>
 	</skill>
@@ -1161,19 +1302,20 @@
 		</effects>
 	</skill>
 	<skill id="4644" levels="2" name="Area Buff - Haste">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
-		<table name="#abnormalLvls"> 1 2 </table>
+		<table name="#abnormalLvl"> 1 2 </table>
 		<table name="#magicLvl"> 30 70 </table>
 		<table name="#pAtkSpd"> 1.15 1.33 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="ATTACK_TIME_DOWN" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="#pAtkSpd" />
@@ -1181,59 +1323,62 @@
 		</effects>
 	</skill>
 	<skill id="4645" levels="3" name="Area Buff - Focus">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
+		<table name="#abnormalLvl"> 1 2 3 </table>
+		<table name="#critRate"> 1.2 1.25 1.3 </table>
 		<table name="#magicLvl"> 20 40 60 </table>
-		<table name="#rCrit"> 1.15 1.25 1.3 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="CRITICAL_PROB_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="critRate" val="#rCrit" />
+				<mul stat="critRate" val="#critRate" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4646" levels="3" name="Area Buff - Death Whisper">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#cAtk"> 1.25 1.3 1.35 </table>
+		<table name="#abnormalLvl"> 1 2 3 </table>
+		<table name="#critDmg"> 1.25 1.3 1.35 </table>
 		<table name="#magicLvl"> 20 40 60 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="CRITICAL_DMG_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="critDmg" val="#cAtk" />
+				<mul stat="critDmg" val="#critDmg" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4647" levels="3" name="Area Buff - Might">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#magicLvl"> 20 40 60 </table>
 		<table name="#pAtk"> 1.08 1.12 1.15 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="PA_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtk" val="#pAtk" />
@@ -1241,19 +1386,20 @@
 		</effects>
 	</skill>
 	<skill id="4648" levels="3" name="Area Buff - Shield">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
-		<table name="#abnormalLvls"> 1 2 3 </table>
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#magicLvl"> 20 40 60 </table>
 		<table name="#pDef"> 1.08 1.12 1.15 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="PD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pDef" val="#pDef" />
@@ -1826,25 +1972,26 @@
 		</effects>
 	</skill>
 	<skill id="4671" levels="1" name="AV - Teleport">
-		<set name="castRange" val="1500" />
-		<set name="effectRange" val="2000" />
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="magicLvl" val="40" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
-		<effects>
-			<effect name="TeleportToTarget" />
-			<effect name="TargetMe" />
-		</effects>
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="4672" levels="1" name="NPC Corpse Remove">
-		<!-- TODO: Needs to be done -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="900" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="effectRange" val="1500" />
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="40" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="CORPSE_MOB" />
+		<effects>
+			<effect name="ConsumeBody" />
+		</effects>
 	</skill>
 	<skill id="4673" levels="12" name="NPC Dispel Offensive Buff">
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
@@ -1993,21 +2140,25 @@
 		</effects>
 	</skill>
 	<skill id="4680" levels="1" name="Valakas Lava Skin">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Valakas Skills -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="30" />
 		<set name="abnormalType" val="PD_UP_SPECIAL" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3300" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="pDef" val="10" />
 				<mul stat="mDef" val="10" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="pDef" val="10" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4681" levels="1" name="Valakas Trample">
@@ -2172,14 +2323,15 @@
 		</effects>
 	</skill>
 	<skill id="4687" levels="1" name="Valakas Tail Stomp">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Valakas Skills -->
-		<!-- Valakas Tail Stomp Visual -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="4688" levels="1" name="Valakas Stun">
 		<!-- Confirmed CT2.5 -->
@@ -2270,46 +2422,50 @@
 		</effects>
 	</skill>
 	<skill id="4691" levels="5" name="Valakas Regeneration">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Valakas Skills -->
-		<table name="#abnormalLvls"> 11 12 13 14 15 </table>
+		<table name="#abnormalLvl"> 11 12 13 14 15 </table>
 		<table name="#regHp"> 0.15 0.3 0.5 0.8 1 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1800" />
 		<set name="abnormalType" val="HP_REGEN_DOWN" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="Buff">
+			<effect name="Debuff">
 				<mul stat="regHp" val="#regHp" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4692" levels="1" name="Quest BOSS Big Body">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="BIG_BODY" />
 		<set name="abnormalVisualEffect" val="BIG_BODY" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Grow" />
 		</effects>
 	</skill>
 	<skill id="4693" levels="1" name="Quest BOSS Dispel Big Body">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelBySlot">
 				<param dispel="BIG_BODY,1" />
@@ -2317,37 +2473,53 @@
 		</effects>
 	</skill>
 	<skill id="4694" levels="1" name="Ultimate Debuff">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="30" />
 		<set name="abnormalType" val="ULTIMATE_DEBUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="isDebuff" val="true" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
-				<mul stat="pAtk" val="0.55" />
-				<sub stat="accCombat" val="4" />
-				<sub stat="rEvas" val="4" />
-				<mul stat="pDef" val="0.55" />
 				<mul stat="pAtkSpd" val="0.75" />
+			</effect>
+			<effect name="Debuff">
+				<sub stat="rEvas" val="4" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="critRate" val="0.77" />
+			</effect>
+			<effect name="Debuff">
+				<sub stat="accCombat" val="6" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="mDef" val="0.2" />
 			</effect>
+			<effect name="Debuff">
+				<mul stat="pAtk" val="0.55" />
+			</effect>
+			<effect name="Debuff">
+				<mul stat="pDef" val="0.55" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4695" levels="1" name="Ultimate Debuff">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="30" />
 		<set name="abnormalType" val="ULTIMATE_DEBUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="isDebuff" val="true" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
 				<mul stat="pAtk" val="0.2" />
@@ -2355,50 +2527,60 @@
 		</effects>
 	</skill>
 	<skill id="4696" levels="1" name="Ultimate Debuff">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="30" />
 		<set name="abnormalType" val="ULTIMATE_DEBUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="isDebuff" val="true" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
-				<mul stat="pDef" val="0.2" />
 				<mul stat="mDef" val="0.2" />
 			</effect>
+			<effect name="Debuff">
+				<mul stat="pDef" val="0.2" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4697" levels="12" name="NPC Monster Hate">
-		<!-- TODO: Needs to be done -->
-		<table name="#effectPoints"> -410 -608 -853 -1134 -1427 -1695 -1903 -1973 -2024 -2064 -2097 -2123 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> -410 -608 -853 -1134 -1427 -1695 -1903 -1973 -2024 -2064 -2097 -2123 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<table name="#mpConsume2"> 18 29 40 53 68 83 100 104 109 113 115 117 </table>
-		<set name="effectPoint" val="#effectPoints" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<table name="#mpConsume1"> 4 6 8 11 14 17 22 21 22 23 23 24 </table>
+		<table name="#mpConsume2"> 14 23 32 42 54 66 78 83 87 90 92 93 </table>
+		<set name="affectObject" val="NOT_FRIEND" />
+		<set name="affectRange" val="200" />
+		<set name="affectScope" val="POINT_BLANK" />
+		<set name="effectPoint" val="#effectPoint" />
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="AURA" />
 	</skill>
 	<skill id="4698" levels="12" name="Area Buff - HP Regeneration">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
-		<table name="#abnormalLvls"> 3 4 5 6 7 8 9 10 11 12 13 14 </table>
+		<table name="#abnormalLvl"> 3 4 5 6 7 8 9 10 11 12 13 14 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
 		<table name="#regHp"> 1.2 1.3 1.4 1.5 1.75 2 3 4 5 6 8.5 11 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="HP_REGEN_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="regHp" val="#regHp" />
@@ -2406,34 +2588,39 @@
 		</effects>
 	</skill>
 	<skill id="4699" levels="13" name="Blessing of Queen">
-		<!-- Confirmed CT2.5 -->
-		<table name="#abnormalLvls"> 1 2 3 3 3 3 3 3 3 3 3 3 3 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 3 3 3 3 3 3 3 3 3 3 </table>
 		<table name="#abnormalTime"> 120 120 120 150 165 180 195 210 225 240 255 270 285 </table>
-		<table name="#cAtk"> 1.2 1.22 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.25 </table>
-		<table name="#effectPoints"> 541 611 659 666 669 673 676 679 681 684 687 689 692 </table>
+		<table name="#critDmg"> 1.2 1.22 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.25 </table>
+		<table name="#critRate"> 1.25 1.27 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 </table>
+		<table name="#effectPoint"> 541 611 659 666 669 673 676 679 681 684 687 689 692 </table>
 		<table name="#magicLvl"> 57 66 75 77 78 79 80 81 82 83 84 85 86 </table>
-		<table name="#mpConsume2"> 97 125 155 161 165 169 172 176 179 183 186 189 193 </table>
 		<table name="#mpConsume1"> 25 32 39 41 42 43 43 44 45 46 47 48 49 </table>
-		<table name="#rCrit"> 1.25 1.27 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume2"> 97 125 155 161 165 169 172 176 179 183 186 189 193 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="#abnormalTime" />
 		<set name="abnormalType" val="BUFF_QUEEN_OF_CAT" />
+		<set name="affectObject" val="FRIEND" />
 		<set name="affectRange" val="1000" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="affectScope" val="PARTY" />
+		<set name="effectPoint" val="#effectPoint" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1331" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="PARTY" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="critRate" val="#rCrit" />
-				<mul stat="critDmg" val="#cAtk" />
+				<mul stat="critDmg" val="#critDmg" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="critRate" val="#critRate" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/src/main/resources/data/stats/skills/04700-04799.xml b/src/main/resources/data/stats/skills/04700-04799.xml
index 2e55678e45..d49cce63d9 100644
--- a/src/main/resources/data/stats/skills/04700-04799.xml
+++ b/src/main/resources/data/stats/skills/04700-04799.xml
@@ -215,27 +215,28 @@
 		</effects>
 	</skill>
 	<skill id="4707" levels="13" name="Shade Sacrifice">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Summon Nightshade Skill -->
-		<table name="#amount"> 541 611 659 666 669 673 676 679 681 684 687 689 692 </table>
-		<table name="#effectPoints"> 589 700 789 804 810 816 826 835 844 852 860 867 874 </table>
+		<table name="#effectPoint"> 589 700 789 804 810 816 826 835 844 852 860 867 874 </table>
+		<table name="#healPower"> 541 611 659 666 669 673 676 679 681 684 687 689 692 </table>
 		<table name="#hpConsume"> 706 840 946 964 972 979 991 1002 1013 1023 1032 1041 1049 </table>
 		<table name="#magicLvl"> 57 66 75 77 78 79 80 81 82 83 84 85 86 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="hpConsume" val="#hpConsume" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="3000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<!-- NOTE: skill description mention party members, but is client typo, it could affect any single target -->
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
-				<param power="#amount" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 	</skill>
@@ -328,16 +329,19 @@
 		</effects>
 	</skill>
 	<skill id="4711" levels="12" name="Wild Defense">
-		<table name="#activateRates"> -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 15 </table>
-		<table name="#effectPoints"> 138 204 285 379 477 566 635 659 676 689 700 709 </table>
+		<!-- High Five Confirmed -->
+		<table name="#activateRate"> -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 15 </table>
+		<table name="#effectPoint"> 138 204 285 379 477 566 635 659 676 689 700 709 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
 		<table name="#mpConsume2"> 46 76 104 139 179 220 258 275 288 298 305 309 </table>
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="30" />
 		<set name="abnormalType" val="ULTIMATE_BUFF" />
-		<set name="activateRate" val="#activateRates" />
+		<set name="activateRate" val="#activateRate" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="coolTime" val="400" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1100" />
 		<set name="icon" val="icon.skill0110" />
 		<set name="magicLvl" val="#magicLvl" />
@@ -345,12 +349,18 @@
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="1200000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="ImmobileBuff">
+				<mul stat="pAtkSpd" val="0.3" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="mDef" val="5" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="pDef" val="5" />
-				<mul stat="pAtkSpd" val="0.3" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="runSpd" val="0.1" />
 			</effect>
 		</effects>
@@ -379,24 +389,29 @@
 		</effects>
 	</skill>
 	<skill id="4713" levels="12" name="Bright Heal">
-		<table name="#amount"> 33 61 98 145 198 251 298 316 330 338 341 342 </table>
-		<table name="#effectPoints"> 33 61 98 145 198 251 298 316 331 347 358 366 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> 33 61 98 145 198 251 298 316 331 347 358 366 </table>
+		<table name="#healPower"> 33 61 98 145 198 251 298 316 331 347 358 366 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<table name="#mpConsume2"> 5 9 11 15 19 23 27 28 30 30 32 32 </table>
+		<table name="#mpConsume1"> 1 2 3 3 4 5 6 6 6 6 7 7 </table>
+		<table name="#mpConsume2"> 4 7 9 12 15 18 21 22 24 24 25 25 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="coolTime" val="1000" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
+		<set name="hitCancelTime" val="1000" />
 		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill4713" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="12000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
-				<param power="#amount" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 	</skill>
@@ -424,6 +439,7 @@
 	<skill id="4717" levels="12" name="Heal Trick">
 		<!-- High Five Confirmed -->
 		<table name="#effectPoint"> 9 16 25 37 50 63 75 79 83 87 90 92 </table>
+		<table name="#healPower"> 9 16 25 37 50 63 75 79 83 87 90 92 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
 		<table name="#mpConsume1"> 1 2 3 4 4 5 6 7 7 7 7 7 </table>
 		<table name="#mpConsume2"> 4 6 9 13 16 20 23 25 26 26 27 27 </table>
@@ -431,6 +447,7 @@
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill4717" />
 		<set name="isMagic" val="1" />
@@ -440,24 +457,25 @@
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="OWNER_PET" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
-				<param power="#effectPoint" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4718" levels="12" name="Greater Heal Trick">
 		<!-- High Five Confirmed -->
 		<table name="#effectPoint"> 62 113 184 272 371 471 558 592 620 651 672 685 </table>
+		<table name="#healPower"> 37 64 99 139 171 205 236 266 300 332 355 368 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
 		<table name="#mpConsume1"> 7 12 18 25 32 39 46 49 51 52 53 53 </table>
 		<table name="#mpConsume2"> 26 47 70 97 127 156 182 193 201 207 209 209 </table>
-		<table name="#power"> 37 64 99 139 171 205 236 266 300 332 355 368 </table>
 		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill4718" />
 		<set name="isMagic" val="1" />
@@ -467,10 +485,10 @@
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="OWNER_PET" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
-				<param power="#power" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 	</skill>
@@ -1895,242 +1913,292 @@
 		</effects>
 	</skill>
 	<skill id="4779" levels="12" name="BOSS Heal">
-		<!-- Boss Skill -->
-		<table name="#amount"> 1640 2824 4501 6612 9334 11649 12865 13406 13624 13544 13303 13157 </table>
+		<!-- High Five Confirmed -->
+		<table name="#healPower"> 2335 2929 4397 7086 10972 14364 16726 17954 19008 19977 13303 13157 </table>
 		<table name="#magicLvl"> 14 24 34 44 54 64 74 79 84 89 94 99 </table>
 		<table name="#mpConsume2"> 21 34 50 67 86 104 119 125 129 131 131 132 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="CLAN_MEMBER" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
-				<param power="#amount" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4780" levels="12" name="BOSS Heal">
-		<!-- Boss Skill -->
-		<table name="#amount"> 1382 2381 3802 5590 7881 9832 10862 11314 11553 11661 11640 11578 </table>
+		<!-- High Five Confirmed -->
+		<table name="#healPower"> 1968 2469 3714 5990 9264 12124 14121 15152 16119 17200 11640 11578 </table>
 		<table name="#magicLvl"> 14 24 34 44 54 64 74 79 84 89 94 99 </table>
 		<table name="#mpConsume2"> 21 34 50 67 86 104 119 125 129 131 131 132 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="CLAN_MEMBER" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
-				<param power="#amount" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4781" levels="12" name="BOSS Heal">
-		<!-- Boss Skill -->
-		<table name="#amount"> 736 1267 2024 2983 4204 5247 5787 6022 6144 6203 6199 6158 </table>
+		<!-- High Five Confirmed -->
+		<table name="#healPower"> 1047 1314 1978 3197 4942 6470 7524 8064 8573 9150 6199 6158 </table>
 		<table name="#magicLvl"> 14 24 34 44 54 64 74 79 84 89 94 99 </table>
 		<table name="#mpConsume2"> 21 34 50 67 86 104 119 125 129 131 131 132 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="CLAN_MEMBER" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
-				<param power="#amount" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4782" levels="12" name="BOSS Heal">
-		<!-- Boss Skill -->
-		<table name="#amount"> 691 1191 1899 2799 3941 4922 5431 5657 5777 5838 5813 5789 </table>
+		<!-- High Five Confirmed -->
+		<table name="#healPower"> 984 1235 1855 2999 4632 6070 7061 7576 8060 8610 5813 5789 </table>
 		<table name="#magicLvl"> 14 24 34 44 54 64 74 79 84 89 94 99 </table>
 		<table name="#mpConsume2"> 21 34 50 67 86 104 119 125 129 131 131 132 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="CLAN_MEMBER" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
-				<param power="#amount" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4783" levels="12" name="BOSS Heal">
-		<!-- Boss Skill -->
-		<table name="#amount"> 647 1115 1778 2607 3677 4597 5075 5293 5409 5458 5441 5421 </table>
+		<!-- High Five Confirmed -->
+		<table name="#healPower"> 921 1156 1737 2794 4323 5669 6598 7088 7546 8051 5441 5421 </table>
 		<table name="#magicLvl"> 14 24 34 44 54 64 74 79 84 89 94 99 </table>
 		<table name="#mpConsume2"> 21 34 50 67 86 104 119 125 129 131 131 132 </table>
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="CLAN_MEMBER" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
-				<param power="#amount" />
+				<param power="#healPower" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4784" levels="12" name="BOSS Chant of Life">
-		<!-- Boss Skill -->
-		<table name="#abnormalLvls"> 11 12 13 14 15 16 17 17 18 18 19 19 </table>
-		<table name="#hot"> 167 210 315 507 784 1026 1195 1283 1358 1427 951 940 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 11 12 13 14 15 16 17 17 18 18 19 19 </table>
 		<table name="#magicLvl"> 14 24 34 44 54 64 74 79 84 89 94 99 </table>
-		<table name="#mpConsume2"> 43 69 99 134 173 207 239 250 258 262 262 263 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume1"> 9 14 20 27 35 42 48 50 52 53 53 53 </table>
+		<table name="#mpConsume2"> 34 55 79 107 138 165 191 200 206 209 209 210 </table>
+		<table name="#tickHpPower"> 167 210 315 507 784 1026 1195 1283 1358 1427 951 940 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="LIFE_FORCE_OTHERS" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="CLAN_MEMBER" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="HpPerMax">
+				<param power="3" />
+			</effect>
 			<effect name="TickHp">
-				<param power="#hot" />
+				<param power="#tickHpPower" />
 				<param ticks="1" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4785" levels="12" name="BOSS Chant of Life">
-		<!-- Boss Skill -->
-		<table name="#abnormalLvls"> 11 12 13 14 15 16 17 17 18 18 19 19 </table>
-		<table name="#hot"> 141 177 266 428 662 866 1009 1083 1152 1229 832 827 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 11 12 13 14 15 16 17 17 18 18 19 19 </table>
 		<table name="#magicLvl"> 14 24 34 44 54 64 74 79 84 89 94 99 </table>
-		<table name="#mpConsume2"> 43 69 99 134 173 207 239 250 258 262 262 263 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume1"> 9 14 20 27 35 42 48 50 52 53 53 53 </table>
+		<table name="#mpConsume2"> 34 55 79 107 138 165 191 200 206 209 209 210 </table>
+		<table name="#tickHpPower"> 141 177 266 428 662 866 1009 1083 1152 1229 832 827 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="LIFE_FORCE_OTHERS" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="CLAN_MEMBER" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="HpPerMax">
+				<param power="3" />
+			</effect>
 			<effect name="TickHp">
-				<param power="#hot" />
+				<param power="#tickHpPower" />
 				<param ticks="1" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4786" levels="12" name="BOSS Chant of Life">
-		<!-- Boss Skill -->
-		<table name="#abnormalLvls"> 11 12 13 14 15 16 17 17 18 18 19 19 </table>
-		<table name="#hot"> 75 94 142 229 353 463 538 576 613 654 443 440 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 11 12 13 14 15 16 17 17 18 18 19 19 </table>
 		<table name="#magicLvl"> 14 24 34 44 54 64 74 79 84 89 94 99 </table>
-		<table name="#mpConsume2"> 43 69 99 134 173 207 239 250 258 262 262 263 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume1"> 9 14 20 27 35 42 48 50 52 53 53 53 </table>
+		<table name="#mpConsume2"> 34 55 79 107 138 165 191 200 206 209 209 210 </table>
+		<table name="#tickHpPower"> 75 94 142 229 353 463 538 576 613 654 443 440 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="LIFE_FORCE_OTHERS" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="CLAN_MEMBER" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="HpPerMax">
+				<param power="3" />
+			</effect>
 			<effect name="TickHp">
-				<param power="#hot" />
+				<param power="#tickHpPower" />
 				<param ticks="1" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4787" levels="12" name="BOSS Chant of Life">
-		<!-- Boss Skill -->
-		<table name="#abnormalLvls"> 11 12 13 14 15 16 17 17 18 18 19 19 </table>
-		<table name="#hot"> 71 89 133 215 331 434 505 542 576 615 416 414 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 11 12 13 14 15 16 17 17 18 18 19 19 </table>
 		<table name="#magicLvl"> 14 24 34 44 54 64 74 79 84 89 94 99 </table>
-		<table name="#mpConsume2"> 43 69 99 134 173 207 239 250 258 262 262 263 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume1"> 9 14 20 27 35 42 48 50 52 53 53 53 </table>
+		<table name="#mpConsume2"> 34 55 79 107 138 165 191 200 206 209 209 210 </table>
+		<table name="#tickHpPower"> 71 89 133 215 331 434 505 542 576 615 416 414 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="LIFE_FORCE_OTHERS" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="CLAN_MEMBER" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="HpPerMax">
+				<param power="3" />
+			</effect>
 			<effect name="TickHp">
-				<param power="#hot" />
+				<param power="#tickHpPower" />
 				<param ticks="1" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="4788" levels="12" name="BOSS Chant of Life">
-		<!-- Boss Skill -->
-		<table name="#abnormalLvls"> 11 12 13 14 15 16 17 17 18 18 19 19 </table>
-		<table name="#hot"> 66 83 125 200 309 405 472 507 539 576 389 388 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 11 12 13 14 15 16 17 17 18 18 19 19 </table>
 		<table name="#magicLvl"> 14 24 34 44 54 64 74 79 84 89 94 99 </table>
-		<table name="#mpConsume2"> 43 69 99 134 173 207 239 250 258 262 262 263 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume1"> 9 14 20 27 35 42 48 50 52 53 53 53 </table>
+		<table name="#mpConsume2"> 34 55 79 107 138 165 191 200 206 209 209 210 </table>
+		<table name="#tickHpPower"> 66 83 125 200 309 405 472 507 539 576 389 388 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="LIFE_FORCE_OTHERS" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="700" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume1" val="#mpConsume1" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="CLAN_MEMBER" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="HpPerMax">
+				<param power="3" />
+			</effect>
 			<effect name="TickHp">
-				<param power="#hot" />
+				<param power="#tickHpPower" />
 				<param ticks="1" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/src/main/resources/data/stats/skills/05000-05099.xml b/src/main/resources/data/stats/skills/05000-05099.xml
index 696fa61ee9..27831fed35 100644
--- a/src/main/resources/data/stats/skills/05000-05099.xml
+++ b/src/main/resources/data/stats/skills/05000-05099.xml
@@ -104,21 +104,22 @@
 		</effects>
 	</skill>
 	<skill id="5005" levels="1" name="Frintezza's Ghost Summoning">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Frintezza Skills -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1" />
 		<set name="abnormalType" val="PARALYZE" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="900" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1400" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="Paralyze" />
+			<effect name="Stun" />
 		</effects>
 	</skill>
 	<skill id="5006" levels="1" name="Frintezza's Melody">
@@ -649,43 +650,48 @@
 		</effects>
 	</skill>
 	<skill id="5039" levels="1" name="NPC - Ultra Bomb">
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="3000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="5040" levels="12" name="NPC - Healing Potion">
-		<!-- CT2.5 retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 4 5 6 7 8 9 10 11 12 </table>
-		<table name="#hot"> 7 12 18 27 37 46 55 58 61 64 66 67 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 7 8 9 10 11 12 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
-		<table name="#mpConsume2"> 1 1 1 1 1 1 1 193 201 207 209 209 </table>
 		<table name="#mpConsume1"> 1 1 1 1 1 1 1 49 51 52 53 53 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume2"> 1 1 1 1 1 1 1 193 201 207 209 209 </table>
+		<table name="#tickHpPower"> 7 12 18 27 37 46 55 58 61 64 66 67 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="LIFE_FORCE_OTHERS" />
-		<set name="affectRange" val="1000" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="TickHp">
-				<param power="#hot" />
+				<param power="#tickHpPower" />
 				<param ticks="1" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="5041" levels="1" name="Charm of Courage">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.skill5041" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
@@ -1225,12 +1231,19 @@
 		</effects>
 	</skill>
 	<skill id="5077" levels="1" name="NPC Remove Death Penalty">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="600" />
+		<set name="effectRange" val="1100" />
 		<set name="hitTime" val="500" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="Recovery" />
+		</effects>
 	</skill>
 	<skill id="5078" levels="1" name="Frintezza Critical Power">
 		<!-- CT2.5 retail confirmed -->
@@ -1476,7 +1489,8 @@
 		<set name="targetType" val="AURA" />
 	</skill>
 	<skill id="5089" levels="1" name="Representation - Enter the Sailren Nest Quest">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
@@ -1484,7 +1498,7 @@
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="5090" levels="1" name="Sailren Production">
 		<!-- Confirmed CT2.5 -->
@@ -1511,12 +1525,15 @@
 		<set name="abnormalType" val="TURN_FLEE" />
 		<set name="abnormalVisualEffect" val="TURN_FLEE" />
 		<set name="activateRate" val="90" />
+		<set name="affectObject" val="NOT_FRIEND" />
 		<set name="affectRange" val="400" />
+		<set name="affectScope" val="RANGE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="castRange" val="600" />
 		<set name="coolTime" val="2700" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill4108" />
 		<set name="isDebuff" val="true" />
diff --git a/src/main/resources/data/stats/skills/05100-05199.xml b/src/main/resources/data/stats/skills/05100-05199.xml
index 79a74be44b..347274d0d3 100644
--- a/src/main/resources/data/stats/skills/05100-05199.xml
+++ b/src/main/resources/data/stats/skills/05100-05199.xml
@@ -28,7 +28,8 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="5103" levels="1" name="Production - Clan / Transfer">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
@@ -36,7 +37,7 @@
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="5104" levels="3" name="Battle Force">
 		<!-- Not Used Anymore -->
@@ -124,16 +125,16 @@
 		</effects>
 	</skill>
 	<skill id="5109" levels="1" name="Production - Clan Gate">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
-		<set name="hitTime" val="1000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="5110" levels="1" name="Cannon Fodder">
 		<!-- Confirmed CT2.5 -->
@@ -196,18 +197,22 @@
 		</effects>
 	</skill>
 	<skill id="5112" levels="12" name="Stun">
-		<!-- Lvl 1-12 - Temporarily Immobilized and in a state of shock. -->
-		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 80 90 95 </table>
+		<!-- High Five Confirmed -->
+		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
 		<table name="#mpConsume2"> 7 10 14 19 25 31 36 38 40 42 42 43 </table>
+		<table name="#physicalAttackPower"> 16 35 73 139 241 379 542 626 704 774 829 873 </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="30" />
-		<set name="affectRange" val="200" />
+		<set name="affectObject" val="NOT_FRIEND" />
+		<set name="affectRange" val="150" />
+		<set name="affectScope" val="POINT_BLANK" />
 		<set name="basicProperty" val="CON" />
 		<set name="coolTime" val="800" />
 		<set name="effectPoint" val="-100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill0100" />
 		<set name="isDebuff" val="true" />
@@ -217,9 +222,12 @@
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="6000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="AURA" />
+		<set name="targetType" val="TARGET" />
 		<set name="trait" val="SHOCK" />
 		<effects>
+			<effect name="PhysicalAttack">
+				<param power="#physicalAttackPower" />
+			</effect>
 			<effect name="Stun" />
 		</effects>
 	</skill>
@@ -1544,10 +1552,10 @@
 		<effects>
 			<effect name="Stun" />
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockBuff" />
 			<effect name="BlockDebuff" />
@@ -1746,18 +1754,20 @@
 		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="5182" levels="1" name="Blessing of Protection">
+		<!-- High Five Confirmed -->
 		<!-- Newbie Guide Buff -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="7200" />
 		<set name="abnormalType" val="PK_PROTECT" />
-		<set name="castRange" val="400" />
-		<set name="effectRange" val="900" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="700" />
+		<set name="effectRange" val="1200" />
 		<set name="icon" val="icon.skill0194" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<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="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="ProtectionBlessing" />
 		</effects>
@@ -1812,27 +1822,30 @@
 		</effects>
 	</skill>
 	<skill id="5186" levels="2" name="Pet Haste">
-		<table name="#abnormalLvls"> 1 2 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 </table>
 		<table name="#magicLvl"> 44 52 </table>
-		<table name="#mpConsume2"> 16 19 </table>
 		<table name="#mpConsume1"> 4 5 </table>
+		<table name="#mpConsume2"> 16 19 </table>
 		<table name="#pAtkSpd"> 1.15 1.33 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="ATTACK_TIME_DOWN" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="495" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1086" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="6000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="OWNER_PET" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="#pAtkSpd" />
@@ -1840,27 +1853,30 @@
 		</effects>
 	</skill>
 	<skill id="5187" levels="4" name="Pet Vampiric Rage">
-		<table name="#abnormalLvls"> 1 2 3 4 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 </table>
 		<table name="#absorbDam"> 6 7 8 9 </table>
 		<table name="#magicLvl"> 30 44 58 72 </table>
-		<table name="#mpConsume2"> 11 16 22 27 </table>
 		<table name="#mpConsume1"> 3 4 6 7 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume2"> 11 16 22 27 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="VAMPIRIC_ATTACK" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="549" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1268" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="6000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="OWNER_PET" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="absorbDam" val="#absorbDam" />
@@ -1868,117 +1884,129 @@
 		</effects>
 	</skill>
 	<skill id="5188" levels="3" name="Pet Regeneration">
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#effectPoints"> 331 457 532 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
+		<table name="#effectPoint"> 331 457 532 </table>
 		<table name="#magicLvl"> 35 48 56 </table>
-		<table name="#mpConsume2"> 12 18 21 </table>
 		<table name="#mpConsume1"> 3 5 6 </table>
-		<table name="#rate"> 1.1 1.15 1.2 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume2"> 12 18 21 </table>
+		<table name="#regHp"> 1.1 1.15 1.2 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="HP_REGEN_UP" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1044" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="6000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="OWNER_PET" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="regHp" val="#rate" />
+				<mul stat="regHp" val="#regHp" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="5189" levels="6" name="Pet Blessed Body">
-		<table name="#abnormalLvls"> 1 2 3 4 5 6 </table>
-		<table name="#effectPoints"> 597 457 495 532 597 646 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 </table>
+		<table name="#effectPoint"> 597 457 495 532 597 646 </table>
 		<table name="#magicLvl"> 44 48 52 56 64 72 </table>
-		<table name="#maxHp"> 10 15 20 25 30 35 </table>
-		<table name="#mpConsume2"> 16 18 19 21 24 27 </table>
+		<table name="#maxHpPower"> 10 15 20 25 30 35 </table>
 		<table name="#mpConsume1"> 4 5 5 6 6 7 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume2"> 16 18 19 21 24 27 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="MAX_HP_UP" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1045" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="6000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="OWNER_PET" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxHp">
-				<param power="#maxHp" />
+				<param power="#maxHpPower" />
 				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="5190" levels="6" name="Pet Blessed Soul">
-		<table name="#abnormalLvls"> 1 2 3 4 5 6 </table>
-		<table name="#effectPoints"> 418 457 495 532 582 635 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 </table>
+		<table name="#effectPoint"> 418 457 495 532 582 635 </table>
 		<table name="#magicLvl"> 44 48 52 56 62 70 </table>
-		<table name="#maxMp"> 10 15 20 25 30 35 </table>
-		<table name="#mpConsume2"> 16 18 19 21 23 26 </table>
+		<table name="#maxMpPower"> 10 15 20 25 30 35 </table>
 		<table name="#mpConsume1"> 4 5 5 6 6 7 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume2"> 16 18 19 21 23 26 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="MAX_MP_UP" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1048" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="6000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="OWNER_PET" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxMp">
-				<param power="#maxMp" />
+				<param power="#maxMpPower" />
 				<param type="PER" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="5191" levels="3" name="Pet Guidance">
-		<table name="#abnormalLvls"> 1 2 3 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#accCombat"> 2 3 4 </table>
-		<table name="#effectPoints"> 379 457 532 </table>
+		<table name="#effectPoint"> 379 457 532 </table>
 		<table name="#magicLvl"> 40 48 56 </table>
-		<table name="#mpConsume2"> 14 18 21 </table>
 		<table name="#mpConsume1"> 4 5 6 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume2"> 14 18 21 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="HIT_UP" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1240" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="6000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="OWNER_PET" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="accCombat" val="#accCombat" />
@@ -1986,28 +2014,31 @@
 		</effects>
 	</skill>
 	<skill id="5192" levels="2" name="Pet Wind Walk">
-		<table name="#abnormalLvls"> 1 2 </table>
-		<table name="#effectPoints"> 204 285 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 </table>
+		<table name="#effectPoint"> 204 285 </table>
 		<table name="#magicLvl"> 20 30 </table>
-		<table name="#mpConsume2"> 8 11 </table>
 		<table name="#mpConsume1"> 2 3 </table>
+		<table name="#mpConsume2"> 8 11 </table>
 		<table name="#runSpd"> 20 33 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="SPEED_UP" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1204" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="6000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="OWNER_PET" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="runSpd" val="#runSpd" />
@@ -2015,28 +2046,31 @@
 		</effects>
 	</skill>
 	<skill id="5193" levels="3" name="Pet Acumen">
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#effectPoints"> 204 331 457 </table>
-		<table name="#magicLvl"> 20 35 48 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
+		<table name="#effectPoint"> 204 331 457 </table>
 		<table name="#mAtkSpd"> 1.15 1.23 1.3 </table>
-		<table name="#mpConsume2"> 8 12 18 </table>
+		<table name="#magicLvl"> 20 35 48 </table>
 		<table name="#mpConsume1"> 2 3 5 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume2"> 8 12 18 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="CASTING_TIME_DOWN" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1085" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="6000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="OWNER_PET" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="#mAtkSpd" />
@@ -2044,28 +2078,31 @@
 		</effects>
 	</skill>
 	<skill id="5194" levels="3" name="Pet Empower">
-		<table name="#abnormalLvls"> 1 2 3 </table>
-		<table name="#effectPoints"> 243 418 495 </table>
-		<table name="#magicLvl"> 25 44 52 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
+		<table name="#effectPoint"> 243 418 495 </table>
 		<table name="#mAtk"> 1.55 1.65 1.75 </table>
-		<table name="#mpConsume2"> 9 16 19 </table>
+		<table name="#magicLvl"> 25 44 52 </table>
 		<table name="#mpConsume1"> 3 4 5 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume2"> 9 16 19 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="MA_UP" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1059" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="6000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="OWNER_PET" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mAtk" val="#mAtk" />
@@ -2075,19 +2112,21 @@
 	<skill id="5195" levels="12" name="Pet Greater Heal">
 		<!-- High Five Confirmed -->
 		<table name="#abnormalLvl"> 1 1 2 2 4 6 7 7 7 7 7 7 </table>
-		<table name="#amount"> 58 92 148 219 299 380 450 477 500 525 542 550 </table>
 		<table name="#effectPoint"> 83 151 245 362 494 628 743 789 826 867 895 913 </table>
-		<table name="#healOverTime"> 4 7 10 15 20 26 30 32 32 32 32 32 </table>
+		<table name="#healPower"> 50 92 148 219 299 380 450 477 500 525 542 553 </table>
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
 		<table name="#mpConsume1"> 2 3 5 7 8 10 12 13 13 13 14 14 </table>
 		<table name="#mpConsume2"> 7 12 18 25 32 39 46 49 51 52 53 53 </table>
+		<table name="#tickHpPower"> 4 7 10 15 20 26 30 32 32 32 32 32 </table>
 		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="LIFE_FORCE_OTHERS" />
+		<set name="activateRate" val="0" />
 		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="5000" />
 		<set name="icon" val="icon.skill1217" />
 		<set name="isMagic" val="1" />
@@ -2097,22 +2136,24 @@
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="OWNER_PET" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
-				<param power="#amount" />
+				<param power="#healPower" />
 			</effect>
 			<effect name="TickHp">
-				<param power="#healOverTime" />
+				<param power="#tickHpPower" />
 				<param ticks="1" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="5196" levels="3" name="Pet Wind Shackle">
-		<table name="#effectPoints"> -597 -611 -624 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> -597 -611 -624 </table>
 		<table name="#magicLvl"> 64 66 68 </table>
-		<table name="#mpConsume2"> 48 49 51 </table>
 		<table name="#mpConsume1"> 12 13 13 </table>
+		<table name="#mpConsume2"> 48 49 51 </table>
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="30" />
 		<set name="abnormalType" val="ATTACK_TIME_UP" />
@@ -2120,16 +2161,17 @@
 		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="castRange" val="600" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill1206" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="lvlBonusRate" val="2" />
 		<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="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -2141,10 +2183,11 @@
 		</effects>
 	</skill>
 	<skill id="5197" levels="3" name="Pet Hex">
-		<table name="#effectPoints"> -299 -306 -312 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> -299 -306 -312 </table>
 		<table name="#magicLvl"> 64 66 68 </table>
-		<table name="#mpConsume2"> 24 25 26  </table>
 		<table name="#mpConsume1"> 6 7 7 </table>
+		<table name="#mpConsume2"> 24 25 26 </table>
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="30" />
 		<set name="abnormalType" val="PD_DOWN" />
@@ -2152,16 +2195,17 @@
 		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="castRange" val="600" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1200" />
 		<set name="icon" val="icon.skill0122" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="lvlBonusRate" val="2" />
 		<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="6000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -2173,10 +2217,11 @@
 		</effects>
 	</skill>
 	<skill id="5198" levels="3" name="Pet Slow">
-		<table name="#effectPoints"> -597 -611 -624 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> -597 -611 -624 </table>
 		<table name="#magicLvl"> 64 66 68 </table>
-		<table name="#mpConsume2"> 48 49 51 </table>
 		<table name="#mpConsume1"> 12 13 13 </table>
+		<table name="#mpConsume2"> 48 49 51 </table>
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="60" />
 		<set name="abnormalType" val="SPEED_DOWN" />
@@ -2184,16 +2229,17 @@
 		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="castRange" val="600" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1160" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="lvlBonusRate" val="2" />
 		<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="7000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -2205,10 +2251,11 @@
 		</effects>
 	</skill>
 	<skill id="5199" levels="3" name="Pet Curse Gloom">
-		<table name="#effectPoints"> -299 -306 -312 </table>
+		<!-- High Five Confirmed -->
+		<table name="#effectPoint"> -299 -306 -312 </table>
 		<table name="#magicLvl"> 64 66 68 </table>
-		<table name="#mpConsume2"> 48 49 51 </table>
 		<table name="#mpConsume1"> 12 13 13 </table>
+		<table name="#mpConsume2"> 48 49 51 </table>
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="30" />
 		<set name="abnormalType" val="MD_DOWN" />
@@ -2216,16 +2263,17 @@
 		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="castRange" val="900" />
-		<set name="effectPoint" val="#effectPoints" />
+		<set name="effectPoint" val="#effectPoint" />
 		<set name="effectRange" val="1400" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill1263" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="lvlBonusRate" val="2" />
 		<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="8000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
diff --git a/src/main/resources/data/stats/skills/05200-05299.xml b/src/main/resources/data/stats/skills/05200-05299.xml
index 23ca901898..4569c7747b 100644
--- a/src/main/resources/data/stats/skills/05200-05299.xml
+++ b/src/main/resources/data/stats/skills/05200-05299.xml
@@ -27,29 +27,31 @@
 		</effects>
 	</skill>
 	<skill id="5201" levels="6" name="Pet Concentration">
-		<!-- CT2.5 retail confirmed -->
-		<table name="#abnormalLvls"> 1 2 3 4 5 6 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 </table>
 		<table name="#cancel"> 18 25 36 42 48 53 </table>
-		<table name="#effectPoints"> 204 285 418 495 566 624 </table>
+		<table name="#effectPoint"> 204 285 418 495 566 624 </table>
 		<table name="#magicLvl"> 20 30 44 52 60 68 </table>
-		<table name="#mpConsume2"> 16 21 31 38 44 51 </table>
 		<table name="#mpConsume1"> 4 6 8 10 11 13 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+		<table name="#mpConsume2"> 16 21 31 38 44 51 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="CANCEL_PROB_DOWN" />
+		<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="4000" />
 		<set name="icon" val="icon.skill1078" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<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="6000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="OWNER_PET" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<sub stat="cancel" val="#cancel" />
@@ -121,11 +123,12 @@
 		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="5205" levels="1" name="Boss Regeneration">
-		<!-- CT2.5 retail confirmed -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="HpPerMax">
 				<param power="100" />
@@ -191,18 +194,19 @@
 		</effects>
 	</skill>
 	<skill id="5208" levels="1" name="Event Wind walk">
-		<!-- CT2.5 retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="SPEED_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1204" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="runSpd" val="33" />
@@ -210,18 +214,19 @@
 		</effects>
 	</skill>
 	<skill id="5209" levels="1" name="Event Shield">
-		<!-- CT2.5 retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="PD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1040" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.15" />
@@ -229,18 +234,19 @@
 		</effects>
 	</skill>
 	<skill id="5210" levels="1" name="Event Bless the body">
-		<!-- CT2.5 retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="7" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MAX_HP_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1045" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxHp">
 				<param power="35" />
@@ -249,37 +255,39 @@
 		</effects>
 	</skill>
 	<skill id="5211" levels="1" name="Event Vampiric rage">
-		<!-- CT2.5 retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="5" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="VAMPIRIC_ATTACK" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1268" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<add stat="absorbDam" val="9" /> <!-- absorb 9% HP from damage inflicted on enemies -->
+				<add stat="absorbDam" val="9" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="5212" levels="1" name="Event Regeneration">
-		<!-- CT2.5 retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="HP_REGEN_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1044" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="regHp" val="1.2" />
@@ -287,18 +295,19 @@
 		</effects>
 	</skill>
 	<skill id="5213" levels="1" name="Event Haste">
-		<!-- CT2.5 retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="ATTACK_TIME_DOWN" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1086" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="1.15" />
@@ -306,18 +315,19 @@
 		</effects>
 	</skill>
 	<skill id="5214" levels="1" name="Event Bless the soul">
-		<!-- CT2.5 retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="7" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MAX_MP_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1048" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxMp">
 				<param power="35" />
@@ -326,18 +336,19 @@
 		</effects>
 	</skill>
 	<skill id="5215" levels="1" name="Event Acumen">
-		<!-- CT2.5 retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="CASTING_TIME_DOWN" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1085" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.3" />
@@ -345,18 +356,19 @@
 		</effects>
 	</skill>
 	<skill id="5216" levels="1" name="Event Concentration">
-		<!-- CT2.5 retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="CANCEL_PROB_DOWN" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1078" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<sub stat="cancel" val="18" />
@@ -364,18 +376,19 @@
 		</effects>
 	</skill>
 	<skill id="5217" levels="1" name="Event Empower">
-		<!-- CT2.5 retail confirmed -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MA_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1059" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mAtk" val="1.55" />
@@ -383,14 +396,15 @@
 		</effects>
 	</skill>
 	<skill id="5218" levels="1" name="Production: Event Teleport">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="hitTime" val="2000" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="5219" levels="1" name="Stun of giant mutated animal">
 		<!-- CT2.5 retail confirmed -->
@@ -533,10 +547,10 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockDebuff" />
 			<effect name="Buff">
@@ -956,15 +970,17 @@
 		<set name="targetType" val="ONE" />
 	</skill>
 	<skill id="5244" levels="1" name="Physical Up">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="PA_PD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="icon" val="icon.skill1068" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.15" />
@@ -975,15 +991,17 @@
 		</effects>
 	</skill>
 	<skill id="5245" levels="1" name="Magical Up">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="MA_MD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="icon" val="icon.skill1059" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mAtk" val="1.15" />
diff --git a/src/main/resources/data/stats/skills/05300-05399.xml b/src/main/resources/data/stats/skills/05300-05399.xml
index 79e92683e3..38fdc54668 100644
--- a/src/main/resources/data/stats/skills/05300-05399.xml
+++ b/src/main/resources/data/stats/skills/05300-05399.xml
@@ -1955,12 +1955,13 @@
 		</effects>
 	</skill>
 	<skill id="5399" levels="1" name="Heat of Desert">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Zone Skill -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="HOT_GROUND" />
 		<set name="activateRate" val="10" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="effectPoint" val="-100" />
 		<set name="icon" val="icon.skill1230" />
@@ -1969,7 +1970,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<cond>
 			<and>
 				<game night="false" />
@@ -1982,6 +1983,7 @@
 			<effect name="TickHp">
 				<param power="-75" />
 				<param ticks="5" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/src/main/resources/data/stats/skills/05400-05499.xml b/src/main/resources/data/stats/skills/05400-05499.xml
index e73d487964..1d8888562d 100644
--- a/src/main/resources/data/stats/skills/05400-05499.xml
+++ b/src/main/resources/data/stats/skills/05400-05499.xml
@@ -55,7 +55,8 @@
 		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="5404" levels="1" name="Presentation - Balor 4">
-		<!-- Balor - Instant Cast Skill -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="coolTime" val="500" />
 		<set name="effectRange" val="1100" />
@@ -63,30 +64,34 @@
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="5405" levels="1" name="Presentation - Demonic 1">
-		<!-- Demonic - General Long Range Magic Skill -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="hitTime" val="3000" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="5406" levels="1" name="Presentation - Demonic 2">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="hitTime" val="3000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="5407" levels="1" name="Presentation - Crystalline Golem 1">
-		<!-- Crystaline-Instant Cast Skill -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="hitTime" val="2000" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
@@ -94,60 +99,72 @@
 		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="5408" levels="1" name="Presentation - Crystalline Golem 2">
-		<!-- Crystaline-General Long Range Magic Skill -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="hitTime" val="4000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="5409" levels="1" name="Presentation - Crystalline Golem 3">
-		<!-- Crystaline Golem -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="hitTime" val="4000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="5410" levels="1" name="Presentation - Balor 10">
-		<!-- Balor Social. -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="hitTime" val="17000" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="5411" levels="1" name="Presentation - Balor 11">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="600" />
+		<set name="effectRange" val="1100" />
 		<set name="hitTime" val="1000" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="5412" levels="1" name="Presentation - Balor 12">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2500" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="5413" levels="1" name="Performing Agathion - Beast Farm">
-		<!-- TODO: Needs to be verified -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill_agathion_cute" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="2292">
-			<player agathionId="16026" />
+			<player hasAgathion="true" />
 		</cond>
 	</skill>
 	<skill id="5414" levels="1" name="Performing Agathion - Rainbow Clan Hall">
@@ -201,13 +218,16 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="5419" levels="1" name="Invincible Blow">
-		<!-- Crystaline Golem -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="600" />
+		<set name="effectRange" val="1100" />
 		<set name="hitTime" val="4000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="5420" levels="1" name="Invincible">
 		<!-- Invincible against general attack and skill, buff/de-buff. -->
@@ -438,10 +458,14 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="5433" levels="1" name="Presentation - Gathering of Evil Power">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="400" />
+		<set name="effectRange" val="900" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="5434" levels="1" name="Gust">
 		<!-- Confirmed CT2.5 -->
@@ -511,15 +535,28 @@
 		</endEffects>
 	</skill>
 	<skill id="5436" levels="1" name="Increase Recovery Rate">
-		<!-- Condition causing target to increase recovery rate of HP and MP. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="ALL_REGEN_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="magicLvl" val="20" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="TickHp">
+				<param power="10" />
+				<param ticks="5" />
+				<param mode="DIFF" />
+			</effect>
+			<effect name="TickHp">
+				<param power="5" />
+				<param ticks="5" />
+				<param mode="DIFF" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="5437" levels="2" name="Dissonance">
 		<!-- Confirmed CT2.5 -->
@@ -885,12 +922,20 @@
 		</effects>
 	</skill>
 	<skill id="5457" levels="1" name="NPC Full Recover">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="1000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="hitCancelTime" val="500" />
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="HpPerMax">
+				<param power="100" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="5458" levels="1" name="Performing Agathion - Fortress">
 		<!-- TODO: Needs to be verified -->
@@ -905,12 +950,13 @@
 		</cond>
 	</skill>
 	<skill id="5459" levels="1" name="Paralysis">
-		<!-- A temporary paralysis that prevents movement. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="PARALYZE" />
 		<set name="abnormalVisualEffect" val="PARALYZE" />
 		<set name="activateRate" val="10" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="effectPoint" val="-100" />
 		<set name="icon" val="icon.skill1170" />
@@ -919,16 +965,20 @@
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
 		<set name="trait" val="PARALYZE" />
+		<effects>
+			<effect name="Stun" />
+		</effects>
 	</skill>
 	<skill id="5460" levels="1" name="Fear">
-		<!-- Causes a temporary fear so strong that a target flees mindlessly. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="TURN_FLEE" />
 		<set name="abnormalVisualEffect" val="TURN_FLEE" />
 		<set name="activateRate" val="10" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="effectPoint" val="-100" />
 		<set name="icon" val="icon.skill1092" />
@@ -937,8 +987,11 @@
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
 		<set name="trait" val="DERANGEMENT" />
+		<effects>
+			<effect name="Fear" />
+		</effects>
 	</skill>
 	<skill id="5461" levels="12" name="Castle Gunner Shot">
 		<!-- Confirmed CT2.5 -->
@@ -1105,16 +1158,17 @@
 		</effects>
 	</skill>
 	<skill id="5480" levels="1" name="Balor Invincible Removal">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Baylor Skills -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="hitTime" val="4000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelBySlot">
 				<param dispel="INVINCIBILITY,9" />
@@ -1164,40 +1218,58 @@
 		</effects>
 	</skill>
 	<skill id="5484" levels="1" name="Endurance Defense Up">
-		<!-- Increases P. Def. Effect 1. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="PD_UP" />
 		<set name="activateRate" val="0" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="660" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="rideState" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="Buff">
+				<add stat="pDef" val="500" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="5485" levels="1" name="Endurance Defense Up">
-		<!-- Increases P. Def. Effect 1. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="MD_UP" />
 		<set name="activateRate" val="0" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="660" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="rideState" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="Buff">
+				<add stat="mDef" val="300" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="5486" levels="1" name="Endurance Offense Up">
-		<!-- Increases P. Atk. Effect 1. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="PA_UP" />
 		<set name="activateRate" val="0" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="660" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="rideState" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="Buff">
+				<add stat="pAtk" val="100" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="5487" levels="1" name="Counter Delete Aggression">
 		<!-- High Five Confirmed -->
@@ -1215,29 +1287,45 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="5488" levels="1" name="Counter Critical Power Up">
-		<!-- Increases critical attack power. Effect 1. -->
+	<skill id="5488" levels="1" name="Counter Critical Damage Up">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="CRITICAL_DMG_UP" />
 		<set name="activateRate" val="0" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="40" />
 		<set name="effectPoint" val="660" />
+		<set name="effectRange" val="400" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="rideState" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="Buff">
+				<add stat="critDmg" val="80" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="5489" levels="1" name="Counter Critical Rate Up">
-		<!-- Increases critical attack rate. Effect 1. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="CRITICAL_PROB_UP" />
 		<set name="activateRate" val="0" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="40" />
 		<set name="effectPoint" val="660" />
+		<set name="effectRange" val="400" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="rideState" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="Buff">
+				<add stat="critRate" val="80" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="5490" levels="1" name="Weakened Life">
 		<!-- You have been infected by a fatal poison. -->
@@ -1291,14 +1379,17 @@
 		</effects>
 	</skill>
 	<skill id="5493" levels="1" name="Naia Production">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="abnormalVisualEffect" val="NONE" />
 		<set name="castRange" val="800" />
 		<set name="channelingSkillId" val="5106" />
 		<set name="channelingTickInterval" val="2" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="1000" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="25000" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="8764" /> <!-- Trap Stone -->
 		<set name="magicLvl" val="85" />
@@ -1306,7 +1397,7 @@
 		<set name="operateType" val="CA5" />
 		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<cond msgId="109">
 			<target npcId="32331" />
 		</cond>
diff --git a/src/main/resources/data/stats/skills/05500-05599.xml b/src/main/resources/data/stats/skills/05500-05599.xml
index ab531f893c..fa0f0ff738 100644
--- a/src/main/resources/data/stats/skills/05500-05599.xml
+++ b/src/main/resources/data/stats/skills/05500-05599.xml
@@ -359,74 +359,96 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="5519" levels="1" name="Chain Buff - Power Up">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="60" />
 		<set name="abnormalType" val="PA_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="900" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="pAtk" val="1.15" />
-				<mul stat="mAtk" val="1.75" />
 				<mul stat="pAtkSpd" val="1.33" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.75" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.15" />
+			</effect>
+			<effect name="Buff">
 				<add stat="runSpd" val="33" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="5520" levels="1" name="Chain Buff - Vampiric Shield">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="60" />
 		<set name="abnormalType" val="VAMPIRIC_ATTACK" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="900" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<add stat="absorbDam" val="9" /> <!-- absorb HP from damage inflicted on enemies -->
 				<add stat="reflectDam" val="60" />
 			</effect>
+			<effect name="Buff">
+				<add stat="absorbDam" val="9" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="5521" levels="1" name="Chain Buff - Critical Sense">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="60" />
 		<set name="abnormalType" val="CRITICAL_DMG_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="900" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="critDmg" val="1.35" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="critRate" val="1.3" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="mCritRate" val="4" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="5522" levels="1" name="Chain Magic - Dark Explosion">
+		<!-- High Five Confirmed -->
+		<set name="affectObject" val="NOT_FRIEND" />
 		<set name="affectRange" val="600" />
+		<set name="affectScope" val="RANGE" />
+		<set name="attributePower" val="80" />
+		<set name="attributeType" val="UNHOLY" />
 		<set name="castRange" val="500" />
 		<set name="effectPoint" val="-1063" />
 		<set name="effectRange" val="900" />
-		<set name="attributeType" val="UNHOLY" />
-		<set name="attributePower" val="80" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -438,104 +460,135 @@
 		</effects>
 	</skill>
 	<skill id="5523" levels="1" name="Chain Magic - Unholy Castle">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="60" />
 		<set name="abnormalType" val="ARMOR_UNHOLY" />
 		<set name="activateRate" val="100" />
+		<set name="affectObject" val="NOT_FRIEND" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="-100" />
 		<set name="effectRange" val="600" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1056" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="lvlBonusRate" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="BlockBuff">
-				<sub stat="darkRes" val="50" />
-			</effect>
 			<effect name="DispelByCategory">
 				<param slot="BUFF" rate="100" max="3" />
 			</effect>
+			<effect name="BlockBuff" />
+			<effect name="Debuff">
+				<sub stat="darkRes" val="50" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="5524" levels="1" name="Chain Buff - Resistance to Bow and Magic attacks">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="60" />
 		<set name="abnormalType" val="MD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="900" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="DefenceTrait">
+				<param BOW="40" />
+			</effect>
 			<effect name="Buff">
-				<sub stat="cancelVuln" val="100" />
 				<!-- TODO: Missing support to resist category "multi_buff". -->
 				<mul stat="mDef" val="1.3" />
 			</effect>
-			<effect name="DefenceTrait">
-				<param BOW="40" />
+			<effect name="Debuff">
+				<mul stat="cancelVuln" val="0" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="5525" levels="1" name="Chain Buff - Resistance to Melee Attacks">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="60" />
 		<set name="abnormalType" val="PD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="900" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="pDef" val="1.15" />
-			</effect>
 			<effect name="DefenceTrait">
 				<param SWORD="25" />
+			</effect>
+			<effect name="DefenceTrait">
 				<param POLE="25" />
+			</effect>
+			<effect name="DefenceTrait">
 				<param BLUNT="25" />
+			</effect>
+			<effect name="DefenceTrait">
 				<param DAGGER="25" />
+			</effect>
+			<effect name="DefenceTrait">
 				<param FIST="25" />
+			</effect>
+			<effect name="DefenceTrait">
 				<param DUAL="25" />
+			</effect>
+			<effect name="DefenceTrait">
 				<param DUALFIST="25" />
+			</effect>
+			<effect name="DefenceTrait">
 				<param DUALDAGGER="25" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="pDef" val="1.15" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="5526" levels="1" name="Challenger's Blessing">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="SHIELD_PROB_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="900" />
 		<set name="icon" val="icon.skill1442" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="85" />
-		<set name="mpConsume2" val="66" />
 		<set name="mpConsume1" val="17" />
+		<set name="mpConsume2" val="66" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="rShld" val="1.9" />
-				<add stat="pDef" val="1000" />
 				<add stat="darkRes" val="50" />
 			</effect>
+			<effect name="Buff">
+				<add stat="pDef" val="1000" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="rShld" val="1.9" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="5527" levels="1" name="Overflow">
@@ -1247,38 +1300,42 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="5567" levels="1" name="Flame Armor">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="icon" val="icon.skill1492" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
-		<set name="magicLvl" val="83" />
+		<set name="isMagic" val="2" />
+		<set name="magicLvl" val="81" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MagicalAttack">
-				<param power="47" />
+				<param power="71" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="5568" levels="1" name="Frost Armor">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="60" />
 		<set name="abnormalType" val="SPEED_DOWN" />
-		<set name="activateRate" val="80" />
+		<set name="activateRate" val="100" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="MEN" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="icon" val="icon.skill1493" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="lvlBonusRate" val="2" />
-		<set name="magicLvl" val="83" />
+		<set name="magicLvl" val="81" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Debuff">
 				<mul stat="runSpd" val="0.7" />
@@ -1440,10 +1497,10 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockDebuff" />
 		</effects>
diff --git a/src/main/resources/data/stats/skills/05800-05899.xml b/src/main/resources/data/stats/skills/05800-05899.xml
index de1661107e..1b99eea66f 100644
--- a/src/main/resources/data/stats/skills/05800-05899.xml
+++ b/src/main/resources/data/stats/skills/05800-05899.xml
@@ -493,18 +493,21 @@
 		</effects>
 	</skill>
 	<skill id="5835" levels="1" name="Major Heal">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="867" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="85" />
-		<set name="mpConsume2" val="104" />
 		<set name="mpConsume1" val="26" />
+		<set name="mpConsume2" val="104" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="3000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="CLAN_MEMBER" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="HpPerMax">
 				<param power="10" />
diff --git a/src/main/resources/data/stats/skills/06600-06699.xml b/src/main/resources/data/stats/skills/06600-06699.xml
index 6541df3c38..1645eedea6 100644
--- a/src/main/resources/data/stats/skills/06600-06699.xml
+++ b/src/main/resources/data/stats/skills/06600-06699.xml
@@ -67,8 +67,6 @@
 		<set name="effectPoint" val="#effectPoint" />
 		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
-										  
-										 
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A1" />
@@ -231,8 +229,6 @@
 		<set name="effectRange" val="1200" />
 		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
-										  
-										 
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume2" val="#mpConsume2" />
 		<set name="operateType" val="A1" />
@@ -551,68 +547,78 @@
 		</effects>
 	</skill>
 	<skill id="6620" levels="7" name="Maguen Plasma">
+		<!-- High Five Confirmed -->
 		<table name="#mAtk"> 5 10 15 20 25 30 35 </table>
 		<table name="#pAtk"> 100 150 200 250 300 350 400 </table>
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="IMPROVE_MA_MD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="85" />
-		<set name="mpConsume2" val="88" />
 		<set name="mpConsume1" val="22" />
+		<set name="mpConsume2" val="88" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<add stat="pAtk" val="#pAtk" />
+				<add stat="mAtk" val="#mAtk" />
 			</effect>
 			<effect name="Buff">
-				<add stat="mAtk" val="#mAtk" />
+				<add stat="pAtk" val="#pAtk" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="6621" levels="7" name="Maguen Plasma">
+		<!-- High Five Confirmed -->
 		<table name="#mAtk"> 15 20 25 30 35 40 45 </table>
 		<table name="#pAtk"> 200 250 300 350 400 450 500 </table>
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="IMPROVE_MA_MD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="85" />
-		<set name="mpConsume2" val="88" />
 		<set name="mpConsume1" val="22" />
+		<set name="mpConsume2" val="88" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<add stat="pAtk" val="#pAtk" />
+				<add stat="mAtk" val="#mAtk" />
 			</effect>
 			<effect name="Buff">
-				<add stat="mAtk" val="#mAtk" />
+				<add stat="pAtk" val="#pAtk" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="6622" levels="1" name="Shock">
-		<!-- Momentarily causes shock, which stuns the enemy for 20 seconds. In addition, your chance of being critically attacked is increased by 50%. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="20" />
 		<set name="abnormalType" val="STUN" />
 		<set name="abnormalVisualEffect" val="STUN" />
 		<set name="activateRate" val="98" />
+		<set name="affectObject" val="FRIEND" />
+		<set name="affectRange" val="300" />
+		<set name="affectScope" val="POINT_BLANK" />
 		<set name="basicProperty" val="CON" />
 		<set name="effectPoint" val="-100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="icon" val="icon.skill0100" />
 		<set name="isDebuff" val="true" />
 		<set name="lvlBonusRate" val="1" />
@@ -620,52 +626,79 @@
 		<set name="mpConsume2" val="121" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<set name="trait" val="SHOCK" />
 		<effects>
 			<effect name="PhysicalAttack">
-				<param power="2748" />
+				<param power="2784" />
 			</effect>
-			<effect name="Stun">
+			<effect name="Stun" />
+			<effect name="Debuff">
 				<mul stat="defCritRate" val="0.5" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="6623" levels="1" name="Fungus Hub">
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="2000" />
+		<set name="effectRange" val="2000" />
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="84" />
+		<set name="mpConsume1" val="22" />
+		<set name="mpConsume2" val="88" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="HpPerMax">
+				<param power="90" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="6624" levels="1" name="Shock">
-		<!-- Momentarily causes shock, which stuns the enemy for 9 seconds. In addition, your chance of being critically attacked is increased by 50%. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="STUN" />
 		<set name="abnormalVisualEffect" val="STUN" />
 		<set name="activateRate" val="98" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="CON" />
+		<set name="hitCancelTime" val="500" />
 		<set name="icon" val="icon.skill0100" />
 		<set name="isDebuff" val="true" />
 		<set name="lvlBonusRate" val="1" />
 		<set name="magicLvl" val="84" />
+		<set name="mpConsume2" val="121" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
 		<set name="trait" val="SHOCK" />
+		<effects>
+			<effect name="PhysicalAttack">
+				<param power="2738" />
+			</effect>
+			<effect name="Stun" />
+			<effect name="Debuff">
+				<mul stat="defCritRate" val="0.5" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="6625" levels="1" name="Energy of Life">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="2000" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="2000" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="100" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="HpPerMax">
 				<param power="15" />
@@ -707,16 +740,19 @@
 		</effects>
 	</skill>
 	<skill id="6628" levels="1" name="Energy of Mana">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="2000" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="2000" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="100" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MpPerMax">
 				<param power="11" />
@@ -758,20 +794,24 @@
 		</effects>
 	</skill>
 	<skill id="6631" levels="1" name="Energy of Power">
+		<!-- High Five Confirmed -->
 		<set name="abnormalInstant" val="true" />
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="PA_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="2000" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="2000" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="100" />
 		<set name="icon" val="icon.etc_herb_red_i00" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="40" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.15" />
@@ -779,34 +819,49 @@
 		</effects>
 	</skill>
 	<skill id="6632" levels="1" name="Energy of Enchant">
+		<!-- High Five Confirmed -->
 		<set name="abnormalInstant" val="true" />
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="MA_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="2000" />
 		<set name="effectPoint" val="100" />
+		<set name="effectRange" val="2000" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="100" />
 		<set name="icon" val="icon.etc_herb_blue_i00" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="52" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.75" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="6633" levels="1" name="Energy of Attack Speed">
+		<!-- High Five Confirmed -->
 		<set name="abnormalInstant" val="true" />
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="ATTACK_TIME_DOWN" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="2000" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="2000" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="100" />
 		<set name="icon" val="icon.etc_attack_sp_herb_i00" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="52" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="1.33" />
@@ -814,55 +869,74 @@
 		</effects>
 	</skill>
 	<skill id="6634" levels="1" name="Energy of Casting Speed">
+		<!-- High Five Confirmed -->
 		<set name="abnormalInstant" val="true" />
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="CASTING_TIME_DOWN" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="2000" />
 		<set name="effectPoint" val="100" />
+		<set name="effectRange" val="2000" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="100" />
 		<set name="icon" val="icon.etc_magic_sp_herb_i00" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="48" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="1.3" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="6635" levels="1" name="Energy of Crt Rate">
+		<!-- High Five Confirmed -->
 		<set name="abnormalInstant" val="true" />
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="CRITICAL_PROB_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="2000" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="2000" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="100" />
 		<set name="icon" val="icon.etc_critical_herb_i00" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="52" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="critRate" val="1.3" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="6636" levels="1" name="Energy of Moving Speed">
+	<skill id="6636" levels="1" name="Energy of Speed">
+		<!-- High Five Confirmed -->
 		<set name="abnormalInstant" val="true" />
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="SPEED_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="2000" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="2000" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="100" />
 		<set name="icon" val="icon.etc_move_herb_i00" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="30" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="runSpd" val="33" />
@@ -870,49 +944,49 @@
 		</effects>
 	</skill>
 	<skill id="6637" levels="1" name="Vampiric Aura">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalInstant" val="true" />
 		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="VAMPIRIC_ATTACK" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="2000" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="2000" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="100" />
 		<set name="icon" val="icon.skill6637" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="40" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
-		<cond msgId="113" addName="1">
-			<not>
-				<player transformationId="103" />
-			</not>
-		</cond>
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="regHp" val="2" />
-				<mul stat="regMp" val="2" />
+				<add stat="absorbDam" val="9" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="6638" levels="1" name="Aura of Mystery">
+		<!-- High Five Confirmed -->
 		<set name="abnormalInstant" val="true" />
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="BIG_HEAD" />
 		<set name="abnormalVisualEffect" val="BIG_HEAD" />
 		<set name="activateRate" val="0" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="2000" />
 		<set name="effectRange" val="2000" />
+		<set name="hitCancelTime" val="500" />
 		<set name="icon" val="icon.skill2513" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<set name="trait" val="ETC" />
 		<cond msgId="113" addName="1">
 			<not>
@@ -922,47 +996,57 @@
 		<effects>
 			<effect name="Buff">
 				<mul stat="regHp" val="2" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="regMp" val="2" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="6639" levels="1" name="Bane of Auras - Damage">
+		<!-- High Five Confirmed -->
 		<set name="abnormalInstant" val="true" />
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="CRITICAL_DMG_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="2000" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="2000" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="100" />
 		<set name="icon" val="icon.skill2514" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="48" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="critDmg" val="1.35" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="6640" levels="1" name="Energizing Aura">
+	<skill id="6640" levels="1" name="Vitalizing Aura">
+		<!-- High Five Confirmed -->
 		<set name="abnormalInstant" val="true" />
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="VP_UP" />
 		<set name="abnormalVisualEffect" val="VP_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="2000" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="2000" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="100" />
 		<set name="icon" val="icon.skilltransform4" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<sub stat="vitalityConsumeRate" val="10" />
@@ -1066,32 +1150,51 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="6647" levels="1" name="Presentation - Ice Knight">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="6648" levels="1" name="Komodo Heal">
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="2000" />
+		<set name="effectRange" val="2000" />
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="84" />
+		<set name="mpConsume1" val="22" />
+		<set name="mpConsume2" val="88" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="HpPerMax">
+				<param power="30" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="6649" levels="1" name="Treykan Transformation">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1800" />
 		<set name="abnormalType" val="TRANSFORM" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="castRange" val="2000" />
 		<set name="effectPoint" val="1" />
+		<set name="effectRange" val="2000" />
+		<set name="hitTime" val="2500" />
 		<set name="icon" val="icon.skilltransform1" />
 		<set name="irreplaceableBuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
+		<set name="mpConsume2" val="31" />
 		<set name="operateType" val="A2" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="reuseDelayLock" val="true" />
-		<set name="targetType" val="ONE" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="TARGET" />
 		<cond>
 			<player canTransform="true" />
 		</cond>
@@ -1146,41 +1249,94 @@
 		</effects>
 	</skill>
 	<skill id="6652" levels="1" name="Level 85 Raid Boss">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.skillraid" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="6653" levels="1" name="Level 85 Raid Boss">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.skillraid" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="6654" levels="1" name="Level 85 Raid Boss">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.skillraid" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="6655" levels="1" name="Tarsque Carapace">
+		<!-- High Five Confirmed -->
+		<set name="blockedInOlympiad" val="true" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
+		<effects>
+			<effect name="Buff">
+				<add stat="vengeancePdam" val="70" />
+			</effect>
+			<effect name="Buff">
+				<add stat="reflectDam" val="70" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.6" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pDef" val="1.6" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="6656" levels="1" name="Lavasaurus Firstborn Attack">
+		<!-- High Five Confirmed -->
+		<set name="affectObject" val="NOT_FRIEND" />
+		<set name="affectRange" val="300" />
+		<set name="affectScope" val="RANGE" />
+		<set name="attributePower" val="180" />
+		<set name="attributeType" val="FIRE" />
+		<set name="castRange" val="1200" />
 		<set name="effectPoint" val="-100" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="2000" />
 		<set name="magicLvl" val="85" />
+		<set name="mpConsume2" val="83" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="AREA" />
+		<effects>
+			<effect name="PhysicalAttack">
+				<param power="11599" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="6657" levels="1" name="Lavasaurus Firstborn Heal">
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="attributePower" val="180" />
+		<set name="attributeType" val="FIRE" />
+		<set name="castRange" val="500" />
+		<set name="effectRange" val="700" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="2000" />
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="85" />
+		<set name="mpConsume1" val="22" />
+		<set name="mpConsume2" val="88" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="HpPerMax">
+				<param power="2" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="6658" levels="1" name="Level 84 Raid Boss">
 		<!-- Confirmed CT2.5 -->
@@ -1274,21 +1430,25 @@
 		</effects>
 	</skill>
 	<skill id="6666" levels="1" name="Feral Shield">
-		<!-- Increases P. Def. by 18% by 5 minutes. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="315" />
 		<set name="abnormalType" val="PD_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="418" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1400" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill1040" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="84" />
+		<set name="mpConsume1" val="22" />
+		<set name="mpConsume2" val="88" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="90000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.18" />
@@ -1296,21 +1456,25 @@
 		</effects>
 	</skill>
 	<skill id="6667" levels="1" name="Feral Wind Walk">
-		<!-- Increases Moving Spd. by 33 for 5 minutes. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="315" />
 		<set name="abnormalType" val="SPEED_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="285" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1400" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill1204" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="84" />
+		<set name="mpConsume1" val="22" />
+		<set name="mpConsume2" val="88" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="90000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="runSpd" val="33" />
@@ -1318,21 +1482,25 @@
 		</effects>
 	</skill>
 	<skill id="6668" levels="1" name="Feral Death Whisper">
-		<!-- Increases critical attack power by 35% for 5 minutes. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="315" />
 		<set name="abnormalType" val="CRITICAL_DMG_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="532" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1400" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill1242" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="84" />
+		<set name="mpConsume1" val="22" />
+		<set name="mpConsume2" val="88" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="90000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="critDmg" val="1.35" />
@@ -1340,21 +1508,25 @@
 		</effects>
 	</skill>
 	<skill id="6669" levels="1" name="Feral Body Bless">
-		<!-- Increases Max HP by 35% for 5 minutes. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="6" />
 		<set name="abnormalTime" val="315" />
 		<set name="abnormalType" val="MAX_HP_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="646" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1400" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill1045" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="84" />
+		<set name="mpConsume1" val="22" />
+		<set name="mpConsume2" val="88" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="90000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxHp">
 				<param power="35" />
@@ -1363,21 +1535,25 @@
 		</effects>
 	</skill>
 	<skill id="6670" levels="1" name="Feral Vampiric Rage">
-		<!-- For 5 minutes, 9% of the standard short-range physical damage inflicted on the enemy is converted to HP for you. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="315" />
 		<set name="abnormalType" val="VAMPIRIC_ATTACK" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="549" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1400" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill1268" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="84" />
+		<set name="mpConsume1" val="22" />
+		<set name="mpConsume2" val="88" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="90000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="absorbDam" val="9" />
@@ -1385,50 +1561,72 @@
 		</effects>
 	</skill>
 	<skill id="6671" levels="1" name="Feral Berserker Spirit">
-		<!-- Decreases P. Def. by 8%, M. Def. by 16%, Evasion by 4 and increases P. Atk. by 8%, M. Atk. by 16%, Atk. Spd. by 8%, Casting Spd. by 8%, and Moving Spd. by 8 for 5 minutes. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="315" />
 		<set name="abnormalType" val="BERSERKER" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="549" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1400" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill1062" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="84" />
+		<set name="mpConsume1" val="22" />
+		<set name="mpConsume2" val="88" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="90000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="1.08" />
+			</effect>
+			<effect name="Debuff">
+				<sub stat="rEvas" val="4" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="1.08" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtk" val="1.16" />
-				<mul stat="pAtk" val="1.08" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="mDef" val="0.84" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.08" />
+			</effect>
+			<effect name="Debuff">
 				<mul stat="pDef" val="0.92" />
-				<mul stat="mAtkSpd" val="1.08" />
-				<mul stat="pAtkSpd" val="1.08" />
+			</effect>
+			<effect name="Buff">
 				<add stat="runSpd" val="8" />
-				<sub stat="rEvas" val="4" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="6672" levels="1" name="Feral Bless Shield">
-		<!-- Increases Shield defense rate by 5% for 30 minutes. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="6" />
 		<set name="abnormalTime" val="315" />
 		<set name="abnormalType" val="SHIELD_PROB_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="549" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1400" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill1243" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="84" />
+		<set name="mpConsume1" val="22" />
+		<set name="mpConsume2" val="88" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="90000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="rShld" val="1.05" />
@@ -1436,28 +1634,38 @@
 		</effects>
 	</skill>
 	<skill id="6673" levels="1" name="Presentation - Attain Noblesse">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="600" />
 		<set name="effectPoint" val="100" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="effectRange" val="1100" />
+		<set name="hitTime" val="1000" />
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="Buff" />
+		</effects>
 	</skill>
 	<skill id="6674" levels="1" name="Energy of Range Increment">
-		<!-- Bow/Crossbow range is temporarily increased by 50. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalInstant" val="true" />
 		<set name="abnormalLvl" val="10" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="SIGNAL_B" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="2000" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="2000" />
+		<set name="hitCancelTime" val="500" />
 		<set name="icon" val="icon.etc_magic_sp_herb_i00" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="52" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="pAtkRange" val="50">
@@ -1467,20 +1675,35 @@
 		</effects>
 	</skill>
 	<skill id="6675" levels="1" name="Lavasaurus Firstborn Attack">
+		<!-- High Five Confirmed -->
+		<set name="affectObject" val="NOT_FRIEND" />
+		<set name="affectRange" val="300" />
+		<set name="affectScope" val="POINT_BLANK" />
+		<set name="attributePower" val="180" />
+		<set name="attributeType" val="FIRE" />
 		<set name="effectPoint" val="-100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="magicLvl" val="85" />
+		<set name="mpConsume2" val="83" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="AURA" />
+		<effects>
+			<effect name="PhysicalAttack">
+				<param power="11599" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="6676" levels="1" name="Magician's Perversity">
+		<!-- High Five Confirmed -->
 		<set name="affectScope" val="SINGLE" />
+		<set name="attributePower" val="180" />
+		<set name="attributeType" val="EARTH" />
 		<set name="castRange" val="900" />
 		<set name="coolTime" val="500" />
 		<set name="effectPoint" val="-684" />
 		<set name="effectRange" val="1200" />
-		<set name="attributeType" val="EARTH" />
-		<set name="attributePower" val="180" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
 		<set name="magicLvl" val="83" />
 		<set name="mpConsume2" val="82" />
@@ -1582,23 +1805,25 @@
 		</effects>
 	</skill>
 	<skill id="6681" levels="1" name="Maguen Speed Walk">
-		<!-- Moving Spd. increases by 40 for 20 minutes. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="SPEED_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill1204" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="85" />
-		<set name="mpConsume2" val="88" />
 		<set name="mpConsume1" val="22" />
+		<set name="mpConsume2" val="88" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="runSpd" val="40" />
@@ -1606,24 +1831,27 @@
 		</effects>
 	</skill>
 	<skill id="6682" levels="1" name="Elite Maguen Speed Walk">
-		<!-- Moving Spd. increases by 45 for 20 minutes. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="SPEED_UP" />
+		<set name="affectObject" val="FRIEND" />
 		<set name="affectRange" val="1000" />
+		<set name="affectScope" val="PARTY" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill1204" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="85" />
-		<set name="mpConsume2" val="88" />
 		<set name="mpConsume1" val="22" />
+		<set name="mpConsume2" val="88" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="PARTY" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="runSpd" val="45" />
@@ -1631,16 +1859,18 @@
 		</effects>
 	</skill>
 	<skill id="6683" levels="1" name="Maguen Recall">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="OWNER_PET" />
+		<set name="targetType" val="TARGET" />
 		<cond msgId="113" addName="1">
 			<and>
 				<player canEscape="true" />
@@ -1655,18 +1885,21 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="6684" levels="1" name="Maguen Recall">
-		<!-- Confirmed CT2.5 -->
+	<skill id="6684" levels="1" name="Maguen Party Recall">
+		<!-- High Five Confirmed -->
+		<set name="affectObject" val="FRIEND" />
 		<set name="affectRange" val="1000" />
+		<set name="affectScope" val="PARTY" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="3000" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="PARTY" />
+		<set name="targetType" val="TARGET" />
 		<cond msgId="113" addName="1">
 			<and>
 				<player canEscape="true" />
@@ -1682,19 +1915,23 @@
 		</effects>
 	</skill>
 	<skill id="6685" levels="1" name="Santa Claus's Gift">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="coolTime" val="1000" />
 		<set name="hitTime" val="2700" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="55" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1800000" />
+		<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="129">
 			<and>
 				<player invSize="10" />
 				<player weight="80" />
+				<player hasAgathion="true" />
 			</and>
 		</cond>
 		<effects>
@@ -1704,31 +1941,37 @@
 		</effects>
 	</skill>
 	<skill id="6686" levels="1" name="Sacred Protector Cancel">
-		<!-- Confirmed CT2.5 -->
-		<!-- Monastery of Silence Skills -->
+		<!-- High Five Confirmed -->
+		<set name="affectObject" val="FRIEND" />
 		<set name="affectRange" val="200" />
+		<set name="affectScope" val="POINT_BLANK" />
 		<set name="effectPoint" val="1" />
+		<set name="hitCancelTime" val="500" />
 		<set name="magicLvl" val="83" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="CLAN" /> <!-- FIXME: Aura Friendly ? -->
+		<set name="targetType" val="AURA" />
 		<effects>
 			<effect name="DispelBySlot">
-				<param dispel="PA_UP,9;PD_UP,9" />
+				<param dispel="PA_UP,9" />
+			</effect>
+			<effect name="DispelBySlot">
+				<param dispel="PD_UP,9" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="6687" levels="1" name="Patience">
-		<!-- Confirmed CT2.5 -->
-		<!-- NOTE: Description says pAtk but is client typo, this increase skill pAtk -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="7" />
 		<set name="abnormalType" val="PATIENCE" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="hitCancelTime" val="500" />
 		<set name="icon" val="icon.skill0983" />
-		<set name="isMagic" val="4" /> <!-- Trigger Skill -->
+		<set name="isMagic" val="4" />
 		<set name="magicLvl" val="60" />
 		<set name="operateType" val="A2" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="Buff">
@@ -1737,37 +1980,61 @@
 		</effects>
 	</skill>
 	<skill id="6688" levels="1" name="Soup of Failure">
-		<!-- Confirmed CT2.5 -->
-		<!-- Sel Mahum Training Grounds Skills -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="180" />
 		<set name="abnormalType" val="ATTACK_TIME_DOWN" />
+		<set name="affectObject" val="FRIEND" />
 		<set name="affectRange" val="350" />
+		<set name="affectScope" val="POINT_BLANK" />
 		<set name="effectPoint" val="100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="100" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="CLAN" /> <!-- FIXME: Aura Friendly ? -->
+		<set name="targetType" val="AURA" />
 		<effects>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="1.2" />
+			</effect>
 			<effect name="TickHp">
 				<param power="-0.02" />
-				<param mode="PER" />
 				<param ticks="5" />
-				<mul stat="pAtkSpd" val="1.2" />
+				<param mode="PER" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="6689" levels="1" name="Absorb HP MP">
+		<!-- High Five Confirmed -->
+		<set name="affectObject" val="NOT_FRIEND" />
+		<set name="affectRange" val="100" />
+		<set name="affectScope" val="RANGE" />
+		<set name="attributePower" val="20" />
+		<set name="attributeType" val="UNHOLY" />
+		<set name="castRange" val="600" />
 		<set name="coolTime" val="2000" />
 		<set name="effectPoint" val="-100" />
+		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="2000" />
 		<set name="magicLvl" val="83" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="AREA" />
+		<effects>
+			<effect name="HpDrain">
+				<param power="131" />
+				<param drain="1.40" />
+			</effect>
+			<effect name="Mp">
+				<param amount="-491" />
+				<param mode="DIFF" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="6690" levels="1" name="Hold">
 		<!-- High Five Confirmed -->
@@ -1917,17 +2184,20 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<set name="trait" val="HOLD" />
 	</skill>
 	<skill id="6697" levels="1" name="Eternal Blizzard">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
 		<!-- Freya Skills -->
+		<set name="affectObject" val="NOT_FRIEND" />
 		<set name="affectRange" val="3000" />
+		<set name="affectScope" val="POINT_BLANK" />
+		<set name="attributePower" val="180" />
+		<set name="attributeType" val="WATER" />
 		<set name="coolTime" val="500" />
 		<set name="effectPoint" val="-1000" />
-		<set name="attributeType" val="WATER" />
-		<set name="attributePower" val="180" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="7000" />
 		<set name="icon" val="icon.skill6274" />
 		<set name="magicLvl" val="85" />
@@ -1937,40 +2207,43 @@
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="AURA" />
 		<effects>
-			<effect name="PhysicalAttack">
-				<param power="45257" />
-			</effect>
 			<effect name="CallSkill">
 				<param skillId="6698" skillLevel="1" />
 			</effect>
+			<effect name="PhysicalAttack">
+				<param power="45257" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="6698" levels="1" name="Pillar of Frozen - Eternal Ice">
-		<!-- Confirmed CT2.5 -->
-		<!-- Freya Skills (Triggered from 6698) -->
+		<!-- High Five Confirmed -->
+		<!-- Freya Skills -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="FREEZING" />
 		<set name="abnormalVisualEffect" val="FROZEN_PILLAR" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="CON" />
 		<set name="effectPoint" val="100" />
 		<set name="icon" val="icon.skill6274" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="lvlBonusRate" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="AURA" />
+		<set name="targetType" val="SELF" />
 		<effects>
-			<effect name="Paralyze" />
+			<effect name="Stun" />
 			<effect name="TickHp">
 				<param power="-115" />
 				<param ticks="5" />
+				<param mode="DIFF" />
 			</effect>
 			<effect name="TickMp">
 				<param power="-5" />
 				<param ticks="5" />
+				<param mode="PER" />
 			</effect>
 		</effects>
 		<endEffects>
@@ -1980,10 +2253,17 @@
 		</endEffects>
 	</skill>
 	<skill id="6699" levels="1" name="Ball Trapping Gnosian Agathion Cute Trick">
-		<!-- You can see the summoned spirit's cute tricks. -->
-		<set name="blockedInOlympiad" val="true" />
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="hitTime" val="7000" />
 		<set name="icon" val="icon.skill_agathion_cute" />
-		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<set name="isMagic" val="2" />
+		<set name="magicLvl" val="85" />
+		<set name="operateType" val="A1" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="SELF" />
+		<cond msgId="2292">
+			<player hasAgathion="true" />
+		</cond>
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/06700-06799.xml b/src/main/resources/data/stats/skills/06700-06799.xml
index fa7af01c82..f598327479 100644
--- a/src/main/resources/data/stats/skills/06700-06799.xml
+++ b/src/main/resources/data/stats/skills/06700-06799.xml
@@ -99,20 +99,22 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="6714" levels="1" name="Wind Walk of Elcadia">
-		<!-- High Five Skill -->
-		<set name="abnormalLvl" val="2" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="SPEED_UP" />
-		<set name="blockedInOlympiad" val="true" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
-		<set name="effectPoint" val="285" />
+		<set name="effectPoint" val="495" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill1204" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="runSpd" val="33" />
@@ -120,20 +122,22 @@
 		</effects>
 	</skill>
 	<skill id="6715" levels="1" name="Haste of Elcadia">
-		<!-- High Five Skill -->
-		<set name="abnormalLvl" val="2" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="ATTACK_TIME_DOWN" />
-		<set name="blockedInOlympiad" val="true" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="495" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill1086" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="1.33" />
@@ -141,20 +145,22 @@
 		</effects>
 	</skill>
 	<skill id="6716" levels="1" name="Might of Elcadia">
-		<!-- High Five Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="PA_UP" />
-		<set name="blockedInOlympiad" val="true" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
-		<set name="effectPoint" val="379" />
+		<set name="effectPoint" val="495" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill1068" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.15" />
@@ -162,48 +168,66 @@
 		</effects>
 	</skill>
 	<skill id="6717" levels="1" name="Berserker Spirit of Elcadia">
-		<!-- High Five Skill -->
-		<set name="abnormalLvl" val="2" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="BERSERKER" />
-		<set name="blockedInOlympiad" val="true" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="495" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill1062" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="1.08" />
+			</effect>
+			<effect name="Debuff">
+				<sub stat="rEvas" val="4" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="1.08" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtk" val="1.16" />
+			</effect>
+			<effect name="Debuff">
+				<mul stat="mDef" val="0.84" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="pAtk" val="1.08" />
-				<mul stat="mDef" val="1.16" />
-				<mul stat="pDef" val="1.08" />
-				<mul stat="mAtkSpd" val="1.16" />
-				<mul stat="pAtkSpd" val="1.08" />
+			</effect>
+			<effect name="Debuff">
+				<mul stat="pDef" val="0.92" />
+			</effect>
+			<effect name="Buff">
 				<add stat="runSpd" val="8" />
-				<sub stat="rEvas" val="4" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="6718" levels="1" name="Death Whisper of Elcadia">
-		<!-- High Five Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="CRITICAL_DMG_UP" />
-		<set name="blockedInOlympiad" val="true" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
-		<set name="effectPoint" val="532" />
+		<set name="effectPoint" val="495" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill1242" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="critDmg" val="1.35" />
@@ -211,20 +235,22 @@
 		</effects>
 	</skill>
 	<skill id="6719" levels="1" name="Guidance of Elcadia">
-		<!-- High Five Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="HIT_UP" />
-		<set name="blockedInOlympiad" val="true" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
-		<set name="effectPoint" val="532" />
+		<set name="effectPoint" val="495" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill1240" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="accCombat" val="4" />
@@ -232,20 +258,22 @@
 		</effects>
 	</skill>
 	<skill id="6720" levels="1" name="Focus of Elcadia">
-		<!-- High Five Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="CRITICAL_PROB_UP" />
-		<set name="blockedInOlympiad" val="true" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="495" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill1077" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="critRate" val="1.3" />
@@ -253,20 +281,22 @@
 		</effects>
 	</skill>
 	<skill id="6721" levels="1" name="Empower of Elcadia">
-		<!-- High Five Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="MA_UP" />
-		<set name="blockedInOlympiad" val="true" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="495" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill1059" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mAtk" val="1.75" />
@@ -274,20 +304,22 @@
 		</effects>
 	</skill>
 	<skill id="6722" levels="1" name="Acumen of Elcadia">
-		<!-- High Five Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="CASTING_TIME_DOWN" />
-		<set name="blockedInOlympiad" val="true" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
-		<set name="effectPoint" val="457" />
+		<set name="effectPoint" val="495" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill1085" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.3" />
@@ -295,20 +327,22 @@
 		</effects>
 	</skill>
 	<skill id="6723" levels="1" name="Concentration of Elcadia">
-		<!-- High Five Skill -->
-		<set name="abnormalLvl" val="6" />
-		<set name="abnormalTime" val="1200" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="7" />
+		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="CANCEL_PROB_DOWN" />
-		<set name="blockedInOlympiad" val="true" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="624" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill1078" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<sub stat="cancel" val="53" />
@@ -316,46 +350,54 @@
 		</effects>
 	</skill>
 	<skill id="6724" levels="1" name="Greater Heal of Elcadia">
-		<!-- High Five Skill -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="6" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="LIFE_FORCE_OTHERS" />
 		<set name="activateRate" val="0" />
-		<set name="blockedInOlympiad" val="true" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="520" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill1217" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="3000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="Heal">
+				<param power="450" />
+			</effect>
 			<effect name="TickHp">
 				<param power="30" />
 				<param ticks="1" />
-			</effect>
-			<effect name="Heal">
-				<param power="450" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="6725" levels="1" name="Bless the Blood of Elcadia">
-		<!-- High Five Skill -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="BLESS_THE_BLOOD" />
-		<set name="blockedInOlympiad" val="true" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill1218" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="20000" />
+		<set name="reuseDelayLock" val="true" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
@@ -367,54 +409,62 @@
 		</effects>
 	</skill>
 	<skill id="6726" levels="1" name="Bless the Blood">
-		<!-- High Five Skill -->
-		<set name="blockedInOlympiad" val="true" />
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="hitCancelTime" val="500" />
 		<set name="icon" val="icon.skill3080" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="4000" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="reuseDelayLock" val="true" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="Hp">
 				<param amount="687" />
+				<param mode="DIFF" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="6727" levels="1" name="Vampiric Rage of Elcadia">
-		<!-- High Five Skill -->
-		<set name="abnormalLvl" val="4" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="5" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="VAMPIRIC_ATTACK" />
-		<set name="blockedInOlympiad" val="true" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
-		<set name="effectPoint" val="646" />
+		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1268" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<add stat="absorbDam" val="9" /> <!-- absorb HP from damage inflicted on enemies -->
+				<add stat="absorbDam" val="9" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="6728" levels="1" name="Recharge of Elcadia">
-		<!-- High Five Skill -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="655" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="6000" />
 		<set name="icon" val="icon.skill1013" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="magicLvl" val="80" />
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
+		<set name="reuseDelay" val="3000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="ManaHealByLevel">
 				<param power="136" />
@@ -422,38 +472,44 @@
 		</effects>
 	</skill>
 	<skill id="6729" levels="1" name="Resist Holy of Elcadia">
-		<!-- High Five Skill -->
-		<set name="abnormalLvl" val="1" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="600" />
-		<set name="abnormalType" val="ARMOR_UNHOLY" />
-		<set name="blockedInOlympiad" val="true" />
+		<set name="abnormalType" val="ARMOR_HOLY" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="655" />
 		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1392" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<add stat="darkRes" val="30" />
+				<add stat="holyRes" val="30" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="6730" levels="1" name="Greater Battle Heal of Elcadia">
-		<!-- High Five Skill -->
-		<set name="blockedInOlympiad" val="true" />
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="468" />
 		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill1218" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Heal">
 				<param power="858" />
@@ -461,9 +517,25 @@
 		</effects>
 	</skill>
 	<skill id="6731" levels="1" name="Etis Shadow">
-		<!-- none -->
-		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalTime" val="1200" />
+		<set name="abnormalType" val="STEALTH" />
+		<set name="abnormalVisualEffect" val="STEALTH" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="150" />
+		<set name="effectPoint" val="1000" />
+		<set name="effectRange" val="200" />
+		<set name="magicLvl" val="85" />
+		<set name="operateType" val="A2" />
+		<set name="rideState" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<cond msgId="109">
+			<target npcId="18950,18951" />
+		</cond>
+		<effects>
+			<effect name="Buff" />
+		</effects>
 	</skill>
 	<skill id="6732" levels="1" name="Mirage">
 		<!-- High Five Confirmed -->
@@ -480,19 +552,88 @@
 		</effects>
 	</skill>
 	<skill id="6733" levels="1" name="Antharas's Stigma">
-		<!-- "Antharas's stigma. After 10 seconds, spreads the Stigma Aftermath nearby, which decreases 400 HP per second and 150 MP." -->
-		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalTime" val="10" />
+		<set name="abnormalType" val="TIME_BOMB" />
+		<set name="abnormalVisualEffect" val="TIME_BOMB" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="2000" />
+		<set name="effectPoint" val="-10000" />
+		<set name="effectRange" val="2000" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="3000" />
+		<set name="icon" val="icon.skill5860" />
+		<set name="isDebuff" val="true" />
+		<set name="isMagic" val="2" />
+		<set name="magicLvl" val="85" />
+		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="2000" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="ENEMY" />
+		<effects>
+			<effect name="Debuff" />
+		</effects>
 	</skill>
 	<skill id="6734" levels="1" name="Energy of Destruction">
-		<!-- "For 5 seconds, inflicted with poison with 800 HP decrease per second." -->
-		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="10" />
+		<set name="abnormalTime" val="5" />
+		<set name="abnormalType" val="POISON" />
+		<set name="abnormalVisualEffect" val="DOT_POISON" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="attributePower" val="120" />
+		<set name="attributeType" val="EARTH" />
+		<set name="basicProperty" val="CON" />
+		<set name="effectPoint" val="-100" />
+		<set name="icon" val="icon.skill0129" />
+		<set name="isDebuff" val="true" />
+		<set name="lvlBonusRate" val="1" />
+		<set name="magicLvl" val="85" />
+		<set name="operateType" val="A2" />
+		<set name="rideState" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<set name="trait" val="POISON" />
+		<effects>
+			<effect name="TickHp">
+				<param power="-800" />
+				<param ticks="5" />
+				<param mode="DIFF" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="6735" levels="1" name="Petrify">
-		<!-- "Inflicted with petrification, the body is rigid like stone." -->
-		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalTime" val="5" />
+		<set name="abnormalType" val="TURN_STONE" />
+		<set name="abnormalVisualEffect" val="FLESH_STONE" />
+		<set name="affectObject" val="NOT_FRIEND" />
+		<set name="affectRange" val="100" />
+		<set name="affectScope" val="POINT_BLANK" />
+		<set name="basicProperty" val="MEN" />
+		<set name="effectPoint" val="-1000" />
+		<set name="icon" val="icon.skill4111" />
+		<set name="isDebuff" val="true" />
+		<set name="lvlBonusRate" val="1" />
+		<set name="magicLvl" val="85" />
+		<set name="operateType" val="A2" />
+		<set name="rideState" val="NONE" />
+		<set name="targetType" val="AURA" />
+		<effects>
+			<effect name="Stun" />
+			<effect name="BlockBuff" />
+			<effect name="BlockDebuff" />
+			<effect name="BlockDamage">
+				<param block="HP" />
+			</effect>
+			<effect name="BlockDamage">
+				<param block="MP" />
+			</effect>
+			<effect name="Debuff">
+				<mul stat="regHp" val="0" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="6736" levels="1" name="Fierce Attack">
 		<!-- High Five Confirmed -->
@@ -639,7 +780,6 @@
 	</skill>
 	<skill id="6744" levels="1" name="Dark Storm">
 		<!-- High Five Confirmed -->
- 		<!-- Casting Spd. decreases by 90% and Atk. Spd. decreases by 30%. -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="CASTING_TIME_UP" />
@@ -839,9 +979,29 @@
 		</effects>
 	</skill>
 	<skill id="6751" levels="1" name="Blow Attack">
-		<!-- none -->
-		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<!-- High Five Confirmed -->
+		<set name="affectObject" val="NOT_FRIEND" />
+		<set name="affectRange" val="150" />
+		<set name="affectScope" val="RANGE" />
+		<set name="attributePower" val="120" />
+		<set name="attributeType" val="UNHOLY" />
+		<set name="castRange" val="150" />
+		<set name="effectPoint" val="-1000" />
+		<set name="effectRange" val="300" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="1500" />
+		<set name="magicLvl" val="85" />
+		<set name="mpConsume2" val="33" />
+		<set name="nextActionAttack" val="true" />
+		<set name="operateType" val="A1" />
+		<set name="reuseDelay" val="5000" />
+		<set name="rideState" val="NONE" />
+		<set name="targetType" val="AREA" />
+		<effects>
+			<effect name="PhysicalAttack">
+				<param power="7072" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="6752" levels="1" name="Revival">
 		<!-- High Five Confirmed -->
@@ -1237,10 +1397,10 @@
 		<effects>
 			<effect name="Stun" />
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockBuff" />
 			<effect name="BlockDebuff" />
diff --git a/src/main/resources/data/stats/skills/06800-06899.xml b/src/main/resources/data/stats/skills/06800-06899.xml
index a7284559e0..b6038c4821 100644
--- a/src/main/resources/data/stats/skills/06800-06899.xml
+++ b/src/main/resources/data/stats/skills/06800-06899.xml
@@ -795,68 +795,78 @@
 	</skill>
 	<skill id="6841" levels="1" name="Summon Subordinate">
 		<!-- High Five Confirmed -->
-		<set name="hitTime" val="5000"/>
-		<set name="magicLvl" val="84"/>
-		<set name="operateType" val="A1"/>
-		<set name="rideState" val="NONE"/>
-		<set name="targetType" val="SELF"/>
+		<set name="affectScope" val="SINGLE" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="5000" />
+		<set name="magicLvl" val="84" />
+		<set name="operateType" val="A1" />
+		<set name="rideState" val="NONE" />
+		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="6842" levels="2" name="Enhance">
 		<!-- High Five Confirmed -->
 		<table name="#abnormalLvl"> 1 2 </table>
 		<table name="#pAtk"> 1.12 1 </table>
 		<table name="#pAtkSpd"> 1.15 1.33 </table>
-		<set name="abnormalLvl" val="#abnormalLvl"/>
-		<set name="abnormalTime" val="300"/>
-		<set name="abnormalType" val="CASTING_TIME_UP"/>
-		<set name="basicProperty" val="MEN"/>
-		<set name="hitTime" val="3000"/>
-		<set name="icon" val="icon.skill1086"/>
-		<set name="isMagic" val="1"/>
-		<set name="lvlBonusRate" val="2"/>
-		<set name="magicLvl" val="85"/>
-		<set name="operateType" val="A2"/>
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF"/>
-		<set name="targetType" val="SELF"/>
+		<set name="abnormalLvl" val="#abnormalLvl" />
+		<set name="abnormalTime" val="300" />
+		<set name="abnormalType" val="CASTING_TIME_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="basicProperty" val="MEN" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="3000" />
+		<set name="icon" val="icon.skill1086" />
+		<set name="isMagic" val="1" />
+		<set name="lvlBonusRate" val="2" />
+		<set name="magicLvl" val="85" />
+		<set name="operateType" val="A2" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="pAtk" val="#pAtk"/>
+				<mul stat="pAtkSpd" val="#pAtkSpd" />
 			</effect>
 			<effect name="Buff">
-				<mul stat="pAtkSpd" val="#pAtkSpd"/>
+				<mul stat="pAtk" val="#pAtk" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="6843" levels="1" name="Enhance">
 		<!-- High Five Confirmed -->
-		<set name="abnormalLvl" val="3"/>
-		<set name="abnormalTime" val="300"/>
-		<set name="abnormalType" val="CASTING_TIME_UP"/>
-		<set name="basicProperty" val="MEN"/>
-		<set name="hitTime" val="3000"/>
-		<set name="icon" val="icon.skill1086"/>
-		<set name="isMagic" val="1"/>
-		<set name="lvlBonusRate" val="2"/>
-		<set name="magicLvl" val="85"/>
-		<set name="operateType" val="A2"/>
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF"/>
-		<set name="targetType" val="SELF"/>
+		<set name="abnormalLvl" val="3" />
+		<set name="abnormalTime" val="300" />
+		<set name="abnormalType" val="CASTING_TIME_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="basicProperty" val="MEN" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="3000" />
+		<set name="icon" val="icon.skill1086" />
+		<set name="isMagic" val="1" />
+		<set name="lvlBonusRate" val="2" />
+		<set name="magicLvl" val="85" />
+		<set name="operateType" val="A2" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="pAtkSpd" val="1.4"/>
+				<mul stat="pAtkSpd" val="1.4" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="6844" levels="1" name="Power Strike">
 		<!-- High Five Confirmed -->
-		<set name="castRange" val="300"/>
-		<set name="effectPoint" val="-10000"/>
-		<set name="effectRange" val="500"/>
-		<set name="hitTime" val="3000"/>
-		<set name="magicLvl" val="85"/>
-		<set name="operateType" val="A1"/>
-		<set name="rideState" val="NONE"/>
-		<set name="targetType" val="ONE"/>
+		<set name="affectObject" val="NOT_FRIEND" />
+		<set name="affectScope" val="FAN" />
+		<set name="castRange" val="300" />
+		<set name="effectPoint" val="-10000" />
+		<set name="effectRange" val="500" />
+		<set name="fanRange" val="0,0,300,60" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="3000" />
+		<set name="magicLvl" val="85" />
+		<set name="operateType" val="A1" />
+		<set name="rideState" val="NONE" />
+		<set name="targetType" val="FRONT_AREA" />
 		<effects>
 			<effect name="PhysicalAttack">
 				<param power="6960" />
@@ -1625,57 +1635,100 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="6883" levels="1" name="Energy Abundance Effect">
-		<!-- "For 5 minutes, energy is filled to stage 4. Returns to before as time goes on." -->
-		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+	<skill id="6883" levels="1" name="Vitality Recovery Effect">
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalTime" val="300" />
+		<set name="abnormalType" val="VP_CHANGE" />
+		<set name="abnormalVisualEffect" val="VP_UP" />
+		<set name="affectRange" val="1000" />
+		<set name="affectScope" val="PARTY" />
+		<set name="buffProtectLevel" val="2" />
+		<set name="castRange" val="900" />
+		<set name="effectPoint" val="100" />
+		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="100" />
+		<set name="icon" val="icon.skilltransform4" />
+		<set name="irreplaceableBuff" val="true" />
+		<set name="isMagic" val="2" />
+		<set name="magicLvl" val="-1" />
+		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="2000" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="Buff" />
+		</effects>
 	</skill>
 	<skill id="6884" levels="1" name="Morale Boost">
-		<!-- none -->
-		<set name="abnormalTime" val="60" />
-		<set name="activateRate" val="80" />
-		<set name="blockedInOlympiad" val="true" />
-		<set name="effectPoint" val="1" />
-		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="1600" />
+		<set name="effectPoint" val="-100" />
+		<set name="effectRange" val="2000" />
+		<set name="magicLvl" val="80" />
+		<set name="operateType" val="A1" />
+		<set name="rideState" val="NONE" />
+		<set name="targetType" val="ENEMY" />
 	</skill>
 	<skill id="6885" levels="3" name="Morale Boost">
-		<!-- Confirmed High Five -->
-		<table name="#abnormalLvl"> 2 3 4 </table>
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
+		<table name="#abnormalVisualEffect"> NONE NONE VP_KEEP </table>
+		<table name="#attackTraitPower"> 50 80 90 </table>
 		<table name="#critDmg"> 1.1 1.15 1.2 </table>
-		<table name="#pmAtk"> 1 1.15 1.15 </table>
-		<table name="#pmAtkSpd"> 1 1 1.15 </table>
 		<table name="#critRate"> 1.1 1.3 1.5 </table>
-		<table name="#traits"> 50 80 90 </table>
+		<table name="#defenceTraitPower"> 50 80 90 </table>
+		<table name="#mAtk"> 1 1.15 1.15 </table>
+		<table name="#mAtkSpd"> 1 1 1.15 </table>
+		<table name="#pAtk"> 1 1.15 1.15 </table>
+		<table name="#pAtkSpd"> 1 1 1.15 </table>
 		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="60" />
 		<set name="abnormalType" val="MORALE_UP" />
-		<set name="affectRange" val="1000" />
-		<set name="blockedInOlympiad" val="true" />
-		<set name="castRange" val="1500" />
-		<set name="effectPoint" val="100" />
-		<set name="effectRange" val="1800" />
+		<set name="abnormalVisualEffect" val="#abnormalVisualEffect" />
+		<set name="affectRange" val="1600" />
+		<set name="affectScope" val="PARTY" />
+		<set name="castRange" val="1600" />
+		<set name="effectRange" val="2000" />
 		<set name="icon" val="icon.skill6885" />
-		<set name="isMagic" val="4" /> <!-- Trigger Skill -->
+		<set name="isMagic" val="4" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="PARTY" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="AttackTrait">
+				<param PARALYZE="#attackTraitPower" />
+			</effect>
+			<effect name="AttackTrait">
+				<param POISON="#attackTraitPower" />
+			</effect>
+			<effect name="AttackTrait">
+				<param SHOCK="#attackTraitPower" />
+			</effect>
 			<effect name="Buff">
-				<mul stat="critRate" val="#critRate" />
 				<mul stat="critDmg" val="#critDmg" />
-				<mul stat="pAtk" val="#pmAtk" />
-				<mul stat="mAtk" val="#pmAtk" />
-				<mul stat="mAtkSpd" val="#pmAtkSpd" />
-				<mul stat="pAtkSpd" val="#pmAtkSpd" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="critRate" val="#critRate" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="#pAtk" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="#pAtkSpd" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="#mAtk" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="#mAtkSpd" />
 			</effect>
 			<effect name="DefenceTrait">
-				<param PARALYZE="#traits" />
-				<param BLEED="#traits" />
-				<param POISON="#traits" />
-				<param SHOCK="#traits" />
+				<param BLEED="#defenceTraitPower" />
 			</effect>
+			<effect name="Buff" />
 		</effects>
 	</skill>
 	<skill id="6886" levels="1" name="Complete Recovery">
diff --git a/src/main/resources/data/stats/skills/06900-06999.xml b/src/main/resources/data/stats/skills/06900-06999.xml
index 39e3976aa8..7c80b10d50 100644
--- a/src/main/resources/data/stats/skills/06900-06999.xml
+++ b/src/main/resources/data/stats/skills/06900-06999.xml
@@ -143,10 +143,12 @@
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="KNIGHT_SHIELD" />
+		<set name="affectObject" val="FRIEND" />
 		<set name="affectRange" val="1000" />
+		<set name="affectScope" val="PARTY" />
 		<set name="effectPoint" val="673" />
 		<set name="icon" val="icon.skill0985" />
-		<set name="isMagic" val="4" /> <!-- Trigger Skill -->
+		<set name="isMagic" val="4" />
 		<set name="magicLvl" val="83" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="60000" />
diff --git a/src/main/resources/data/stats/skills/07000-07099.xml b/src/main/resources/data/stats/skills/07000-07099.xml
index 685d2498ac..1b20af4c4a 100644
--- a/src/main/resources/data/stats/skills/07000-07099.xml
+++ b/src/main/resources/data/stats/skills/07000-07099.xml
@@ -2,19 +2,22 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="7000" levels="1" name="NPC Default">
 		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="7001" levels="1" name="Dispel Buff">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="900" />
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelByCategory">
 				<param slot="BUFF" rate="100" max="20" />
@@ -22,13 +25,15 @@
 		</effects>
 	</skill>
 	<skill id="7002" levels="1" name="Dispel Debuff">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="900" />
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelByCategory">
 				<param slot="DEBUFF" rate="100" max="20" />
@@ -36,14 +41,15 @@
 		</effects>
 	</skill>
 	<skill id="7003" levels="1" name="Dispel All">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="900" />
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="DispelByCategory">
 				<param slot="BUFF" rate="100" max="20" />
@@ -399,21 +405,24 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="7041" levels="1" name="Master's Blessing - Focus">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="CRITICAL_PROB_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1077" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="52" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="critRate" val="1.3" />
@@ -421,21 +430,24 @@
 		</effects>
 	</skill>
 	<skill id="7042" levels="1" name="Master's Blessing - Death Whisper">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="CRITICAL_DMG_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1242" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="56" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="critDmg" val="1.35" />
@@ -443,21 +455,24 @@
 		</effects>
 	</skill>
 	<skill id="7043" levels="1" name="Master's Blessing - Haste">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="2" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="ATTACK_TIME_DOWN" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1086" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="52" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="1.33" />
@@ -465,21 +480,24 @@
 		</effects>
 	</skill>
 	<skill id="7044" levels="1" name="Master's Blessing - Guidance">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="HIT_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1240" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="56" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="accCombat" val="4" />
@@ -487,21 +505,24 @@
 		</effects>
 	</skill>
 	<skill id="7045" levels="1" name="Master's Blessing - Blessed Body">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="6" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="7" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MAX_HP_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1045" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="72" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxHp">
 				<param power="35" />
@@ -510,21 +531,24 @@
 		</effects>
 	</skill>
 	<skill id="7046" levels="1" name="Master's Blessing - Blessed Soul">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="6" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="7" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MAX_MP_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1048" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="70" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="MaxMp">
 				<param power="35" />
@@ -533,21 +557,24 @@
 		</effects>
 	</skill>
 	<skill id="7047" levels="1" name="Master's Blessing - Agility">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="AVOID_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1087" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="52" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="rEvas" val="4" />
@@ -555,21 +582,24 @@
 		</effects>
 	</skill>
 	<skill id="7048" levels="1" name="Master's Blessing - Acumen">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="CASTING_TIME_DOWN" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1085" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="48" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mAtkSpd" val="1.3" />
@@ -577,21 +607,24 @@
 		</effects>
 	</skill>
 	<skill id="7049" levels="1" name="Master's Blessing - Decrease Weight">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="DECREASE_WEIGHT_PENALTY" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1257" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="52" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="weightPenalty" val="9000" />
@@ -599,21 +632,24 @@
 		</effects>
 	</skill>
 	<skill id="7050" levels="1" name="Master's Blessing - Might">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="PA_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1068" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="40" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.15" />
@@ -621,21 +657,24 @@
 		</effects>
 	</skill>
 	<skill id="7051" levels="1" name="Master's Blessing - Shield">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="PD_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1040" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="44" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.15" />
@@ -643,21 +682,24 @@
 		</effects>
 	</skill>
 	<skill id="7052" levels="1" name="Master's Blessing - Magic Barrier">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
-		<set name="abnormalType" val="PD_UP" />
-		<set name="castRange" val="400" />
+		<set name="abnormalType" val="MD_UP" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1036" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="52" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mDef" val="1.3" />
@@ -665,43 +707,49 @@
 		</effects>
 	</skill>
 	<skill id="7053" levels="1" name="Master's Blessing - Vampiric Rage">
-		<!-- GM Skill -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="VAMPIRIC_ATTACK" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1268" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="72" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<add stat="absorbDam" val="9" /> <!-- absorb 9% HP from damage inflicted on enemies -->
+				<add stat="absorbDam" val="9" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="7054" levels="1" name="Master's Blessing - Empower">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MA_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1059" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="52" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="mAtk" val="1.75" />
@@ -709,21 +757,24 @@
 		</effects>
 	</skill>
 	<skill id="7055" levels="1" name="Master's Blessing - Wind Walk">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="2" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="SPEED_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1204" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="30" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="runSpd" val="33" />
@@ -731,50 +782,70 @@
 		</effects>
 	</skill>
 	<skill id="7056" levels="1" name="Master's Blessing - Berserker Spirit">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="2" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="BERSERKER" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1062" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="52" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="1.08" />
+			</effect>
+			<effect name="Buff">
+				<sub stat="rEvas" val="4" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="1.08" />
+			</effect>
 			<effect name="Buff">
 				<mul stat="mAtk" val="1.16" />
-				<mul stat="pAtk" val="1.08" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="mDef" val="0.84" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.08" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="pDef" val="0.92" />
-				<mul stat="mAtkSpd" val="1.08" />
-				<mul stat="pAtkSpd" val="1.08" />
+			</effect>
+			<effect name="Buff">
 				<add stat="runSpd" val="8" />
-				<sub stat="rEvas" val="4" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="7057" levels="1" name="Master's Blessing - Greater Might">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="PA_PD_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1388" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="74" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.1" />
@@ -782,21 +853,24 @@
 		</effects>
 	</skill>
 	<skill id="7058" levels="1" name="Master's Blessing - Greater Shield">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="PA_PD_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1389" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="74" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.15" />
@@ -804,21 +878,24 @@
 		</effects>
 	</skill>
 	<skill id="7059" levels="1" name="Master's Blessing - Wild Magic">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="2" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MAGIC_CRITICAL_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1303" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="70" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<add stat="mCritRate" val="2" />
@@ -826,236 +903,370 @@
 		</effects>
 	</skill>
 	<skill id="7060" levels="1" name="Master's Blessing - Clarity">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="3" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="4" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="CHEAP_MAGIC" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1397" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="74" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<mul stat="magicalMpConsumeRate" val="0.9" />
 				<mul stat="physicalMpConsumeRate" val="0.8" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="magicalMpConsumeRate" val="0.9" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="danceMpConsumeRate" val="0.8" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="7061" levels="1" name="Master's Blessing - Prophecy of Water">
-		<!-- GM Skill -->
-		<!-- Confirmed CT2.5 -->
-		<set name="abnormalLvl" val="1" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MULTI_BUFF" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="600" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1355" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="78" />
 		<set name="mpConsume2" val="1" />
-		<set name="mpConsume1" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
-				<add stat="mCritRate" val="2" />
-				<mul stat="regMp" val="1.2" />
-				<mul stat="pAtk" val="1.1" />
-				<mul stat="pDef" val="1.2" />
 				<mul stat="pAtkSpd" val="1.2" />
-				<mul stat="mAtk" val="1.2" />
-				<mul stat="mDef" val="1.2" />
-				<mul stat="mAtkSpd" val="1.2" />
-				<sub stat="debuffVuln" val="10" />
-				<mul stat="runSpd" val="0.8" />
-				<mul stat="magicalMpConsumeRate" val="0.95" />
-				<mul stat="physicalMpConsumeRate" val="0.95" />
-				<mul stat="danceMpConsumeRate" val="0.95" />
 			</effect>
-		</effects>
+			<effect name="Buff">
+				<add stat="mCritRate" val="2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="physicalMpConsumeRate" val="0.95" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="magicalMpConsumeRate" val="0.95" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="danceMpConsumeRate" val="0.95" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="regMp" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.1" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pDef" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="debuffVuln" val="0.9" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="runSpd" val="0.8" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="7062" levels="1" name="Master's Blessing - Prophecy of Fire">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="1" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MULTI_BUFF" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1356" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="78" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="critDmg" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="regHp" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<add stat="mCritRate" val="2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.2" />
+			</effect>
 			<effect name="MaxMp">
 				<param power="20" />
 				<param type="PER" />
 			</effect>
 			<effect name="Buff">
-				<mul stat="regHp" val="1.2" />
-				<add stat="mCritRate" val="2" />
-				<mul stat="critDmg" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="pDef" val="1.2" />
-				<mul stat="pAtkSpd" val="1.2" />
-				<mul stat="mAtk" val="1.2" />
-				<mul stat="mDef" val="1.2" />
-				<mul stat="mAtkSpd" val="1.2" />
-				<add stat="accCombat" val="4" />
-				<sub stat="debuffVuln" val="10" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="debuffVuln" val="0.9" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="runSpd" val="0.8" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="7063" levels="1" name="Master's Blessing - Prophecy of Wind">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="1" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MULTI_BUFF" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1357" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="78" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="critRate" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mCritPower" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.2" />
+			</effect>
 			<effect name="MaxHp">
 				<param power="20" />
 				<param type="PER" />
 			</effect>
 			<effect name="Buff">
-				<mul stat="critRate" val="1.2" />
-				<mul stat="mCritPower" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="pDef" val="1.2" />
-				<mul stat="pAtkSpd" val="1.2" />
-				<mul stat="mAtk" val="1.2" />
-				<mul stat="mDef" val="1.2" />
-				<mul stat="mAtkSpd" val="1.2" />
-				<sub stat="debuffVuln" val="10" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="debuffVuln" val="0.9" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="runSpd" val="0.8" />
-				<add stat="absorbDam" val="5" /> <!-- absorb 5% HP from damage inflicted on enemies -->
+			</effect>
+			<effect name="Buff">
+				<add stat="absorbDam" val="5" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="7064" levels="1" name="Master's Blessing - Chant of Victory">
-		<!-- GM Skill -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="MULTI_BUFF" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1363" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="78" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="critDmg" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<add stat="accCombat" val="4" />
+			</effect>
+			<effect name="Buff">
+				<add stat="mCritRate" val="2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.2" />
+			</effect>
 			<effect name="MaxHp">
 				<param power="20" />
 				<param type="PER" />
 				<param heal="true" />
-				<add stat="mCritRate" val="2" />
-				<mul stat="critDmg" val="1.2" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="pAtk" val="1.1" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="pDef" val="1.2" />
-				<mul stat="pAtkSpd" val="1.2" />
-				<mul stat="mAtk" val="1.2" />
-				<mul stat="mDef" val="1.2" />
-				<mul stat="mAtkSpd" val="1.2" />
-				<sub stat="debuffVuln" val="10" />
-				<add stat="accCombat" val="4" />
-				<mul stat="runSpd" val="0.8" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="debuffVuln" val="0.9" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="7065" levels="1" name="Test - Charge">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="400" />
 		<set name="coolTime" val="200" />
+		<set name="effectRange" val="600" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="800" />
 		<set name="magicLvl" val="75" />
+		<set name="mpConsume1" val="50" />
 		<set name="nextActionAttack" val="true" />
 		<set name="operateType" val="DA1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="ENEMY" />
 		<cond msgId="113" addName="1">
 			<target mindistance="200" />
 		</cond>
 	</skill>
 	<skill id="7066" levels="1" name="Test Stun Charge">
+		<!-- High Five Confirmed -->
 		<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="400" />
 		<set name="coolTime" val="200" />
+		<set name="effectRange" val="600" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="800" />
 		<set name="isDebuff" val="true" />
 		<set name="lvlBonusRate" val="1" />
 		<set name="magicLvl" val="75" />
+		<set name="mpConsume1" val="50" />
 		<set name="nextActionAttack" val="true" />
 		<set name="operateType" val="DA2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="ENEMY" />
 		<set name="trait" val="SHOCK" />
 		<cond msgId="113" addName="1">
 			<target mindistance="200" />
 		</cond>
+		<effects>
+			<effect name="Stun" />
+		</effects>
 	</skill>
 	<skill id="7067" levels="1" name="Test Range Charge">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="20" />
 		<set name="abnormalType" val="BLEEDING" />
 		<set name="abnormalVisualEffect" val="DOT_BLEEDING" />
 		<set name="activateRate" val="100" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="basicProperty" val="CON" />
+		<set name="castRange" val="400" />
 		<set name="coolTime" val="200" />
+		<set name="effectRange" val="600" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="800" />
 		<set name="isDebuff" val="true" />
 		<set name="lvlBonusRate" val="2" />
 		<set name="magicLvl" val="75" />
+		<set name="mpConsume1" val="50" />
 		<set name="nextActionAttack" val="true" />
 		<set name="operateType" val="DA2" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="ENEMY" />
 		<set name="trait" val="BLEED" />
 		<cond msgId="113" addName="1">
 			<target mindistance="200" />
 		</cond>
+		<effects>
+			<effect name="TickHp">
+				<param power="-34" />
+				<param ticks="5" />
+				<param mode="DIFF" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="7068" levels="1" name="Test Steal Abnormal State">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="600" />
 		<set name="coolTime" val="200" />
+		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="75" />
+		<set name="mpConsume1" val="50" />
+		<set name="mpConsume2" val="50" />
 		<set name="nextActionAttack" val="true" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="ENEMY" />
 		<cond msgId="113" addName="1">
 			<target mindistance="200" />
 		</cond>
@@ -1066,17 +1277,29 @@
 		</effects>
 	</skill>
 	<skill id="7069" levels="1" name="Test Abnormal State DD">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="600" />
 		<set name="coolTime" val="200" />
+		<set name="effectRange" val="1100" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="2000" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="75" />
+		<set name="mpConsume1" val="50" />
+		<set name="mpConsume2" val="50" />
 		<set name="nextActionAttack" val="true" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="ENEMY" />
 		<cond msgId="113" addName="1">
 			<target mindistance="200" />
 		</cond>
+		<effects>
+			<effect name="MagicalAttackByAbnormal">
+				<param power="100" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="7070" levels="1" name="Test - Soul Eating Passive">
 		<set name="magicLvl" val="75" />
@@ -1084,12 +1307,25 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="7071" levels="1" name="Test - Soul Transfer">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="900" />
+		<set name="hpConsume" val="20" />
 		<set name="magicLvl" val="75" />
+		<set name="mpConsume2" val="5" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<cond msgId="113" addName="1">
+			<target myParty="INCLUDE_ME" />
+		</cond>
+		<effects>
+			<effect name="FocusSouls">
+				<param charge="1" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="7072" levels="1" name="Test - Basic Trap">
 		<!-- Confirmed CT2.5 -->
@@ -1288,89 +1524,105 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="7088" levels="1" name="Master's Blessing - Improve Combat">
-		<!-- Confirmed CT2.5 -->
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="1" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="IMPROVE_PA_PD_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
-		<set name="hitTime" val="1500" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1499" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="70" />
 		<set name="mpConsume2" val="1" />
-		<set name="mpConsume1" val="1" />
 		<set name="operateType" val="A2" />
-		<set name="reuseDelay" val="2000" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="pAtk" val="1.15" />
-				<mul stat="pDef" val="1.15" />
-			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="PA_UP,9;PD_UP,9" />
 			</effect>
 			<effect name="BlockBuffSlot">
 				<param slot="PA_UP;PD_UP" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.15" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pDef" val="1.15" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="7089" levels="1" name="Master's Blessing - Improve Magic">
-		<!-- Confirmed CT2.5 -->
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="1" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="IMPROVE_MA_MD_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
-		<set name="hitTime" val="1500" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1500" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="74" />
 		<set name="mpConsume2" val="1" />
-		<set name="mpConsume1" val="1" />
 		<set name="operateType" val="A2" />
-		<set name="reuseDelay" val="2000" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="mAtk" val="1.75" />
-				<mul stat="mDef" val="1.3" />
+			<effect name="DispelBySlot">
+				<param dispel="MA_UP,9" />
 			</effect>
 			<effect name="DispelBySlot">
-				<param dispel="MA_UP,9;MD_UP,9" />
+				<param dispel="MD_UP,9" />
 			</effect>
 			<effect name="BlockBuffSlot">
 				<param slot="MA_UP;MD_UP" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.75" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.3" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="7090" levels="1" name="Master's Blessing - Improve Condition">
-		<!-- Confirmed CT2.5 -->
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="1" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="IMPROVE_HP_MP_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
-		<set name="hitTime" val="1500" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1501" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="72" />
 		<set name="mpConsume2" val="1" />
-		<set name="mpConsume1" val="1" />
 		<set name="operateType" val="A2" />
-		<set name="reuseDelay" val="2000" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
+			<effect name="DispelBySlot">
+				<param dispel="MAX_HP_UP,9" />
+			</effect>
+			<effect name="DispelBySlot">
+				<param dispel="MAX_MP_UP,9" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="MAX_HP_UP;MAX_MP_UP" />
+			</effect>
 			<effect name="MaxHp">
 				<param power="35" />
 				<param type="PER" />
@@ -1379,132 +1631,146 @@
 				<param power="35" />
 				<param type="PER" />
 			</effect>
-			<effect name="DispelBySlot">
-				<param dispel="MAX_HP_UP,9;MAX_MP_UP,9" />
-			</effect>
-			<effect name="BlockBuffSlot">
-				<param slot="MAX_HP_UP;MAX_MP_UP" />
-			</effect>
 		</effects>
 	</skill>
 	<skill id="7091" levels="1" name="Master's Blessing - Improve Critical">
-		<!-- Confirmed CT2.5 -->
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="1" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="IMPROVE_CRT_RATE_DMG_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
-		<set name="hitTime" val="1500" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1502" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="74" />
 		<set name="mpConsume2" val="1" />
-		<set name="mpConsume1" val="1" />
 		<set name="operateType" val="A2" />
-		<set name="reuseDelay" val="2000" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="critRate" val="1.3" />
-				<mul stat="critDmg" val="1.35" />
+			<effect name="DispelBySlot">
+				<param dispel="CRITICAL_PROB_UP,9" />
 			</effect>
 			<effect name="DispelBySlot">
-				<param dispel="CRITICAL_PROB_UP,9;CRITICAL_DMG_UP,9" />
+				<param dispel="CRITICAL_DMG_UP,9" />
 			</effect>
 			<effect name="BlockBuffSlot">
 				<param slot="CRITICAL_PROB_UP;CRITICAL_DMG_UP" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="critDmg" val="1.35" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="critRate" val="1.3" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="7092" levels="1" name="Master's Blessing - Improve Shield Defense">
-		<!-- Confirmed CT2.5 -->
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="1" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="IMPROVE_SHIELD_RATE_DEFENCE_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
-		<set name="hitTime" val="1500" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1503" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="70" />
 		<set name="mpConsume2" val="1" />
-		<set name="mpConsume1" val="1" />
 		<set name="operateType" val="A2" />
-		<set name="reuseDelay" val="2000" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="Buff">
-				<mul stat="rShld" val="1.3" />
-				<mul stat="sDef" val="1.5" />
+			<effect name="DispelBySlot">
+				<param dispel="SHIELD_PROB_UP,9" />
 			</effect>
 			<effect name="DispelBySlot">
-				<param dispel="SHIELD_PROB_UP,9;SHIELD_DEFENCE_UP,9" />
+				<param dispel="SHIELD_DEFENCE_UP,9" />
 			</effect>
 			<effect name="BlockBuffSlot">
 				<param slot="SHIELD_PROB_UP;SHIELD_DEFENCE_UP" />
 			</effect>
+			<effect name="Buff">
+				<mul stat="sDef" val="1.5" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="rShld" val="1.3" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="7093" levels="1" name="Master's Blessing - Improve Movement">
-		<!-- Confirmed CT2.5 -->
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="1" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="IMPROVE_SPEED_AVOID_UP" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
-		<set name="hitTime" val="1500" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1504" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="72" />
 		<set name="mpConsume2" val="1" />
-		<set name="mpConsume1" val="1" />
 		<set name="operateType" val="A2" />
-		<set name="reuseDelay" val="2000" />
+		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="Buff">
-				<add stat="runSpd" val="33" />
-				<add stat="rEvas" val="4" />
+			<effect name="DispelBySlot">
+				<param dispel="SPEED_UP,9" />
 			</effect>
 			<effect name="DispelBySlot">
-				<param dispel="SPEED_UP,9;AVOID_UP,9" />
+				<param dispel="AVOID_UP,9" />
+			</effect>
+			<effect name="Buff">
+				<add stat="rEvas" val="4" />
 			</effect>
 			<effect name="BlockBuffSlot">
 				<param slot="SPEED_UP;AVOID_UP" />
 			</effect>
+			<effect name="Buff">
+				<add stat="runSpd" val="33" />
+			</effect>
 		</effects>
 	</skill>
 	<skill id="7094" levels="1" name="Master's Blessing - Sharpen Edge">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="1" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="DWARF_ATTACK_BUFF" />
-		<set name="castRange" val="40" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="coolTime" val="500" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="400" />
-		<set name="hitTime" val="4000" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill0825" />
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="49" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
-		<set name="reuseDelay" val="2000" />
-		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="reuseDelay" val="1000" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.05">
 					<using kind="SWORD,DUAL,ANCIENTSWORD,RAPIER,DAGGER,DUALDAGGER,POLE,DUALFIST" />
 				</mul>
+			</effect>
+			<effect name="Buff">
 				<mul stat="critRate" val="1.2">
 					<using kind="SWORD,DUAL,ANCIENTSWORD,RAPIER,DAGGER,DUALDAGGER,POLE,DUALFIST" />
 				</mul>
@@ -1512,22 +1778,25 @@
 		</effects>
 	</skill>
 	<skill id="7095" levels="1" name="Master's Blessing - Face Harden">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="1" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="DWARF_DEFENCE_BUFF" />
-		<set name="castRange" val="40" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="coolTime" val="500" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="400" />
-		<set name="hitTime" val="4000" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill0828" />
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="46" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
-		<set name="reuseDelay" val="2000" />
-		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="reuseDelay" val="1000" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.1">
@@ -1537,22 +1806,25 @@
 		</effects>
 	</skill>
 	<skill id="7096" levels="1" name="Master's Blessing - Blessing of Noblesse">
-		<!-- GM Skill -->
-		<set name="abnormalLvl" val="1" />
+		<!-- High Five Confirmed -->
+		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="PRESERVE_ABNORMAL" />
-		<set name="castRange" val="400" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
-		<set name="effectRange" val="900" />
-		<set name="hitTime" val="4000" />
+		<set name="effectRange" val="1500" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill1323" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
-		<set name="mpConsume2" val="2" />
+		<set name="mpConsume2" val="1" />
 		<set name="operateType" val="A2" />
-		<set name="reuseDelay" val="2000" />
+		<set name="reuseDelay" val="1000" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="NoblesseBless" />
 		</effects>
diff --git a/src/main/resources/data/stats/skills/08300-08399.xml b/src/main/resources/data/stats/skills/08300-08399.xml
index 00336d936e..60d6185287 100644
--- a/src/main/resources/data/stats/skills/08300-08399.xml
+++ b/src/main/resources/data/stats/skills/08300-08399.xml
@@ -1107,16 +1107,24 @@
 		</effects>
 	</skill>
 	<skill id="8362" levels="1" name="Beast Training - Release">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectObject" val="FRIEND" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="900" />
 		<set name="effectRange" val="1200" />
+		<set name="hitCancelTime" val="500" />
 		<set name="icon" val="icon.skill8362" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
+		<set name="reuseDelayLock" val="true" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
+		<cond msgId="113" addName="1">
+			<target npcId="18869,18870,18871,18872" />
+		</cond>
 	</skill>
 	<skill id="8363" levels="1" name="Beast Training - Accompany">
 		<!-- Confirmed CT2.5 -->
diff --git a/src/main/resources/data/stats/skills/09000-09099.xml b/src/main/resources/data/stats/skills/09000-09099.xml
index 0b8b7d290c..506fa8cec9 100644
--- a/src/main/resources/data/stats/skills/09000-09099.xml
+++ b/src/main/resources/data/stats/skills/09000-09099.xml
@@ -1294,19 +1294,21 @@
 		</effects>
 	</skill>
 	<skill id="9075" levels="1" name="Awful Soup">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="150" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="300" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="15507" /> <!-- Foul Fruit -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="9076" levels="1" name="Secret Door Key">
 		<!-- Confirmed CT2.5 -->
diff --git a/src/main/resources/data/stats/skills/09100-09199.xml b/src/main/resources/data/stats/skills/09100-09199.xml
index e4f841b4c8..70919ace19 100644
--- a/src/main/resources/data/stats/skills/09100-09199.xml
+++ b/src/main/resources/data/stats/skills/09100-09199.xml
@@ -906,116 +906,156 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="9150" levels="1" name="Freesia Bouquet - Event">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="500" />
 		<set name="effectPoint" val="500" />
+		<set name="effectRange" val="700" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.etc_flower_bouquet_i02" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="17130" /> <!-- Freesia Bouquet (Event) -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
+		<set name="reuseDelayLock" val="true" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="9151" levels="1" name="Baby's Breath Bouquet - Event">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="500" />
 		<set name="effectPoint" val="500" />
+		<set name="effectRange" val="700" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.etc_flower_bouquet_i03" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="17131" /> <!-- Baby Breath Bouquet (Event) -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
+		<set name="reuseDelayLock" val="true" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="9152" levels="1" name="Pink Lady - Event">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="500" />
 		<set name="effectPoint" val="500" />
+		<set name="effectRange" val="700" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.etc_fruit_cocktail_i02" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="17132" /> <!-- Pink Lady (Event) -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
+		<set name="reuseDelayLock" val="true" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="9153" levels="1" name="June Bug - Event">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="500" />
 		<set name="effectPoint" val="500" />
+		<set name="effectRange" val="700" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.etc_fruit_cocktail_i03" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="17133" /> <!-- June Bug (Event) -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
+		<set name="reuseDelayLock" val="true" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="9154" levels="1" name="Soft Cheese Cake - Event">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="500" />
 		<set name="effectPoint" val="500" />
+		<set name="effectRange" val="700" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.etc_herb_of_cheesecake" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="17134" /> <!-- Soft Cheesecake (Event) -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
+		<set name="reuseDelayLock" val="true" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="9155" levels="1" name="Freshly-Baked Baguette - Event">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="500" />
 		<set name="effectPoint" val="500" />
+		<set name="effectRange" val="700" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.etc_herb_of_baguette" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="17135" /> <!-- Freshly-Baked Baguette (Event) -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
+		<set name="reuseDelayLock" val="true" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="9156" levels="1" name="Sweet Cream-filled Bread - Event">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="500" />
 		<set name="effectPoint" val="500" />
+		<set name="effectRange" val="700" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.etc_herb_of_cream" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="17136" /> <!-- Sweet Cream Bun (Event) -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
+		<set name="reuseDelayLock" val="true" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="9157" levels="1" name="White Day Candy - Event">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="500" />
 		<set name="effectPoint" val="500" />
+		<set name="effectRange" val="700" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.etc_whiteday_candy_i00" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="17137" /> <!-- White Day Candy (Event) -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
+		<set name="reuseDelayLock" val="true" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="9158" levels="1" name="Freya's Gift">
 		<!-- Confirmed CT2.5 -->
diff --git a/src/main/resources/data/stats/skills/21000-21099.xml b/src/main/resources/data/stats/skills/21000-21099.xml
index 2bc90ba4de..6c5f7e55fb 100644
--- a/src/main/resources/data/stats/skills/21000-21099.xml
+++ b/src/main/resources/data/stats/skills/21000-21099.xml
@@ -1609,10 +1609,10 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockDebuff" />
 			<effect name="Buff">
@@ -1664,7 +1664,7 @@
 		<set name="targetType" val="ONE" />
 		<cond>
 			<and>
-				<target myPartyExceptMe="true" />
+				<target myParty="EXCEPT_ME" />
 				<player callPc="true" />
 			</and>
 		</cond>
@@ -1820,7 +1820,7 @@
 		<set name="targetType" val="ONE" />
 		<cond>
 			<and>
-				<target myPartyExceptMe="true" />
+				<target myParty="EXCEPT_ME" />
 				<player callPc="true" />
 			</and>
 		</cond>
diff --git a/src/main/resources/data/stats/skills/22100-22199.xml b/src/main/resources/data/stats/skills/22100-22199.xml
index e7e3cf796a..12ee7588d5 100644
--- a/src/main/resources/data/stats/skills/22100-22199.xml
+++ b/src/main/resources/data/stats/skills/22100-22199.xml
@@ -595,17 +595,18 @@
 		</effects>
 	</skill>
 	<skill id="22126" levels="1" name="Baby Food Skill">
-		<!-- TODO: Implement. -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="500" />
 		<set name="icon" val="BranchSys.br_baby_food_i00" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="20769" /> <!-- Rudolph Baby Food -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
+		<set name="reuseDelayLock" val="true" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<cond msgId="109">
 			<target npcId="1538" />
 		</cond>
diff --git a/src/main/resources/data/stats/skills/23000-23099.xml b/src/main/resources/data/stats/skills/23000-23099.xml
index 1a24d9d266..3b0aaecea8 100644
--- a/src/main/resources/data/stats/skills/23000-23099.xml
+++ b/src/main/resources/data/stats/skills/23000-23099.xml
@@ -325,24 +325,44 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="23017" levels="1" name="Holiday Festival">
+	<skill id="23017" levels="1" name="Christmas Festival">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
-		<set name="abnormalType" val="BR_EVENT_BUF1" />
+		<set name="abnormalType" val="BR_EVENT_BUF10" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="buffProtectLevel" val="1" />
+		<set name="castRange" val="400" />
+		<set name="effectRange" val="900" />
 		<set name="icon" val="BranchSys.icon.br_xmas_reward_buff_i00" />
 		<set name="irreplaceableBuff" val="true" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<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="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="MaxHp">
+			<effect name="Buff">
+				<mul stat="physicalMpConsumeRate" val="0.95" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="magicalMpConsumeRate" val="0.95" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="danceMpConsumeRate" val="0.95" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.15" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.2" />
+			</effect>
+			<effect name="MaxCp">
 				<param power="40" />
 				<param type="PER" />
 			</effect>
-			<effect name="MaxCp">
+			<effect name="MaxHp">
 				<param power="40" />
 				<param type="PER" />
 			</effect>
@@ -352,13 +372,12 @@
 			</effect>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.1" />
+			</effect>
+			<effect name="Buff">
 				<mul stat="pDef" val="1.2" />
-				<mul stat="mDef" val="1.2" />
-				<mul stat="mAtk" val="1.15" />
+			</effect>
+			<effect name="Buff">
 				<add stat="runSpd" val="20" />
-				<mul stat="magicalMpConsumeRate" val="0.95" />
-				<mul stat="physicalMpConsumeRate" val="0.95" />
-				<mul stat="danceMpConsumeRate" val="0.95" />
 			</effect>
 		</effects>
 	</skill>
@@ -401,72 +420,94 @@
 		</effects>
 	</skill>
 	<skill id="23019" levels="3" name="Scissors">
-		<table name="#icons"> BranchSys.icon.br_xmas_gawi_i00 BranchSys.icon.br_xmas_bawi_i00 BranchSys.icon.br_xmas_bo_i00 </table>
+		<!-- High Five Confirmed -->
+		<table name="#icon"> BranchSys.icon.br_xmas_gawi_i00 BranchSys.icon.br_xmas_bawi_i00 BranchSys.icon.br_xmas_bo_i00 </table>
 		<table name="#magicLvl"> 1 2 3 </table>
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="30" />
 		<set name="abnormalType" val="BR_EVENT_BUF2" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="500" />
 		<set name="effectRange" val="550" />
-		<set name="icon" val="#icons" />
+		<set name="icon" val="#icon" />
 		<set name="irreplaceableBuff" val="true" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="stayAfterDeath" val="true" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<effect name="ImmobileBuff" />
+			<effect name="Root" />
 		</effects>
 	</skill>
-	<skill id="23020" levels="1" name="Challenge the Turkey">
+	<skill id="23020" levels="1" name="Start attacking the Turkey">
+		<!-- High Five Confirmed -->
+		<set name="affectObject" val="ALL" />
 		<set name="affectRange" val="500" />
+		<set name="affectScope" val="RANGE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="coolTime" val="500" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="8000" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="AURA" />
 	</skill>
 	<skill id="23021" levels="3" name="Turkey's Attack Scissors">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 	</skill>
-	<skill id="23022" levels="10" name="First Win">
-		<table name="#abnormalLvls"> 1 2 3 4 5 6 7 8 9 10 </table>
-		<table name="#icons"> BranchSys.icon.br_xmas_pcwin1_i00 BranchSys.icon.br_xmas_pcwin2_i00 BranchSys.icon.br_xmas_pcwin3_i00 BranchSys.icon.br_xmas_pcwin4_i00 BranchSys.icon.br_xmas_pcwin5_i00 BranchSys.icon.br_xmas_pcwin6_i00 BranchSys.icon.br_xmas_pcwin7_i00 BranchSys.icon.br_xmas_pcwin8_i00 BranchSys.icon.br_xmas_pcwin9_i00 BranchSys.icon.br_xmas_pcwin10_i00 </table>
-		<set name="abnormalLvl" val="#abnormalLvls" />
+	<skill id="23022" levels="10" name="First win">
+		<!-- High Five Confirmed -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 7 8 9 10 </table>
+		<table name="#icon"> BranchSys.icon.br_xmas_pcwin1_i00 BranchSys.icon.br_xmas_pcwin2_i00 BranchSys.icon.br_xmas_pcwin3_i00 BranchSys.icon.br_xmas_pcwin4_i00 BranchSys.icon.br_xmas_pcwin5_i00 BranchSys.icon.br_xmas_pcwin6_i00 BranchSys.icon.br_xmas_pcwin7_i00 BranchSys.icon.br_xmas_pcwin8_i00 BranchSys.icon.br_xmas_pcwin9_i00 BranchSys.icon.br_xmas_pcwin10_i00 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="BR_EVENT_BUF3" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
-		<set name="icon" val="#icons" />
+		<set name="buffProtectLevel" val="1" />
+		<set name="castRange" val="500" />
+		<set name="effectRange" val="550" />
+		<set name="icon" val="#icon" />
 		<set name="irreplaceableBuff" val="true" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<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="stayAfterDeath" val="true" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
 			<effect name="Buff" />
 		</effects>
 	</skill>
 	<skill id="23023" levels="1" name="Reset Consecutive Wins">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="castRange" val="500" />
+		<set name="effectRange" val="550" />
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="DispelBySlot">
+				<param dispel="BR_EVENT_BUF3,10" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23024" levels="1" name="Agathion of Love Special Skill - Energy Recovery Ability">
 		<!-- Recovers energy when acquiring Exp. for 20 minutes. Reuse Delay 12 hours -->
@@ -1412,7 +1453,7 @@
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<cond msgId="113" addName="1">
 			<target checkAbnormal="BR_EVENT_BUF2;1;false" />
 		</cond>
@@ -1434,7 +1475,7 @@
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<cond msgId="113" addName="1">
 			<target checkAbnormal="BR_EVENT_BUF2;1;false" />
 		</cond>
@@ -1514,10 +1555,10 @@
 				<mul stat="pDef" val="1.3" />
 				<mul stat="mDef" val="1.3" />
 				<add stat="runSpd" val="30" />
-				<mul stat="pAtk" val="1.2"/>
-				<mul stat="physicalMpConsumeRate" val="0.9"/>
+				<mul stat="pAtk" val="1.2" />
+				<mul stat="physicalMpConsumeRate" val="0.9" />
 				<mul stat="magicalMpConsumeRate" val="0.9" />
-				<mul stat="danceMpConsumeRate" val="0.9"/>
+				<mul stat="danceMpConsumeRate" val="0.9" />
 			</effect>
 		</effects>
 	</skill>
@@ -1563,9 +1604,9 @@
 				<mul stat="mDef" val="1.3" />
 				<add stat="runSpd" val="20" />
 				<mul stat="mAtk" val="1.45" />
-				<mul stat="physicalMpConsumeRate" val="0.9"/>
+				<mul stat="physicalMpConsumeRate" val="0.9" />
 				<mul stat="magicalMpConsumeRate" val="0.85" />
-				<mul stat="danceMpConsumeRate" val="0.9"/>
+				<mul stat="danceMpConsumeRate" val="0.9" />
 			</effect>
 		</effects>
 	</skill>
@@ -1602,9 +1643,9 @@
 		</cond>
 		<effects>
 			<effect name="Buff">
-				<mul stat="pAtkSpd" val="1.2"/>
+				<mul stat="pAtkSpd" val="1.2" />
 				<mul stat="pDef" val="1.2" />
-				<mul stat="pAtk" val="1.1"/>
+				<mul stat="pAtk" val="1.1" />
 				<mul stat="critRate" val="1.2" />
 				<mul stat="critDmg" val="1.2" />
 			</effect>
@@ -1692,9 +1733,9 @@
 				<param type="PER" />
 			</effect>
 			<effect name="Buff">
-				<mul stat="regMp" val="1.2"/>
-				<mul stat="runSpd" val="1.2"/>
-				<mul stat="regHp" val="1.2"/>
+				<mul stat="regMp" val="1.2" />
+				<mul stat="runSpd" val="1.2" />
+				<mul stat="regHp" val="1.2" />
 			</effect>
 		</effects>
 	</skill>
@@ -1772,9 +1813,9 @@
 		</cond>
 		<effects>
 			<effect name="Buff">
-				<mul stat="pAtkSpd" val="1.2"/>
+				<mul stat="pAtkSpd" val="1.2" />
 				<mul stat="pDef" val="1.2" />
-				<mul stat="pAtk" val="1.1"/>
+				<mul stat="pAtk" val="1.1" />
 				<mul stat="critRate" val="1.2" />
 				<mul stat="critDmg" val="1.2" />
 			</effect>
@@ -1821,9 +1862,9 @@
 				<param type="PER" />
 			</effect>
 			<effect name="Buff">
-				<mul stat="regMp" val="1.2"/>
-				<mul stat="runSpd" val="1.2"/>
-				<mul stat="regHp" val="1.2"/>
+				<mul stat="regMp" val="1.2" />
+				<mul stat="runSpd" val="1.2" />
+				<mul stat="regHp" val="1.2" />
 			</effect>
 		</effects>
 	</skill>
@@ -1879,7 +1920,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23095" levels="1" name="Rotten Jack O'Lantern Card - Confirm Skill">
 		<!-- High Five Confirmed -->
@@ -1893,7 +1934,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23096" levels="1" name="Halloween Defeat">
 		<!-- High Five Confirmed -->
@@ -1906,7 +1947,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23097" levels="1" name="First win">
 		<!-- High Five Confirmed -->
@@ -1919,7 +1960,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23098" levels="1" name="2nd Consecutive Win">
 		<!-- High Five Confirmed -->
@@ -1932,7 +1973,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23099" levels="1" name="3rd Consecutive Win">
 		<!-- High Five Confirmed -->
@@ -1945,6 +1986,6 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/23100-23199.xml b/src/main/resources/data/stats/skills/23100-23199.xml
index 833317da01..10f2d824f7 100644
--- a/src/main/resources/data/stats/skills/23100-23199.xml
+++ b/src/main/resources/data/stats/skills/23100-23199.xml
@@ -11,7 +11,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23101" levels="1" name="5th Consecutive Win">
 		<!-- High Five Confirmed -->
@@ -24,7 +24,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23102" levels="1" name="6th Consecutive Win">
 		<!-- High Five Confirmed -->
@@ -37,7 +37,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23103" levels="1" name="7th Consecutive Win">
 		<!-- High Five Confirmed -->
@@ -50,7 +50,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23104" levels="1" name="8th Consecutive Win">
 		<!-- High Five Confirmed -->
@@ -63,7 +63,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23105" levels="1" name="9th Consecutive Win">
 		<!-- High Five Confirmed -->
@@ -76,7 +76,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23106" levels="1" name="10th Consecutive Win">
 		<!-- High Five Confirmed -->
@@ -89,7 +89,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23107" levels="1" name="11th Consecutive Win">
 		<!-- High Five Confirmed -->
@@ -102,7 +102,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23108" levels="1" name="12th Consecutive Win">
 		<!-- High Five Confirmed -->
@@ -115,7 +115,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23109" levels="1" name="13th Consecutive Win">
 		<!-- High Five Confirmed -->
@@ -128,7 +128,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23110" levels="1" name="14th Consecutive Win">
 		<!-- High Five Confirmed -->
@@ -141,7 +141,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23111" levels="1" name="15th Consecutive Win">
 		<!-- High Five Confirmed -->
@@ -154,7 +154,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23112" levels="1" name="16th Consecutive Win">
 		<!-- High Five Confirmed -->
@@ -167,7 +167,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23113" levels="1" name="17th Consecutive Win">
 		<!-- High Five Confirmed -->
@@ -180,7 +180,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23114" levels="1" name="18th Consecutive Win">
 		<!-- High Five Confirmed -->
@@ -193,7 +193,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23115" levels="1" name="19th Consecutive Win">
 		<!-- High Five Confirmed -->
@@ -206,7 +206,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23116" levels="1" name="20th Consecutive Win">
 		<!-- High Five Confirmed -->
@@ -219,7 +219,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
 	<skill id="23117" levels="1" name="Frozen Corpse Agathion Cute Trick">
 		<!-- High Five Confirmed -->
@@ -242,6 +242,8 @@
 		<set name="abnormalType" val="MULTI_BUFF" />
 		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="buffProtectLevel" val="1" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill_agathion_special" />
 		<set name="irreplaceableBuff" val="true" />
@@ -295,9 +297,10 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 	</skill>
-	<skill id="23122" levels="1" name="Jack Game - Target">
+	<skill id="23122" levels="1" name="Jack's game - Target">
+		<!-- High Five Confirmed -->
 		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="castRange" val="600" />
@@ -308,7 +311,12 @@
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="TargetMeProbability">
+				<param chance="100" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23123" levels="1" name="Gwangong Agathion Cute Trick">
 		<!-- High Five Confirmed -->
@@ -331,10 +339,12 @@
 		<set name="abnormalType" val="TARGET_LOCK" />
 		<set name="activateRate" val="0" />
 		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="1" />
 		<set name="castRange" val="800" />
 		<set name="coolTime" val="200" />
 		<set name="effectPoint" val="-1" />
 		<set name="effectRange" val="1300" />
+		<set name="hitCancelTime" val="500" />
 		<set name="hitTime" val="700" />
 		<set name="icon" val="icon.skill_agathion_special" />
 		<set name="irreplaceableBuff" val="true" />
@@ -344,6 +354,7 @@
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="60000" />
 		<set name="reuseDelayLock" val="true" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ENEMY_ONLY" />
 		<cond msgId="2292">
@@ -369,6 +380,7 @@
 		</cond>
 	</skill>
 	<skill id="23126" levels="1" name="Gwanseum Nyang Nyang Agathion Special Skill - Blessing of Mercy">
+		<!-- High Five Confirmed -->
 		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="castRange" val="600" />
@@ -377,10 +389,15 @@
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
 		<cond msgId="2292">
 			<player agathionId="1552" />
 		</cond>
+		<effects>
+			<effect name="Heal">
+				<param power="201" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23127" levels="1" name="Blue Opera Agathion Cute Trick">
 		<!-- High Five Confirmed -->
@@ -397,6 +414,7 @@
 		</cond>
 	</skill>
 	<skill id="23128" levels="1" name="Blue Opera Agathion Special Skill - Sword of Recovery">
+		<!-- High Five Confirmed -->
 		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="castRange" val="600" />
@@ -406,22 +424,33 @@
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
 		<cond msgId="2292">
 			<player agathionId="1553" />
 		</cond>
+		<effects>
+			<effect name="Heal">
+				<param power="201" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23129" levels="1" name="Blue Opera Agathion Special Skill - Sword of Water">
+		<!-- High Five Confirmed -->
 		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="effectPoint" val="-1" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="ENEMY" />
 		<cond msgId="2292">
 			<player agathionId="1553" />
 		</cond>
+		<effects>
+			<effect name="MagicalAttack">
+				<param power="236" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23130" levels="1" name="Red Opera Agathion Cute Trick">
 		<!-- High Five Confirmed -->
@@ -438,16 +467,22 @@
 		</cond>
 	</skill>
 	<skill id="23131" levels="1" name="Red Opera Agathion Special Skill - Spear of Flames">
+		<!-- High Five Confirmed -->
 		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="effectPoint" val="-1" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="ENEMY" />
 		<cond msgId="2292">
 			<player agathionId="1554" />
 		</cond>
+		<effects>
+			<effect name="MagicalAttack">
+				<param power="236" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23132" levels="1" name="Opera Agathion Cute Trick">
 		<!-- High Five Confirmed -->
@@ -586,9 +621,11 @@
 		</effects>
 	</skill>
 	<skill id="23139" levels="1" name="Ladder Snow Agathion Cute Trick">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill_agathion_cute" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -792,130 +829,356 @@
 		</cond>
 	</skill>
 	<skill id="23153" levels="1" name="Prominent Outsider Adventurer's Ability">
-		<!-- For 20 minutes, raises HP by 20%, Max MP by 20%, and moving speed by 20%. Increases HP recovery bonus by 20% and MP recovery bonus by 20%. Increases resistance to de-buffs by 10%. Reuse delay is 4 hours. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="26" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="MULTI_BUFF" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="buffProtectLevel" val="1" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill_agathion_special" />
 		<set name="irreplaceableBuff" val="true" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="14400000" />
+		<set name="reuseDelayLock" val="true" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
+		<cond msgId="2292">
+			<player hasAgathion="true" />
+		</cond>
+		<effects>
+			<effect name="Buff">
+				<mul stat="regHp" val="1.2" />
+			</effect>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="regMp" val="1.2" />
+			</effect>
+			<effect name="Debuff">
+				<mul stat="debuffVuln" val="0.9" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="runSpd" val="1.2" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23154" levels="1" name="Kadomas Special Skill - Fireworks">
-		<set name="hitTime" val="4000" />
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
+		<set name="hitTime" val="6300" />
 		<set name="icon" val="BranchSys.icon.br_kadomatsu_i00" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="60000" />
+		<set name="reuseDelayLock" val="true" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 	</skill>
-	<skill id="23155" levels="1" name="Reindeer Scratch">
-		<!-- Raises affection level. For 10 minutes, raises physical critical rate by 30% and chance of magical critical rate by 2. -->
+	<skill id="23155" levels="1" name="Hand of Warmth">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="BR_EVENT_BUF3" />
+		<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="icon" val="icon.skill0436" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="irreplaceableBuff" val="true" />
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
+		<effects>
+			<effect name="Buff">
+				<mul stat="critRate" val="1.3" />
+			</effect>
+			<effect name="Buff">
+				<add stat="mCritRate" val="2" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23156" levels="1" name="Gift of Thanks">
-		<!-- Energy level is maintained for 10 minutes. Reuse delay is 2 hours. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="VP_UP" />
 		<set name="abnormalVisualEffect" val="VP_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="buffProtectLevel" val="1" />
+		<set name="castRange" val="400" />
+		<set name="effectRange" val="900" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1086" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="irreplaceableBuff" val="true" />
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="7200000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="Buff">
+				<mul stat="vitalityConsumeRate" val="0" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23157" levels="1" name="Donateloph's Blessing">
-		<!-- For 1 hour, increases Max HP, MP, and CP by 40%. Increases physical P. Def. and magic M. Def. by 20%. Increases moving speed by 20%. Increases physical P. Atk. by 10%. Increases physical Atk. Spd. by 20%. Bestows the ability to recover as HP 10% of the standard short-range physical damage inflicted on the enemy. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="BR_EVENT_BUF1" />
+		<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="icon" val="BranchSys.icon.br_xmas_present_luck_i00" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="irreplaceableBuff" val="true" />
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
+		<effects>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.2" />
+			</effect>
+			<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>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.1" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pDef" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="runSpd" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<add stat="absorbDam" val="10" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23158" levels="1" name="Raphaeloph's Blessing">
-		<!-- For 1 hour, increases Max HP, MP, and CP by 40%. Increasesw physical P. Def. and magic M. Def. by 20%. Increases moving speed by 20%. Increases physical P. Atk. by 10%. Increases the rate of Critical attack by 30%. Increases the power of Critical attack by 10%. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="BR_EVENT_BUF1" />
+		<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="icon" val="BranchSys.icon.br_xmas_present_joy_i00" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="irreplaceableBuff" val="true" />
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
+		<effects>
+			<effect name="Buff">
+				<mul stat="critDmg" val="1.1" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="critRate" val="1.3" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.2" />
+			</effect>
+			<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>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.1" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pDef" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="runSpd" val="1.2" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23159" levels="1" name="Leonardoph's Blessing">
-		<!-- For 1 hour, increases Max HP, MP, and CP by 40%. Increases physical P. Def. and magic M. Def. by 20%. Increases moving speed by 20%. Increases magic M. Atk. by 10%. Increases magic Casting Spd. by 20%. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="BR_EVENT_BUF1" />
+		<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="icon" val="BranchSys.icon.br_xmas_reward_buff_i00" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="irreplaceableBuff" val="true" />
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
+		<effects>
+			<effect name="Buff">
+				<mul stat="mAtkSpd" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.1" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.2" />
+			</effect>
+			<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>
+			<effect name="Buff">
+				<mul stat="pDef" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="runSpd" val="1.2" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23160" levels="1" name="Michelangeloph's Blessing">
-		<!-- For 1 hour, increases Max HP, MP, and CP by 40%. Increases physical P. Def. and magic M. Def. by 20%. Increases moving speed by 20%. Increases magical critical power by 20% and the chance of magical critical rate by 2. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="BR_EVENT_BUF1" />
+		<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="icon" val="BranchSys.icon.br_xmas_weapon_i00" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="irreplaceableBuff" val="true" />
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
+		<effects>
+			<effect name="Buff">
+				<mul stat="mCritPower" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<add stat="mCritRate" val="2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.2" />
+			</effect>
+			<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>
+			<effect name="Buff">
+				<mul stat="pDef" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="runSpd" val="1.2" />
+			</effect>
+		</effects>
 	</skill>
-	<skill id="23161" levels="1" name="Rudolphina's Blessing - Maintain Vitality">
+	<skill id="23161" levels="1" name="Rudolph Girl's Blessing - Maintain Vitality">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="VP_UP" />
 		<set name="abnormalVisualEffect" val="VP_UP" />
+		<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="icon" val="BranchSys.icon.br_xmas_miracle_i00" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="irreplaceableBuff" val="true" />
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
+		<effects>
+			<effect name="Buff">
+				<mul stat="vitalityConsumeRate" val="0" />
+			</effect>
+		</effects>
 	</skill>
-	<skill id="23162" levels="1" name="Rudolphina's Blessing - Replenish Vitality">
-		<!-- Confirmed CT2.5 -->
-		<!-- <set name="castRange" val="600" /> -->
-		<!-- <set name="effectRange" val="600" /> -->
+	<skill id="23162" levels="1" name="Rudolph Girl's Blessing - Replenish Energy">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="castRange" val="600" />
+		<set name="effectRange" val="600" />
 		<set name="hitTime" val="500" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -927,129 +1190,289 @@
 		</effects>
 	</skill>
 	<skill id="23163" levels="1" name="Turkey's Big Mistake">
-		<!-- For 1 hour, increases Max HP, MP, and CP by 50%. Increases physical P. Atk., magic M. Atk., physical P. Def., and magic M. Def. by 20%. Increases moving speed by 30%. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3600" />
 		<set name="abnormalType" val="BR_EVENT_BUF1" />
+		<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="icon" val="BranchSys.icon.br_turkey_buff_i00" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="irreplaceableBuff" val="true" />
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
+		<effects>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.2" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="50" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxHp">
+				<param power="50" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="50" />
+				<param type="PER" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pDef" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="runSpd" val="1.3" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23164" levels="1" name="Opera Agathion Special Skill - Sword of Life">
-		<!-- Can use the ability of Blessed Resurrection through the power of life. Reuse delay is 12 hours. -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="castRange" val="400" />
 		<set name="effectPoint" val="1" />
+		<set name="effectRange" val="600" />
+		<set name="hitCancelTime" val="500" />
+		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill_agathion_special" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<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="NONE" />
+		<set name="targetType" val="PC_BODY" />
 		<cond msgId="2292">
-			<player agathionId="1555" />
+			<and>
+				<player canResurrect="true" />
+				<player agathionId="1555" />
+			</and>
 		</cond>
+		<effects>
+			<effect name="Resurrection">
+				<param power="200" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23165" levels="1" name="Inadequate Affection">
-		<!-- For 10 seconds, moving speed decreases by 2%, and your head gets bigger. -->
+		<!-- 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="icon" val="icon.skill4443" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<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="Debuff">
+				<mul stat="runSpd" val="0.98" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23166" levels="1" name="Energized Rose Spirit">
-		<!-- Confirmed CT2.5 -->
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
 		<set name="effectRange" val="1400" />
 		<set name="hitTime" val="6000" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="TARGET" />
 		<effects>
-			<!-- TODO: Need new effect i_dispel_by_name. -->
+			<effect name="InstantDispelByName">
+				<param id="22158" />
+			</effect>
 			<effect name="VitalityPointUp">
 				<param value="5000" />
 			</effect>
 		</effects>
 	</skill>
 	<skill id="23167" levels="1" name="Rosy Seduction">
-		<!-- Increases Max HP by 20%, Max MP by 20%, and the moving speed by 20% for 5 minutes. Increases the resistance to de-buffs by 10%. Reuse delay 10 minutes. Consumes 3 Rose Essence during skill use. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="BR_EVENT_BUF5" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="buffProtectLevel" val="1" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
+		<set name="effectRange" val="1400" />
+		<set name="hitTime" val="3000" />
 		<set name="icon" val="BranchSys2.icon.br_rosalia_rose_red_i00" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
-		<set name="magicLvl" val="-1" />
+		<set name="irreplaceableBuff" val="true" />
+		<set name="isMagic" val="2" />
+		<set name="itemConsumeCount" val="3" />
+		<set name="itemConsumeId" val="20904" />
+		<set name="magicLvl" val="-3" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="600000" />
+		<set name="reuseDelayLock" val="true" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="CallSkill">
+				<param skillId="23170" />
+			</effect>
+			<effect name="MaxHp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="20" />
+				<param type="PER" />
+			</effect>
+			<effect name="Debuff">
+				<mul stat="debuffVuln" val="0.9" />
+			</effect>
+			<effect name="Buff">
+				<add stat="runSpd" val="20" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23168" levels="1" name="Critical Seduction">
-		<!-- Increases party members' Max HP by 30%, Max MP by 30%, Max CP by 30%, physical P. Def. by 30%, magic M. Def. by 30%, moving speed by 20%, and physical P. Atk. by 10%, and decreases MP consumption during skill use by 15% for 20 minutes. Reuse delay 40 minutes. Consumes 10 Rose Essence during skill use. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="2" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="BR_EVENT_BUF5" />
+		<set name="affectObject" val="FRIEND" />
+		<set name="affectRange" val="1000" />
+		<set name="affectScope" val="PARTY" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="buffProtectLevel" val="1" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
+		<set name="effectRange" val="1400" />
+		<set name="hitTime" val="3000" />
 		<set name="icon" val="BranchSys2.icon.br_rosalia_rose_red_i00" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
-		<set name="magicLvl" val="-1" />
+		<set name="irreplaceableBuff" val="true" />
+		<set name="isMagic" val="2" />
+		<set name="itemConsumeCount" val="10" />
+		<set name="itemConsumeId" val="20904" />
+		<set name="magicLvl" val="-3" />
 		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="2400000" />
+		<set name="reuseDelayLock" val="true" />
+		<set name="reuseDelayType" val="S" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
 		<set name="trait" val="ETC" />
+		<effects>
+			<effect name="CallSkill">
+				<param skillId="23169" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="physicalMpConsumeRate" val="0.85" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="magicalMpConsumeRate" val="0.85" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="danceMpConsumeRate" val="0.85" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.2" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.3" />
+			</effect>
+			<effect name="MaxCp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxHp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
+			<effect name="MaxMp">
+				<param power="30" />
+				<param type="PER" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.1" />
+			</effect>
+			<effect name="Buff">
+				<mul stat="pDef" val="1.3" />
+			</effect>
+			<effect name="Buff">
+				<add stat="runSpd" val="20" />
+			</effect>
+		</effects>
 	</skill>
-	<skill id="23169" levels="1" name="Mesmerized">
-		<!-- Critical Seduction has left you mesmerized. You cannot be buffed with Critical Seduction again during the next 40 minutes. -->
+	<skill id="23169" levels="1" name="Mesmerization">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="2400" />
 		<set name="abnormalType" val="BR_EVENT_BUF6" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="2" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
+		<set name="effectRange" val="1400" />
 		<set name="icon" val="BranchSys2.icon.br_rosalia_rose_blue_i00" />
+		<set name="irreplaceableBuff" val="true" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="magicLvl" val="-1" />
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="-2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
 		<set name="trait" val="ETC" />
 	</skill>
-	<skill id="23170" levels="1" name="Mesmerized">
-		<!-- Rosy Seduction has left you mesmerized. You cannot be buffed with Rosy Seduction again during the next 10 minutes. -->
+	<skill id="23170" levels="1" name="Mesmerization">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="BR_EVENT_BUF7" />
+		<set name="affectScope" val="SINGLE" />
+		<set name="buffProtectLevel" val="2" />
+		<set name="castRange" val="900" />
 		<set name="effectPoint" val="1" />
+		<set name="effectRange" val="1400" />
 		<set name="icon" val="BranchSys2.icon.br_rosalia_rose_white_i00" />
+		<set name="irreplaceableBuff" val="true" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="magicLvl" val="-1" />
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="-2" />
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="TARGET" />
 		<set name="trait" val="ETC" />
 	</skill>
 	<skill id="23171" levels="1" name="Phoenix Agathion Cute Trick">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill_agathion_cute" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -1058,21 +1481,24 @@
 			<player agathionId="1574" />
 		</cond>
 	</skill>
-	<skill id="23172" levels="1" name="Phoenix Agathion Special Skill - Nirvana Rebirth">
-		<!-- All HP, MP, CP are recovered, and becomes invincible for 5 seconds with the power of Phoenix. Possible to use under HP 30% only. Cooldown of 12 hours. -->
+	<skill id="23172" levels="1" name="Phoenix Agathion Special Skill - Nirvana Cycle">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="26" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="INVINCIBILITY" />
 		<set name="abnormalVisualEffect" val="INVINCIBILITY" />
 		<set name="activateRate" val="0" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
-		<set name="hitTime" val="2000" />
+		<set name="buffProtectLevel" val="1" />
+		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill_agathion_special" />
 		<set name="irreplaceableBuff" val="true" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="43200000" />
+		<set name="reuseDelayLock" val="true" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="113" addName="1">
@@ -1082,13 +1508,6 @@
 			</and>
 		</cond>
 		<effects>
-			<effect name="BlockDamage">
-				<param block="HP"/>
-			</effect>
-			<effect name="BlockDamage">
-				<param block="MP"/>
-			</effect>
-			<effect name="BlockDebuff" />
 			<effect name="Cp">
 				<param amount="9000" />
 			</effect>
@@ -1098,18 +1517,27 @@
 			<effect name="MpPerMax">
 				<param power="100" />
 			</effect>
+			<effect name="BlockDebuff" />
+			<effect name="BlockDamage">
+				<param block="HP" />
+			</effect>
+			<effect name="BlockDamage">
+				<param block="MP" />
+			</effect>
 		</effects>
 	</skill>
-	<skill id="23173" levels="1" name="Phoenix Agathion Special Skill - Oriental Phoenix">
-		<!-- All Debuff is canceled with the power of Phoenix. Cooldown of 4 hours. -->
+	<skill id="23173" levels="1" name="Phoenix Agathion Special Skill - Mountain Echoes">
+		<!-- High Five Confirmed -->
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="effectPoint" val="1" />
-		<set name="hitTime" val="2000" />
+		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill_agathion_special" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="14400000" />
+		<set name="reuseDelayLock" val="true" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="2292">
@@ -1117,25 +1545,34 @@
 		</cond>
 		<effects>
 			<effect name="DispelByCategory">
-				<param slot="DEBUFF" rate="100" max="20" />
+				<param slot="DEBUFF" rate="100" max="10" />
 			</effect>
 		</effects>
 	</skill>
-	<skill id="23174" levels="1" name="Narrow Escape from Death">
-		<!-- Revives from death with completely recovered status. Buff/de-buff doesn't disappear at death but is maintained, though the Blessing of Noblesse and the Amulet of Luck will both be lost. Cooldown of 12 hours. -->
+	<skill id="23174" levels="1" name="Narrow Escape">
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="26" />
 		<set name="abnormalTime" val="1800" />
 		<set name="abnormalType" val="RESURRECTION_SPECIAL" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="buffProtectLevel" val="1" />
+		<set name="castRange" val="600" />
 		<set name="effectPoint" val="1" />
+		<set name="effectRange" val="600" />
+		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill_agathion_special" />
 		<set name="irreplaceableBuff" val="true" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="43200000" />
+		<set name="reuseDelayLock" val="true" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<cond msgId="2292">
+			<player hasAgathion="true" />
+		</cond>
 		<effects>
 			<effect name="ResurrectionSpecial">
 				<param resPower="100" />
@@ -1144,69 +1581,129 @@
 		</effects>
 	</skill>
 	<skill id="23175" levels="1" name="Soul Stealth">
-		<!-- Hides for 5 seconds, then bestows the ability not to provoke preemptive attacks from monsters for 2 minutes. Decreases moving speed by 50% while the skill is in effect. Reuse delay is 12 hours. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="26" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="HIDE" />
 		<set name="abnormalVisualEffect" val="STEALTH" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="buffProtectLevel" val="1" />
+		<set name="castRange" val="600" />
 		<set name="effectPoint" val="1" />
+		<set name="effectRange" val="600" />
+		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill_agathion_special" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="irreplaceableBuff" val="true" />
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="43200000" />
+		<set name="reuseDelayLock" val="true" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
+		<effects>
+			<effect name="SilentMove" />
+			<effect name="Hide" />
+			<effect name="Buff">
+				<mul stat="runSpd" val="0.5" />
+			</effect>
+		</effects>
+		<endEffects>
+			<effect name="CallSkill">
+				<param skillId="23177" skillLevel="1" />
+			</effect>
+		</endEffects>
 	</skill>
 	<skill id="23176" levels="1" name="Hide">
-		<!-- Hides for 5 seconds. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="26" />
 		<set name="abnormalTime" val="5" />
 		<set name="abnormalType" val="HIDE" />
 		<set name="abnormalVisualEffect" val="STEALTH" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="buffProtectLevel" val="1" />
+		<set name="castRange" val="600" />
 		<set name="effectPoint" val="1" />
+		<set name="effectRange" val="600" />
+		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill0922" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="irreplaceableBuff" val="true" />
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="10000" />
+		<set name="reuseDelayLock" val="true" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
+		<effects>
+			<effect name="SilentMove" />
+			<effect name="Hide" />
+		</effects>
+		<endEffects>
+			<effect name="CallSkill">
+				<param skillId="23178" skillLevel="1" />
+			</effect>
+		</endEffects>
 	</skill>
 	<skill id="23177" levels="1" name="Soul Stealth">
-		<!-- For 2 minutes, bestows the ability not to provoke preemptive attacks from monsters. Decreases moving speed by 50% while the skill is in effect. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="26" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="STEALTH" />
 		<set name="abnormalVisualEffect" val="STEALTH" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="buffProtectLevel" val="1" />
+		<set name="castRange" val="600" />
 		<set name="effectPoint" val="1" />
+		<set name="effectRange" val="600" />
+		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill_agathion_special" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="irreplaceableBuff" val="true" />
+		<set name="isMagic" val="2" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="5000" />
+		<set name="reuseDelayLock" val="true" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
+		<effects>
+			<effect name="SilentMove" />
+			<effect name="Buff">
+				<mul stat="runSpd" val="0.5" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23178" levels="1" name="Soul Stealth">
-		<!-- For 2 minutes, bestows the ability not to provoke preemptive attacks from monsters. Decreases moving speed by 50% while the skill is in effect. -->
+		<!-- High Five Confirmed -->
 		<set name="abnormalLvl" val="26" />
 		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="STEALTH" />
 		<set name="abnormalVisualEffect" val="STEALTH" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="buffProtectLevel" val="1" />
+		<set name="castRange" val="600" />
 		<set name="effectPoint" val="1" />
+		<set name="effectRange" val="600" />
+		<set name="hitTime" val="500" />
 		<set name="icon" val="icon.skill0411" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="irreplaceableBuff" val="true" />
+		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="5000" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="reuseDelayLock" val="true" />
-		<set name="targetType" val="NONE" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="TARGET" />
+		<effects>
+			<effect name="SilentMove" />
+			<effect name="Debuff">
+				<mul stat="runSpd" val="0.5" />
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23179" levels="1" name="Blessing of Vitality">
 		<!-- Confirmed CT2.5 -->
diff --git a/src/main/resources/data/xsd/skills.xsd b/src/main/resources/data/xsd/skills.xsd
index 801754482e..dbef5452f5 100644
--- a/src/main/resources/data/xsd/skills.xsd
+++ b/src/main/resources/data/xsd/skills.xsd
@@ -67,6 +67,7 @@
 							<xs:enumeration value="resetQuest" />
 							<xs:enumeration value="reuseDelay" />
 							<xs:enumeration value="reuseDelayLock" />
+							<xs:enumeration value="reuseDelayType" />
 							<xs:enumeration value="rideState" />
 							<xs:enumeration value="simultaneousCast" />
 							<xs:enumeration value="soulMaxConsumeCount" />
@@ -166,7 +167,7 @@
 				<xs:attribute type="xs:short" name="active_skill_id" />
 				<xs:attribute type="xs:string" name="checkAbnormal" />
 				<xs:attribute type="xs:string" name="class_id_restriction" />
-				<xs:attribute type="xs:string" name="myPartyExceptMe" />
+				<xs:attribute type="xs:string" name="myParty" />
 				<xs:attribute type="xs:string" name="race" />
 				<xs:attribute type="xs:string" name="npcId" />
 				<xs:attribute type="xs:string" name="npcType" />
@@ -581,6 +582,7 @@
 					<xs:enumeration value="ImmobilePetBuff" />
 					<xs:enumeration value="InstantAgathionEnergy" />
 					<xs:enumeration value="InstantBetray" />
+					<xs:enumeration value="InstantDispelByName" />
 					<xs:enumeration value="Lethal" />
 					<xs:enumeration value="Lucky" />
 					<xs:enumeration value="MagicalAttack" />
diff --git a/src/test/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantBetrayTest.java b/src/test/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantBetrayTest.java
index 5714f83b86..9283a2cf32 100644
--- a/src/test/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantBetrayTest.java
+++ b/src/test/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantBetrayTest.java
@@ -5,11 +5,11 @@ import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.expectLastCall;
 import static org.powermock.api.easymock.PowerMock.mockStatic;
-import static org.powermock.api.easymock.PowerMock.replay;
+import static org.powermock.api.easymock.PowerMock.replayAll;
 
 import java.util.Map;
 
-import org.easymock.Mock;
+import org.powermock.api.easymock.annotation.Mock;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
@@ -29,7 +29,10 @@ import com.l2jserver.gameserver.model.stats.Formulas;
  * @author Zoey76
  * @version 2.6.2.0
  */
-@PrepareForTest(Formulas.class)
+@PrepareForTest({
+	BuffInfo.class,
+	Formulas.class
+})
 public class InstantBetrayTest extends AbstractTest {
 	
 	@Mock
@@ -67,7 +70,7 @@ public class InstantBetrayTest extends AbstractTest {
 	public void test_effected_is_raid() {
 		expect(buffInfo.getEffected()).andReturn(effected);
 		expect(effected.isRaid()).andReturn(true);
-		replay(buffInfo, effected);
+		replayAll();
 		
 		effect.onStart(buffInfo);
 	}
@@ -79,7 +82,7 @@ public class InstantBetrayTest extends AbstractTest {
 		expect(effected.isServitor()).andReturn(false);
 		expect(effected.isSummon()).andReturn(false);
 		expect(effected.isRaidMinion()).andReturn(false);
-		replay(buffInfo, effected);
+		replayAll();
 		
 		effect.onStart(buffInfo);
 	}
@@ -95,7 +98,7 @@ public class InstantBetrayTest extends AbstractTest {
 		expect(effected.getActingPlayer()).andReturn(masterPlayer);
 		expect(Formulas.calcProbability(80, effector, effected, skill)).andReturn(false);
 		expect(effected.getAI()).andReturn(creatureAI);
-		replay(buffInfo, effected, effector, skill, masterPlayer, Formulas.class);
+		replayAll();
 		
 		effect.onStart(buffInfo);
 	}
@@ -115,7 +118,7 @@ public class InstantBetrayTest extends AbstractTest {
 		expectLastCall();
 		creatureAI.setIntention(AI_INTENTION_IDLE, masterPlayer);
 		expectLastCall();
-		replay(buffInfo, effected, effector, skill, masterPlayer, creatureAI, Formulas.class);
+		replayAll();
 		
 		effect.onStart(buffInfo);
 	}
@@ -136,7 +139,7 @@ public class InstantBetrayTest extends AbstractTest {
 		expectLastCall();
 		creatureAI.setIntention(AI_INTENTION_IDLE, masterPlayer);
 		expectLastCall();
-		replay(buffInfo, effected, effector, skill, masterPlayer, creatureAI, Formulas.class);
+		replayAll();
 		
 		effect.onStart(buffInfo);
 	}
@@ -158,7 +161,7 @@ public class InstantBetrayTest extends AbstractTest {
 		expectLastCall();
 		creatureAI.setIntention(AI_INTENTION_IDLE, effectedLeader);
 		expectLastCall();
-		replay(buffInfo, effectedMinion, effectedLeader, effector, skill, creatureAI, Formulas.class);
+		replayAll();
 		
 		effect.onStart(buffInfo);
 	}
diff --git a/src/test/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantDispelByNameTest.java b/src/test/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantDispelByNameTest.java
new file mode 100644
index 0000000000..65899eb992
--- /dev/null
+++ b/src/test/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantDispelByNameTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2004-2021 L2J DataPack
+ * 
+ * This file is part of L2J DataPack.
+ * 
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.datapack.handlers.effecthandlers.instant;
+
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.powermock.api.easymock.PowerMock.replayAll;
+
+import java.util.Map;
+
+import org.powermock.api.easymock.annotation.Mock;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.Test;
+
+import com.l2jserver.datapack.test.AbstractTest;
+import com.l2jserver.gameserver.model.CharEffectList;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+
+/**
+ * Dispel By Name instant effect test.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+@PrepareForTest({
+	BuffInfo.class,
+	CharEffectList.class
+})
+public class InstantDispelByNameTest extends AbstractTest {
+	
+	private static final int SKILL_ID = 4342;
+	
+	@Mock
+	private BuffInfo buffInfo;
+	@Mock
+	private L2Character effected;
+	@Mock
+	private CharEffectList effectList;
+	
+	private InstantDispelByName effect;
+	
+	@BeforeSuite
+	void init() {
+		final var set = new StatsSet(Map.of("name", "InstantDispelByName"));
+		final var params = new StatsSet(Map.of("id", SKILL_ID));
+		effect = new InstantDispelByName(null, null, set, params);
+	}
+	
+	@Test
+	public void test_null_effected() {
+		effect.onStart(buffInfo);
+	}
+	
+	@Test
+	public void test_effect_dispel() {
+		expect(buffInfo.getEffected()).andReturn(effected);
+		expect(effected.getEffectList()).andReturn(effectList);
+		effectList.stopSkillEffects(true, SKILL_ID);
+		expectLastCall().once();
+		
+		replayAll();
+		
+		effect.onStart(buffInfo);
+	}
+}
diff --git a/src/test/java/com/l2jserver/datapack/handlers/targethandlers/EnemyNotTest.java b/src/test/java/com/l2jserver/datapack/handlers/targethandlers/EnemyNotTest.java
new file mode 100644
index 0000000000..12034f20ce
--- /dev/null
+++ b/src/test/java/com/l2jserver/datapack/handlers/targethandlers/EnemyNotTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2004-2021 L2J DataPack
+ * 
+ * This file is part of L2J DataPack.
+ * 
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.datapack.handlers.targethandlers;
+
+import static com.l2jserver.gameserver.handler.ITargetTypeHandler.EMPTY_TARGET_LIST;
+import static com.l2jserver.gameserver.network.SystemMessageId.INCORRECT_TARGET;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.powermock.api.easymock.PowerMock.replayAll;
+import static org.testng.Assert.assertEquals;
+
+import java.util.List;
+
+import org.powermock.api.easymock.annotation.Mock;
+import org.testng.annotations.Test;
+
+import com.l2jserver.datapack.test.AbstractTest;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.skills.targets.AffectScope;
+
+/**
+ * Enemy Not test.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class EnemyNotTest extends AbstractTest {
+	
+	@Mock
+	private Skill skill;
+	@Mock
+	private L2Character activeChar;
+	@Mock
+	private L2Character target;
+	@Mock
+	private AffectScope affectScope;
+	
+	private final EnemyNot handler = new EnemyNot();
+	
+	@Test
+	public void test_target_null() {
+		assertEquals(handler.getTargetList(skill, activeChar, false, null), EMPTY_TARGET_LIST);
+	}
+	
+	@Test
+	public void test_target_is_dead() {
+		expect(target.isDead()).andReturn(true);
+		activeChar.sendPacket(INCORRECT_TARGET);
+		expectLastCall().once();
+		replayAll();
+		
+		assertEquals(handler.getTargetList(skill, activeChar, false, target), EMPTY_TARGET_LIST);
+	}
+	
+	@Test
+	public void test_target_is_not_autoattackable() {
+		expect(target.isDead()).andReturn(false);
+		expect(target.isAutoAttackable(activeChar)).andReturn(false);
+		expect(skill.getAffectScope()).andReturn(affectScope);
+		expect(affectScope.affectTargets(activeChar, target, skill)).andReturn(List.of(activeChar, target));
+		replayAll();
+		
+		assertEquals(handler.getTargetList(skill, activeChar, false, target), new L2Character[] {
+			activeChar,
+			target
+		});
+	}
+	
+	@Test
+	public void test_target_is_autoattackable() {
+		expect(target.isDead()).andReturn(false);
+		expect(target.isAutoAttackable(activeChar)).andReturn(true);
+		activeChar.sendPacket(INCORRECT_TARGET);
+		expectLastCall().once();
+		replayAll();
+		
+		assertEquals(handler.getTargetList(skill, activeChar, false, target), EMPTY_TARGET_LIST);
+	}
+}
diff --git a/src/test/java/com/l2jserver/datapack/handlers/targethandlers/EnemyTest.java b/src/test/java/com/l2jserver/datapack/handlers/targethandlers/EnemyTest.java
index 5c01ac1765..d6ad769514 100644
--- a/src/test/java/com/l2jserver/datapack/handlers/targethandlers/EnemyTest.java
+++ b/src/test/java/com/l2jserver/datapack/handlers/targethandlers/EnemyTest.java
@@ -24,7 +24,7 @@ import static com.l2jserver.gameserver.model.skills.targets.AffectScope.SINGLE;
 import static com.l2jserver.gameserver.network.SystemMessageId.INCORRECT_TARGET;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.expectLastCall;
-import static org.powermock.api.easymock.PowerMock.replay;
+import static org.powermock.api.easymock.PowerMock.replayAll;
 import static org.testng.Assert.assertEquals;
 
 import org.powermock.api.easymock.annotation.Mock;
@@ -59,7 +59,7 @@ public class EnemyTest extends AbstractTest {
 	@Test
 	public void test_invalid_affect_scope_should_return_empty_target_list() {
 		expect(skill.getAffectScope()).andReturn(NONE);
-		replay(skill);
+		replayAll();
 		
 		final var actual = enemy.getTargetList(skill, activeChar, false, target);
 		assertEquals(EMPTY_TARGET_LIST, actual);
@@ -68,7 +68,7 @@ public class EnemyTest extends AbstractTest {
 	@Test
 	public void test_null_target_should_return_empty_target_list() {
 		expect(skill.getAffectScope()).andReturn(SINGLE);
-		replay(skill);
+		replayAll();
 		
 		final var actual = enemy.getTargetList(skill, activeChar, false, null);
 		assertEquals(EMPTY_TARGET_LIST, actual);
@@ -80,7 +80,7 @@ public class EnemyTest extends AbstractTest {
 		expect(target.isDead()).andReturn(true);
 		activeChar.sendPacket(INCORRECT_TARGET);
 		expectLastCall().once();
-		replay(skill, target, activeChar);
+		replayAll();
 		
 		final var actual = enemy.getTargetList(skill, activeChar, false, target);
 		assertEquals(EMPTY_TARGET_LIST, actual);
@@ -91,7 +91,7 @@ public class EnemyTest extends AbstractTest {
 		expect(skill.getAffectScope()).andReturn(SINGLE);
 		expect(target.isDead()).andReturn(false);
 		expect(target.isAttackable()).andReturn(true);
-		replay(skill, target);
+		replayAll();
 		
 		final var actual = enemy.getTargetList(skill, activeChar, false, target);
 		assertEquals(target, actual[0]);
@@ -103,7 +103,7 @@ public class EnemyTest extends AbstractTest {
 		expect(target.isDead()).andReturn(false);
 		expect(target.isAttackable()).andReturn(false);
 		expect(activeChar.getActingPlayer()).andReturn(null);
-		replay(skill, target, activeChar);
+		replayAll();
 		
 		final var actual = enemy.getTargetList(skill, activeChar, false, target);
 		assertEquals(EMPTY_TARGET_LIST, actual);
@@ -120,7 +120,7 @@ public class EnemyTest extends AbstractTest {
 		expect(skillUseHolder.isCtrlPressed()).andReturn(false);
 		player.sendPacket(INCORRECT_TARGET);
 		expectLastCall().once();
-		replay(skill, target, activeChar, player, skillUseHolder);
+		replayAll();
 		
 		final var actual = enemy.getTargetList(skill, activeChar, false, target);
 		assertEquals(EMPTY_TARGET_LIST, actual);
@@ -135,7 +135,7 @@ public class EnemyTest extends AbstractTest {
 		expect(player.checkIfPvP(target)).andReturn(false);
 		expect(player.getCurrentSkill()).andReturn(skillUseHolder);
 		expect(skillUseHolder.isCtrlPressed()).andReturn(true);
-		replay(skill, target, activeChar, player, skillUseHolder);
+		replayAll();
 		
 		final var actual = enemy.getTargetList(skill, activeChar, false, target);
 		assertEquals(target, actual[0]);
@@ -148,7 +148,7 @@ public class EnemyTest extends AbstractTest {
 		expect(target.isAttackable()).andReturn(false);
 		expect(activeChar.getActingPlayer()).andReturn(player);
 		expect(player.checkIfPvP(target)).andReturn(true);
-		replay(skill, target, activeChar, player);
+		replayAll();
 		
 		final var actual = enemy.getTargetList(skill, activeChar, false, target);
 		assertEquals(target, actual[0]);
diff --git a/src/test/java/com/l2jserver/datapack/handlers/targethandlers/TargetTest.java b/src/test/java/com/l2jserver/datapack/handlers/targethandlers/TargetTest.java
new file mode 100644
index 0000000000..e9d3efcd6d
--- /dev/null
+++ b/src/test/java/com/l2jserver/datapack/handlers/targethandlers/TargetTest.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright © 2004-2021 L2J DataPack
+ * 
+ * This file is part of L2J DataPack.
+ * 
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.datapack.handlers.targethandlers;
+
+import static com.l2jserver.gameserver.handler.ITargetTypeHandler.EMPTY_TARGET_LIST;
+import static com.l2jserver.gameserver.network.SystemMessageId.INCORRECT_TARGET;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.powermock.api.easymock.PowerMock.replayAll;
+import static org.testng.Assert.assertEquals;
+
+import java.util.List;
+
+import org.powermock.api.easymock.annotation.Mock;
+import org.testng.annotations.Test;
+
+import com.l2jserver.datapack.test.AbstractTest;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.SkillUseHolder;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.skills.targets.AffectScope;
+
+/**
+ * Target test.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class TargetTest extends AbstractTest {
+	
+	@Mock
+	private Skill skill;
+	@Mock
+	private L2Character activeChar;
+	@Mock
+	private L2Character target;
+	@Mock
+	private L2PcInstance player;
+	@Mock
+	private SkillUseHolder skillUse;
+	@Mock
+	private AffectScope affectScope;
+	
+	private final Target handler = new Target();
+	
+	@Test
+	public void test_target_null() {
+		assertEquals(handler.getTargetList(skill, activeChar, false, null), EMPTY_TARGET_LIST);
+	}
+	
+	@Test
+	public void test_target_self_target() {
+		expect(activeChar.getActingPlayer()).andReturn(null);
+		expect(skill.getAffectScope()).andReturn(affectScope);
+		expect(affectScope.affectTargets(activeChar, activeChar, skill)).andReturn(List.of(activeChar));
+		replayAll();
+		
+		assertEquals(handler.getTargetList(skill, activeChar, false, activeChar), new L2Character[] {
+			activeChar
+		});
+	}
+	
+	@Test
+	public void test_target_without_ctrl_target_autoattackable() {
+		expect(activeChar.getActingPlayer()).andReturn(player);
+		expect(player.getCurrentSkill()).andReturn(skillUse);
+		expect(skillUse.isCtrlPressed()).andReturn(false);
+		expect(target.isAutoAttackable(activeChar)).andReturn(true);
+		activeChar.sendPacket(INCORRECT_TARGET);
+		expectLastCall().once();
+		
+		replayAll();
+		
+		assertEquals(handler.getTargetList(skill, activeChar, false, target), EMPTY_TARGET_LIST);
+	}
+	
+	@Test
+	public void test_target_with_ctrl_target_autoattackable() {
+		expect(activeChar.getActingPlayer()).andReturn(player);
+		expect(player.getCurrentSkill()).andReturn(skillUse);
+		expect(skillUse.isCtrlPressed()).andReturn(true);
+		expect(skill.getAffectScope()).andReturn(affectScope);
+		expect(affectScope.affectTargets(activeChar, target, skill)).andReturn(List.of(activeChar, target));
+		
+		replayAll();
+		
+		assertEquals(handler.getTargetList(skill, activeChar, false, target), new L2Character[] {
+			activeChar,
+			target
+		});
+	}
+}
diff --git a/src/test/java/com/l2jserver/datapack/test/AbstractTest.java b/src/test/java/com/l2jserver/datapack/test/AbstractTest.java
index f7a0835756..b019bb96a3 100644
--- a/src/test/java/com/l2jserver/datapack/test/AbstractTest.java
+++ b/src/test/java/com/l2jserver/datapack/test/AbstractTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2020 L2J DataPack
+ * Copyright © 2004-2021 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -23,14 +23,17 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.testng.PowerMockTestCase;
 
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
 
 /**
- * AbstractTest.
+ * Abstract Test.
  * @author Zoey76
  * @version 2.6.2.0
  */
-
-@PrepareForTest(L2PcInstance.class)
+@PrepareForTest({
+	L2PcInstance.class,
+	Skill.class
+})
 @PowerMockIgnore({
 	"javax.xml.*",
 	"org.w3c.*",
-- 
GitLab