From 86fc18126c684a5cf388d96828fff48a17ff852f Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 31 Oct 2021 10:48:37 +0000
Subject: [PATCH] Buff harmony effect after dance. Contributed by MacuK.

---
 .../game/data/stats/skills/00200-00299.xml    | 184 ++++++++++++-----
 .../game/data/stats/skills/00300-00399.xml    |  74 ++++---
 .../game/data/stats/skills/45400-45499.xml    | 188 +++++++++++-------
 .../game/data/stats/skills/45500-45599.xml    |  34 +++-
 .../dist/game/data/xsd/skills.xsd             |  22 +-
 5 files changed, 340 insertions(+), 162 deletions(-)

diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00200-00299.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00200-00299.xml
index 5cab1daffa..5950098643 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00200-00299.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00200-00299.xml
@@ -5370,35 +5370,68 @@
 	</skill>
 	<skill id="267" toLevel="2" name="Song of Hunter">
 		<!-- Elven hunters' song. P. Critical Rate $s1 -->
-		<icon>icon.skill0267</icon>
-		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>300</abnormalTime>
-		<abnormalType>SONG_OF_WARDING</abnormalType>
-		<affectRange>1000</affectRange>
+		<icon>
+			<value level="1">icon.skill0267</value>
+			<value level="2">icon.song_of_hunter_02</value>
+		</icon>
+		<abnormalLevel>
+			<value level="1">1</value>
+			<value level="2">2</value>
+		</abnormalLevel>
+		<abnormalTime>1200</abnormalTime>
+		<abnormalType>SONG_OF_HUNTER</abnormalType>
+		<affectRange>1200</affectRange>
+		<affectLimit>10-12</affectLimit>
+		<hitTime>2500</hitTime>
 		<effectPoint>
 			<value level="1">0</value>
 			<value level="2">200</value>
 		</effectPoint>
-		<hitTime>2500</hitTime>
 		<isMagic>3</isMagic> <!-- Dance Skill -->
-		<magicLevel>
-			<value level="1">40</value>
-			<value level="2">95</value>
-		</magicLevel>
-		<mpConsume>
-			<value level="1">50</value>
-			<value level="2">50</value>
-		</mpConsume>
+		<magicLevel>40</magicLevel>
+		<mpConsume>50</mpConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
-		<magicCriticalRate>5</magicCriticalRate>
+		<magicCriticalRate>-5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
+		<affectScope>
+			<value level="1">SINGLE</value>
+			<value level="2">RANGE</value>
+		</affectScope>
 		<affectObject>FRIEND</affectObject>
+		<itemConsumeCount>
+			<value level="1">0</value>
+			<value level="2">30</value>
+		</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<conditions>
+			<condition name="OpNotAffectedBySkill">
+				<skillId>45405</skillId>
+			</condition>
+		</conditions>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>45405</skillId> 
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+				</skillLevel>
+			</effect>
+		</selfEffects>
 		<effects>
 			<effect name="CriticalRate">
-				<amount>100</amount>
+				<amount>
+					<value level="1">0</value>
+					<value level="2">60</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicCriticalRate">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">60</value>
+				</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
@@ -5484,34 +5517,64 @@
 	<skill id="271" toLevel="2" name="Dance of Fire">
 		<!-- Dark Elven fire-praising dance. P. Critical Damage $s1 -->
 		<icon>icon.skill0271</icon>
-		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>300</abnormalTime>
-		<abnormalType>DANCE_OF_WARRIOR</abnormalType>
-		<affectRange>1000</affectRange>
+		<abnormalLevel>
+			<value level="1">1</value>
+			<value level="2">2</value>
+		</abnormalLevel>
+		<abnormalTime>1200</abnormalTime>
+		<abnormalType>DANCE_OF_FIRE</abnormalType>
+		<affectRange>1200</affectRange>
+		<affectLimit>10-12</affectLimit>
+		<hitTime>2500</hitTime>
 		<effectPoint>
 			<value level="1">0</value>
 			<value level="2">200</value>
 		</effectPoint>
-		<hitTime>2500</hitTime>
 		<isMagic>3</isMagic> <!-- Dance Skill -->
