Przeglądaj źródła

Some Fixes by Zoey76

'''BETA:'''
 * Added Agathion skills.
 * Retail element values and slot condition for new cloaks.
 * Descriptions fix.

'''BETA/STABLE:'''
 * Some skills using new Condition for level range.
 * Moved some conditions from items to skills.
MELERIX 14 lat temu
rodzic
commit
347a8cf2c2

+ 0 - 18
L2J_DataPack_BETA/data/stats/items/08500-08599.xml

@@ -1333,9 +1333,6 @@
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2286-1" />
-		<cond>
-			<player chaotic="False" />
-		</cond>
 	</item>
 	<item id="8595" type="EtcItem" name="Scroll: Recovery (Grade D)">
 		<set name="icon" val="icon.etc_penalty_recovery_i01" />
@@ -1349,9 +1346,6 @@
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2286-2" />
-		<cond>
-			<player chaotic="False" />
-		</cond>
 	</item>
 	<item id="8596" type="EtcItem" name="Scroll: Recovery (Grade C)">
 		<set name="icon" val="icon.etc_penalty_recovery_i02" />
@@ -1365,9 +1359,6 @@
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2286-3" />
-		<cond>
-			<player chaotic="False" />
-		</cond>
 	</item>
 	<item id="8597" type="EtcItem" name="Scroll: Recovery (Grade B)">
 		<set name="icon" val="icon.etc_penalty_recovery_i03" />
@@ -1381,9 +1372,6 @@
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2286-4" />
-		<cond>
-			<player chaotic="False" />
-		</cond>
 	</item>
 	<item id="8598" type="EtcItem" name="Scroll: Recovery (Grade A)">
 		<set name="icon" val="icon.etc_penalty_recovery_i04" />
@@ -1397,9 +1385,6 @@
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2286-5" />
-		<cond>
-			<player chaotic="False" />
-		</cond>
 	</item>
 	<item id="8599" type="EtcItem" name="Scroll: Recovery (Grade S)">
 		<set name="icon" val="icon.etc_penalty_recovery_i05" />
@@ -1413,8 +1398,5 @@
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2286-6" />
-		<cond>
-			<player chaotic="False" />
-		</cond>
 	</item>
 </list>

+ 6 - 0
L2J_DataPack_BETA/data/stats/items/17200-17299.xml

@@ -40,6 +40,8 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="8515-1;23236-1;23237-1" />
 	</item>
 	<item id="17204" type="Armor" name="Agathion Seal Bracelet - Ball Trapping Orodriel">
 		<!-- Description: Bracelet that summons a ball trapping Orodriel. It wears a red uniform. Cannot be exchanged or dropped. Cannot use a private store. Can be stored in a private warehouse. -->
@@ -51,6 +53,8 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="8516-1;23236-1;23237-1" />
 	</item>
 	<item id="17205" type="Armor" name="Agathion Seal Bracelet - Penalty Kick">
 		<!-- Description: Bracelet that summons a Gnosian and Orodriel who are practicing penalty kicks. All are wearing red uniforms. Cannot be exchanged or dropped. Cannot use a private store. Can be stored in a private warehouse. -->
@@ -62,6 +66,8 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="8517-1;23236-1;23237-1" />
 	</item>
 	<item id="17206" type="EtcItem" name="Nevit's Hourglass - 1 hour">
 		<!-- Description: Hourglass that increases Nevit's blessing time by 1 hour. Can be used regardless of level. Cannot be exchanged or dropped. -->

+ 8 - 0
L2J_DataPack_BETA/data/stats/items/21100-21199.xml

@@ -529,6 +529,8 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="21233-1;23234-1;23235-1" />
 	</item>
 	<item id="21153" type="Armor" name="Agathion Seal Bracelet - Singer &amp; Dancer - 7-day limited period">
 		<!-- Description: Bracelet that summons a Singer &amp; Dancer Agathion that gleefully sings and dances. Cannot be exchanged, dropped, or sold. Can be stored in a private warehouse. -->
@@ -540,6 +542,8 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="21233-1;23234-1;23235-1" />
 		<set name="time" val="10080" />
 	</item>
 	<item id="21154" type="EtcItem" name="Singer &amp; Dancer Agathion Pack">
@@ -666,6 +670,8 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="21234-1;23236-1;23237-1" />
 	</item>
 	<item id="21166" type="Armor" name="Agathion Seal Bracelet - Zaken's Spirit Swords - 7-day limited period">
 		<!-- Description: Bracelet that summons Zaken's Spirit Swords. Can be used for 7 days. Cannot be exchanged or dropped. -->
@@ -676,6 +682,8 @@
 		<set name="weight" val="150" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="21234-1;23236-1;23237-1" />
 		<set name="time" val="10080" />
 	</item>
 	<item id="21167" type="EtcItem" name="Zaken Spirit Sword Pack">

+ 42 - 0
L2J_DataPack_BETA/data/stats/items/21300-21399.xml

@@ -316,6 +316,8 @@
 		<set name="weight" val="120" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="8255-1;23252-1" />
 		<set name="time" val="10080" />
 	</item>
 	<item id="21332" type="Armor" name="Agathion Summon Bracelet - Griffin - 7-day limited period (event)">
@@ -328,6 +330,8 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="8255-1;23252-1" />
 		<set name="time" val="10080" />
 	</item>
 	<item id="21333" type="Armor" name="Agathion Summon Bracelet - Griffin - 30-day limited period">
@@ -339,6 +343,8 @@
 		<set name="weight" val="120" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="8255-1;23252-1" />
 		<set name="time" val="43200" />
 	</item>
 	<item id="21334" type="Armor" name="Agathion Summon Bracelet - Griffin - 30-day limited period (event)">
@@ -351,6 +357,8 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="8255-1;23252-1" />
 		<set name="time" val="43200" />
 	</item>
 	<item id="21335" type="Armor" name="Agathion Summon Bracelet - Griffin">
@@ -363,6 +371,8 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="8255-1;23252-1" />
 	</item>
 	<item id="21336" type="Armor" name="Agathion Summon Bracelet - Griffin - Event">
 		<!-- Description: Dimensional item. Can summon a Griffin Agathion when equipped. Cannot be exchanged, dropped, or destroyed. Can be shared between characters within an account through the Dimensional Merchant. Can be stored in a private warehouse. -->
@@ -375,6 +385,8 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="8255-1;23252-1" />
 	</item>
 	<item id="21337" type="EtcItem" name="Cow Agathion 7-Day Pack">
 		<!-- Description: Dimensional item pack. Gift box containing 1 Cow Agathion Summon Bracelet (7 day). Cannot be exchanged or dropped. Can be shared between characters within an account through the Dimensional Merchant. Can be stored in a private warehouse. -->
@@ -432,6 +444,8 @@
 		<set name="is_destroyable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="unequip_skill" val="3267-1" />
+		<!-- set name="item_skill" val="" /-->
 	</item>
 	<item id="21343" type="Armor" name="Agathion Summon Bracelet - Cow - 7-day limited period">
 		<!-- Description: Dimensional item. Can summon a Cow Agathion when equipped. Can be used for 7 days. Cannot be exchanged or dropped. Can be stored in a private warehouse. -->
