From e7f8690336eb499d7bf9c6cba98133434d14b5dd Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 27 Mar 2018 19:15:22 +0000
Subject: [PATCH] Updated Zaken Olympiad items. Contributed by quangnguyen.

---
 .../dist/game/data/multisell/3168801.xml      | 154 ++--
 .../game/data/stats/items/06600-06699.xml     |  99 +--
 .../game/data/stats/skills/03500-03599.xml    | 768 +++++++++---------
 3 files changed, 532 insertions(+), 489 deletions(-)

diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/multisell/3168801.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/multisell/3168801.xml
index 6d15ba7aeb..4fa2fa2b52 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/multisell/3168801.xml
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/multisell/3168801.xml
@@ -4,91 +4,127 @@
 		<npc>31688</npc> <!-- Olympiad Manager -->
 	</npcs>
 	<item>
-		<!-- Mark of Battle -->
-		<ingredient count="57" id="45584" />
 		<!-- Adena -->
-		<ingredient count="50000" id="57" />
+		<ingredient id="57" count="12000000" />
+		<!-- Mark of Battle -->
+		<ingredient id="45584" count="2037" />
+		<!-- Ancient Book: Divine Inspiration (Modern Language Version) -->
+		<production id="8618" count="1" />
+	</item>
+	<item>
+		<!-- Adena -->
+		<ingredient id="57" count="15000000" />
+		<!-- Mark of Battle -->
+		<ingredient id="45584" count="3961" />
+		<!-- Ancient Book: Divine Inspiration (Original Language Version) -->
+		<production id="8619" count="1" />
+	</item>
+	<item>
+		<!-- Adena -->
+		<ingredient id="57" count="50000" />
+		<!-- Mark of Battle -->
+		<ingredient id="45584" count="57" />
 		<!-- Clan Reputation Score - 10 -->
-		<production count="1" id="70280" />
+		<production id="70280" count="1" />
 	</item>
 	<item>
 		<!-- Mark of Battle -->
-		<ingredient count="29" id="45584" />
-		<!-- Adena -->
-		<ingredient count="25000" id="57" />
-		<!-- Superspeed Potion -->
-		<production count="1" id="70283" />
+		<ingredient id="45584" count="8" />
+		<!-- Elixir of Life -->
+		<production id="90032" count="1" />
 	</item>
 	<item>
 		<!-- Mark of Battle -->
-		<ingredient count="787" id="45584" />
-		<!-- Adena -->
-		<ingredient count="1000000" id="57" />
-		<!-- Hero's Talisman (30-day) -->
-		<production count="1" id="90036" />
+		<ingredient id="45584" count="13" />
+		<!-- Elixir of Mind -->
+		<production id="90033" count="1" />
 	</item>
 	<item>
-		<!-- Mark of Battle -->
-		<ingredient count="787" id="45584" />
 		<!-- Adena -->
-		<ingredient count="1000000" id="57" />
-		<!-- Hero's Talisman (30-day) -->
-		<production count="1" id="90037" />
+		<ingredient id="57" count="1000000" />
+		<!-- Mark of Battle -->
+		<ingredient id="45584" count="787" />
+		<!-- Hero’s Talisman - Attack -->
+		<production id="90036" count="1" />
 	</item>
 	<item>
-		<!-- Mark of Battle -->
-		<ingredient count="800" id="45584" />
 		<!-- Adena -->
-		<ingredient count="5000000" id="57" />
-		<!-- Talisman of Battle - Liberate -->
-		<production count="1" id="90159" />
+		<ingredient id="57" count="1000000" />
+		<!-- Mark of Battle -->
+		<ingredient id="45584" count="787" />
+		<!-- Hero’s Talisman - Defense -->
+		<production id="90037" count="1" />
 	</item>
 	<item>
-		<!-- Mark of Battle -->
-		<ingredient count="140" id="45584" />
 		<!-- Adena -->
-		<ingredient count="123483" id="57" />
-		<!-- Sealed Rune Lv. 1 -->
-		<production count="1" id="70000" />
-	</item>
-	<item>
+		<ingredient id="57" count="600000" />
 		<!-- Mark of Battle -->
-		<ingredient count="1019" id="45584" />
-		<!-- Adena -->
-		<ingredient count="4500000" id="57" />
-		<!-- Scroll: Enchant Weapon (A-grade) -->
-		<production count="1" id="729" />
-	</item>
-	<item>
-		<!-- Mark of Battle -->
-		<ingredient count="272" id="45584" />
-		<!-- Adena -->
-		<ingredient count="600000" id="57" />
+		<ingredient id="45584" count="272" />
 		<!-- Scroll: Enchant Armor (A-grade) -->
-		<production count="1" id="730" />
+		<production id="730" count="1" />
 	</item>
 	<item>
-		<!-- Mark of Battle -->
-		<ingredient count="283" id="45584" />
 		<!-- Adena -->
-		<ingredient count="1250000" id="57" />
-		<!-- Scroll: Enchant Weapon (B-grade) -->
-		<production count="1" id="947" />
-	</item>
-	<item>
+		<ingredient id="57" count="200000" />
 		<!-- Mark of Battle -->
-		<ingredient count="92" id="45584" />
-		<!-- Adena -->
-		<ingredient count="200000" id="57" />
+		<ingredient id="45584" count="92" />
 		<!-- Scroll: Enchant Armor (B-grade) -->
