From 7fb863ee6e76e62ed5a86b4ecfc6f8bca0ab6cfa Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 17 Jan 2021 03:05:46 +0000
Subject: [PATCH] Sonata skill adjustments. Contributed by epu.

---
 .../game/data/stats/skills/11500-11599.xml    |  4 +-
 .../game/data/stats/skills/11600-11699.xml    | 22 +++--
 .../game/data/stats/skills/14900-14999.xml    |  8 +-
 .../game/data/stats/skills/15600-15699.xml    |  5 +
 .../game/data/stats/skills/17100-17199.xml    | 91 ++++++++++++-------
 .../game/data/stats/skills/17200-17299.xml    | 48 ++++++----
 .../game/data/stats/skills/17300-17399.xml    | 83 +++++++++--------
 .../game/data/stats/skills/18000-18099.xml    |  2 +-
 .../game/data/stats/skills/23500-23599.xml    |  4 +-
 9 files changed, 156 insertions(+), 111 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml
index d939fda537..1c8b68642d 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml
@@ -2106,7 +2106,7 @@
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</slot>
 			</effect>
 			<effect name="VampiricAttack">
-				<amount>9</amount>
+				<amount>8</amount>
 				<chance>30</chance>
 			</effect>
 			<effect name="PAtk">
@@ -2118,7 +2118,7 @@
 				<mode>PER</mode>
 			</effect>
 			<effect name="MagicalDefence">
-				<amount>-3</amount>
+				<amount>-11</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PhysicalDefence">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11600-11699.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11600-11699.xml
index b989b0904e..4aa069330d 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11600-11699.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11600-11699.xml
@@ -46,11 +46,11 @@
 				<mode>PER</mode>
 			</effect>
 			<effect name="ReduceCancel">
-				<amount>53</amount>
+				<amount>-53</amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="MagicMpCost">
-				<amount>10</amount>
+				<amount>-10</amount>
 				<mode>PER</mode>
 				<magicType>1</magicType>
 			</effect>
@@ -94,12 +94,16 @@
 				<amount>8</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="MAtk">
+				<amount>16</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="MagicalDefence">
-				<amount>11</amount>
+				<amount>-11</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PhysicalDefence">
-				<amount>3</amount>
+				<amount>-3</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PhysicalEvasion">
@@ -107,7 +111,7 @@
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="PhysicalAttackSpeed">
-				<amount>16</amount>
+				<amount>8</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MagicalAttackSpeed">
@@ -165,12 +169,12 @@
 				<mode>PER</mode>
 			</effect>
 			<effect name="MagicMpCost">
-				<amount>10</amount>
+				<amount>-20</amount>
 				<mode>PER</mode>
 				<magicType>1</magicType>
 			</effect>
 			<effect name="MagicMpCost">
-				<amount>10</amount>
+				<amount>-20</amount>
 				<mode>PER</mode>
 				<magicType>0</magicType>
 			</effect>
@@ -180,12 +184,12 @@
 				<magicType>3</magicType>
 			</effect>
 			<effect name="Reuse">
-				<amount>10</amount>
+				<amount>-10</amount>
 				<mode>PER</mode>
 				<magicType>0</magicType>
 			</effect>
 			<effect name="Reuse">
-				<amount>10</amount>
+				<amount>-10</amount>
 				<mode>PER</mode>
 				<magicType>1</magicType>
 			</effect>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14900-14999.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14900-14999.xml
index 3f6dbd07eb..ecc89d4433 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14900-14999.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14900-14999.xml
@@ -2424,7 +2424,7 @@
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</slot>
 			</effect>
 			<effect name="VampiricAttack">
-				<amount>9</amount>
+				<amount>8</amount>
 				<chance>30</chance>
 			</effect>
 			<effect name="PAtk">
@@ -2436,7 +2436,7 @@
 				<mode>PER</mode>
 			</effect>
 			<effect name="MagicalDefence">
