From 051f80e5936e38ab0e4fdc46d7c810cccc3947e3 Mon Sep 17 00:00:00 2001
From: mobius <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 3 Feb 2015 05:13:36 +0000
Subject: [PATCH] Adventurer skills updated. Originally shared on l2j forum by
 NeeScience.

---
 .../game/data/stats/skills/11500-11599.xml    | 541 ++++++++++++++----
 .../game/data/stats/skills/15600-15699.xml    | 272 +++++++--
 .../gameserver/model/skills/AbnormalType.java |  12 +-
 3 files changed, 643 insertions(+), 182 deletions(-)

diff --git a/trunk/dist/game/data/stats/skills/11500-11599.xml b/trunk/dist/game/data/stats/skills/11500-11599.xml
index 330d4fa2af..b5f27975d7 100644
--- a/trunk/dist/game/data/stats/skills/11500-11599.xml
+++ b/trunk/dist/game/data/stats/skills/11500-11599.xml
@@ -167,112 +167,346 @@
 		<set name="isDebuff" val="true" />
 	</skill>
 	<skill id="11517" levels="4" name="Horn Melody">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 20 minutes, all party members' P. Atk. + 17%, P. Def. + 15%, M. Atk. + 79%, and M. Def. + 30%. -->
+		<table name="#abnormalLvls"> 1 2 3 4 </table>
 		<table name="#mpConsumes"> 140 151 170 181 </table>
+		<table name="#magicLvl"> 85 90 95 99 </table>
+		<table name="#pAtk"> 1.17 1.19 1.21 1.23 </table>
+		<table name="#pDef"> 1.15 1.15 1.15 1.15 </table>
+		<table name="#mAtk"> 1.79 1.83 1.87 1.91 </table>
+		<table name="#mDef"> 1.30 1.30 1.30 1.30 </table>
 		<set name="icon" val="icon.skill11517" />
+		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalTime" val="1800" />
+		<set name="abnormalType" val="MELODY_HORN" />
+		<set name="affectRange" val="1000" />
 		<set name="operateType" val="A2" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="PARTY" />
 		<set name="mpConsume" val="#mpConsumes" />