@@ -442,6 +456,8 @@
 		<set name="weight" val="120" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<!-- set name="item_skill" val="" /-->
 		<set name="time" val="10080" />
 	</item>
 	<item id="21344" type="Armor" name="Agathion Summon Bracelet - Cow - 7-day limited period (event)">
@@ -454,6 +470,8 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<!-- set name="item_skill" val="" /-->
 		<set name="time" val="10080" />
 	</item>
 	<item id="21345" type="Armor" name="Agathion Summon Bracelet - Cow - 30-day limited period">
@@ -465,6 +483,8 @@
 		<set name="weight" val="120" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<!-- set name="item_skill" val="" /-->
 		<set name="time" val="43200" />
 	</item>
 	<item id="21346" type="Armor" name="Agathion Summon Bracelet - Cow - 30-day limited period (event)">
@@ -477,6 +497,8 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<!-- set name="item_skill" val="" /-->
 		<set name="time" val="43200" />
 	</item>
 	<item id="21347" type="Armor" name="Agathion Summon Bracelet - Cow">
@@ -489,6 +511,8 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="unequip_skill" val="3267-1" />
+		<!-- set name="item_skill" val="" /-->
 	</item>
 	<item id="21348" type="Armor" name="Agathion Summon Bracelet - Cow - Event">
 		<!-- Description: Dimensional item. Can summon a Cow Agathion when equipped. Cannot be exchanged, dropped, or destroyed. Can be shared between characters within an account through the Dimensional Merchant. Can be stored in a private warehouse. -->
@@ -501,6 +525,8 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="unequip_skill" val="3267-1" />
+		<!-- set name="item_skill" val="" /-->
 	</item>
 	<item id="21349" type="EtcItem" name="Tow Agathion 7-Day Pack">
 		<!-- Description: Dimensional item pack. Gift box containing 1 Tow Agathion Summon Bracelet (7 day). Cannot be exchanged or dropped. Can be shared between characters within an account through the Dimensional Merchant. Can be stored in a private warehouse. -->
@@ -548,6 +574,8 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="21248-1;23251-1" />
 	</item>
 	<item id="21354" type="EtcItem" name="Tow Agathion Pack - Event">
 		<!-- Description: Dimensional item pack. Gift box containing 1 Tow Agathion Summon Bracelet. Cannot be exchanged, dropped, or destroyed. Can be shared between characters within an account through the Dimensional Merchant. Can be stored in a private warehouse. -->
@@ -558,6 +586,8 @@
 		<set name="is_destroyable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="21248-1;23251-1" />
 	</item>
 	<item id="21355" type="Armor" name="Agathion Summon Bracelet - Tow - 7-day limited period">
 		<!-- Description: Dimensional item. Can summon a Tow Agathion when equipped. Can be used for 7 days. Cannot be exchanged or dropped. Can be stored in a private warehouse. -->
@@ -568,6 +598,8 @@
 		<set name="weight" val="120" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="23251-1" /> <!-- Missing Release Agathion skill. -->
 		<set name="time" val="10080" />
 	</item>
 	<item id="21356" type="Armor" name="Agathion Summon Bracelet - Tow - 7-day limited period (event)">
@@ -580,6 +612,8 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="23251-1" /> <!-- Missing Release Agathion skill. -->
 		<set name="time" val="10080" />
 	</item>
 	<item id="21357" type="Armor" name="Agathion Summon Bracelet - Tow - 30-day limited period">
@@ -591,6 +625,8 @@
 		<set name="weight" val="120" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="23251-1" /> <!-- Missing Release Agathion skill. -->
 		<set name="time" val="43200" />
 	</item>
 	<item id="21358" type="Armor" name="Agathion Summon Bracelet - Tow - 30-day limited period (event)">
@@ -603,6 +639,8 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="23251-1" /> <!-- Missing Release Agathion skill. -->
 		<set name="time" val="43200" />
 	</item>
 	<item id="21359" type="Armor" name="Agathion Summon Bracelet - Tow">
@@ -615,6 +653,8 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="23251-1" /> <!-- Missing Release Agathion skill. -->
 	</item>
 	<item id="21360" type="Armor" name="Agathion Summon Bracelet - Tow - Event">
 		<!-- Description: Dimensional item. Can summon a Tow Agathion when equipped. Cannot be exchanged, dropped, or destroyed. Can be shared between characters within an account through the Dimensional Merchant. Can be stored in a private warehouse. -->
@@ -627,6 +667,8 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="23251-1" /> <!-- Missing Release Agathion skill. -->
 	</item>
 	<item id="21361" type="EtcItem" name="Aqua Elf Transformation Harp 7-Day Pack">
 		<!-- Description: Dimensional item pack. Gift box containing 1 aqua Elf transformation harp (7 day). Cannot be exchanged or dropped. Can be shared between characters within an account through the Dimensional Merchant. Can be stored in a private warehouse. -->

+ 20 - 5
L2J_DataPack_BETA/data/stats/items/21500-21599.xml

@@ -874,7 +874,7 @@
 		</for>
 	</item>
 	<item id="21581" type="EtcItem" name="Olf's T-shirt Enchant Scroll">
-		<!-- Description: Enchant scroll exclusive to Olf's T-shirt.. Increases the T-shirt's P. Def. and M. Def. by 1. Starting from +4, increases P. Def. by 3. Can safely enchant to +3 and up to a max +10. From +4, "basic abilities (CON, MEN, STR, INT, DEX, WIT)" are raised in stages. Addtional options are added at +5, +7, +8 and +9. Cannot be dropped. Can be stored in a private warehouse. -->
+		<!-- Description: Enchant scroll exclusive to Olf's T-shirt. Increases the T-shirt's P. Def. and M. Def. by 1. Starting from +4, increases P. Def. by 3. Can safely enchant to +3 and up to a max +10. From +4, "basic abilities (CON, MEN, STR, INT, DEX, WIT)" are raised in stages. Addtional options are added at +5, +7, +8 and +9. Cannot be dropped. Can be stored in a private warehouse. -->
 		<set name="icon" val="BranchSys2.icon.etc_scroll_of_enchant_shirt_i01" />
 		<set name="material" val="paper" />
 		<set name="weight" val="120" />
@@ -882,7 +882,7 @@
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="21582" type="EtcItem" name="Blessed Olf's T-shirt Enchant Scroll">
-		<!-- Description: Dimensional item. Enchant scroll exclusive to Olf's T-shirt.. Increases the T-shirt's P. Def. and M. Def. by 1. Starting from +4, increases P. Def. by 3. Can safely enchant to +3 and up to a max +10. From +4, "basic abilities (CON, MEN, STR, INT, DEX, WIT)" are raised in stages. Additional options are added at +5, +7, +8 and +9. If the enchant fails, the existing enchant value becomes 0. Cannot be dropped. Can be stored in a private warehouse. -->
+		<!-- Description: Dimensional item. Enchant scroll exclusive to Olf's T-shirt. Increases the T-shirt's P. Def. and M. Def. by 1. Starting from +4, increases P. Def. by 3. Can safely enchant to +3 and up to a max +10. From +4, "basic abilities (CON, MEN, STR, INT, DEX, WIT)" are raised in stages. Additional options are added at +5, +7, +8 and +9. If the enchant fails, the existing enchant value becomes 0. Cannot be dropped. Can be stored in a private warehouse. -->
 		<set name="icon" val="BranchSys2.icon.etc_scroll_of_enchant_shirt_i00" />
 		<set name="material" val="paper" />
 		<set name="weight" val="120" />