-		<production count="1" id="948" />
+		<production id="948" count="1" />
 	</item>
 	<item>
-		<!-- Mark of Battle -->
-		<ingredient count="114" id="45584" />
 		<!-- Adena -->
-		<ingredient count="100000" id="57" />
-		<!-- XP/SP Scroll 30% 20 min -->
-		<production count="1" id="29008" />
+		<ingredient id="57" count="4500000" />
+		<!-- Mark of Battle -->
+		<ingredient id="45584" count="1019" />
+		<!-- Scroll: Enchant Weapon (A-grade) -->
+		<production id="729" count="1" />
+	</item>
+	<item>
+		<!-- Adena -->
+		<ingredient id="57" count="1250000" />
+		<!-- Mark of Battle -->
+		<ingredient id="45584" count="283" />
+		<!-- Scroll: Enchant Weapon (B-grade) -->
+		<production id="947" count="1" />
+	</item>
+	<item>
+		<!-- Adena -->
+		<ingredient id="57" count="123483" />
+		<!-- Mark of Battle -->
+		<ingredient id="45584" count="140" />
+		<!-- Sealed Rune - Stage 1 -->
+		<production id="70000" count="1" />
+	</item>
+	<item>
+		<!-- Adena -->
+		<ingredient id="57" count="9400000" />
+		<!-- Mark of Battle -->
+		<ingredient id="45584" count="740" />
+		<!-- Spellbook Box - 3rd Class Transfer -->
+		<production id="90034" count="1" />
+	</item>
+	<item>
+		<!-- Adena -->
+		<ingredient id="57" count="25000" />
+		<!-- Mark of Battle -->
+		<ingredient id="45584" count="29" />
+		<!-- Superspeed Potion -->
+		<production id="70283" count="1" />
+	</item>
+	<item>
+		<!-- Adena -->
+		<ingredient id="57" count="5000000" />
+		<!-- Mark of Battle -->
+		<ingredient id="45584" count="800" />
+		<!-- Talisman of Battle - Liberate -->
+		<production id="90159" count="1" />
+	</item>
+	<item>
+		<!-- Adena -->
+		<ingredient id="57" count="100000" />
+		<!-- Mark of Battle -->
+		<ingredient id="45584" count="114" />
+		<!-- XP/SP Scroll -->
+		<production id="29565" count="1" />
 	</item>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/items/06600-06699.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/items/06600-06699.xml
index d7a34f8b0a..03d9866bc9 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/items/06600-06699.xml
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/items/06600-06699.xml
@@ -8,7 +8,7 @@
 		<set name="bodypart" val="rhand" />
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
-		<set name="crystal_type" val="S" />
+		<set name="crystal_type" val="NONE" />
 		<set name="material" val="ADAMANTAITE" />
 		<set name="weight" val="1300" />
 		<set name="soulshots" val="1" />
@@ -29,15 +29,13 @@
 		</cond>
 		<skills>
 			<skill id="3578" level="1" /> <!-- Special Ability: Infinity Blade -->
-			<skill id="8524" level="1" /> <!-- Hero's Holy Attack -->
-			<skill id="3579" level="1" type="ON_CRITICAL_SKILL" /> <!-- Decrease P. Def. -->
+			<skill id="3579" level="1" type="ON_CRITICAL_SKILL" /> <!-- Infinity Power - Reflect -->
 		</skills>
 		<stats>
-			<stat type="pAtk">524</stat>
-			<stat type="mAtk">230</stat>
+			<stat type="pAtk">301</stat>
+			<stat type="mAtk">166</stat>
 			<stat type="rCrit">8</stat>
 			<stat type="pAtkSpd">379</stat>
-			<stat type="holyPower">250</stat>
 			<stat type="randomDamage">10</stat>
 			<stat type="pAtkRange">40</stat>
 		</stats>
@@ -50,7 +48,7 @@
 		<set name="bodypart" val="lrhand" />
 		<set name="damage_range" val="0;0;44;120" />
 		<set name="immediate_effect" val="true" />
-		<set name="crystal_type" val="S" />
+		<set name="crystal_type" val="NONE" />
 		<set name="material" val="ADAMANTAITE" />
 		<set name="weight" val="1300" />
 		<set name="soulshots" val="1" />
@@ -70,15 +68,14 @@
 			<player isHero="true" />
 		</cond>
 		<skills>
-			<skill id="8524" level="1" /> <!-- Hero's Holy Attack -->
 			<skill id="3582" level="1" /> <!-- Special Ability: Infinity Cleaver -->
+			<skill id="3584" level="1" type="ON_CRITICAL_SKILL" /> <!-- Infinity Power - Protection -->
 		</skills>
 		<stats>
-			<stat type="pAtk">638</stat>
-			<stat type="mAtk">230</stat>
+			<stat type="pAtk">368</stat>
+			<stat type="mAtk">166</stat>
 			<stat type="rCrit">8</stat>
 			<stat type="pAtkSpd">325</stat>
-			<stat type="holyPower">250</stat>
 			<stat type="randomDamage">10</stat>
 			<stat type="pAtkRange">40</stat>
 		</stats>
@@ -112,16 +109,14 @@
 		</cond>
 		<skills>
 			<skill id="3580" level="1" /> <!-- Special Ability: Infinity Axe -->