-		<set name="hitTime" val="700" />
-		<set name="coolTime" val="300" />
-		<set name="reuseDelay" val="2000" />
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="#magicLvl" />
+		<set name="reuseDelay" val="3000" />
+		<set name="rideState" val="NONE" />
+		<for>
+			<effect name="Buff">
+				<mul stat="pAtk" val="#pAtk" />
+				<mul stat="pDef" val="#pDef" />
+				<mul stat="mAtk" val="#mAtk" />
+				<mul stat="mDef" val="#mDef" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="PA_UP;PD_UP;MA_UP;MD_UP;IMPROVE_MA_MD_UP;IMPROVE_PA_PD_UP" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="PA_UP;PD_UP;MA_UP;MD_UP;IMPROVE_MA_MD_UP;IMPROVE_PA_PD_UP" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="11518" levels="4" name="Drum Melody">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- For 30 minutes, party members' Max MP + 20%, HP Recovery Bonus + 20%, M. Critical Rate + 20, Critical Damage during a normal attack + 20%, P. Atk. + 10%, P. Def. + 20%, Atk. Spd. + 20%, M. Atk. + 20%, M. Def. + 20%, Casting Spd. + 20%, Debuff Resistance + 10%, damage received from critical attacks - 30% and Speed - 15%. Party members equipped with melee weapons/bows/crossbows have increased Critical Damage after receiving an amount of damage. -->
-		<table name="#mpConsumes"> 140 151 170 181 </table>
-		<set name="icon" val="icon.skill11522" />
-		<set name="operateType" val="A2" />
-		<set name="targetType" val="SELF" />
-		<set name="mpConsume" val="#mpConsumes" />
-		<set name="hitTime" val="700" />
-		<set name="coolTime" val="300" />
-		<set name="reuseDelay" val="2000" />
+ 		<!-- For 30 minutes, party members' Max MP + 20%, HP Recovery Bonus + 20%, M. Critical Rate + 20, Critical Damage during a normal attack + 20%, P. Atk. + 10%, P. Def. + 20%, Atk. Spd. + 20%, M. Atk. + 20%, M. Def. + 20%, Casting Spd. + 20%, Debuff Resistance + 10%, damage received from critical attacks - 30% and Speed - 15%. Party members equipped with melee weapons/bows/crossbows have increased Critical Damage after receiving an amount of damage. -->
+		<table name="#abnormalLvls"> 1 2 3 4</table>
+ 		<table name="#mpConsumes"> 140 151 170 181 </table>
+		<table name="#magicLvl"> 85 90 95 99 </table>
+		<table name="#maxMp"> 1.20 1.20 1.20 1.20 </table>
+		<table name="#regHp"> 1.20 1.20 1.20 1.20 </table>
+		<table name="#mCritRate"> 20 20 20 20 </table>
+		<table name="#cAtk"> 20 20 20 20 </table>
+		<table name="#pAtk"> 1.10 1.10 1.10 1.10 </table>
+		<table name="#pDef"> 1.20 1.20 1.20 1.20 </table>
+		<table name="#pAtkSpd"> 1.20 1.20 1.20 1.20 </table>
+		<table name="#mAtk"> 1.20 1.20 1.20 1.20 </table>
+		<table name="#mDef"> 1.20 1.20 1.20 1.20 </table>
+		<table name="#mAtkSpd"> 1.20 1.20 1.20 1.20 </table>
+		<table name="#debuffVuln"> 1.10 1.10 1.10 1.10 </table>
+		<table name="#defCritDamage"> 1.30 1.30 1.30 1.30 </table>
+		<table name="#runSpd"> 0.85 0.90 0.95 1.0 </table>
+ 		<set name="icon" val="icon.skill11522" />
+		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalType" val="MELODY_DRUM" />
+		<set name="abnormalTime" val="1800" />
+		<set name="affectRange" val="1000" />
+ 		<set name="operateType" val="A2" />
+		<set name="targetType" val="PARTY" />
+ 		<set name="mpConsume" val="#mpConsumes" />
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="#magicLvl" />
+		<set name="reuseDelay" val="3000" />
+		<set name="rideState" val="NONE" />
+		<for>
+			<effect name="Buff">
+				<mul stat="maxMp" val="#maxMp" />
+				<mul stat="regHp" val="#regHp" />
+				<add stat="mCritRate" val="#mCritRate" />
+				<add stat="cAtk" val="#cAtk" />
+				<mul stat="pAtk" val="#pAtk" />
+				<mul stat="pDef" val="#pDef" />
+				<mul stat="pAtkSpd" val="#pAtkSpd" />
+				<mul stat="mAtk" val="#mAtk" />
+				<mul stat="mDef" val="#mDef" />
+				<mul stat="mAtkSpd" val="#mAtkSpd" />
+				<mul stat="runSpd" val="#runSpd" />
+				<mul stat="debuffVuln" val="#debuffVuln" />
+				<mul stat="defCritDamage" val="#defCritDamage" />
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param isCritical="true" />
+				<param minDamage="300" chance="15" /> <!-- Guess: Could be bewteen 15% to 25% chance -->
+				<param skillId="11569" skillLevel="1" /> <!-- Critical Damage Increase -->
+				<param targetType="SELF" />
+				<param allowWeapons="SWORD,BLUNT,DAGGER,DUALDAGGER,DUAL,DUALFIST,POLE,ANCIENTSWORD,RAPIER,BOW,CROSSBOW" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="MAX_MP_UP;HP_REGEN_UP;MAGIC_CRITICAL_UP;PA_UP;PD_UP;ATTACK_TIME_DOWN;MA_UP;MD_UP;CASTING_TIME_DOWN;SPEED_UP;IMPROVE_MA_MD_UP;IMPROVE_PA_PD_UP" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="MAX_MP_UP;HP_REGEN_UP;MAGIC_CRITICAL_UP;PA_UP;PD_UP;ATTACK_TIME_DOWN;MA_UP;MD_UP;CASTING_TIME_DOWN;SPEED_UP;IMPROVE_MA_MD_UP;IMPROVE_PA_PD_UP" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="11519" levels="4" name="Pipe Organ Melody">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- For 30 minutes, party members' Max HP + 37%, Max MP + 37%, Max CP + 37%, and HP Recovery Bonus + 20%. -->
-		<table name="#mpConsumes"> 140 151 170 181 </table>
-		<set name="icon" val="icon.skill11519" />
-		<set name="operateType" val="A2" />
-		<set name="targetType" val="SELF" />
-		<set name="mpConsume" val="#mpConsumes" />
-		<set name="hitTime" val="700" />
-		<set name="coolTime" val="300" />
-		<set name="reuseDelay" val="2000" />
+ 		<!-- For 30 minutes, party members' Max HP + 37%, Max MP + 37%, Max CP + 37%, and HP Recovery Bonus + 20%. -->
+		<table name="#abnormalLvls"> 1 2 3 4 </table>
+		<table name="#magicLvl"> 85 90 95 99 </table>
+		<table name="#maxHp"> 1.37 1.39 1.41 1.43 </table>
+		<table name="#maxMp"> 1.37 1.39 1.41 1.43 </table>
+		<table name="#maxCp"> 1.37 1.39 1.41 1.43 </table>
+		<table name="#regHp"> 1.20 1.20 1.20 1.20 </table>
+ 		<table name="#mpConsumes"> 140 151 170 181 </table>
+ 		<set name="icon" val="icon.skill11519" />
+		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalType" val="MELODY_PIPE" />
+		<set name="abnormalTime" val="1800" />
+		<set name="affectRange" val="1000" />
+ 		<set name="operateType" val="A2" />
+		<set name="targetType" val="PARTY" />
+ 		<set name="mpConsume" val="#mpConsumes" />
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="#magicLvl" />
+		<set name="reuseDelay" val="3000" />
+		<set name="rideState" val="NONE" />
+		<for>
+			<effect name="Buff">
+				<mul stat="maxHp" val="#maxHp" />
+				<mul stat="maxMp" val="#maxMp" />
+				<mul stat="maxCp" val="#maxCp" />
+				<mul stat="regHp" val="#regHp" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="MAX_HP_UP;MAX_MP_UP;HP_REGEN_UP;IMPROVE_HP_MP_UP" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="MAX_HP_UP;MAX_MP_UP;HP_REGEN_UP;IMPROVE_HP_MP_UP" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="11520" levels="4" name="Guitar Melody">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- For 30 minutes, party members' P. Critical Rate + 32%, P. Critical Damage + 35%, M. Critical Rate + 20 , and MP Consumption - 20% for physical skills and - 10% for magic skills. Iss Enchanter's Enchant Skill MP Consumption - 20%. -->
-		<table name="#mpConsumes"> 140 151 170 181 </table>
-		<set name="icon" val="icon.skill11520" />
-		<set name="operateType" val="A2" />
-		<set name="targetType" val="SELF" />
-		<set name="mpConsume" val="#mpConsumes" />
-		<set name="hitTime" val="700" />
-		<set name="coolTime" val="300" />
-		<set name="reuseDelay" val="2000" />
+ 		<!-- For 30 minutes, party members' P. Critical Rate + 32%, P. Critical Damage + 35%, M. Critical Rate + 20 , and MP Consumption - 20% for physical skills and - 10% for magic skills. Iss Enchanter's Enchant Skill MP Consumption - 20%. -->
+		<table name="#abnormalLvls"> 1 2 3 4 </table>
+		<table name="#magicLvl"> 85 90 95 99 </table>
+		<table name="#rCrit"> 1.32 1.34 1.36 1.38 </table>
+		<table name="#cAtk"> 1.35 1.35 1.35 1.35 </table>
+		<table name="#mCritRate"> 20 20 20 20 </table>
+		<table name="#magicMpConsumeRate"> 0.90 0.90 0.90 0.90 </table>
+		<table name="#PhysMpConsumeRate"> 0.80 0.80 0.80 0.80 </table>
+ 		<table name="#mpConsumes"> 140 151 170 181 </table>
+ 		<set name="icon" val="icon.skill11520" />
+		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalType" val="MELODY_GUITAR" />
+		<set name="abnormalTime" val="1800" />
+		<set name="affectRange" val="1000" />
+ 		<set name="operateType" val="A2" />
+		<set name="targetType" val="PARTY" />
+ 		<set name="mpConsume" val="#mpConsumes" />
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="#magicLvl" />
+		<set name="reuseDelay" val="3000" />
+		<set name="rideState" val="NONE" />
+		<for>
+			<effect name="Buff">
+				<mul stat="rCrit" val="#rCrit" />
+				<mul stat="cAtk" val="#cAtk" />
+				<add stat="mCritRate" val="#mCritRate" />
+				<mul stat="MagicalMpConsumeRate" val="#magicMpConsumeRate" />
+				<mul stat="PhysicalMpConsumeRate" val="#PhysMpConsumeRate" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="CRITICAL_DMG_UP;CRITICAL_PROB_UP;MAGIC_CRITICAL_UP;CHEAP_MAGIC;IMPROVE_HIT_DEFENCE_CRT_RATE_UP;IMPROVE_CRT_RATE_DMG_UP" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="CRITICAL_DMG_UP;CRITICAL_PROB_UP;MAGIC_CRITICAL_UP;CHEAP_MAGIC;IMPROVE_HIT_DEFENCE_CRT_RATE_UP;IMPROVE_CRT_RATE_DMG_UP" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="11521" levels="4" name="Harp Melody">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- For 30 minutes, party members' P. Accuracy + 5, P. and M. Evasion + 5, Speed + 34 and received Critical Damage - 30%. -->
-		<table name="#mpConsumes"> 140 151 170 181 </table>
-		<set name="icon" val="icon.skill11521" />
-		<set name="operateType" val="A2" />
-		<set name="targetType" val="SELF" />
-		<set name="mpConsume" val="#mpConsumes" />
-		<set name="hitTime" val="700" />
-		<set name="coolTime" val="300" />
-		<set name="reuseDelay" val="2000" />
+ 		<!-- For 30 minutes, party members' P. Accuracy + 5, P. and M. Evasion + 5, Speed + 34 and received Critical Damage - 30%. -->
+		<table name="#abnormalLvls"> 1 2 3 4 </table>
+		<table name="#magicLvl"> 85 90 95 99 </table>
+		<table name="#accCombat"> 5 6 7 8 </table>
+		<table name="#rEvas"> 5 6 7 8 </table>
+		<table name="#mEvas"> 5 6 7 8 </table>
+		<table name="#runSpd"> 34 35 36 37 </table>
+		<table name="#defCritDamage"> 1.30 1.30 1.30 1.30 </table>
+ 		<table name="#mpConsumes"> 140 151 170 181 </table>
+ 		<set name="icon" val="icon.skill11521" />
+		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalType" val="MELODY_GUITAR" />
+		<set name="abnormalTime" val="1800" />
+		<set name="affectRange" val="1000" />
+ 		<set name="operateType" val="A2" />
+		<set name="targetType" val="PARTY" />
+ 		<set name="mpConsume" val="#mpConsumes" />
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="#magicLvl" />
+		<set name="reuseDelay" val="3000" />
+		<set name="rideState" val="NONE" />
+		<for>
+			<effect name="Buff">
+				<add stat="accCombat" val="#accCombat" />
+				<add stat="rEvas" val="#rEvas" />
+				<add stat="mEvas" val="#mEvas" />
+				<add stat="runSpd" val="#runSpd" />
+				<mul stat="defCritDamage" val="#defCritDamage" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="AVOID_UP;HIT_UP;SPEED_UP;CRITICAL_DMG_DOWN;IMPROVE_SPEED_AVOID_UP;IMPROVE_VAMPIRIC_HASTE" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="AVOID_UP;HIT_UP;SPEED_UP;CRITICAL_DMG_DOWN;IMPROVE_SPEED_AVOID_UP;IMPROVE_VAMPIRIC_HASTE" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="11522" levels="4" name="Lute Melody">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- For 30 minutes, party members' Atk. Spd. + 34% and Casting Spd. + 31%. Also has a chance of triggering a 9% Vampiric Rage effect during a normal attack. -->
-		<table name="#mpConsumes"> 140 151 170 181 </table>
-		<set name="icon" val="icon.skill11518" />
-		<set name="operateType" val="A2" />
-		<set name="targetType" val="SELF" />
-		<set name="mpConsume" val="#mpConsumes" />
-		<set name="hitTime" val="700" />
-		<set name="coolTime" val="300" />
-		<set name="reuseDelay" val="2000" />
+ 		<!-- For 30 minutes, party members' Atk. Spd. + 34% and Casting Spd. + 31%. Also has a chance of triggering a 9% Vampiric Rage effect during a normal attack. -->
+		<table name="#abnormalLvls"> 1 2 3 4 </table>
+		<table name="#magicLvl"> 85 90 95 99 </table>
+		<table name="#pAtkSpd"> 1.34 1.35 1.36 1.37 </table>
+		<table name="#mAtkSpd"> 1.31 1.32 1.33 1.34 </table>
+		<table name="#absorbDam"> 9 9 9 9 </table>
+ 		<table name="#mpConsumes"> 140 151 170 181 </table>
+ 		<set name="icon" val="icon.skill11518" />
+		<set name="abnormalLvl" val="#abnormalLvls" />
+		<set name="abnormalType" val="MELODY_GUITAR" />
+		<set name="abnormalTime" val="1800" />
+		<set name="affectRange" val="1000" />
+ 		<set name="operateType" val="A2" />
+		<set name="targetType" val="PARTY" />
+ 		<set name="mpConsume" val="#mpConsumes" />
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="#magicLvl" />
+		<set name="reuseDelay" val="3000" />
+		<set name="rideState" val="NONE" />
+		<for>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="1.34" />
+				<mul stat="mAtkSpd" val="1.31" />
+				<add stat="absorbDam" val="9" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="ATTACK_TIME_DOWN;CASTING_TIME_DOWN;VAMPIRIC_ATTACK;IMPROVE_VAMPIRIC_HASTE" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param dispel="ATTACK_TIME_DOWN;CASTING_TIME_DOWN;VAMPIRIC_ATTACK;IMPROVE_VAMPIRIC_HASTE" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="11523" levels="1" name="Knight's Harmony">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- For 30 minutes, the selected party member's P. Atk. + 12%, P. Critical Damage + 35%, P. Critical Rate + 100%, P. Def. + 45%, Shield Defense Rate + 30% and Shield Defense + 50%. -->
-		<set name="icon" val="icon.skill11523" />
-		<set name="operateType" val="A2" />
-		<set name="targetType" val="SELF" />
-		<set name="mpConsume" val="140" />
-		<set name="castRange" val="900" />
-		<set name="hitTime" val="700" />
-		<set name="coolTime" val="300" />
-		<set name="reuseDelay" val="2000" />
+ 		<!-- For 30 minutes, the selected party member's P. Atk. + 12%, P. Critical Damage + 35%, P. Critical Rate + 100%, P. Def. + 45%, Shield Defense Rate + 30% and Shield Defense + 50%. -->
+ 		<set name="icon" val="icon.skill11523" />
+ 		<set name="operateType" val="A2" />
+		<set name="targetType" val="PARTY_MEMBER" />
+		<set name="castRange" val="400" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalTime" val="1800" />
+		<set name="abnormalType" val="HARMONY" />
+ 		<set name="mpConsume" val="140" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill-->
+		<set name="magicLvl" val="1" />
+		<set name="rideState" val="NONE" />
+		<for>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.12" />
+				<mul stat="pDef" val="1.45" />
+				<mul stat="rShld" val="1.30" />
+				<mul stat="sDef" val="1.50" />
+				<mul stat="cAtk" val="1.35" />
+				<mul stat="rCrit" val="2.00" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="PA_UP;PD_UP;SHIELD_DEFENCE_UP;SHIELD_PROB_UP;CRITICAL_DMG_UP;CRITICAL_PROB_UP;IMPROVE_PA_PD_UP;IMPROVE_CRT_RATE_DMG_UP;IMPROVE_SHIELD_RATE_DEFENCE_UP" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="PA_UP;PD_UP;SHIELD_DEFENCE_UP;SHIELD_PROB_UP;CRITICAL_DMG_UP;CRITICAL_PROB_UP;IMPROVE_PA_PD_UP;IMPROVE_CRT_RATE_DMG_UP;IMPROVE_SHIELD_RATE_DEFENCE_UP" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="11524" levels="1" name="Warrior's Harmony">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- For 30 minutes, the selected party member's P. Atk. + 35%, P. Critical Damage + 35%, P. Critical Rate + 100%, Atk. Spd. + 8%, M. Atk. + 16%, Casting Spd. + 8% and Speed + 8. -->
-		<set name="icon" val="icon.skill11524" />
-		<set name="operateType" val="A2" />
-		<set name="targetType" val="SELF" />
-		<set name="mpConsume" val="140" />
-		<set name="castRange" val="900" />
-		<set name="hitTime" val="700" />
-		<set name="coolTime" val="300" />
-		<set name="reuseDelay" val="2000" />
+ 		<!-- For 30 minutes, the selected party member's P. Atk. + 35%, P. Critical Damage + 35%, P. Critical Rate + 100%, Atk. Spd. + 8%, M. Atk. + 16%, Casting Spd. + 8% and Speed + 8. -->
+ 		<set name="icon" val="icon.skill11524" />
+ 		<set name="operateType" val="A2" />
+		<set name="targetType" val="PARTY_MEMBER" />
+		<set name="castRange" val="400" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalTime" val="1800" />
+		<set name="abnormalType" val="HARMONY" />
+ 		<set name="mpConsume" val="140" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill-->
+		<set name="magicLvl" val="1" />
+		<set name="rideState" val="NONE" />
+		<for>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.35" />
+				<mul stat="cAtk" val="1.35" />
+				<mul stat="rCrit" val="2.00" />
+				<mul stat="pAtkSpd" val="1.08" />
+				<mul stat="mAtk" val="1.16" />
+				<mul stat="mAtkSpd" val="1.08" />
+				<add stat="runSpd" val="8" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="PA_UP;PD_UP;CRITICAL_DMG_UP;CRITICAL_PROB_UP;ATTACK_TIME_DOWN;MA_UP;CASTING_TIME_DOWN;SPEED_UP" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="PA_UP;PD_UP;CRITICAL_DMG_UP;CRITICAL_PROB_UP;ATTACK_TIME_DOWN;MA_UP;CASTING_TIME_DOWN;SPEED_UP" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="11525" levels="1" name="Wizard's Harmony">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- For 30 minutes, the selected party member's M. Atk. + 40%, M. Critical Rate + 100%, Casting Spd. + 8%, P. Atk. + 8%, Atk. Spd. + 8%, Speed + 8, M. Def. + 14%, MP Recovery Bonus + 20%, MP Consumption for magic skills - 15% and physical skills -5%, and Cooldown - 20%. -->
-		<set name="icon" val="icon.skill11525" />
-		<set name="operateType" val="A2" />
-		<set name="targetType" val="SELF" />
-		<set name="mpConsume" val="140" />
-		<set name="castRange" val="900" />
-		<set name="hitTime" val="700" />
-		<set name="coolTime" val="300" />
-		<set name="reuseDelay" val="2000" />
+ 		<!-- For 30 minutes, the selected party member's M. Atk. + 40%, M. Critical Rate + 100%, Casting Spd. + 8%, P. Atk. + 8%, Atk. Spd. + 8%, Speed + 8, M. Def. + 14%, MP Recovery Bonus + 20%, MP Consumption for magic skills - 15% and physical skills -5%, and Cooldown - 20%. -->
+ 		<set name="icon" val="icon.skill11525" />
+ 		<set name="operateType" val="A2" />
+		<set name="targetType" val="PARTY_MEMBER" />
+		<set name="castRange" val="400" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalTime" val="1800" />
+		<set name="abnormalType" val="HARMONY" />
+ 		<set name="mpConsume" val="140" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill-->
+		<set name="magicLvl" val="1" />
+		<set name="rideState" val="NONE" />
+		<for>
+			<effect name="Buff">
+				<mul stat="mAtk" val="1.40" />
+				<mul stat="pAtk" val="1.08" />
+				<mul stat="mAtkSpd" val="1.08" />
+				<mul stat="pAtkSpd" val="1.08" />
+				<mul stat="mDef" val="1.14" />
+				<mul stat="mCritRate" val="2.00" />
+				<mul stat="regMp" val="1.20" />
+				<mul stat="runSpd" val="1.08" />
+				<mul stat="MagicalMpConsumeRate" val="0.85" />
+				<mul stat="PhysicalMpConsumeRate" val="0.95" />
+				<mul stat="mReuse" val="0.80" />
+				<mul stat="pReuse" val="0.80" />
+				<mul stat="dReuse" val="0.80" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="MA_UP;PA_UP;CASTING_TIME_DOWN;ATTACK_TIME_DOWN;MD_UP;MAGIC_CRITICAL_UP;MP_REGEN_UP;SPEED_UP;MP_COST_DOWN;REUSE_DELAY_DOWN" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="MA_UP;PA_UP;CASTING_TIME_DOWN;ATTACK_TIME_DOWN;MD_UP;MAGIC_CRITICAL_UP;MP_REGEN_UP;SPEED_UP;MP_COST_DOWN;REUSE_DELAY_DOWN" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="11526" levels="1" name="Superior Sword/Blunt Weapon Mastery">
 		<!-- AUTO GENERATED SKILL -->