@@ -890,7 +890,7 @@
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="21583" type="Armor" name="7th Anniversary Cloak - Pitch Black">
-		<!-- Description: Dimensional Item. Lineage II 7th Anniversary commemorative item.. When an armor set above the Dynasty level is worn, the Sealed Cloak Slot will be open so that the cloak can be equipped. Enchanting, attribute enhancing, or augmenting are not possible. Cannot be exchanged, dropped or destroyed. -->
+		<!-- Description: Dimensional Item. Lineage II 7th Anniversary commemorative item. When an armor set above the Dynasty level is worn, the Sealed Cloak Slot will be open so that the cloak can be equipped. Enchanting, attribute enhancing, or augmenting are not possible. Cannot be exchanged, dropped or destroyed. -->
 		<set name="icon" val="BranchSys2.Icon.7anni_cloack_i00" />
 		<set name="default_action" val="equip" />
 		<set name="bodypart" val="back" />
@@ -899,6 +899,9 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
+		<cond msgId="2453">
+			<player cloakStatus="1" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="25" />
 		</for>
@@ -923,6 +926,9 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
 		<set name="is_freightable" val="true" />
+		<cond msgId="2453">
+			<player cloakStatus="1" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="25" />
 		</for>
@@ -938,7 +944,7 @@
 		<set name="is_freightable" val="true" />
 	</item>
 	<item id="21587" type="Armor" name="7th Anniversary Cloak - Blood Red">
-		<!-- Description: Dimensional Item. Lineage II 7th anniversary commemorative item.. Cloak for the true heroes who have made history since the beginning of Lineage II. When an armor set above the Dynasty level is worn, the Sealed Cloak Slot will be open so that the cloak can be equipped. Enchanting, attribute enhancing, or augmenting are not possible. Cannot be exchanged, dropped, or destroyed. Can be shared between characters on the same account through the Dimensional Merchant. -->
+		<!-- Description: Dimensional Item. Lineage II 7th anniversary commemorative item. Cloak for the true heroes who have made history since the beginning of Lineage II. When an armor set above the Dynasty level is worn, the Sealed Cloak Slot will be open so that the cloak can be equipped. Enchanting, attribute enhancing, or augmenting are not possible. Cannot be exchanged, dropped, or destroyed. Can be shared between characters on the same account through the Dimensional Merchant. -->
 		<set name="icon" val="BranchSys2.Icon.7anni_cloack_i01" />
 		<set name="default_action" val="equip" />
 		<set name="bodypart" val="back" />
@@ -947,12 +953,15 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
+		<cond msgId="2453">
+			<player cloakStatus="1" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="25" />
 		</for>
 	</item>
 	<item id="21588" type="Armor" name="7th Anniversary Cloak - Pearl White">
-		<!-- Description: Dimensional Item. Lineage II 7th Anniversary commemorative item.. When an armor set above the Dynasty level is worn, the Sealed Cloak Slot will be open so that the cloak can be equipped. Enchanting, attribute enhancing, or augmenting are not possible. Cannot be exchanged, dropped or destroyed. Can be shared between characters on the same account through the Dimensional Merchant. -->
+		<!-- Description: Dimensional Item. Lineage II 7th Anniversary commemorative item. When an armor set above the Dynasty level is worn, the Sealed Cloak Slot will be open so that the cloak can be equipped. Enchanting, attribute enhancing, or augmenting are not possible. Cannot be exchanged, dropped or destroyed. Can be shared between characters on the same account through the Dimensional Merchant. -->
 		<set name="icon" val="BranchSys2.Icon.7anni_cloack_i02" />
 		<set name="default_action" val="equip" />
 		<set name="bodypart" val="back" />
@@ -961,6 +970,9 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
+		<cond msgId="2453">
+			<player cloakStatus="1" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="25" />
 		</for>
@@ -985,6 +997,9 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
 		<set name="is_freightable" val="true" />
+		<cond msgId="2453">
+			<player cloakStatus="1" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="25" />
 		</for>

+ 50 - 10
L2J_DataPack_BETA/data/stats/items/21700-21799.xml

@@ -65,7 +65,7 @@
 		</for>
 	</item>
 	<item id="21707" type="EtcItem" name="Blessed Olf's T-shirt Enchant Scroll - Event">
-		<!-- Description: Dimensional item. Enchant scroll exclusive to Olf's T-shirt.. Increases the T-shirt's P. Def. and M. Def. by 1. Starting from +4, increases P. Def. by 3. Can safely enchant to +3 and up to a max +10. From +4, "basic abilities (CON, MEN, STR, INT, DEX, WIT)" are raised in stages. Special skills are added at +5, +7, +8 and +9. If the enchant fails, the existing enchant value becomes 0. Cannot be dropped. Can be stored in a private warehouse. -->
+		<!-- Description: Dimensional item. Enchant scroll exclusive to Olf's T-shirt. Increases the T-shirt's P. Def. and M. Def. by 1. Starting from +4, increases P. Def. by 3. Can safely enchant to +3 and up to a max +10. From +4, "basic abilities (CON, MEN, STR, INT, DEX, WIT)" are raised in stages. Special skills are added at +5, +7, +8 and +9. If the enchant fails, the existing enchant value becomes 0. Cannot be dropped. Can be stored in a private warehouse. -->
 		<set name="icon" val="BranchSys2.icon.etc_scroll_of_enchant_shirt_i00" />
 		<set name="material" val="paper" />
 		<set name="weight" val="120" />
@@ -156,7 +156,12 @@
 			<player cloakStatus="1" />
 		</cond>
 		<for>
-			<add order="0x40" stat="darkRes" val="30" /> <!-- Guess. -->
+			<add order="0x40" stat="darkRes" val="15" />
+			<add order="0x40" stat="earthRes" val="5" />
+			<add order="0x40" stat="fireRes" val="5" />
+			<add order="0x40" stat="holyRes" val="5" />
+			<add order="0x40" stat="waterRes" val="15" />
+			<add order="0x40" stat="windRes" val="15" />
 			<add order="0x10" stat="pDef" val="20" />
 		</for>
 	</item>
@@ -173,7 +178,12 @@
 			<player cloakStatus="1" />
 		</cond>
 		<for>
