From fb0bf57910db2810cf8a8ea9e9cf5efbd131a1e1 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 21 Oct 2019 10:46:44 +0000
Subject: [PATCH] Various skill adjustments. Contributed by gamelike85.

---
 .../game/data/stats/skills/10000-10099.xml    |  6 +--
 .../game/data/stats/skills/19200-19299.xml    |  4 ++
 .../game/data/stats/skills/10000-10099.xml    |  6 +--
 .../game/data/stats/skills/19200-19299.xml    |  4 ++
 .../game/data/stats/skills/10000-10099.xml    |  6 +--
 .../game/data/stats/skills/19200-19299.xml    |  4 ++
 .../game/data/stats/skills/10000-10099.xml    |  6 +--
 .../game/data/stats/skills/11500-11599.xml    | 52 ++++++++-----------
 .../game/data/stats/skills/19200-19299.xml    |  4 ++
 .../game/data/stats/skills/19400-19499.xml    | 48 ++++++++++++++---
 10 files changed, 89 insertions(+), 51 deletions(-)

diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml
index d778ffc323..4c083c3e22 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml
@@ -2200,7 +2200,7 @@
 				<magicType>1</magicType>
 			</effect>
 			<effect name="Reuse">
-				<amount>-10</amount>
+				<amount>-5</amount>
 				<mode>PER</mode>
 				<magicType>3</magicType>
 			</effect>
@@ -2291,11 +2291,11 @@
 				<mode>PER</mode>
 			</effect>
 			<effect name="DefenceCriticalDamage">
-				<amount>-15</amount>
+				<amount>-10</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="DefenceMagicCriticalDamage">
-				<amount>-15</amount>
+				<amount>-10</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19200-19299.xml
index e6e8be2e05..c2ab172a88 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19200-19299.xml
@@ -168,6 +168,10 @@
 				<amount>25</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="CallSkill">
+				<skillId>19447</skillId> <!-- Glaring -->
+				<skillLevel>1</skillLevel>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19205" toLevel="1" name="Song of Archery">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml
index e487d5e724..6c2cd63c7e 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml
@@ -2200,7 +2200,7 @@
 				<magicType>1</magicType>
 			</effect>
 			<effect name="Reuse">
-				<amount>-10</amount>
+				<amount>-5</amount>
 				<mode>PER</mode>
 				<magicType>3</magicType>
 			</effect>
@@ -2291,11 +2291,11 @@
 				<mode>PER</mode>
 			</effect>
 			<effect name="DefenceCriticalDamage">
-				<amount>-15</amount>
+				<amount>-10</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="DefenceMagicCriticalDamage">
-				<amount>-15</amount>
+				<amount>-10</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml
index 4d61134eed..fa57cd1db8 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml
@@ -168,6 +168,10 @@
 				<amount>25</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="CallSkill">
+				<skillId>19447</skillId> <!-- Glaring -->
+				<skillLevel>1</skillLevel>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19205" toLevel="1" name="Song of Archery">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml
index 6476ee67a2..6f02f79d3b 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml
@@ -2289,7 +2289,7 @@
 				<magicType>1</magicType>
 			</effect>
 			<effect name="Reuse">
-				<amount>-10</amount>
+				<amount>-5</amount>
 				<mode>PER</mode>
 				<magicType>3</magicType>
 			</effect>
@@ -2380,11 +2380,11 @@
 				<mode>PER</mode>
 			</effect>
 			<effect name="DefenceCriticalDamage">
-				<amount>-15</amount>
+				<amount>-10</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="DefenceMagicCriticalDamage">
-				<amount>-15</amount>
+				<amount>-10</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml
index 429d98e3ce..f07b87b7d1 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml
@@ -168,6 +168,10 @@
 				<amount>25</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="CallSkill">
+				<skillId>19447</skillId> <!-- Glaring -->
+				<skillLevel>1</skillLevel>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19205" toLevel="1" name="Song of Archery">
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml
index 0e57c9c862..86672431ad 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml
@@ -2289,7 +2289,7 @@
 				<magicType>1</magicType>
 			</effect>
 			<effect name="Reuse">
-				<amount>-10</amount>
+				<amount>-5</amount>
 				<mode>PER</mode>
 				<magicType>3</magicType>
 			</effect>
@@ -2380,11 +2380,11 @@
 				<mode>PER</mode>
 			</effect>
 			<effect name="DefenceCriticalDamage">