@@ -282,37 +516,97 @@
 		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="11529" levels="1" name="Prevailing Sonata">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- Increases party members' Atk. Spd. by 15%, Casting Spd. by 30%, Max HP by 30%, MP recovery bonus by 20% and decreases MP Consumption for magic skill by 10% and the magic cancel rate for 5 minutes. -->
-		<set name="icon" val="icon.skill11529" />
-		<set name="operateType" val="A2" />
-		<set name="targetType" val="SELF" />
-		<set name="mpConsume" val="140" />
-		<set name="hitTime" val="700" />
-		<set name="coolTime" val="300" />
-		<set name="reuseDelay" val="2000" />
+ 		<!-- Increases party members' Atk. Spd. by 15%, Casting Spd. by 30%, Max HP by 30%, MP recovery bonus by 20% and decreases MP Consumption for magic skill by 10% and the magic cancel rate for 5 minutes. -->
+ 		<set name="icon" val="icon.skill11529" />
+ 		<set name="operateType" val="A2" />
+		<set name="targetType" val="PARTY" />
+		<set name="affectRange" val="1000" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalType" val="PREV_SONATA" />
+		<set name="abnormalTime" val="300" />
+ 		<set name="mpConsume" val="140" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill-->
+		<set name="magicLvl" val="1" />
+		<set name="rideState" val="NONE" />
+		<for>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="1.15" />
+				<mul stat="mAtkSpd" val="1.30" />
+				<mul stat="maxHp" val="1.30" />
+				<mul stat="regMp" val="1.20" />
+				<mul stat="MagicalMpConsumeRate" val="0.90" />
+				<sub stat="cancel" val="50" /> <!-- Guess -->
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="ATTACK_TIME_DOWN;CASTING_TIME_DOWN;MAX_HP_UP;MP_REGEN_UP;MP_COST_DOWN" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="ATTACK_TIME_DOWN;CASTING_TIME_DOWN;MAX_HP_UP;MP_REGEN_UP;MP_COST_DOWN" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="11530" levels="1" name="Daring Sonata">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- Increases party members' P. Atk. by 8%, M. Atk. by 16%, Atk. Spd. and Casting Spd. by 8% and decreases P. Def. by 3%, M. Def. by 11% and P. Evasion by 4 for 5 minutes. Also bestows an 8% Vampiric Rage effect and a chance of reflecting 10% of the damage received. -->
-		<set name="icon" val="icon.skill11530" />
-		<set name="operateType" val="A2" />
-		<set name="targetType" val="SELF" />
-		<set name="mpConsume" val="140" />
-		<set name="hitTime" val="700" />
-		<set name="coolTime" val="300" />
-		<set name="reuseDelay" val="2000" />
+ 		<!-- Increases party members' P. Atk. by 8%, M. Atk. by 16%, Atk. Spd. and Casting Spd. by 8% and decreases P. Def. by 3%, M. Def. by 11% and P. Evasion by 4 for 5 minutes. Also bestows an 8% Vampiric Rage effect and a chance of reflecting 10% of the damage received. -->
+ 		<set name="icon" val="icon.skill11530" />
+ 		<set name="operateType" val="A2" />
+		<set name="targetType" val="PARTY" />
+		<set name="affectRange" val="1000" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalType" val="DARING_SONATA" />
+		<set name="abnormalTime" val="300" />
+ 		<set name="mpConsume" val="140" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill-->
+		<set name="magicLvl" val="1" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<for>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.08" />
+				<mul stat="mAtk" val="1.16" />
+				<mul stat="pAtkSpd" val="1.08" />
+				<mul stat="mAtkSpd" val="1.08" />
+				<mul stat="pDef" val="0.97" />
+				<mul stat="mDef" val="0.97" />
+				<sub stat="rEvas" val="4" />
+				<add stat="absorbDam" val="8" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="PA_UP;MA_UP;ATTACK_TIME_DOWN;CASTING_TIME_DOWN;PD_UP;MD_UP;AVOID_UP;VAMPIRIC_ATTACK" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="PA_UP;MA_UP;ATTACK_TIME_DOWN;CASTING_TIME_DOWN;PD_UP;MD_UP;AVOID_UP;VAMPIRIC_ATTACK" />
+			</effect>
+	</for>
 	</skill>
 	<skill id="11532" levels="1" name="Refreshing Sonata">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- Increases party members' HP Recovery Bonus by 20%, P.ﾠAccuracy by 4, P.ﾠEvasion by 3, Speed by 20, and decreases MP Consumption for skills by 20% and skill Cooldown by 10% for 5 minutes. -->