-				<amount>-3</amount>
+				<amount>-11</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PhysicalDefence">
@@ -2609,7 +2609,7 @@
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</slot>
 			</effect>
 			<effect name="VampiricAttack">
-				<amount>9</amount>
+				<amount>8</amount>
 				<chance>30</chance>
 			</effect>
 			<effect name="PAtk">
@@ -2621,7 +2621,7 @@
 				<mode>PER</mode>
 			</effect>
 			<effect name="MagicalDefence">
-				<amount>-3</amount>
+				<amount>-11</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PhysicalDefence">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15600-15699.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15600-15699.xml
index 7668c5eb04..78abce04b6 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15600-15699.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15600-15699.xml
@@ -1097,6 +1097,11 @@
 				<mode>PER</mode>
 				<magicType>0</magicType>
 			</effect>
+			<effect name="Reuse">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="15654" toLevel="1" name="Master's Blessing - GM's Courage">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17100-17199.xml
index 0ca3be56e7..78f316bf38 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17100-17199.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17100-17199.xml
@@ -1158,22 +1158,27 @@
 			<effect name="BlockAbnormalSlot">
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</slot>
 			</effect>
-			<effect name="PAtk">
-				<amount>25</amount>
+			<effect name="PhysicalAttackSpeed">
+				<amount>15</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MAtk">
+			<effect name="MagicalAttackSpeed">
 				<amount>30</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="MpRegen">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-10</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
 			<effect name="ReduceCancel">
 				<amount>-40</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="VampiricAttack">
-				<amount>8</amount>
-				<chance>30</chance>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="17176" toLevel="1" name="GM's Blessing - Daring Sonata">
@@ -1199,36 +1204,45 @@
 			<effect name="BlockAbnormalSlot">
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</slot>
 			</effect>
+			<effect name="PAtk">
+				<amount>8</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>16</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="Speed">
 				<amount>20</amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="PhysicalAttackSpeed">
-				<amount>25</amount>
+				<amount>8</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MagicalAttackSpeed">
-				<amount>25</amount>
+				<amount>8</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="PhysicalDefence">
+				<amount>-3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>-11</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalEvasion">
+				<amount>-4</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="VampiricAttack">
+				<amount>8</amount>
+				<chance>30</chance>
+			</effect>
 			<effect name="DamageShield">
 				<amount>10</amount>
 			</effect>
-			<effect name="Reuse">
-				<amount>-10</amount>
-				<mode>PER</mode>
-				<magicType>0</magicType>
-			</effect>
-			<effect name="Reuse">
-				<amount>-10</amount>
-				<mode>PER</mode>
-				<magicType>1</magicType>
-			</effect>
-			<effect name="Reuse">
-				<amount>-10</amount>
-				<mode>PER</mode>
-				<magicType>22</magicType>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="17177" toLevel="1" name="GM's Blessing - Refreshing Sonata">
@@ -1255,20 +1269,20 @@
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</slot>
 			</effect>
 			<effect name="PhysicalEvasion">
-				<amount>5</amount>
+				<amount>3</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MagicalEvasion">
-				<amount>5</amount>
+			<effect name="Accuracy">
+				<amount>4</amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="HpRegen">
-				<amount>75</amount>
+				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MpRegen">
-				<amount>50</amount>
-				<mode>PER</mode>
+			<effect name="Speed">
+				<amount>20</amount>
+				<mode>DIFF</mode>
 			</effect>
 			<effect name="MagicMpCost">
 				<amount>-20</amount>
@@ -1280,6 +1294,21 @@
 				<mode>PER</mode>
 				<magicType>0</magicType>
 			</effect>
