From df96027bbdb660ab890407088e100ff4b75c0818 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 8 Jun 2015 15:04:28 +0000
Subject: [PATCH] -Adding Rose Essence stats skills, Rosy Seduction and Art of
 Seduction (effect not done yet). -Adding Mentor skills, fix accumulative
 buffs on Mentor buffs. -Various fixes buffs skills.

Contributed by OdairDevalier.
---
 .../game/data/stats/skills/09200-09299.xml    |  71 ++++++++----
 .../game/data/stats/skills/09300-09399.xml    | 107 +++++++++++++++---
 .../game/data/stats/skills/11500-11599.xml    |  12 +-
 .../game/data/stats/skills/11600-11699.xml    |   6 +-
 .../game/data/stats/skills/17000-17099.xml    |  77 ++++++++++++-
 .../game/data/stats/skills/23100-23199.xml    |  62 +++++++---
 6 files changed, 273 insertions(+), 62 deletions(-)

diff --git a/trunk/dist/game/data/stats/skills/09200-09299.xml b/trunk/dist/game/data/stats/skills/09200-09299.xml
index ddf9f14edc..9b6e4ccd8a 100644
--- a/trunk/dist/game/data/stats/skills/09200-09299.xml
+++ b/trunk/dist/game/data/stats/skills/09200-09299.xml
@@ -287,11 +287,11 @@
 		<set name="reuseDelay" val="2000" />
 	</skill>
 	<skill id="9227" levels="1" name="Mentor's Horn Melody">
-		<!-- Ertheia skill -->
 		<!-- Mentor's assistance. P. Atk. + 17%, P. Def. + 15%, M. Atk. + 79%, and M. Def. + 30%. Applied only when mentor is logged in. The buff lasts 5 minutes if your mentor logs out. -->
 		<set name="abnormalTime" val="-1" />
 		<set name="canBeDispeled" val="false" />
 		<set name="icon" val="icon.skill11517" />
+		<set name="abnormalType" val="MELODY_HORN" />
 		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
@@ -304,32 +304,38 @@
 				<mul stat="mAtk" val="1.79" />
 				<mul stat="mDef" val="1.30" />
 			</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="9228" levels="1" name="Mentor's Drum Melody">
-		<!-- Ertheia skill -->
 		<!-- Mentor's assistance. Max MP + 20%, HP Recovery Bonus + 20%, M. Critical Rate + 2, P. Critical Damage + 20%, P. Atk. + 10%, P. Def. + 20%, Atk. Spd. + 20%, M. Atk. + 20%, M. Def. + 20%, Casting Spd. + 20%, and Debuff Resistance + 10%. When hit with a critical attack, received damage - 30% and Speed - 15%. Increases Critical Damage during a standard attack for a member equipped with a melee weapon who receives more than a certain amount of damage. Applied only when mentor is logged in. The buff lasts 5 minutes if your mentor logs out. -->
 		<set name="abnormalTime" val="-1" />
 		<set name="canBeDispeled" val="false" />
 		<set name="icon" val="icon.skill11522" />
+		<set name="abnormalType" val="MELODY_DRUM" />
 		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="targetType" val="SELF" />
 		<set name="isMentoring" val="true" />
 		<for>
-			<effect name="TriggerSkillByAttack">
+			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
-				<param isCritical="true" />
-				<param minDamage="1" chance="80" />
-				<param skillId="6059" skillLevel="1" />
+				<param minDamage="300" />
+				<param chance="25" />
+				<param skillId="11569" skillLevel="1" /> <!-- Critical Damage Increase -->
 				<param targetType="SELF" />
 				<param allowWeapons="ALL" />
 			</effect>
 			<effect name="Buff">
 				<mul stat="maxMp" val="1.2" />
 				<mul stat="regHp" val="1.2" />
-				<add stat="mCritRate" val="20" />
+				<add stat="mCritRate" val="2" />
 				<mul stat="rCrit" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
 				<mul stat="pDef" val="1.2" />
@@ -337,18 +343,24 @@
 				<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="debuffVuln" val="1.1" />
 				<mul stat="runSpd" val="0.85" />
-				<!-- TODO: increases P. Def. upon evading a critical attack ??? -->
+				<mul stat="defCritDamage" val="1.3" />
+			</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;COUNTER_CRITICAL" 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;COUNTER_CRITICAL" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="9229" levels="1" name="Mentor's Lute Melody">
-		<!-- Ertheia skill -->
 		<!-- Mentor's assistance. Atk. Spd. + 34%, Casting Spd. + 31%, and has a chance of applying 9% Vampiric Rage effect. Applied only when mentor is logged in. The buff lasts 5 minutes if your mentor logs out. -->
 		<set name="abnormalTime" val="-1" />
 		<set name="canBeDispeled" val="false" />
 		<set name="icon" val="icon.skill11518" />