-		<set name="icon" val="icon.skill11532" />
-		<set name="operateType" val="A2" />
-		<set name="targetType" val="SELF" />
-		<set name="mpConsume" val="140" />
-		<set name="hitTime" val="700" />
-		<set name="coolTime" val="300" />
-		<set name="reuseDelay" val="2000" />
+ 		<!-- Increases party members' HP Recovery Bonus by 20%, P.οΎ Accuracy by 4, P.οΎ Evasion by 3, Speed by 20, and decreases MP Consumption for skills by 20% and skill Cooldown by 10% for 5 minutes. -->
+ 		<set name="icon" val="icon.skill11532" />
+ 		<set name="operateType" val="A2" />
+		<set name="targetType" val="PARTY" />
+		<set name="affectRange" val="1000" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalType" val="REF_SONATA" />
+		<set name="abnormalTime" val="300" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill-->
+		<set name="magicLvl" val="1" />
+		<set name="rideState" val="NONE" />
+		<for>
+			<effect name="Buff">
+				<mul stat="regHp" val="1.20" />
+				<add stat="accCombat" val="4" />
+				<add stat="rEvas" val="3" />
+				<add stat="runSpd" val="20" />
+				<mul stat="PhysicalMpConsumeRate" val="0.80" />
+				<mul stat="MagicalMpConsumeRate" val="0.80" />
+				<mul stat="mReuse" val="0.90" />
+				<mul stat="pReuse" val="0.90" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="HP_REGEN_UP;HIT_UP;AVOID_UP;SPEED_UP;MP_COST_DOWN;REUSE_DELAY_DOWN" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="HP_REGEN_UP;HIT_UP;AVOID_UP;SPEED_UP;MP_COST_DOWN;REUSE_DELAY_DOWN" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="11533" levels="1" name="Blood Requiem">
 		<!-- AUTO GENERATED SKILL -->