-		<magicLevel>
-			<value level="1">40</value>
-			<value level="2">95</value>
-		</magicLevel>
-		<mpConsume>
-			<value level="1">50</value>
-			<value level="2">50</value>
-		</mpConsume>
+		<magicLevel>40</magicLevel>
+		<mpConsume>50</mpConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
+		<affectScope>
+			<value level="1">SINGLE</value>
+			<value level="2">RANGE</value>
+		</affectScope>
 		<affectObject>FRIEND</affectObject>
+		<itemConsumeCount>
+			<value level="1">0</value>
+			<value level="2">30</value>
+		</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<conditions>
+			<condition name="OpNotAffectedBySkill">
+				<skillId>45407</skillId>
+			</condition>
+		</conditions>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>45407</skillId> 
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+				</skillLevel>
+			</effect>
+		</selfEffects>
 		<effects>
-			<effect name="CriticalDamage">
-				<amount>40</amount>
+			<effect name="SkillCriticalDamage">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">4</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicCriticalDamage">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">4</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
@@ -5561,33 +5624,60 @@
 			<value level="1">1</value>
 			<value level="2">2</value>
 		</abnormalLevel>
-		<abnormalTime>300</abnormalTime>
-		<abnormalType>DANCE_OF_FIRE</abnormalType>
-		<affectRange>1000</affectRange>
+		<abnormalTime>1200</abnormalTime>
+		<abnormalType>DANCE_OF_WARRIOR</abnormalType>
+		<affectRange>1200</affectRange>
+		<affectLimit>10-12</affectLimit>
+		<hitTime>2500</hitTime>
 		<effectPoint>
 			<value level="1">0</value>
 			<value level="2">200</value>
 		</effectPoint>
-		<hitTime>2500</hitTime>
 		<isMagic>3</isMagic> <!-- Dance Skill -->
-		<magicLevel>
-			<value level="1">40</value>
-			<value level="2">95</value>
-		</magicLevel>
-		<mpConsume>
-			<value level="1">50</value>
-			<value level="2">50</value>
-		</mpConsume>
+		<magicLevel>40</magicLevel>
+		<mpConsume>50</mpConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
+		<affectScope>
+			<value level="1">SINGLE</value>
+			<value level="2">RANGE</value>
+		</affectScope>
 		<affectObject>FRIEND</affectObject>
+		<itemConsumeCount>
+			<value level="1">0</value>
+			<value level="2">30</value>
+		</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<conditions>
+			<condition name="OpNotAffectedBySkill">
+				<skillId>45406</skillId>
+			</condition>
+		</conditions>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>45406</skillId> 
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+				</skillLevel>
+			</effect>
+		</selfEffects>
 		<effects>
 			<effect name="PAtk">
-				<amount>200</amount>
+				<amount>
+					<value level="1">0</value>
+					<value level="2">250</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">250</value>
+				</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00300-00399.xml
index 70a18b369c..8807de462b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00300-00399.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00300-00399.xml
@@ -168,24 +168,26 @@
 	</skill>
 	<skill id="304" toLevel="2" name="Song of Earth">
 		<!-- Elven earth-praising song. P. Def. $s1 M. Def. $s2 -->
-		<icon>icon.skill0304</icon>
+		<icon>
+			<value level="1">icon.skill0304</value>
+			<value level="2">icon.song_of_earth_02</value>
+		</icon>
 		<abnormalLevel>
 			<value level="1">1</value>
 			<value level="2">2</value>
 		</abnormalLevel>
 		<abnormalTime>300</abnormalTime>
-		<abnormalType>SONG_OF_VITALITY</abnormalType>
-		<affectRange>1000</affectRange>
+		<abnormalTime>1200</abnormalTime>
+		<abnormalType>SONG_OF_EARTH</abnormalType>
+		<affectRange>1200</affectRange>
+		<affectLimit>10-12</affectLimit>
+		<hitTime>2500</hitTime>
 		<effectPoint>
 			<value level="1">0</value>
 			<value level="2">200</value>
 		</effectPoint>
-		<hitTime>2500</hitTime>
 		<isMagic>3</isMagic> <!-- Dance Skill -->
