From 6e7b1ab07b0074c49669a2cf37b3a2ee91f0825c Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 22 Sep 2017 17:42:54 +0000
Subject: [PATCH] Proper Lightning Force skill. Contributed by gamelike85.

---
 .../game/data/stats/skills/10200-10299.xml    | 95 +++++++++----------
 .../game/data/stats/skills/10200-10299.xml    | 95 +++++++++----------
 .../game/data/stats/skills/10200-10299.xml    | 95 +++++++++----------
 3 files changed, 135 insertions(+), 150 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml
index 76972bf34b..37f41d0421 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml
@@ -2298,65 +2298,30 @@
 			<value level="2">icon.skill10284_2</value>
 			<value level="3">icon.skill10284_3</value>
 		</icon>
-		<operateType>A2</operateType>
-		<castRange>400</castRange>
-		<abnormalType>WEAPON_MASTER_SPECIAL</abnormalType>
-		<basicProperty>NONE</basicProperty>
-		<rideState>NONE</rideState>
-		<magicCriticalRate>5</magicCriticalRate>
-		<effectRange>900</effectRange>
-		<magicLvl>85</magicLvl>
 		<abnormalLvl>
-			<value level="1">1</value>
-			<value level="2">2</value>
-			<value level="3">3</value>
+			<value level="1">2</value>
+			<value level="2">3</value>
+			<value level="3">4</value>
 		</abnormalLvl>
 		<abnormalTime>
 			<value level="1">30</value>
 			<value level="2">20</value>
 			<value level="3">15</value>
 		</abnormalTime>
-		<isMagic>4</isMagic>
+		<abnormalType>WEAPON_MASTER_SPECIAL</abnormalType>		
+		<isMagic>4</isMagic> <!-- Item Skill -->
+		<isTriggeredSkill>true</isTriggeredSkill>
+		<magicLvl>95</magicLvl>
+		<operateType>A2</operateType>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<effectRange>900</effectRange>
+		<castRange>400</castRange>
+		<rideState>NONE</rideState>
 		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
-		<isTriggeredSkill>true</isTriggeredSkill>
-		<effects>
-			<effect name="DispelBySlotProbability">
-				<dispel>WEAPON_MASTER_SPECIAL</dispel>
-				<rate>100</rate>
-			</effect>
-			<effect name="BlockAbnormalSlot" fromLevel="3" toLevel="3">
-				<slot>WEAPON_MASTER_SPECIAL</slot>
-			</effect>
-			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="1">
-				<isCritical>true</isCritical>
-				<attackerType>L2Character</attackerType>
-				<minAttackerLevel>1</minAttackerLevel>
-				<maxAttackerLevel>107</maxAttackerLevel>
-				<chance>20</chance>
-				<targetType>SELF</targetType>
-				<minDamage>1</minDamage>
-				<skillId>10284</skillId>
-				<skillLevel>2</skillLevel>
-			</effect>
-			<effect name="TriggerSkillByAttack" fromLevel="2" toLevel="2">
-				<isCritical>true</isCritical>
-				<attackerType>L2Character</attackerType>
-				<minAttackerLevel>1</minAttackerLevel>
-				<maxAttackerLevel>107</maxAttackerLevel>
-				<chance>10</chance>
-				<targetType>SELF</targetType>
-				<minDamage>1</minDamage>
-				<skillId>10284</skillId>
-				<skillLevel>3</skillLevel>
-			</effect>
-			<effect name="PAtk">
-				<amount>
-					<value level="1">10</value>
-					<value level="2">20</value>
-					<value level="3">30</value>
-				</amount>
-				<mode>PER</mode>
+		<conditions>
+			<condition name="EquipWeapon">
 				<weaponType>
 					<item>DUAL</item>
 					<item>POLE</item>
@@ -2365,6 +2330,36 @@
 					<item>DUALFIST</item>
 					<item>DUALBLUNT</item>
 				</weaponType>
+			</condition>
+		</conditions>
+		<effects>		
+			<effect name="TriggerSkillByAttack">
+				<!-- Lightning Force -->
+				<isCritical>true</isCritical>
+				<attackerType>L2Character</attackerType>
+				<minAttackerLevel>1</minAttackerLevel>
+				<maxAttackerLevel>107</maxAttackerLevel>
+				<chance>
+					<value level="1">30</value>
+					<value level="2">20</value>
+					<value level="3">0</value>
+				</chance>
+				<targetType>SELF</targetType>
+				<minDamage>1</minDamage>
+				<skillId>10284</skillId>
+				<skillLevel>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">0</value>
+				</skillLevel>
+			</effect>		
+			<effect name="PAtk">
+				<amount>
+					<value level="1">10</value>
+					<value level="2">20</value>
+					<value level="3">30</value>
+				</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="Speed">
 				<amount>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml
index 037ea57f99..a0f3ac1a89 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml
@@ -2321,65 +2321,30 @@
 			<value level="2">icon.skill10284_2</value>
 			<value level="3">icon.skill10284_3</value>
 		</icon>
-		<operateType>A2</operateType>
-		<castRange>400</castRange>
-		<abnormalType>WEAPON_MASTER_SPECIAL</abnormalType>
-		<basicProperty>NONE</basicProperty>
-		<rideState>NONE</rideState>
-		<magicCriticalRate>5</magicCriticalRate>
-		<effectRange>900</effectRange>
-		<magicLvl>85</magicLvl>
 		<abnormalLvl>
-			<value level="1">1</value>
-			<value level="2">2</value>
-			<value level="3">3</value>
+			<value level="1">2</value>
+			<value level="2">3</value>
+			<value level="3">4</value>
 		</abnormalLvl>
 		<abnormalTime>
 			<value level="1">30</value>
 			<value level="2">20</value>
 			<value level="3">15</value>
 		</abnormalTime>
-		<isMagic>4</isMagic>
+		<abnormalType>WEAPON_MASTER_SPECIAL</abnormalType>		
+		<isMagic>4</isMagic> <!-- Item Skill -->
+		<isTriggeredSkill>true</isTriggeredSkill>
+		<magicLvl>95</magicLvl>
+		<operateType>A2</operateType>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<effectRange>900</effectRange>
+		<castRange>400</castRange>
+		<rideState>NONE</rideState>
 		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
-		<isTriggeredSkill>true</isTriggeredSkill>
-		<effects>
-			<effect name="DispelBySlotProbability">
-				<dispel>WEAPON_MASTER_SPECIAL</dispel>
-				<rate>100</rate>
-			</effect>
-			<effect name="BlockAbnormalSlot" fromLevel="3" toLevel="3">
-				<slot>WEAPON_MASTER_SPECIAL</slot>
-			</effect>
-			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="1">
-				<isCritical>true</isCritical>
-				<attackerType>L2Character</attackerType>
-				<minAttackerLevel>1</minAttackerLevel>
-				<maxAttackerLevel>107</maxAttackerLevel>
-				<chance>20</chance>
-				<targetType>SELF</targetType>
-				<minDamage>1</minDamage>
-				<skillId>10284</skillId>
-				<skillLevel>2</skillLevel>
-			</effect>
-			<effect name="TriggerSkillByAttack" fromLevel="2" toLevel="2">
-				<isCritical>true</isCritical>
-				<attackerType>L2Character</attackerType>
-				<minAttackerLevel>1</minAttackerLevel>
-				<maxAttackerLevel>107</maxAttackerLevel>
-				<chance>10</chance>
-				<targetType>SELF</targetType>
-				<minDamage>1</minDamage>
-				<skillId>10284</skillId>
-				<skillLevel>3</skillLevel>
-			</effect>
-			<effect name="PAtk">
-				<amount>
-					<value level="1">10</value>
-					<value level="2">20</value>
-					<value level="3">30</value>
-				</amount>
-				<mode>PER</mode>
+		<conditions>
+			<condition name="EquipWeapon">
 				<weaponType>
 					<item>DUAL</item>
 					<item>POLE</item>
@@ -2388,6 +2353,36 @@
 					<item>DUALFIST</item>
 					<item>DUALBLUNT</item>
 				</weaponType>
+			</condition>
+		</conditions>
+		<effects>		
+			<effect name="TriggerSkillByAttack">
+				<!-- Lightning Force -->
+				<isCritical>true</isCritical>
+				<attackerType>L2Character</attackerType>
+				<minAttackerLevel>1</minAttackerLevel>
+				<maxAttackerLevel>107</maxAttackerLevel>
+				<chance>
+					<value level="1">30</value>
+					<value level="2">20</value>
+					<value level="3">0</value>
+				</chance>
+				<targetType>SELF</targetType>
+				<minDamage>1</minDamage>
+				<skillId>10284</skillId>
+				<skillLevel>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">0</value>
+				</skillLevel>
+			</effect>		
+			<effect name="PAtk">
+				<amount>
+					<value level="1">10</value>
+					<value level="2">20</value>
+					<value level="3">30</value>
+				</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="Speed">
 				<amount>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml
index dc8f36bb6b..148179118c 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml
@@ -2326,65 +2326,30 @@
 			<value level="2">icon.skill10284_2</value>
 			<value level="3">icon.skill10284_3</value>
 		</icon>
-		<operateType>A2</operateType>
-		<castRange>400</castRange>
-		<abnormalType>WEAPON_MASTER_SPECIAL</abnormalType>
-		<basicProperty>NONE</basicProperty>
-		<rideState>NONE</rideState>
-		<magicCriticalRate>5</magicCriticalRate>
-		<effectRange>900</effectRange>
-		<magicLvl>85</magicLvl>
 		<abnormalLvl>
-			<value level="1">1</value>
-			<value level="2">2</value>
-			<value level="3">3</value>
+			<value level="1">2</value>
+			<value level="2">3</value>
+			<value level="3">4</value>
 		</abnormalLvl>
 		<abnormalTime>
 			<value level="1">30</value>
 			<value level="2">20</value>
 			<value level="3">15</value>
 		</abnormalTime>
-		<isMagic>4</isMagic>
+		<abnormalType>WEAPON_MASTER_SPECIAL</abnormalType>		
+		<isMagic>4</isMagic> <!-- Item Skill -->
+		<isTriggeredSkill>true</isTriggeredSkill>
+		<magicLvl>95</magicLvl>
+		<operateType>A2</operateType>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<effectRange>900</effectRange>
+		<castRange>400</castRange>
+		<rideState>NONE</rideState>
 		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
-		<isTriggeredSkill>true</isTriggeredSkill>
-		<effects>
-			<effect name="DispelBySlotProbability">
-				<dispel>WEAPON_MASTER_SPECIAL</dispel>
-				<rate>100</rate>
-			</effect>
-			<effect name="BlockAbnormalSlot" fromLevel="3" toLevel="3">
-				<slot>WEAPON_MASTER_SPECIAL</slot>
-			</effect>
-			<effect name="TriggerSkillByAttack" fromLevel="1" toLevel="1">
-				<isCritical>false</isCritical>
-				<attackerType>L2Character</attackerType>
-				<minAttackerLevel>1</minAttackerLevel>
-				<maxAttackerLevel>107</maxAttackerLevel>
-				<chance>20</chance>
-				<targetType>SELF</targetType>
-				<minDamage>1</minDamage>
-				<skillId>10284</skillId>
-				<skillLevel>2</skillLevel>
-			</effect>
-			<effect name="TriggerSkillByAttack" fromLevel="2" toLevel="2">
-				<isCritical>false</isCritical>
-				<attackerType>L2Character</attackerType>
-				<minAttackerLevel>1</minAttackerLevel>
-				<maxAttackerLevel>107</maxAttackerLevel>
-				<chance>10</chance>
-				<targetType>SELF</targetType>
-				<minDamage>1</minDamage>
-				<skillId>10284</skillId>
-				<skillLevel>3</skillLevel>
-			</effect>
-			<effect name="PAtk">
-				<amount>
-					<value level="1">10</value>
-					<value level="2">20</value>
-					<value level="3">30</value>
-				</amount>
-				<mode>PER</mode>
+		<conditions>
+			<condition name="EquipWeapon">
 				<weaponType>
 					<item>DUAL</item>
 					<item>POLE</item>
@@ -2393,6 +2358,36 @@
 					<item>DUALFIST</item>
 					<item>DUALBLUNT</item>
 				</weaponType>
+			</condition>
+		</conditions>
+		<effects>		
+			<effect name="TriggerSkillByAttack">
+				<!-- Lightning Force -->
+				<isCritical>false</isCritical>
+				<attackerType>L2Character</attackerType>
+				<minAttackerLevel>1</minAttackerLevel>
+				<maxAttackerLevel>107</maxAttackerLevel>
+				<chance>
+					<value level="1">30</value>
+					<value level="2">20</value>
+					<value level="3">0</value>
+				</chance>
+				<targetType>SELF</targetType>
+				<minDamage>1</minDamage>
+				<skillId>10284</skillId>
+				<skillLevel>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">0</value>
+				</skillLevel>
+			</effect>		
+			<effect name="PAtk">
+				<amount>
+					<value level="1">10</value>
+					<value level="2">20</value>
+					<value level="3">30</value>
+				</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="Speed">
 				<amount>