@@ -675,13 +969,24 @@
 		<set name="reuseDelay" val="2000" />
 	</skill>
 	<skill id="11569" levels="1" name="Critical Damage Increase">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- Critical Damage is greatly increased through Poem of Drum. -->
-		<set name="icon" val="icon.skill1542" />
-		<set name="operateType" val="A2" />
+ 		<!-- Critical Damage is greatly increased through Poem of Drum. -->
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalTime" val="8" />
+		<set name="abnormalType" val="COUNTER_CRITICAL_TRIGGER" />
+ 		<set name="icon" val="icon.skill1542" />
+		<set name="isTriggeredSkill" val="true" />
+		<set name="magicLvl" val="99" />
+ 		<set name="operateType" val="A2" />
+ 		<set name="reuseDelay" val="15000" />
+		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
-		<set name="reuseDelay" val="15000" />
-		<set name="isMagic" val="4" />
+		<for>
+			<effect name="Buff">
+				<mul stat="cAtk" val="2.0"> <!-- GUESS: From testing it's looking more like 120% increase to critical damage. More testing on live server is needed to confirm this -->
+					<using kind="SWORD,BLUNT,DAGGER,DUALDAGGER,DUAL,DUALFIST,POLE,ANCIENTSWORD,RAPIER,BOW,CROSSBOW" />
+				</mul>
+			</effect>
+		</for>
 	</skill>
 	<skill id="11570" levels="1" name="Healing Melody">
 		<!-- AUTO GENERATED SKILL -->
diff --git a/trunk/dist/game/data/stats/skills/15600-15699.xml b/trunk/dist/game/data/stats/skills/15600-15699.xml
index b928cde732..b148165709 100644
--- a/trunk/dist/game/data/stats/skills/15600-15699.xml
+++ b/trunk/dist/game/data/stats/skills/15600-15699.xml
@@ -400,143 +400,235 @@
 		<set name="targetType" val="SELF" />
 		<set name="isDebuff" val="true" />
 	</skill>