-			<skill id="8524" level="1" /> <!-- Hero's Holy Attack -->
-			<skill id="3581" level="1" type="ON_CRITICAL_SKILL" /> <!-- Discord -->
+			<skill id="3581" level="1" type="ON_CRITICAL_SKILL" /> <!-- Infinity Power - Tenacity -->
 		</skills>
 		<stats>
-			<stat type="pAtk">524</stat>
-			<stat type="mAtk">230</stat>
+			<stat type="pAtk">301</stat>
+			<stat type="mAtk">166</stat>
 			<stat type="rCrit">6</stat>
 			<stat type="accCombat">8</stat>
 			<stat type="pAtkSpd">379</stat>
-			<stat type="holyPower">250</stat>
 			<stat type="randomDamage">20</stat>
 			<stat type="pAtkRange">40</stat>
 		</stats>
@@ -134,7 +129,7 @@
 		<set name="bodypart" val="rhand" />
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
-		<set name="crystal_type" val="S" />
+		<set name="crystal_type" val="NONE" />
 		<set name="material" val="ADAMANTAITE" />
 		<set name="weight" val="1300" />
 		<set name="soulshots" val="1" />
@@ -154,17 +149,15 @@
 			<player isHero="true" />
 		</cond>
 		<skills>
-			<skill id="3598" level="1" type_chance="3" type="ON_MAGIC_SKILL" /> <!-- Full Recovery -->
-			<skill id="8524" level="1" /> <!-- Hero's Holy Attack -->
 			<skill id="3597" level="1" /> <!-- Special Ability: Infinity Rod -->
+			<skill id="3598" level="1" type="ON_MAGIC_SKILL" /> <!-- Infinity Power - Mana Limit -->
 		</skills>
 		<stats>
-			<stat type="pAtk">420</stat>
-			<stat type="mAtk">307</stat>
+			<stat type="pAtk">255</stat>
+			<stat type="mAtk">204</stat>
 			<stat type="rCrit">6</stat>
 			<stat type="accCombat">8</stat>
 			<stat type="pAtkSpd">379</stat>
-			<stat type="holyPower">250</stat>
 			<stat type="randomDamage">20</stat>
 			<stat type="pAtkRange">40</stat>
 		</stats>
@@ -177,7 +170,7 @@
 		<set name="bodypart" val="lrhand" />
 		<set name="damage_range" val="0;0;44;120" />
 		<set name="immediate_effect" val="true" />
-		<set name="crystal_type" val="S" />
+		<set name="crystal_type" val="NONE" />
 		<set name="material" val="ADAMANTAITE" />
 		<set name="weight" val="1300" />
 		<set name="soulshots" val="1" />
@@ -197,17 +190,15 @@
 			<player isHero="true" />
 		</cond>
 		<skills>
-			<skill id="3596" level="1" type_chance="3" type="ON_MAGIC_SKILL" /> <!-- Full Recovery -->
-			<skill id="8525" level="1" /> <!-- Hero's Holy Attack -->
 			<skill id="3595" level="1" /> <!-- Special Ability: Infinity Scepter -->
+			<skill id="3596" level="1" type="ON_MAGIC_SKILL" /> <!-- Infinity Power - Vampiric Mana -->
 		</skills>
 		<stats>
-			<stat type="pAtk">511</stat>
-			<stat type="mAtk">337</stat>
+			<stat type="pAtk">295</stat>
+			<stat type="mAtk">219</stat>
 			<stat type="rCrit">6</stat>
 			<stat type="accCombat">8</stat>
 			<stat type="pAtkSpd">325</stat>
-			<stat type="holyPower">250</stat>
 			<stat type="randomDamage">20</stat>
 			<stat type="pAtkRange">40</stat>
 		</stats>
@@ -220,7 +211,7 @@
 		<set name="bodypart" val="rhand" />
 		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
-		<set name="crystal_type" val="S" />
+		<set name="crystal_type" val="NONE" />
 		<set name="material" val="ADAMANTAITE" />
 		<set name="weight" val="1300" />
 		<set name="soulshots" val="1" />
@@ -241,16 +232,14 @@
 		</cond>
 		<skills>
 			<skill id="3589" level="1" /> <!-- Special Ability: Infinity Stinger -->
-			<skill id="8524" level="1" /> <!-- Hero's Holy Attack -->
-			<skill id="3590" level="1" type="ON_CRITICAL_SKILL" /> <!-- Restrain Magic Skills -->
+			<skill id="3590" level="1" type="ON_CRITICAL_SKILL" /> <!-- Infinity Power - Immortal -->
 		</skills>
 		<stats>
-			<stat type="pAtk">458</stat>
-			<stat type="mAtk">230</stat>
+			<stat type="pAtk">272</stat>
+			<stat type="mAtk">166</stat>
 			<stat type="rCrit">12</stat>
 			<stat type="accCombat">-3.75</stat>
 			<stat type="pAtkSpd">433</stat>
-			<stat type="holyPower">250</stat>
 			<stat type="randomDamage">5</stat>
 			<stat type="pAtkRange">40</stat>
 		</stats>
@@ -263,7 +252,7 @@
 		<set name="bodypart" val="lrhand" />
 		<set name="damage_range" val="0;0;32;120" />
 		<set name="immediate_effect" val="true" />
-		<set name="crystal_type" val="S" />
+		<set name="crystal_type" val="NONE" />
 		<set name="material" val="ADAMANTAITE" />
 		<set name="weight" val="1300" />
 		<set name="soulshots" val="1" />
