From a121bb8ce3c24e5dc22d5408dc596f1a82c19941 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 19 Dec 2017 21:37:43 +0000
Subject: [PATCH] Wind Blend and Sayha's Blessing skill improvements.
 Contributed by gamelike85.

---
 .../game/data/stats/skills/30000-30099.xml    | 39 ++++++++++++++----
 .../dist/game/data/xsd/skills.xsd             | 16 +++++++-
 .../gameserver/model/skills/AbnormalType.java |  2 +
 .../game/data/stats/skills/30000-30099.xml    | 36 +++++++++++++----
 .../gameserver/model/skills/AbnormalType.java |  2 +
 .../game/data/stats/skills/30000-30099.xml    | 36 +++++++++++++----
 .../gameserver/model/skills/AbnormalType.java |  2 +
 .../game/data/stats/skills/30000-30099.xml    | 40 ++++++++++++++-----
 .../gameserver/model/skills/AbnormalType.java |  2 +
 9 files changed, 141 insertions(+), 34 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30000-30099.xml
index 7c9106b459..525b4be026 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30000-30099.xml
@@ -619,6 +619,7 @@
 	<skill id="30008" toLevel="5" name="Wind Blend">
 		<!-- Updated to IO -->
 		<!-- For 3 sec., blends into the wind. Becomes one with the wind and disappears later on. Requires a sword or blunt weapon. -->
+		<operateType>A2</operateType>
 		<icon>icon.skill30008</icon>
 		<abnormalLvl>
 			<value level="1">1</value>
@@ -627,9 +628,10 @@
 			<value level="4">4</value>
 			<value level="5">5</value>
 		</abnormalLvl>
+		<abnormalType>WIND_BLEND</abnormalType>
+		<abnormalVisualEffect>WIND_BLEND</abnormalVisualEffect>
 		<abnormalTime>3</abnormalTime>
 		<effectPoint>687</effectPoint>
-		<operateType>A2</operateType>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<magicLvl>
@@ -663,8 +665,25 @@
 			</condition>
 		</conditions>
 		<effects>
-			<effect name="ReduceDamage">
-				<amount>50</amount>
+			<effect name="PhysicalDefence">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">20</value>
+					<value level="3">30</value>
+					<value level="4">40</value>
+					<value level="5">50</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">20</value>
+					<value level="3">30</value>
+					<value level="4">40</value>
+					<value level="5">50</value>
+				</amount>
+				<mode>PER</mode>
 			</effect>
 		</effects>
 		<endEffects>
@@ -1338,13 +1357,12 @@
 		<!-- Updated to IO -->
 		<!-- For 30 sec., nearby party members' Speed + 50, and Knock Back / Knock Down / Pull / Aerial Yoke / Aggression Resistance + 30. Requires a sword or blunt weapon. -->
 		<icon>icon.skill30022</icon>
+		<operateType>A2</operateType>
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>30</abnormalTime>
+		<abnormalType>SAYHA_BLESSING</abnormalType>
 		<effectPoint>687</effectPoint>
-		<operateType>A2</operateType>
-		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectRange>1000</affectRange>
 		<magicLvl>
 			<value level="1">99</value>
 			<value level="2">101</value>
@@ -1357,6 +1375,9 @@
 		<coolTime>500</coolTime>
 		<reuseDelay>300000</reuseDelay>
 		<isMagic>1</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>PARTY</affectScope>
+		<affectObject>FRIEND</affectObject>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -1379,6 +1400,10 @@
 					<value level="1">30</value>
 					<value level="2">40</value>
 				</PULL>
+				<ZONE>
+					<value level="1">30</value>
+					<value level="2">40</value>
+				</ZONE>
 				<AIRBIND>
 					<value level="1">30</value>
 					<value level="2">40</value>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/skills.xsd b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/skills.xsd
index e532360239..ba8e72fc3f 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/skills.xsd
@@ -1857,7 +1857,21 @@
 															<xs:element name="GUST" type="xs:unsignedByte" />
 															<xs:element name="id" type="xs:unsignedShort" />
 															<xs:element name="BOSS" type="xs:unsignedByte" />
