diff --git a/trunk/dist/game/data/JumpTrack.xml b/trunk/dist/game/data/JumpTrack.xml
index f8cc532540..982b62cedc 100644
--- a/trunk/dist/game/data/JumpTrack.xml
+++ b/trunk/dist/game/data/JumpTrack.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xml>
 <list>
 	<!-- <FlyToLocation ToX="-111994" ToY="257250" ToZ="-1392" Type="2" /> -->
 	<track trackId="12" zone="Talking Island Village -> Essar to Gila ruins" ToX="-111994" ToY="257250" ToZ="-1392">
diff --git a/trunk/dist/game/data/stats/chars/pcBaseStats.xml b/trunk/dist/game/data/stats/chars/pcBaseStats.xml
index 05e0c276a9..3f6eb6ebd9 100644
--- a/trunk/dist/game/data/stats/chars/pcBaseStats.xml
+++ b/trunk/dist/game/data/stats/chars/pcBaseStats.xml
@@ -23,6 +23,8 @@
 	<basePatk classId="53" sex="male" val="4" /> <!-- Male Dwarven Fighter -->
 	<basePatk classId="124" sex="female" val="4" /> <!-- Female Soldier -->
 	<basePatk classId="123" sex="male" val="4" /> <!-- Male Male Soldier -->
+	<basePatk classId="182" sex="female" val="4" /> <!-- Ertheia Fighter -->
+	<basePatk classId="183" sex="female" val="3" /> <!-- Ertheia Wizard -->
 	<!-- Base rCrit -->
 	<baseRcrit classId="0" sex="female" val="4" /> <!-- Female Human Fighter -->
 	<baseRcrit classId="0" sex="male" val="4" /> <!-- Male Human Fighter -->
@@ -44,6 +46,8 @@
 	<baseRcrit classId="53" sex="male" val="4" /> <!-- Male Dwarven Fighter -->
 	<baseRcrit classId="124" sex="female" val="4" /> <!-- Female Soldier -->
 	<baseRcrit classId="123" sex="male" val="4" /> <!-- Male Male Soldier -->
+	<baseRcrit classId="182" sex="female" val="4" /> <!-- Ertheia Fighter -->
+	<baseRcrit classId="183" sex="female" val="4" /> <!-- Ertheia Wizard -->
 	<!-- Base atkType -->
 	<baseAtkType classId="0" sex="female" val="fist" /> <!-- Female Human Fighter -->
 	<baseAtkType classId="0" sex="male" val="fist" /> <!-- Male Human Fighter -->
@@ -65,6 +69,8 @@
 	<baseAtkType classId="53" sex="male" val="fist" /> <!-- Male Dwarven Fighter -->
 	<baseAtkType classId="124" sex="female" val="fist" /> <!-- Female Soldier -->
 	<baseAtkType classId="123" sex="male" val="fist" /> <!-- Male Male Soldier -->
+	<baseAtkType classId="182" sex="female" val="fist" /> <!-- Ertheia Fighter -->
+	<baseAtkType classId="183" sex="female" val="fist" /> <!-- Ertheia Wizard -->
 	<!-- Base atkSpd -->
 	<baseAtkSpd classId="0" sex="female" val="300" /> <!-- Female Human Fighter -->
 	<baseAtkSpd classId="0" sex="male" val="300" /> <!-- Male Human Fighter -->
@@ -86,6 +92,8 @@
 	<baseAtkSpd classId="53" sex="male" val="300" /> <!-- Male Dwarven Fighter -->
 	<baseAtkSpd classId="124" sex="female" val="300" /> <!-- Female Soldier -->
 	<baseAtkSpd classId="123" sex="male" val="300" /> <!-- Male Male Soldier -->
+	<baseAtkSpd classId="182" sex="female" val="300" /> <!-- Ertheia Fighter -->
+	<baseAtkSpd classId="183" sex="female" val="300" /> <!-- Ertheia Wizard -->
 	<!-- Base pDef -->
 	<basePdef classId="0" sex="female" chest="31" legs="18" head="12" feet="7" gloves="8" underwear="3" cloak="1" /> <!-- Female Human Fighter -->
 	<basePdef classId="0" sex="male" chest="31" legs="18" head="12" feet="7" gloves="8" underwear="3" cloak="1" /> <!-- Male Human Fighter -->
@@ -107,6 +115,8 @@
 	<basePdef classId="53" sex="male" chest="31" legs="18" head="12" feet="7" gloves="8" underwear="3" cloak="1" /> <!-- Male Dwarven Fighter -->
 	<basePdef classId="124" sex="female" chest="31" legs="18" head="12" feet="7" gloves="8" underwear="3" cloak="1" /> <!-- Female Soldier -->
 	<basePdef classId="123" sex="male" chest="31" legs="18" head="12" feet="7" gloves="8" underwear="3" cloak="1" /> <!-- Male Male Soldier -->
+	<basePdef classId="182" sex="female" chest="31" legs="18" head="12" feet="7" gloves="8" underwear="3" cloak="1" /> <!-- Ertheia Fighter -->
+	<basePdef classId="183" sex="female" chest="31" legs="18" head="12" feet="7" gloves="8" underwear="3" cloak="1" /> <!-- Ertheia Wizard -->
 	<!-- Base mAtk -->
 	<baseMatk classId="0" sex="female" val="6" /> <!-- Female Human Fighter -->
 	<baseMatk classId="0" sex="male" val="6" /> <!-- Male Human Fighter -->
@@ -128,6 +138,8 @@
 	<baseMatk classId="53" sex="male" val="6" /> <!-- Male Dwarven Fighter -->
 	<baseMatk classId="124" sex="female" val="6" /> <!-- Female Soldier -->
 	<baseMatk classId="123" sex="male" val="6" /> <!-- Male Male Soldier -->
+	<baseMatk classId="182" sex="female" val="6" /> <!-- Ertheia Fighter -->
+	<baseMatk classId="183" sex="female" val="6" /> <!-- Ertheia Wizard -->
 	<!-- Base mDef -->
 	<baseMdef classId="0" sex="female" rear="9" lear="9" rfinger="5" lfinger="5" neck="13" /> <!-- Female Human Fighter -->
 	<baseMdef classId="0" sex="male" rear="9" lear="9" rfinger="5" lfinger="5" neck="13" /> <!-- Male Human Fighter -->
@@ -149,6 +161,8 @@
 	<baseMdef classId="53" sex="male" rear="9" lear="9" rfinger="5" lfinger="5" neck="13" /> <!-- Male Dwarven Fighter -->
 	<baseMdef classId="124" sex="female" rear="9" lear="9" rfinger="5" lfinger="5" neck="13" /> <!-- Female Soldier -->
 	<baseMdef classId="123" sex="male" rear="9" lear="9" rfinger="5" lfinger="5" neck="13" /> <!-- Male Male Soldier -->
+	<baseMdef classId="182" sex="female" rear="9" lear="9" rfinger="5" lfinger="5" neck="13" /> <!-- Ertheia Fighter -->
+	<baseMdef classId="183" sex="female" rear="9" lear="9" rfinger="5" lfinger="5" neck="13" /> <!-- Ertheia Wizard -->
 	<!-- Base canPenetrate -->
 	<baseCanPenetrate classId="0" sex="female" val="0" /> <!-- Female Human Fighter -->
 	<baseCanPenetrate classId="0" sex="male" val="0" /> <!-- Male Human Fighter -->
@@ -170,6 +184,8 @@
 	<baseCanPenetrate classId="53" sex="male" val="0" /> <!-- Male Dwarven Fighter -->
 	<baseCanPenetrate classId="124" sex="female" val="0" /> <!-- Female Soldier -->
 	<baseCanPenetrate classId="123" sex="male" val="0" /> <!-- Male Male Soldier -->
+	<baseCanPenetrate classId="182" sex="female" val="0" /> <!-- Ertheia Fighter -->
+	<baseCanPenetrate classId="183" sex="female" val="0" /> <!-- Ertheia Wizard -->
 	<!-- Base atkRange -->
 	<baseAtkRange classId="0" sex="female" val="20" /> <!-- Female Human Fighter -->
 	<baseAtkRange classId="0" sex="male" val="20" /> <!-- Male Human Fighter -->
@@ -191,6 +207,8 @@
 	<baseAtkRange classId="53" sex="male" val="20" /> <!-- Male Dwarven Fighter -->
 	<baseAtkRange classId="124" sex="female" val="20" /> <!-- Female Soldier -->
 	<baseAtkRange classId="123" sex="male" val="20" /> <!-- Male Male Soldier -->
+	<baseAtkRange classId="182" sex="female" val="20" /> <!-- Ertheia Fighter -->
+	<baseAtkRange classId="183" sex="female" val="20" /> <!-- Ertheia Wizard -->
 	<!-- Base damRange -->
 	<!-- NOTE: Vertical Direction is represented in degrees 0=Front, 180=Back, positive degree=Up, negative degree=Down -->
 	<!-- NOTE: Horizontal Direction is represented in degrees 0=Front, 180=Back, positive degree=Left, negative degree=Right -->
@@ -214,6 +232,8 @@
 	<baseDamRange classId="53" sex="male" verticalDirection="0" horizontalDirection="0" distance="26" width="120" /> <!-- Male Dwarven Fighter -->
 	<baseDamRange classId="124" sex="female" verticalDirection="0" horizontalDirection="0" distance="26" width="120" /> <!-- Female Soldier -->
 	<baseDamRange classId="123" sex="male" verticalDirection="0" horizontalDirection="0" distance="26" width="120" /> <!-- Male Male Soldier -->
+	<baseDamRange classId="182" sex="female" verticalDirection="0" horizontalDirection="0" distance="26" width="120" /> <!-- Ertheia Fighter -->
+	<baseDamRange classId="183" sex="female" verticalDirection="0" horizontalDirection="0" distance="26" width="120" /> <!-- Ertheia Wizard -->
 	<!-- Base rndDam -->
 	<baseRndDam classId="0" sex="female" val="10" /> <!-- Female Human Fighter -->
 	<baseRndDam classId="0" sex="male" val="10" /> <!-- Male Human Fighter -->
@@ -235,4 +255,6 @@
 	<baseRndDam classId="53" sex="male" val="10" /> <!-- Male Dwarven Fighter -->
 	<baseRndDam classId="124" sex="female" val="10" /> <!-- Female Soldier -->
 	<baseRndDam classId="123" sex="male" val="10" /> <!-- Male Male Soldier -->
+	<baseRndDam classId="182" sex="female" val="10" /> <!-- Ertheia Fighter -->
+	<baseRndDam classId="183" sex="female" val="10" /> <!-- Ertheia Wizard -->
 </pcBaseStats>
\ No newline at end of file
diff --git a/trunk/dist/game/data/stats/skills/09200-09299.xml b/trunk/dist/game/data/stats/skills/09200-09299.xml
index 9b6e4ccd8a..ff3c3c58a0 100644
--- a/trunk/dist/game/data/stats/skills/09200-09299.xml
+++ b/trunk/dist/game/data/stats/skills/09200-09299.xml
@@ -23,7 +23,7 @@
 		<set name="targetType" val="SELF" />
 		<set name="abnormalType" val="MELODY_PIPE" />
 		<for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<mul stat="maxHp" val="1.37" />
 				<mul stat="maxMp" val="1.37" />
 				<mul stat="maxCp" val="1.37" />
@@ -39,7 +39,7 @@
 		<set name="targetType" val="SELF" />
 		<set name="abnormalType" val="MELODY_GUITAR" />
 		<for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<mul stat="rCrit" val="1.32" />
 				<mul stat="cAtk" val="1.35" />
 				<add stat="mCritRate" val="20" />
