From a93066a5a70dedc8a7e466328a7ffa92356177b9 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 13 May 2019 09:31:45 +0000
Subject: [PATCH] Addition of Triad state. Contributed by Liamxroy.

---
 .../game/data/stats/skills/11500-11599.xml    |  28 ++++
 .../game/data/stats/skills/19400-19499.xml    |  88 +++++++++---
 .../game/data/stats/skills/19500-19599.xml    | 129 +++++++++++++++++-
 .../gameserver/model/skills/AbnormalType.java |   1 +
 .../game/data/stats/skills/11500-11599.xml    |  28 ++++
 .../game/data/stats/skills/19400-19499.xml    |  89 ++++++++----
 .../game/data/stats/skills/19500-19599.xml    | 129 +++++++++++++++++-
 .../gameserver/model/skills/AbnormalType.java |   1 +
 .../game/data/stats/skills/11500-11599.xml    |  28 ++++
 .../game/data/stats/skills/19400-19499.xml    |  89 ++++++++----
 .../game/data/stats/skills/19500-19599.xml    | 129 +++++++++++++++++-
 .../gameserver/model/skills/AbnormalType.java |   1 +
 12 files changed, 669 insertions(+), 71 deletions(-)

diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml
index 762b668c7f..2837e9040c 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml
@@ -587,6 +587,13 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19442</skillId> <!-- Single Note - Triad -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="11510" toLevel="11" name="Shadow Blade">
 		<!-- Attacks target with $s1 Power added to P. Atk. for $s2, P. Atk. and M. Atk.-$s3. Requires a sword, blunt, dual sword, or dual blunt to be equipped. Over-hit. Critical. -->
@@ -703,6 +710,13 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19442</skillId> <!-- Single Note - Triad -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="11511" toLevel="11" name="Death Strike">
 		<!-- Attacks the target with $s1 Power added to P. Atk. to reduce its P. Atk./ M. Atk./ P. Def./ M. Def. by $s3 for $s2. The target can remove these debuffs if it has Spectral Slash Stage 3 or higher. Requires a sword, blunt, dual sword or dual blunt to be equipped. Over-hit. Critical. -->
@@ -943,6 +957,13 @@
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19442</skillId> <!-- Single Note - Triad -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="11514" toLevel="11" name="Mass Shadow Blade">
 		<!-- Attacks target and nearby enemies with $s1 Power added to P. Atk. for $s2, P. Atk. and M. Atk. -$s3. Requires a sword, blunt, dual sword, or dual blunt to be equipped. Over-hit. Critical. -->
@@ -1050,6 +1071,13 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19442</skillId> <!-- Single Note - Triad -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="11515" toLevel="5" name="Confusion Bomber">
 		<!-- Curses target with darkness. For $s1, decreases Speed and Atk. Spd. by $s2. After $s3, detonates target to inflict damage nearby. Requires a sword, dual sword or dual blunt to be equipped. -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19400-19499.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19400-19499.xml
index 6d66a76280..2199c048ac 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19400-19499.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19400-19499.xml
@@ -1152,6 +1152,11 @@
 				<skillId>19432</skillId> <!-- Swift Praise -->
 				<skillLevel>1</skillLevel>
 			</effect>
+			<effect name="CallSkill">
+				<skillId>19442</skillId> <!-- Single Note - Triad lvl 1 -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+			</effect>
 		</selfEffects>
 	</skill>
 	<skill id="19432" toLevel="1" name="Swift Praise">
@@ -1253,14 +1258,10 @@
 				</weaponType>
 			</condition>
 			<condition name="OpCheckAbnormal">
-				<type>CRITICAL_PROB_DOWN</type>
-				<level>1</level>
-				<hasAbnormal>true</hasAbnormal>
-			</condition>
-			<condition name="OpCheckAbnormal">
-				<type>ULTIMATE_DEBUFF</type>
-				<level>1</level>
+				<type>TRIAD</type>
+				<level>3</level>
 				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
 			</condition>
 		</conditions>
 		<effects>
@@ -1310,6 +1311,9 @@
 				<skillId>19432</skillId> <!-- Swift Praise -->
 				<skillLevel>1</skillLevel>
 			</effect>