@@ -284,16 +273,14 @@
 		</cond>
 		<skills>
 			<skill id="3587" level="1" /> <!-- Special Ability: Infinity Fang -->
-			<skill id="8524" level="1" /> <!-- Hero's Holy Attack -->
-			<skill id="3588" level="1" type="ON_CRITICAL_SKILL" /> <!-- Stun -->
+			<skill id="3584" level="1" /> <!-- Infinity Power - Protection -->
 		</skills>
 		<stats>
-			<stat type="pAtk">638</stat>
-			<stat type="mAtk">230</stat>
-			<stat type="rCrit">6</stat>
+			<stat type="pAtk">368</stat>
+			<stat type="mAtk">166</stat>
+			<stat type="rCrit">8</stat>
 			<stat type="accCombat">8</stat>
 			<stat type="pAtkSpd">325</stat>
-			<stat type="holyPower">250</stat>
 			<stat type="randomDamage">5</stat>
 			<stat type="pAtkRange">40</stat>
 		</stats>
@@ -306,7 +293,7 @@
 		<set name="bodypart" val="lrhand" />
 		<set name="damage_range" val="0;0;10;0" />
 		<set name="immediate_effect" val="true" />
-		<set name="crystal_type" val="S" />
+		<set name="crystal_type" val="NONE" />
 		<set name="material" val="ADAMANTAITE" />
 		<set name="weight" val="1300" />
 		<set name="soulshots" val="1" />
@@ -329,16 +316,14 @@
 		</cond>
 		<skills>
 			<skill id="3593" level="1" /> <!-- Special Ability: Infinity Bow -->
-			<skill id="8524" level="1" /> <!-- Hero's Holy Attack -->
-			<skill id="3594" level="1" type="ON_CRITICAL_SKILL" /> <!-- Decrease Speed -->
+			<skill id="3594" level="1" type="ON_CRITICAL_SKILL" /> <!-- Infinity Power - Archery -->
 		</skills>
 		<stats>
-			<stat type="pAtk">952</stat>
-			<stat type="mAtk">230</stat>
+			<stat type="pAtk">665</stat>
+			<stat type="mAtk">177</stat>
 			<stat type="rCrit">12</stat>
 			<stat type="accCombat">-3.75</stat>
 			<stat type="pAtkSpd">293</stat>
-			<stat type="holyPower">250</stat>
 			<stat type="randomDamage">5</stat>
 			<stat type="pAtkRange">500</stat>
 		</stats>
@@ -351,7 +336,7 @@
 		<set name="bodypart" val="lrhand" />
 		<set name="damage_range" val="0;0;44;120" />
 		<set name="immediate_effect" val="true" />
-		<set name="crystal_type" val="S" />
+		<set name="crystal_type" val="NONE" />
 		<set name="material" val="ADAMANTAITE" />
 		<set name="weight" val="1300" />
 		<set name="soulshots" val="1" />
@@ -372,15 +357,13 @@
 		</cond>
 		<skills>
 			<skill id="3585" level="1" /> <!-- Special Ability: Infinity Wing -->
-			<skill id="8524" level="1" /> <!-- Hero's Holy Attack -->
-			<skill id="3586" level="1" type="ON_CRITICAL_SKILL" /> <!-- Restrain Physical Skills -->
+			<skill id="3586" level="1" type="ON_CRITICAL_SKILL" /> <!-- Infinity Power - Refresh -->
 		</skills>
 		<stats>
-			<stat type="pAtk">638</stat>
-			<stat type="mAtk">230</stat>
+			<stat type="pAtk">361</stat>
+			<stat type="mAtk">164</stat>
 			<stat type="rCrit">8</stat>
 			<stat type="pAtkSpd">325</stat>
-			<stat type="holyPower">250</stat>
 			<stat type="randomDamage">10</stat>
 			<stat type="pAtkRange">40</stat>
 		</stats>
@@ -393,7 +376,7 @@
 		<set name="bodypart" val="lrhand" />
 		<set name="damage_range" val="0;0;66;120" />
 		<set name="immediate_effect" val="true" />
-		<set name="crystal_type" val="S" />
+		<set name="crystal_type" val="NONE" />
 		<set name="material" val="ADAMANTAITE" />
 		<set name="weight" val="1300" />
 		<set name="soulshots" val="1" />
@@ -414,16 +397,14 @@
 		</cond>
 		<skills>
 			<skill id="3591" level="1" /> <!-- Special Ability: Infinity Spear -->
-			<skill id="8524" level="1" /> <!-- Hero's Holy Attack -->
-			<skill id="3592" level="1" type="ON_CRITICAL_SKILL" /> <!-- Dispel -->
+			<skill id="3581" level="1" type="ON_CRITICAL_SKILL" /> <!-- Infinity Power - Tenacity -->
 		</skills>
 		<stats>
-			<stat type="pAtk">524</stat>
-			<stat type="mAtk">230</stat>
+			<stat type="pAtk">301</stat>
+			<stat type="mAtk">166</stat>
 			<stat type="rCrit">8</stat>
 			<stat type="accCombat">-3.75</stat>
 			<stat type="pAtkSpd">325</stat>