@@ -130,9 +130,9 @@
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="hitTime" val="2500" />
 		<set name="reuseDelay" val="1000" />
-		<cond msgId="1509">
+		<!--<cond msgId="1509">
 			<player olympiad="false" />
-		</cond>
+		</cond>-->
 		<cond addName="1" msgId="113">
 			<player canTransform="true" />
 		</cond>
diff --git a/trunk/dist/game/data/stats/skills/10000-10099.xml b/trunk/dist/game/data/stats/skills/10000-10099.xml
index 8299a25ac5..6bec065c55 100644
--- a/trunk/dist/game/data/stats/skills/10000-10099.xml
+++ b/trunk/dist/game/data/stats/skills/10000-10099.xml
@@ -460,7 +460,7 @@
 		<enchant8 name="power" val="#enchPower" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="Mute" val="0">
+			<effect name="Mute">
 				<param power="80" />
 				<mul stat="pDef" val="0.8" />
 				<mul stat="mDef" val="0.8" />
@@ -518,13 +518,11 @@
 		</cond>
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="Stun" val="0" />
-			<param power="40" />
+			<effect name="Stun" />
 		</for>
 		<enchant2for>
 			<effect name="PhysicalAttack" />
-			<effect name="Stun" val="0" />
-			<param power="#ench2effectPower" />
+			<effect name="Stun" />
 		</enchant2for>
 	</skill>
 	<skill id="10012" levels="7" name="Shield Wave">
@@ -578,13 +576,11 @@
 		</cond>
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="Stun" val="0" />
-			<param power="65" />
+			<effect name="Stun" />
 		</for>
 		<enchant2for>
 			<effect name="PhysicalAttack" />
-			<effect name="Stun" val="0" />
-			<param power="#ench2effectPower" />
+			<effect name="Stun" />
 		</enchant2for>
 	</skill>
 	<skill id="10013" levels="8" name="Gust Blade">
@@ -685,7 +681,7 @@
 		<enchant8 name="power" val="#enchPower" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<mul stat="regHp" val="0.1" />
 			</effect>
 		</for>
@@ -826,20 +822,20 @@
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
 		<enchant2 name="abnormalTime" val="#ench2abnormalTime" />
 		<for>
-			<effect name="TransferDamage" val="0">
+			<effect name="TransferDamage">
 				<add stat="transDamToPlayer" val="#transDamToPlayer" />
 			</effect>
 		</for>
 		<enchant2for>
-			<effect name="TransferDamage" val="0">
+			<effect name="TransferDamage">
 				<add stat="transDamToPlayer" val="90" />
 			</effect>
 		</enchant2for>
 		<enchant3for>
-			<effect name="TransferDamage" val="0">
+			<effect name="TransferDamage">
 				<add stat="transDamToPlayer" val="90" />
 			</effect>
-			<effect name="HealPercent" noicon="1" val="#ench3HpHealPercent" />
+			<effect name="HealPercent" />
 		</enchant3for>
 	</skill>
 	<skill id="10019" levels="2" name="Protection of Faith">
@@ -861,7 +857,7 @@
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
 		<enchant2 name="abnormalTime" val="#ench2abnormalTime" />
 		<for>
-			<effect name="TransferDamage" val="0">
+			<effect name="TransferDamage">
 				<add stat="transDamToPlayer" val="90" />
 				<param DERANGEMENT="#derangementVuln" />
 				<add stat="pDef" val="#power" />
@@ -869,7 +865,7 @@
 			</effect>
 		</for>
 		<enchant2for>
-			<effect name="TransferDamage" val="0">
+			<effect name="TransferDamage">
 				<add stat="transDamToPlayer" val="90" />
 				<param DERANGEMENT="70" />
 				<add stat="pDef" val="10000" />
@@ -877,7 +873,7 @@
 			</effect>
 		</enchant2for>
 		<enchant3for>
-			<effect name="TransferDamage" val="0">
+			<effect name="TransferDamage">
 				<add stat="transDamToPlayer" val="90" />
 				<param DERANGEMENT="70" />
 				<add stat="pDef" val="10000" />
@@ -900,7 +896,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="DamOverTime" val="#mpConsume">
+			<effect name="DamOverTime">
 				<add stat="pDef" val="#pDef" />
 				<add stat="sDef" val="#sDef" />
 				<mul stat="rShld" val="#rShld" />
@@ -929,14 +925,14 @@
 			<using kind="SHIELD" />
 		</cond>
 		<for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="reflectDam" val="#reflectPercent" />
 				<add stat="vengeanceMdam" val="50" />
 				<add stat="reflectSkillMagic" val="50" />
 			</effect>
 		</for>
 		<enchant2for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="reflectDam" val="25" />
 				<add stat="vengeanceMdam" val="50" />
 				<add stat="reflectSkillMagic" val="50" />
@@ -961,11 +957,11 @@
 		<enchant2 name="abnormalTime" val="#ench2abnormalTime" />
 		<!-- <enchant9 name="reuseDelay" val="#ench9Reuse" /> -->
 		<for>
-			<effect name="IgnoreDeath"/>
+			<effect name="IgnoreDeath" />
 		</for>
 		<enchant3for>
-			<effect name="IgnoreDeath"/>
-			<effect name="HealPercent" noicon="1" val="#ench3HpHealPercent" />
+			<effect name="IgnoreDeath" />
+			<effect name="HealPercent" />
 		</enchant3for>
 	</skill>
 	<skill id="10023" levels="2" name="King of Beasts">
@@ -1010,7 +1006,7 @@
 			<using kind="SHIELD" />
 		</cond>
 		<for>
-			<effect abnormalLvl="1" abnormalTime="1" abnormalVisualEffect="sknockdown" effectPower="85"	effectType="KNOCK_DOWN" name="KnockDown" val="0" />
+			<effect abnormalTime="1" name="KnockDown" />
 		</for>
 	</skill>
 	<skill id="10024" levels="1" name="Party Rescue" enchantGroup1="10" enchantGroup2="10">
@@ -1036,15 +1032,15 @@
 				<add stat="transDamToPlayer" val="90" />
 				<add stat="maxSkillDamage" val="10" />
 			</effect>
-			<effect name="JumpToFriend" noicon="1" />
+			<effect name="JumpToFriend" />
 		</for>
 		<enchant2for>
 			<effect name="TransferDamage">
 				<add stat="transDamToPlayer" val="90" />
 				<add stat="maxSkillDamage" val="10" />
 			</effect>
-			<effect name="JumpToFriend" noicon="1" />
-			<effect name="HealPercent" noicon="1" val="#ench2HpHealPercent" />
+			<effect name="JumpToFriend" />
+			<effect name="HealPercent" />
 		</enchant2for>
 	</skill>
 	<skill id="10025" levels="4" name="Knight Frenzy">
@@ -1845,7 +1841,7 @@
 			<effect name="DispelByCategory">
 				<param slot="debuff" rate="100" max="10" />
 			</effect>
-			<effect name="HealPercent" noicon="1" val="#HpHealPercent" />
+			<effect name="HealPercent" />
 			<effect name="Buff">
 				<set stat="debuffImmunity" val="1" />
 				<add stat="pDef" val="#pDef" />
@@ -1871,7 +1867,7 @@
 		<set name="reuseDelay" val="30000" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="mDef" val="1000" />
 				<add stat="fireRes" val="20" />
 				<add stat="waterRes" val="20" />
@@ -1956,7 +1952,7 @@
 		<set name="skillRadius" val="450" />
 		<set name="skillType" val="BUFF" />
 		<for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<mul stat="mDef" val="#defense" />
 				<mul stat="pDef" val="#defense" />
 			</effect>
diff --git a/trunk/dist/game/data/stats/skills/10200-10299.xml b/trunk/dist/game/data/stats/skills/10200-10299.xml
index 2a379ed595..48a1d91e94 100644
--- a/trunk/dist/game/data/stats/skills/10200-10299.xml
+++ b/trunk/dist/game/data/stats/skills/10200-10299.xml
@@ -69,7 +69,7 @@
 		<set name="isDebuff" val="true" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="Stun" val="0" />
+			<effect name="Stun" />
 		</for>
 	</skill>
 	<skill id="10251" levels="1" name="Superior Weapon Mastery" enchantGroup1="10">
@@ -662,13 +662,13 @@
 		<enchant8 name="power" val="#enchPower" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="RandomizeHate" noicon="1" val="0">
+			<effect name="RandomizeHate">
 				<param power="#powerDebuff" />
 			</effect>
-			<effect  name="TargetCancel" noicon="1" val="0">
+			<effect  name="TargetCancel">
 				<param power="#powerDebuff" />
 			</effect>
-			<effect name="Stun" val="0">
+			<effect name="Stun">
 				<param power="#powerDebuff" />
 			</effect>
 		</for>
@@ -752,17 +752,17 @@
 			</and>
 		</cond>
 		<for>
-			<effect name="Stun" val="0">
+			<effect name="Stun">
 				<param power="70" />
 			</effect>
 		</for>
 		<enchant2for>
-			<effect name="Stun" val="0">
+			<effect name="Stun">
 				<param power="#ench2effectPower" />
 			</effect>
 		</enchant2for>
 		<enchant4for>
-			<effect name="Stun" val="0">
+			<effect name="Stun">
 				<param power="#ench2effectPower" />
 			</effect>
 			<effect name="Debuff">
@@ -784,7 +784,7 @@
 		<set name="skillToCastLevel" val="#triggeredLevel" />
 		<set name="operateType" val="TOGGLE" />
 		<for>
-			<effect abnormalLvl="#triggeredLevel" name="ManaDamOverTime" val="#mdot" />
+			<effect name="ManaDamOverTime" />
 		</for>
 	</skill>
 	<skill id="10269" levels="7" name="Jump Attack">
@@ -840,19 +840,19 @@
 			</and>
 		</cond>
 		<for>
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<param power="80" />
 				<mul stat="runSpd" val="0.3" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<param power="80" />
 				<mul stat="runSpd" val="0.3" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<param power="#ench2effectPower" />
 				<mul stat="runSpd" val="0.3" />
 			</effect>
@@ -913,7 +913,7 @@
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
 		<enchant3 name="skillRadius" val="#ench3radius" />
 		<for>
-			<effect name="TargetMe" val="0">
+			<effect name="TargetMe">
 				<param power="75" />
 				<mul stat="pAtk" val="1.2" />
 				<mul stat="pAtkSpd" val="1.2" />
@@ -921,7 +921,7 @@
 			</effect>
 		</for>
 		<enchant2for>
-			<effect name="TargetMe" val="0">
+			<effect name="TargetMe">
 				<param power="#ench2effectPower" />
 				<mul stat="pAtk" val="1.2" />
 				<mul stat="pAtkSpd" val="1.2" />
@@ -929,7 +929,7 @@
 			</effect>
 		</enchant2for>
 		<enchant4for>
-			<effect name="TargetMe" val="0">
+			<effect name="TargetMe">
 				<param power="#ench2effectPower" />
 				<mul stat="pAtk" val="1.2" />
 				<mul stat="pAtkSpd" val="1.2" />
@@ -937,7 +937,7 @@
 			</effect>
 		</enchant4for>
 		<enchant5for>
-			<effect name="TargetMe" val="0">
+			<effect name="TargetMe">
 				<param power="#ench2effectPower" />
 				<mul stat="pAtk" val="1.2" />
 				<mul stat="pAtkSpd" val="1.2" />