+			<effect name="DispelBySlotMyself">
+				<dispel>TRIAD</dispel>
+			</effect>
 		</selfEffects>
 	</skill>
 	<skill id="19434" toLevel="13" name="Repeat Mark Somersault">
@@ -1331,8 +1335,8 @@
 		</abnormalLvl>
 		<abnormalTime>8</abnormalTime>
 		<abnormalType>ULTIMATE_DEBUFF</abnormalType>
-		<activateRate>99</activateRate>
-		<castRange>40</castRange>
+		<activateRate>100</activateRate>
+		<castRange>200</castRange>
 		<coolTime>300</coolTime>
 		<effectRange>400</effectRange>
 		<hitTime>910</hitTime>
@@ -1366,8 +1370,7 @@
 			<value level="12">176</value>
 			<value level="13">180</value>
 		</mpConsume>
-		<operateType>DA1</operateType>
-		<nextAction>ATTACK</nextAction>
+		<operateType>DA3</operateType>
 		<reuseDelay>7000</reuseDelay>
 		<effectPoint>
 			<value level="1">-687</value>
@@ -1400,14 +1403,10 @@
 				</weaponType>
 			</condition>
 			<condition name="OpCheckAbnormal">
-				<type>CRITICAL_PROB_DOWN</type>
-				<level>1</level>
-				<hasAbnormal>true</hasAbnormal>
-			</condition>
-			<condition name="OpCheckAbnormal">
-				<type>ULTIMATE_DEBUFF</type>
-				<level>1</level>
+				<type>TRIAD</type>
+				<level>3</level>
 				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
 			</condition>
 		</conditions>
 		<effects>
@@ -1443,9 +1442,8 @@
 			</effect>
 		</effects>
 		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>30608</skillId> <!-- Fury of Eviscerator TODO create a new one -->
-				<skillLevel>1</skillLevel>
+			<effect name="DispelBySlotMyself">
+				<dispel>TRIAD</dispel>
 			</effect>
 		</selfEffects>
 	</skill>
@@ -1769,7 +1767,42 @@
 			<value level="2">icon.skill19442</value>
 			<value level="3">icon.skill19442_3</value>
 		</icon>
-		<operateType>A1</operateType>
+		<isTriggeredSkill>true</isTriggeredSkill>
+		<abnormalType>TRIAD</abnormalType>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+		</abnormalLvl>
+		<abnormalTime>
+			<value level="1">4</value>
+			<value level="2">4</value>
+			<value level="3">12</value>
+		</abnormalTime>
+		<activateRate>100</activateRate>
+		<operateType>A2</operateType>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<specialLevel>-1</specialLevel>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<isMagic>4</isMagic>
+		<effectPoint>100</effectPoint>
+		<effects>
+			<effect name="PAtk">
+				<value level="1">3</value>
+				<value level="2">5</value>
+				<value level="3">10</value>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<value level="1">3</value>
+				<value level="2">5</value>
+				<value level="3">10</value>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19443" toLevel="9" name="Melody of Refection">
 		<icon>icon.skill11761</icon>
@@ -1784,6 +1817,14 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<reuseDelay>15000</reuseDelay>
 		<effectPoint>100</effectPoint>
+		<conditions>
+			<condition name="OpCheckAbnormal">
+				<type>TRIAD</type>
+				<level>3</level>
+				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="ManaHealByLevel">
 				<power>
@@ -1798,6 +1839,9 @@
 					<value level="9">826</value>
 				</power>
 			</effect>
+			<effect name="DispelBySlotMyself">
+				<dispel>TRIAD</dispel>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19444" toLevel="1" name="War Drum">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19500-19599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19500-19599.xml
index 559b5ec88f..607d4eef54 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19500-19599.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19500-19599.xml
@@ -131,7 +131,134 @@
 	<skill id="19522" toLevel="13" name="Repeat Mark Somersault">
 		<!-- Attacks the target with $s1 Power added to P. Atk., decreases P./ M. Def. by $s3 and Speed by $s4 for $s2, and moves $s5 back. Can be cast by consuming Triad. -->
 		<icon>icon.skill19434</icon>
