From d79d227d7a8d8bcced3dbb01c4e5e0275c89aa4c Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 18 Oct 2017 06:48:20 +0000
Subject: [PATCH] Improvements for previous commit. Contributed by gamelike85.

---
 .../game/data/stats/skills/10300-10399.xml    | 45 ++++++++++++++++---
 .../game/data/stats/skills/17700-17799.xml    |  3 ++
 .../game/data/stats/skills/10300-10399.xml    | 37 ++++++++++++---
 .../game/data/stats/skills/17700-17799.xml    |  3 ++
 .../game/data/stats/skills/10300-10399.xml    | 37 ++++++++++++---
 .../game/data/stats/skills/17700-17799.xml    |  3 ++
 6 files changed, 111 insertions(+), 17 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10300-10399.xml
index ce72f7bbc0..68d5d2ba5e 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10300-10399.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10300-10399.xml
@@ -785,7 +785,7 @@
 					<value level="7">29911</value>
 				</power>
 				<overHit>true</overHit>
-				<criticalChance>15
+				<criticalChance>
 					<value fromLevel="1" toLevel="7">15</value>
 				</criticalChance>
 				<chargeConsume>3</chargeConsume>
@@ -1655,18 +1655,50 @@
 			<value level="2">icon.skill0526</value>
 			<value level="3">icon.skill0526</value>
 		</icon>
-		<operateType>A1</operateType>
+		<itemConsumeCount>
+			<value level="1">1</value>
+			<value level="2">1</value>
+			<value level="3">1</value>
+		</itemConsumeCount>
+		<itemConsumeId>
+			<value level="1">1785</value>
+			<value level="2">1785</value>
+			<value level="3">1785</value>
+		</itemConsumeId>
 		<mpConsume>
 			<value level="1">233</value>
 			<value level="2">236</value>
 			<value level="3">239</value>
 		</mpConsume>
-		<magicLvl>85</magicLvl>
+		<magicLvl>
+			<value level="1">101</value>
+			<value level="2">103</value>
+			<value level="3">105</value>
+		</magicLvl>
+		<affectLimit>6-12</affectLimit>
+		<affectRange>200</affectRange>
+		<basicProperty>PHYSICAL</basicProperty>
+		<operateType>A1</operateType>
+		<fanRange>0;0;200;900</fanRange>
 		<castRange>40</castRange>
 		<hitTime>1000</hitTime>
-		<coolTime>500</coolTime>
-		<effectPoint>-125</effectPoint>
+		<coolTime>500</coolTime>s
 		<reuseDelay>10000</reuseDelay>
+		<effectPoint>-125</effectPoint>
+		<rideState>NONE</rideState>
+		<staticReuse>true</staticReuse>
+		<targetType>SELF</targetType>
+		<affectScope>SQUARE_PB</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<nextAction>ATTACK</nextAction>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>SWORD</item>
+					<item>BLUNT</item>
+				</weaponType>
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="PhysicalAttack">
 				<power>
@@ -1674,8 +1706,7 @@
 					<value level="2">17094</value>
 					<value level="3">17959</value>
 				</power>
-				<overHit>true</overHit>				
-				<criticalChance>15</criticalChance>
+				<overHit>false</overHit>				
 				<pDefMod>0.7</pDefMod>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17700-17799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17700-17799.xml
index d7905add1e..286a5d3262 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17700-17799.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17700-17799.xml
@@ -25,6 +25,9 @@
 		<reuseDelay>30000</reuseDelay>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<targetConditions>
+			<condition name="OpCheckFlag" />
+		</targetConditions>
 		<effects>
 			<effect name="BlockSkill">
 				<magicTypes>1;3</magicTypes>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10300-10399.xml
index f87e4330dd..74a8c250fe 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10300-10399.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10300-10399.xml
@@ -1686,7 +1686,16 @@
 			<value level="2">icon.skill0526</value>
 			<value level="3">icon.skill0526</value>
 		</icon>
-		<operateType>A1</operateType>
+		<itemConsumeCount>
+			<value level="1">1</value>
+			<value level="2">1</value>
+			<value level="3">1</value>
+		</itemConsumeCount>
+		<itemConsumeId>
+			<value level="1">1785</value>
+			<value level="2">1785</value>
+			<value level="3">1785</value>
+		</itemConsumeId>
 		<mpConsume>
 			<value level="1">233</value>
 			<value level="2">236</value>