@@ -970,25 +970,25 @@
 		<enchant2 name="abnormalTime" val="#ench2Time" />
 		<enchant3 name="skillRadius" val="#ench3radius" />
 		<for>
-			<effect abnormalLvl="1" abnormalType="disarm" name="Disarm" val="0">
+			<effect name="Disarm">
 				<mul stat="pDef" val="#def" />
 				<mul stat="mDef" val="#def" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect abnormalLvl="1" abnormalType="disarm" abnormalVisualEffect="bleed" name="Disarm" val="0">
+			<effect name="Disarm">
 				<mul stat="pDef" val="0.75" />
 				<mul stat="mDef" val="0.75" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect abnormalLvl="1" abnormalType="disarm" abnormalVisualEffect="bleed" name="Disarm" val="0">
+			<effect name="Disarm">
 				<mul stat="pDef" val="0.75" />
 				<mul stat="mDef" val="0.75" />
 			</effect>
 		</enchant2for>
 		<enchant4for>
-			<effect abnormalLvl="1" abnormalType="disarm" abnormalVisualEffect="bleed" name="Disarm" val="0">
+			<effect name="Disarm">
 				<mul stat="pDef" val="0.75" />
 				<mul stat="mDef" val="0.75" />
 				<!--<add stat="knockDownVuln" val="#enchVuln" />
@@ -996,7 +996,7 @@
 			</effect>
 		</enchant4for>
 		<enchant5for>
-			<effect abnormalLvl="1" abnormalTime="5" abnormalType="disarm" abnormalVisualEffect="bleed" name="Disarm" val="0">
+			<effect name="Disarm">
 				<mul stat="pDef" val="0.75" />
 				<mul stat="mDef" val="0.75" />
 				<!--<add stat="stunVuln" val="#enchVuln" />-->
@@ -1039,7 +1039,7 @@
 			</and>
 		</enchant3cond>
 		<for>
-			<effect abnormalLvl="#abnormalLvl" abnormalType="pinch" name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="runSpd" val="#runSpd" />
 				<mul stat="pAtk" val="#pAtk" />
 				<add stat="accCombat" val="#accPhysical" />
@@ -1069,7 +1069,7 @@
 			</effect>
 		</for>
 		<enchant2for>
-			<effect abnormalLvl="7" abnormalType="pinch" name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="runSpd" val="25" />
 				<mul stat="pAtk" val="1.11" />
 				<add stat="accCombat" val="25" />
@@ -1099,7 +1099,7 @@
 			</effect>
 		</enchant2for>
 		<enchant4for>
-			<effect abnormalLvl="7" abnormalType="pinch" name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="runSpd" val="25" />
 				<mul stat="pAtk" val="1.11" />
 				<add stat="accCombat" val="25" />
@@ -1173,15 +1173,15 @@
 			</not>
 		</cond>
 		<for>
-			<effect count="1" name="FocusEnergy" noicon="1" val="15" />
+			<effect name="FocusEnergy" />
 		</for>
 		<enchant1for>
-			<effect count="1" name="FocusEnergy" noicon="1" val="15" />
-			<effect name="HealPercent" noicon="1" val="#enchPercentHeal" />
+			<effect name="FocusEnergy" />
+			<effect name="HealPercent" />
 		</enchant1for>
 		<enchant2for>
-			<effect count="1" name="FocusEnergy" noicon="1" val="15" />
-			<effect name="CpHealPercent" noicon="1" val="#enchPercentHeal" />
+			<effect name="FocusEnergy" />
+			<effect name="CpHealPercent" />
 		</enchant2for>
 	</skill>
 	<skill id="10277" levels="4" name="Final Cry">
@@ -1203,7 +1203,7 @@
 		<enchant2 name="abnormalTime" val="#ench2abnormalTime" />
 		<enchant3 name="abnormalTime" val="#ench2abnormalTime" />
 		<for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<mul stat="pAtk" val="#pAtk" />
 				<mul stat="physicalSkillPower" val="#physicalSkillPower" />
 				<mul stat="pvpPhysDmg" val="1.05" />
@@ -1211,7 +1211,7 @@
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<mul stat="pAtk" val="1.33" />
 				<mul stat="physicalSkillPower" val="1.33" />
 				<mul stat="pvpPhysDmg" val="1.05" />
@@ -1219,7 +1219,7 @@
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<mul stat="pAtk" val="1.33" />
 				<mul stat="physicalSkillPower" val="1.16" />
 				<mul stat="pvpPhysDmg" val="1.05" />
@@ -1296,7 +1296,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="FocusEnergy" val="100" />
+			<effect name="FocusEnergy" />
 		</for>
 	</skill>
 	<skill id="10281" levels="2" name="Sonic Star">
@@ -1430,7 +1430,7 @@
 		<set name="skillRadius" val="200" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<for>
-			<effect name="DamOverTime" val="#dot" />
+			<effect name="DamOverTime" />
 		</for>
 	</skill>
 	<skill id="10288" levels="8" name="Hurricane Storm">
@@ -1787,7 +1787,7 @@
 		<set name="reuseDelay" val="600000" />
 		<set name="mpConsume" val="38" />
 		<for>
-			<effect name="HealPercent" noicon="1" val="100" />
+			<effect name="HealPercent" />
 		</for>
 	</skill>
 	<skill id="10299" levels="1" name="Stun Spear">
diff --git a/trunk/dist/game/data/stats/skills/10500-10599.xml b/trunk/dist/game/data/stats/skills/10500-10599.xml
index 02fa0e4825..85126e81c7 100644
--- a/trunk/dist/game/data/stats/skills/10500-10599.xml
+++ b/trunk/dist/game/data/stats/skills/10500-10599.xml
@@ -326,7 +326,7 @@
 		</cond>
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="Buff" time="10" val="0">
+			<effect name="Buff">
 				<add stat="runSpd" val="40" />
 				<add stat="rEvas" val="5" />
 			</effect>
@@ -534,7 +534,7 @@
 		<enchant8 name="power" val="#enchPower" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="Debuff" time="10" val="0">
+			<effect name="Debuff">
 				<param BLEED="1.1" />
 			</effect>
 		</for>
@@ -583,7 +583,7 @@
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="PARALYZE" />
 		<for>
-			<effect name="Paralyze" abnormalTime="5" val="0" />
+			<effect name="Paralyze" abnormalTime="5" />
 		</for>
 	</skill>
 	<skill id="10516" levels="6" name="Shadow Chase">
@@ -609,15 +609,15 @@
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
 		<enchant3 name="castRange" val="#ench3CastRange" />
 		<for>
-			<effect effectPower="100" name="TargetCancel" noicon="1" val="0" />
-			<effect name="TeleportToTarget" val="0" />
-			<effect name="Stun" val="0">
+			<effect name="TargetCancel" />
+			<effect name="TeleportToTarget" />
+			<effect name="Stun">
 				<param power="40" />
 			</effect>
 		</for>
 		<enchant2for>
-			<effect effectPower="100" name="TargetCancel" noicon="1" val="0" />
-			<effect name="Stun" val="0">
+			<effect name="TargetCancel" />
+			<effect name="Stun">
 				<param power="40" />
 			</effect>
 		</enchant2for>
@@ -699,7 +699,7 @@
 		<enchant2 name="abnormalTime" val="#ench2abnormalTime" />
 		<enchant3 name="abnormalTime" val="#ench2abnormalTime" />
 		<for>
-			<effect name="TriggerSkillBySkill" noicon="1" triggeredId="10544" triggeredLevel="4" val="0" />
+			<effect name="TriggerSkillBySkill" triggeredId="10544" triggeredLevel="4" />
 			<effect name="Buff">
 				<add stat="rEvas" val="#rEvas" />
 				<add stat="mEvas" val="#mEvas" />
@@ -709,7 +709,7 @@
 			</effect>
 		</for>
 		<enchant2for>
-			<effect name="TriggerSkillBySkill" noicon="1" triggeredId="10544" triggeredLevel="4" val="0" />
+			<effect name="TriggerSkillBySkill" triggeredId="10544" triggeredLevel="4" />
 			<effect name="Buff">
 				<add stat="rEvas" val="75" />
 				<add stat="mEvas" val="90" />
@@ -719,7 +719,7 @@
 			</effect>
 		</enchant2for>
 		<enchant3for>
-			<effect name="TriggerSkillBySkill" noicon="1" triggeredId="10544" triggeredLevel="4" val="0" />
+			<effect name="TriggerSkillBySkill" triggeredId="10544" triggeredLevel="4" />
 			<effect name="Buff">
 				<add stat="rEvas" val="75" />
 				<add stat="mEvas" val="90" />
@@ -729,7 +729,7 @@
 			</effect>
 		</enchant3for>
 		<enchant4for>
-			<effect name="TriggerSkillBySkill" noicon="1" triggeredId="10544" triggeredLevel="4" val="0" />
+			<effect name="TriggerSkillBySkill" triggeredId="10544" triggeredLevel="4" />
 			<effect name="Buff">
 				<add stat="rEvas" val="75" />
 				<add stat="mEvas" val="90" />
@@ -782,7 +782,7 @@
 		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" val="#dot">
+			<effect name="DamOverTime">
 				<mul stat="runSpd" val="#runSpd" />
 				<mul stat="pAtk" val="#pAtk" />
 				<mul stat="sDef" val="#sDef" />
@@ -816,13 +816,13 @@
 		<enchant2 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant2 name="abnormalTime" val="#ench2abnormalTime" />
 		<for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="vengeancePdam" val="#vengeancePdam" />
 				<add stat="pSkillEvas" val="90" />
 			</effect>
 		</for>
 		<enchant2for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="vengeancePdam" val="100" />
 				<add stat="pSkillEvas" val="90" />
 			</effect>
@@ -848,21 +848,21 @@
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
 		<enchant2 name="abnormalTime" val="#ench2abnormalTime" />
 		<for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="runSpd" val="66" />
 				<mul stat="regHp" val="#regHp" />
 				<add stat="rEvas" val="#rEvas" />
 			</effect>
 		</for>
 		<enchant2for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="runSpd" val="66" />
 				<mul stat="regHp" val="1.4" />
 				<add stat="rEvas" val="10" />
 			</effect>
 		</enchant2for>
 		<enchant3for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="runSpd" val="66" />
 				<mul stat="regHp" val="1.4" />
 				<add stat="rEvas" val="10" />
@@ -895,41 +895,38 @@
 		<enchant2 name="power" val="#ench2effectPower" />
 		<for>
 			<effect name="RandomizeHate" />
-			<effect name="TargetCancel" noicon="1" val="0" />
-			<effect name="Debuff" val="0">
+			<effect name="TargetCancel" />
+			<effect name="Debuff">
 				<mul stat="runSpd" val="0.7" />
 			</effect>
 		</for>
 		<enchant3for>
 			<effect name="RandomizeHate" />
-			<effect name="TargetCancel" noicon="1" val="0" />
-			<effect name="Debuff" val="0">
+			<effect name="TargetCancel" />
+			<effect name="Debuff">
 				<mul stat="runSpd" val="0.7" />
-				<add stat="paralyzeVuln" val="#enchVuln" />
 			</effect>
 		</enchant3for>
 		<enchant4for>
 			<effect name="RandomizeHate" />
-			<effect name="TargetCancel" noicon="1" val="0" />
-			<effect name="Debuff" val="0">
+			<effect name="TargetCancel" />
+			<effect name="Debuff">
 				<mul stat="runSpd" val="0.7" />
 				<param BLEED="#enchVuln" />
 			</effect>
 		</enchant4for>
 		<enchant5for>
 			<effect name="RandomizeHate" />