-		<operateType>A1</operateType>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+			<value level="4">4</value>
+			<value level="5">5</value>
+			<value level="6">6</value>
+			<value level="7">7</value>
+			<value level="8">8</value>
+			<value level="9">9</value>
+			<value level="10">10</value>
+			<value level="11">11</value>
+			<value level="12">12</value>
+			<value level="13">13</value>
+		</abnormalLvl>
+		<abnormalTime>8</abnormalTime>
+		<abnormalType>ULTIMATE_DEBUFF</abnormalType>
+		<activateRate>100</activateRate>
+		<castRange>200</castRange>
+		<coolTime>300</coolTime>
+		<effectRange>400</effectRange>
+		<hitTime>910</hitTime>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">86</value>
+			<value level="3">88</value>
+			<value level="4">90</value>
+			<value level="5">92</value>
+			<value level="6">94</value>
+			<value level="7">96</value>
+			<value level="8">98</value>
+			<value level="9">101</value>
+			<value level="10">103</value>
+			<value level="11">105</value>
+			<value level="12">107</value>
+			<value level="13">109</value>
+		</magicLvl>
+		<mpConsume>
+			<value level="1">130</value>
+			<value level="2">132</value>
+			<value level="3">136</value>
+			<value level="4">142</value>
+			<value level="5">146</value>
+			<value level="6">150</value>
+			<value level="7">156</value>
+			<value level="8">160</value>
+			<value level="9">164</value>
+			<value level="10">168</value>
+			<value level="11">172</value>
+			<value level="12">176</value>
+			<value level="13">180</value>
+		</mpConsume>
+		<operateType>DA3</operateType>
+		<reuseDelay>7000</reuseDelay>
+		<effectPoint>
+			<value level="1">-687</value>
+			<value level="2">-694</value>
+			<value level="3">-700</value>
+			<value level="4">-705</value>
+			<value level="5">-709</value>
+			<value level="6">-712</value>
+			<value level="7">-712</value>
+			<value level="8">-712</value>
+			<value level="9">-712</value>
+			<value level="10">-712</value>
+			<value level="11">-712</value>
+			<value level="12">-712</value>
+			<value level="13">-712</value>
+		</effectPoint>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<isDebuff>true</isDebuff>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>DUAL</item>
+					<item>DUALBLUNT</item>
+					<item>SWORD</item>
+					<item>BLUNT</item>
+				</weaponType>
+			</condition>
+			<condition name="OpCheckAbnormal">
+				<type>TRIAD</type>
+				<level>3</level>
+				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="PhysicalAttackWeaponBonus">
+				<power>
+					<value level="1">20668</value>
+					<value level="2">21494</value>
+					<value level="3">23146</value>
+					<value level="4">24798</value>
+					<value level="5">26450</value>
+					<value level="6">28102</value>
+					<value level="7">29754</value>
+					<value level="8">31406</value>
+					<value level="9">33884</value>
+					<value level="10">35536</value>
+					<value level="11">37188</value>
+					<value level="12">38939</value>
+					<value level="13">40690</value>
+				</power>
+				<overHit>true</overHit>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>-20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>-20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Speed">
+				<amount>-150</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
+		<selfEffects>
+			<effect name="DispelBySlotMyself">
+				<dispel>TRIAD</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19523" toLevel="1" name="Maximum Blow">
 		<!-- Resets the cooldown of Heart Breaker/ Chain Blow. -->
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
index df33e3c3ad..51a4508eb5 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -252,6 +252,7 @@ public enum AbnormalType
 	SAYHA_BLESSING(-1),
 	SONG_WEAPON(-1), // TODO: need find proper name
 	HEAL_RESISTANCE(-1), // TODO: need find proper name
+	TRIAD(-1),
 	AB_HAWK_EYE(0),
 	ALL_ATTACK_DOWN(1),
 	ALL_ATTACK_UP(2),
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml
index a40a1126da..31ae1a017d 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml
@@ -585,6 +585,13 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19442</skillId> <!-- Single Note - Triad -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="11510" toLevel="11" name="Shadow Blade">
 		<icon>icon.skill11509</icon>
@@ -700,6 +707,13 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19442</skillId> <!-- Single Note - Triad -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="11511" toLevel="11" name="Death Strike">
 		<icon>icon.skill11511</icon>