-		<magicLevel>
-			<value level="1">40</value>
-			<value level="2">95</value>
-		</magicLevel>
+		<magicLevel>40</magicLevel>
 		<mpConsume>
 			<value level="1">50</value>
 			<value level="2">50</value>
@@ -195,15 +197,43 @@
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
+		<affectScope>
+			<value level="1">SINGLE</value>
+			<value level="2">RANGE</value>
+		</affectScope>
 		<affectObject>FRIEND</affectObject>
+		<itemConsumeCount>
+			<value level="1">0</value>
+			<value level="2">30</value>
+		</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<conditions>
+			<condition name="OpNotAffectedBySkill">
+				<skillId>45404</skillId>
+			</condition>
+		</conditions>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>45404</skillId> 
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+				</skillLevel>
+			</effect>
+		</selfEffects>
 		<effects>
 			<effect name="PhysicalDefence">
-				<amount>200</amount>
+				<amount>
+					<value level="1">0</value>
+					<value level="2">200</value>
+			    </amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="MagicalDefence">
-				<amount>250</amount>
+				<amount>
+					<value level="1">0</value>
+					<value level="2">200</value>
+			    </amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
@@ -228,15 +258,12 @@
 			<value level="2">200</value>
 		</effectPoint>
 		<isMagic>3</isMagic> <!-- Dance Skill -->
-		<magicLevel>
-			<value level="1">40</value>
-			<value level="2">40</value>
-		</magicLevel>
+		<magicLevel>40</magicLevel>
 		<mpConsume>50</mpConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
-		<magicCriticalRate>5</magicCriticalRate>
+		<magicCriticalRate>-5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>
 			<value level="1">SINGLE</value>
@@ -255,10 +282,7 @@
 		</conditions>
 		<selfEffects>
 			<effect name="CallSkill">
-				<skillId>
-					<value level="1">45543</value>
-					<value level="2">45543</value>
-				</skillId>
+				<skillId>45543</skillId>
 				<skillLevel>
 					<value level="1">1</value>
 					<value level="2">2</value>
@@ -420,10 +444,7 @@
 			<value level="2">200</value>
 		</effectPoint>
 		<isMagic>3</isMagic> <!-- Dance Skill -->
-		<magicLevel>
-			<value level="1">40</value>
-			<value level="2">40</value>
-		</magicLevel>
+		<magicLevel>40</magicLevel>
 		<mpConsume>50</mpConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
@@ -447,10 +468,7 @@
 		</conditions>
 		<selfEffects>
 			<effect name="CallSkill">
-				<skillId>
-					<value level="1">45544</value>
-					<value level="2">45544</value>
-				</skillId>
+				<skillId>45544</skillId>
 				<skillLevel>
 					<value level="1">1</value>
 					<value level="2">2</value>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45400-45499.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45400-45499.xml
index 96b3f40639..928108b29e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45400-45499.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45400-45499.xml
@@ -158,79 +158,102 @@
 	</skill>
 	<skill id="45404" toLevel="2" name="Song of Earth">
 		<!-- Elven earth-praising song. <Enchanter> P. Def. $s1 M. Def. $s1 <Nearby characters> P. Def. $s2 M. Def. $s2 -->
-		<icon>icon.skill0304</icon>
+		<icon>
+			<value level="1">icon.skill0304</value>
+			<value level="2">icon.song_of_earth_02</value>
+		</icon>
 		<abnormalLevel>
 			<value level="1">1</value>
 			<value level="2">2</value>
 		</abnormalLevel>
-		<abnormalTime>300</abnormalTime>
-		<abnormalType>SONG_OF_VITALITY</abnormalType>
-		<affectRange>1000</affectRange>
 		<effectPoint>
 			<value level="1">0</value>
 			<value level="2">200</value>
 		</effectPoint>
+		<abnormalTime>1200</abnormalTime>
+		<abnormalType>SONG_OF_EARTH</abnormalType>
 		<hitTime>2500</hitTime>
 		<isMagic>3</isMagic> <!-- Dance Skill -->