-	<skill id="15642" levels="1" name="Horn Melody (Adventurer)">
-		<!-- AUTO GENERATED SKILL -->
+		<skill id="15642" levels="1" name="Horn Melody (Adventurer)">
 		<!-- For 60 min., P. Atk. + 17%, P. Def. + 15%, M. Atk. + 79%, and M. Def. + 30%. -->
-		<set name="abnormalTime" val="3600" />
-		<set name="icon" val="icon.skill15642" />
+		<set name="icon" val="icon.skill11517" />
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<set name="castRange" val="400" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalType" val="MELODY_HORN" />
+		<set name="abnormalTime" val="3600" />
+		<set name="effectRange" val="900" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill-->
+		<set name="magicLvl" val="1" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<for>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.17" />
 				<mul stat="pDef" val="1.15" />
-				<add stat="mAtk" val="79" />
-				<mul stat="mDef" val="1.30" />
+				<mul stat="mAtk" val="1.79" />
+				<mul stat="mDef" val="1.3" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="PA_UP;PD_UP;MA_UP;MD_UP;IMPROVE_MA_MD_UP;IMPROVE_PA_PD_UP" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="PA_UP;PD_UP;MA_UP;MD_UP;IMPROVE_MA_MD_UP;IMPROVE_PA_PD_UP" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="15643" levels="1" name="Drum Melody (Adventurer)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 60 min., Max MP + 20%, HP Recovery Bonus + 20%, M. Critical Rate + 20, Critical Damage in standard attack + 20%, P. Atk. + 10%, P. Def. + 20%, Atk. Spd. + 20%, M. Atk./ Def. + 20%, Casting Spd. + 20%, and Debuff Resistance + 10%. Received Critical Damage - 30%, and Speed - 15%. Party members equipped with melee weapons/bows/crossbows have increased Critical Damage after receiving an amount of damage. -->
-		<set name="abnormalTime" val="3600" />
-		<set name="icon" val="icon.skill15643" />
+		<set name="icon" val="icon.skill11522" />
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<set name="castRange" val="400" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalType" val="MELODY_DRUM" />
+		<set name="abnormalTime" val="3600" />
+		<set name="effectRange" val="900" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill-->
+		<set name="magicLvl" val="1" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<for>
 			<effect name="Buff">
-				<mul stat="regMp" val="1.20" />
-				<mul stat="regHp" val="1.20" />
+				<mul stat="maxMp" val="1.2" />
+				<mul stat="regHp" val="1.2" />
 				<add stat="mCritRate" val="20" />
-				<mul stat="rCrit" val="1.20" />
-				<mul stat="pAtk" val="1.10" />
-				<mul stat="pDef" val="1.20" />
-				<mul stat="pAtkSpd" val="1.20" />
-				<mul stat="mAtk" val="1.20" />
-				<mul stat="mDef" val="1.20" />
-				<mul stat="mAtkSpd" val="1.20" />
-				<mul stat="debuffVuln" val="1.10" />
+				<mul stat="cAtk" 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" />
+				<mul stat="runSpd" val="0.85" />
+				<mul stat="debuffVuln" val="1.2" />
+				<mul stat="defCritDamage" val="1.3" />
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param isCritical="true" />
+				<param minDamage="300" chance="15" /> <!-- Guess: Could be bewteen 15% to 25% chance -->
+				<param skillId="11569" skillLevel="1" /> <!-- Critical Damage Increase -->
+				<param targetType="SELF" />
+				<param allowWeapons="SWORD,BLUNT,DAGGER,DUALDAGGER,DUAL,DUALFIST,POLE,ANCIENTSWORD,RAPIER,BOW,CROSSBOW" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="MAX_MP_UP;HP_REGEN_UP;MAGIC_CRITICAL_UP;PA_UP;PD_UP;ATTACK_TIME_DOWN;MA_UP;MD_UP;CASTING_TIME_DOWN;SPEED_UP;IMPROVE_MA_MD_UP;IMPROVE_PA_PD_UP" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="MAX_MP_UP;HP_REGEN_UP;MAGIC_CRITICAL_UP;PA_UP;PD_UP;ATTACK_TIME_DOWN;MA_UP;MD_UP;CASTING_TIME_DOWN;SPEED_UP;IMPROVE_MA_MD_UP;IMPROVE_PA_PD_UP" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="15644" levels="1" name="Pipe Organ Melody (Adventurer)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 60 min., Max HP/MP/CP + 37%, and HP Recovery Bonus + 20%. -->
-		<set name="abnormalTime" val="3600" />
 		<set name="icon" val="icon.skill11519" />
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<set name="castRange" val="400" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalType" val="MELODY_PIPE" />
+		<set name="abnormalTime" val="3600" />
+		<set name="effectRange" val="900" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill-->
+		<set name="magicLvl" val="1" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<for>
 			<effect name="Buff">
 				<mul stat="maxHp" val="1.37" />
-				<mul stat="maxMp" val="1.17" />
+				<mul stat="maxMp" val="1.37" />
 				<mul stat="maxCp" val="1.37" />
-				<mul stat="regHp" val="1.20" />
+				<mul stat="regHp" val="1.2" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="MAX_HP_UP;MAX_MP_UP;HP_REGEN_UP;IMPROVE_HP_MP_UP" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="MAX_HP_UP;MAX_MP_UP;HP_REGEN_UP;IMPROVE_HP_MP_UP" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="15645" levels="1" name="Guitar Melody (Adventurer)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 60 min., P. Critical Rate + 32%, P. Critical Damage + 35%, and M. Critical Rate + 20. M. Skill MP Consumption - 10%, and Iss Enchanter's Enchant Skill MP Consumption - 20%. -->
-		<set name="abnormalTime" val="3600" />
+		<!-- TODO: Iss Enchanter's Enchant Skill MP Consumption - 20% Effect on skill -->
 		<set name="icon" val="icon.skill11520" />
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<set name="castRange" val="400" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalType" val="MELODY_GUITAR" />
+		<set name="abnormalTime" val="3600" />
+		<set name="effectRange" val="900" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill-->
+		<set name="magicLvl" val="1" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<for>
 			<effect name="Buff">
 				<mul stat="rCrit" val="1.32" />
 				<mul stat="cAtk" val="1.35" />
 				<add stat="mCritRate" val="20" />
-				<mul stat="PhysicalMpConsumeRate" val="0.80" />
-				<mul stat="MagicalMpConsumeRate" val="0.90" />
+				<mul stat="MagicalMpConsumeRate" val="1.1" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="CRITICAL_DMG_UP;CRITICAL_PROB_UP;MAGIC_CRITICAL_UP;CHEAP_MAGIC;IMPROVE_HIT_DEFENCE_CRT_RATE_UP;IMPROVE_CRT_RATE_DMG_UP" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="CRITICAL_DMG_UP;CRITICAL_PROB_UP;MAGIC_CRITICAL_UP;CHEAP_MAGIC;IMPROVE_HIT_DEFENCE_CRT_RATE_UP;IMPROVE_CRT_RATE_DMG_UP" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="15646" levels="1" name="Harp Melody (Adventurer)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 60 min., P. Accuracy + 5, P./M. Evasion + 5, and Speed + 34. Received Critical Damage - 30%. -->
-		<set name="abnormalTime" val="3600" />
 		<set name="icon" val="icon.skill11521" />
 		<set name="operateType" val="A2" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="ONE" />
 		<set name="castRange" val="400" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalType" val="MELODY_HARP" />