-			<effect name="TargetCancel" noicon="1" val="0" />
-			<effect name="Debuff" val="0">
+			<effect name="TargetCancel" />
+			<effect name="Debuff">
 				<mul stat="runSpd" val="0.7" />
-				<add stat="poisonVuln" val="#enchVuln" />
 			</effect>
 		</enchant5for>
 		<enchant6for>
 			<effect name="RandomizeHate" />
-			<effect name="TargetCancel" noicon="1" val="0" />
-			<effect name="Debuff" val="0">
+			<effect name="TargetCancel" />
+			<effect name="Debuff">
 				<mul stat="runSpd" val="0.7" />
-				<add stat="stunVuln" val="#enchVuln" />
 			</effect>
 		</enchant6for>
 	</skill>
@@ -996,7 +993,7 @@
 		<set name="skillType" val="FAKE_DEATH" />
 		<set name="operateType" val="TOGGLE" />
 		<for>
-			<effect name="FakeDeath" val="60" />
+			<effect name="FakeDeath" />
 		</for>
 	</skill>
 	<skill id="10529" levels="1" name="Shadow Flash">
@@ -1055,7 +1052,7 @@
 		<set name="targetType" val="SELF" />
 		<set name="skillType" val="BUFF" />
 		<for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<mul stat="pAtk" val="1.1" />
 				<mul stat="rCrit" val="1.1" />
 				<mul stat="cAtk" val="1.1">
@@ -1089,7 +1086,7 @@
 			<using kind="DAGGER,DUALDAGGER" />
 		</cond>
 		<for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="runSpd" val="#runSpd" />
 				<add stat="rEvas" val="40" />
 				<add stat="pSkillEvas" val="#pSkillEvas" />
@@ -1105,7 +1102,7 @@
 			</effect>
 		</for>
 		<enchant2for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="runSpd" val="34" />
 				<add stat="rEvas" val="40" />
 				<add stat="pSkillEvas" val="45" />
@@ -1121,13 +1118,12 @@
 			</effect>
 		</enchant2for>
 		<enchant3for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="runSpd" val="34" />
 				<add stat="rEvas" val="40" />
 				<add stat="pSkillEvas" val="45" />
 				<mul stat="rCrit" val="1.4" />
 				<sub stat="debuffVuln" val="80" />
-				<add stat="stunProf" val="#enchBonusProf" />
 			</effect>
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
@@ -1202,7 +1198,7 @@
 		<set name="lvlDepend" val="2" />
 		<set name="trait" val="DERANGEMENT" />
 		<for>
-			<effect name="Mute" val="0" />
+			<effect name="Mute" />
 		</for>
 	</skill>
 	<skill id="10538" levels="4" name="Weakness Critical">
@@ -1288,7 +1284,7 @@
 			<using kind="DAGGER,DUALDAGGER" />
 		</cond>
 		<for>
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<mul stat="runSpd" val="0.2" />
 			</effect>
 		</for>
@@ -1322,25 +1318,25 @@
 			<using kind="DAGGER,DUALDAGGER" />
 		</cond>
 		<for>
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<param power="#power" />
 				<sub stat="accCombat" val="#accPhysical" />
 			</effect>
 		</for>
 		<enchant2for>
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<param power="#power" />
 				<sub stat="accCombat" val="16" />
 			</effect>
 		</enchant2for>
 		<enchant3for>
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<sub stat="accCombat" val="16" />
 				<sub stat="earthRes" val="#enchtargetTypeElemVuln" />
 			</effect>
 		</enchant3for>
 		<enchant4for>
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<sub stat="accCombat" val="16" />
 				<param BLEED="#enchtargetTypeElemVuln" />
 			</effect>
@@ -1396,7 +1392,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="SilentMove" val="45">
+			<effect name="SilentMove">
 				<mul stat="runSpd" val="1.2" />
 				<mul stat="pDef" val="0.8" />
 			</effect>
@@ -1414,7 +1410,7 @@
 		<set name="power" val="100" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="TargetCancel" noicon="1" val="0" />
+			<effect name="TargetCancel" />
 		</for>
 	</skill>
 	<skill id="10545" levels="4" name="Crippling Poison">
@@ -1430,7 +1426,7 @@
 		<set name="power" val="100" />
 		<set name="isTriggeredSkill" val="true" />
 		<for>
-			<effect name="Paralyze" val="0" />
+			<effect name="Paralyze" />
 		</for>
 	</skill>
 	<skill id="10546" levels="4" name="Uppercut">
@@ -1461,11 +1457,11 @@
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect abnormalVisualEffect="sknockdown" comboType="COMBO_KNOCK_DOWN" effectType="KNOCK_DOWN" name="KnockDown" val="0" />
+			<effect name="KnockDown" />
 		</for>
 		<enchant2for>
 			<effect name="PhysicalAttack" />
-			<effect effectType="KNOCK_DOWN" name="KnockDown" val="0" />
+			<effect name="KnockDown" />
 		</enchant2for>
 	</skill>
 	<skill id="10547" levels="1" name="Shadow Attack">
@@ -1496,9 +1492,9 @@
 		<set name="skillType" val="PDAM" />
 		<set name="targetType" val="ONE" />
 		<enchant1 name="power" val="#ench1power" />
-		<cond addName="1" msgId="109">
+		<!--<cond addName="1" msgId="109">
 			<targetType npcType="L2MonsterInstance" />
-		</cond>
+		</cond>-->
 		<!--<for>
 			<effect name="Plunder" noicon="1" val="0" />
 		</for>-->
@@ -1530,7 +1526,7 @@
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
 		<enchant2 name="power" val="#ench2effectPower" />
 		<for>
-			<effect effectPower="-1" effectType="KNOCK_BACK" name="KnockBack" val="0" />
+			<effect name="KnockBack" />
 		</for>
 	</skill>
 	<skill id="10550" levels="4" name="Illusion Strike">
@@ -1547,7 +1543,7 @@
 		<set name="staticReuse" val="false" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<mul stat="runSpd" val="0.77" />
 			</effect>
 		</for>
@@ -1569,7 +1565,7 @@
 		<set name="trait" val="DERANGEMENT" />
 		<set name="isDebuff" val="true" />
 		<for>
-			<effect name="TargetCancel" noicon="1" val="0" />
+			<effect name="TargetCancel" />
 		</for>
 	</skill>
 	<skill id="10552" levels="1" name="Superior Resistance">
@@ -1632,9 +1628,9 @@
 		<set name="isDebuff" val="true" />
 		<enchant1 name="power" val="#ench1chance" />
 		<for>
-			<effect name="Bluff" noicon="1" val="0" />
-			<effect  name="Stun" val="0" />
-			<effect name="TargetCancel" noicon="1" val="0" />
+			<effect name="Bluff" />
+			<effect  name="Stun" />
+			<effect name="TargetCancel" />
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param minDamage="1" chance="70" />
@@ -1659,7 +1655,7 @@
 		<set name="trait" val="HOLD" />
 		<set name="ignoreResists" val="true" />
 		<for>
-			<effect name="Root" val="0" />
+			<effect name="Root" />
 		</for>
 	</skill>
 	<skill id="10556" levels="1" name="Illusion Hide">
@@ -1706,11 +1702,11 @@
 					<using kind="DAGGER,DUALDAGGER" />
 				</mul>
 				<mul stat="rCrit" val="#rCritSide">
-					<targetType position="SIDE" />
+					<!--<targetType position="SIDE" />-->
 					<using kind="DAGGER,DUALDAGGER" />
 				</mul>
 				<mul stat="rCrit" val="#rCritBack">
-					<targetType position="BACK" />
+					<!--<targetType position="BACK" />-->
 					<using kind="DAGGER,DUALDAGGER" />
 				</mul>
 			</effect>
@@ -1736,7 +1732,7 @@
 		<set name="power" val="100" />
 		<set name="isTriggeredSkill" val="true" />
 		<for>
-			<effect name="TargetCancel" noicon="1" val="0" />
+			<effect name="TargetCancel" />
 		</for>
 	</skill>
 	<skill id="10560" levels="1" name="Maximum Blow">
@@ -1750,7 +1746,7 @@
 		<set name="skillType" val="BUFF" />
 		<set name="weaponsAllowed" val="Dagger, Dual Dagger" />
 		<for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<mul stat="blowRate" val="1.1" />
 			</effect>
 		</for>
diff --git a/trunk/dist/game/data/stats/skills/10700-10799.xml b/trunk/dist/game/data/stats/skills/10700-10799.xml
index 30aac45644..e06133126b 100644
--- a/trunk/dist/game/data/stats/skills/10700-10799.xml
+++ b/trunk/dist/game/data/stats/skills/10700-10799.xml
@@ -704,9 +704,7 @@
 			<effect name="KnockBack" />
 		</for>
 		<enchant2for>
-			<for>
-				<effect name="KnockBack" />
-			</for>
+			<effect name="KnockBack" />
 		</enchant2for>
 	</skill>
 	<skill id="10771" levels="8" name="Multiple Arrow">
@@ -837,7 +835,7 @@
 		<set name="hitTime" val="700" />
 		<enchant1 name="flyRadius" val="#ench1flyRadius" />
 		<for>
-			<effect name="Blink" noicon="1" self="1" val="0" />
+			<effect name="Blink" />
 		</for>
 	</skill>
 	<skill id="10775" levels="3" name="Confusion Decoy">
@@ -1471,9 +1469,6 @@
 		<set name="trait" val="BLEED" />
 		<enchant1 name="power" val="#ench1power" />
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
-		<for>
-			<effect abnormalType="bleeding" abnormalVisualEffect="bleed" count="10" effectPower="50" effectType="BLEED" name="DamOverTime" val="#dot" />
-		</for>
 	</skill>
 	<skill id="10799" levels="1" name="Superior M. Def.">
 		<table name="#ench1mDef">206 213 220 227 234 241 248 255 262 270</table>
diff --git a/trunk/dist/game/data/stats/skills/10800-10899.xml b/trunk/dist/game/data/stats/skills/10800-10899.xml
index 8eab6afce4..5dbd3c82a2 100644
--- a/trunk/dist/game/data/stats/skills/10800-10899.xml
+++ b/trunk/dist/game/data/stats/skills/10800-10899.xml
@@ -65,7 +65,6 @@
 				<param BOW="1.6" />
 				<param CROSSBOW="1.6" />
 				<mul stat="mDef" val="0.75" />
-				<add stat="stunVuln" val="#enchVuln" />
 			</effect>
 		</enchant3for>
 		<enchant4for>
@@ -74,7 +73,6 @@
 				<param CROSSBOW="1.6" />
 				<mul stat="mDef" val="0.75" />
 				<param KNOCKDOWN="#enchVuln" />
-				<param KNOCKBACK="#enchVuln" />
 			</effect>
 		</enchant4for>
 	</skill>
@@ -117,7 +115,6 @@
 				<param BOW="1.6" />
 				<param CROSSBOW="1.6" />
 				<mul stat="mDef" val="0.75" />
-				<add stat="stunVuln" val="#enchVuln" />
 			</effect>
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
@@ -133,7 +130,6 @@
 				<param CROSSBOW="1.6" />
 				<mul stat="mDef" val="0.75" />
 				<param KNOCKDOWN="#enchVuln" />