-			<stat type="holyPower">250</stat>
 			<stat type="randomDamage">10</stat>
 			<stat type="pAtkRange">80</stat>
 		</stats>
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/03500-03599.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/03500-03599.xml
index 525dbb2ade..cecf4f5f1a 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/03500-03599.xml
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/03500-03599.xml
@@ -1411,164 +1411,128 @@
 		</effects>
 	</skill>
 	<skill id="3578" toLevel="1" name="Special Ability: Infinity Sword">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
+		<!-- Update to Classic Zaken -->
 		<icon>icon.weapon_the_sword_of_hero_i00</icon>
 		<magicLvl>80</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="DamageShield">
-				<amount>9</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MaxCp">
-				<amount>50</amount>
+			<effect name="MaxHp">
+				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MaxMp">
+				<amount>15</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxCp">
 				<amount>30</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PvpPhysicalAttackDamageBonus">
+			<effect name="PAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalAttackDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="PvpMagicalSkillDamageBonus">
-				<amount>10</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PvpPhysicalSkillDamageBonus">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="ShieldDefence">
-				<amount>33</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MaxHp">
-				<amount>25</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
 	<skill id="3579" toLevel="1" name="Infinity Power - Reflect">
-		<!-- Confirmed CT2.5 -->
-		<!-- Infinity Blade/Rapier Skill -->
-		<abnormalLvl>3</abnormalLvl>
-		<abnormalTime>120</abnormalTime>
-		<abnormalType>PD_DOWN</abnormalType>
-		<activateRate>4</activateRate>
-		<basicProperty>MAGIC</basicProperty>
-		<icon>icon.skill0122</icon>
-		<isDebuff>true</isDebuff>
-		<lvlBonusRate>10</lvlBonusRate>
-		<magicLvl>80</magicLvl>
+		<!-- Update to Classic Zaken -->
+		<icon>icon.skill0086</icon>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>300</abnormalTime>
 		<operateType>A2</operateType>
-		<rideState>NONE</rideState>
-		<magicCriticalRate>5</magicCriticalRate>
-		<hitCancelTime>0</hitCancelTime>
-		<targetType>ENEMY_ONLY</targetType>
+		<hitTime>1000</hitTime>
+		<reuseDelay>600000</reuseDelay>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="PhysicalDefence">
-				<amount>-23</amount>
-				<mode>PER</mode>
+			<effect name="DamageShield">
+				<amount>8</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="ReflectSkill">
+				<amount>8</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="ReflectSkill">
+				<amount>8</amount>
+				<mode>DIFF</mode>
+				<type>MAGIC</type>
 			</effect>
 		</effects>
 	</skill>
 	<skill id="3580" toLevel="1" name="Special Ability: Infinity Axe">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
+		<!-- Updated to Classic Zaken -->
 		<icon>icon.weapon_the_axe_of_hero_i00</icon>
 		<magicLvl>80</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="DamageShield">
-				<amount>9</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="ShieldDefenceRate">
-				<amount>39</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MaxCp">
-				<amount>50</amount>
+			<effect name="MaxHp">
+				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MaxMp">
+				<amount>15</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxCp">
 				<amount>30</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PvpPhysicalAttackDamageBonus">
+			<effect name="PAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalAttackDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="PvpMagicalSkillDamageBonus">
-				<amount>10</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PvpPhysicalSkillDamageBonus">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MaxHp">
-				<amount>25</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
 	<skill id="3581" toLevel="1" name="Infinity Power - Tenacity">
-		<!-- Confirmed CT2.5 -->
-		<!-- Infinity Axe Skill -->
-		<magicLvl>80</magicLvl>
-		<operateType>A1</operateType>
-		<rideState>NONE</rideState>
-		<magicCriticalRate>5</magicCriticalRate>
-		<hitCancelTime>0</hitCancelTime>
-		<targetType>ENEMY</targetType>
+		<!-- Updated to Classic Zaken -->
+		<icon>icon.skill0000</icon>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>120</abnormalTime>
+		<operateType>A2</operateType>
+		<hitTime>1000</hitTime>
+		<reuseDelay>600000</reuseDelay>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<!-- FIXME: this should be "Distrust" effect -->
-			<effect name="Confuse" abnormalTime="20">
-				<chance>20</chance>
-			</effect>
-		</effects>
-	</skill>
-	<skill id="3582" toLevel="1" name="Special Ability: Infinity Slasher">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
-		<icon>icon.weapon_the_two_handed_sword_of_hero_i00</icon>
-		<magicLvl>80</magicLvl>
-		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
-		<effects>
-			<effect name="MaxCp">
-				<amount>50</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="CriticalDamage">
-				<amount>504</amount>
+			<effect name="DamageShield">
+				<amount>10</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PvpPhysicalAttackDamageBonus">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PvpMagicalSkillDamageBonus">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PvpPhysicalSkillDamageBonus">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="CriticalRate">
-				<amount>78.7</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MaxHp">
-				<amount>25</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="ReflectSkill">
 				<amount>10</amount>
 				<mode>DIFF</mode>
@@ -1578,11 +1542,192 @@
 				<mode>DIFF</mode>
 				<type>MAGIC</type>
 			</effect>