+		<set name="abnormalTime" val="3600" />
+		<set name="effectRange" val="900" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill-->
+		<set name="magicLvl" val="1" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<for>
 			<effect name="Buff">
 				<add stat="accCombat" val="5" />
 				<add stat="rEvas" val="5" />
 				<add stat="mEvas" val="5" />
-				<mul stat="defCritDamage" val="0.70" />
 				<add stat="runSpd" val="34" />
+				<mul stat="defCritDamage" val="1.3" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="AVOID_UP;HIT_UP;SPEED_UP;CRITICAL_DMG_DOWN;IMPROVE_SPEED_AVOID_UP;IMPROVE_VAMPIRIC_HASTE" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="AVOID_UP;HIT_UP;SPEED_UP;CRITICAL_DMG_DOWN;IMPROVE_SPEED_AVOID_UP;IMPROVE_VAMPIRIC_HASTE" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="15647" levels="1" name="Lute Melody (Adventurer)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 60 min., Atk. Spd. + 34%, Casting Spd. + 31%, and has a chance of applying 9% Vampiric Rage. -->
-		<set name="abnormalTime" val="3600" />
 		<set name="icon" val="icon.skill11518" />
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<set name="castRange" val="400" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalType" val="MELODY_LUTE" />
+		<set name="abnormalTime" val="3600" />
+		<set name="effectRange" val="900" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill-->
+		<set name="magicLvl" val="1" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<for>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="1.34" />
 				<mul stat="mAtkSpd" val="1.31" />
-				<mul stat="absorbDam" val="0.09" />
+				<add stat="absorbDam" val="9" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="ATTACK_TIME_DOWN;CASTING_TIME_DOWN;VAMPIRIC_ATTACK;IMPROVE_VAMPIRIC_HASTE" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param dispel="ATTACK_TIME_DOWN;CASTING_TIME_DOWN;VAMPIRIC_ATTACK;IMPROVE_VAMPIRIC_HASTE" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="15648" levels="1" name="Knight's Harmony (Adventurer)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 60 min., P. Atk. + 12%, P. Critical Damage + 35%, P. Critical Rate + 100%, P. Def. + 45%, Shield Defense Rate + 30%, and Shield Defense + 50%. -->
-		<set name="abnormalTime" val="3600" />
 		<set name="icon" val="icon.skill11523" />
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<set name="castRange" val="400" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalTime" val="3600" />
+		<set name="abnormalType" val="HARMONY" />
+		<set name="effectRange" val="900" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill-->
+		<set name="magicLvl" val="1" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<for>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.12" />
 				<mul stat="pDef" val="1.45" />
+				<mul stat="rShld" val="1.3" />
+				<mul stat="sDef" val="1.5" />
 				<mul stat="cAtk" val="1.35" />
 				<mul stat="rCrit" val="2.0" />
-				<mul stat="rShld" val="1.30" />
-				<mul stat="sDef" val="1.50" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="PA_UP;PD_UP;SHIELD_DEFENCE_UP;SHIELD_PROB_UP;CRITICAL_DMG_UP;CRITICAL_PROB_UP;IMPROVE_PA_PD_UP;IMPROVE_CRT_RATE_DMG_UP;IMPROVE_SHIELD_RATE_DEFENCE_UP" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="PA_UP;PD_UP;SHIELD_DEFENCE_UP;SHIELD_PROB_UP;CRITICAL_DMG_UP;CRITICAL_PROB_UP;IMPROVE_PA_PD_UP;IMPROVE_CRT_RATE_DMG_UP;IMPROVE_SHIELD_RATE_DEFENCE_UP" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="15649" levels="1" name="Warrior's Harmony (Adventurer)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 60 min., P. Atk. + 35%, P. Critical Damage + 35%, P. Critical Rate + 100%, Atk. Spd. + 8%, M. Atk. + 16%, Casting Spd. + 8%, and Speed + 8. -->
-		<set name="abnormalTime" val="3600" />
 		<set name="icon" val="icon.skill11524" />
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<set name="castRange" val="400" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalTime" val="3600" />
+		<set name="abnormalType" val="HARMONY" />
+		<set name="effectRange" val="900" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill-->
+		<set name="magicLvl" val="1" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<for>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.35" />
@@ -547,89 +639,143 @@
 				<mul stat="mAtkSpd" val="1.08" />
 				<add stat="runSpd" val="8" />
 			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="PA_UP;PD_UP;CRITICAL_DMG_UP;CRITICAL_PROB_UP;ATTACK_TIME_DOWN;MA_UP;CASTING_TIME_DOWN;SPEED_UP" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="PA_UP;PD_UP;CRITICAL_DMG_UP;CRITICAL_PROB_UP;ATTACK_TIME_DOWN;MA_UP;CASTING_TIME_DOWN;SPEED_UP" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="15650" levels="1" name="Wizard's Harmony (Adventurer)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 60 min., M. Atk. + 40%, M. Critical Rate + 100%, Casting Spd. + 8%, P. Atk. + 8%, Atk. Spd. + 8%, Speed + 8, M. Def. + 14%, and MP Recovery Bonus + 20%. M. Skill MP Consumption - 15%, P. Skill MP Consumption - 5%, and Skill Cooldown - 20%. -->
-		<set name="abnormalTime" val="3600" />
 		<set name="icon" val="icon.skill11525" />
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<set name="castRange" val="400" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalTime" val="3600" />
+		<set name="abnormalType" val="HARMONY" />
+		<set name="effectRange" val="900" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill-->
+		<set name="magicLvl" val="1" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<for>
 			<effect name="Buff">
 				<mul stat="mAtk" val="1.40" />
-				<mul stat="mCritRate" val="2.0" />
+				<mul stat="pAtk" val="1.08" />
 				<mul stat="mAtkSpd" val="1.08" />
 				<mul stat="pAtkSpd" val="1.08" />
 				<mul stat="mDef" val="1.14" />
-				<mul stat="pAtkSpd" val="1.08" />
-				<add stat="runSpd" val="8" />
+				<mul stat="mCritRate" val="2.0" />
 				<mul stat="regMp" val="1.20" />
+				<mul stat="runSpd" val="1.08" />
 				<mul stat="MagicalMpConsumeRate" val="0.85" />
 				<mul stat="PhysicalMpConsumeRate" val="0.95" />