-				<param KNOCKBACK="#enchVuln" />
 			</effect>
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
diff --git a/trunk/dist/game/data/stats/skills/11000-11099.xml b/trunk/dist/game/data/stats/skills/11000-11099.xml
index 100b8627d9..9785549c4c 100644
--- a/trunk/dist/game/data/stats/skills/11000-11099.xml
+++ b/trunk/dist/game/data/stats/skills/11000-11099.xml
@@ -25,7 +25,7 @@
 			</and>
 		</cond>
 		<for>
-			<effect name="Stun" val="0">
+			<effect name="Stun">
 				<param power="50" />
 			</effect>
 		</for>
@@ -197,7 +197,7 @@
 		<set name="stayAfterDeath" val="true" />
 		<set name="forceStore" val="true" />
 		<for>
-			<effect name="DamOverTime" val="0">
+			<effect name="DamOverTime">
 				<add stat="firePower" val="50" />
 			</effect>
 		</for>
@@ -215,7 +215,7 @@
 		<set name="stayAfterDeath" val="true" />
 		<set name="forceStore" val="true" />
 		<for>
-			<effect name="DamOverTime" val="0">
+			<effect name="DamOverTime">
 				<add stat="waterPower" val="50" />
 			</effect>
 		</for>
@@ -233,7 +233,7 @@
 		<set name="stayAfterDeath" val="true" />
 		<set name="forceStore" val="true" />
 		<for>
-			<effect name="DamOverTime" val="0">
+			<effect name="DamOverTime">
 				<add stat="windPower" val="50" />
 			</effect>
 		</for>
@@ -251,7 +251,7 @@
 		<set name="stayAfterDeath" val="true" />
 		<set name="forceStore" val="true" />
 		<for>
-			<effect name="DamOverTime" val="0">
+			<effect name="DamOverTime">
 				<add stat="earthPower" val="50" />
 			</effect>
 		</for>
@@ -966,15 +966,20 @@
 		<enchant1 name="mpInitialConsume" val="#ench1MpInitialConsume" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect name="DamOverTime" val="#dot" />
+			<effect name="DamOverTime">
+				<param power="#dot" />
+			</effect>
 		</for>
 		<enchant2for>
 			<effect name="MagicalAttack" />
-			<effect name="DamOverTime" val="#ench2dot" />
+			<effect name="DamOverTime">
+				<param power="#ench2dot" />
+			</effect>
 		</enchant2for>
 		<enchant3for>
 			<effect name="MagicalAttack" />
-			<effect name="DamOverTime" val="537">
+			<effect name="DamOverTime">
+				<param power="537" />
 				<param DERANGEMENT="#ench3reduceFear" />
 			</effect>
 		</enchant3for>
@@ -1054,12 +1059,12 @@
 		<enchant4 name="power" val="#enchPower" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect effectPower="40" effectType="KNOCK_BACK" name="KnockBack" noicon="1" val="0">
+			<effect name="KnockBack">
 				<param power="40" />
 			</effect>
 		</for>
 		<enchant3for>
-			<effect effectType="KNOCK_BACK" name="KnockBack" noicon="1" val="0">
+			<effect name="KnockBack">
 				<param power="#ench3debuffPower" />
 			</effect>
 		</enchant3for>
@@ -1524,7 +1529,7 @@
 		<enchant1 name="mpInitialConsume" val="#ench1MpInitialConsume" />
 		<enchant2 name="abnormalTime" val="#ench2abnormalTime" />
 		<for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<mul stat="mAtk" val="#mAtk" />
 				<mul stat="mCritRate" val="#mCritRate" />
 				<mul stat="mDef" val="1.2" />
@@ -1534,7 +1539,7 @@
 			</effect>
 		</for>
 		<enchant2for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<mul stat="mAtk" val="1.3" />
 				<mul stat="mCritRate" val="1.6" />
 				<mul stat="mDef" val="1.2" />
@@ -1544,7 +1549,7 @@
 			</effect>
 		</enchant2for>
 		<enchant3for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<mul stat="mAtk" val="1.3" />
 				<mul stat="mCritRate" val="1.6" />
 				<mul stat="mDef" val="1.2" />
@@ -1554,14 +1559,13 @@
 			</effect>
 		</enchant3for>
 		<enchant4for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<mul stat="mAtk" val="1.3" />
 				<mul stat="mCritRate" val="1.6" />
 				<mul stat="mDef" val="1.2" />
 				<mul stat="pDef" val="1.2" />
 				<mul stat="MagicalMpConsumeRate" val="0.4" />
 				<add stat="rEvas" val="2" />
-				<add stat="derangementProf" val="#ench4derangementProf" />
 			</effect>
 		</enchant4for>
 	</skill>
@@ -1605,7 +1609,7 @@
 		<enchant5 name="power" val="#enchPower" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<mul stat="mDef" val="0.7" />
 				<mul stat="mAtk" val="0.7" />
 				<mul stat="mAtkSpd" val="0.9" />
@@ -1618,7 +1622,7 @@
 		</for>
 		<enchant2for>
 			<effect name="MagicalAttack" />
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<mul stat="runSpd" val="0.9" />
 				<sub stat="rEvas" val="6" />
 				<mul stat="pDef" val="0.9" />
@@ -1629,7 +1633,7 @@
 		</enchant2for>
 		<enchant3for>
 			<effect name="MagicalAttack" />
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<mul stat="runSpd" val="0.9" />
 				<sub stat="rEvas" val="6" />
 				<mul stat="pDef" val="#ench3pDefDown" />
@@ -1640,7 +1644,7 @@
 		</enchant3for>
 		<enchant4for>
 			<effect name="MagicalAttack" />
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<mul stat="runSpd" val="0.9" />
 				<sub stat="rEvas" val="6" />
 				<mul stat="pDef" val="0.9" />
@@ -1650,7 +1654,7 @@
 			</effect>
 		</enchant4for>
 		<enchant5for>
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<mul stat="runSpd" val="#ench5slow" />
 				<sub stat="rEvas" val="6" />
 				<mul stat="pDef" val="0.9" />
@@ -1701,7 +1705,7 @@
 		<enchant5 name="power" val="#enchMdamPower" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<sub stat="rEvas" val="12" />
 				<sub stat="mEvas" val="12" />
 				<mul stat="pDef" val="0.92" />
@@ -1713,7 +1717,7 @@
 		</for>
 		<enchant2for>
 			<effect name="MagicalAttack" />
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<sub stat="rEvas" val="12" />
 				<sub stat="mEvas" val="12" />
 				<mul stat="pDef" val="0.92" />
@@ -1725,7 +1729,7 @@
 		</enchant2for>
 		<enchant3for>
 			<effect name="MagicalAttack" />
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<sub stat="rEvas" val="12" />
 				<sub stat="mEvas" val="12" />
 				<mul stat="pDef" val="#ench3PhysicalHexpower" />
@@ -1737,7 +1741,7 @@
 		</enchant3for>
 		<enchant4for>
 			<effect name="MagicalAttack" />
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<sub stat="rEvas" val="12" />
 				<sub stat="mEvas" val="12" />
 				<mul stat="pDef" val="0.92" />
@@ -1749,7 +1753,7 @@
 		</enchant4for>
 		<enchant5for>
 			<effect name="MagicalAttack" />
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<sub stat="rEvas" val="12" />
 				<sub stat="mEvas" val="12" />
 				<mul stat="pDef" val="0.92" />
@@ -1820,15 +1824,15 @@
 		<enchant1 name="mpInitialConsume" val="#ench1MpInitialConsume" />
 		<enchant2 name="power" val="#ench2power" />
 		<for>
-			<effect name="ThrowUp" val="0" />
+			<effect name="ThrowUp" />
 		</for>
 		<enchant3for>
-			<effect name="ThrowUp" val="0">
+			<effect name="ThrowUp">
 				<mul stat="pDef" val="#enchHex" />
 			</effect>
 		</enchant3for>
 		<enchant4for>
-			<effect name="ThrowUp" val="0">
+			<effect name="ThrowUp">
 				<mul stat="mDef" val="#enchHex" />
 			</effect>
 		</enchant4for>
@@ -1917,7 +1921,7 @@
 		<enchant2 name="power" val="#ench1MpInitialConsume" />
 		<enchant3 name="castRange" val="#ench3CastRange" />
 		<for>
-			<effect abnormalLvl="1" abnormalTime="9" abnormalVisualEffect="sflyup" comboType="COMBO_FLY_UP" effectPower="-1" name="ThrowUp" val="0" />
+			<effect abnormalTime="9" name="ThrowUp" />
 		</for>
 	</skill>
 	<skill id="11054" levels="1" name="Yoke Status">
@@ -1962,18 +1966,18 @@
 		<enchant1 name="mpInitialConsume" val="#ench1MpInitialConsume" />
 		<enchant2 name="power" val="#ench2power" />
 		<for>
-			<effect abnormalType="turn_flee" activationChance="40" count="5" name="Fear" val="0">
+			<effect activationChance="40" name="Fear">
 				<mul stat="runSpd" val="#runSpd" />
 			</effect>
 		</for>
 		<enchant3for>
-			<effect abnormalType="turn_flee" activationChance="40" count="5" name="Fear" val="0">
+			<effect activationChance="40" name="Fear">
 				<mul stat="runSpd" val="0.7" />
 				<mul stat="pDef" val="#enchHex" />
 			</effect>
 		</enchant3for>
 		<enchant4for>
-			<effect abnormalType="turn_flee" activationChance="40" count="5" name="Fear" val="0">
+			<effect activationChance="40" name="Fear">
 				<mul stat="runSpd" val="0.7" />
 				<mul stat="mDef" val="#enchHex" />
 			</effect>
@@ -2011,18 +2015,18 @@
 		<enchant1 name="mpInitialConsume" val="#ench1MpInitialConsume" />
 		<enchant2 name="power" val="#ench2power" />
 		<for>
-			<effect abnormalType="turn_flee" activationChance="40" count="5" name="Fear" val="0">
+			<effect activationChance="40" name="Fear">
 				<mul stat="runSpd" val="#runSpd" />
 			</effect>
 		</for>
 		<enchant3for>
-			<effect abnormalType="turn_flee" activationChance="40" count="5" name="Fear" val="0">
+			<effect activationChance="40" name="Fear">
 				<mul stat="runSpd" val="0.4" />
 				<mul stat="pDef" val="#enchHex" />
 			</effect>
 		</enchant3for>
 		<enchant4for>
-			<effect abnormalType="turn_flee" activationChance="40" count="5" name="Fear" val="0">
+			<effect activationChance="40" name="Fear">
 				<mul stat="runSpd" val="0.4" />
 				<mul stat="mDef" val="#enchHex" />
 			</effect>
@@ -2062,9 +2066,9 @@
 		<enchant3 name="skillRadius" val="#ench3skillRadius" />
 		<enchant3 name="power" val="#enchPower" />
 		<for>
-			<effect name="Stun" val="0" />
-			<effect name="Blink" noicon="1" self="1" val="0" />
-			<effect name="TargetCancel" noicon="1" val="0" />
+			<effect name="Stun" />
+			<effect name="Blink" />
+			<effect name="TargetCancel" />
 		</for>
 	</skill>
 	<skill id="11058" levels="3" name="Shadow Snare">
@@ -2092,9 +2096,9 @@
 		<set name="effectLevel" val="1" />
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
 		<enchant1 name="mpInitialConsume" val="#ench1MpInitialConsume" />
-		<cond msgId="1509">
-			<player olympiad="false" />
-		</cond>
+		<!--<cond msgId="1509">
+			<player use_in_olympiad="false" />
+		</cond>-->
 		<!--<for>
 			<effect abnormalTime="2" count="3" name="BlackHole" val="0" />
 		</for>-->