@@ -938,6 +952,13 @@
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19442</skillId> <!-- Single Note - Triad -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="11514" toLevel="11" name="Mass Shadow Blade">
 		<icon>icon.skill11509</icon>
@@ -1044,6 +1065,13 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19442</skillId> <!-- Single Note - Triad -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="11515" toLevel="5" name="Confusion Bomber">
 		<!-- Curses target with darkness. For $s1, decreases Speed and Atk. Spd. by $s2. After $s3, detonates target to inflict damage nearby. Requires a sword, dual sword or dual blunt to be equipped. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19400-19499.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19400-19499.xml
index aecd8bd756..8589d11a75 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19400-19499.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19400-19499.xml
@@ -1156,6 +1156,11 @@
 				<skillId>19432</skillId> <!-- Swift Praise -->
 				<skillLevel>1</skillLevel>
 			</effect>
+			<effect name="CallSkill">
+				<skillId>19442</skillId> <!-- Single Note - Triad lvl 1 -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+			</effect>
 		</selfEffects>
 	</skill>
 	<skill id="19432" toLevel="1" name="Swift Praise">
@@ -1257,14 +1262,10 @@
 				</weaponType>
 			</condition>
 			<condition name="OpCheckAbnormal">
-				<type>CRITICAL_PROB_DOWN</type>
-				<level>1</level>
-				<hasAbnormal>true</hasAbnormal>
-			</condition>
-			<condition name="OpCheckAbnormal">
-				<type>ULTIMATE_DEBUFF</type>
-				<level>1</level>
+				<type>TRIAD</type>
+				<level>3</level>
 				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
 			</condition>
 		</conditions>
 		<effects>
@@ -1314,6 +1315,9 @@
 				<skillId>19432</skillId> <!-- Swift Praise -->
 				<skillLevel>1</skillLevel>
 			</effect>
+			<effect name="DispelBySlotMyself">
+				<dispel>TRIAD</dispel>
+			</effect>
 		</selfEffects>
 	</skill>
 	<skill id="19434" toLevel="13" name="Repeat Mark Somersault">
@@ -1336,8 +1340,8 @@
 		</abnormalLvl>
 		<abnormalTime>8</abnormalTime>
 		<abnormalType>ULTIMATE_DEBUFF</abnormalType>
-		<activateRate>99</activateRate>
-		<castRange>40</castRange>
+		<activateRate>100</activateRate>
+		<castRange>200</castRange>
 		<coolTime>300</coolTime>
 		<effectRange>400</effectRange>
 		<hitTime>910</hitTime>
@@ -1371,8 +1375,7 @@
 			<value level="12">176</value>
 			<value level="13">180</value>
 		</mpConsume>
-		<operateType>DA1</operateType>
-		<nextAction>ATTACK</nextAction>
+		<operateType>DA3</operateType>
 		<reuseDelay>7000</reuseDelay>
 		<effectPoint>
 			<value level="1">-687</value>
@@ -1405,14 +1408,10 @@
 				</weaponType>
 			</condition>
 			<condition name="OpCheckAbnormal">
-				<type>CRITICAL_PROB_DOWN</type>
-				<level>1</level>
-				<hasAbnormal>true</hasAbnormal>
-			</condition>
-			<condition name="OpCheckAbnormal">
-				<type>ULTIMATE_DEBUFF</type>
-				<level>1</level>
+				<type>TRIAD</type>
+				<level>3</level>
 				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
 			</condition>
 		</conditions>
 		<effects>
@@ -1448,9 +1447,8 @@
 			</effect>
 		</effects>
 		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>30608</skillId> <!-- Fury of Eviscerator TODO create a new one -->
-				<skillLevel>1</skillLevel>
+			<effect name="DispelBySlotMyself">
+				<dispel>TRIAD</dispel>
 			</effect>
 		</selfEffects>
 	</skill>
@@ -1779,7 +1777,42 @@
 			<value level="2">icon.skill19442</value>
 			<value level="3">icon.skill19442_3</value>
 		</icon>