-			<add order="0x40" stat="darkRes" val="30" /> <!-- Guess. -->
+			<add order="0x40" stat="darkRes" val="10" />
+			<add order="0x40" stat="earthRes" val="10" />
+			<add order="0x40" stat="fireRes" val="10" />
+			<add order="0x40" stat="holyRes" val="20" />
+			<add order="0x40" stat="waterRes" val="20" />
+			<add order="0x40" stat="windRes" val="20" />
 			<add order="0x10" stat="pDef" val="30" />
 		</for>
 	</item>
@@ -190,7 +200,12 @@
 			<player cloakStatus="1" />
 		</cond>
 		<for>
-			<add order="0x40" stat="darkRes" val="30" /> <!-- Guess. -->
+			<add order="0x40" stat="darkRes" val="15" />
+			<add order="0x40" stat="earthRes" val="15" />
+			<add order="0x40" stat="fireRes" val="15" />
+			<add order="0x40" stat="holyRes" val="5" />
+			<add order="0x40" stat="waterRes" val="5" />
+			<add order="0x40" stat="windRes" val="5" />
 			<add order="0x10" stat="pDef" val="20" />
 		</for>
 	</item>
@@ -207,7 +222,12 @@
 			<player cloakStatus="1" />
 		</cond>
 		<for>
-			<add order="0x40" stat="darkRes" val="30" /> <!-- Guess. -->
+			<add order="0x40" stat="darkRes" val="10" />
+			<add order="0x40" stat="earthRes" val="5" />
+			<add order="0x40" stat="fireRes" val="5" />
+			<add order="0x40" stat="holyRes" val="5" />
+			<add order="0x40" stat="waterRes" val="10" />
+			<add order="0x40" stat="windRes" val="10" />
 			<add order="0x10" stat="pDef" val="40" />
 		</for>
 	</item>
@@ -224,7 +244,12 @@
 			<player cloakStatus="1" />
 		</cond>
 		<for>
-			<add order="0x40" stat="darkRes" val="30" /> <!-- Guess. -->
+			<add order="0x40" stat="darkRes" val="5" />
+			<add order="0x40" stat="earthRes" val="5" />
+			<add order="0x40" stat="fireRes" val="5" />
+			<add order="0x40" stat="holyRes" val="15" />
+			<add order="0x40" stat="waterRes" val="15" />
+			<add order="0x40" stat="windRes" val="15" />
 			<add order="0x10" stat="pDef" val="60" />
 		</for>
 	</item>
@@ -241,7 +266,12 @@
 			<player cloakStatus="1" />
 		</cond>
 		<for>
-			<add order="0x40" stat="darkRes" val="30" /> <!-- Guess. -->
+			<add order="0x40" stat="darkRes" val="10" />
+			<add order="0x40" stat="earthRes" val="10" />
+			<add order="0x40" stat="fireRes" val="10" />
+			<add order="0x40" stat="holyRes" val="5" />
+			<add order="0x40" stat="waterRes" val="5" />
+			<add order="0x40" stat="windRes" val="5" />
 			<add order="0x10" stat="pDef" val="40" />
 		</for>
 	</item>
@@ -280,27 +310,35 @@
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="21727" type="Armor" name="Zinenze Agathion Bracelet (3 day) - 3-day limited period">
-		<!-- Description: Bracelet skill that let's you summon Zinenze for 3 days.. Upon using the skill name, instantly recovers Exp, HP, MP, and CP, and makes you invincible for 5 seconds. (But can only be used when HP is below 30%.). Cool time is 12 hour(s).. Can be stored in a private warehouse. But cannot be exchange, dropped, or sold in shops. -->
+		<!-- Description: Bracelet skill that let's you summon Zinenze for 3 days. Upon using the skill name, instantly recovers Exp, HP, MP, and CP, and makes you invincible for 5 seconds. (But can only be used when HP is below 30%.). Cool time is 12 hour(s). Can be stored in a private warehouse. But cannot be exchange, dropped, or sold in shops. -->
 		<set name="icon" val="BranchSys2.Icon.br_aga_jinjiayan_i00" />
 		<set name="default_action" val="equip" />
 		<set name="bodypart" val="lbracelet" />
 		<set name="material" val="silver" />
 		<set name="weight" val="120" />
+		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="21248-1;23305-1;23306-1" />
 		<set name="time" val="4320" />
 	</item>
 	<item id="21728" type="Armor" name="Zinenze Agathion Bracelet (7 day) - 7-day limited period">
-		<!-- Description: Bracelet skill that let's you summon Zinenze for 3 days.. Upon using the skill name, instantly recovers Exp, HP, MP, and CP, and makes you invincible for 5 seconds. (But can only be used when HP is below 31%.). Cool time is 12 hour(s).. Can be stored in a private warehouse. But cannot be exchange, dropped, or sold in shops. -->
+		<!-- Description: Bracelet skill that let's you summon Zinenze for 3 days. Upon using the skill name, instantly recovers Exp, HP, MP, and CP, and makes you invincible for 5 seconds. (But can only be used when HP is below 31%.). Cool time is 12 hour(s). Can be stored in a private warehouse. But cannot be exchange, dropped, or sold in shops. -->
 		<set name="icon" val="BranchSys2.Icon.br_aga_jinjiayan_i00" />
 		<set name="default_action" val="equip" />
 		<set name="bodypart" val="lbracelet" />
 		<set name="material" val="silver" />
 		<set name="weight" val="120" />
+		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="21248-1;23305-1;23306-1" />
 		<set name="time" val="10080" />
 	</item>
 	<item id="21729" type="Armor" name="Enze Agathion Bracelet - Permanent">
-		<!-- Description: Enze Agathion. Upon skill use, transforms into an Enze fairy. Can stay as an Enze fairy for 10 minutes. Cool time is 5 hours.. Can be traded, sold at a private store, and stored in a private warehouse. But cannot be dropped or sold at a shop. -->
+		<!-- Description: Enze Agathion. Upon skill use, transforms into an Enze fairy. Can stay as an Enze fairy for 10 minutes. Cool time is 5 hours. Can be traded, sold at a private store, and stored in a private warehouse. But cannot be dropped or sold at a shop. -->
 		<set name="icon" val="BranchSys2.Icon.br_aga_jiayan_i00" />
 		<set name="default_action" val="equip" />
 		<set name="bodypart" val="lbracelet" />
@@ -308,6 +346,8 @@
 		<set name="weight" val="120" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="21249-1;23307-1" />
 	</item>
 	<item id="21730" type="EtcItem" name="Letter Collector's Gift - Event">
 		<!-- Description: 7th Anniversary. Letter Collector's Gift. Upon use, for 2 hours, increases Atk. Spd. +15%, Casting Spd. +15%, Speed +20, and changes the appearance of the equipped weapon and armor to look like items from the past. Reuse time is 60 minutes. -->

+ 4 - 2
L2J_DataPack_BETA/data/stats/items/21800-21899.xml

@@ -529,7 +529,7 @@
 		</for>
 	</item>
 	<item id="21831" type="Weapon" name="Laevateinn of Fortune - 90-day limited period">