+		<set name="abnormalType" val="MELODY_LUTE" />
 		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
@@ -360,18 +372,23 @@
 				<mul stat="pAtkSpd" val="1.34" />
 				<mul stat="mAtkSpd" val="1.31" />
 			</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="9230" levels="1" name="Mentor's Pipe Organ Melody">
-		<!-- Ertheia skill -->
 		<!-- Mentor's assistance. Max HP/MP/CP + 37%, and HP Recovery Bonus + 20%. The buff lasts 5 minutes if your mentor logs out. -->
 		<set name="abnormalTime" val="-1" />
 		<set name="canBeDispeled" val="false" />
 		<set name="icon" val="icon.skill11519" />
+		<set name="abnormalType" val="MELODY_PIPE" />
 		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
-		<set name="skillType" val="BUFF" />
 		<set name="targetType" val="SELF" />
 		<set name="isMentoring" val="true" />
 		<for>
@@ -381,14 +398,20 @@
 				<mul stat="maxCp" val="1.37" />
 				<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="9231" levels="1" name="Mentor's Guitar Melody">
-		<!-- Ertheia skill -->
 		<!-- Mentor's assistance. P. Critical Rate + 32%, P. Critical Damage + 35%, and M. Critical Rate + 20. P. Skill MP Consumption - 20%, M. Skill MP Consumption - 10%, and Iss Enchanter's Enchant Skill MP Consumption - 20%. Applied only when mentor is logged in. The buff lasts 5 minutes if your mentor logs out. -->
 		<set name="abnormalTime" val="-1" />
 		<set name="canBeDispeled" val="false" />
 		<set name="icon" val="icon.skill11520" />
+		<set name="abnormalType" val="MELODY_GUITAR" />
 		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
@@ -400,20 +423,25 @@
 				<mul stat="cAtk" val="1.35" />
 				<add stat="mCritRate" val="20" />
 				<mul stat="MagicalMpConsumeRate" val="0.9" />
-				<mul stat="PhysicalMpConsumeRate" val="0.9" />
-				<mul stat="DanceMpConsumeRate" val="0.8" />
+				<mul stat="PhysicalMpConsumeRate" val="0.8" />
 				<mul stat="MagicalMpConsumeRate" val="0.8">
-					<player class_id_restriction="144" />
+					<player class_id_restriction="171,172,173,174,175" />
 				</mul>
 			</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="9232" levels="1" name="Mentor's Harp Melody">
-		<!-- Ertheia skill -->
 		<!-- Mentor's assistance. P. Accuracy + 5, P. Evasion/M. Evasion + 5, and Speed + 34. Received Critical Damage - 30%. Applied only when mentor is logged in. The buff lasts 5 minutes if your mentor logs out. -->
 		<set name="abnormalTime" val="-1" />
 		<set name="canBeDispeled" val="false" />
 		<set name="icon" val="icon.skill11521" />
+		<set name="abnormalType" val="MELODY_HARP" />
 		<set name="isMagic" val="1" />
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
@@ -425,12 +453,17 @@
 				<add stat="rEvas" val="5" />
 				<add stat="mEvas" val="5" />
 				<add stat="accCombat" val="5" />
-				<mul stat="defCritRate" val="0.7" />
+				<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="9233" levels="1" name="Mentor's Guidance">
-		<!-- Ertheia skill -->
 		<!-- Mentor's assistance. Obtained XP/SP + 50%. Buff remains 5 min. after mentor logs out. -->
 		<set name="abnormalTime" val="-1" />
 		<set name="canBeDispeled" val="false" />
diff --git a/trunk/dist/game/data/stats/skills/09300-09399.xml b/trunk/dist/game/data/stats/skills/09300-09399.xml
index 4dc0ae9524..ff58ea0b6b 100644
--- a/trunk/dist/game/data/stats/skills/09300-09399.xml
+++ b/trunk/dist/game/data/stats/skills/09300-09399.xml
@@ -534,40 +534,117 @@
 		<set name="isMagic" val="4" />
 	</skill>
 	<skill id="9376" levels="1" name="Mentor's Knight's Harmony">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 2 hr., selected mentee's P. Atk. + 12% P. Critical Damage + 35%, P. Critical Rate + 100%, P. Def. + 45%, Shield Defense Rate + 30%, and Shield Defense + 50%. The buff lasts 5 minutes if your mentor logs out. -->