-		<operateType>A1</operateType>
+		<isTriggeredSkill>true</isTriggeredSkill>
+		<abnormalType>TRIAD</abnormalType>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+		</abnormalLvl>
+		<abnormalTime>
+			<value level="1">4</value>
+			<value level="2">4</value>
+			<value level="3">12</value>
+		</abnormalTime>
+		<activateRate>100</activateRate>
+		<operateType>A2</operateType>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<specialLevel>-1</specialLevel>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<isMagic>4</isMagic>
+		<effectPoint>100</effectPoint>
+		<effects>
+			<effect name="PAtk">
+				<value level="1">3</value>
+				<value level="2">5</value>
+				<value level="3">10</value>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<value level="1">3</value>
+				<value level="2">5</value>
+				<value level="3">10</value>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19443" toLevel="9" name="Melody of Refection">
 		<!-- Instantly recovers your MP and nearby allies' MP up to $s1 according to their levels and decreases remaining cooldown of Alluring Conduct by $s2. Can be cast in the Triad state. -->
@@ -1795,7 +1828,14 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<reuseDelay>15000</reuseDelay>
 		<effectPoint>100</effectPoint>
-		<!-- TODO: Find proper way for Triad State -->
+		<conditions>
+			<condition name="OpCheckAbnormal">
+				<type>TRIAD</type>
+				<level>3</level>
+				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="ManaHealByLevel">
 				<power>
@@ -1810,6 +1850,9 @@
 					<value level="9">826</value>
 				</power>
 			</effect>
+			<effect name="DispelBySlotMyself">
+				<dispel>TRIAD</dispel>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19444" toLevel="1" name="War Drum">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19500-19599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19500-19599.xml
index 559b5ec88f..607d4eef54 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19500-19599.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19500-19599.xml
@@ -131,7 +131,134 @@
 	<skill id="19522" toLevel="13" name="Repeat Mark Somersault">
 		<!-- Attacks the target with $s1 Power added to P. Atk., decreases P./ M. Def. by $s3 and Speed by $s4 for $s2, and moves $s5 back. Can be cast by consuming Triad. -->
 		<icon>icon.skill19434</icon>
-		<operateType>A1</operateType>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+			<value level="4">4</value>
+			<value level="5">5</value>
+			<value level="6">6</value>
+			<value level="7">7</value>
+			<value level="8">8</value>
+			<value level="9">9</value>
+			<value level="10">10</value>
+			<value level="11">11</value>
+			<value level="12">12</value>
+			<value level="13">13</value>
+		</abnormalLvl>
+		<abnormalTime>8</abnormalTime>
+		<abnormalType>ULTIMATE_DEBUFF</abnormalType>
+		<activateRate>100</activateRate>
+		<castRange>200</castRange>
+		<coolTime>300</coolTime>
+		<effectRange>400</effectRange>
+		<hitTime>910</hitTime>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">86</value>
+			<value level="3">88</value>
+			<value level="4">90</value>
+			<value level="5">92</value>
+			<value level="6">94</value>
+			<value level="7">96</value>
+			<value level="8">98</value>
+			<value level="9">101</value>
+			<value level="10">103</value>
+			<value level="11">105</value>
+			<value level="12">107</value>
+			<value level="13">109</value>
+		</magicLvl>
+		<mpConsume>
+			<value level="1">130</value>
+			<value level="2">132</value>
+			<value level="3">136</value>
+			<value level="4">142</value>
+			<value level="5">146</value>
+			<value level="6">150</value>
+			<value level="7">156</value>
+			<value level="8">160</value>
+			<value level="9">164</value>
+			<value level="10">168</value>
+			<value level="11">172</value>
+			<value level="12">176</value>
+			<value level="13">180</value>
+		</mpConsume>
+		<operateType>DA3</operateType>
+		<reuseDelay>7000</reuseDelay>
+		<effectPoint>
+			<value level="1">-687</value>
+			<value level="2">-694</value>
+			<value level="3">-700</value>
+			<value level="4">-705</value>
+			<value level="5">-709</value>
+			<value level="6">-712</value>
+			<value level="7">-712</value>
+			<value level="8">-712</value>
+			<value level="9">-712</value>
+			<value level="10">-712</value>
+			<value level="11">-712</value>
+			<value level="12">-712</value>
+			<value level="13">-712</value>
+		</effectPoint>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<isDebuff>true</isDebuff>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>DUAL</item>
+					<item>DUALBLUNT</item>
+					<item>SWORD</item>
+					<item>BLUNT</item>
+				</weaponType>
+			</condition>
+			<condition name="OpCheckAbnormal">
+				<type>TRIAD</type>
+				<level>3</level>
+				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="PhysicalAttackWeaponBonus">
+				<power>
+					<value level="1">20668</value>
+					<value level="2">21494</value>
+					<value level="3">23146</value>
+					<value level="4">24798</value>
+					<value level="5">26450</value>
+					<value level="6">28102</value>
+					<value level="7">29754</value>
+					<value level="8">31406</value>
+					<value level="9">33884</value>
+					<value level="10">35536</value>
+					<value level="11">37188</value>
+					<value level="12">38939</value>
+					<value level="13">40690</value>
+				</power>
+				<overHit>true</overHit>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>-20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>-20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Speed">
+				<amount>-150</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
+		<selfEffects>
+			<effect name="DispelBySlotMyself">
+				<dispel>TRIAD</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19523" toLevel="1" name="Maximum Blow">
 		<!-- Resets the cooldown of Heart Breaker/ Chain Blow. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