-		<!-- Description: Kamael exclusive weapon. Increases Critical by 84. Increases damage inflicted during PvP.. During Critical, party members including yourself will receive increased attack power, magic power, and healing capacity by a fixed rate. But decreased MP consumption per skill during a critical attack. Cannot be exchanged or dropped. Can be stored in a private warehouse. Can be assigned an attribute. -->
+		<!-- Description: Kamael exclusive weapon. Increases Critical by 84. Increases damage inflicted during PvP. During Critical, party members including yourself will receive increased attack power, magic power, and healing capacity by a fixed rate. But decreased MP consumption per skill during a critical attack. Cannot be exchanged or dropped. Can be stored in a private warehouse. Can be assigned an attribute. -->
 		<set name="icon" val="icon.weapon_leavatein_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="rapier" />
@@ -804,7 +804,7 @@
 		</for>
 	</item>
 	<item id="21843" type="Weapon" name="Dynasty Rapier of Fortune - 90-day limited period">
-		<!-- Description: Kamael exclusive weapon. Increases Critical by 111. Increases damage inflicted during PvP.. During Critical, party members including yourself will receive increased attack power, magic power, and healing capacity by a fixed rate. But decreased MP consumption per skill during a critical attack. Cannot be exchanged or dropped. Can be stored in a private warehouse. Can be assigned an attribute. -->
+		<!-- Description: Kamael exclusive weapon. Increases Critical by 111. Increases damage inflicted during PvP. During Critical, party members including yourself will receive increased attack power, magic power, and healing capacity by a fixed rate. But decreased MP consumption per skill during a critical attack. Cannot be exchanged or dropped. Can be stored in a private warehouse. Can be assigned an attribute. -->
 		<set name="icon" val="icon.weapon_dynasty_rapier_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="rapier" />
@@ -1067,6 +1067,8 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="8314-1;6124-1" />
 	</item>
 	<item id="21871" type="EtcItem" name="Hero Assistance Package">
 		<!-- Description: A coupon for an item set that helps a hero to grow stronger. Bestows an Equipment Set 7-Day Pak, a Button-Eyed Bear Doll Agathion 7-Day Pack, a Quick Healing Potion, and a Steam Beatle Mount Bracelet 7-Day Pack. Cannot be exchanged or dropped. Can be stored in a private warehouse. -->

+ 30 - 28
L2J_DataPack_BETA/data/stats/items/21900-21999.xml

@@ -310,7 +310,7 @@
 		</for>
 	</item>
 	<item id="21927" type="Weapon" name="Hellblade - Lightning">
-		<!-- Description: Masterwork Item than increases the critical rate.. Sword used by Darion. Bestows a special power upon the wielder. Bestows one of the following functions: Haste, Focus, or Health. -->
+		<!-- Description: Masterwork Item than increases the critical rate. Sword used by Darion. Bestows a special power upon the wielder. Bestows one of the following functions: Haste, Focus, or Health. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_Caladbulg_i00" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="sword" />
@@ -333,7 +333,7 @@
 		</for>
 	</item>
 	<item id="21928" type="Weapon" name="Hellblade - Lightning - Haste">
-		<!-- Description: Masterwork Item that increases the critical attack rate.. (Soul Crystal Enhancement). Sword used by Darion. Bestows a special power upon the wielder. Increases Atk. Spd. by about 11%. Increases damage inflicted during PvP. -->
+		<!-- Description: Masterwork Item that increases the critical attack rate. (Soul Crystal Enhancement). Sword used by Darion. Bestows a special power upon the wielder. Increases Atk. Spd. by about 11%. Increases damage inflicted during PvP. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_Caladbulg_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="sword" />
@@ -356,7 +356,7 @@
 		</for>
 	</item>
 	<item id="21929" type="Weapon" name="Hellblade - Lightning - Health">
-		<!-- Description: Masterwork Item that increases the critical attack rate.. (Soul Crystal Enhancement). Sword used by Darion. Bestows a special power upon the wielder. Increases Max HP by 25%. Increases damage inflicted during PvP. -->
+		<!-- Description: Masterwork Item that increases the critical attack rate. (Soul Crystal Enhancement). Sword used by Darion. Bestows a special power upon the wielder. Increases Max HP by 25%. Increases damage inflicted during PvP. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_Caladbulg_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="sword" />
@@ -379,7 +379,7 @@
 		</for>
 	</item>
 	<item id="21930" type="Weapon" name="Hellblade - Lightning - Focus">
-		<!-- Description: Masterwork Item that increases the critical attack rate.. (Soul Crystal Enhancement). Sword used by Darion. Bestows a special power upon the wielder. Increases Critical by 131. Increases damage inflicted during PvP. -->
+		<!-- Description: Masterwork Item that increases the critical attack rate. (Soul Crystal Enhancement). Sword used by Darion. Bestows a special power upon the wielder. Increases Critical by 131. Increases damage inflicted during PvP. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_Caladbulg_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="sword" />
@@ -402,7 +402,7 @@
 		</for>
 	</item>
 	<item id="21931" type="Weapon" name="Hellblade - Lightning {PvP}">
-		<!-- Description: Masterwork Item than increases the critical rate.. Sword used by Darion. Bestows a special power upon the wielder. Bestows one of the following functions: Haste, Focus, or Health. Increases damage inflicted during PvP. Improves the chance of CP recovery during an attack. -->
+		<!-- Description: Masterwork Item than increases the critical rate. Sword used by Darion. Bestows a special power upon the wielder. Bestows one of the following functions: Haste, Focus, or Health. Increases damage inflicted during PvP. Improves the chance of CP recovery during an attack. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_Caladbulg_i00" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="sword" />
@@ -542,7 +542,7 @@
 		</for>
 	</item>
 	<item id="21937" type="Weapon" name="Butcher Blades - Confusion">
-		<!-- Description: Masterwork Item that raises evasion.. Dagger dualsword used by Doll Blader. Bestows a special power upon the wielder. Increases P. Atk. more than that for regular one-handed swords when enchanted. Can be equipped by Dagger Masters above level 81. -->
+		<!-- Description: Masterwork Item that raises evasion. Dagger dualsword used by Doll Blader. Bestows a special power upon the wielder. Increases P. Atk. more than that for regular one-handed swords when enchanted. Can be equipped by Dagger Masters above level 81. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_habus_knife_i00" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="dualdagger" />
@@ -566,7 +566,7 @@
 		</for>
 	</item>
 	<item id="21938" type="Weapon" name="Butcher Blades - Confusion {PvP}">
-		<!-- Description: Masterwork Item that raises evasion.. Dagger dualsword used by Doll Blader. Bestows a special power upon the wielder. Increases P. Atk. more than that for regular one-handed swords when enchanted. Increases damage inflicted during PvP, during an attack, cancels a target's enhanced status by more than 1 at a fixed rate, or decreases a target's shield P. Def. Can be equipped by Dagger Masters above level 81. -->
+		<!-- Description: Masterwork Item that raises evasion. Dagger dualsword used by Doll Blader. Bestows a special power upon the wielder. Increases P. Atk. more than that for regular one-handed swords when enchanted. Increases damage inflicted during PvP, during an attack, cancels a target's enhanced status by more than 1 at a fixed rate, or decreases a target's shield P. Def. Can be equipped by Dagger Masters above level 81. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_habus_knife_i00" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="dualdagger" />
@@ -782,7 +782,7 @@
 		</for>
 	</item>
 	<item id="21947" type="Weapon" name="Claw of Destruction - Landslide">
