From 48a1422a5fd8571c3c69fd9728418cc3d8d5e75a Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 17 Jul 2019 12:16:47 +0000
Subject: [PATCH] Momentum Master (10324) new condition use and xsd
 adjustments.

---
 .../game/data/stats/skills/10300-10399.xml    |  16 +-
 .../dist/game/data/xsd/skills.xsd             |   4 +-
 .../game/data/stats/skills/10300-10399.xml    |  16 +-
 .../dist/game/data/xsd/skills.xsd             |   8 +-
 .../game/data/stats/skills/10300-10399.xml    |  16 +-
 .../dist/game/data/xsd/skills.xsd             |  10 +-
 .../game/data/stats/skills/10300-10399.xml    |  16 +-
 .../dist/game/data/xsd/skills.xsd             |  10 +-
 .../game/data/stats/skills/10300-10399.xml    |  16 +-
 .../dist/game/data/xsd/skills.xsd             | 204 +++++++++---------
 .../game/data/stats/skills/10300-10399.xml    |  16 +-
 .../dist/game/data/xsd/skills.xsd             | 204 +++++++++---------
 .../game/data/stats/skills/10300-10399.xml    |  16 +-
 .../dist/game/data/xsd/skills.xsd             | 204 +++++++++---------
 14 files changed, 372 insertions(+), 384 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 30a240b49b..94d657df35 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
@@ -1012,14 +1012,14 @@
 		<icon>icon.skill10324</icon>
 		<operateType>P</operateType>
 		<passiveConditions>
-			<condition name="OpCheckSkill">
-				<skillId>261</skillId> <!-- Triple Sonic Slash -->
-				<skillId>10258</skillId> <!-- Armor Destruction -->
-				<skillId>10260</skillId> <!-- Mega Strike -->
-				<skillId>10262</skillId> <!-- Power Bomber -->
-				<skillId>10265</skillId> <!-- Eruption -->
-				<skillId>10269</skillId> <!-- Jump Attack -->
-				<skillId>10318</skillId> <!-- Sonic Flash -->
+			<condition name="OpCheckSkillList">
+				<item>261</item> <!-- Triple Sonic Slash -->
+				<item>10258</item> <!-- Armor Destruction -->
+				<item>10260</item> <!-- Mega Strike -->
+				<item>10262</item> <!-- Power Bomber -->
+				<item>10265</item> <!-- Eruption -->
+				<item>10269</item> <!-- Jump Attack -->
+				<item>10318</item> <!-- Sonic Flash -->
 				<affectType>CASTER</affectType>
 			</condition>
 		</passiveConditions>
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 1954a5cae3..1b5e190d00 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
@@ -524,7 +524,7 @@
 														</xs:element>
 														<xs:element minOccurs="0" name="classId" type="xs:string" />
 														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
-														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillLevel" type="xs:unsignedByte" />
+														<xs:element minOccurs="0" name="skillLevel" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
 														<xs:element minOccurs="0" name="type" type="xs:string" />
 														<xs:element minOccurs="0" name="level">
@@ -2185,7 +2185,7 @@
 														<xs:element minOccurs="0" name="alignment" type="xs:string" />
 														<xs:element minOccurs="0" name="amount" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="percentType" type="xs:string" />
-														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" maxOccurs="unbounded" name="item" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="classIds">
 															<xs:complexType>
 																<xs:sequence>
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 a8b02c2903..7dd073149b 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
@@ -1040,14 +1040,14 @@
 		<icon>icon.skill10324</icon>
 		<operateType>P</operateType>
 		<passiveConditions>
-			<condition name="OpCheckSkill">
-				<skillId>261</skillId> <!-- Triple Sonic Slash -->
-				<skillId>10258</skillId> <!-- Armor Destruction -->
-				<skillId>10260</skillId> <!-- Mega Strike -->
-				<skillId>10262</skillId> <!-- Power Bomber -->
-				<skillId>10265</skillId> <!-- Eruption -->
-				<skillId>10269</skillId> <!-- Jump Attack -->
-				<skillId>10318</skillId> <!-- Sonic Flash -->
+			<condition name="OpCheckSkillList">
+				<item>261</item> <!-- Triple Sonic Slash -->
+				<item>10258</item> <!-- Armor Destruction -->
+				<item>10260</item> <!-- Mega Strike -->
+				<item>10262</item> <!-- Power Bomber -->
+				<item>10265</item> <!-- Eruption -->
+				<item>10269</item> <!-- Jump Attack -->
+				<item>10318</item> <!-- Sonic Flash -->
 				<affectType>CASTER</affectType>
 			</condition>
 		</passiveConditions>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/xsd/skills.xsd b/L2J_Mobius_2.5_Underground/dist/game/data/xsd/skills.xsd