index df33e3c3ad..51a4508eb5 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -252,6 +252,7 @@ public enum AbnormalType
 	SAYHA_BLESSING(-1),
 	SONG_WEAPON(-1), // TODO: need find proper name
 	HEAL_RESISTANCE(-1), // TODO: need find proper name
+	TRIAD(-1),
 	AB_HAWK_EYE(0),
 	ALL_ATTACK_DOWN(1),
 	ALL_ATTACK_UP(2),
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml
index 06f0464889..0e38e6fb07 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml
@@ -603,6 +603,13 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19442</skillId> <!-- Single Note - Triad -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="11510" toLevel="13" name="Resolving Bash">
 		<!-- Attacks target with $s1 Power added to P. Atk. For $s2, P./ M. Atk. -$s3. Requires a sword/ blunt/ dual sword/ dual blunt to be equipped. Over-hit. Critical. -->
@@ -729,6 +736,13 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19442</skillId> <!-- Single Note - Triad -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="11511" toLevel="13" name="Phantom Slasher">
 		<!-- Attacks the target with $s1 Power added to P. Atk., P. Atk./ M. Atk./ P. Def./ M. Def. -$s3 for $s2 The target can remove these debuffs if it has Spectral Slash Stage 3 or higher. Requires a sword/ blunt/ dual sword/ dual blunt to be equipped. Over-hit. Critical. -->
@@ -979,6 +993,13 @@
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19442</skillId> <!-- Single Note - Triad -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="11514" toLevel="11" name="Resolving Bash">
 		<!-- Attacks target and nearby enemies with $s1 Power added to P. Atk. For $s2, P./ M. Atk. -$s3. Requires a sword/ blunt/ dual sword/ dual blunt to be equipped. Over-hit. Critical. -->
@@ -1086,6 +1107,13 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19442</skillId> <!-- Single Note - Triad -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="11515" toLevel="5" name="Confusion Bomber">
 		<!-- Curses target with darkness. For $s1, decreases Speed and Atk. Spd. by $s2. After $s3, detonates target to inflict damage nearby. Requires a sword, dual sword or dual blunt to be equipped. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19400-19499.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19400-19499.xml
index 376c780c1f..ee4d0c9301 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19400-19499.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19400-19499.xml
@@ -1176,6 +1176,11 @@
 				<skillId>19432</skillId> <!-- Swift Praise -->
 				<skillLevel>1</skillLevel>
 			</effect>
+			<effect name="CallSkill">
+				<skillId>19442</skillId> <!-- Single Note - Triad lvl 1 -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+			</effect>
 		</selfEffects>
 	</skill>
 	<skill id="19432" toLevel="1" name="Swift Praise">
@@ -1277,14 +1282,10 @@
 				</weaponType>
 			</condition>
 			<condition name="OpCheckAbnormal">
-				<type>CRITICAL_PROB_DOWN</type>
-				<level>1</level>
-				<hasAbnormal>true</hasAbnormal>
-			</condition>
-			<condition name="OpCheckAbnormal">
-				<type>ULTIMATE_DEBUFF</type>
-				<level>1</level>
+				<type>TRIAD</type>
+				<level>3</level>
 				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
 			</condition>
 		</conditions>
 		<effects>