-		<set name="icon" val="icon.skill11523" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" />
-		<set name="targetType" val="SELF" />
-		<set name="mpConsume" val="140" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalTime" val="7200" />
+		<set name="abnormalType" val="HARMONY" />
 		<set name="castRange" val="900" />
 		<set name="hitTime" val="700" />
+		<set name="icon" val="icon.skill11523" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="85" />
+		<set name="mpConsume" val="140" />
+		<set name="mpInitialConsume" val="28" />
+		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="coolTime" val="300" />
 		<set name="reuseDelay" val="2000" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="ONE" />
+		<set name="isMentoring" val="true" />
+		<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" />
+			</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="9377" levels="1" name="Mentor's Wizard's Harmony">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 2 hr., selected mentee's M. Atk. + 40%, M. Critical Rate + 100%, Casting Spd. + 8%, P. Atk. + 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%. The buff lasts 5 minutes if your mentor logs out. -->
-		<set name="icon" val="icon.skill11525" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" />
-		<set name="targetType" val="SELF" />
-		<set name="mpConsume" val="140" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalTime" val="7200" />
+		<set name="abnormalType" val="HARMONY" />
 		<set name="castRange" val="900" />
 		<set name="hitTime" val="700" />
+		<set name="icon" val="icon.skill11525" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="85" />
+		<set name="mpConsume" val="140" />
+		<set name="mpInitialConsume" val="28" />
+		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="coolTime" val="300" />
 		<set name="reuseDelay" val="2000" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="ONE" />
+		<set name="isMentoring" val="true" />
+		<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" />
+				<mul stat="regMp" val="1.20" />
+				<add stat="runSpd" val="8" />
+				<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="9378" levels="1" name="Mentor's Warrior's Harmony">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- For 2 hr., selected mentee's P. Atk. + 35%, P. Critical Damage + 35%, P. Critical Rate + 100%, Atk. Spd. + 8%, M. Atk. + 16%, and Speed + 8. The buff lasts 5 minutes if your mentor logs out. -->
-		<set name="icon" val="icon.skill11524" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" />
-		<set name="targetType" val="SELF" />
-		<set name="mpConsume" val="140" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalTime" val="7200" />
+		<set name="abnormalType" val="HARMONY" />
 		<set name="castRange" val="900" />
 		<set name="hitTime" val="700" />
+		<set name="icon" val="icon.skill11524" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="85" />
+		<set name="mpConsume" val="140" />
+		<set name="mpInitialConsume" val="28" />
+		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="coolTime" val="300" />
 		<set name="reuseDelay" val="2000" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="ONE" />
+		<set name="isMentoring" val="true" />
+		<for>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.35" />
+				<mul stat="cAtk" val="1.35" />
+				<mul stat="rCrit" val="2" />
+				<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="9379" levels="1" name="Mentee's Mentor Summon">
 		<!-- AUTO GENERATED SKILL -->
diff --git a/trunk/dist/game/data/stats/skills/11500-11599.xml b/trunk/dist/game/data/stats/skills/11500-11599.xml
index 26d322770e..80d3828fcd 100644
--- a/trunk/dist/game/data/stats/skills/11500-11599.xml
+++ b/trunk/dist/game/data/stats/skills/11500-11599.xml
@@ -806,6 +806,9 @@
 				<add stat="mCritRate" val="#mCritRate" />
 				<mul stat="MagicalMpConsumeRate" val="#magicMpConsumeRate" />
 				<mul stat="PhysicalMpConsumeRate" val="#physMpConsumeRate" />
+				<mul stat="MagicalMpConsumeRate" val="0.8">
+					<player class_id_restriction="171,172,173,174,175" />
+				</mul>
 			</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" />
@@ -1099,7 +1102,7 @@
 				<mul stat="mDef" val="1.14" />
 				<mul stat="mCritRate" val="2.00" />
 				<mul stat="regMp" val="1.20" />
-				<mul stat="runSpd" val="1.08" />
+				<add stat="runSpd" val="8" />
 				<mul stat="MagicalMpConsumeRate" val="0.85" />
 				<mul stat="PhysicalMpConsumeRate" val="0.95" />
 				<mul stat="mReuse" val="0.80" />
@@ -1122,7 +1125,7 @@
 				<mul stat="mDef" val="1.14" />
 				<mul stat="mCritRate" val="2.00" />
 				<mul stat="regMp" val="1.20" />
