From 554bfd6afb281d61ae5e40cdcb8816674d705090 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 15 Jul 2020 06:44:10 +0000
Subject: [PATCH] Fixed Sword Expert used even if sword is not equipped.
 Contributed by Sahar.

---
 .../game/data/stats/skills/01600-01699.xml    | 47 +++++++------------
 .../game/data/stats/skills/01600-01699.xml    |  7 ---
 .../game/data/stats/skills/01600-01699.xml    |  7 ---
 .../game/data/stats/skills/01600-01699.xml    |  7 ---
 .../game/data/stats/skills/01600-01699.xml    |  7 ---
 .../game/data/stats/skills/01600-01699.xml    |  7 ---
 6 files changed, 17 insertions(+), 65 deletions(-)

diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01600-01699.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01600-01699.xml
index 019a2cb42c..2a75c0b319 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01600-01699.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01600-01699.xml
@@ -406,23 +406,22 @@
 			<value level="1">1</value>
 			<value level="2">2</value>
 		</abnormalLvl>
-		<abnormalTime>
-			<value fromLevel="1" toLevel="2">5</value>
-		</abnormalTime>
+		<abnormalTime>5</abnormalTime>
 		<abnormalType>RESIST_DEATH</abnormalType>
 		<operateType>A2</operateType>
-		<targetType>SELF</targetType>
-		<affectScope>SINGLE</affectScope>
 		<mpConsume>
 			<value level="1">38</value>
 			<value level="2">42</value>
 		</mpConsume>
 		<hitTime>500</hitTime>
+		<coolTime>300</coolTime>
 		<reuseDelay>600000</reuseDelay>
 		<effectPoint>2</effectPoint>
 		<reuseDelayType>S</reuseDelayType>
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="IgnoreDeath" />
 		</effects>
@@ -441,32 +440,15 @@
 		<magicLvl>
 			<value level="1">46</value>
 			<value level="2">58</value>
-			<value level="2">70</value>
-			<value level="3">70</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="3">70</value>
 		</magicLvl>
-		<mpConsume>
-			<value level="1">1</value>
-			<value level="2">2</value>
-			<value level="2">3</value>
-		</mpConsume>
+		<mpConsume>1</mpConsume>
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>NONE</targetType>
-		<conditions>
-			<condition name="EquipWeapon">
-				<weaponType>
-					<item>SWORD</item>
-					<item>BLUNT</item>
-				</weaponType>
-			</condition>
-		</conditions>
 		<effects>
 			<effect name="ManaDamOverTime">
-				<power>
-					<value level="1">1</value>
-					<value level="2">2</value>
-					<value level="3">3</value>
-				</power>
+				<power>1</power>
 				<ticks>2</ticks>
 			</effect>
 			<effect name="PAtk">
@@ -476,6 +458,9 @@
 					<value level="3">60</value>
 				</amount>
 				<mode>DIFF</mode>
+				<weaponType>
+					<item>SWORD</item>
+				</weaponType>
 			</effect>
 			<effect name="Accuracy">
 				<amount>
@@ -484,14 +469,16 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>DIFF</mode>
+				<weaponType>
+					<item>SWORD</item>
+				</weaponType>
 			</effect>
 			<effect name="PhysicalAttackSpeed">
-				<amount>
-					<value level="1">30</value>
-					<value level="2">30</value>
-					<value level="3">30</value>
-				</amount>
+				<amount>30</amount>
 				<mode>DIFF</mode>
+				<weaponType>
+					<item>SWORD</item>
+				</weaponType>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/01600-01699.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/01600-01699.xml
index 0110573611..68f4c1ecc0 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/01600-01699.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/01600-01699.xml
@@ -441,13 +441,6 @@
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>NONE</targetType>
-		<conditions>
-			<condition name="EquipWeapon">
-				<weaponType>
-					<item>SWORD</item>
-				</weaponType>
-			</condition>
-		</conditions>
 		<effects>
 			<effect name="ManaDamOverTime">
 				<power>1</power>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/01600-01699.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/01600-01699.xml
index 05c9d08e8f..000b847960 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/01600-01699.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/01600-01699.xml
@@ -462,13 +462,6 @@
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>NONE</targetType>
-		<conditions>
-			<condition name="EquipWeapon">
-				<weaponType>
-					<item>SWORD</item>
-				</weaponType>
-			</condition>
-		</conditions>
 		<effects>
 			<effect name="ManaDamOverTime">
 				<power>1</power>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/01600-01699.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/01600-01699.xml
index 07bfdb2bec..863b6c3229 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/01600-01699.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/01600-01699.xml
@@ -462,13 +462,6 @@
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>NONE</targetType>
-		<conditions>
-			<condition name="EquipWeapon">
-				<weaponType>
-					<item>SWORD</item>
-				</weaponType>
-			</condition>
-		</conditions>
 		<effects>
 			<effect name="ManaDamOverTime">
 				<power>1</power>
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/01600-01699.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/01600-01699.xml
index ec14cb6e7b..19895a8db9 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/01600-01699.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/01600-01699.xml
@@ -473,13 +473,6 @@
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>NONE</targetType>
-		<conditions>
-			<condition name="EquipWeapon">
-				<weaponType>
-					<item>SWORD</item>
-				</weaponType>
-			</condition>
-		</conditions>
 		<effects>
 			<effect name="ManaDamOverTime">
 				<power>1</power>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01600-01699.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01600-01699.xml
index 7e3e806160..9877b9025e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01600-01699.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01600-01699.xml
@@ -462,13 +462,6 @@
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>NONE</targetType>
-		<conditions>
-			<condition name="EquipWeapon">
-				<weaponType>
-					<item>SWORD</item>
-				</weaponType>
-			</condition>
-		</conditions>
 		<effects>
 			<effect name="ManaDamOverTime">
 				<power>1</power>