index eb9569b38f..5ed0d8bce9 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/xsd/skills.xsd
@@ -4,7 +4,7 @@
 		<xs:complexType>
 			<xs:sequence>
 				<xs:element maxOccurs="unbounded" name="skill">
-					<xs:complexType mixed="true">
+					<xs:complexType>
 						<xs:sequence>
 							<xs:choice maxOccurs="unbounded">
 								<xs:element name="icon">
@@ -2245,7 +2245,7 @@
 														<xs:element minOccurs="0" name="alignment" type="xs:string" />
 														<xs:element minOccurs="0" name="amount" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="percentType" type="xs:string" />
-														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" maxOccurs="unbounded" name="item" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="classIds">
 															<xs:complexType>
 																<xs:sequence>
@@ -2879,11 +2879,9 @@
 							</xs:choice>
 						</xs:sequence>
 						<xs:attribute name="id" type="xs:unsignedInt" use="required" />
-						<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
+						<xs:attribute name="toLevel" type="xs:unsignedByte" use="required" />
 						<xs:attribute name="name" type="xs:string" use="required" />
-						<xs:attribute name="levels" type="xs:unsignedByte" use="optional" />
 						<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
-						<xs:attribute name="usingServerSideName" type="xs:boolean" use="optional" />
 						<xs:attribute name="displayId" type="xs:unsignedShort" use="optional" />
 					</xs:complexType>
 				</xs:element>
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 3c8c385445..7b33a06d61 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
@@ -1041,14 +1041,14 @@
 		<icon>icon.skill10324</icon>
 		<operateType>P</operateType>
 		<passiveConditions>
-			<condition name="OpCheckSkill">
-				<skillId>261</skillId> <!-- Triple Sonic Slash -->
-				<skillId>10258</skillId> <!-- Armor Destruction -->
-				<skillId>10260</skillId> <!-- Mega Strike -->
-				<skillId>10262</skillId> <!-- Power Bomber -->
-				<skillId>10265</skillId> <!-- Eruption -->
-				<skillId>10269</skillId> <!-- Jump Attack -->
-				<skillId>10318</skillId> <!-- Sonic Flash -->
+			<condition name="OpCheckSkillList">
+				<item>261</item> <!-- Triple Sonic Slash -->
+				<item>10258</item> <!-- Armor Destruction -->
+				<item>10260</item> <!-- Mega Strike -->
+				<item>10262</item> <!-- Power Bomber -->
+				<item>10265</item> <!-- Eruption -->
+				<item>10269</item> <!-- Jump Attack -->
+				<item>10318</item> <!-- Sonic Flash -->
 				<affectType>CASTER</affectType>
 			</condition>
 		</passiveConditions>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/xsd/skills.xsd b/L2J_Mobius_3.0_Helios/dist/game/data/xsd/skills.xsd
index c7e3bcac9d..ec2a021231 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/xsd/skills.xsd
@@ -4,7 +4,7 @@
 		<xs:complexType>
 			<xs:sequence>
 				<xs:element maxOccurs="unbounded" name="skill">
-					<xs:complexType mixed="true">
+					<xs:complexType>
 						<xs:sequence>
 							<xs:choice maxOccurs="unbounded">
 								<xs:element name="icon">
@@ -661,7 +661,7 @@
 											<xs:element minOccurs="0" name="dispel">
 												<xs:complexType>
 													<xs:sequence>
-														<xs:element maxOccurs="unbounded" name="value">
+														<xs:element name="value">
 															<xs:complexType>
 																<xs:simpleContent>
 																	<xs:extension base="xs:string">