-		<magicLevel>
-			<value level="1">40</value>
-			<value level="2">95</value>
-		</magicLevel>
-		<mpConsume>
-			<value level="1">50</value>
-			<value level="2">50</value>
-		</mpConsume>
+		<magicLevel>40</magicLevel>
+		<mpConsume>50</mpConsume>
 		<operateType>A2</operateType>
-		<reuseDelay>10000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
-		<magicCriticalRate>5</magicCriticalRate>
+		<magicCriticalRate>-5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="PhysicalDefence">
-				<amount>200</amount>
+				<amount>
+					<value level="1">200</value>
+					<value level="2">500</value>
+			    </amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="MagicalDefence">
-				<amount>250</amount>
+				<amount>
+					<value level="1">250</value>
+					<value level="2">500</value>
+			    </amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="Synergy">
+				<!-- Party Solidarity  -->
+				<optionalSlots>DANCE_OF_FURY;DANCE_OF_FIRE;DANCE_OF_WARRIOR;SONG_OF_EARTH;SONG_OF_WIND;SONG_OF_HUNTER</optionalSlots>
+				<requiredSlots>SONG_OF_EARTH</requiredSlots>
+				<partyBuffSkillId>45403</partyBuffSkillId>
+				<minSlot>2</minSlot>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+				<ticks>5</ticks>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="45405" toLevel="2" name="Song of Hunter">
 		<!-- Elven hunter-praising song. <Enchanter> All Critical Rate $s1 <Nearby characters> All Critical Rate $s2 -->
-		<icon>icon.skill0267</icon>
-		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>300</abnormalTime>
-		<abnormalType>SONG_OF_WARDING</abnormalType>
-		<affectRange>1000</affectRange>
+		<icon>
+			<value level="1">icon.skill0267</value>
+			<value level="2">icon.song_of_hunter_02</value>
+		</icon>
+		<abnormalLevel>
+			<value level="1">1</value>
+			<value level="2">2</value>
+		</abnormalLevel>
 		<effectPoint>
 			<value level="1">0</value>
 			<value level="2">200</value>
 		</effectPoint>
+		<abnormalTime>1200</abnormalTime>
+		<abnormalType>SONG_OF_HUNTER</abnormalType>
 		<hitTime>2500</hitTime>
 		<isMagic>3</isMagic> <!-- Dance Skill -->
-		<magicLevel>
-			<value level="1">40</value>
-			<value level="2">95</value>
-		</magicLevel>
-		<mpConsume>
-			<value level="1">50</value>
-			<value level="2">50</value>
-		</mpConsume>
 		<operateType>A2</operateType>
-		<reuseDelay>10000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
-		<magicCriticalRate>5</magicCriticalRate>
+		<magicCriticalRate>-5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="CriticalRate">
-				<amount>100</amount>
+				<amount>
+					<value level="1">100</value>
+					<value level="2">150</value>
+				</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="MagicCriticalRate">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">150</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="Synergy">
+				<!-- Party Solidarity  -->
+				<optionalSlots>DANCE_OF_FURY;DANCE_OF_FIRE;DANCE_OF_WARRIOR;SONG_OF_EARTH;SONG_OF_WIND;SONG_OF_HUNTER</optionalSlots>
+				<requiredSlots>SONG_OF_HUNTER</requiredSlots>
+				<partyBuffSkillId>45403</partyBuffSkillId>
+				<minSlot>2</minSlot>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+				<ticks>5</ticks>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="45406" toLevel="2" name="Dance of Warrior">
@@ -240,70 +263,101 @@
 			<value level="1">1</value>
 			<value level="2">2</value>
 		</abnormalLevel>
-		<abnormalTime>300</abnormalTime>
-		<abnormalType>DANCE_OF_FIRE</abnormalType>
-		<affectRange>1000</affectRange>
 		<effectPoint>
 			<value level="1">0</value>
 			<value level="2">200</value>
 		</effectPoint>
+		<abnormalTime>1200</abnormalTime>
+		<abnormalType>DANCE_OF_WARRIOR</abnormalType>
+		<affectRange>1200</affectRange>
 		<hitTime>2500</hitTime>
 		<isMagic>3</isMagic> <!-- Dance Skill -->