-															<xs:element name="ZONE" type="xs:unsignedByte" />
+															<xs:element name="ZONE">
+																<xs:complexType mixed="true">
+																	<xs:sequence minOccurs="0">
+																		<xs:element maxOccurs="unbounded" name="value">
+																			<xs:complexType>
+																				<xs:simpleContent>
+																					<xs:extension base="xs:unsignedByte">
+																						<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+																					</xs:extension>
+																				</xs:simpleContent>
+																			</xs:complexType>
+																		</xs:element>
+																	</xs:sequence>
+																</xs:complexType>
+															</xs:element>
 															<xs:element name="PSYCHIC" type="xs:unsignedByte" />
 															<xs:element name="FIST">
 																<xs:complexType mixed="true">
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
index 58a65a181c..6842b358c8 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -217,11 +217,13 @@ public enum AbnormalType
 	VP_UP(-1),
 	WEAKENED_DEATH_PENALTY(-1),
 	WEAPON_MASTER_SPECIAL(-1),
+	WIND_BLEND(-1),
 	WISPERING_OF_BATTLE(-1),
 	WP_CHANGE_EVENT(-1),
 	CLAN_TEAMWORK(-1),
 	SONG_OF_ARCHERY(-1),
 	DANCE_OF_SAGE(-1),
+	SAYHA_BLESSING(-1),
 	SONG_WEAPON(-1), // TODO: need find proper name
 	HEAL_RESISTANCE(-1), // TODO: need find proper name
 	AB_HAWK_EYE(0),
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30000-30099.xml
index e0df185e31..2b9d64bea0 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30000-30099.xml
@@ -767,7 +767,7 @@
 	<skill id="30008" toLevel="5" name="Wind Blend">
 		<!-- Updated to IO -->
 		<!-- For 3 sec., blends into the wind. Becomes one with the wind and disappears later on. Requires a sword or blunt weapon. -->
-		<abnormalVisualEffect>WIND_BLEND</abnormalVisualEffect>
+		<operateType>A2</operateType>
 		<icon>icon.skill30008</icon>
 		<abnormalLvl>
 			<value level="1">1</value>
@@ -776,9 +776,10 @@
 			<value level="4">4</value>
 			<value level="5">5</value>
 		</abnormalLvl>
+		<abnormalType>WIND_BLEND</abnormalType>
+		<abnormalVisualEffect>WIND_BLEND</abnormalVisualEffect>
 		<abnormalTime>3</abnormalTime>
 		<effectPoint>687</effectPoint>
-		<operateType>A2</operateType>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<magicLvl>
@@ -812,8 +813,25 @@
 			</condition>
 		</conditions>
 		<effects>
-			<effect name="ReduceDamage">
-				<amount>50</amount>
+			<effect name="PhysicalDefence">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">20</value>
+					<value level="3">30</value>
+					<value level="4">40</value>
+					<value level="5">50</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">20</value>
+					<value level="3">30</value>
+					<value level="4">40</value>
+					<value level="5">50</value>
+				</amount>
+				<mode>PER</mode>
 			</effect>
 		</effects>
 		<endEffects>
@@ -1653,17 +1671,16 @@
 		<!-- Updated to IO -->
 		<!-- For 30 sec., nearby party members' Speed + 50, and Knock Back / Knock Down / Pull / Aerial Yoke / Aggression Resistance + 30. Requires a sword or blunt weapon. -->
 		<icon>icon.skill30022</icon>
+		<operateType>A2</operateType>
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>
 			<value fromLevel="1" toLevel="2">30</value>
 			<value fromLevel="1" toLevel="2" fromSubLevel="1001" toSubLevel="1010">{base + subIndex}</value>
 			<value fromLevel="1" toLevel="2" fromSubLevel="1011" toSubLevel="1030">{base + 10 + 0.5 * subIndex}</value>
 		</abnormalTime>
+		<abnormalType>SAYHA_BLESSING</abnormalType>
 		<effectPoint>687</effectPoint>
-		<operateType>A2</operateType>
-		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectRange>1000</affectRange>
 		<magicLvl>
 			<value level="1">99</value>
 			<value level="2">101</value>
@@ -1676,6 +1693,9 @@
 		<coolTime>500</coolTime>
 		<reuseDelay>300000</reuseDelay>
 		<isMagic>1</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>PARTY</affectScope>