@@ -2277,7 +2277,7 @@
 														<xs:element minOccurs="0" name="alignment" type="xs:string" />
 														<xs:element minOccurs="0" name="amount" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="percentType" type="xs:string" />
-														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" maxOccurs="unbounded" name="item" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="classIds">
 															<xs:complexType>
 																<xs:sequence>
@@ -2918,11 +2918,9 @@
 							</xs:choice>
 						</xs:sequence>
 						<xs:attribute name="id" type="xs:unsignedInt" use="required" />
-						<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
+						<xs:attribute name="toLevel" type="xs:unsignedByte" use="required" />
 						<xs:attribute name="name" type="xs:string" use="required" />
-						<xs:attribute name="levels" type="xs:unsignedByte" use="optional" />
 						<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
-						<xs:attribute name="usingServerSideName" type="xs:boolean" use="optional" />
 						<xs:attribute name="displayId" type="xs:unsignedShort" use="optional" />
 					</xs:complexType>
 				</xs:element>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10300-10399.xml
index 3720a39b0c..cf70bb5837 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10300-10399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10300-10399.xml
@@ -1054,14 +1054,14 @@
 		<icon>icon.skill10324</icon>
 		<operateType>P</operateType>
 		<passiveConditions>
-			<condition name="OpCheckSkill">
-				<skillId>261</skillId> <!-- Triple Sonic Slash -->
-				<skillId>10258</skillId> <!-- Armor Destruction -->
-				<skillId>10260</skillId> <!-- Mega Strike -->
-				<skillId>10262</skillId> <!-- Power Bomber -->
-				<skillId>10265</skillId> <!-- Eruption -->
-				<skillId>10269</skillId> <!-- Jump Attack -->
-				<skillId>10318</skillId> <!-- Sonic Flash -->
+			<condition name="OpCheckSkillList">
+				<item>261</item> <!-- Triple Sonic Slash -->
+				<item>10258</item> <!-- Armor Destruction -->
+				<item>10260</item> <!-- Mega Strike -->
+				<item>10262</item> <!-- Power Bomber -->
+				<item>10265</item> <!-- Eruption -->
+				<item>10269</item> <!-- Jump Attack -->
+				<item>10318</item> <!-- Sonic Flash -->
 				<affectType>CASTER</affectType>
 			</condition>
 		</passiveConditions>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skills.xsd b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skills.xsd
index 695e76fb41..4c15031fa4 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skills.xsd
@@ -4,7 +4,7 @@
 		<xs:complexType>
 			<xs:sequence>
 				<xs:element maxOccurs="unbounded" name="skill">
-					<xs:complexType mixed="true">
+					<xs:complexType>
 						<xs:sequence>
 							<xs:choice maxOccurs="unbounded">
 								<xs:element name="icon">
@@ -663,7 +663,7 @@
 											<xs:element minOccurs="0" name="dispel">
 												<xs:complexType>
 													<xs:sequence>
-														<xs:element maxOccurs="unbounded" name="value">
+														<xs:element name="value">
 															<xs:complexType>
 																<xs:simpleContent>
 																	<xs:extension base="xs:string">
@@ -2247,7 +2247,7 @@
 														<xs:element minOccurs="0" name="alignment" type="xs:string" />
 														<xs:element minOccurs="0" name="amount" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="percentType" type="xs:string" />
-														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" maxOccurs="unbounded" name="item" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="classIds">
 															<xs:complexType>
 																<xs:sequence>
@@ -2925,11 +2925,9 @@
 							</xs:choice>
 						</xs:sequence>
 						<xs:attribute name="id" type="xs:unsignedInt" use="required" />
-						<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
+						<xs:attribute name="toLevel" type="xs:unsignedByte" use="required" />
 						<xs:attribute name="name" type="xs:string" use="required" />
-						<xs:attribute name="levels" type="xs:unsignedByte" use="optional" />
 						<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
-						<xs:attribute name="usingServerSideName" type="xs:boolean" use="optional" />
 						<xs:attribute name="displayId" type="xs:unsignedShort" use="optional" />
 					</xs:complexType>
 				</xs:element>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10300-10399.xml
index bd6edec5a1..d27d8ddcdb 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10300-10399.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10300-10399.xml
@@ -1054,14 +1054,14 @@
 		<icon>icon.skill10324</icon>
 		<operateType>P</operateType>
 		<passiveConditions>