-				<mul stat="runSpd" val="1.08" />
+				<add stat="runSpd" val="8" />
 				<mul stat="MagicalMpConsumeRate" val="0.85" />
 				<mul stat="PhysicalMpConsumeRate" val="0.95" />
 				<mul stat="mReuse" val="0.80" />
@@ -1148,7 +1151,7 @@
 				<mul stat="mDef" val="1.14" />
 				<mul stat="mCritRate" val="2.00" />
 				<mul stat="regMp" val="1.20" />
-				<mul stat="runSpd" val="1.08" />
+				<add stat="runSpd" val="8" />
 				<mul stat="MagicalMpConsumeRate" val="0.85" />
 				<mul stat="PhysicalMpConsumeRate" val="0.95" />
 				<mul stat="mReuse" val="0.80" />
@@ -1264,9 +1267,10 @@
 				<mul stat="pAtkSpd" val="1.08" />
 				<mul stat="mAtkSpd" val="1.08" />
 				<mul stat="pDef" val="0.97" />
-				<mul stat="mDef" val="0.97" />
+				<mul stat="mDef" val="0.89" />
 				<sub stat="rEvas" val="4" />
 				<add stat="absorbDam" val="8" />
+				<add stat="reflectDam" val="10" />
 			</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" />
diff --git a/trunk/dist/game/data/stats/skills/11600-11699.xml b/trunk/dist/game/data/stats/skills/11600-11699.xml
index 37c9761b4e..fc0c2a9bc9 100644
--- a/trunk/dist/game/data/stats/skills/11600-11699.xml
+++ b/trunk/dist/game/data/stats/skills/11600-11699.xml
@@ -301,9 +301,10 @@
 				<mul stat="pAtkSpd" val="1.08" />
 				<mul stat="mAtkSpd" val="1.08" />
 				<mul stat="pDef" val="0.97" />
-				<mul stat="mDef" val="0.97" />
+				<mul stat="mDef" val="0.89" />
 				<sub stat="rEvas" val="4" />
 				<add stat="absorbDam" val="8" />
+				<add stat="reflectDam" val="10" />
 			</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" />
@@ -434,9 +435,10 @@
 				<mul stat="pAtkSpd" val="1.08" />
 				<mul stat="mAtkSpd" val="1.08" />
 				<mul stat="pDef" val="0.97" />
-				<mul stat="mDef" val="0.97" />
+				<mul stat="mDef" val="0.89" />
 				<sub stat="rEvas" val="4" />
 				<add stat="absorbDam" val="8" />
+				<add stat="reflectDam" val="10" />
 			</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" />
diff --git a/trunk/dist/game/data/stats/skills/17000-17099.xml b/trunk/dist/game/data/stats/skills/17000-17099.xml
index 585f31fe0e..2bdb59dacf 100644
--- a/trunk/dist/game/data/stats/skills/17000-17099.xml
+++ b/trunk/dist/game/data/stats/skills/17000-17099.xml
@@ -581,28 +581,93 @@
 		<set name="hitTime" val="1500" />
 	</skill>
 	<skill id="17082" levels="1" name="Mentor's Prevailing Sonata">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Mentor's assistance. 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. Applied only when mentor is logged in. Lasts 5 min. after mentor logs out. -->
+		<set name="abnormalTime" val="-1" />
+		<set name="canBeDispeled" val="false" />
 		<set name="icon" val="icon.skill11529" />
+		<set name="abnormalType" val="PREV_SONATA" />
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="99" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="targetType" val="SELF" />
-		<set name="isMagic" val="1" />
+		<set name="isMentoring" val="true" />
+		<for>
+			<effect name="Buff">
+				<mul stat="pAtkSpd" val="1.1" />
+				<mul stat="mAtkSpd" val="1.2" />
+				<mul stat="maxHp" val="1.2" />
+				<mul stat="regMp" val="1.1" />
+				<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="17083" levels="1" name="Mentor's Daring Sonata">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Mentor's assistance. P. Atk. + 5%, M. Atk. + 10%, and Atk./Casting Spd. + 5%. P. Def./M. Def. - 4%, and P. Evasion - 4. Has a chance of 5% Vampiric Rage effect, and reflects 10% of received damage back to enemy. Applied only when mentor is logged in. Lasts 5 min. after mentor logs out. -->
+		<set name="abnormalTime" val="-1" />
+		<set name="canBeDispeled" val="false" />
 		<set name="icon" val="icon.skill11530" />