+			<effect name="Hp">
+				<amount>460</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
+	</skill>
+	<skill id="3582" toLevel="1" name="Special Ability: Infinity Slasher">
+		<!-- Update to Classic Zaken -->
+		<icon>icon.weapon_the_two_handed_sword_of_hero_i00</icon>
+		<magicLvl>80</magicLvl>
+		<operateType>P</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<effects>
+			<effect name="MaxHp">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxMp">
+				<amount>15</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxCp">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="CriticalDamage">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalAttackDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="3584" toLevel="1" name="Infinity Power - Protection">
-		<!-- Confirmed CT2.5 -->
-		<!-- Infinity Crusher Skill -->
+		<!-- Update to Classic Zaken -->
+		<icon>icon.skill0100</icon>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>120</abnormalTime>
+		<operateType>A2</operateType>
+		<hitTime>1000</hitTime>
+		<reuseDelay>600000</reuseDelay>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DispelByCategory">
+				<slot>DEBUFF</slot>
+				<rate>100</rate>
+				<max>5</max>
+			</effect>
+		</effects>
+	</skill>
+	<skill id="3585" toLevel="1" name="Special Ability: Infinity Dualsword">
+		<!-- Update to Classic Zaken -->
+		<icon>icon.weapon_the_dualsword_of_hero_i00</icon>
+		<magicLvl>80</magicLvl>
+		<operateType>P</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<effects>
+			<effect name="MaxHp">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxMp">
+				<amount>15</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxCp">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PAtk">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="CriticalDamage">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalAttackDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="ReflectSkill">
+				<amount>5</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="ReflectSkill">
+				<amount>5</amount>
+				<mode>DIFF</mode>
+				<type>MAGIC</type>
+			</effect>
+		</effects>
+	</skill>
+	<skill id="3586" toLevel="1" name="Infinity Power - Refresh">
+		<!-- Update to Classic Zaken -->
+		<icon>icon.skill3123</icon>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>300</abnormalTime>
+		<operateType>A2</operateType>
+		<hitTime>1000</hitTime>
+		<reuseDelay>600000</reuseDelay>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="MagicMpCost">
+				<amount>-10</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-10</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-10</amount>
+				<mode>PER</mode>
+				<magicType>3</magicType>
+			</effect>
+		</effects>
+	</skill>
+	<skill id="3587" toLevel="1" name="Special Ability: Infinity Fighter">
+		<!-- Update to Classic Zaken -->
+		<icon>icon.weapon_the_fist_of_hero_i00</icon>
+		<magicLvl>80</magicLvl>
+		<operateType>P</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<effects>
+			<effect name="MaxHp">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxMp">
+				<amount>15</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxCp">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="CriticalRate">
+				<amount>20</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalAttackDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
+	</skill>
+	<skill id="3588" toLevel="1" name="Stun">
+		<!-- Infinity Fang Skill -->
 		<abnormalLvl>1</abnormalLvl>
 		<abnormalTime>9</abnormalTime>
 		<abnormalType>STUN</abnormalType>
@@ -1591,7 +1736,7 @@
 		<basicProperty>PHYSICAL</basicProperty>
 		<effectPoint>-100</effectPoint>
 		<icon>icon.skill0100</icon>
-		<isDebuff>true</isDebuff>
+		<isDebuff>1</isDebuff>
 		<lvlBonusRate>10</lvlBonusRate>
 		<magicLvl>80</magicLvl>
 		<operateType>A2</operateType>
@@ -1601,421 +1746,302 @@
 		<trait>SHOCK</trait>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
 		<effects>
 			<effect name="BlockActions" />
 		</effects>
 	</skill>
-	<skill id="3585" toLevel="1" name="Special Ability: Infinity Dualsword">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
-		<icon>icon.weapon_the_dualsword_of_hero_i00</icon>
-		<magicLvl>80</magicLvl>
-		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
-		<effects>
-			<effect name="MaxCp">
-				<amount>50</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MaxMp">
-				<amount>30</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PvpPhysicalAttackDamageBonus">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PvpMagicalSkillDamageBonus">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PvpPhysicalSkillDamageBonus">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="CriticalRate">
-				<amount>78.7</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MaxHp">
-				<amount>25</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="ReflectSkill">
-				<amount>10</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="ReflectSkill">
-				<amount>10</amount>
-				<mode>DIFF</mode>
-				<type>MAGIC</type>
-			</effect>
-		</effects>
-	</skill>
-	<skill id="3586" toLevel="1" name="Infinity Power - Refresh">
-		<!-- Confirmed CT2.5 -->
-		<!-- Infinity Wing Skill -->
-		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>60</abnormalTime>
-		<abnormalType>SILENCE_PHYSICAL</abnormalType>
-		<abnormalVisualEffect>SILENCE</abnormalVisualEffect>
-		<activateRate>10</activateRate>
-		<basicProperty>MAGIC</basicProperty>
-		<effectPoint>-100</effectPoint>
-		<icon>icon.skill1064</icon>
-		<isDebuff>true</isDebuff>
-		<lvlBonusRate>10</lvlBonusRate>
-		<magicLvl>80</magicLvl>
-		<operateType>A2</operateType>
-		<rideState>NONE</rideState>
-		<magicCriticalRate>5</magicCriticalRate>
-		<hitCancelTime>0</hitCancelTime>
-		<trait>DERANGEMENT</trait>
-		<targetType>ENEMY_ONLY</targetType>
-		<affectScope>SINGLE</affectScope>
-		<effects>
-			<effect name="PhysicalMute" />
-		</effects>
-	</skill>
-	<skill id="3587" toLevel="1" name="Special Ability: Infinity Fighter">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
-		<icon>icon.weapon_the_fist_of_hero_i00</icon>
-		<magicLvl>80</magicLvl>
-		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
-		<effects>
-			<effect name="PhysicalEvasion">
-				<amount>3.15</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MaxCp">
-				<amount>50</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MaxMp">
-				<amount>30</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PvpPhysicalAttackDamageBonus">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PvpMagicalSkillDamageBonus">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PvpPhysicalSkillDamageBonus">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MaxHp">
-				<amount>25</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="ReflectSkill">
-				<amount>10</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="ReflectSkill">
-				<amount>10</amount>
-				<mode>DIFF</mode>
-				<type>MAGIC</type>
-			</effect>
-		</effects>
-	</skill>
 	<skill id="3589" toLevel="1" name="Special Ability: Infinity Dagger">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