-				<amount>-15</amount>
+				<amount>-10</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="DefenceMagicCriticalDamage">
-				<amount>-15</amount>
+				<amount>-10</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml
index 0cbe4e7568..d4f46ea0c1 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml
@@ -752,7 +752,7 @@
 		</selfEffects>
 	</skill>
 	<skill id="11511" toLevel="13" name="Phantom Slasher">
-		<!-- 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 1 or higher. Requires a sword, blunt weapon, dualsword or dual blunt weapon to be equipped. Over-hit. Critical. -->
+		<!-- Attacks the target with 26041 power. For 10 seconds, enemy's P./ M. Atk. and P./ M. Def. -50%. Removes the Spectral Slash Lv. 1+ effect from the target. Requires a sword, a blunt weapon, dual swords, or dual blunt weapons. Critical. Over-hit. -->
 		<icon>icon.skill11511_2</icon>
 		<abnormalLvl>5</abnormalLvl>
 		<abnormalTime>10</abnormalTime>
@@ -820,6 +820,11 @@
 		<affectScope>SINGLE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<conditions>
+			<condition name="OpCheckAbnormal">
+				<type>ULTIMATE_DEBUFF</type>
+				<level>1</level>
+				<hasAbnormal>true</hasAbnormal>
+			</condition>
 			<condition name="EquipWeapon">
 				<weaponType>
 					<item>DUAL</item>
@@ -870,24 +875,6 @@
 				<amount>-50</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="CallSkill">
-				<skillId>19435</skillId> <!-- Spectral Slash -->
-				<skillLevel>
-					<value level="1">1</value> <!-- Guessed -->
-					<value level="2">1</value> <!-- Guessed -->
-					<value level="3">2</value> <!-- Guessed -->
-					<value level="4">2</value> <!-- Guessed -->
-					<value level="5">3</value> <!-- Guessed -->
-					<value level="6">3</value> <!-- Guessed -->
-					<value level="7">3</value> <!-- Guessed -->
-					<value level="8">4</value> <!-- Guessed -->
-					<value level="9">4</value> <!-- Guessed -->
-					<value level="10">4</value> <!-- Guessed -->
-					<value level="11">5</value> <!-- Guessed -->
-					<value level="12">5</value> <!-- Guessed -->
-					<value level="13">5</value> <!-- Guessed -->
-				</skillLevel>
-			</effect>
 		</effects>
 		<selfEffects>
 			<effect name="CallSkill">
@@ -4580,25 +4567,28 @@
 		<icon>icon.skill11585</icon>
 		<operateType>P</operateType>
 		<effects>
-			<effect name="TriggerSkillBySkill">
-				<castSkillId>11508</castSkillId><!-- Trace of Twin Edges -->
-				<skillId>19435</skillId> <!-- Spectral Slash -->
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19435</skillId> <!-- Phantom Slasher -->
 				<skillLevel>1</skillLevel>
-				<chance>30</chance>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+				<attackSkillId>11508</attackSkillId> <!-- Trace of Twin Edges -->
+				<chance>100</chance>
 				<targetType>TARGET</targetType>
 			</effect>
-			<effect name="TriggerSkillBySkill">
-				<castSkillId>19426</castSkillId><!-- Shadow Blade -->
-				<skillId>19435</skillId> <!-- Spectral Slash -->
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19435</skillId> <!-- Phantom Slasher -->
 				<skillLevel>1</skillLevel>
-				<chance>30</chance>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+				<attackSkillId>19426</attackSkillId> <!-- Shadow Blade -->
+				<chance>100</chance>
 				<targetType>TARGET</targetType>
 			</effect>
-			<effect name="TriggerSkillBySkill">
-				<castSkillId>11510</castSkillId><!-- Resolving Bash -->
-				<skillId>19435</skillId> <!-- Spectral Slash -->
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19435</skillId> <!-- Phantom Slasher -->
 				<skillLevel>1</skillLevel>
-				<chance>30</chance>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+				<attackSkillId>11510</attackSkillId> <!-- Resolving Bash -->
+				<chance>100</chance>
 				<targetType>TARGET</targetType>
 			</effect>
 			<effect name="PAtk">
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml
index 9a174083e6..1ecc8870fe 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml
@@ -168,6 +168,10 @@
 				<amount>25</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="CallSkill">