+			<effect name="Reuse">
+				<amount>-10</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-10</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-10</amount>
+				<mode>PER</mode>
+				<magicType>22</magicType>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="17178" toLevel="1" name="Transformation Scroll: Makeshift Bat">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17200-17299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17200-17299.xml
index cc506ef669..2b4dd0095f 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17200-17299.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17200-17299.xml
@@ -620,15 +620,15 @@
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</slot>
 			</effect>
 			<effect name="PhysicalAttackSpeed">
-				<amount>15</amount>
+				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MagicalAttackSpeed">
-				<amount>30</amount>
+				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MpRegen">
-				<amount>20</amount>
+				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="ReduceCancel">
@@ -636,11 +636,11 @@
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="MaxHp">
-				<amount>30</amount>
+				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MagicMpCost">
-				<amount>-10</amount>
+				<amount>-5</amount>
 				<mode>PER</mode>
 				<magicType>1</magicType>
 			</effect>
@@ -674,23 +674,23 @@
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</slot>
 			</effect>
 			<effect name="VampiricAttack">
-				<amount>9</amount>
+				<amount>5</amount>
 				<chance>30</chance>
 			</effect>
 			<effect name="PAtk">
-				<amount>8</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MAtk">
-				<amount>16</amount>
+				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MagicalDefence">
-				<amount>-3</amount>
+				<amount>-4</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PhysicalDefence">
-				<amount>-3</amount>
+				<amount>-4</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PhysicalEvasion">
@@ -698,11 +698,11 @@
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="PhysicalAttackSpeed">
-				<amount>8</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MagicalAttackSpeed">
-				<amount>8</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="DamageShield">
@@ -738,28 +738,28 @@
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</slot>
 			</effect>
 			<effect name="Speed">
-				<amount>20</amount>
+				<amount>10</amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="PhysicalEvasion">
-				<amount>3</amount>
+				<amount>2</amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="Accuracy">
-				<amount>4</amount>
+				<amount>2</amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="HpRegen">
-				<amount>20</amount>
+				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MagicMpCost">
-				<amount>-20</amount>
+				<amount>-10</amount>
 				<mode>PER</mode>
 				<magicType>1</magicType>
 			</effect>
 			<effect name="MagicMpCost">
-				<amount>-20</amount>
+				<amount>-10</amount>
 				<mode>PER</mode>
 				<magicType>0</magicType>
 			</effect>
@@ -769,7 +769,7 @@
 				<magicType>0</magicType>
 			</effect>
 			<effect name="Reuse">
-				<amount>-10</amount>
+				<amount>-5</amount>
 				<mode>PER</mode>
 				<magicType>1</magicType>
 			</effect>
@@ -1036,6 +1036,14 @@
 		<affectScope>SINGLE</affectScope>
 		<stayAfterDeath>true</stayAfterDeath>
 		<effects>
+			<effect name="PAtk">
+				<amount>8</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>16</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="PhysicalAttackSpeed">
 				<amount>8</amount>
 				<mode>PER</mode>
@@ -1057,7 +1065,7 @@
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="VampiricAttack">
-				<amount>9</amount>
+				<amount>8</amount>
 				<chance>30</chance>
 			</effect>
 			<effect name="DamageShield">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17300-17399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17300-17399.xml
index cc9826dd49..f31cf32872 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17300-17399.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17300-17399.xml
@@ -35,7 +35,7 @@
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="MaxHp">
-				<amount>30</amount>
+				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="DispelBySlotProbability">
@@ -45,16 +45,16 @@
 			<effect name="BlockAbnormalSlot">
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</slot>
 			</effect>
-			<effect name="PAtk">
-				<amount>25</amount>
+			<effect name="PhysicalAttackSpeed">
+				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MAtk">
-				<amount>30</amount>
+			<effect name="MagicalAttackSpeed">
+				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MpRegen">
-				<amount>20</amount>
+				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="ReduceCancel">
@@ -62,14 +62,10 @@
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="MagicMpCost">
-				<amount>-10</amount>
+				<amount>-5</amount>
 				<mode>PER</mode>
 				<magicType>1</magicType>
 			</effect>