+		<affectObject>FRIEND</affectObject>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
index 58a65a181c..6842b358c8 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -217,11 +217,13 @@ public enum AbnormalType
 	VP_UP(-1),
 	WEAKENED_DEATH_PENALTY(-1),
 	WEAPON_MASTER_SPECIAL(-1),
+	WIND_BLEND(-1),
 	WISPERING_OF_BATTLE(-1),
 	WP_CHANGE_EVENT(-1),
 	CLAN_TEAMWORK(-1),
 	SONG_OF_ARCHERY(-1),
 	DANCE_OF_SAGE(-1),
+	SAYHA_BLESSING(-1),
 	SONG_WEAPON(-1), // TODO: need find proper name
 	HEAL_RESISTANCE(-1), // TODO: need find proper name
 	AB_HAWK_EYE(0),
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30000-30099.xml
index fb9f05dd68..8e2413fa7b 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30000-30099.xml
@@ -767,7 +767,7 @@
 	<skill id="30008" toLevel="5" name="Wind Blend">
 		<!-- Updated to IO -->
 		<!-- For 3 sec., blends into the wind. Becomes one with the wind and disappears later on. Requires a sword or blunt weapon. -->
-		<abnormalVisualEffect>WIND_BLEND</abnormalVisualEffect>
+		<operateType>A2</operateType>
 		<icon>icon.skill30008</icon>
 		<abnormalLvl>
 			<value level="1">1</value>
@@ -776,9 +776,10 @@
 			<value level="4">4</value>
 			<value level="5">5</value>
 		</abnormalLvl>
+		<abnormalType>WIND_BLEND</abnormalType>
+		<abnormalVisualEffect>WIND_BLEND</abnormalVisualEffect>
 		<abnormalTime>3</abnormalTime>
 		<effectPoint>687</effectPoint>
-		<operateType>A2</operateType>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<magicLvl>
@@ -812,8 +813,25 @@
 			</condition>
 		</conditions>
 		<effects>
-			<effect name="ReduceDamage">
-				<amount>50</amount>
+			<effect name="PhysicalDefence">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">20</value>
+					<value level="3">30</value>
+					<value level="4">40</value>
+					<value level="5">50</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">20</value>
+					<value level="3">30</value>
+					<value level="4">40</value>
+					<value level="5">50</value>
+				</amount>
+				<mode>PER</mode>
 			</effect>
 		</effects>
 		<endEffects>
@@ -1653,17 +1671,16 @@
 		<!-- Updated to IO -->
 		<!-- For 30 sec., nearby party members' Speed + 50, and Knock Back / Knock Down / Pull / Aerial Yoke / Aggression Resistance + 30. Requires a sword or blunt weapon. -->
 		<icon>icon.skill30022</icon>
+		<operateType>A2</operateType>
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>
 			<value fromLevel="1" toLevel="2">30</value>
 			<value fromLevel="1" toLevel="2" fromSubLevel="1001" toSubLevel="1010">{base + subIndex}</value>
 			<value fromLevel="1" toLevel="2" fromSubLevel="1011" toSubLevel="1030">{base + 10 + 0.5 * subIndex}</value>
 		</abnormalTime>
+		<abnormalType>SAYHA_BLESSING</abnormalType>
 		<effectPoint>687</effectPoint>
-		<operateType>A2</operateType>
-		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectRange>1000</affectRange>
 		<magicLvl>
 			<value level="1">99</value>
 			<value level="2">101</value>
@@ -1676,6 +1693,9 @@
 		<coolTime>500</coolTime>
 		<reuseDelay>300000</reuseDelay>
 		<isMagic>1</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>PARTY</affectScope>
+		<affectObject>FRIEND</affectObject>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
index 19828a5049..d9e360fc7f 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -218,11 +218,13 @@ public enum AbnormalType
 	VP_UP(-1),
 	WEAKENED_DEATH_PENALTY(-1),
 	WEAPON_MASTER_SPECIAL(-1),
+	WIND_BLEND(-1),
 	WISPERING_OF_BATTLE(-1),
 	WP_CHANGE_EVENT(-1),
 	CLAN_TEAMWORK(-1),
 	SONG_OF_ARCHERY(-1),
 	DANCE_OF_SAGE(-1),