-		<magicLevel>
-			<value level="1">40</value>
-			<value level="2">95</value>
-		</magicLevel>
-		<mpConsume>
-			<value level="1">50</value>
-			<value level="2">50</value>
-		</mpConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
-		<magicCriticalRate>5</magicCriticalRate>
+		<magicCriticalRate>-5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="PAtk">
-				<amount>200</amount>
+				<amount>
+					<value level="1">200</value>
+					<value level="2">600</value>
+				</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="MAtk">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">600</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="Synergy">
+				<!-- Party Solidarity  -->
+				<optionalSlots>DANCE_OF_FURY;DANCE_OF_FIRE;DANCE_OF_WARRIOR;SONG_OF_EARTH;SONG_OF_WIND;SONG_OF_HUNTER</optionalSlots>
+				<requiredSlots>DANCE_OF_WARRIOR</requiredSlots>
+				<partyBuffSkillId>45403</partyBuffSkillId>
+				<minSlot>2</minSlot>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+				<ticks>5</ticks>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="45407" toLevel="2" name="Dance of Fire">
 		<!-- Dark elven fire-praising dance. <Enchanter> P. Critical Damage $s1 P. Skill Critical Damage $s2 M. Skill Critical Damage $s2 <Nearby characters> P. Skill Critical Damage $s3 M. Skill Critical Damage $s3 -->
 		<icon>icon.skill0271</icon>
-		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>300</abnormalTime>
-		<abnormalType>DANCE_OF_WARRIOR</abnormalType>
-		<affectRange>1000</affectRange>
+		<abnormalLevel>
+			<value level="1">1</value>
+			<value level="2">2</value>
+		</abnormalLevel>
 		<effectPoint>
 			<value level="1">0</value>
 			<value level="2">200</value>
 		</effectPoint>
+		<abnormalTime>1200</abnormalTime>
+		<abnormalType>DANCE_OF_FIRE</abnormalType>
 		<hitTime>2500</hitTime>
 		<isMagic>3</isMagic> <!-- Dance Skill -->
-		<magicLevel>
-			<value level="1">40</value>
-			<value level="2">95</value>
-		</magicLevel>
-		<mpConsume>
-			<value level="1">50</value>
-			<value level="2">50</value>
-		</mpConsume>
+		<magicLevel>40</magicLevel>
+		<mpConsume>50</mpConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
-		<magicCriticalRate>5</magicCriticalRate>
+		<magicCriticalRate>-5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="CriticalDamage">
-				<amount>40</amount>
+				<amount>
+					<value level="1">40</value>
+					<value level="2">40</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="SkillCriticalDamage">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">10</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicCriticalDamage">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">10</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Synergy">
+				<!-- Party Solidarity  -->
+				<optionalSlots>DANCE_OF_FURY;DANCE_OF_FIRE;DANCE_OF_WARRIOR;SONG_OF_EARTH;SONG_OF_WIND;SONG_OF_HUNTER</optionalSlots>
+				<requiredSlots>DANCE_OF_FIRE</requiredSlots>
+				<partyBuffSkillId>45403</partyBuffSkillId>
+				<minSlot>2</minSlot>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+				<ticks>5</ticks>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="45408" toLevel="4" name="Blessed by Sayha">
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45500-45599.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45500-45599.xml
index 1b79f70d7a..a9adb988ba 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45500-45599.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45500-45599.xml
@@ -1270,11 +1270,15 @@
 			<value level="1">1</value>
 			<value level="2">2</value>
 		</abnormalLevel>
-		<effectPoint>200</effectPoint>
+		<effectPoint>
+			<value level="1">0</value>
+			<value level="2">200</value>
+		</effectPoint>
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>SONG_OF_WIND</abnormalType>
-		<affectRange>1000</affectRange>
 		<hitTime>2500</hitTime>
+		<isMagic>3</isMagic> <!-- Dance Skill -->
+		<magicLevel>40</magicLevel>
 		<operateType>A2</operateType>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>-5</magicCriticalRate>
@@ -1283,7 +1287,7 @@
 		<effects>
 			<effect name="Speed">
 				<amount>
