Quellcode durchsuchen

BETA: Item and Skill update:
* '''Items:'''
a. Infinity Wing(6620) (can't be enchanted, removed skill on enchant +4).
a. Changed uc_in_residence_siege_field to L2J condition.
* '''Skills:'''
a. Cleanup of custom siege conditions.
a. Updated:
1. Acrobatic Move(225)
1. Mystery Potion(2103)
1. Herb of Doubt(2513)
1. Zubei's Leather Shirt(3669)
1. Zubei's Breastplate(3676)
1. Priest's Ire(6426)
1. Mount Darkmane Pacer(8247)
1. Einhasad's Strike(8357)
1. Secret medicine of Will(22043)
1. Secret medicine of Life(22044)
1. Secret medicine of Will(26027)
1. Secret medicine of Life(26028)
a. Pre-implemented:
1. Baby Food Skill(22126)
1. Red Dimensional Stone(22129)
a. Implemented:
Fundation main armor bonus skills, not used in game, fix for #L5542
1. Tunic of Zubei(3677)
1. Avadon Breastplate(3686)
1. Avadon Leather Armor(3690)
1. Avadon Robe(3694)
1. Doom Plate Armor(3698)
1. Leather Armor of Doom(3701)
1. Tunic of Doom(3707)
1. Blue Wolf Breastplate(3710)
1. Blue Wolf Leather Armor(3715)
1. Blue Wolf Tunic(3721)
1. Dark Crystal Breastplate(3725)
1. Dark Crystal Leather Armor(3730)
1. Dark Crystal Robe(3736)
1. Tallum Plate Armor(3741)
1. Tallum Leather Armor(3743)
1. Tallum Tunic(3749)
1. Majestic Plate Armor(3754)
1. Majestic Leather Armor(3757)
1. Majestic Robe(3761)
1. Armor of Nightmare(3764)
1. Nightmarish Leather Armor
1. Nightmare Robe(3772)
1. Draconic Leather Armor(3777)
1. Major Arcana Robe(3780)
1. Imperial Crusader Breastplate(3788)
1. Dynasty Breastplate(3789)
1. Dynasty Leather Armor(3795)
1. Dynasty Tunic(3799)
1. Dynasty Silver Satin Tunic(3804)
1. Dynasty Jewel Leather Mail(3805)
1. Dynasty Platinum Plate(3806)
Other skills:
1. Soul Sucking(1545)
1. Strider Fear(1546)
1. Petrification Scroll(2239)
1. Hot Spring Nectar(2240)
1. Vampiric Aura(6637)
1. Cool air cannon(9010)
1. Jack O'Lantern Card(21120)
1. Rotten Jack O'Lantern Card(21121)
1. Soul Scent(22100)
1. Blessed Scroll of Escape (Event)(22103)
1. Blessed Scroll of Resurrection (Event)(22104)
1. Uldie Summon Scroll (Event)(22105)
1. Belldandy Summon Scroll (Event)(22106)
1. Skooldie Summon Scroll (Event)(22107)
1. Warmth of Kotatz(22118)
1. Love for All Seasons(22119)
1. Happy New Year(22120)
1. Female Aniruddha(22121)
1. Kung Hei Fat Choy(22122)
1. Chinese Feast(22123)
1. Hwa Gei Bu Gwi(22124)
1. Fire Stamp(22125)
1. Summon Warm Kotatz(22127)
1. Rudolph's Joy(22128)
1. Red Firework Flames(22131)
1. Gold Firework Flames(22132)
1. Blue Firework Flames(22133)
1. Pink Firework Flames(22134)
1. White Firework Flames(22135)
1. Silver Firework Flames(22136)
1. Star Food(22137)
1. Mango Dessert(22138)
1. Branding Wind Walk(22139)
1. Hwa Gei Bu Gwi Haste(22140)
1. Branding Agility(22141)
1. Female Aniruddha's Shield(22142)
1. Happy New Year Death Whisper(22143)
1. Happy New Year Guidance(22144)
1. Love for All Seasons Empower(22145)
1. Chinese Feast Greater Acumen(22146)
1. Kung Hei Fat Choy Vampiric Rage(22147)
1. Branding Blessed Body(22148)
1. Kung Hei Fat Choy Berserker Spirit(22149)
1. Female Aniruddha's Magic Barrier(22150)
1. Chinese Feast Blessed Soul(22151)
1. Chinese Feast Clarity(22152)
1. Love for All Seasons Wild Magic(22153)
1. Happy New Year Focus(22154)
1. Female Aniruddha's Blessed Shield(22155)
1. Hwa Gei Bu Gwi Decrease Weight(22156)
1. Kung Hei Fat Choy Might(22157)
1. Rose Petal(22158)
1. Mt. Fuji Herb(22162)
1. Hawk Herb(22163)
1. Eggplant Herb(22164)
1. Turkey's Attack Scissors(23021)
1. Healing medicine for Mana(26030)

Zoey76 vor 13 Jahren
Ursprung
Commit
4947d6939e
25 geänderte Dateien mit 1065 neuen und 457 gelöschten Zeilen
  1. 0 1
      L2J_DataPack_BETA/data/stats/items/09300-09399.xml
  2. 3 1
      L2J_DataPack_BETA/data/stats/items/09600-09699.xml
  3. 48 16
      L2J_DataPack_BETA/data/stats/items/10100-10199.xml
  4. 3 1
      L2J_DataPack_BETA/data/stats/items/12800-12899.xml
  5. 9 3
      L2J_DataPack_BETA/data/stats/items/14800-14899.xml
  6. 6 4
      L2J_DataPack_BETA/data/stats/skills/00200-00299.xml
  7. 23 11
      L2J_DataPack_BETA/data/stats/skills/01500-01599.xml
  8. 7 1
      L2J_DataPack_BETA/data/stats/skills/02100-02199.xml
  9. 20 5
      L2J_DataPack_BETA/data/stats/skills/02200-02299.xml
  10. 0 60
      L2J_DataPack_BETA/data/stats/skills/02300-02399.xml
  11. 2 8
      L2J_DataPack_BETA/data/stats/skills/02400-02499.xml
  12. 6 1
      L2J_DataPack_BETA/data/stats/skills/02500-02599.xml
  13. 40 22
      L2J_DataPack_BETA/data/stats/skills/03600-03699.xml
  14. 215 69
      L2J_DataPack_BETA/data/stats/skills/03700-03799.xml
  15. 28 9
      L2J_DataPack_BETA/data/stats/skills/03800-03899.xml
  16. 9 8
      L2J_DataPack_BETA/data/stats/skills/06400-06499.xml
  17. 18 3
      L2J_DataPack_BETA/data/stats/skills/06600-06699.xml
  18. 1 1
      L2J_DataPack_BETA/data/stats/skills/08200-08299.xml
  19. 8 8
      L2J_DataPack_BETA/data/stats/skills/08300-08399.xml
  20. 14 4
      L2J_DataPack_BETA/data/stats/skills/09000-09099.xml
  21. 14 6
      L2J_DataPack_BETA/data/stats/skills/21100-21199.xml
  22. 12 8
      L2J_DataPack_BETA/data/stats/skills/22000-22099.xml
  23. 556 193
      L2J_DataPack_BETA/data/stats/skills/22100-22199.xml
  24. 5 3
      L2J_DataPack_BETA/data/stats/skills/23000-23099.xml
  25. 18 11
      L2J_DataPack_BETA/data/stats/skills/26000-26099.xml

+ 0 - 1
L2J_DataPack_BETA/data/stats/items/09300-09399.xml

@@ -2924,7 +2924,6 @@
 		<set name="weight" val="1280" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
-		<set name="enchant4_skill" val="3426-1" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />

+ 3 - 1
L2J_DataPack_BETA/data/stats/items/09600-09699.xml

@@ -1191,7 +1191,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2342-1" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="9689" type="EtcItem" name="Spirit of the Lake">
 		<set name="icon" val="icon.etc_talisman_i01" />

+ 48 - 16
L2J_DataPack_BETA/data/stats/items/10100-10199.xml

@@ -586,7 +586,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2379-1;2380-1;2381-1;2382-1;2383-1" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="10144" type="EtcItem" name="Battleground Spell - Wizard">
 		<set name="icon" val="icon.etc_scroll_white_i00" />
@@ -600,7 +602,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2379-1;2380-1;2381-1;2384-1;2385-1" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="10145" type="EtcItem" name="Battleground Spell - Healer">
 		<set name="icon" val="icon.etc_scroll_white_i00" />
@@ -614,7 +618,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2379-1;2380-1;2381-1;2384-1;2386-1" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="10146" type="EtcItem" name="Battleground Spell - Dagger Master">
 		<set name="icon" val="icon.etc_scroll_white_i00" />
@@ -628,7 +634,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2379-1;2387-1;2381-1;2388-1;2383-1" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="10147" type="EtcItem" name="Battleground Spell - Bow Master">
 		<set name="icon" val="icon.etc_scroll_white_i00" />
@@ -642,7 +650,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2379-1;2387-1;2381-1;2389-1;2383-1" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="10148" type="EtcItem" name="Battleground Spell - Berserker">
 		<set name="icon" val="icon.etc_scroll_white_i00" />
@@ -656,7 +666,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2390-1;2391-1" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="10149" type="EtcItem" name="Battleground Blessed Scroll of Escape">
 		<set name="icon" val="icon.etc_scroll_of_return_i00" />
@@ -670,7 +682,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2392-1" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="10150" type="EtcItem" name="Battleground Blessed Scroll of Resurrection">
 		<set name="icon" val="icon.etc_scroll_of_resurrection_i00" />
@@ -682,7 +696,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ScrollOfResurrection" />
 		<set name="item_skill" val="2393-1" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="10151" type="EtcItem" name="Battleground Transform Spell">
 		<set name="icon" val="icon.etc_trans_4f_s_b_01" />
@@ -696,7 +712,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2394-1" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="10152" type="EtcItem" name="Battle Health Recovery Potion">
 		<set name="icon" val="icon.etc_super_hp_potion_i00" />
@@ -711,7 +729,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2395-1" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="10153" type="EtcItem" name="Battle Mana Recovery Potion">
 		<set name="icon" val="icon.etc_super_mp_potion_i00" />
@@ -726,7 +746,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2401-1" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="10154" type="EtcItem" name="Battle CP Recovery Potion">
 		<set name="icon" val="icon.etc_super_cp_potion_i00" />
@@ -741,7 +763,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2402-1" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="10155" type="EtcItem" name="Mental Strengthening Potion">
 		<set name="icon" val="icon.etc_lesser_potion_yellow_i00" />
@@ -754,7 +778,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2396-1" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="10156" type="EtcItem" name="Medusa's Potion">
 		<set name="icon" val="icon.etc_lesser_potion_yellow_i00" />
@@ -769,7 +795,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2397-1" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="10157" type="EtcItem" name="Instant Haste Potion">
 		<set name="icon" val="icon.etc_lesser_potion_yellow_i00" />
@@ -782,7 +810,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2398-1" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="10158" type="Armor" name="Grey Talisman of Upper Grade Fishing">
 		<set name="icon" val="icon.etc_talisman_i07" />
@@ -808,7 +838,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2399-1" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="10160" type="EtcItem" name="Cursed Red Soul Crystal - Stage 14">
 		<set name="icon" val="icon.etc_broken_crystal_red_i00" />

+ 3 - 1
L2J_DataPack_BETA/data/stats/items/12800-12899.xml

@@ -418,7 +418,9 @@
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2530-1" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="12820" type="EtcItem" name="Blueprint - Summon Merchant Golem">
 		<set name="icon" val="icon.etc_plan_i00" />

+ 9 - 3
L2J_DataPack_BETA/data/stats/items/14800-14899.xml

@@ -272,7 +272,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2907-5" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="14816" type="EtcItem" name="Territory Mana Recovery Potion">
 		<set name="icon" val="icon.etc_super_mp_potion_i05" />
@@ -289,7 +291,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2908-5" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="14817" type="EtcItem" name="Territory CP Recovery Potion">
 		<set name="icon" val="icon.etc_super_cp_potion_i05" />
@@ -306,7 +310,9 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2909-5" />
-		<set name="use_condition" val="{{uc_in_residence_siege_field}}" />
+		<cond msgId="113" addName="1">
+			<player SiegeZone="126" />
+		</cond>
 	</item>
 	<item id="14818" type="EtcItem" name="Enriched Pet Food for Wolves">
 		<set name="icon" val="icon.etc_pouch_red_i00" />

+ 6 - 4
L2J_DataPack_BETA/data/stats/skills/00200-00299.xml

@@ -378,16 +378,18 @@
 		</enchant1for>
 	</skill>
 	<skill id="225" levels="3" name="Acrobatic Move">
-		<table name="#gain"> 4 5 6 </table>
+		<!-- Confirmed CT2.5 -->
+		<table name="#evas"> 4 5 6 </table>
 		<table name="#magicLvl"> 28 43 55 </table>
 		<set name="magicLvl" val="#magicLvl" />
-		<set name="target" val="TARGET_SELF" />
-		<set name="skillType" val="BUFF" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
 		<for>
-			<add order="0x40" stat="rEvas" val="#gain">
+			<add order="0x40" stat="rEvas" val="#evas">
 				<player running="true" />
 			</add>
+			<add order="0x40" stat="stunVuln" val="11" />
 		</for>
 	</skill>
 	<skill id="226" levels="1" name="Relax">

+ 23 - 11
L2J_DataPack_BETA/data/stats/skills/01500-01599.xml

@@ -1058,19 +1058,21 @@
 		<set name="target" val="TARGET_FRONT_AREA" />
 	</skill>
 	<skill id="1545" levels="1" name="Soul Sucking">
+		<!-- Confirmed CT2.5 -->
 		<!-- Kamael Final Form Skill -->
-		<!-- TODO: Related with Quest "Long live the Pa'agrio Lord! -->
-		<!-- TODO: This skill require retail check -->
+		<!-- TODO: Synch with animation. -->
 		<set name="castRange" val="900" />
-		<set name="effectRange" val="1400" />
+		<set name="effectRange" val="1000" />
+		<set name="element" val="5" /> <!-- Dark -->
+		<set name="elementPower" val="20" />
 		<set name="hitTime" val="15000" />
 		<set name="isMagic" val="true" />
-		<set name="mpConsume" val="36" />
+		<set name="magicLvl" val="79" />
+		<set name="mpInitialConsume" val="36" />
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="power" val="80" /> <!-- Base Land Rate -->
 		<set name="reuseDelay" val="300000" />
 		<set name="staticReuse" val="true" />
-		<set name="saveVs" val="WIT" />
 		<set name="skillType" val="DOT" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
@@ -1078,14 +1080,24 @@
 		</for>
 	</skill>
 	<skill id="1546" levels="1" name="Strider Fear">
-		<!-- Frightens the enemy and causes him to flee for 10 seconds. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="hitTime" val="4000" />
+		<set name="isDebuff" val="true" />
+		<set name="isMagic" val="true" />
 		<set name="lvlDepend" val="1" />
-		<set name="operateType" val="OP_PASSIVE" />
-		<set name="saveVs" val="MEN" />
+		<set name="magicLvl" val="56" />
+		<set name="mpConsume" val="40" />
+		<set name="mpInitialConsume" val="10" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="power" val="40" /> <!-- Base Land Rate -->
 		<set name="reuseDelay" val="5000" />
-		<set name="trait" val="DERANGEMENT" />
+		<set name="saveVs" val="MEN" />
+		<set name="skillRadius" val="100" /> <!-- 900, 100 -->
+		<set name="skillType" val="FEAR" />
+		<set name="target" val="TARGET_FRONT_AREA" /> <!-- TODO: TARGET_AURA_SQUARE -->
+		<for>
+			<effect count="5" name="Fear" abnormalTime="10" val="0" abnormalLvl="1" abnormalType="turn_flee" />
+		</for>
 	</skill>
 	<skill id="1547" levels="3" name="Spirit Sharing">
 		<table name="#abnormalLvl"> 1 2 3 </table>

+ 7 - 1
L2J_DataPack_BETA/data/stats/skills/02100-02199.xml

@@ -24,13 +24,19 @@
 		<set name="target" val="TARGET_SELF" />
 	</skill>
 	<skill id="2103" levels="1" name="Mystery Potion">
+		<!-- Confirmed CT2.5 -->
+		<set name="isPotion" val="true" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="magicLvl" val="1" />
-		<set name="isPotion" val="true" />
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
 		<set name="trait" val="ETC" />
+		<cond msgId="113" addName="1">
+			<not>
+				<player transformationId="103" />
+			</not>
+		</cond>
 		<for>
 			<effect name="BigHead" abnormalTime="300" val="0" abnormal="bighead" abnormalLvl="0" abnormalType="big_head" />
 		</for>

+ 20 - 5
L2J_DataPack_BETA/data/stats/skills/02200-02299.xml

@@ -679,15 +679,30 @@
 		</cond>
 	</skill>
 	<skill id="2239" levels="1" name="Petrification Scroll">
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="castRange" val="600" />
+		<set name="effectRange" val="1100" />
+		<set name="itemConsumeCount" val="1" />
+		<set name="itemConsumeId" val="8379" />
+		<set name="magicLvl" val="99" />
 		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_PARTY" />
+		<for>
+			<effect name="Petrification" abnormalTime="5" val="0" abnormalLvl="1" abnormalType="turn_stone" />
+		</for>
 	</skill>
 	<skill id="2240" levels="1" name="Hot Spring Nectar">
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="reuseDelay" val="2000" />
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="100" />
+		<set name="castRange" val="40" />
+		<set name="effectRange" val="300" />
+		<set name="itemConsumeCount" val="1" />
+		<set name="itemConsumeId" val="8379" />
 		<set name="operateType" val="OP_ACTIVE" />
+		<set name="reuseDelay" val="2000" />
+		<set name="skillType" val="NOTDONE" />
+		<set name="target" val="TARGET_ONE" />
 	</skill>
 	<skill id="2241" levels="1" name="Hot Spring Mineral Water">
 		<set name="target" val="TARGET_NONE" />

+ 0 - 60
L2J_DataPack_BETA/data/stats/skills/02300-02399.xml

@@ -1104,9 +1104,6 @@
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 		<for>
 			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="2" abnormalType="speed_up">
 				<add order="0x40" stat="runSpd" val="33" />
@@ -1119,9 +1116,6 @@
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 		<for>
 			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="3" abnormalType="pd_up">
 				<mul order="0x30" stat="pDef" val="1.15" />
@@ -1134,9 +1128,6 @@
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 		<for>
 			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="2" abnormalType="md_up">
 				<mul order="0x30" stat="mDef" val="1.23" />
@@ -1149,9 +1140,6 @@
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 		<for>
 			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="6" abnormalType="shield_prob_up">
 				<mul order="0x30" stat="rShld" val="1.35" />
@@ -1164,9 +1152,6 @@
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 		<for>
 			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="1" abnormalType="attack_time_down">
 				<mul order="0x30" stat="pAtkSpd" val="1.15" />
@@ -1179,9 +1164,6 @@
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 		<for>
 			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="1" abnormalType="casting_time_down">
 				<mul order="0x30" stat="mAtkSpd" val="1.15" />
@@ -1194,9 +1176,6 @@
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 		<for>
 			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="1" abnormalType="ma_up">
 				<mul order="0x30" stat="mAtk" val="1.55" />
@@ -1209,9 +1188,6 @@
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 		<for>
 			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="1" abnormalType="heal_power_up">
 				<add order="0x40" stat="bonusHp" val="100" />
@@ -1224,9 +1200,6 @@
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 		<for>
 			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="3" abnormalType="pa_up">
 				<mul order="0x30" stat="pAtk" val="1.15" />
@@ -1239,9 +1212,6 @@
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 		<for>
 			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="1" abnormalType="critical_prob_up">
 				<basemul order="0x30" stat="rCrit" val="0.15" />
@@ -1254,9 +1224,6 @@
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 		<for>
 			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="1" abnormalType="hit_up">
 				<add order="0x40" stat="accCombat" val="2" />
@@ -1270,9 +1237,6 @@
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 		<for>
 			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="2" abnormalType="berserker">
 				<mul order="0x30" stat="mAtk" val="1.16" />
@@ -1292,9 +1256,6 @@
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 		<for>
 			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="1" abnormalType="cheap_magic">
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="0.96" />
@@ -1311,9 +1272,6 @@
 		<set name="skillType" val="RECALL" />
 		<set name="staticHitTime" val="true" />
 		<set name="target" val="TARGET_SELF" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 	</skill>
 	<skill id="2393" levels="1" name="Blessed Scroll of Battlefield Resurrection">
 		<!-- Confirmed CT2.5 -->
@@ -1327,9 +1285,6 @@
 		<set name="skillType" val="RESURRECT" />
 		<set name="staticHitTime" val="true" />
 		<set name="target" val="TARGET_CORPSE_PLAYER" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 	</skill>
 	<skill id="2394" levels="1" name="Scroll of Battlefield Transformation">
 		<!-- Confirmed CT2.5 -->
@@ -1338,9 +1293,6 @@
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
 		<set name="transformId" val="304" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 	</skill>
 	<skill id="2395" levels="1" name="Lesser Battlefield Healing Potion">
 		<!-- Confirmed CT2.5 -->
@@ -1369,9 +1321,6 @@
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 		<for>
 			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="1" abnormalType="hit_up">
 				<sub order="0x40" stat="rootVuln" val="20" />
@@ -1389,9 +1338,6 @@
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 		<for>
 			<effect name="Petrification" abnormalTime="6" val="0" abnormalLvl="1" abnormalType="turn_stone" />
 		</for>
@@ -1405,9 +1351,6 @@
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 		<for>
 			<effect name="Buff" abnormalTime="15" val="0" abnormalLvl="2" abnormalType="speed_up_special">
 				<add order="0x40" stat="runSpd" val="66" />
@@ -1431,9 +1374,6 @@
 		<set name="skillType" val="ROOT" />
 		<set name="target" val="TARGET_ONE" />
 		<set name="trait" val="HOLD" />
-		<cond msgId="113" addName="1">
-			<player SiegeZone="126" />
-		</cond>
 		<for>
 			<effect name="Root" abnormalTime="7" val="0" abnormalLvl="1" abnormalType="root_physically" />
 		</for>

+ 2 - 8
L2J_DataPack_BETA/data/stats/skills/02400-02499.xml

@@ -27,10 +27,7 @@
 		<set name="skillType" val="MANAHEAL" />
 		<set name="target" val="TARGET_SELF" />
 		<cond msgId="113" addName="1">
-			<and>
-				<player SiegeZone="126" />
-				<player level="52" />
-			</and>
+			<player level="52" />
 		</cond>
 	</skill>
 	<skill id="2402" levels="1" name="Lesser Battlefield CP Potion">
@@ -44,10 +41,7 @@
 		<set name="skillType" val="COMBATPOINTHEAL" />
 		<set name="target" val="TARGET_SELF" />
 		<cond msgId="113" addName="1">
-			<and>
-				<player SiegeZone="126" />
-				<player level="52" />
-			</and>
+			<player level="52" />
 		</cond>
 	</skill>
 	<skill id="2403" levels="1" name="Spring CP Potion">

+ 6 - 1
L2J_DataPack_BETA/data/stats/skills/02500-02599.xml

@@ -206,7 +206,12 @@
 		<set name="target" val="TARGET_SELF" />
 		<set name="trait" val="ETC" />
 		<cond msgId="113" addName="1">
-			<player flyMounted="False" />
+			<and>
+				<player flyMounted="False" />
+				<not>
+					<player transformationId="103" />
+				</not>
+			</and>
 		</cond>
 		<for>
 			<effect name="BigHead" abnormalTime="300" val="0" abnormal="bighead" abnormalLvl="1" abnormalType="big_head">

+ 40 - 22
L2J_DataPack_BETA/data/stats/skills/03600-03699.xml

@@ -1083,10 +1083,10 @@
 	</skill>
 	<skill id="3669" levels="1" name="Zubei's Leather Shirt">
 		<!-- Confirmed CT2.5 -->
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_SELF" />
-		<set name="skillType" val="BUFF" />
+		<set name="magicLvl" val="58" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
 		<for>
 			<add order="0x40" stat="rEvas" val="9.55" />
 		</for>
@@ -1151,21 +1151,24 @@
 	</skill>
 	<skill id="3676" levels="1" name="Zubei's Breastplate">
 		<!-- Confirmed CT2.5 -->
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_SELF" />
-		<set name="skillType" val="BUFF" />
+		<set name="magicLvl" val="58" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
 		<for>
-			<mul order="0x30" stat="pDef" val="1.0724" />
 			<add order="0x40" stat="maxHp" val="294" />
+			<mul order="0x30" stat="pDef" val="1.0724" />
 		</for>
 	</skill>
 	<skill id="3677" levels="1" name="Tunic of Zubei">
 		<!-- Confirmed CT2.5 -->
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<set name="magicLvl" val="58" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<mul order="0x30" stat="mAtk" val="1.15" />
+		</for>
 	</skill>
 	<skill id="3678" levels="1" name="Stockings of Zubei">
 		<!-- Confirmed CT2.5 -->
@@ -1241,10 +1244,13 @@
 	</skill>
 	<skill id="3686" levels="1" name="Avadon Breastplate">
 		<!-- Confirmed CT2.5 -->
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<set name="magicLvl" val="58" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<add order="0x40" stat="maxHp" val="833" />
+		</for>
 	</skill>
 	<skill id="3687" levels="1" name="Avadon Shield">
 		<!-- Confirmed CT2.5 -->
@@ -1277,10 +1283,14 @@
 	</skill>
 	<skill id="3690" levels="1" name="Avadon Leather Armor">
 		<!-- Confirmed CT2.5 -->
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<set name="magicLvl" val="58" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<add order="0x40" stat="maxLoad" val="11038" />
+			<mul order="0x30" stat="mDef" val="1.1708" />
+		</for>
 	</skill>
 	<skill id="3691" levels="1" name="Avadon Boots">
 		<!-- Confirmed CT2.5 -->
@@ -1312,10 +1322,14 @@
 	</skill>
 	<skill id="3694" levels="1" name="Avadon Robe">
 		<!-- Confirmed CT2.5 -->
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<set name="magicLvl" val="58" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<mul order="0x30" stat="mAtkSpd" val="1.15" />
+			<mul order="0x30" stat="mDef" val="1.1708" />
+		</for>
 	</skill>
 	<skill id="3695" levels="1" name="Avadon Boots">
 		<!-- Confirmed CT2.5 -->
@@ -1348,10 +1362,14 @@
 	</skill>
 	<skill id="3698" levels="1" name="Doom Plate Armor">
 		<!-- Confirmed CT2.5 -->
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<set name="magicLvl" val="61" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<add order="0x40" stat="breath" val="383" />
+			<add order="0x40" stat="maxHp" val="1093" />
+		</for>
 	</skill>
 	<skill id="3699" levels="1" name="Doom Helmet">
 		<!-- Confirmed CT2.5 -->

+ 215 - 69
L2J_DataPack_BETA/data/stats/skills/03700-03799.xml

@@ -10,10 +10,17 @@
 		</for>
 	</skill>
 	<skill id="3701" levels="1" name="Leather Armor of Doom">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="61" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<add order="0x40" stat="breath" val="383" />
+			<mul order="0x30" stat="pAtk" val="1.0827" />
+			<sub order="0x40" stat="poisonVuln" val="13" />
+			<mul order="0x30" stat="regMp" val="1.0827" />
+		</for>
 	</skill>
 	<skill id="3702" levels="1" name="Doom Gloves">
 		<!-- Confirmed CT2.5 -->
@@ -74,10 +81,16 @@
 		</for>
 	</skill>
 	<skill id="3707" levels="1" name="Tunic of Doom">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="61" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<add order="0x40" stat="breath" val="200" />
+			<mul order="0x30" stat="regMp" val="1.0724" />
+			<add order="0x40" stat="runSpd" val="7" />
+		</for>
 	</skill>
 	<skill id="3708" levels="1" name="Stockings of Doom">
 		<!-- Confirmed CT2.5 -->
@@ -102,10 +115,15 @@
 		</for>
 	</skill>
 	<skill id="3710" levels="1" name="Blue Wolf Breastplate">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="61" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<mul order="0x30" stat="regHp" val="1.0724" />
+			<add order="0x40" stat="runSpd" val="7" />
+		</for>
 	</skill>
 	<skill id="3711" levels="1" name="Blue Wolf Gaiters">
 		<!-- Confirmed CT2.5 -->
@@ -148,10 +166,15 @@
 		</for>
 	</skill>
 	<skill id="3715" levels="1" name="Blue Wolf Leather Armor">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="61" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<mul order="0x30" stat="mAtkSpd" val="1.15" />
+			<mul order="0x30" stat="pDef" val="1.0219" />
+		</for>
 	</skill>
 	<skill id="3716" levels="1" name="Blue Wolf Boots">
 		<!-- Confirmed CT2.5 -->
@@ -201,10 +224,15 @@
 		</for>
 	</skill>
 	<skill id="3721" levels="1" name="Blue Wolf Tunic">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="61" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<add order="0x40" stat="maxMp" val="205" />
+			<mul order="0x30" stat="regMp" val="1.0724" />
+		</for>
 	</skill>
 	<skill id="3722" levels="1" name="Blue Wolf Stockings">
 		<!-- Confirmed CT2.5 -->
@@ -237,10 +265,15 @@
 		</for>
 	</skill>
 	<skill id="3725" levels="1" name="Dark Crystal Breastplate">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="64" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<mul order="0x30" stat="gainHp" val="1.12" />
+			<add order="0x40" stat="paralyzeVuln" val="20" />
+		</for>
 	</skill>
 	<skill id="3726" levels="1" name="Dark Crystal Gaiters">
 		<!-- Confirmed CT2.5 -->
@@ -282,10 +315,16 @@
 		</for>
 	</skill>
 	<skill id="3730" levels="1" name="Dark Crystal Leather Armor">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="64" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<sub order="0x40" stat="paralyzeVuln" val="20" />
+			<mul order="0x30" stat="pAtkSpd" val="1.0724" />
+			<mul order="0x30" stat="pAtk" val="1.0724" />
+		</for>
 	</skill>
 	<skill id="3731" levels="1" name="Dark Crystal Gloves">
 		<!-- Confirmed CT2.5 -->
@@ -344,10 +383,18 @@
 		</for>
 	</skill>
 	<skill id="3736" levels="1" name="Dark Crystal Robe">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="64" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<add order="0x40" stat="cancelVuln" val="8.33" />
+			<mul order="0x30" stat="mAtkSpd" val="1.15" />
+			<add order="0x40" stat="paralyzeVuln" val="20" />
+			<mul order="0x30" stat="pDef" val="1.0333" />
+			<add order="0x40" stat="runSpd" val="2.91" />
+		</for>
 	</skill>
 	<skill id="3737" levels="1" name="Dark Crystal Boots">
 		<!-- Confirmed CT2.5 -->
@@ -398,10 +445,17 @@
 		</for>
 	</skill>
 	<skill id="3741" levels="1" name="Tallum Plate Armor">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="64" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<add order="0x40" stat="bleedVuln" val="52" />
+			<add order="0x40" stat="maxLoad" val="8159" />
+			<add order="0x40" stat="poisonVuln" val="52" />
+			<mul order="0x30" stat="pAtkSpd" val="1.0932" />
+		</for>
 	</skill>
 	<skill id="3742" levels="1" name="Tallum Helmet">
 		<!-- Confirmed CT2.5 -->
@@ -416,10 +470,17 @@
 		</for>
 	</skill>
 	<skill id="3743" levels="1" name="Tallum Leather Armor">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="64" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<add order="0x40" stat="bleedVuln" val="52" />
+			<add order="0x40" stat="maxMp" val="315" />
+			<add order="0x40" stat="poisonVuln" val="52" />
+			<mul order="0x30" stat="regMp" val="1.0932" />
+		</for>
 	</skill>
 	<skill id="3744" levels="1" name="Tallum Gloves">
 		<!-- Confirmed CT2.5 -->
@@ -480,10 +541,14 @@
 		</for>
 	</skill>
 	<skill id="3749" levels="1" name="Tallum Tunic">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="64" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<mul order="0x30" stat="mAtkSpd" val="1.15" />
+		</for>
 	</skill>
 	<skill id="3750" levels="1" name="Tallum Stockings">
 		<!-- Confirmed CT2.5 -->
@@ -530,10 +595,16 @@
 		</for>
 	</skill>
 	<skill id="3754" levels="1" name="Majestic Plate Armor">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="67" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<add order="0x40" stat="accCombat" val="0.579" />
+			<mul order="0x30" stat="pAtk" val="1.0827" />
+			<add order="0x40" stat="stunVuln" val="20.83" />
+		</for>
 	</skill>
 	<skill id="3755" levels="1" name="Majestic Boots">
 		<!-- Confirmed CT2.5 -->
@@ -561,10 +632,19 @@
 		</for>
 	</skill>
 	<skill id="3757" levels="1" name="Majestic Leather Armor">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="67" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<add order="0x40" stat="maxLoad" val="8159" />
+			<add order="0x40" stat="maxMp" val="340" />
+			<mul order="0x30" stat="pAtk" val="1.0932">
+				<using kind="Bow,Crossbow" />
+			</mul>
+			<add order="0x40" stat="stunVuln" val="20.83" />
+		</for>
 	</skill>
 	<skill id="3758" levels="1" name="Majestic Boots">
 		<!-- Confirmed CT2.5 -->
@@ -606,10 +686,16 @@
 		</for>
 	</skill>
 	<skill id="3761" levels="1" name="Majestic Robe">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="67" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<mul order="0x30" stat="mAtkSpd" val="1.15" />
+			<mul order="0x30" stat="regMp" val="1.0333" />
+			<add order="0x40" stat="stunVuln" val="20.83" />
+		</for>
 	</skill>
 	<skill id="3762" levels="1" name="Majestic Boots">
 		<!-- Confirmed CT2.5 -->
@@ -634,10 +720,16 @@
 		</for>
 	</skill>
 	<skill id="3764" levels="1" name="Armor of Nightmare">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="67" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<mul order="0x30" stat="pAtk" val="1.1708" />
+			<sub order="0x40" stat="rootVuln" val="29.16" />
+			<sub order="0x40" stat="sleepVuln" val="29.16" />
+		</for>
 	</skill>
 	<skill id="3765" levels="1" name="Gauntlet of Nightmare">
 		<!-- Confirmed CT2.5 -->
@@ -673,10 +765,17 @@
 		</for>
 	</skill>
 	<skill id="3768" levels="1" name="Nightmarish Leather Armor">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="67" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<add order="0x40" stat="absorbDam" val="3" />
+			<mul order="0x30" stat="mDef" val="1.0827" />
+			<sub order="0x40" stat="rootVuln" val="29.16" />
+			<sub order="0x40" stat="sleepVuln" val="29.16" />
+		</for>
 	</skill>
 	<skill id="3769" levels="1" name="Gauntlet of Nightmare">
 		<!-- Confirmed CT2.5 -->
@@ -713,10 +812,17 @@
 		</for>
 	</skill>
 	<skill id="3772" levels="1" name="Nightmare Robe">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="67" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<mul order="0x30" stat="mAtk" val="1.0827" />
+			<mul order="0x30" stat="regMp" val="1.0827" />
+			<sub order="0x40" stat="rootVuln" val="29.16" />
+			<sub order="0x40" stat="sleepVuln" val="29.16" />
+		</for>
 	</skill>
 	<skill id="3773" levels="1" name="Boots of Nightmare">
 		<!-- Confirmed CT2.5 -->
@@ -764,10 +870,17 @@
 		</for>
 	</skill>
 	<skill id="3777" levels="1" name="Draconic Leather Armor">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="75" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<add order="0x40" stat="maxLoad" val="8159" />
+			<add order="0x40" stat="maxMp" val="630" />
+			<mul order="0x30" stat="pAtk" val="1.058" />
+			<mul order="0x30" stat="pAtkSpd" val="1.058" />
+		</for>
 	</skill>
 	<skill id="3778" levels="1" name="Draconic Leather Helmet">
 		<!-- Confirmed CT2.5 -->
@@ -795,10 +908,18 @@
 		</for>
 	</skill>
 	<skill id="3780" levels="1" name="Major Arcana Robe">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="75" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<sub order="0x40" stat="cancel" val="21" />
+			<add order="0x40" stat="maxLoad" val="8159" />
+			<mul order="0x30" stat="mAtk" val="1.1603" />
+			<mul order="0x30" stat="runSpd" val="1.0991" />
+			<sub order="0x40" stat="stunVuln" val="20.83" />
+		</for>
 	</skill>
 	<skill id="3781" levels="1" name="Major Arcana Boots">
 		<!-- Confirmed CT2.5 -->
@@ -887,16 +1008,29 @@
 		</for>
 	</skill>
 	<skill id="3788" levels="1" name="Imperial Crusader Breastplate">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="75" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<add order="0x40" stat="maxHp" val="889" />
+			<mul order="0x30" stat="pDef" val="1.0724" />
+			<sub order="0x40" stat="rootVuln" val="28" />
+			<sub order="0x40" stat="sleepVuln" val="28" />
+		</for>
 	</skill>
 	<skill id="3789" levels="1" name="Dynasty Breastplate">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="80" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<add order="0x40" stat="darkRes" val="3.2" />
+			<add order="0x40" stat="maxHp" val="984" />
+			<mul order="0x30" stat="pDef" val="1.0724" />
+		</for>
 	</skill>
 	<skill id="3790" levels="1" name="Dynasty Gaiters">
 		<!-- Confirmed CT2.5 -->
@@ -952,10 +1086,18 @@
 		</for>
 	</skill>
 	<skill id="3795" levels="1" name="Dynasty Leather Armor">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="80" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<add order="0x40" stat="accCombat" val="3.4" />
+			<add order="0x40" stat="darkRes" val="3.2" />
+			<add order="0x40" stat="maxMp" val="492" />
+			<mul order="0x30" stat="pAtkSpd" val="1.0477" />
+			<add order="0x40" stat="rEvas" val="3.4" />
+		</for>
 	</skill>
 	<skill id="3796" levels="1" name="Dynasty Leather Leggings">
 		<!-- Confirmed CT2.5 -->
@@ -997,9 +1139,13 @@
 		</for>
 	</skill>
 	<skill id="3799" levels="1" name="Dynasty Tunic">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="80" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<mul order="0x30" stat="mAtkSpd" val="1.15" />
+		</for>
 	</skill>
 </list>

+ 28 - 9
L2J_DataPack_BETA/data/stats/skills/03800-03899.xml

@@ -45,22 +45,41 @@
 		</for>
 	</skill>
 	<skill id="3804" levels="1" name="Dynasty Silver Satin Tunic">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="80" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<mul order="0x30" stat="mAtkSpd" val="1.15" />
+		</for>
 	</skill>
 	<skill id="3805" levels="1" name="Dynasty Jewel Leather Mail">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="80" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<add order="0x40" stat="accCombat" val="3.4" />
+			<add order="0x40" stat="darkRes" val="3.2" />
+			<add order="0x30" stat="maxMp" val="492" />
+			<mul order="0x30" stat="pAtkSpd" val="1.0477" />
+			<add order="0x40" stat="rEvas" val="3.4" />
+		</for>
 	</skill>
 	<skill id="3806" levels="1" name="Dynasty Platinum Plate">
-		<!-- It has been changed so that a rare type upper armor is not manufactured during item creation. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="80" />
 		<set name="operateType" val="OP_PASSIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<add order="0x40" stat="darkRes" val="3.2" />
+			<mul order="0x30" stat="MagicalMpConsumeRate" val="0.95" />
+			<add order="0x30" stat="maxHp" val="1023" />
+			<mul order="0x30" stat="pDef" val="1.0724" />
+		</for>
 	</skill>
 	<skill id="3807" levels="1" name="Adamantite Earring">
 		<!-- Confirmed CT2.5 -->

+ 9 - 8
L2J_DataPack_BETA/data/stats/skills/06400-06499.xml

@@ -408,19 +408,20 @@
 		<set name="lvlDepend" val="2" />
 	</skill>
 	<skill id="6426" levels="1" name="Priest's Ire">
-		<set name="target" val="TARGET_ONE" />
-		<set name="operateType" val="OP_ACTIVE" />
-		<set name="magicLvl" val="84" />
-		<set name="skillType" val="MDAM" />
-		<set name="power" val="120" />
-		<set name="isMagic" val="true" />
+		<!-- Confirmed CT2.5 -->
 		<set name="castRange" val="800" />
-		<set name="effectRange" val="1200" />
-		<set name="hitTime" val="2000" />
 		<set name="coolTime" val="500" />
+		<set name="effectRange" val="1200" />
 		<set name="element" val="3" />	<!-- Earth -->
 		<set name="elementPower" val="20" />
+		<set name="hitTime" val="2000" />
+		<set name="isMagic" val="true" />
+		<set name="magicLvl" val="84" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="power" val="120" />
 		<set name="skillRadius" val="200" />
+		<set name="skillType" val="MDAM" />
+		<set name="target" val="TARGET_ONE" />
 	</skill>
 	<skill id="6427" levels="1" name="Medicinal Mushroom 1">
 		<!-- Fantasy Mushroom Skill -->

+ 18 - 3
L2J_DataPack_BETA/data/stats/skills/06600-06699.xml

@@ -304,10 +304,25 @@
 		<set name="reuseDelay" val="2000" />
 	</skill>
 	<skill id="6637" levels="1" name="Vampiric Aura">
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="castRange" val="2000" />
+		<set name="effectRange" val="2000" />
+		<set name="magicLvl" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
 		<set name="reuseDelay" val="2000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_ONE" />
+		<cond msgId="113" addName="1">
+			<not>
+				<player transformationId="103" />
+			</not>
+		</cond>
+		<for>
+			<effect name="BigHead" abnormalTime="1200" val="0" abnormal="bighead" abnormalLvl="1" abnormalType="big_head">
+				<mul order="0x30" stat="regHp" val="2" />
+				<mul order="0x30" stat="regMp" val="2" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="6638" levels="1" name="Aura of Mystery">
 		<set name="target" val="TARGET_NONE" />

+ 1 - 1
L2J_DataPack_BETA/data/stats/skills/08200-08299.xml

@@ -807,7 +807,7 @@
 			<effect name="Transformation" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="transform" />
 		</for>
 	</skill>
-	<skill id="8247" levels="1" name="Mount Light Purple Maned Horse">
+	<skill id="8247" levels="1" name="Mount Darkmane Pacer">
 		<!-- Confirmed CT2.5 -->
 		<set name="aggroPoints" val="1" />
 		<set name="operateType" val="OP_ACTIVE" />

+ 8 - 8
L2J_DataPack_BETA/data/stats/skills/08300-08399.xml

@@ -635,20 +635,20 @@
 		</for>
 	</skill>
 	<skill id="8357" levels="1" name="Einhasad's Strike">
+		<!-- Confirmed CT2.5 -->
+		<!-- TODO: Implement proper target type. -->
 		<set name="castRange" val="200" />
+		<set name="coolTime" val="700" />
 		<set name="effectRange" val="400" />
 		<set name="hitTime" val="1300" />
-		<set name="target" val="TARGET_FRONT_AREA" />
-		<set name="skillType" val="PDAM" />
-		<set name="skillRadius" val="300" />
-		<set name="staticDamage" val="true" />
+		<set name="magicLvl" val="85" />
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="power" val="10000" />
 		<set name="reuseDelay" val="4000" />
-		<set name="coolTime" val="700" />
-		<cond msgId="113" addName="1">
-			<player instanceId="112" />
-		</cond>
+		<set name="skillRadius" val="300" />
+		<set name="skillType" val="PDAM" />
+		<set name="staticDamage" val="true" />
+		<set name="target" val="TARGET_FRONT_AREA" />
 	</skill>
 	<skill id="8358" levels="1" name="Remove the seal of an Agathion - Towbat">
 		<set name="target" val="TARGET_NONE" />

+ 14 - 4
L2J_DataPack_BETA/data/stats/skills/09000-09099.xml

@@ -51,11 +51,21 @@
 		<set name="operateType" val="OP_PASSIVE" />
 	</skill>
 	<skill id="9010" levels="1" name="Cool air cannon">
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
-		<set name="reuseDelay" val="1000" />
+		<!-- Confirmed CT2.5 -->
+		<set name="castRange" val="200" />
 		<set name="coolTime" val="700" />
+		<set name="effectRange" val="400" />
+		<set name="hitTime" val="1300" />
+		<set name="itemConsumeCount" val="1" />
+		<set name="magicLvl" val="85" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="power" val="1" />
+		<set name="reuseDelay" val="1000" />
+		<set name="skillType" val="PDAM" />
+		<set name="target" val="TARGET_ONE" />
+		<cond msgId="109">
+			<target npcId="13270" />
+		</cond>
 	</skill>
 	<skill id="9011" levels="1" name="Might">
 		<!-- Increases P. Atk. by 15% for 60 minutes. -->

+ 14 - 6
L2J_DataPack_BETA/data/stats/skills/21100-21199.xml

@@ -270,16 +270,24 @@
 		</for>
 	</skill>
 	<skill id="21120" levels="1" name="Jack O'Lantern Card">
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="castRange" val="400" />
+		<set name="effectRange" val="500" />
+		<set name="magicLvl" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="DUMMY" />
 		<set name="staticReuse" val="true" />
+		<set name="target" val="TARGET_ONE" />
 	</skill>
 	<skill id="21121" levels="1" name="Rotten Jack O'Lantern Card">
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="castRange" val="400" />
+		<set name="effectRange" val="500" />
+		<set name="magicLvl" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
 		<set name="staticReuse" val="true" />
+		<set name="skillType" val="DUMMY" />
+		<set name="target" val="TARGET_ONE" />
 	</skill>
 	<skill id="21122" levels="1" name="Blessing of Skooldy : Protection of Darkness">
 		<!-- Increase max HP by 20%, max MP by 20%, physical Def. by 20%, magic Def. by 20% for 1 hour. Increase dark attack resistance by 20. Reuse Delay 1 hour. -->

+ 12 - 8
L2J_DataPack_BETA/data/stats/skills/22000-22099.xml

@@ -573,32 +573,36 @@
 		<set name="isPotion" val="true" />
 	</skill>
 	<skill id="22043" levels="6" name="Secret medicine of Will">
+		<!-- Confirmed CT2.5 -->
 		<!-- Level 1 doesn't exist in client. -->
-		<table name="#power"> 200 800 1500 2000 2500 3000 </table>
 		<table name="#levelRange"> 0;0 20;39 40;51 52;60 61;75 76;85 </table>
+		<table name="#power"> 200 800 1500 2000 2500 3000 </table>
+		<set name="isPotion" val="true" />
 		<set name="itemConsumeCount" val="1" />
+		<set name="magicLvl" val="1" />
 		<set name="power" val="#power" />
-		<set name="target" val="TARGET_SELF" />
-		<set name="skillType" val="COMBATPOINTHEAL" />
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="reuseDelay" val="300000" />
 		<set name="sharedReuse" val="2289-1" />
-		<set name="isPotion" val="true" />
+		<set name="skillType" val="COMBATPOINTHEAL" />
+		<set name="target" val="TARGET_SELF" />
 		<cond msgId="113" addName="1">
 			<player levelRange="#levelRange" />
 		</cond>
 	</skill>
 	<skill id="22044" levels="6" name="Secret medicine of Life">
+		<!-- Confirmed CT2.5 -->
 		<!-- Level 1 doesn't exist in client. -->
 		<table name="#levelRange"> 0;0 20;39 40;51 52;60 61;75 76;85 </table>
+		<set name="isPotion" val="true" />
 		<set name="itemConsumeCount" val="1" />
-		<set name="power" val="50" />
-		<set name="target" val="TARGET_SELF" />
-		<set name="skillType" val="HEAL_PERCENT" />
+		<set name="magicLvl" val="1" />
 		<set name="operateType" val="OP_ACTIVE" />
+		<set name="power" val="50" />
 		<set name="reuseDelay" val="300000" />
 		<set name="sharedReuse" val="2287-1" />
-		<set name="isPotion" val="true" />
+		<set name="skillType" val="HEAL_PERCENT" />
+		<set name="target" val="TARGET_SELF" />
 		<cond msgId="113" addName="1">
 			<player levelRange="#levelRange" />
 		</cond>

+ 556 - 193
L2J_DataPack_BETA/data/stats/skills/22100-22199.xml

@@ -1,12 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list>
 	<skill id="22100" levels="1" name="Soul Scent">
-		<!-- When using a monster's corpse, comforts the monster's soul to borrow the monster's power temporarily. For 2 minutes, increases Max HP by 40%, Max MP by 40%, Max CP by 40%, physical P. Def. by 30%, M. Def. by 30%, moving speed by 20, and M. Atk. by 45%. Decreases MP consumption during skill use by 10%. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
-		<set name="reuseDelay" val="5000" />
+		<!-- Confirmed CT2.5 -->
+		<set name="castRange" val="400" />
+		<set name="effectRange" val="900" />
 		<set name="hitTime" val="1500" />
+		<set name="itemConsumeCount" val="1" />
+		<set name="magicLvl" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="reuseDelay" val="5000" />
+		<set name="skillType" val="DRAIN" />
+		<set name="target" val="TARGET_CORPSE_MOB" />
+		<for>
+			<effect self="1" name="Buff" abnormalTime="120" val="0" abnormalLvl="1" abnormalType="br_event_buf6">
+				<mul order="0x30" stat="maxHp" val="1.4" />
+				<mul order="0x30" stat="maxMp" val="1.4" />
+				<mul order="0x30" stat="maxCp" val="1.4" />
+				<mul order="0x30" stat="pDef" val="1.3" />
+				<mul order="0x30" stat="mDef" val="1.3" />
+				<add order="0x40" stat="runSpd" val="20" />
+				<mul order="0x30" stat="mAtk" val="1.45" />
+				<mul order="0x30" stat="MagicalMpConsumeRate" val="0.9" />
+				<mul order="0x30" stat="PhysicalMpConsumeRate" val="0.9" />
+				<mul order="0x30" stat="DanceMpConsumeRate" val="0.9" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22101" levels="1" name="Fortune of Love Box">
 		<!-- Confirmed CT2.5 -->
@@ -15,6 +33,7 @@
 		</table>
 		<set name="capsuled_items_skill" val="#extractableItems" />
 		<set name="itemConsumeCount" val="1" />
+		<set name="magicLvl" val="1" />
 		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="EXTRACTABLE" />
 		<set name="target" val="TARGET_SELF" />
@@ -44,35 +63,96 @@
 			</and>
 		</cond>
 	</skill>
-	<skill id="22103" levels="1" name="Blessed Scroll of Escape - event">
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+	<skill id="22103" levels="1" name="Blessed Scroll of Escape (Event)">
+		<!-- Confirmed CT2.5 -->
 		<set name="hitTime" val="200" />
+		<set name="itemConsumeCount" val="1" />
+		<set name="itemConsumeId" val="20583" />
+		<set name="magicLvl" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="RECALL" />
+		<set name="staticHitTime" val="true" />
+		<set name="target" val="TARGET_SELF" />
 	</skill>
-	<skill id="22104" levels="1" name="Blessed Scroll of Resurrection - event">
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+	<skill id="22104" levels="1" name="Blessed Scroll of Resurrection (Event)">
+		<!-- Confirmed CT2.5 -->
+		<set name="castRange" val="400" />
+		<set name="effectRange" val="600" />
 		<set name="hitTime" val="3000" />
+		<set name="itemConsumeCount" val="1" />
+		<set name="itemConsumeId" val="20584" />
+		<set name="magicLvl" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="power" val="100" />
+		<set name="skillType" val="RESURRECT" />
+		<set name="staticHitTime" val="true" />
+		<set name="target" val="TARGET_CORPSE_PLAYER" />
 	</skill>
-	<skill id="22105" levels="1" name="Wooldy Summon Scroll - Event">
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+	<skill id="22105" levels="1" name="Uldie Summon Scroll (Event)">
+		<!-- Confirmed CT2.5 -->
+		<set name="hitTime" val="3000" />
+		<set name="itemConsumeCount" val="1" />
+		<set name="itemConsumeId" val="20707" />
+		<set name="magicLvl" val="1" />
+		<set name="npcDistance" val="40" />
+		<set name="npcId" val="20" />
+		<set name="operateType" val="OP_ACTIVE" />
 		<set name="reuseDelay" val="12000" />
+		<set name="skillType" val="SUMMON" /> <!-- TODO: SUMMON_NPC_NEAR" -->
+		<set name="target" val="TARGET_SELF" />
+		<cond msgId="113" addName="1">
+			<player active_skill_id="21120" />
+		</cond>
+		<cond msgId="129">
+			<and>
+				<player invSize="10" />
+				<player weight="80" />
+			</and>
+		</cond>
 	</skill>
-	<skill id="22106" levels="1" name="Verdandi Summon Scroll - Event">
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+	<skill id="22106" levels="1" name="Belldandy Summon Scroll (Event)">
+		<!-- Confirmed CT2.5 -->
+		<set name="hitTime" val="3000" />
+		<set name="itemConsumeCount" val="1" />
+		<set name="itemConsumeId" val="20707" />
+		<set name="magicLvl" val="1" />
+		<set name="npcDistance" val="40" />
+		<set name="npcId" val="21" />
+		<set name="operateType" val="OP_ACTIVE" />
 		<set name="reuseDelay" val="12000" />
+		<set name="skillType" val="SUMMON" /> <!-- TODO: SUMMON_NPC_NEAR" -->
+		<set name="target" val="TARGET_SELF" />
+		<cond msgId="113" addName="1">
+			<player active_skill_id="21120" />
+		</cond>
+		<cond msgId="129">
+			<and>
+				<player invSize="10" />
+				<player weight="80" />
+			</and>
+		</cond>
 	</skill>
-	<skill id="22107" levels="1" name="Skooldy Summon Scroll - Event">
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+	<skill id="22107" levels="1" name="Skooldie Summon Scroll (Event)">
+		<!-- Confirmed CT2.5 -->
+		<set name="hitTime" val="3000" />
+		<set name="itemConsumeCount" val="1" />
+		<set name="itemConsumeId" val="20707" />
+		<set name="magicLvl" val="1" />
+		<set name="npcDistance" val="40" />
+		<set name="npcId" val="19" />
+		<set name="operateType" val="OP_ACTIVE" />
 		<set name="reuseDelay" val="12000" />
+		<set name="skillType" val="SUMMON" /> <!-- TODO: SUMMON_NPC_NEAR" -->
+		<set name="target" val="TARGET_SELF" />
+		<cond msgId="113" addName="1">
+			<player active_skill_id="21120" />
+		</cond>
+		<cond msgId="129">
+			<and>
+				<player invSize="10" />
+				<player weight="80" />
+			</and>
+		</cond>
 	</skill>
 	<skill id="22108" levels="1" name="Halloween Toy Box">
 		<!-- Confirmed CT2.5 -->
@@ -173,80 +253,174 @@
 		<set name="operateType" val="OP_PASSIVE" />
 	</skill>
 	<skill id="22118" levels="1" name="Warmth of Kotatz">
-		<!-- The Warmth of Kotatz can be felt. HP regeneration is increased by 40%. CP regeneration is increased by 30%. MP regeneration is increased by 20%. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillRadius" val="200" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_AURA" />
+		<for>
+			<effect name="Buff" abnormalTime="25" val="0" abnormalLvl="99" abnormalType="hp_regen_up">
+				<mul order="0x30" stat="regCp" val="1.3" />
+				<mul order="0x30" stat="regHp" val="1.4" />
+				<mul order="0x30" stat="regMp" val="1.2" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22119" levels="1" name="Love for All Seasons">
-		<!-- For 1 hour, increases M. Atk. by 75% and the chance of Prominent Damage occurring through damage magic by 2. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="multi_buff">
+				<mul order="0x30" stat="mAtk" val="1.75" />
+				<add order="0x40" stat="mCritRate" val="2" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22120" levels="1" name="Happy New Year">
-		<!-- For 1 hour, increases Critical attack power by 35%, Critical attack rate by 30, and accuracy by 4. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="multi_buff">
+				<mul order="0x30" stat="cAtk" val="1.35" />
+				<mul order="0x30" stat="rCrit" val="1.3" />
+				<add order="0x40" stat="accCombat" val="4" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22121" levels="1" name="Female Aniruddha">
-		<!-- For 1 hour, increases P. Def. by 15%, Magic Resistance by 30%, and Shield Defense Rate by 15. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="multi_buff">
+				<mul order="0x30" stat="mDef" val="1.3" />
+				<mul order="0x30" stat="pDef" val="1.15" />
+				<add order="0x40" stat="sDef" val="15" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22122" levels="1" name="Kung Hei Fat Choy">
-		<!-- For 1 hour, decreases party members' P. Def. by 8%, M. Def. by 16%, and Evasion by 4. Increases P. Atk. by 15%, P. Atk. by 8%, M. Atk. by 16%, Atk. Spd. by 8%, Casting Spd. by 8%, and moving speed by 8. 9% of the standard short-range physical damage inflicted on the enemy is recovered by HP. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="multi_buff">
+				<mul order="0x30" stat="mAtk" val="1.16" />
+				<mul order="0x30" stat="mDef" val="0.84" />
+				<mul order="0x30" stat="pAtk" val="1.15" />
+				<mul order="0x30" stat="pAtk" val="1.08" />
+				<mul order="0x30" stat="pAtkSpd" val="1.08" />
+				<mul order="0x30" stat="pDef" val="0.92" />
+				<sub order="0x40" stat="rEvas" val="4" />
+				<add order="0x40" stat="runSpd" val="8" />
+				<add order="0x40" stat="absorbDam" val="9" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22123" levels="1" name="Chinese Feast">
-		<!-- For 1 hour, decreases physical skill MP consumption by 20%, magic skill's MP consumption by 10%, and song/dance skill's MP consumption by 20%. Increases Casting Spd. by 30% and Max MP by 35%. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="multi_buff">
+				<mul order="0x30" stat="DanceMpConsumeRate" val="0.8" />
+				<mul order="0x30" stat="MagicalMpConsumeRate" val="0.8" />
+				<mul order="0x30" stat="mAtkSpd" val="1.3" />
+				<mul order="0x30" stat="maxHp" val="1.35" />
+				<mul order="0x30" stat="PhysicalMpConsumeRate" val="0.9" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22124" levels="1" name="Hwa Gei Bu Gwi">
-		<!-- For 1 hour, increases Atk. Spd. by 33% and weight penalty interval by 9000. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="multi_buff">
+				<add order="0x40" stat="maxLoad" val="9000" />
+				<add order="0x40" stat="pAtkSpd" val="33" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22125" levels="1" name="Fire Stamp">
-		<!-- For 1 hour, increases moving speed by 33, Evasion rate by 4, and Max HP by 35%. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="multi_buff">
+				<mul order="0x30" stat="maxHp" val="1.35" />
+				<add order="0x40" stat="rEvas" val="4" />
+				<add order="0x40" stat="runSpd" val="33" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22126" levels="1" name="Baby Food Skill">
-		<set name="target" val="TARGET_NONE" />
+		<!-- TODO: Implement. -->
+		<set name="castRange" val="400" />
+		<set name="effectRange" val="500" />
+		<set name="itemConsumeCount" val="1" />
+		<set name="magicLvl" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
 		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
 		<set name="staticReuse" val="true" />
+		<set name="target" val="TARGET_ONE" />
+		<cond msgId="109">
+			<target npcId="1538" />
+		</cond>
 	</skill>
 	<skill id="22127" levels="1" name="Summon Warm Kotatz">
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="despawnDelay" val="7200" /> <!-- Custom -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="magicLvl" val="1" />
+		<set name="npcId" val="28" />
 		<set name="operateType" val="OP_PASSIVE" />
 		<set name="reuseDelay" val="600000" />
+		<set name="skillType" val="SPAWN" />
 		<set name="staticReuse" val="true" />
+		<set name="target" val="TARGET_SELF" />
 	</skill>
 	<skill id="22128" levels="3" name="Rudolph's Joy">
-		<!-- Lvl 1: For 5 minutes, raises Atk. Spd. by 10% and Magic Casting Spd. by 10%. -->
-		<!-- Lvl 2: For 5 minutes, raises Atk. Spd. by 15% and Magic Casting Spd. by 15%. -->
-		<!-- Lvl 3: For 5 minutes, raises Atk. Spd. by 20% and Magic Casting Spd. by 20%. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
-		<set name="reuseDelay" val="2000" />
+		<!-- Confirmed CT2.5 -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
+		<table name="#AtkSpd"> 1.1 1.15 1.2 </table>
+		<set name="aggroPoints" val="100" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="300" val="0" abnormalLvl="#abnormalLvl" abnormalType="br_event_buf2">
+				<mul order="0x30" stat="pAtkSpd" val="#AtkSpd" />
+				<mul order="0x30" stat="mAtkSpd" val="#AtkSpd" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22129" levels="1" name="Red Dimensional Stone">
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- TODO: Implement. -->
+		<set name="hitTime" val="3000" />
+		<set name="itemConsumeCount" val="1" />
+		<set name="magicLvl" val="1" />
 		<set name="operateType" val="OP_PASSIVE" />
 		<set name="reuseDelay" val="18000000" />
+		<set name="resetQuest" val="128;129;144" />
+		<set name="skillType" val="NOTDONE" /> <!-- TODO: RESET_QUESTS -->
+		<set name="target" val="TARGET_SELF" />
 	</skill>
 	<skill id="22130" levels="1" name="Food of Doubt's Effect">
 		<!-- Food of Doubt's effect.For 20 minutes, energy is recovered when Exp. is acquired. -->
@@ -255,171 +429,332 @@
 		<set name="operateType" val="OP_PASSIVE" />
 	</skill>
 	<skill id="22131" levels="1" name="Red Firework Flames">
-		<!-- For 10 minutes, increases water type defense by 30 and STR by 1. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="600" val="0" abnormalLvl="1" abnormalType="br_event_buf10">
+				<add order="0x10" stat="STR" val="1" />
+				<add order="0x40" stat="waterRes" val="30" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22132" levels="1" name="Gold Firework Flames">
-		<!-- For 10 minutes, increases divinity type defense by 30 and CON by 1. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="600" val="0" abnormalLvl="1" abnormalType="br_event_buf10">
+				<add order="0x10" stat="CON" val="1" />
+				<add order="0x40" stat="holyRes" val="30" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22133" levels="1" name="Blue Firework Flames">
-		<!-- For 10 minutes, increases fire type defense by 30 and DEX by 1. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="600" val="0" abnormalLvl="1" abnormalType="br_event_buf10">
+				<add order="0x10" stat="DEX" val="1" />
+				<add order="0x40" stat="fireRes" val="30" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22134" levels="1" name="Pink Firework Flames">
-		<!-- For 10 minutes, increases earth type defense by 30 and MEN by 1. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="600" val="0" abnormalLvl="1" abnormalType="br_event_buf10">
+				<add order="0x10" stat="MEN" val="1" />
+				<add order="0x40" stat="earthRes" val="30" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22135" levels="1" name="White Firework Flames">
-		<!-- For 10 minutes, increases wind type defense by 30 and WIT by 1. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="600" val="0" abnormalLvl="1" abnormalType="br_event_buf10">
+				<add order="0x10" stat="WIT" val="1" />
+				<add order="0x40" stat="windRes" val="30" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22136" levels="1" name="Silver Firework Flames">
-		<!-- For 10 minutes, increases darkness type defense by 30 and INT by 1. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="600" val="0" abnormalLvl="1" abnormalType="br_event_buf10">
+				<add order="0x10" stat="INT" val="1" />
+				<add order="0x40" stat="darkRes" val="30" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22137" levels="1" name="Star Food">
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="power" val="20000" />
+		<set name="skillType" val="GIVE_VITALITY" />
+		<set name="target" val="TARGET_SELF" />
 	</skill>
 	<skill id="22138" levels="1" name="Mango Dessert">
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="magicLvl" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="power" val="20000" />
+		<set name="skillType" val="GIVE_VITALITY" />
+		<set name="target" val="TARGET_SELF" />
 	</skill>
 	<skill id="22139" levels="1" name="Branding Wind Walk">
-		<!-- Increases moving speed by 33 for 1 hour. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="speed_up">
+				<add order="0x40" stat="runSpd" val="33" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22140" levels="1" name="Hwa Gei Bu Gwi Haste">
-		<!-- Increases Atk. Spd. by 33% for 1 hour. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="attack_time_down">
+				<mul order="0x30" stat="pAtkSpd" val="1.33" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22141" levels="1" name="Branding Agility">
-		<!-- Increases evasion rate by 4 for 1 hour. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="avoid_up">
+				<add order="0x40" stat="rEvas" val="4" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22142" levels="1" name="Female Aniruddha's Shield">
-		<!-- Increases P. Def. by 15% for 1 hour. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="pd_up">
+				<mul order="0x30" stat="pDef" val="1.15" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22143" levels="1" name="Happy New Year Death Whisper">
-		<!-- Increases Critical attack power by 35% for 1 hour. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="critical_dmg_up">
+				<mul order="0x30" stat="rCrit" val="1.35" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22144" levels="1" name="Happy New Year Guidance">
-		<!-- Increases accuracy by 4 for 1 hour. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="hit_up">
+				<add order="0x40" stat="accCombat" val="4" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22145" levels="1" name="Love for All Seasons Empower">
-		<!-- Increases M. Atk. by 75% for 1 hour. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="ma_up">
+				<mul order="0x30" stat="mAtk" val="1.75" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22146" levels="1" name="Chinese Feast Greater Acumen">
-		<!-- Increases Casting Spd. by 30% for 1 hour. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="casting_time_down">
+				<mul order="0x30" stat="mAtkSpd" val="1.3" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22147" levels="1" name="Kung Hei Fat Choy Vampiric Rage">
-		<!-- For 1 hour, 9% of the standard short-range physical damage inflicted on the enemy is recovered as HP. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="vampiric_attack">
+				<add order="0x40" stat="absorbDam" val="9" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22148" levels="1" name="Branding Blessed Body">
-		<!-- Increases Max HP by 35% for 1 hour. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="max_hp_up">
+				<mul order="0x30" stat="maxHp" val="1.35" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22149" levels="1" name="Kung Hei Fat Choy Berserker Spirit">
-		<!-- Decreases P. Def. by 8%, M. Def. by 16%, and evasion by 4, and increases P. Atk. by 8%, M. Atk. by 16%, Atk. Spd. by 8%, Casting Spd. by 8%, and moving speed by 8 for 1 hour. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="berserker">
+				<mul order="0x30" stat="mAtk" val="1.16" />
+				<mul order="0x30" stat="mDef" val="0.84" />
+				<mul order="0x30" stat="pAtk" val="1.08" />
+				<mul order="0x30" stat="pAtkSpd" val="1.08" />
+				<mul order="0x30" stat="pDef" val="0.92" />
+				<sub order="0x40" stat="rEvas" val="4" />
+				<add order="0x40" stat="runSpd" val="8" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22150" levels="1" name="Female Aniruddha's Magic Barrier">
-		<!-- Increases magic resistance by 30% for 1 hour. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="md_up">
+				<mul order="0x30" stat="mDef" val="1.3" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22151" levels="1" name="Chinese Feast Blessed Soul">
-		<!-- Increases Max MP by 35% for 1 hour. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="max_mp_up">
+				<mul order="0x30" stat="maxMp" val="1.35" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22152" levels="1" name="Chinese Feast Clarity">
-		<!-- For 1 hour, decreases physical skill MP consumption by 20%, magic skill's MP consumption by 10%, and song/dance skill's MP consumption by 20%. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="cheap_magic">
+				<mul order="0x30" stat="DanceMpConsumeRate" val="0.8" />
+				<mul order="0x30" stat="MagicalMpConsumeRate" val="0.9" />
+				<mul order="0x30" stat="PhysicalMpConsumeRate" val="0.8" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22153" levels="1" name="Love for All Seasons Wild Magic">
-		<!-- For 1 hour, increases by 2 the occurrence rate of damage that is caused by damage magic. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="magic_critical_up">
+				<add order="0x40" stat="mCritRate" val="2" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22154" levels="1" name="Happy New Year Focus">
-		<!-- Increases Critical attack rate by 30% for 1 hour. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="critical_prob_up">
+				<mul order="0x30" stat="rCrit" val="1.3" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22155" levels="1" name="Female Aniruddha's Blessed Shield">
-		<!-- Increases Shield defense rate by 15 for 1 hour. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="shield_prob_up">
+				<add order="0x40" stat="rShld" val="15" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22156" levels="1" name="Hwa Gei Bu Gwi Decrease Weight">
-		<!-- Increases the weight penalty interval by 9000 for 1 hour. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="decrease_weight_penalty">
+				<add order="0x40" stat="maxLoad" val="9000" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22157" levels="1" name="Kung Hei Fat Choy Might">
-		<!-- Increases P. Atk. by 15% for 1 hour. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="26" abnormalType="pa_up">
+				<mul order="0x30" stat="pAtk" val="1.15" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22158" levels="10" name="Rose Petal">
-		<!-- Increase HP/MP recovery by 20% for 5 minutes. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
-		<set name="reuseDelay" val="2000" />
+		<!-- Confirmed CT2.5 -->
+		<table name="#abnormalLvl"> 1 2 3 4 5 6 7 8 9 10 </table>
+		<set name="aggroPoints" val="100" />
+		<set name="hitTime" val="100" />
+		<set name="magicLvl" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="300" val="0" abnormalLvl="#abnormalLvl" abnormalType="br_event_buf1">
+				<mul order="0x30" stat="regHp" val="1.2" />
+				<mul order="0x30" stat="regMp" val="1.2" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22159" levels="1" name="Vesper Super Power">
 		<!-- Increases P. Atk. by 15%, M. Atk. by 20% and Speed by 10 for 10 minutes. -->
@@ -474,25 +809,53 @@
 		</for>
 	</skill>
 	<skill id="22162" levels="1" name="Mt. Fuji Herb">
-		<!-- Energy is recovered for 10 minutes when acquiring Exp. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="100" />
+		<set name="hitTime" val="100" />
+		<set name="isPotion" val="true" /> <!-- Custom. -->
+		<set name="operateType" val="OP_ACTIVE" />
 		<set name="reuseDelay" val="2000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="600" val="0" abnormalLvl="2" abnormalType="vp_up">
+				<sub order="0x40" stat="vitalityConsumeRate" val="10" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22163" levels="1" name="Hawk Herb">
-		<!-- Physical Atk Speed is increased by 15% and physical Critical Atk rate is increased by 10% for 10 minutes. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="100" />
+		<set name="hitTime" val="100" />
+		<set name="isPotion" val="true" /> <!-- Custom. -->
+		<set name="magicLvl" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
 		<set name="reuseDelay" val="2000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="600" val="0" abnormalLvl="1" abnormalType="br_event_buf1">
+				<mul order="0x30" stat="pAtkSpd" val="1.15" />
+				<basemul order="0x30" stat="rCrit" val="0.1" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22164" levels="1" name="Eggplant Herb">
-		<!-- Magic Atk Speed is increased by 10% and magic Critical Rate is increased by 2 for 10 minutes. -->
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="100" />
+		<set name="hitTime" val="100" />
+		<set name="isPotion" val="true" /> <!-- Custom. -->
+		<set name="magicLvl" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
 		<set name="reuseDelay" val="2000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="600" val="0" abnormalLvl="1" abnormalType="br_event_buf1">
+				<mul order="0x30" stat="mAtkSpd" val="1.1" />
+				<add order="0x40" stat="mCritRate" val="2" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22165" levels="1" name="Energy Replenish">
 		<!-- 5000 Soul Avatar Energy is replenished. -->

+ 5 - 3
L2J_DataPack_BETA/data/stats/skills/23000-23099.xml

@@ -267,9 +267,11 @@
 		<set name="skillRadius" val="500" />
 	</skill>
 	<skill id="23021" levels="3" name="Turkey's Attack Scissors">
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="DUMMY" />
+		<set name="target" val="TARGET_SELF" />
 	</skill>
 	<skill id="23022" levels="10" name="First Win">
 		<table name="#abnormalLvl"> 1 2 3 4 5 6 7 8 9 10 </table>

+ 18 - 11
L2J_DataPack_BETA/data/stats/skills/26000-26099.xml

@@ -239,33 +239,37 @@
 		</for>
 	</skill>
 	<skill id="26027" levels="6" name="Secret medicine of Will">
+		<!-- Confirmed CT2.5 -->
 		<!-- Level 1 doesn't exist in client. -->
 		<table name="#levelRange"> 0;0 20;39 40;51 52;60 61;75 76;85 </table>
 		<table name="#power"> 0 350 600 800 1000 1200 </table>
+		<set name="isPotion" val="true" />
 		<set name="itemConsumeCount" val="1" />
-		<set name="power" val="#power" />
-		<set name="target" val="TARGET_SELF" />
-		<set name="skillType" val="COMBATPOINTHEAL" />
+		<set name="magicLvl" val="1" />
 		<set name="operateType" val="OP_ACTIVE" />
+		<set name="power" val="#power" />
 		<set name="reuseDelay" val="600000" />
 		<set name="sharedReuse" val="2289-1" />
-		<set name="isPotion" val="true" />
+		<set name="skillType" val="COMBATPOINTHEAL" />
+		<set name="target" val="TARGET_SELF" />
 		<cond msgId="113" addName="1">
 			<player levelRange="#levelRange" />
 		</cond>
 	</skill>
 	<skill id="26028" levels="6" name="Secret medicine of Life">
+		<!-- Confirmed CT2.5 -->
 		<!-- Level 1 doesn't exist in client. -->
 		<table name="#levelRange"> 0;0 20;39 40;51 52;60 61;75 76;85 </table>
 		<table name="#power"> 0 650 1100 1500 1900 2300 </table>
+		<set name="isPotion" val="true" />
 		<set name="itemConsumeCount" val="1" />
-		<set name="power" val="#power" />
-		<set name="target" val="TARGET_SELF" />
-		<set name="skillType" val="HEAL_STATIC" />
+		<set name="magicLvl" val="1" />
 		<set name="operateType" val="OP_ACTIVE" />
+		<set name="power" val="#power" />
 		<set name="reuseDelay" val="600000" />
 		<set name="sharedReuse" val="2287-1" />
-		<set name="isPotion" val="true" />
+		<set name="skillType" val="HEAL_STATIC" />
+		<set name="target" val="TARGET_SELF" />
 		<cond msgId="113" addName="1">
 			<player levelRange="#levelRange" />
 		</cond>
@@ -279,10 +283,13 @@
 		<set name="isPotion" val="true" />
 	</skill>
 	<skill id="26030" levels="1" name="Healing medicine for Mana">
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
-		<set name="operateType" val="OP_PASSIVE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="1" />
+		<set name="operateType" val="OP_ACTIVE" />
+		<set name="power" val="60" />
 		<set name="reuseDelay" val="600000" />
+		<set name="skillType" val="MANAHEAL" />
+		<set name="target" val="TARGET_SELF" />
 	</skill>
 	<skill id="26031" levels="1" name="Wind Walk Scroll">
 		<set name="itemConsumeCount" val="1" />