-		<!-- Description: Masterwork Item that has the stun effect at a fixed rate when striking.. Blunt weapon used by Tiat. Bestows a special power upon the wielder. Bestows one of the following functions: HP Regeneration, HP Drain, or Health. -->
+		<!-- Description: Masterwork Item that has the stun effect at a fixed rate when striking. Blunt weapon used by Tiat. Bestows a special power upon the wielder. Bestows one of the following functions: HP Regeneration, HP Drain, or Health. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_tiatenon_i00" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="blunt" />
@@ -806,7 +806,7 @@
 		</for>
 	</item>
 	<item id="21948" type="Weapon" name="Claw of Destruction - Landslide - HP Drain">
-		<!-- Description: Masterwork Item that has the stun effect at a fixed rate when striking.. (Soul Crystal Enhancement). Blunt weapon used by Tiat. Bestows a special power upon the wielder. Recovers 4% of melee damage inflicted upon the enemy to your own HP. Increases damage inflicted during PvP. -->
+		<!-- Description: Masterwork Item that has the stun effect at a fixed rate when striking. (Soul Crystal Enhancement). Blunt weapon used by Tiat. Bestows a special power upon the wielder. Recovers 4% of melee damage inflicted upon the enemy to your own HP. Increases damage inflicted during PvP. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_tiatenon_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="blunt" />
@@ -830,7 +830,7 @@
 		</for>
 	</item>
 	<item id="21949" type="Weapon" name="Claw of Destruction - Landslide - Health">
-		<!-- Description: Masterwork Item that has the stun effect at a fixed rate when striking.. (Soul Crystal Enhancement). Blunt weapon used by Tiat. Bestows a special power upon the wielder. Increases Max HP by 25%. Increases damage inflicted during PvP. -->
+		<!-- Description: Masterwork Item that has the stun effect at a fixed rate when striking. (Soul Crystal Enhancement). Blunt weapon used by Tiat. Bestows a special power upon the wielder. Increases Max HP by 25%. Increases damage inflicted during PvP. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_tiatenon_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="blunt" />
@@ -854,7 +854,7 @@
 		</for>
 	</item>
 	<item id="21950" type="Weapon" name="Claw of Destruction - Landslide - HP Regeneration">
-		<!-- Description: Masterwork Item that has the stun effect at a fixed rate when striking.. (Soul Crystal Enhancement). Blunt weapon used by Tiat. Bestows a special power upon the wielder. Increases HP recovery rate. Increases damage inflicted during PvP. -->
+		<!-- Description: Masterwork Item that has the stun effect at a fixed rate when striking. (Soul Crystal Enhancement). Blunt weapon used by Tiat. Bestows a special power upon the wielder. Increases HP recovery rate. Increases damage inflicted during PvP. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_tiatenon_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="blunt" />
@@ -878,7 +878,7 @@
 		</for>
 	</item>
 	<item id="21951" type="Weapon" name="Claw of Destruction - Landslide {PvP}">
-		<!-- Description: Masterwork Item that has the stun effect at a fixed rate when striking.. Blunt weapon used by Tiat. Bestows a special power upon the wielder. Bestows one of the following functions: HP Regeneration, HP Drain, or Health. Increases damage inflicted during PvP. Improves the chance of CP recovery during an attack. -->
+		<!-- Description: Masterwork Item that has the stun effect at a fixed rate when striking. Blunt weapon used by Tiat. Bestows a special power upon the wielder. Bestows one of the following functions: HP Regeneration, HP Drain, or Health. Increases damage inflicted during PvP. Improves the chance of CP recovery during an attack. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_tiatenon_i00" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="blunt" />
@@ -902,7 +902,7 @@
 		</for>
 	</item>
 	<item id="21952" type="Weapon" name="Claw of Destruction - Landslide {PvP} - HP Drain">
-		<!-- Description: Masterwork Item that has the stun effect at a fixed rate when striking.. (Soul Crystal Enhancement). Blunt weapon used by Tiat. Bestows a special power upon the wielder. Recovers 4% of melee damage inflicted upon the enemy to your own HP. Increases damage inflicted during PvP. Improves the chance of CP recovery during an attack. -->
+		<!-- Description: Masterwork Item that has the stun effect at a fixed rate when striking. (Soul Crystal Enhancement). Blunt weapon used by Tiat. Bestows a special power upon the wielder. Recovers 4% of melee damage inflicted upon the enemy to your own HP. Increases damage inflicted during PvP. Improves the chance of CP recovery during an attack. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_tiatenon_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="blunt" />
@@ -926,7 +926,7 @@
 		</for>
 	</item>
 	<item id="21953" type="Weapon" name="Claw of Destruction - Landslide {PvP} - Health">
-		<!-- Description: Masterwork Item that has the stun effect at a fixed rate when striking.. (Soul Crystal Enhancement). Blunt weapon used by Tiat. Bestows a special power upon the wielder. Increases Max HP by 25%. Increases damage inflicted during PvP and has a chance of recovering CP during an attack. -->
+		<!-- Description: Masterwork Item that has the stun effect at a fixed rate when striking. (Soul Crystal Enhancement). Blunt weapon used by Tiat. Bestows a special power upon the wielder. Increases Max HP by 25%. Increases damage inflicted during PvP and has a chance of recovering CP during an attack. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_tiatenon_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="blunt" />
@@ -950,7 +950,7 @@
 		</for>
 	</item>
 	<item id="21954" type="Weapon" name="Claw of Destruction - Landslide {PvP} - HP Regeneration">
-		<!-- Description: Masterwork Item that has the stun effect at a fixed rate when striking.. (Soul Crystal Enhancement). Blunt weapon used by Tiat. Bestows a special power upon the wielder. Increases HP recovery rate. Increases damage inflicted during PvP and has a chance of recovering CP during an attack. -->
+		<!-- Description: Masterwork Item that has the stun effect at a fixed rate when striking. (Soul Crystal Enhancement). Blunt weapon used by Tiat. Bestows a special power upon the wielder. Increases HP recovery rate. Increases damage inflicted during PvP and has a chance of recovering CP during an attack. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_tiatenon_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="blunt" />
@@ -1020,7 +1020,7 @@
 		</for>
 	</item>
 	<item id="21957" type="Weapon" name="Blades of Delusion - Earth">