+				<skillId>19447</skillId> <!-- Glaring -->
+				<skillLevel>1</skillLevel>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19205" toLevel="1" name="Song of Archery">
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19400-19499.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19400-19499.xml
index 22f2dda49d..04e87ce9b8 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19400-19499.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19400-19499.xml
@@ -1571,7 +1571,7 @@
 	<skill id="19435" toLevel="5" name="Spectral Slash">
 		<!-- The Spectral Sword attacks the target with $s1 Power added to P. Atk. and decreases P./ M. Def. by $s3 for $s2 -->
 		<icon>icon.skill19435</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
 		<isTriggeredSkill>true</isTriggeredSkill>
 		<isDebuff>true</isDebuff>
 		<abnormalTime>10</abnormalTime>
@@ -1627,7 +1627,7 @@
 		</effects>
 	</skill>
 	<skill id="19436" toLevel="13" name="Dancing Phantom Blade">
-		<!-- Attacks the target and nearby enemies with $s1 Power added to P. Atk. to make them unable to target you and decrease their P. Atk./M. Atk./P. Def./M. Def./Movement Speed by $s3 for $s2. Enemies with the Spectral Slash Stage 2 or higher can remove these debuffs. Requires a sword, blunt weapon, dualsword or dual blunt weapon to be equipped. Over-hit. Critical. -->
+		<!-- Attacks the target and nearby enemies with 28631 power, making them unable to target you. For 10 seconds, enemies' P./ M. Atk., P./ M. Def., and Speed -50%. Can be used if the enemies are inflicted with Spectral Slash Lv. 2+. Requires a sword, a blunt weapon, dual swords, or dual blunt weapons. Critical. Over-hit. -->
 		<icon>icon.skill19436</icon>
 		<abnormalLvl>5</abnormalLvl>
 		<abnormalTime>10</abnormalTime>
@@ -1697,6 +1697,11 @@
 		<affectScope>RANGE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<conditions>
+			<condition name="OpCheckAbnormal">
+				<type>ULTIMATE_DEBUFF</type>
+				<level>2</level>
+				<hasAbnormal>true</hasAbnormal>
+			</condition>
 			<condition name="EquipWeapon">
 				<weaponType>
 					<item>DUAL</item>
@@ -1759,6 +1764,12 @@
 				<chance>100</chance>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>15404</skillId> <!-- Unable to Target -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19437" toLevel="1" name="Vanguard of Baylor">
 		<!-- Summons the Dominant Flag. If used near the Dominant Flag, applies the effects of Melody/ Harmony/ Drum/ Ditty/ Rhapsody buff skills to clan members and enhances Seal Mesmerizing skills (Lv. 4+). Makes you immune to pulling. Consumes 5 Spirit Ore. -->
@@ -2203,18 +2214,23 @@
 		<!-- For $s1, P. Atk. and M. Atk. +$s2. Canceled if Prophecy of Might is cast. -->
 		<icon>icon.skill11866</icon>
 		<operateType>A2</operateType>
-		<reuseDelay>3000</reuseDelay>
+		<reuseDelay>
+			<value level="1">600000</value>
+			<value level="2">3000</value>
+		</reuseDelay>
 		<abnormalLvl>
 			<value level="1">1</value>
 			<value level="2">2</value>
 		</abnormalLvl>
-		<abnormalType>SONG_WEAPON</abnormalType>
-		<abnormalTime>300</abnormalTime>
+		<abnormalTime>
+			<value level="1">300</value>
+			<value level="2">1</value>		
+		</abnormalTime>
+		<abnormalType>PD_UP_DMAGIC</abnormalType> <!-- NOT RETAIL: FIXME -->
 		<isTriggeredSkill>true</isTriggeredSkill>
 		<effectPoint>707</effectPoint>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<isTriggeredSkill>true</isTriggeredSkill>
 		<affectRange>2000</affectRange>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>
@@ -2222,13 +2238,29 @@
 		<affectObject>FRIEND</affectObject>
 		<effects>
 			<effect name="PAtk">
-				<amount>20</amount>
+				<amount>
+					<value level="1">20</value>
+					<value level="2">0</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MAtk">
-				<amount>20</amount>
+				<amount>
+					<value level="1">20</value>
+					<value level="2">0</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="ReuseSkillById" fromLevel="1" toLevel="1">
+				<skillId>19204</skillId>
+			</effect>
+			<effect name="TriggerSkillBySkill">
+				<castSkillId>19204</castSkillId>
+				<skillId>19447</skillId> <!-- Glaring -->
+				<skillLevel>2</skillLevel>
+				<chance>100</chance>
+				<targetType>SELF</targetType>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19448" toLevel="13" name="Rampageous Beat">