-				<mul stat="mReuse" val="0.80" />
+				<mul stat="mReuse" val="0.8" />
+				<mul stat="pReuse" val="0.8" />
+				<mul stat="dReuse" val="0.8" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="MA_UP;PA_UP;CASTING_TIME_DOWN;ATTACK_TIME_DOWN;MD_UP;MAGIC_CRITICAL_UP;MP_REGEN_UP;SPEED_UP;MP_COST_DOWN;REUSE_DELAY_DOWN" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="MA_UP;PA_UP;CASTING_TIME_DOWN;ATTACK_TIME_DOWN;MD_UP;MAGIC_CRITICAL_UP;MP_REGEN_UP;SPEED_UP;MP_COST_DOWN;REUSE_DELAY_DOWN" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="15651" levels="1" name="Prevailing Sonata (Adventurer)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 60 min., Atk. Spd. + 10%, Casting Spd. + 20%, Max HP + 20%, and MP Recovery Bonus + 10%. M. Skill MP Consumption - 5%, and decreases chance of cancellation while casting. -->
-		<set name="abnormalTime" val="3600" />
 		<set name="icon" val="icon.skill11529" />
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<set name="castRange" val="400" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalType" val="PREV_SONATA" />
+		<set name="abnormalTime" val="3600" />
+		<set name="effectRange" val="900" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill-->
+		<set name="magicLvl" val="1" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<for>
 			<effect name="Buff">
 				<mul stat="pAtkSpd" val="1.10" />
-				<mul stat="mAtkSpd" val="1.08" />
+				<mul stat="mAtkSpd" val="1.20" />
 				<mul stat="maxHp" val="1.20" />
 				<mul stat="regMp" val="1.10" />
-				<mul stat="MagicalMpConsumeRate" val="0.85" />
-				<mul stat="cancelVuln" val="1.02" />
+				<mul stat="MagicalMpConsumeRate" val="0.95" />
+				<sub stat="cancel" val="50" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="ATTACK_TIME_DOWN;CASTING_TIME_DOWN;MAX_HP_UP;MP_REGEN_UP;MP_COST_DOWN" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="ATTACK_TIME_DOWN;CASTING_TIME_DOWN;MAX_HP_UP;MP_REGEN_UP;MP_COST_DOWN" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="15652" levels="1" name="Daring Sonata (Adventurer)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 60 min., P. Atk. + 5%, M. Atk. + 10%, and Atk./Casting Spd. + 5%. P. Def./M. Def. - 4%, and P. Evasion - 4. Has a chance of applying 5% Vampiric Rage, and reflects 10% of received damage back to enemy. -->
-		<set name="abnormalTime" val="3600" />
 		<set name="icon" val="icon.skill11530" />
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<set name="castRange" val="400" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalType" val="DARING_SONATA" />
+		<set name="abnormalTime" val="3600" />
+		<set name="effectRange" val="900" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill-->
+		<set name="magicLvl" val="1" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<for>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.05" />
-				<mul stat="mAtk" val="1.10" />
+				<mul stat="mAtk" val="1.1" />
 				<mul stat="pAtkSpd" val="1.05" />
 				<mul stat="mAtkSpd" val="1.05" />
 				<mul stat="pDef" val="0.96" />
 				<mul stat="mDef" val="0.96" />
-				<mul stat="rEvas" val="0.96" />
-				<mul stat="absorbDam" val="0.09" />
-				<mul stat="reflectDam" val="1.10" />
+				<sub stat="rEvas" val="4" />
+				<add stat="absorbDam" val="5" />
+				<add stat="reflectDam" val="10" />
 			</effect>
-		</for>
+			<effect name="DispelBySlotProbability">
+				<param dispel="PA_UP;MA_UP;ATTACK_TIME_DOWN;CASTING_TIME_DOWN;PD_UP;MD_UP;AVOID_UP;VAMPIRIC_ATTACK" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="PA_UP;MA_UP;ATTACK_TIME_DOWN;CASTING_TIME_DOWN;PD_UP;MD_UP;AVOID_UP;VAMPIRIC_ATTACK" />
+			</effect>
+	</for>		
 	</skill>
 	<skill id="15653" levels="1" name="Refreshing Sonata (Adventurer)">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 60 min., HP Recovery Bonus + 10%, P. Accuracy + 2, P. Evasion + 2, and Speed + 10. Skill MP Consumption - 10%, and Skill Cooldown - 5%. -->
-		<set name="abnormalTime" val="3600" />
 		<set name="icon" val="icon.skill11532" />
 		<set name="operateType" val="A2" />
 		<set name="targetType" val="ONE" />
 		<set name="castRange" val="400" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalType" val="REF_SONATA" />
+		<set name="abnormalTime" val="3600" />
+		<set name="effectRange" val="900" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill-->
+		<set name="magicLvl" val="1" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<for>
 			<effect name="Buff">
-				<mul stat="regHp" val="1.10" />
+				<mul stat="regHp" val="1.1" />
 				<add stat="accCombat" val="2" />
 				<add stat="rEvas" val="2" />
 				<add stat="runSpd" val="10" />
-				<mul stat="MagicalMpConsumeRate" val="0.90" />
-				<mul stat="PhysicalMpConsumeRate" val="0.95" />
+				<mul stat="PhysicalMpConsumeRate" val="0.9" />
+				<mul stat="MagicalMpConsumeRate" val="0.9" />
+				<mul stat="mReuse" val="0.95" />
+				<mul stat="pReuse" val="0.95" />
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<param dispel="HP_REGEN_UP;HIT_UP;AVOID_UP;SPEED_UP;MP_COST_DOWN;REUSE_DELAY_DOWN" rate="100" />
+			</effect>
+			<effect name="BlockBuffSlot">
+				<param slot="HP_REGEN_UP;HIT_UP;AVOID_UP;SPEED_UP;MP_COST_DOWN;REUSE_DELAY_DOWN" />
 			</effect>
 		</for>
 	</skill>
diff --git a/trunk/java/com/l2jserver/gameserver/model/skills/AbnormalType.java b/trunk/java/com/l2jserver/gameserver/model/skills/AbnormalType.java
index b00ec879a2..9953f412b8 100644
--- a/trunk/java/com/l2jserver/gameserver/model/skills/AbnormalType.java
+++ b/trunk/java/com/l2jserver/gameserver/model/skills/AbnormalType.java
@@ -355,7 +355,17 @@ public enum AbnormalType
 	WEAPON_MASTERY,
 	WILL,
 	WIND_DOT,
-	WP_CHANGE_EVENT;
+	WP_CHANGE_EVENT,
+	HARMONY, // Knight/Warrior/Wizard Harmony Buffs (GoD)
+	MELODY_HORN,
+	MELODY_DRUM,
+	MELODY_PIPE,
+	MELODY_GUITAR,
+	MELODY_HARP,
+	MELODY_LUTE,
+	PREV_SONATA,
+	DARING_SONATA,
+	REF_SONATA;
 	
 	/**
 	 * Get the enumerate for the given String.