@@ -1334,6 +1335,9 @@
 				<skillId>19432</skillId> <!-- Swift Praise -->
 				<skillLevel>1</skillLevel>
 			</effect>
+			<effect name="DispelBySlotMyself">
+				<dispel>TRIAD</dispel>
+			</effect>
 		</selfEffects>
 	</skill>
 	<skill id="19434" toLevel="13" name="Repeat Mark Somersault">
@@ -1356,8 +1360,8 @@
 		</abnormalLvl>
 		<abnormalTime>8</abnormalTime>
 		<abnormalType>ULTIMATE_DEBUFF</abnormalType>
-		<activateRate>99</activateRate>
-		<castRange>40</castRange>
+		<activateRate>100</activateRate>
+		<castRange>200</castRange>
 		<coolTime>300</coolTime>
 		<effectRange>400</effectRange>
 		<hitTime>910</hitTime>
@@ -1391,8 +1395,7 @@
 			<value level="12">176</value>
 			<value level="13">180</value>
 		</mpConsume>
-		<operateType>DA1</operateType>
-		<nextAction>ATTACK</nextAction>
+		<operateType>DA3</operateType>
 		<reuseDelay>7000</reuseDelay>
 		<effectPoint>
 			<value level="1">-687</value>
@@ -1425,14 +1428,10 @@
 				</weaponType>
 			</condition>
 			<condition name="OpCheckAbnormal">
-				<type>CRITICAL_PROB_DOWN</type>
-				<level>1</level>
-				<hasAbnormal>true</hasAbnormal>
-			</condition>
-			<condition name="OpCheckAbnormal">
-				<type>ULTIMATE_DEBUFF</type>
-				<level>1</level>
+				<type>TRIAD</type>
+				<level>3</level>
 				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
 			</condition>
 		</conditions>
 		<effects>
@@ -1468,9 +1467,8 @@
 			</effect>
 		</effects>
 		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>30608</skillId> <!-- Fury of Eviscerator TODO create a new one -->
-				<skillLevel>1</skillLevel>
+			<effect name="DispelBySlotMyself">
+				<dispel>TRIAD</dispel>
 			</effect>
 		</selfEffects>
 	</skill>
@@ -1799,7 +1797,42 @@
 			<value level="2">icon.skill19442</value>
 			<value level="3">icon.skill19442_3</value>
 		</icon>
-		<operateType>A1</operateType>
+		<isTriggeredSkill>true</isTriggeredSkill>
+		<abnormalType>TRIAD</abnormalType>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+		</abnormalLvl>
+		<abnormalTime>
+			<value level="1">4</value>
+			<value level="2">4</value>
+			<value level="3">12</value>
+		</abnormalTime>
+		<activateRate>100</activateRate>
+		<operateType>A2</operateType>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<specialLevel>-1</specialLevel>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<isMagic>4</isMagic>
+		<effectPoint>100</effectPoint>
+		<effects>
+			<effect name="PAtk">
+				<value level="1">3</value>
+				<value level="2">5</value>
+				<value level="3">10</value>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<value level="1">3</value>
+				<value level="2">5</value>
+				<value level="3">10</value>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19443" toLevel="9" name="Melody of Refection">
 		<!-- Instantly recovers your MP and nearby allies' MP up to $s1 according to their levels and decreases remaining cooldown of Alluring Conduct by $s2. Can be cast in the Triad state. -->
@@ -1815,7 +1848,14 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<reuseDelay>15000</reuseDelay>
 		<effectPoint>100</effectPoint>
-		<!-- TODO: Find proper way for Triad State -->
+		<conditions>
+			<condition name="OpCheckAbnormal">
+				<type>TRIAD</type>
+				<level>3</level>
+				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="ManaHealByLevel">
 				<power>
@@ -1830,6 +1870,9 @@
 					<value level="9">826</value>
 				</power>
 			</effect>