-			<effect name="VampiricAttack">
-				<amount>9</amount>
-				<chance>30</chance>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="17304" toLevel="1" name="Daring Sonata - Enhanced Cocktail">
@@ -95,40 +91,33 @@
 			<effect name="BlockAbnormalSlot">
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</slot>
 			</effect>
-			<effect name="Speed">
-				<amount>20</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MagicMpCost">
-				<amount>-10</amount>
+			<effect name="PAtk">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>10</amount>
 				<mode>PER</mode>
-				<magicType>1</magicType>
 			</effect>
 			<effect name="PhysicalAttackSpeed">
-				<amount>25</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MagicalAttackSpeed">
-				<amount>25</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="DamageShield">
-				<amount>10</amount>
-			</effect>
-			<effect name="Reuse">
-				<amount>-10</amount>
+			<effect name="PhysicalDefence">
+				<amount>-4</amount>
 				<mode>PER</mode>
-				<magicType>0</magicType>
 			</effect>
-			<effect name="Reuse">
-				<amount>-10</amount>
+			<effect name="MagicalDefence">
+				<amount>-4</amount>
 				<mode>PER</mode>
-				<magicType>1</magicType>
 			</effect>
-			<effect name="Reuse">
-				<amount>-10</amount>
-				<mode>PER</mode>
-				<magicType>22</magicType>
+			<effect name="PhysicalEvasion">
+				<amount>-4</amount>
+				<mode>DIFF</mode>
 			</effect>
 		</effects>
 	</skill>
@@ -156,31 +145,41 @@
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</slot>
 			</effect>
 			<effect name="PhysicalEvasion">
-				<amount>5</amount>
+				<amount>2</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MagicalEvasion">
-				<amount>5</amount>
+			<effect name="Accuracy">
+				<amount>2</amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="HpRegen">
-				<amount>75</amount>
+				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MpRegen">
-				<amount>50</amount>
-				<mode>PER</mode>
+			<effect name="Speed">
+				<amount>10</amount>
+				<mode>DIFF</mode>
 			</effect>
 			<effect name="MagicMpCost">
-				<amount>-20</amount>
+				<amount>-10</amount>
 				<mode>PER</mode>
 				<magicType>1</magicType>
 			</effect>
 			<effect name="MagicMpCost">
-				<amount>-20</amount>
+				<amount>-10</amount>
 				<mode>PER</mode>
 				<magicType>0</magicType>
 			</effect>
+			<effect name="Reuse">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-5</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="17306" toLevel="1" name="Real Tor's Blessing">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/18000-18099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/18000-18099.xml
index 7a331b18a1..4f2ad1b155 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/18000-18099.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/18000-18099.xml
@@ -695,7 +695,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="18051" toLevel="1" name="Prevailing Sonata - Dance">
+	<skill id="18051" toLevel="1" name="Prevailing Dance">
 		<!-- For 1 hr., Atk. Spd. + 15%, Casting Spd. + 30%, Max HP + 30%, MP Recovery Bonus + 20%, and M. Skill MP Consumption - 10%. Decreases chance of being interrupted mid-spell. Cooldown is 1 hr. Remains after death. -->
 		<icon>icon.etc_bm_sonata_cookie</icon>
 		<affectRange>1000</affectRange>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/23500-23599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/23500-23599.xml
index 4b15e4de51..a6751c53c1 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/23500-23599.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/23500-23599.xml
@@ -475,7 +475,7 @@
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</slot>
 			</effect>
 			<effect name="VampiricAttack">
-				<amount>9</amount>
+				<amount>8</amount>
 				<chance>30</chance>
 			</effect>
 			<effect name="PAtk">
@@ -487,7 +487,7 @@
 				<mode>PER</mode>
 			</effect>
 			<effect name="MagicalDefence">
-				<amount>-3</amount>
+				<amount>-11</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PhysicalDefence">