-					<value level="1">0</value>
+					<value level="1">20</value>
 					<value level="2">30</value>
 				</amount>
 				<mode>DIFF</mode>
@@ -1294,6 +1298,15 @@
 					<value level="2">5</value>
 				</SUPPRESSION>
 			</effect>
+			<effect name="Synergy">
+				<!-- Party Solidarity  -->
+				<optionalSlots>DANCE_OF_FURY;DANCE_OF_FIRE;DANCE_OF_WARRIOR;SONG_OF_EARTH;SONG_OF_WIND;SONG_OF_HUNTER</optionalSlots>
+				<requiredSlots>SONG_OF_WIND</requiredSlots>
+				<partyBuffSkillId>45403</partyBuffSkillId>
+				<minSlot>2</minSlot>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+				<ticks>5</ticks>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="45544" toLevel="2" name="Dance of Fury">
@@ -1306,10 +1319,14 @@
 			<value level="1">1</value>
 			<value level="2">2</value>
 		</abnormalLevel>
-		<effectPoint>200</effectPoint>
+		<effectPoint>
+			<value level="1">0</value>
+			<value level="2">200</value>
+		</effectPoint>
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>DANCE_OF_FURY</abnormalType>
 		<hitTime>2500</hitTime>
+		<isMagic>3</isMagic> <!-- Dance Skill -->
 		<operateType>A2</operateType>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>-5</magicCriticalRate>
@@ -1338,6 +1355,15 @@
 				<mode>PER</mode>
 				<magicType>0</magicType>
 			</effect>
+			<effect name="Synergy">
+				<!-- Party Solidarity  -->
+				<optionalSlots>DANCE_OF_FURY;DANCE_OF_FIRE;DANCE_OF_WARRIOR;SONG_OF_EARTH;SONG_OF_WIND;SONG_OF_HUNTER</optionalSlots>
+				<requiredSlots>DANCE_OF_FURY</requiredSlots>
+				<partyBuffSkillId>45403</partyBuffSkillId>
+				<minSlot>2</minSlot>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+				<ticks>5</ticks>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="45545" toLevel="1" name="Meteor">
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/skills.xsd
index 78df9fa5df..e8c758b582 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/skills.xsd
@@ -1679,9 +1679,13 @@
 															<xs:element name="attackSkillId" type="xs:unsignedShort" />
 															<xs:element name="adjustLevel" type="xs:boolean" />
 															<xs:element name="damageModifier" type="xs:decimal" />
+															<xs:element name="optionalSlots" type="xs:string" />
+															<xs:element name="requiredSlots" type="xs:string" />
+															<xs:element name="partyBuffSkillId" type="xs:unsignedShort" />
+															<xs:element name="minSlot" type="xs:unsignedByte" />
+															<xs:element name="skillLevelScaleTo" type="xs:unsignedByte" />
 															<xs:element name="percentTo" type="xs:unsignedByte" />
 															<xs:element name="percentFrom" type="xs:unsignedByte" />
-															<xs:element name="skillLevelScaleTo" type="xs:unsignedByte" />
 															<xs:element name="closeSkill" type="xs:unsignedShort" />
 															<xs:element name="rangeSkill" type="xs:unsignedShort" />
 															<xs:element name="PISTOLS" type="xs:byte" />
@@ -2047,21 +2051,7 @@
 														</xs:element>
 														<xs:element minOccurs="0" name="slot" type="xs:string" />
 														<xs:element minOccurs="0" name="mode" type="xs:string" />
-														<xs:element minOccurs="0" name="skillId">
-															<xs:complexType mixed="true">
-																<xs:sequence minOccurs="0">
-																	<xs:element maxOccurs="unbounded" name="value">
-																		<xs:complexType>
-																			<xs:simpleContent>
-																				<xs:extension base="xs:unsignedShort">
-																					<xs:attribute name="level" type="xs:unsignedByte" use="required" />
-																				</xs:extension>
-																			</xs:simpleContent>
-																		</xs:complexType>
-																	</xs:element>
-																</xs:sequence>
-															</xs:complexType>
-														</xs:element>
+														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="skillLevel">
 															<xs:complexType mixed="true">
 																<xs:sequence minOccurs="0">