@@ -1697,11 +1706,30 @@
 			<value level="2">103</value>
 			<value level="3">105</value>
 		</magicLvl>
+		<affectLimit>6-12</affectLimit>
+		<affectRange>200</affectRange>
+		<basicProperty>PHYSICAL</basicProperty>
+		<operateType>A1</operateType>
+		<fanRange>0;0;200;900</fanRange>
 		<castRange>40</castRange>
 		<hitTime>1000</hitTime>
-		<coolTime>500</coolTime>
-		<effectPoint>-125</effectPoint>
+		<coolTime>500</coolTime>s
 		<reuseDelay>10000</reuseDelay>
+		<effectPoint>-125</effectPoint>
+		<rideState>NONE</rideState>
+		<staticReuse>true</staticReuse>
+		<targetType>SELF</targetType>
+		<affectScope>SQUARE_PB</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<nextAction>ATTACK</nextAction>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>SWORD</item>
+					<item>BLUNT</item>
+				</weaponType>
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="PhysicalAttack">
 				<power>
@@ -1709,8 +1737,7 @@
 					<value level="2">17094</value>
 					<value level="3">17959</value>
 				</power>
-				<overHit>true</overHit>				
-				<criticalChance>15</criticalChance>
+				<overHit>false</overHit>				
 				<pDefMod>0.7</pDefMod>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17700-17799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17700-17799.xml
index e0b30d2cad..d65fbcf45f 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17700-17799.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17700-17799.xml
@@ -25,6 +25,9 @@
 		<reuseDelay>30000</reuseDelay>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<targetConditions>
+			<condition name="OpCheckFlag" />
+		</targetConditions>
 		<effects>
 			<effect name="BlockSkill">
 				<magicTypes>1;3</magicTypes>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10300-10399.xml
index 24e5496494..de5333e481 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10300-10399.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10300-10399.xml
@@ -1687,7 +1687,16 @@
 			<value level="2">icon.skill0526</value>
 			<value level="3">icon.skill0526</value>
 		</icon>
-		<operateType>A1</operateType>
+		<itemConsumeCount>
+			<value level="1">1</value>
+			<value level="2">1</value>
+			<value level="3">1</value>
+		</itemConsumeCount>
+		<itemConsumeId>
+			<value level="1">1785</value>
+			<value level="2">1785</value>
+			<value level="3">1785</value>
+		</itemConsumeId>
 		<mpConsume>
 			<value level="1">233</value>
 			<value level="2">236</value>
@@ -1698,11 +1707,30 @@
 			<value level="2">103</value>
 			<value level="3">105</value>
 		</magicLvl>
+		<affectLimit>6-12</affectLimit>
+		<affectRange>200</affectRange>
+		<basicProperty>PHYSICAL</basicProperty>
+		<operateType>A1</operateType>
+		<fanRange>0;0;200;900</fanRange>
 		<castRange>40</castRange>
 		<hitTime>1000</hitTime>
-		<coolTime>500</coolTime>
-		<effectPoint>-125</effectPoint>
+		<coolTime>500</coolTime>s
 		<reuseDelay>10000</reuseDelay>
+		<effectPoint>-125</effectPoint>
+		<rideState>NONE</rideState>
+		<staticReuse>true</staticReuse>
+		<targetType>SELF</targetType>
+		<affectScope>SQUARE_PB</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<nextAction>ATTACK</nextAction>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>SWORD</item>
+					<item>BLUNT</item>
+				</weaponType>
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="PhysicalAttack">
 				<power>
@@ -1710,8 +1738,7 @@
 					<value level="2">17094</value>
 					<value level="3">17959</value>
 				</power>
-				<overHit>true</overHit>				
-				<criticalChance>15</criticalChance>
+				<overHit>false</overHit>				
 				<pDefMod>0.7</pDefMod>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17700-17799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17700-17799.xml
index dc0675d5c9..075ee7ba80 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17700-17799.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17700-17799.xml
@@ -27,6 +27,9 @@
 		<reuseDelay>30000</reuseDelay>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<targetConditions>
+			<condition name="OpCheckFlag" />
+		</targetConditions>
 		<effects>
 			<effect name="BlockSkill">
 				<magicTypes>1;3</magicTypes>