-		<!-- Description: Masterwork Item than increases Max HP.. Dualsword used by Aenkinel. Bestows a special power upon the wielder. When enchanted, P. Atk. of dual-swords, two-handed swords, two-handed blunt weapons and fist weapons will increase more than that of one-handed swords. When enchanted to 4 or more, increases Critical Damage by 109, and Increases Max HP by 10%. Increases the damage inflicted during PvP. -->
+		<!-- Description: Masterwork Item than increases Max HP. Dualsword used by Aenkinel. Bestows a special power upon the wielder. When enchanted, P. Atk. of dual-swords, two-handed swords, two-handed blunt weapons and fist weapons will increase more than that of one-handed swords. When enchanted to 4 or more, increases Critical Damage by 109, and Increases Max HP by 10%. Increases the damage inflicted during PvP. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_astarot_i00" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="dual" />
@@ -1043,7 +1043,7 @@
 		</for>
 	</item>
 	<item id="21958" type="Weapon" name="Blades of Delusion - Earth {PvP}">
-		<!-- Description: Masterwork Item than increases Max HP.. Dualsword used by Aenkinel. Bestows a special power upon the wielder. When enchanted, increases P. Atk. of a dualsword, two-handed sword, two-handed blunt weapon and fist weapon more significantly than that of a one-handed sword. When enchanted to 4 or more, increases Critical Damage by 109 and Increases Max HP by 10%. Increases damage inflicted during PvP, and has a chance of increasing Atk. Spd. of bows/crossbows during an attack. -->
+		<!-- Description: Masterwork Item than increases Max HP. Dualsword used by Aenkinel. Bestows a special power upon the wielder. When enchanted, increases P. Atk. of a dualsword, two-handed sword, two-handed blunt weapon and fist weapon more significantly than that of a one-handed sword. When enchanted to 4 or more, increases Critical Damage by 109 and Increases Max HP by 10%. Increases damage inflicted during PvP, and has a chance of increasing Atk. Spd. of bows/crossbows during an attack. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_astarot_i00" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="dual" />
@@ -1227,7 +1227,7 @@
 		</for>
 	</item>
 	<item id="21966" type="Weapon" name="Blood Brother - Great Gale">
-		<!-- Description: Masterwork Item than increases Atk. Spd.. Two-handed sword used by Yehan Klodekus. Bestows a special power upon the wielder. Bestows one of the following functions: Focus, Health or Light. -->
+		<!-- Description: Masterwork Item than increases Atk. Spd. Two-handed sword used by Yehan Klodekus. Bestows a special power upon the wielder. Bestows one of the following functions: Focus, Health or Light. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_tirbing_i00" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="sword" />
@@ -1250,7 +1250,7 @@
 		</for>
 	</item>
 	<item id="21967" type="Weapon" name="Blood Brother - Great Gale - Focus">
-		<!-- Description: Masterwork Item than increases Atk. Spd.. (Soul Crystal Enhancement). Two-handed sword used by Yehan Klodekus. Bestows a special power upon the wielder. Increases Critical by 111. Increases damage inflicted during PvP. -->
+		<!-- Description: Masterwork Item than increases Atk. Spd. (Soul Crystal Enhancement). Two-handed sword used by Yehan Klodekus. Bestows a special power upon the wielder. Increases Critical by 111. Increases damage inflicted during PvP. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_tirbing_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="sword" />
@@ -1273,7 +1273,7 @@
 		</for>
 	</item>
 	<item id="21968" type="Weapon" name="Blood Brother - Great Gale - Health">
-		<!-- Description: Masterwork Item than increases Atk. Spd.. (Soul Crystal Enhancement). Two-handed sword used by Yehan Klodekus. Bestows a special power upon the wielder. Increases Max HP by 25%. Increases damage inflicted during PvP. -->
+		<!-- Description: Masterwork Item than increases Atk. Spd. (Soul Crystal Enhancement). Two-handed sword used by Yehan Klodekus. Bestows a special power upon the wielder. Increases Max HP by 25%. Increases damage inflicted during PvP. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_tirbing_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="sword" />
@@ -1296,7 +1296,7 @@
 		</for>
 	</item>
 	<item id="21969" type="Weapon" name="Blood Brother - Great Gale - Light">
-		<!-- Description: Masterwork Item than increases Atk. Spd.. (Soul Crystal Enhancement). Two-handed sword used by Yehan Klodekus. Bestows a special power upon the wielder. Increases weight gauge by 20%. Increases damage inflicted during PvP. -->
+		<!-- Description: Masterwork Item than increases Atk. Spd. (Soul Crystal Enhancement). Two-handed sword used by Yehan Klodekus. Bestows a special power upon the wielder. Increases weight gauge by 20%. Increases damage inflicted during PvP. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_tirbing_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="sword" />
@@ -1319,7 +1319,7 @@
 		</for>
 	</item>
 	<item id="21970" type="Weapon" name="Blood Brother - Great Gale {PvP} - Focus">
-		<!-- Description: Masterwork Item than increases Atk. Spd.. (Soul Crystal Enhancement). Two-handed sword used by Yehan Klodekus. Bestows a special power upon the wielder. Increases Critical by 111. Increases damage inflicted during PvP. Has a chance of inflicting additional damage during an attack. -->
+		<!-- Description: Masterwork Item than increases Atk. Spd. (Soul Crystal Enhancement). Two-handed sword used by Yehan Klodekus. Bestows a special power upon the wielder. Increases Critical by 111. Increases damage inflicted during PvP. Has a chance of inflicting additional damage during an attack. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_tirbing_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="sword" />
@@ -1342,7 +1342,7 @@
 		</for>
 	</item>
 	<item id="21971" type="Weapon" name="Blood Brother - Great Gale {PvP} - Health">
-		<!-- Description: Masterwork Item than increases Atk. Spd.. (Soul Crystal Enhancement). Two-handed sword used by Yehan Klodekus. Bestows a special power upon the wielder. Increases Max HP by 25%. Increases damage inflicted during PvP. Has a chance of inflicting additional damage during an attack. -->
+		<!-- Description: Masterwork Item than increases Atk. Spd. (Soul Crystal Enhancement). Two-handed sword used by Yehan Klodekus. Bestows a special power upon the wielder. Increases Max HP by 25%. Increases damage inflicted during PvP. Has a chance of inflicting additional damage during an attack. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_tirbing_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="sword" />
@@ -1365,7 +1365,7 @@
 		</for>
 	</item>
 	<item id="21972" type="Weapon" name="Blood Brother - Great Gale {PvP} - Light">
-		<!-- Description: Masterwork Item than increases Atk. Spd.. (Soul Crystal Enhancement). Two-handed sword used by Yehan Klodekus. Bestows a special power upon the wielder. Increases weight gauge by 20%. Increases damage inflicted during PvP. Has a chance of inflicting additional damage during an attack. -->
+		<!-- Description: Masterwork Item than increases Atk. Spd. (Soul Crystal Enhancement). Two-handed sword used by Yehan Klodekus. Bestows a special power upon the wielder. Increases weight gauge by 20%. Increases damage inflicted during PvP. Has a chance of inflicting additional damage during an attack. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_tirbing_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="sword" />
@@ -1480,7 +1480,7 @@
 		</for>
 	</item>
 	<item id="21977" type="Weapon" name="Mardil's Fan - Holy Spirit">