@@ -2127,23 +2131,23 @@
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
 		<enchant2 name="abnormalTime" val="#ench2abnormalTime" />
 		<for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="runSpd" val="#runSpd" />
 			</effect>
 		</for>
 		<enchant2for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="runSpd" val="90" />
 			</effect>
 		</enchant2for>
 		<enchant3for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="runSpd" val="90" />
 				<mul stat="pDef" val="#enchDefence" />
 			</effect>
 		</enchant3for>
 		<enchant4for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="runSpd" val="90" />
 				<mul stat="mDef" val="#enchDefence" />
 			</effect>
@@ -2203,26 +2207,26 @@
 		<enchant1 name="mpInitialConsume" val="#ench1MpInitialConsume" />
 		<enchant2 name="abnormalTime" val="#ench2abnormalTime" />
 		<for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="manaShield" val="20" />
 				<add stat="reflectDam" val="10" />
 			</effect>
 		</for>
 		<enchant2for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="manaShield" val="20" />
 				<add stat="reflectDam" val="10" />
 			</effect>
 		</enchant2for>
 		<enchant3for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="manaShield" val="20" />
 				<add stat="reflectDam" val="10" />
 				<mul stat="pDef" val="#enchDefence" />
 			</effect>
 		</enchant3for>
 		<enchant4for>
-			<effect name="Buff" val="0">
+			<effect name="Buff">
 				<add stat="manaShield" val="80" />
 				<add stat="reflectDam" val="10" />
 				<mul stat="mDef" val="#enchDefence" />
@@ -2258,10 +2262,10 @@
 		<enchant1 name="power" val="#enchPower" />
 		<enchant2 name="power" val="#enchPower" />
 		<for>
-			<effect abnormalType="turn_flee" activationChance="70" count="5" effectPower="50" name="Fear" val="0" />
+			<effect activationChance="70" name="Fear" />
 		</for>
 		<enchant2for>
-			<effect abnormalType="turn_flee" activationChance="70" count="5" effectPower="50" name="Fear" val="0">
+			<effect activationChance="70" name="Fear">
 				<mul stat="runSpd" val="#ench2slow" />
 			</effect>
 		</enchant2for>
@@ -2296,10 +2300,10 @@
 		<enchant1 name="power" val="#enchPower" />
 		<enchant2 name="power" val="#enchPower" />
 		<for>
-			<effect abnormalType="turn_flee" activationChance="70" count="5" effectPower="50" name="Fear" val="0" />
+			<effect activationChance="70" name="Fear" />
 		</for>
 		<enchant2for>
-			<effect abnormalType="turn_flee" activationChance="70" count="5" effectPower="50" name="Fear" val="0">
+			<effect activationChance="70" name="Fear">
 				<mul stat="runSpd" val="#ench2slow" />
 			</effect>
 		</enchant2for>
@@ -2666,9 +2670,9 @@
 		<enchant3 name="skillRadius" val="#ench3skillRadius" />
 		<enchant3 name="power" val="#enchPower" />
 		<for>
-			<effect name="Stun" val="0" />
-			<effect name="Blink" noicon="1" self="1" val="0" />
-			<effect name="TargetCancel" noicon="1" val="0" />
+			<effect name="Stun" />
+			<effect name="Blink" />
+			<effect name="TargetCancel" />
 		</for>
 	</skill>
 	<skill id="11096" levels="1" name="Elemental Destruction: Fire">
diff --git a/trunk/dist/game/data/stats/skills/11500-11599.xml b/trunk/dist/game/data/stats/skills/11500-11599.xml
index f9f9924101..63b2946d39 100644
--- a/trunk/dist/game/data/stats/skills/11500-11599.xml
+++ b/trunk/dist/game/data/stats/skills/11500-11599.xml
@@ -1712,7 +1712,7 @@
 		</cond>
 		<for>
 			<effect name="Transformation">
-				<param id="#transformationId" />
+				<param id="111" />
 				<mul stat="pAtk" val="0.8" />
 				<mul stat="mAtk" val="0.8" />
 				<add stat="pDef" val="#Def" />
@@ -2118,9 +2118,8 @@
 		<set name="effectRange" val="1200" />
 		<set name="castRange" val="900" />
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
-		<effect name="Invincible" time="30" val="0" />
 		<for>
-			<effect name="Invincible" time="30" val="0" />
+			<effect name="Invincible" />
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param minDamage="1" chance="100" />
@@ -2130,7 +2129,7 @@
 			</effect>
 		</for>
 		<enchant2for>
-			<effect name="Invincible" time="30" val="0" />
+			<effect name="Invincible" />
 			<effect name="Buff">
 				<add stat="runSpd" val="#ench2runSpd" />
 			</effect>
@@ -2143,8 +2142,8 @@
 			</effect>
 		</enchant2for>
 		<enchant3for>
-			<effect name="HealPercent" noicon="1" val="#enchHealPower" />
-			<effect name="Invincible" time="30" val="0" />
+			<effect name="HealPercent" />
+			<effect name="Invincible" />
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param minDamage="1" chance="100" />
@@ -2154,8 +2153,8 @@
 			</effect>
 		</enchant3for>
 		<enchant4for>
-			<effect name="MpHealPercent" noicon="1" val="#enchHealPower" />
-			<effect name="Invincible" time="30" val="0" />
+			<effect name="MpHealPercent" />
+			<effect name="Invincible" />
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param minDamage="1" chance="100" />
@@ -2165,8 +2164,8 @@
 			</effect>
 		</enchant4for>
 		<enchant5for>
-			<effect name="CpHealPercent" noicon="1" val="#enchHealPower" />
-			<effect name="Invincible" time="30" val="0" />
+			<effect name="CpHealPercent" />
+			<effect name="Invincible" />
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param minDamage="1" chance="100" />
@@ -2241,13 +2240,13 @@
 		<set name="canBeDispeled" val="false" />
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
 		<for>
-			<effect abnormalLvl="3" abnormalTime="120" abnormalType="DANCE_OF_SHADOW" abnormalVisualEffect="STEALTH" name="SilentMove" removed="ON_ATTACK_BUFF" val="0" />
+			<effect abnormalTime="120" name="SilentMove" />
 		</for>
 		<enchant2for>
-			<effect abnormalLvl="3" abnormalTime="#ench2abnormalTime" abnormalType="DANCE_OF_SHADOW" abnormalVisualEffect="STEALTH" name="SilentMove" removed="ON_ATTACK_BUFF" val="0" />
+			<effect abnormalTime="#ench2abnormalTime" name="SilentMove" />
 		</enchant2for>
 		<enchant3for>
-			<effect abnormalLvl="3" abnormalTime="120" abnormalType="DANCE_OF_SHADOW" abnormalVisualEffect="STEALTH" name="SilentMove" removed="ON_ATTACK_BUFF" val="0">
+			<effect abnormalTime="120" name="SilentMove">
 				<add stat="runSpd" val="#ench3runSpd" />
 			</effect>
 		</enchant3for>
diff --git a/trunk/dist/game/data/stats/skills/11600-11699.xml b/trunk/dist/game/data/stats/skills/11600-11699.xml
index 83e4c71a8b..a7546478e6 100644
--- a/trunk/dist/game/data/stats/skills/11600-11699.xml
+++ b/trunk/dist/game/data/stats/skills/11600-11699.xml
@@ -150,9 +150,9 @@
 		<set name="reuseDelay" val="120000" />
 		<set name="castRange" val="900" />
 		<set name="skillRadius" val="250" />
-		<cond>
+		<!--<cond>
 			<target playable="true" />
-		</cond>
+		</cond>-->
 		<for>
 			<effect name="Debuff">
 				<mul stat="regHp" val="0.7" />
@@ -197,7 +197,7 @@
 		<set name="castRange" val="900" />
 		<set name="skillRadius" val="250" />
 		<for>
-			<effect abnormalLvl="1" abnormalTime="1800" abnormalType="song_of_shield" name="Buff" val="0">
+			<effect abnormalTime="1800" name="Buff">
 				<mul stat="pDef" val="1.1" />
 				<add stat="fireRes" val="20" />
 				<add stat="waterRes" val="20" />
@@ -223,7 +223,7 @@
 		<set name="castRange" val="900" />
 		<set name="skillRadius" val="250" />
 		<for>
-			<effect abnormalLvl="1" abnormalTime="1800" abnormalType="dance_of_power" name="Buff" val="0">
+			<effect abnormalTime="1800" name="Buff">
 				<mul stat="pAtk" val="1.05" />
 				<mul stat="pAtkSpd" val="1.05" />
 				<mul stat="rCrit" val="1.1" />
diff --git a/trunk/dist/game/data/stats/skills/11700-11799.xml b/trunk/dist/game/data/stats/skills/11700-11799.xml
index c4bf167083..d5244bfa3e 100644
--- a/trunk/dist/game/data/stats/skills/11700-11799.xml
+++ b/trunk/dist/game/data/stats/skills/11700-11799.xml
@@ -7,7 +7,7 @@
 		<set name="skillType" val="BUFF" />
 		<set name="abnormalTime" val="3" />
 		<for>
-			<effect name="DamOverTime" val="0">
+			<effect name="DamOverTime">
 				<mul stat="pveMagicalDmg" val="1.5" />
 				<mul stat="MagicalMpConsumeRate" val="1.3" />
 			</effect>
@@ -67,7 +67,7 @@
 		<set name="trait" val="KNOCKDOWN" />
 		<set name="isDebuff" val="true" />
 		<for>
-			<effect effectType="KNOCK_DOWN" name="KnockDown" val="0" />
+			<effect name="KnockDown" />
 		</for>
 	</skill>
 	<skill id="11751" levels="1" name="Superior Magic Weapon Mastery">
@@ -123,7 +123,7 @@
 		<set name="activationChance" val="100" />
 		<set name="activationSkills" val="11752" />
 		<for>
-			<effect name="HealOverTime" val="#hotValue">
+			<effect name="HealOverTime">
 				<mul stat="healEffect" val="#power" />
 			</effect>
 		</for>
@@ -139,7 +139,7 @@
 		<set name="abnormalTime" val="10" />
 		<set name="triggeredLevelUpMax" val="3" />
 		<for>
-			<effect name="HealOverTime" val="0">
+			<effect name="HealOverTime">
 				<mul stat="healEffect" val="#power" />
 			</effect>
 		</for>
@@ -167,7 +167,7 @@
 		</for>
 		<enchant2for>
 			<effect name="SummonCubic">
-				<param cubicId="17" cubicDelay="10" cubicDuration="#ench2Time" cubicMaxCount="30" />
+				<param cubicId="17" cubicDelay="10" cubicDuration="60" cubicMaxCount="30" /> <!-- TODO: Fix duration -->
 			</effect>
 		</enchant2for>
 	</skill>
@@ -671,29 +671,29 @@
 		<enchant1 name="mpInitialConsume" val="#ench1MpInitialConsume" />
 		<enchant2 name="power" val="#ench2Power" />
 		<for>
-			<effect abnormalLvl="#abnormalLvl" abnormalTime="30" abnormalType="mp_cost_up" name="Debuff" val="0">
+			<effect abnormalTime="30" name="Debuff">
 				<mul stat="MagicalMpConsumeRate" val="#MpConsumeRate" />
 				<mul stat="PhysicalMpConsumeRate" val="#MpConsumeRate" />
 				<mul stat="mAtkSpd" val="0.8" />
 				<mul stat="pAtkSpd" val="0.8" />
 			</effect>
 		</for>
