From 08bd1cee9c120f2e883b8bc0bc71fc22706db2b6 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 13 Nov 2019 19:19:50 +0000
Subject: [PATCH] Various skill adjustments. Contributed by gamelike85.

---
 .../game/data/stats/skills/10000-10099.xml    |  5 ++-
 .../game/data/stats/skills/10200-10299.xml    | 38 ++++++++-----------
 .../game/data/stats/skills/10000-10099.xml    |  5 ++-
 .../game/data/stats/skills/10200-10299.xml    | 38 ++++++++-----------
 .../game/data/stats/skills/10000-10099.xml    |  5 ++-
 .../game/data/stats/skills/10200-10299.xml    | 38 ++++++++-----------
 .../game/data/stats/skills/10000-10099.xml    |  5 ++-
 .../game/data/stats/skills/10200-10299.xml    | 16 ++------
 .../game/data/stats/skills/30600-30699.xml    | 16 ++------
 9 files changed, 64 insertions(+), 102 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 722458040f..9638fd5e35 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
@@ -1789,6 +1789,7 @@
 			<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1020">{base + 0.5 * subIndex}</value>
 		</abnormalTime>
 		<abnormalType>TRANSFER_DAMAGE</abnormalType>
+		<abnormalVisualEffect>SHIELD_WALL</abnormalVisualEffect>
 		<magicLevel>99</magicLevel>
 		<affectRange>1000</affectRange>
 		<operateType>A2</operateType>
@@ -1992,8 +1993,6 @@
 		<effects>
 			<effect name="TargetMe" />
 			<effect name="GetAgro" />
-		</effects>
-		<pvpEffects>
 			<!-- TODO p_berserker -->
 			<effect name="AddHate">
 				<power>
@@ -2021,6 +2020,8 @@
 					<value level="9">19981</value>
 				</power>
 			</effect>
+		</effects>
+		<pvpEffects>
 			<effect name="Speed">
 				<amount>-70</amount>
 				<mode>DIFF</mode>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10200-10299.xml
index 56e26d9e73..cd9ad29327 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10200-10299.xml
@@ -9,44 +9,36 @@
 			<value level="2">90</value>
 			<value level="3">95</value>
 		</magicLvl>
-		<operateType>T</operateType>
+		<operateType>AU</operateType>
+		<abnormalVisualEffect>TRUE_VANGUARD</abnormalVisualEffect>
 		<isMagic>6</isMagic>
 		<hitTime>1500</hitTime>
 		<coolTime>1000</coolTime>
 		<reuseDelay>10000</reuseDelay>
 		<effectPoint>2</effectPoint>
 		<mpConsume>20</mpConsume>
-		<targetType>NONE</targetType>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="EquipShield" />
+		</conditions>
 		<effects>
-			<effect name="PveMagicalSkillDamageBonus">
-				<amount>
-					<value level="1">50</value>
-					<value level="2">55</value>
-					<value level="3">60</value>
-				</amount>
+			<effect name="CriticalDamage">
+				<amount>15</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PvePhysicalAttackDamageBonus">
-				<amount>
-					<value level="1">50</value>
-					<value level="2">55</value>
-					<value level="3">60</value>
-				</amount>
+			<effect name="CriticalRate">
+				<amount>15</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PvePhysicalAttackDamageBonus">
+			<effect name="PAtk">
 				<amount>
-					<value level="1">50</value>
-					<value level="2">55</value>
-					<value level="3">60</value>
+					<value level="1">100</value>
+					<value level="2">130</value>
+					<value level="3">150</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicMpCost">
-				<amount>30</amount>
-				<mode>PER</mode>
-				<magicType>0</magicType>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="10245" toLevel="1" name="Wizard - Individual Passive">
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 9ad30c9bee..34f2b6333e 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
@@ -1789,6 +1789,7 @@
 			<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1020">{base + 0.5 * subIndex}</value>
 		</abnormalTime>
 		<abnormalType>TRANSFER_DAMAGE</abnormalType>
+		<abnormalVisualEffect>SHIELD_WALL</abnormalVisualEffect>
 		<magicLevel>99</magicLevel>
 		<affectRange>1000</affectRange>
 		<operateType>A2</operateType>
@@ -1992,8 +1993,6 @@
 		<effects>
 			<effect name="TargetMe" />
 			<effect name="GetAgro" />
-		</effects>
-		<pvpEffects>
 			<!-- TODO p_berserker -->
 			<effect name="AddHate">
 				<power>
@@ -2021,6 +2020,8 @@
 					<value level="9">19981</value>
 				</power>
 			</effect>