+			<effect name="DispelBySlotMyself">
+				<dispel>TRIAD</dispel>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19444" toLevel="1" name="War Drum">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19500-19599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19500-19599.xml
index f37f119714..2e010c1ca9 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19500-19599.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19500-19599.xml
@@ -131,7 +131,134 @@
 	<skill id="19522" toLevel="13" name="Repeat Mark Somersault">
 		<!-- Attacks the target with $s1 Power added to P. Atk., decreases P./ M. Def. by $s3 and Speed by $s4 for $s2, and moves $s5 back. Can be cast by consuming Triad. -->
 		<icon>icon.skill19434</icon>
-		<operateType>A1</operateType>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+			<value level="4">4</value>
+			<value level="5">5</value>
+			<value level="6">6</value>
+			<value level="7">7</value>
+			<value level="8">8</value>
+			<value level="9">9</value>
+			<value level="10">10</value>
+			<value level="11">11</value>
+			<value level="12">12</value>
+			<value level="13">13</value>
+		</abnormalLvl>
+		<abnormalTime>8</abnormalTime>
+		<abnormalType>ULTIMATE_DEBUFF</abnormalType>
+		<activateRate>100</activateRate>
+		<castRange>200</castRange>
+		<coolTime>300</coolTime>
+		<effectRange>400</effectRange>
+		<hitTime>910</hitTime>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">86</value>
+			<value level="3">88</value>
+			<value level="4">90</value>
+			<value level="5">92</value>
+			<value level="6">94</value>
+			<value level="7">96</value>
+			<value level="8">98</value>
+			<value level="9">101</value>
+			<value level="10">103</value>
+			<value level="11">105</value>
+			<value level="12">107</value>
+			<value level="13">109</value>
+		</magicLvl>
+		<mpConsume>
+			<value level="1">130</value>
+			<value level="2">132</value>
+			<value level="3">136</value>
+			<value level="4">142</value>
+			<value level="5">146</value>
+			<value level="6">150</value>
+			<value level="7">156</value>
+			<value level="8">160</value>
+			<value level="9">164</value>
+			<value level="10">168</value>
+			<value level="11">172</value>
+			<value level="12">176</value>
+			<value level="13">180</value>
+		</mpConsume>
+		<operateType>DA3</operateType>
+		<reuseDelay>7000</reuseDelay>
+		<effectPoint>
+			<value level="1">-687</value>
+			<value level="2">-694</value>
+			<value level="3">-700</value>
+			<value level="4">-705</value>
+			<value level="5">-709</value>
+			<value level="6">-712</value>
+			<value level="7">-712</value>
+			<value level="8">-712</value>
+			<value level="9">-712</value>
+			<value level="10">-712</value>
+			<value level="11">-712</value>
+			<value level="12">-712</value>
+			<value level="13">-712</value>
+		</effectPoint>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<isDebuff>true</isDebuff>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>DUAL</item>
+					<item>DUALBLUNT</item>
+					<item>SWORD</item>
+					<item>BLUNT</item>
+				</weaponType>
+			</condition>
+			<condition name="OpCheckAbnormal">
+				<type>TRIAD</type>
+				<level>3</level>
+				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="PhysicalAttackWeaponBonus">
+				<power>
+					<value level="1">20668</value>
+					<value level="2">21494</value>
+					<value level="3">23146</value>
+					<value level="4">24798</value>
+					<value level="5">26450</value>
+					<value level="6">28102</value>
+					<value level="7">29754</value>
+					<value level="8">31406</value>
+					<value level="9">33884</value>
+					<value level="10">35536</value>
+					<value level="11">37188</value>
+					<value level="12">38939</value>
+					<value level="13">40690</value>
+				</power>
+				<overHit>true</overHit>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>-20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>-20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Speed">
+				<amount>-150</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
+		<selfEffects>
+			<effect name="DispelBySlotMyself">
+				<dispel>TRIAD</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19523" toLevel="1" name="Maximum Blow">
 		<!-- Resets the cooldown of Heart Breaker/ Chain Blow. -->
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
index df33e3c3ad..51a4508eb5 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -252,6 +252,7 @@ public enum AbnormalType
 	SAYHA_BLESSING(-1),
 	SONG_WEAPON(-1), // TODO: need find proper name
 	HEAL_RESISTANCE(-1), // TODO: need find proper name
+	TRIAD(-1),
 	AB_HAWK_EYE(0),
 	ALL_ATTACK_DOWN(1),
 	ALL_ATTACK_UP(2),