+		<!-- Update to Classic Zaken -->
 		<icon>icon.weapon_the_dagger_of_hero_i00</icon>
 		<magicLvl>80</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="CriticalRatePositionBonus">
-				<amount>22</amount>
-				<position>BACK</position>
-			</effect>
-			<effect name="VampiricAttack">
-				<amount>2</amount>
-				<chance>30</chance>
-			</effect>
-			<effect name="PhysicalAttackSpeed">
-				<amount>3</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MaxCp">
-				<amount>50</amount>
+			<effect name="MaxHp">
+				<amount>15</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MaxMp">
+				<amount>25</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxCp">
 				<amount>30</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MpRegen">
-				<amount>0.51</amount>
+			<effect name="MagicCriticalRate">
+				<amount>20</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PvpPhysicalAttackDamageBonus">
+			<effect name="CriticalDamage">
 				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="PvpPhysicalAttackDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="PvpMagicalSkillDamageBonus">
-				<amount>20</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PvpPhysicalSkillDamageBonus">
-				<amount>20</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
 	<skill id="3590" toLevel="1" name="Infinity Power - Immortal">
-		<!-- Confirmed CT2.5 -->
-		<!-- Infinity Stinger Skill -->
+		<!-- Update to Classic Zaken -->
+		<icon>icon.skill0410</icon>
 		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>120</abnormalTime>
-		<abnormalType>SILENCE</abnormalType>
-		<abnormalVisualEffect>SILENCE</abnormalVisualEffect>
-		<activateRate>5</activateRate>
-		<basicProperty>MAGIC</basicProperty>
-		<effectPoint>-100</effectPoint>
-		<icon>icon.skill1064</icon>
-		<isDebuff>true</isDebuff>
-		<lvlBonusRate>10</lvlBonusRate>
-		<magicLvl>80</magicLvl>
+		<abnormalTime>300</abnormalTime>
+		<reuseDelay>600000</reuseDelay>
+		<hitTime>1000</hitTime>
 		<operateType>A2</operateType>
-		<rideState>NONE</rideState>
-		<magicCriticalRate>5</magicCriticalRate>
-		<hitCancelTime>0</hitCancelTime>
-		<trait>DERANGEMENT</trait>
-		<targetType>ENEMY_ONLY</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="Mute" />
+			<effect name="FatalBlowRate">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="3591" toLevel="1" name="Special Ability: Infinity Spear">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
+		<!-- Update to Classic Zaken -->
 		<icon>icon.weapon_the_pole_of_hero_i00</icon>
 		<magicLvl>80</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="Accuracy">
-				<amount>4.89</amount>
-				<mode>DIFF</mode>
+			<effect name="MaxHp">
+				<amount>20</amount>
+				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttackSpeed">
-				<amount>7</amount>
+			<effect name="MaxMp">
+				<amount>15</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MaxCp">
-				<amount>50</amount>
+				<amount>30</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="HitNumber">
-				<amount>8</amount>
-				<mode>DIFF</mode>
-				<weaponType>
-					<item>POLE</item>
-				</weaponType>
+			<effect name="PAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="CriticalDamage">
+				<amount>10</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="PvpPhysicalAttackDamageBonus">
-				<amount>10</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PvpMagicalSkillDamageBonus">
-				<amount>10</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PvpPhysicalSkillDamageBonus">
-				<amount>10</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MaxHp">
-				<amount>25</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="ReflectSkill">
-				<amount>20</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="ReflectSkill">
-				<amount>20</amount>
-				<mode>DIFF</mode>
-				<type>MAGIC</type>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="3593" toLevel="1" name="Special Ability: Infinity Bow">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
+		<!-- Update to Classic Zaken -->
 		<icon>icon.weapon_the_bow_of_hero_i00</icon>
 		<magicLvl>80</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="MaxCp">
-				<amount>50</amount>
+		<effect name="MaxHp">
+				<amount>15</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MaxMp">
+				<amount>25</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxCp">
 				<amount>30</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PvpPhysicalAttackDamageBonus">
+			<effect name="MagicMpCost">
+				<amount>-5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="PvpPhysicalAttackDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="PvpMagicalSkillDamageBonus">
-				<amount>10</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PvpPhysicalSkillDamageBonus">
-				<amount>10</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
 	<skill id="3594" toLevel="1" name="Infinity Power - Archery">