-		<!-- Description: Masterwork Item that increases heal amount.. Magic fan used by Mardil. Bestows a special power upon the wielder. Bestows one of the following functions: M. Atk., Magic Silence or Acumen. -->
+		<!-- Description: Masterwork Item that increases heal amount. Magic fan used by Mardil. Bestows a special power upon the wielder. Bestows one of the following functions: M. Atk., Magic Silence or Acumen. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_wind_of_mardil_i00" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="sword" />
@@ -1503,7 +1503,7 @@
 		</for>
 	</item>
 	<item id="21978" type="Weapon" name="Mardil's Fan - Holy Spirit - M. Atk.">
-		<!-- Description: Masterwork Item that increases heal amount.. (Soul Crystal Enhancement). Magic fan used by Mardil. Bestows a special power upon the wielder. When using magic, increases MP Consumption by 15% and increases M. Atk. by 167. Increases damage inflicted during PvP. -->
+		<!-- Description: Masterwork Item that increases heal amount. (Soul Crystal Enhancement). Magic fan used by Mardil. Bestows a special power upon the wielder. When using magic, increases MP Consumption by 15% and increases M. Atk. by 167. Increases damage inflicted during PvP. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_wind_of_mardil_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="sword" />
@@ -1526,7 +1526,7 @@
 		</for>
 	</item>
 	<item id="21979" type="Weapon" name="Mardil's Fan - Holy Spirit - Magic Silence">
-		<!-- Description: Masterwork Item that increases heal amount.. (Soul Crystal Enhancement). Magic fan used by Mardil. Bestows a special power upon the wielder. Inflicts silence on a target with a 10% chance when using a magic skill. Increases damage inflicted during PvP. -->
+		<!-- Description: Masterwork Item that increases heal amount. (Soul Crystal Enhancement). Magic fan used by Mardil. Bestows a special power upon the wielder. Inflicts silence on a target with a 10% chance when using a magic skill. Increases damage inflicted during PvP. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_wind_of_mardil_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="sword" />
@@ -1549,7 +1549,7 @@
 		</for>
 	</item>
 	<item id="21980" type="Weapon" name="Mardil's Fan - Holy Spirit - Acumen">
-		<!-- Description: Masterwork Item that increases heal amount.. (Soul Crystal Enhancement). Magic fan used by Mardil. Bestows a special power upon the wielder. Increases Casting Spd. by 15%. Increases damage inflicted during PvP. -->
+		<!-- Description: Masterwork Item that increases heal amount. (Soul Crystal Enhancement). Magic fan used by Mardil. Bestows a special power upon the wielder. Increases Casting Spd. by 15%. Increases damage inflicted during PvP. -->
 		<set name="icon" val="BranchSys2.icon.br_wp_wind_of_mardil_i01" />
 		<set name="default_action" val="equip" />
 		<set name="weapon_type" val="sword" />
@@ -1636,6 +1636,8 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="unequip_skill" val="3267-1" />
+		<set name="item_skill" val="8521-1;6916-1" />
 	</item>
 	<item id="21987" type="Armor" name="Pirate Hat">
 		<!-- Description: Hat worn by pirates. Uses 2 hair accessory slots. Cannot be exchanged, dropped, or sold. -->

+ 28 - 39
L2J_DataPack_BETA/data/stats/skills/02200-02299.xml

@@ -1495,19 +1495,18 @@
 		</for>
 	</skill>
 	<skill id="2286" levels="6" name="Scroll: Recovery">
-		<table name="#minLvl"> 0 20 40 52 61 76 </table>
-		<table name="#maxLvl"> 20 40 52 61 76 86 </table>
+		<!-- Confirmed CT2.5 -->
+		<table name="#levelRange"> 1;19 20;39 40;51 52;60 61;75 76;85 </table>
 		<set name="itemConsumeCount" val="1" />
-		<set name="target" val="TARGET_SELF" />
-		<set name="skillType" val="BUFF" />
+		<set name="magicLvl" val="1" />
 		<set name="operateType" val="OP_ACTIVE" />
+		<set name="skillType" val="BUFF" />
 		<set name="staticHitTime" val="true" />
+		<set name="target" val="TARGET_SELF" />
 		<cond msgId="113" addName="1">
 			<and>
-				<player level="#minLvl" />
-				<not>
-					<player level="#maxLvl" />
-				</not>
+				<player chaotic="False" />
+				<player levelRange="#levelRange" />
 			</and>
 		</cond>
 		<for>
@@ -1516,70 +1515,60 @@
 	</skill>
 	<skill id="2287" levels="6" name="Elixir of Life">
 		<!-- Confirmed CT2.5 -->
+		<table name="#levelRange"> 1;19 20;39 40;51 52;60 61;75 76;85 </table>
 		<table name="#power"> 250 650 1100 1500 1900 2300 </table>
-		<table name="#minLvl"> 0 20 40 52 61 76 </table>
-		<table name="#maxLvl"> 20 40 52 61 76 86 </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="reuseDelay" val="300000" />
+		<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">
 			<and>
 				<player flyMounted="False" />
-				<player level="#minLvl" />
-				<not>
-					<player level="#maxLvl" />
-				</not>
+				<player levelRange="#levelRange" />
 			</and>
 		</cond>
 	</skill>
 	<skill id="2288" levels="6" name="Elixir of Mental Strength">
 		<!-- Confirmed CT2.5 -->
+		<table name="#levelRange"> 1;19 20;39 40;51 52;60 61;75 76;85 </table>
 		<table name="#power"> 60 140 220 290 360 420 </table>
-		<table name="#minLvl"> 0 20 40 52 61 76 </table>
-		<table name="#maxLvl"> 20 40 52 61 76 86 </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="MANAHEAL" />
+		<set name="magicLvl" val="1" />
 		<set name="operateType" val="OP_ACTIVE" />
+		<set name="power" val="#power" />
 		<set name="reuseDelay" val="300000" />
 		<set name="sharedReuse" val="2287-1" />
-		<set name="isPotion" val="true" />
+		<set name="skillType" val="MANAHEAL" />
+		<set name="target" val="TARGET_SELF" />
 		<cond msgId="113" addName="1">
 			<and>
 				<player flyMounted="False" />
-				<player level="#minLvl" />
-				<not>
-					<player level="#maxLvl" />
-				</not>
+				<player levelRange="#levelRange" />
 			</and>
 		</cond>
 	</skill>
 	<skill id="2289" levels="6" name="Elixir of CP">
 		<!-- Confirmed CT2.5 -->
+		<table name="#levelRange"> 1;19 20;39 40;51 52;60 61;75 76;85 </table>
 		<table name="#power"> 150 350 600 800 1000 1200 </table>
-		<table name="#minLvl"> 0 20 40 52 61 76 </table>
-		<table name="#maxLvl"> 20 40 52 61 76 86 </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="operateType" val="OP_ACTIVE" />
+		<set name="power" val="#power" />
 		<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">
 			<and>
 				<player flyMounted="False" />
-				<player level="#minLvl" />
-				<not>
-					<player level="#maxLvl" />
-				</not>
+				<player levelRange="#levelRange" />
 			</and>
 		</cond>
 	</skill>