+		</effects>
+		<pvpEffects>
 			<effect name="Speed">
 				<amount>-70</amount>
 				<mode>DIFF</mode>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10200-10299.xml
index c54200fc0d..b3364d09f6 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10200-10299.xml
@@ -9,44 +9,36 @@
 			<value level="2">90</value>
 			<value level="3">95</value>
 		</magicLvl>
-		<operateType>T</operateType>
+		<operateType>AU</operateType>
+		<abnormalVisualEffect>TRUE_VANGUARD</abnormalVisualEffect>
 		<isMagic>6</isMagic>
 		<hitTime>1500</hitTime>
 		<coolTime>1000</coolTime>
 		<reuseDelay>10000</reuseDelay>
 		<effectPoint>2</effectPoint>
 		<mpConsume>20</mpConsume>
-		<targetType>NONE</targetType>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="EquipShield" />
+		</conditions>
 		<effects>
-			<effect name="PveMagicalSkillDamageBonus">
-				<amount>
-					<value level="1">50</value>
-					<value level="2">55</value>
-					<value level="3">60</value>
-				</amount>
+			<effect name="CriticalDamage">
+				<amount>15</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PvePhysicalAttackDamageBonus">
-				<amount>
-					<value level="1">50</value>
-					<value level="2">55</value>
-					<value level="3">60</value>
-				</amount>
+			<effect name="CriticalRate">
+				<amount>15</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PvePhysicalAttackDamageBonus">
+			<effect name="PAtk">
 				<amount>
-					<value level="1">50</value>
-					<value level="2">55</value>
-					<value level="3">60</value>
+					<value level="1">100</value>
+					<value level="2">130</value>
+					<value level="3">150</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicMpCost">
-				<amount>30</amount>
-				<mode>PER</mode>
-				<magicType>0</magicType>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="10245" toLevel="1" name="Wizard - Individual Passive">
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 725630f987..16b1714758 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
@@ -1860,6 +1860,7 @@
 			<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1020">{base + (0.5 * subIndex)}</value>
 		</abnormalTime>
 		<abnormalType>TRANSFER_DAMAGE</abnormalType>
+		<abnormalVisualEffect>SHIELD_WALL</abnormalVisualEffect>
 		<magicLevel>99</magicLevel>
 		<affectRange>1000</affectRange>
 		<operateType>A2</operateType>
@@ -2067,8 +2068,6 @@
 		<effects>
 			<effect name="TargetMe" />
 			<effect name="GetAgro" />
-		</effects>
-		<pvpEffects>
 			<!-- TODO p_berserker -->
 			<effect name="AddHate">
 				<power>
@@ -2100,6 +2099,8 @@
 					<value level="11">22033</value>
 				</power>
 			</effect>
+		</effects>
+		<pvpEffects>
 			<effect name="Speed">
 				<amount>-70</amount>
 				<mode>DIFF</mode>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10200-10299.xml
index bc09b2e1db..697a7edbfa 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10200-10299.xml
@@ -9,44 +9,36 @@
 			<value level="2">90</value>
 			<value level="3">95</value>
 		</magicLvl>
-		<operateType>T</operateType>
+		<operateType>AU</operateType>
+		<abnormalVisualEffect>TRUE_VANGUARD</abnormalVisualEffect>
 		<isMagic>6</isMagic>
 		<hitTime>1500</hitTime>
 		<coolTime>1000</coolTime>
 		<reuseDelay>10000</reuseDelay>
 		<effectPoint>2</effectPoint>
 		<mpConsume>20</mpConsume>
-		<targetType>NONE</targetType>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="EquipShield" />
+		</conditions>
 		<effects>
-			<effect name="PveMagicalSkillDamageBonus">
-				<amount>
-					<value level="1">50</value>
-					<value level="2">55</value>
-					<value level="3">60</value>
-				</amount>
+			<effect name="CriticalDamage">
+				<amount>15</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PvePhysicalAttackDamageBonus">
-				<amount>
-					<value level="1">50</value>
-					<value level="2">55</value>
-					<value level="3">60</value>
-				</amount>
+			<effect name="CriticalRate">
+				<amount>15</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PvePhysicalAttackDamageBonus">
+			<effect name="PAtk">
 				<amount>
-					<value level="1">50</value>
-					<value level="2">55</value>
-					<value level="3">60</value>
+					<value level="1">100</value>
+					<value level="2">130</value>
+					<value level="3">150</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicMpCost">
-				<amount>30</amount>
-				<mode>PER</mode>
-				<magicType>0</magicType>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="10245" toLevel="1" name="Wizard - Individual Passive">
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 9f2ba5d29d..9f0c3dc47a 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
@@ -1860,6 +1860,7 @@
 			<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1020">{base + (0.5 * subIndex)}</value>
 		</abnormalTime>
 		<abnormalType>TRANSFER_DAMAGE</abnormalType>