+	SAYHA_BLESSING(-1),
 	SONG_WEAPON(-1), // TODO: need find proper name
 	HEAL_RESISTANCE(-1), // TODO: need find proper name
 	AB_HAWK_EYE(0),
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml
index 48c1d77574..c1e70e58fc 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml
@@ -717,7 +717,7 @@
 	<skill id="30008" toLevel="5" name="Wind Blend">
 		<!-- Updated to IO -->
 		<!-- For 3 sec., blends into the wind. Becomes one with the wind and disappears later on. Requires a sword or blunt weapon. -->
-		<abnormalVisualEffect>WIND_BLEND</abnormalVisualEffect>
+		<operateType>A2</operateType>
 		<icon>icon.skill30008</icon>
 		<abnormalLvl>
 			<value level="1">1</value>
@@ -726,9 +726,10 @@
 			<value level="4">4</value>
 			<value level="5">5</value>
 		</abnormalLvl>
-		<abnormalTime>3</abnormalTime>
+		<abnormalType>WIND_BLEND</abnormalType>
+		<abnormalVisualEffect>WIND_BLEND</abnormalVisualEffect>
+		<abnormalTime>5</abnormalTime>
 		<effectPoint>687</effectPoint>
-		<operateType>A2</operateType>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<magicLvl>
@@ -762,8 +763,25 @@
 			</condition>
 		</conditions>
 		<effects>
-			<effect name="ReduceDamage">
-				<amount>50</amount>
+			<effect name="PhysicalDefence">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">20</value>
+					<value level="3">30</value>
+					<value level="4">40</value>
+					<value level="5">50</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">20</value>
+					<value level="3">30</value>
+					<value level="4">40</value>
+					<value level="5">50</value>
+				</amount>
+				<mode>PER</mode>
 			</effect>
 		</effects>
 		<endEffects>
@@ -835,7 +853,7 @@
 			</effect>
 			<effect name="Hide" />
 			<effect name="Speed">
-				<amount>100</amount>
+				<amount>50</amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="PhysicalDefence" fromLevel="9" toLevel="10" fromSubLevel="1001" toSubLevel="1020">
@@ -1573,17 +1591,16 @@
 		<!-- Updated to IO -->
 		<!-- For 30 sec., nearby party members' Speed + 50, and Knock Back / Knock Down / Pull / Aerial Yoke / Aggression Resistance + 30. Requires a sword or blunt weapon. -->
 		<icon>icon.skill30022</icon>
+		<operateType>A2</operateType>
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>
 			<value fromLevel="1" toLevel="2">30</value>
 			<value fromLevel="1" toLevel="2" fromSubLevel="1001" toSubLevel="1010">{base + subIndex}</value>
 			<value fromLevel="1" toLevel="2" fromSubLevel="1011" toSubLevel="1020">{base + 10 + 0.5 * subIndex}</value>
 		</abnormalTime>
+		<abnormalType>SAYHA_BLESSING</abnormalType>
 		<effectPoint>687</effectPoint>
-		<operateType>A2</operateType>
-		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectRange>1000</affectRange>
 		<magicLvl>
 			<value level="1">99</value>
 			<value level="2">101</value>
@@ -1596,6 +1613,9 @@
 		<coolTime>500</coolTime>
 		<reuseDelay>300000</reuseDelay>
 		<isMagic>1</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>PARTY</affectScope>
+		<affectObject>FRIEND</affectObject>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
index 69f27d1afc..f68439cdd3 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -238,11 +238,13 @@ public enum AbnormalType
 	VP_UP(-1),
 	WEAKENED_DEATH_PENALTY(-1),
 	WEAPON_MASTER_SPECIAL(-1),
+	WIND_BLEND(-1),
 	WISPERING_OF_BATTLE(-1),
 	WP_CHANGE_EVENT(-1),
 	CLAN_TEAMWORK(-1),
 	SONG_OF_ARCHERY(-1),
 	DANCE_OF_SAGE(-1),
+	SAYHA_BLESSING(-1),
 	SONG_WEAPON(-1), // TODO: need find proper name
 	HEAL_RESISTANCE(-1), // TODO: need find proper name
 	AB_HAWK_EYE(0),