-		<echant3for>
-			<effect abnormalLvl="6" abnormalTime="30" abnormalType="mp_cost_up" name="Debuff" val="0">
+		<enchant3for>
+			<effect abnormalTime="30" name="Debuff">
 				<mul stat="MagicalMpConsumeRate" val="4" />
 				<mul stat="PhysicalMpConsumeRate" val="4" />
 				<mul stat="mAtkSpd" val="0.8" />
 				<mul stat="pAtkSpd" val="#ench34CastAtkSpdReduce" />
 			</effect>
-		</echant3for>
-		<echant4for>
-			<effect abnormalLvl="6" abnormalTime="30" abnormalType="mp_cost_up" name="Debuff" val="0">
+		</enchant3for>
+		<enchant4for>
+			<effect abnormalTime="30" name="Debuff">
 				<mul stat="MagicalMpConsumeRate" val="4" />
 				<mul stat="PhysicalMpConsumeRate" val="4" />
 				<mul stat="mAtkSpd" val="#ench34CastAtkSpdReduce" />
 				<mul stat="pAtkSpd" val="0.8" />
 			</effect>
-		</echant4for>
+		</enchant4for>
 	</skill>
 	<skill id="11770" levels="1" name="Dissolve">
 		<set name="hitTime" val="500" />
@@ -709,7 +709,7 @@
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="castMagic" val="MAGIC" />
 		<for>
-			<effect name="Buff" self="1" val="0">
+			<effect name="Buff">
 				<add stat="runSpd" val="100" />
 			</effect>
 		</for>
@@ -899,25 +899,25 @@
 		<set name="effectRange" val="900" />
 		<set name="trait" val="POISON" />
 		<for>
-			<effect name="DamOverTime" val="#dmg">
+			<effect name="DamOverTime">
 				<mul stat="pDef" val="#pDef" />
 				<mul stat="mDef" val="#mDef" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="DamOverTime" val="134">
+			<effect name="DamOverTime">
 				<mul stat="pDef" val="0.75" />
 				<mul stat="mDef" val="0.75" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect name="DamOverTime" val="134">
+			<effect name="DamOverTime">
 				<mul stat="pDef" val="#ench2pDef" />
 				<mul stat="mDef" val="0.75" />
 			</effect>
 		</enchant2for>
 		<enchant3for>
-			<effect name="DamOverTime" val="134">
+			<effect name="DamOverTime">
 				<mul stat="pDef" val="0.75" />
 				<mul stat="mDef" val="#ench3mDef" />
 			</effect>
@@ -984,7 +984,7 @@
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="isDebuff" val="true" />
 		<for>
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<mul stat="runSpd" val="#spd" />
 				<mul stat="mAtkSpd" val="#spd" />
 				<mul stat="pAtkSpd" val="#spd" />
@@ -1020,12 +1020,12 @@
 		<enchant1 name="mpInitialConsume" val="#ench1MpInitialConsume" />
 		<enchant2 name="power" val="#ench2Power" />
 		<for>
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<mul stat="healEffect" val="#gainHp" />
 			</effect>
 		</for>
 		<enchant3for>
-			<effect name="Debuff" val="0">
+			<effect name="Debuff">
 				<mul stat="healEffect" val="#ench3debuffPower" />
 			</effect>
 		</enchant3for>
@@ -1046,7 +1046,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="operateType" val="TOGGLE" />
 		<for>
-			<effect name="DamOverTime" val="0">
+			<effect name="DamOverTime">
 				<mul stat="mAtkSpd" val="#mAtkSpd">
 					<using kind="MAGIC,LIGHT" />
 				</mul>
@@ -1159,8 +1159,7 @@
 					<using kind="LIGHT" />
 				</add>
 				<add stat="mDef" val="300">
-					<using kind="MAGIC" />
-					<using kind="LIGHT" />
+					<using kind="MAGIC,LIGHT" />
 				</add>
 				<add stat="regHp" val="2.8" />
 				<add stat="regMp" val="3.6" />
diff --git a/trunk/dist/game/data/stats/skills/11800-11899.xml b/trunk/dist/game/data/stats/skills/11800-11899.xml
index 73cfb26613..1abb14749c 100644
--- a/trunk/dist/game/data/stats/skills/11800-11899.xml
+++ b/trunk/dist/game/data/stats/skills/11800-11899.xml
@@ -331,7 +331,7 @@
 		<set name="isDebuff" val="true" />
 		<set name="canBeDispeled" val="false" />
 		<effect name="Debuff">
-			<div stat="healEffect" val="1.4" />
+			<set stat="healEffect" val="1.4" />
 		</effect>
 	</skill>
 	<!-- Level 1 : Teleports party members to the nearest village. Cannot be used in a specially designated place such as the GM Consultation Service. -->
diff --git a/trunk/dist/game/data/stats/skills/13000-13099.xml b/trunk/dist/game/data/stats/skills/13000-13099.xml
index 41e3bc36ff..cef9afb412 100644
--- a/trunk/dist/game/data/stats/skills/13000-13099.xml
+++ b/trunk/dist/game/data/stats/skills/13000-13099.xml
@@ -1057,9 +1057,9 @@
 		<for>
 			<effect name="Buff">
 				<add stat="pAtkRange" val="50">
-					<mul stat="pvpPhysDmg" val="1.05" />
+					<!--<mul stat="pvpPhysDmg" val="1.05" />
 					<mul stat="pvpPhysSkillsDmg" val="1.05" />
-					<mul stat="pvpMagicalDmg" val="1.05" />
+					<mul stat="pvpMagicalDmg" val="1.05" />-->
 					<using kind="BOW" />
 				</add>
 			</effect>
@@ -1516,7 +1516,7 @@
 		<table name="#pAtkMul"> 1 1 1 1.07 </table>
 		<table name="#cAtkAdd"> 0 0 0 242 </table>
 		<table name="#resist"> 0 0 0 10 </table>
-		<mul stat="pAtkSpd" val="#pAtkSpd" />
+		<!--<mul stat="pAtkSpd" val="#pAtkSpd" />-->
 		<set name="icon" val="icon.armor_t602_u_i00" />
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="PASSIVE" />
diff --git a/trunk/dist/game/data/stats/skills/30000-30099.xml b/trunk/dist/game/data/stats/skills/30000-30099.xml
index 2ecb92c9d3..bc9eaf4cc1 100644
--- a/trunk/dist/game/data/stats/skills/30000-30099.xml
+++ b/trunk/dist/game/data/stats/skills/30000-30099.xml
@@ -50,7 +50,7 @@
 		<set name="isMagic" val="4" />
 		<set name="isDebuff" val="true" />
 		<for>
-			<effect name="Debuff" time="10" val="0">
+			<effect name="Debuff">
 				<mul stat="mDef" val="0.3" />
 				<mul stat="runSpd" val="70" />
 			</effect>
@@ -238,8 +238,7 @@
 		<set name="reuseDelay" val="15000" />
 		<set name="isMagic" val="1" />
 		<for>
-			<effect abnormalTime="10" chance="100" name="TriggerSkillBySkill" triggeredId="30002"
-					triggeredLevel="1" val="0" />
+			<effect abnormalTime="10" name="TriggerSkillBySkill" triggeredId="30002" triggeredLevel="1" />
 		</for>
 	</skill>
 	<skill id="30012" levels="22" name="Air Rush">
@@ -341,7 +340,7 @@
 		<set name="reuseDelay" val="300000" />
 		<set name="isMagic" val="1" />
 		<for>
-			<effect name="Buff" time="30" val="0" stackOrder="1" stackType="storm">
+			<effect name="Buff">
 				<add stat="mCritRate" val="100" />
 				<add stat="pDef" val="1.30" />
 				<add stat="mDef" val="1.30" />
@@ -427,7 +426,7 @@
 		<set name="reuseDelay" val="300000" />
 		<set name="isMagic" val="1" />
 		<for>
-			<effect name="Buff" val="0" stackOrder="1" stackType="fury">
+			<effect name="Buff">
 				<add stat="runSpd" val="1.5" />
 				<mul stat="mCritRate" val="0.50" />
 				<mul stat="rCrit" val="0.50" />
@@ -455,7 +454,7 @@
 		<set name="reuseDelay" val="300000" />
 		<set name="isMagic" val="1" />
 		<for>
-			<effect name="Buff" time="30" val="0">
+			<effect name="Buff">
 				<add stat="runSpd" val="50" />
 			</effect>
 		</for>
diff --git a/trunk/dist/game/data/stats/skills/30500-30599.xml b/trunk/dist/game/data/stats/skills/30500-30599.xml
index 99121bf242..66e2e09c64 100644
--- a/trunk/dist/game/data/stats/skills/30500-30599.xml
+++ b/trunk/dist/game/data/stats/skills/30500-30599.xml
@@ -19,7 +19,7 @@
 		<set name="isDebuff" val="true" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="Debuff" time="30" val="0">
+			<effect name="Debuff">
 				<mul stat="pDef" val="0.3" />
 			</effect>
 		</for>
@@ -153,7 +153,7 @@
 		<set name="coolTime" val="300" />
 		<set name="reuseDelay" val="7000" />
 		<for>
-			<effect count="1" name="Stun" stackOrder="-1" stackType="Stun" time="5" val="0" />
+			<effect name="Stun" />
 		</for>
 	</skill>
 	<!-- Level 1 : Disables targeting and finds weakness to the enemy's right. Decreases enemy's resistance to Fist Weapons by 10%. Requires a fist weapon. -->
@@ -268,7 +268,7 @@
 		<set name="abnormalTime" val="3" />
 		<set name="hitTime" val="200" />
 		<set name="reuseDelay" val="5000" />
-		<effect count="1" name="Buff" stackOrder="1" stackType="stance" time="3" val="0">
+		<effect name="Buff">
 			<add stat="pSkillEvas" val="#pSkillEvas" />
 			<add stat="rEvas" val="#rEvas" />
 			<add stat="mEvas" val="#mEvas" />
@@ -369,7 +369,7 @@
 		<set name="coolTime" val="500" />
 		<set name="reuseDelay" val="300000" />
 		<for>
-			<effect name="Buff" time="30" val="0" stackOrder="1" stackType="storm">
+			<effect name="Buff">
 				<add stat="runSpd" val="#spd" />
 				<add stat="pAtk" val="#pAtks" />
 				<add stat="cAtk" val="#cAtk" />
diff --git a/trunk/dist/game/data/xsd/items.xsd b/trunk/dist/game/data/xsd/items.xsd
index 602219aa88..20dc345f95 100644
--- a/trunk/dist/game/data/xsd/items.xsd
+++ b/trunk/dist/game/data/xsd/items.xsd
@@ -104,7 +104,7 @@
 			<xs:simpleType>
 				<xs:restriction base="xs:positiveInteger">
 					<xs:minInclusive value="1" />
-					<xs:maxInclusive value="85" />
+					<xs:maxInclusive value="99" />
 				</xs:restriction>
 			</xs:simpleType>
 		</xs:attribute>
diff --git a/trunk/dist/game/data/xsd/pcBaseStats.xsd b/trunk/dist/game/data/xsd/pcBaseStats.xsd
index a0b9a9974a..d313c0fdd0 100644
--- a/trunk/dist/game/data/xsd/pcBaseStats.xsd
+++ b/trunk/dist/game/data/xsd/pcBaseStats.xsd
@@ -3,7 +3,7 @@
 	<xs:element name="pcBaseStats">
 		<xs:complexType>
 			<xs:sequence minOccurs="1" maxOccurs="1">