-			<condition name="OpCheckSkill">
-				<skillId>261</skillId> <!-- Triple Sonic Slash -->
-				<skillId>10258</skillId> <!-- Armor Destruction -->
-				<skillId>10260</skillId> <!-- Mega Strike -->
-				<skillId>10262</skillId> <!-- Power Bomber -->
-				<skillId>10265</skillId> <!-- Eruption -->
-				<skillId>10269</skillId> <!-- Jump Attack -->
-				<skillId>10318</skillId> <!-- Sonic Flash -->
+			<condition name="OpCheckSkillList">
+				<item>261</item> <!-- Triple Sonic Slash -->
+				<item>10258</item> <!-- Armor Destruction -->
+				<item>10260</item> <!-- Mega Strike -->
+				<item>10262</item> <!-- Power Bomber -->
+				<item>10265</item> <!-- Eruption -->
+				<item>10269</item> <!-- Jump Attack -->
+				<item>10318</item> <!-- Sonic Flash -->
 				<affectType>CASTER</affectType>
 			</condition>
 		</passiveConditions>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skills.xsd b/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skills.xsd
index 569340f596..37ede5ac1b 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skills.xsd
@@ -22,40 +22,6 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="affectLimit">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:string">
-															<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="affectRange">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:string">
-															<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
-															<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
-															<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
-															<xs:attribute name="fromSubLevel" type="xs:unsignedShort" use="optional" />
-															<xs:attribute name="toSubLevel" type="xs:unsignedShort" use="optional" />
-														</xs:extension>
-													</xs:simpleContent>
-												</xs:complexType>
-											</xs:element>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
 								<xs:element name="abnormalLvl">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -175,21 +141,6 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="fanRange">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:string">
-															<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="hitTime">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -205,51 +156,6 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="itemConsumeCount">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:unsignedShort">
-															<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="itemConsumeId">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:unsignedShort">
-															<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="hpConsume">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:unsignedShort">
-															<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="isMagic">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -419,7 +325,6 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="affectObject" type="xs:string" />
 								<xs:element name="conditions">
 									<xs:complexType>
 										<xs:sequence>
@@ -661,7 +566,7 @@
 											<xs:element minOccurs="0" name="dispel">
 												<xs:complexType>
 													<xs:sequence>
-														<xs:element maxOccurs="unbounded" name="value">
+														<xs:element name="value">
 															<xs:complexType>
 																<xs:simpleContent>
 																	<xs:extension base="xs:string">
@@ -2068,11 +1973,10 @@
 															</xs:element>
 															<xs:element name="existingSkillId" type="xs:unsignedShort" />
 															<xs:element name="existingSkillLevel" type="xs:unsignedByte" />
-															<xs:element name="replacementSkillId" type="xs:unsignedShort" />
-															<xs:element name="replacementSkillLevel" type="xs:unsignedByte" />
 															<xs:element name="addedSkillId" type="xs:unsignedShort" />
 															<xs:element name="addedSkillLevel" type="xs:unsignedByte" />
 															<xs:element name="skills" type="xs:string" />
+															<xs:element name="replacementSkillId" type="xs:unsignedShort" />
 															<xs:element name="isSummonSpawn" type="xs:boolean" />
 															<xs:element name="randomOffset" type="xs:unsignedByte" />
 															<xs:element name="AGGRESSION">
@@ -2123,6 +2027,101 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
+								<xs:element name="affectLimit">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:string">
+															<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="affectRange">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:string">
+															<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
+															<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
+															<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
+															<xs:attribute name="fromSubLevel" type="xs:unsignedShort" use="optional" />
+															<xs:attribute name="toSubLevel" type="xs:unsignedShort" use="optional" />
+														</xs:extension>
+													</xs:simpleContent>
+												</xs:complexType>
+											</xs:element>
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
+								<xs:element name="affectObject" type="xs:string" />
+								<xs:element name="hpConsume">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:unsignedShort">
+															<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="fanRange">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:string">
+															<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="itemConsumeCount">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:unsignedShort">
+															<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="itemConsumeId">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:unsignedShort">
+															<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="isDebuff">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -2243,6 +2242,8 @@
 												<xs:complexType>
 													<xs:sequence minOccurs="0">
 														<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
 														<xs:element minOccurs="0" name="type" type="xs:string" />
 														<xs:element minOccurs="0" name="level" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="hasAbnormal" type="xs:boolean" />