+		<set name="abnormalType" val="DARING_SONATA" />
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="99" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="targetType" val="SELF" />
-		<set name="isMagic" val="1" />
+		<set name="isMentoring" val="true" />
+		<for>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.05" />
+				<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" />
+				<sub stat="rEvas" val="4" />
+				<add stat="absorbDam" val="5" />
+				<add stat="reflectDam" val="10" />
+			</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="17084" levels="1" name="Mentor's Refreshing Sonata">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Mentor's assistance. HP Recovery Bonus + 10%, P. Accuracy + 2, P. Evasion + 2, and Speed + 10. Skill MP Consumption - 10%, and Skill Cooldown - 5%. Applied only when mentor is logged in. Lasts 5 min. after mentor logs out. -->
+		<set name="abnormalTime" val="-1" />
+		<set name="canBeDispeled" val="false" />
 		<set name="icon" val="icon.skill11532" />
+		<set name="abnormalType" val="REF_SONATA" />
+		<set name="isMagic" val="1" />
+		<set name="magicLvl" val="99" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="targetType" val="SELF" />
-		<set name="isMagic" val="1" />
+		<set name="isMentoring" val="true" />
+		<for>
+			<effect name="Buff">
+				<mul stat="regHp" val="1.1" />
+				<add stat="accCombat" val="2" />
+				<add stat="rEvas" val="2" />
+				<add stat="runSpd" val="10" />
+				<mul stat="PhysicalMpConsumeRate" val="0.90" />
+				<mul stat="MagicalMpConsumeRate" val="0.90" />
+				<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>
 	<skill id="17085" levels="1" name="Kisung's Power Up">
 		<!-- AUTO GENERATED SKILL -->
diff --git a/trunk/dist/game/data/stats/skills/23100-23199.xml b/trunk/dist/game/data/stats/skills/23100-23199.xml
index 54a8987696..d968c673b7 100644
--- a/trunk/dist/game/data/stats/skills/23100-23199.xml
+++ b/trunk/dist/game/data/stats/skills/23100-23199.xml
@@ -835,32 +835,62 @@
 	</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. -->
-		<set name="abnormalLvl" val="1" />
-		<set name="abnormalTime" val="300" />
-		<set name="abnormalType" val="BR_EVENT_BUF5" />
-		<set name="blockedInOlympiad" val="true" />
-		<set name="effectPoint" val="1" />
 		<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="magicLvl" val="1" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="itemConsumeCount" val="3" />
+		<set name="itemConsumeId" val="20904" /> <!-- Rose Essence -->
+		<set name="blockedInOlympiad" val="true" />
+		<set name="affectRange" val="900" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalType" val="BR_EVENT_BUF5" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="abnormalTime" val="300" />
+		<set name="targetType" val="SELF" />
+		<set name="hitTime" val="3000" />
+		<set name="reuseDelay" val="600000" />
+		<for>
+			<effect name="Buff">
+				<mul stat="maxHp" val="1.2" />
+				<mul stat="maxMp" val="1.2" />
+				<add stat="runSpd" val="20" />
+				<mul stat="debuffVuln" val="1.1" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="23168" levels="1" name="Art of 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. -->
-		<set name="abnormalLvl" val="2" />
-		<set name="abnormalTime" val="1200" />
-		<set name="abnormalType" val="BR_EVENT_BUF5" />
-		<set name="blockedInOlympiad" val="true" />
-		<set name="effectPoint" val="1" />
 		<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="magicLvl" val="1" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<set name="targetType" val="NONE" />
+		<set name="itemConsumeCount" val="10" />
+		<set name="itemConsumeId" val="20904" /> <!-- Rose Essence -->
+		<set name="blockedInOlympiad" val="true" />
+		<set name="affectRange" val="900" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalType" val="BR_EVENT_BUF5" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="abnormalTime" val="1200" />
+		<set name="targetType" val="PARTY" />
+		<set name="hitTime" val="5000" />
+		<set name="reuseDelay" val="2400000" />
 		<set name="trait" val="ETC" />
+		<for>
+			<effect name="Buff">
+				<mul stat="maxHp" val="1.3" />
+				<mul stat="maxMp" val="1.3" />
+				<mul stat="maxCp" val="1.3" />
+				<mul stat="mDef" val="1.3" />
+				<mul stat="pDef" val="1.3" />
+				<add stat="runSpd" val="20" />
+				<mul stat="pAtk" val="1.1" />
+				<mul stat="mAtk" val="1.2" />
+				<mul stat="MagicalMpConsumeRate" val="0.85" />
+				<mul stat="PhysicalMpConsumeRate" val="0.85" />
+			</effect>
+		</for>
 	</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. -->