-				<xs:element name="basePatk" minOccurs="20" maxOccurs="20">
+				<xs:element name="basePatk" minOccurs="22" maxOccurs="22">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -19,6 +19,8 @@
 									<xs:enumeration value="53" />
 									<xs:enumeration value="123" />
 									<xs:enumeration value="124" />
+									<xs:enumeration value="182" />
+									<xs:enumeration value="183" />
 								</xs:restriction>
 							</xs:simpleType>
 						</xs:attribute>
@@ -33,7 +35,7 @@
 						<xs:attribute name="val" type="xs:positiveInteger" use="required" />
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="baseRcrit" minOccurs="20" maxOccurs="20">
+				<xs:element name="baseRcrit" minOccurs="22" maxOccurs="22">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -49,6 +51,8 @@
 									<xs:enumeration value="53" />
 									<xs:enumeration value="123" />
 									<xs:enumeration value="124" />
+									<xs:enumeration value="182" />
+									<xs:enumeration value="183" />
 								</xs:restriction>
 							</xs:simpleType>
 						</xs:attribute>
@@ -63,7 +67,7 @@
 						<xs:attribute name="val" type="xs:positiveInteger" use="required" />
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="baseAtkType" minOccurs="20" maxOccurs="20">
+				<xs:element name="baseAtkType" minOccurs="22" maxOccurs="22">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -79,6 +83,8 @@
 									<xs:enumeration value="53" />
 									<xs:enumeration value="123" />
 									<xs:enumeration value="124" />
+									<xs:enumeration value="182" />
+									<xs:enumeration value="183" />
 								</xs:restriction>
 							</xs:simpleType>
 						</xs:attribute>
@@ -99,7 +105,7 @@
 						</xs:attribute>
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="baseAtkSpd" minOccurs="20" maxOccurs="20">
+				<xs:element name="baseAtkSpd" minOccurs="22" maxOccurs="22">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -115,6 +121,8 @@
 									<xs:enumeration value="53" />
 									<xs:enumeration value="123" />
 									<xs:enumeration value="124" />
+									<xs:enumeration value="182" />
+									<xs:enumeration value="183" />
 								</xs:restriction>
 							</xs:simpleType>
 						</xs:attribute>
@@ -129,7 +137,7 @@
 						<xs:attribute name="val" type="xs:positiveInteger" use="required" />
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="basePdef" minOccurs="20" maxOccurs="20">
+				<xs:element name="basePdef" minOccurs="22" maxOccurs="22">
 					<xs:complexType>
 						<xs:attribute name="chest" type="xs:positiveInteger" use="required" />
 						<xs:attribute name="classId" use="required">
@@ -146,6 +154,8 @@
 									<xs:enumeration value="53" />
 									<xs:enumeration value="123" />
 									<xs:enumeration value="124" />
+									<xs:enumeration value="182" />
+									<xs:enumeration value="183" />
 								</xs:restriction>
 							</xs:simpleType>
 						</xs:attribute>
@@ -165,7 +175,7 @@
 						<xs:attribute name="underwear" type="xs:positiveInteger" use="required" />
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="baseMatk" minOccurs="20" maxOccurs="20">
+				<xs:element name="baseMatk" minOccurs="22" maxOccurs="22">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -181,6 +191,8 @@
 									<xs:enumeration value="53" />
 									<xs:enumeration value="123" />
 									<xs:enumeration value="124" />
+									<xs:enumeration value="182" />
+									<xs:enumeration value="183" />
 								</xs:restriction>
 							</xs:simpleType>
 						</xs:attribute>
@@ -195,7 +207,7 @@
 						<xs:attribute name="val" type="xs:positiveInteger" use="required" />
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="baseMdef" minOccurs="20" maxOccurs="20">
+				<xs:element name="baseMdef" minOccurs="22" maxOccurs="22">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -211,6 +223,8 @@
 									<xs:enumeration value="53" />
 									<xs:enumeration value="123" />
 									<xs:enumeration value="124" />
+									<xs:enumeration value="182" />
+									<xs:enumeration value="183" />
 								</xs:restriction>
 							</xs:simpleType>
 						</xs:attribute>
@@ -229,7 +243,7 @@
 						</xs:attribute>
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="baseCanPenetrate" minOccurs="20" maxOccurs="20">
+				<xs:element name="baseCanPenetrate" minOccurs="22" maxOccurs="22">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -245,6 +259,8 @@
 									<xs:enumeration value="53" />
 									<xs:enumeration value="123" />
 									<xs:enumeration value="124" />
+									<xs:enumeration value="182" />
+									<xs:enumeration value="183" />
 								</xs:restriction>
 							</xs:simpleType>
 						</xs:attribute>
@@ -259,7 +275,7 @@
 						<xs:attribute name="val" type="xs:nonNegativeInteger" use="required" />
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="baseAtkRange" minOccurs="20" maxOccurs="20">
+				<xs:element name="baseAtkRange" minOccurs="22" maxOccurs="22">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -275,6 +291,8 @@
 									<xs:enumeration value="53" />
 									<xs:enumeration value="123" />
 									<xs:enumeration value="124" />
+									<xs:enumeration value="182" />
+									<xs:enumeration value="183" />
 								</xs:restriction>
 							</xs:simpleType>
 						</xs:attribute>
@@ -289,7 +307,7 @@
 						<xs:attribute name="val" type="xs:positiveInteger" use="required" />
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="baseDamRange" minOccurs="20" maxOccurs="20">
+				<xs:element name="baseDamRange" minOccurs="22" maxOccurs="22">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -305,6 +323,8 @@
 									<xs:enumeration value="53" />
 									<xs:enumeration value="123" />
 									<xs:enumeration value="124" />
+									<xs:enumeration value="182" />
+									<xs:enumeration value="183" />
 								</xs:restriction>
 							</xs:simpleType>
 						</xs:attribute>
@@ -336,7 +356,7 @@
 						<xs:attribute name="width" type="xs:positiveInteger" use="required" />
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="baseRndDam" minOccurs="20" maxOccurs="20">
+				<xs:element name="baseRndDam" minOccurs="22" maxOccurs="22">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -352,6 +372,8 @@
 									<xs:enumeration value="53" />
 									<xs:enumeration value="123" />
 									<xs:enumeration value="124" />
+									<xs:enumeration value="182" />
+									<xs:enumeration value="183" />
 								</xs:restriction>
 							</xs:simpleType>
 						</xs:attribute>
diff --git a/trunk/dist/game/data/xsd/skills.xsd b/trunk/dist/game/data/xsd/skills.xsd
index f8a81b4bda..df808aed46 100644
--- a/trunk/dist/game/data/xsd/skills.xsd
+++ b/trunk/dist/game/data/xsd/skills.xsd
@@ -334,6 +334,8 @@
 			<xs:enumeration value="MEN" />
 			<xs:enumeration value="WIT" />
 			<xs:enumeration value="DEX" />
+			<xs:enumeration value="LUC" />
+			<xs:enumeration value="CHA" />
 			<xs:enumeration value="waterPower" />
 			<xs:enumeration value="windPower" />
 			<xs:enumeration value="firePower" />
@@ -462,6 +464,7 @@
 			<xs:element name="enchant6" type="enchantType" />
 			<xs:element name="enchant7" type="enchantType" />
 			<xs:element name="enchant8" type="enchantType" />
+			<xs:element name="enchant9" type="enchantType" />
 			<xs:element name="cond" type="condType" />
 			<xs:element name="for" type="forType" />
 			<xs:element name="enchant1for" type="forType" />
@@ -499,6 +502,7 @@
 		<xs:attribute type="xs:byte" name="enchantGroup6" use="optional" />
 		<xs:attribute type="xs:byte" name="enchantGroup7" use="optional" />
 		<xs:attribute type="xs:byte" name="enchantGroup8" use="optional" />
+		<xs:attribute type="xs:byte" name="enchantGroup9" use="optional" />
 	</xs:complexType>
 	<xs:element name="list">
 		<xs:complexType>
diff --git a/trunk/dist/game/data_classic/xsd/pcBaseStats.xsd b/trunk/dist/game/data_classic/xsd/pcBaseStats.xsd
index a0b9a9974a..bb4a4986c2 100644
--- a/trunk/dist/game/data_classic/xsd/pcBaseStats.xsd
+++ b/trunk/dist/game/data_classic/xsd/pcBaseStats.xsd
@@ -3,7 +3,7 @@
 	<xs:element name="pcBaseStats">
 		<xs:complexType>
 			<xs:sequence minOccurs="1" maxOccurs="1">
-				<xs:element name="basePatk" minOccurs="20" maxOccurs="20">
+				<xs:element name="basePatk" minOccurs="18" maxOccurs="18">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -33,7 +33,7 @@
 						<xs:attribute name="val" type="xs:positiveInteger" use="required" />
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="baseRcrit" minOccurs="20" maxOccurs="20">
+				<xs:element name="baseRcrit" minOccurs="18" maxOccurs="18">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -63,7 +63,7 @@
 						<xs:attribute name="val" type="xs:positiveInteger" use="required" />
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="baseAtkType" minOccurs="20" maxOccurs="20">
+				<xs:element name="baseAtkType" minOccurs="18" maxOccurs="18">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -99,7 +99,7 @@
 						</xs:attribute>
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="baseAtkSpd" minOccurs="20" maxOccurs="20">
+				<xs:element name="baseAtkSpd" minOccurs="18" maxOccurs="18">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -129,7 +129,7 @@
 						<xs:attribute name="val" type="xs:positiveInteger" use="required" />
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="basePdef" minOccurs="20" maxOccurs="20">
+				<xs:element name="basePdef" minOccurs="18" maxOccurs="18">
 					<xs:complexType>
 						<xs:attribute name="chest" type="xs:positiveInteger" use="required" />
 						<xs:attribute name="classId" use="required">
@@ -165,7 +165,7 @@
 						<xs:attribute name="underwear" type="xs:positiveInteger" use="required" />
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="baseMatk" minOccurs="20" maxOccurs="20">
+				<xs:element name="baseMatk" minOccurs="18" maxOccurs="18">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -195,7 +195,7 @@
 						<xs:attribute name="val" type="xs:positiveInteger" use="required" />
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="baseMdef" minOccurs="20" maxOccurs="20">
+				<xs:element name="baseMdef" minOccurs="18" maxOccurs="18">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -229,7 +229,7 @@
 						</xs:attribute>
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="baseCanPenetrate" minOccurs="20" maxOccurs="20">
+				<xs:element name="baseCanPenetrate" minOccurs="18" maxOccurs="18">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -259,7 +259,7 @@
 						<xs:attribute name="val" type="xs:nonNegativeInteger" use="required" />
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="baseAtkRange" minOccurs="20" maxOccurs="20">
+				<xs:element name="baseAtkRange" minOccurs="18" maxOccurs="18">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -289,7 +289,7 @@
 						<xs:attribute name="val" type="xs:positiveInteger" use="required" />
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="baseDamRange" minOccurs="20" maxOccurs="20">
+				<xs:element name="baseDamRange" minOccurs="18" maxOccurs="18">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>
@@ -336,7 +336,7 @@
 						<xs:attribute name="width" type="xs:positiveInteger" use="required" />
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="baseRndDam" minOccurs="20" maxOccurs="20">
+				<xs:element name="baseRndDam" minOccurs="18" maxOccurs="18">
 					<xs:complexType>
 						<xs:attribute name="classId" use="required">
 							<xs:simpleType>