+		<abnormalVisualEffect>SHIELD_WALL</abnormalVisualEffect>
 		<magicLevel>99</magicLevel>
 		<affectRange>1000</affectRange>
 		<operateType>A2</operateType>
@@ -2067,8 +2068,6 @@
 		<effects>
 			<effect name="TargetMe" />
 			<effect name="GetAgro" />
-		</effects>
-		<pvpEffects>
 			<!-- TODO p_berserker -->
 			<effect name="AddHate">
 				<power>
@@ -2100,6 +2099,8 @@
 					<value level="11">30846</value>
 				</power>
 			</effect>
+		</effects>
+		<pvpEffects>
 			<effect name="Speed">
 				<amount>-70</amount>
 				<mode>DIFF</mode>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10200-10299.xml
index 303f038aac..706dec313c 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10200-10299.xml
@@ -10,13 +10,15 @@
 			<value level="3">95</value>
 		</magicLvl>
 		<operateType>AU</operateType>
+		<abnormalVisualEffect>TRUE_VANGUARD</abnormalVisualEffect>
 		<isMagic>6</isMagic>
 		<hitTime>1500</hitTime>
 		<coolTime>1000</coolTime>
 		<reuseDelay>10000</reuseDelay>
 		<effectPoint>2</effectPoint>
 		<mpConsume>20</mpConsume>
-		<targetType>NONE</targetType>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="EquipShield" />
 		</conditions>
@@ -24,18 +26,10 @@
 			<effect name="CriticalDamage">
 				<amount>15</amount>
 				<mode>PER</mode>
-				<weaponType>
-					<item>SWORD</item>
-					<item>BLUNT</item>
-				</weaponType>
 			</effect>
 			<effect name="CriticalRate">
 				<amount>15</amount>
 				<mode>PER</mode>
-				<weaponType>
-					<item>SWORD</item>
-					<item>BLUNT</item>
-				</weaponType>
 			</effect>
 			<effect name="PAtk">
 				<amount>
@@ -44,10 +38,6 @@
 					<value level="3">150</value>
 				</amount>
 				<mode>PER</mode>
-				<weaponType>
-					<item>SWORD</item>
-					<item>BLUNT</item>
-				</weaponType>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30600-30699.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30600-30699.xml
index 0e42742606..646c21678f 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30600-30699.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30600-30699.xml
@@ -145,6 +145,7 @@
 		<mpConsume>32</mpConsume>
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>1800</abnormalTime>
+		<removedOnUnequipWeapon>true</removedOnUnequipWeapon>
 		<abnormalType>POLEARM_ATTACK</abnormalType>
 		<magicLvl>85</magicLvl>
 		<basicProperty>NONE</basicProperty>
@@ -166,10 +167,6 @@
 					<item>POLE</item>
 				</weaponType>
 			</effect>
-			<effect name="SetSkill">
-				<skillId>30612</skillId> <!-- Cancel Edge of Storm -->
-				<skillLvl>1</skillLvl>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="30611" toLevel="1" name="Edge of Storm">
@@ -183,6 +180,7 @@
 		<mpConsume>32</mpConsume>
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>60</abnormalTime>
+		<removedOnUnequipWeapon>true</removedOnUnequipWeapon>
 		<abnormalType>POLEARM_ATTACK</abnormalType>
 		<magicLvl>85</magicLvl>
 		<basicProperty>NONE</basicProperty>
@@ -204,10 +202,6 @@
 					<item>POLE</item>
 				</weaponType>
 			</effect>
-			<effect name="SetSkill">
-				<skillId>30612</skillId> <!-- Cancel Edge of Storm -->
-				<skillLvl>1</skillLvl>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="30612" toLevel="1" name="Cancel Edge of Storm">
@@ -628,16 +622,14 @@
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>20</abnormalTime>
 		<abnormalType>ULTIMATE_DEBUFF</abnormalType>
-		<activateRate>90</activateRate>
-		<affectLimit>5-12</affectLimit>
+		<activateRate>80</activateRate>
 		<affectRange>200</affectRange>
 		<nextAction>ATTACK</nextAction>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effectRange>400</effectRange>
 		<targetType>ENEMY</targetType>
-		<affectScope>RANGE</affectScope>
-		<affectObject>NOT_FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>