@@ -2250,8 +2251,7 @@
 														<xs:element minOccurs="0" name="alignment" type="xs:string" />
 														<xs:element minOccurs="0" name="amount" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="percentType" type="xs:string" />
-														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
-														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
+														<xs:element minOccurs="0" maxOccurs="unbounded" name="item" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="classIds">
 															<xs:complexType>
 																<xs:sequence>
@@ -2929,11 +2929,9 @@
 							</xs:choice>
 						</xs:sequence>
 						<xs:attribute name="id" type="xs:unsignedInt" use="required" />
-						<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
+						<xs:attribute name="toLevel" type="xs:unsignedByte" use="required" />
 						<xs:attribute name="name" type="xs:string" use="required" />
-						<xs:attribute name="levels" type="xs:unsignedByte" use="optional" />
 						<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
-						<xs:attribute name="usingServerSideName" type="xs:boolean" use="optional" />
 						<xs:attribute name="displayId" type="xs:unsignedShort" use="optional" />
 					</xs:complexType>
 				</xs:element>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10300-10399.xml
index ccc0155c11..f2de9071c4 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10300-10399.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10300-10399.xml
@@ -1054,14 +1054,14 @@
 		<icon>icon.skill10324</icon>
 		<operateType>P</operateType>
 		<passiveConditions>
-			<condition name="OpCheckSkill">
-				<skillId>261</skillId> <!-- Triple Sonic Slash -->
-				<skillId>10258</skillId> <!-- Armor Destruction -->
-				<skillId>10260</skillId> <!-- Mega Strike -->
-				<skillId>10262</skillId> <!-- Power Bomber -->
-				<skillId>10265</skillId> <!-- Eruption -->
-				<skillId>10269</skillId> <!-- Jump Attack -->
-				<skillId>10318</skillId> <!-- Sonic Flash -->
+			<condition name="OpCheckSkillList">
+				<item>261</item> <!-- Triple Sonic Slash -->
+				<item>10258</item> <!-- Armor Destruction -->
+				<item>10260</item> <!-- Mega Strike -->
+				<item>10262</item> <!-- Power Bomber -->
+				<item>10265</item> <!-- Eruption -->
+				<item>10269</item> <!-- Jump Attack -->
+				<item>10318</item> <!-- Sonic Flash -->
 				<affectType>CASTER</affectType>
 			</condition>
 		</passiveConditions>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skills.xsd b/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skills.xsd
index 569340f596..37ede5ac1b 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skills.xsd
@@ -22,40 +22,6 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="affectLimit">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:string">
-															<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="affectRange">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:string">
-															<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
-															<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
-															<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
-															<xs:attribute name="fromSubLevel" type="xs:unsignedShort" use="optional" />
-															<xs:attribute name="toSubLevel" type="xs:unsignedShort" use="optional" />
-														</xs:extension>
-													</xs:simpleContent>
-												</xs:complexType>
-											</xs:element>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
 								<xs:element name="abnormalLvl">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -175,21 +141,6 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="fanRange">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:string">
-															<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="hitTime">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -205,51 +156,6 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="itemConsumeCount">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:unsignedShort">
-															<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="itemConsumeId">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:unsignedShort">
-															<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="hpConsume">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:unsignedShort">
-															<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="isMagic">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -419,7 +325,6 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="affectObject" type="xs:string" />
 								<xs:element name="conditions">
 									<xs:complexType>
 										<xs:sequence>
@@ -661,7 +566,7 @@
 											<xs:element minOccurs="0" name="dispel">
 												<xs:complexType>
 													<xs:sequence>
-														<xs:element maxOccurs="unbounded" name="value">
+														<xs:element name="value">
 															<xs:complexType>
 																<xs:simpleContent>
 																	<xs:extension base="xs:string">
@@ -2068,11 +1973,10 @@
 															</xs:element>
 															<xs:element name="existingSkillId" type="xs:unsignedShort" />
 															<xs:element name="existingSkillLevel" type="xs:unsignedByte" />