-		<!-- Confirmed Ct2.5 -->
-		<!-- Infinity Bow/Shooter Skill -->
-		<abnormalLvl>3</abnormalLvl>
-		<abnormalTime>120</abnormalTime>
-		<abnormalType>SPEED_DOWN</abnormalType>
-		<activateRate>7</activateRate>
-		<basicProperty>MAGIC</basicProperty>
-		<effectPoint>-100</effectPoint>
-		<icon>icon.skill1160</icon>
-		<isDebuff>true</isDebuff>
-		<lvlBonusRate>10</lvlBonusRate>
-		<magicLvl>80</magicLvl>
+		<!-- Update to Classic Zaken -->
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>300</abnormalTime>
+		<reuseDelay>600000</reuseDelay>
+		<hitTime>1000</hitTime>
+		<icon>icon.skill0431</icon>
 		<operateType>A2</operateType>
-		<rideState>NONE</rideState>
-		<magicCriticalRate>5</magicCriticalRate>
-		<hitCancelTime>0</hitCancelTime>
-		<targetType>ENEMY_ONLY</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
-		<affectObject>NOT_FRIEND</affectObject>
 		<effects>
-			<effect name="Speed">
-				<amount>-30</amount>
+			<effect name="PhysicalAttackSpeed">
+				<amount>15</amount>
 				<mode>PER</mode>
+				<weaponType>
+					<item>BOW</item>
+				</weaponType>
+			</effect>
+			<effect name="PhysicalAttackRange">
+				<amount>100</amount>
+				<mode>DIFF</mode>
+				<weaponType>
+					<item>BOW</item>
+				</weaponType>
 			</effect>
 		</effects>
 	</skill>
 	<skill id="3595" toLevel="1" name="Special Ability: Infinity Scepter">
+		<!-- Update to Classic Zaken -->
 		<icon>icon.weapon_the_staff_of_hero_i00</icon>
 		<magicLvl>80</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="MAtk">
-				<amount>29.67</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MaxCp">
-				<amount>50</amount>
+			<effect name="MaxHp">
+				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MaxMp">
+				<amount>25</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxCp">
 				<amount>30</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PvpPhysicalAttackDamageBonus">
+			<effect name="MAtk">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="CriticalDamage">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalAttackDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="PvpMagicalSkillDamageBonus">
-				<amount>10</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PvpPhysicalSkillDamageBonus">
-				<amount>10</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicCriticalRate">
-				<amount>1</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="ReduceCancel">
-				<amount>-106</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MagicMpCost">
-				<amount>-4</amount>
-				<mode>PER</mode>
-				<magicType>1</magicType>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="3596" toLevel="1" name="Infinity Power - Vampiric Mana">
-		<!-- Confirmed CT2.5 -->
-		<!-- Infinity Scepter Skill -->
-		<effectPoint>100</effectPoint>
-		<magicLvl>80</magicLvl>
-		<operateType>A1</operateType>
-		<rideState>NONE</rideState>
-		<magicCriticalRate>5</magicCriticalRate>
-		<hitCancelTime>0</hitCancelTime>
-		<!-- TODO: Remove this condition when proper target type is done -->
-		<targetType>ENEMY_NOT</targetType>
+		<!-- Update to Classic Zaken -->
+		<icon>icon.skill1268</icon>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>300</abnormalTime>
+		<reuseDelay>600000</reuseDelay>
+		<hitTime>1000</hitTime>
+		<operateType>A2</operateType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="HealPercent">
-				<power>100</power>
+			<effect name="MpVampiricAttack">
+				<amount>3</amount>
+				<chance>80</chance>
 			</effect>
 		</effects>
 	</skill>
 	<skill id="3597" toLevel="1" name="Special Ability: Infinity Rod">
-		<!-- Confirmed CT2.5 and Updated to H5 -->
+		<!-- Updated to Classic Zaken -->
 		<icon>icon.weapon_the_mace_of_hero_i00</icon>
 		<magicLvl>80</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="MagicalAttackSpeed">
-				<amount>15</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MaxCp">
-				<amount>50</amount>
+			<effect name="MaxHp">
+				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MaxMp">
+				<amount>25</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxCp">
 				<amount>30</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MpRegen">
-				<amount>0.51</amount>
+			<effect name="MagicCriticalRate">
+				<amount>20</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="MagicalAttackSpeed">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="PvpPhysicalAttackDamageBonus">
-				<amount>10</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PvpMagicalSkillDamageBonus">
-				<amount>10</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PvpPhysicalSkillDamageBonus">
-				<amount>10</amount>
+				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
 	<skill id="3598" toLevel="1" name="Infinity Power - Mana Limit">
-		<!-- Confirmed CT2.5 -->
-		<!-- Infinity Rod Skill -->
-		<effectPoint>100</effectPoint>
-		<magicLvl>80</magicLvl>
-		<operateType>A1</operateType>
-		<rideState>NONE</rideState>
-		<magicCriticalRate>5</magicCriticalRate>
-		<hitCancelTime>0</hitCancelTime>
-		<!-- TODO: Remove this condition when proper target type is done -->
-		<targetType>ENEMY_NOT</targetType>
+		<!-- Updated to Classic Zaken -->
+		<icon>icon.skill0100</icon>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>30</abnormalTime>
+		<operateType>A2</operateType>
+		<hitTime>1000</hitTime>
+		<reuseDelay>600000</reuseDelay>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="HealPercent">
-				<power>100</power>
+			<effect name="MagicMpCost">
+				<amount>-100</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-100</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-100</amount>
+				<mode>PER</mode>
+				<magicType>3</magicType>
 			</effect>
 		</effects>
 	</skill>