-															<xs:element name="replacementSkillId" type="xs:unsignedShort" />
-															<xs:element name="replacementSkillLevel" type="xs:unsignedByte" />
 															<xs:element name="addedSkillId" type="xs:unsignedShort" />
 															<xs:element name="addedSkillLevel" type="xs:unsignedByte" />
 															<xs:element name="skills" type="xs:string" />
+															<xs:element name="replacementSkillId" type="xs:unsignedShort" />
 															<xs:element name="isSummonSpawn" type="xs:boolean" />
 															<xs:element name="randomOffset" type="xs:unsignedByte" />
 															<xs:element name="AGGRESSION">
@@ -2123,6 +2027,101 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
+								<xs:element name="affectLimit">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:string">
+															<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="affectRange">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:string">
+															<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
+															<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
+															<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
+															<xs:attribute name="fromSubLevel" type="xs:unsignedShort" use="optional" />
+															<xs:attribute name="toSubLevel" type="xs:unsignedShort" use="optional" />
+														</xs:extension>
+													</xs:simpleContent>
+												</xs:complexType>
+											</xs:element>
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
+								<xs:element name="affectObject" type="xs:string" />
+								<xs:element name="hpConsume">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:unsignedShort">
+															<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="fanRange">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:string">
+															<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="itemConsumeCount">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:unsignedShort">
+															<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="itemConsumeId">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:unsignedShort">
+															<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="isDebuff">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -2243,6 +2242,8 @@
 												<xs:complexType>
 													<xs:sequence minOccurs="0">
 														<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
 														<xs:element minOccurs="0" name="type" type="xs:string" />
 														<xs:element minOccurs="0" name="level" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="hasAbnormal" type="xs:boolean" />
@@ -2250,8 +2251,7 @@
 														<xs:element minOccurs="0" name="alignment" type="xs:string" />
 														<xs:element minOccurs="0" name="amount" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="percentType" type="xs:string" />
-														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
-														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
+														<xs:element minOccurs="0" maxOccurs="unbounded" name="item" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="classIds">
 															<xs:complexType>
 																<xs:sequence>
@@ -2929,11 +2929,9 @@
 							</xs:choice>
 						</xs:sequence>
 						<xs:attribute name="id" type="xs:unsignedInt" use="required" />
-						<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
+						<xs:attribute name="toLevel" type="xs:unsignedByte" use="required" />
 						<xs:attribute name="name" type="xs:string" use="required" />
-						<xs:attribute name="levels" type="xs:unsignedByte" use="optional" />
 						<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
-						<xs:attribute name="usingServerSideName" type="xs:boolean" use="optional" />
 						<xs:attribute name="displayId" type="xs:unsignedShort" use="optional" />
 					</xs:complexType>
 				</xs:element>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10300-10399.xml
index 1c8930cf11..600450f55f 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10300-10399.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10300-10399.xml
@@ -1076,14 +1076,14 @@
 		<icon>icon.skill10324</icon>
 		<operateType>P</operateType>
 		<passiveConditions>
-			<condition name="OpCheckSkill">
-				<skillId>261</skillId> <!-- Triple Sonic Slash -->
-				<skillId>10258</skillId> <!-- Armor Destruction -->
-				<skillId>10260</skillId> <!-- Mega Strike -->
-				<skillId>10262</skillId> <!-- Power Bomber -->
-				<skillId>10265</skillId> <!-- Eruption -->
-				<skillId>10269</skillId> <!-- Jump Attack -->
-				<skillId>10318</skillId> <!-- Sonic Flash -->
+			<condition name="OpCheckSkillList">
+				<item>261</item> <!-- Triple Sonic Slash -->
+				<item>10258</item> <!-- Armor Destruction -->
+				<item>10260</item> <!-- Mega Strike -->
+				<item>10262</item> <!-- Power Bomber -->
+				<item>10265</item> <!-- Eruption -->
+				<item>10269</item> <!-- Jump Attack -->
+				<item>10318</item> <!-- Sonic Flash -->
 				<affectType>CASTER</affectType>
 			</condition>
 		</passiveConditions>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd b/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd
index 569340f596..37ede5ac1b 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd
@@ -22,40 +22,6 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="affectLimit">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:string">
-															<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="affectRange">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:string">
-															<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
-															<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
-															<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
-															<xs:attribute name="fromSubLevel" type="xs:unsignedShort" use="optional" />
-															<xs:attribute name="toSubLevel" type="xs:unsignedShort" use="optional" />
-														</xs:extension>
-													</xs:simpleContent>
-												</xs:complexType>
-											</xs:element>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
 								<xs:element name="abnormalLvl">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -175,21 +141,6 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="fanRange">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:string">
-															<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="hitTime">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -205,51 +156,6 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="itemConsumeCount">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:unsignedShort">
-															<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="itemConsumeId">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:unsignedShort">
-															<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="hpConsume">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:unsignedShort">
-															<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="isMagic">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -419,7 +325,6 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="affectObject" type="xs:string" />
 								<xs:element name="conditions">
 									<xs:complexType>
 										<xs:sequence>
@@ -661,7 +566,7 @@
 											<xs:element minOccurs="0" name="dispel">
 												<xs:complexType>
 													<xs:sequence>
-														<xs:element maxOccurs="unbounded" name="value">
+														<xs:element name="value">
 															<xs:complexType>
 																<xs:simpleContent>
 																	<xs:extension base="xs:string">
@@ -2068,11 +1973,10 @@
 															</xs:element>
 															<xs:element name="existingSkillId" type="xs:unsignedShort" />
 															<xs:element name="existingSkillLevel" type="xs:unsignedByte" />
-															<xs:element name="replacementSkillId" type="xs:unsignedShort" />
-															<xs:element name="replacementSkillLevel" type="xs:unsignedByte" />
 															<xs:element name="addedSkillId" type="xs:unsignedShort" />
 															<xs:element name="addedSkillLevel" type="xs:unsignedByte" />
 															<xs:element name="skills" type="xs:string" />
+															<xs:element name="replacementSkillId" type="xs:unsignedShort" />
 															<xs:element name="isSummonSpawn" type="xs:boolean" />
 															<xs:element name="randomOffset" type="xs:unsignedByte" />
 															<xs:element name="AGGRESSION">
@@ -2123,6 +2027,101 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
+								<xs:element name="affectLimit">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:string">
+															<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="affectRange">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:string">
+															<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
+															<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
+															<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
+															<xs:attribute name="fromSubLevel" type="xs:unsignedShort" use="optional" />
+															<xs:attribute name="toSubLevel" type="xs:unsignedShort" use="optional" />
+														</xs:extension>
+													</xs:simpleContent>
+												</xs:complexType>
+											</xs:element>
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
+								<xs:element name="affectObject" type="xs:string" />
+								<xs:element name="hpConsume">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:unsignedShort">
+															<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="fanRange">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:string">
+															<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="itemConsumeCount">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:unsignedShort">
+															<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="itemConsumeId">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:unsignedShort">
+															<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="isDebuff">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -2243,6 +2242,8 @@
 												<xs:complexType>
 													<xs:sequence minOccurs="0">
 														<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
 														<xs:element minOccurs="0" name="type" type="xs:string" />
 														<xs:element minOccurs="0" name="level" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="hasAbnormal" type="xs:boolean" />
@@ -2250,8 +2251,7 @@
 														<xs:element minOccurs="0" name="alignment" type="xs:string" />
 														<xs:element minOccurs="0" name="amount" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="percentType" type="xs:string" />
-														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
-														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
+														<xs:element minOccurs="0" maxOccurs="unbounded" name="item" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="classIds">
 															<xs:complexType>
 																<xs:sequence>
@@ -2929,11 +2929,9 @@
 							</xs:choice>
 						</xs:sequence>
 						<xs:attribute name="id" type="xs:unsignedInt" use="required" />
-						<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
+						<xs:attribute name="toLevel" type="xs:unsignedByte" use="required" />
 						<xs:attribute name="name" type="xs:string" use="required" />
-						<xs:attribute name="levels" type="xs:unsignedByte" use="optional" />
 						<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
-						<xs:attribute name="usingServerSideName" type="xs:boolean" use="optional" />
 						<xs:attribute name="displayId" type="xs:unsignedShort" use="optional" />
 					</xs:complexType>
 				</xs:element>