Browse Source

BETA/STABLE: Cleanup some duplicated conditions on items.

MELERIX 14 năm trước cách đây
mục cha
commit
338fa4eb8c

+ 60 - 64
L2J_DataPack_BETA/data/stats/items/07800-07899.xml

@@ -306,6 +306,9 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_magic_weapon" val="true" />
+		<cond msgId="1685">
+			<player pkCount="0" />
+		</cond>
 		<for>
 			<set order="0x08" stat="pAtk" val="23" />
 			<set order="0x08" stat="mAtk" val="24" />
@@ -313,9 +316,6 @@
 			<add order="0x10" stat="accCombat" val="4.75" />
 			<set order="0x08" stat="pAtkSpd" val="325" />
 		</for>
-		<cond msgId="1685">
-			<player pkCount="0" />
-		</cond>
 	</item>
 	<item id="7817" type="Weapon" name="Apprentice Adventurer's Bone Club">
 		<set name="icon" val="icon.weapon_club_i00" />
@@ -333,6 +333,9 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<cond msgId="1685">
+			<player pkCount="0" />
+		</cond>
 		<for>
 			<set order="0x08" stat="pAtk" val="24" />
 			<set order="0x08" stat="mAtk" val="17" />
@@ -340,9 +343,6 @@
 			<add order="0x10" stat="accCombat" val="4.75" />
 			<set order="0x08" stat="pAtkSpd" val="379" />
 		</for>
-		<cond msgId="1685">
-			<player pkCount="0" />
-		</cond>
 	</item>
 	<item id="7818" type="Weapon" name="Apprentice Adventurer's Knife">
 		<set name="icon" val="icon.weapon_shining_knife_i00" />
@@ -360,6 +360,9 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<cond msgId="1685">
+			<player pkCount="0" />
+		</cond>
 		<for>
 			<set order="0x08" stat="pAtk" val="21" />
 			<set order="0x08" stat="mAtk" val="17" />
@@ -367,9 +370,6 @@
 			<add order="0x10" stat="accCombat" val="-3.75" />
 			<set order="0x08" stat="pAtkSpd" val="433" />
 		</for>
-		<cond msgId="1685">
-			<player pkCount="0" />
-		</cond>
 	</item>
 	<item id="7819" type="Weapon" name="Apprentice Adventurer's Cestus">
 		<set name="icon" val="icon.weapon_vipers_canine_i00" />
@@ -387,6 +387,9 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<cond msgId="1685">
+			<player pkCount="0" />
+		</cond>
 		<for>
 			<set order="0x08" stat="pAtk" val="29" />
 			<set order="0x08" stat="mAtk" val="17" />
@@ -394,9 +397,6 @@
 			<add order="0x10" stat="accCombat" val="4.75" />
 			<set order="0x08" stat="pAtkSpd" val="325" />
 		</for>
-		<cond msgId="1685">
-			<player pkCount="0" />
-		</cond>
 	</item>
 	<item id="7820" type="Weapon" name="Apprentice Adventurer's Bow">
 		<set name="icon" val="icon.weapon_short_bow_i00" />
@@ -416,6 +416,9 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<cond msgId="1685">
+			<player pkCount="0" />
+		</cond>
 		<for>
 			<set order="0x08" stat="pAtk" val="49" />
 			<set order="0x08" stat="mAtk" val="17" />
@@ -423,9 +426,6 @@
 			<add order="0x10" stat="accCombat" val="-3.75" />
 			<set order="0x08" stat="pAtkSpd" val="293" />
 		</for>
-		<cond msgId="1685">
-			<player pkCount="0" />
-		</cond>
 	</item>
 	<item id="7821" type="Weapon" name="Apprentice Adventurer's Long Sword">
 		<set name="icon" val="icon.weapon_long_sword_i00" />
@@ -443,15 +443,15 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<cond msgId="1685">
+			<player pkCount="0" />
+		</cond>
 		<for>
 			<set order="0x08" stat="pAtk" val="24" />
 			<set order="0x08" stat="mAtk" val="17" />
 			<set order="0x08" stat="rCrit" val="8" />
 			<set order="0x08" stat="pAtkSpd" val="379" />
 		</for>
-		<cond msgId="1685">
-			<player pkCount="0" />
-		</cond>
 	</item>
 	<item id="7822" type="Weapon" name="Traveler's Mace">
 		<set name="icon" val="icon.weapon_mace_of_prayer_i00" />
@@ -471,6 +471,9 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_magic_weapon" val="true" />
+		<cond msgId="1685">
+			<player pkCount="0" />
+		</cond>
 		<for>
 			<set order="0x08" stat="pAtk" val="41" />
 			<set order="0x08" stat="mAtk" val="43" />
@@ -480,9 +483,6 @@
 			<enchant val="0" order="0x0C" stat="pAtk" />
 			<enchant val="0" order="0x0C" stat="mAtk" />
 		</for>
-		<cond msgId="1685">
-			<player pkCount="0" />
-		</cond>
 	</item>
 	<item id="7823" type="Weapon" name="Traveler's Dark Elven Bow">
 		<set name="icon" val="icon.weapon_dark_elven_bow_i00" />
@@ -503,6 +503,9 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<cond msgId="1685">
+			<player pkCount="0" />
+		</cond>
 		<for>
 			<set order="0x08" stat="pAtk" val="105" />
 			<set order="0x08" stat="mAtk" val="32" />
@@ -512,9 +515,6 @@
 			<enchant val="0" order="0x0C" stat="pAtk" />
 			<enchant val="0" order="0x0C" stat="mAtk" />
 		</for>
-		<cond msgId="1685">
-			<player pkCount="0" />
-		</cond>
 	</item>
 	<item id="7824" type="Weapon" name="Traveler's Long Bow">
 		<set name="icon" val="icon.weapon_strengthening_bow_i00" />
@@ -535,6 +535,9 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<cond msgId="1685">
+			<player pkCount="0" />
+		</cond>
 		<for>
 			<set order="0x08" stat="pAtk" val="105" />
 			<set order="0x08" stat="mAtk" val="32" />
@@ -544,9 +547,6 @@
 			<enchant val="0" order="0x0C" stat="pAtk" />
 			<enchant val="0" order="0x0C" stat="mAtk" />
 		</for>
-		<cond msgId="1685">
-			<player pkCount="0" />
-		</cond>
 	</item>
 	<item id="7825" type="Weapon" name="Traveler's Staff">
 		<set name="icon" val="icon.weapon_staff_of_mana_i00" />
@@ -566,6 +566,9 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_magic_weapon" val="true" />
+		<cond msgId="1685">
+			<player pkCount="0" />
+		</cond>
 		<for>
 			<set order="0x08" stat="pAtk" val="50" />
 			<set order="0x08" stat="mAtk" val="47" />
@@ -575,9 +578,6 @@
 			<enchant val="0" order="0x0C" stat="pAtk" />
 			<enchant val="0" order="0x0C" stat="mAtk" />
 		</for>
-		<cond msgId="1685">
-			<player pkCount="0" />
-		</cond>
 	</item>
 	<item id="7826" type="Weapon" name="Traveler's Bastard Sword">
 		<set name="icon" val="icon.weapon_bastard_sword_i00" />
@@ -596,6 +596,9 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<cond msgId="1685">
+			<player pkCount="0" />
+		</cond>
 		<for>
 			<set order="0x08" stat="pAtk" val="51" />
 			<set order="0x08" stat="mAtk" val="32" />
@@ -604,9 +607,6 @@
 			<enchant val="0" order="0x0C" stat="pAtk" />
 			<enchant val="0" order="0x0C" stat="mAtk" />
 		</for>
-		<cond msgId="1685">
-			<player pkCount="0" />
-		</cond>
 	</item>
 	<item id="7827" type="Weapon" name="Traveler's Wand">
 		<set name="icon" val="icon.weapon_divine_tome_i00" />
@@ -626,6 +626,9 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_magic_weapon" val="true" />
+		<cond msgId="1685">
+			<player pkCount="0" />
+		</cond>
 		<for>
 			<set order="0x08" stat="pAtk" val="41" />
 			<set order="0x08" stat="mAtk" val="43" />
@@ -634,9 +637,6 @@
 			<enchant val="0" order="0x0C" stat="pAtk" />
 			<enchant val="0" order="0x0C" stat="mAtk" />
 		</for>
-		<cond msgId="1685">
-			<player pkCount="0" />
-		</cond>
 	</item>
 	<item id="7828" type="Weapon" name="Traveler's Jamadhr">
 		<set name="icon" val="icon.weapon_baghnakh_i00" />
@@ -655,6 +655,9 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<cond msgId="1685">
+			<player pkCount="0" />
+		</cond>
 		<for>
 			<set order="0x08" stat="pAtk" val="62" />
 			<set order="0x08" stat="mAtk" val="32" />
@@ -664,9 +667,6 @@
 			<enchant val="0" order="0x0C" stat="pAtk" />
 			<enchant val="0" order="0x0C" stat="mAtk" />
 		</for>
-		<cond msgId="1685">
-			<player pkCount="0" />
-		</cond>
 	</item>
 	<item id="7829" type="Weapon" name="Traveler's Tomahawk">
 		<set name="icon" val="icon.weapon_tomahawk_i00" />
@@ -685,6 +685,9 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<cond msgId="1685">
+			<player pkCount="0" />
+		</cond>
 		<for>
 			<set order="0x08" stat="pAtk" val="51" />
 			<set order="0x08" stat="mAtk" val="32" />
@@ -694,9 +697,6 @@
 			<enchant val="0" order="0x0C" stat="pAtk" />
 			<enchant val="0" order="0x0C" stat="mAtk" />
 		</for>
-		<cond msgId="1685">
-			<player pkCount="0" />
-		</cond>
 	</item>
 	<item id="7830" type="Weapon" name="Traveler's Poniard Dagger">
 		<set name="icon" val="icon.weapon_dirk_i00" />
@@ -715,6 +715,9 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<cond msgId="1685">
+			<player pkCount="0" />
+		</cond>
 		<for>
 			<set order="0x08" stat="pAtk" val="45" />
 			<set order="0x08" stat="mAtk" val="32" />
@@ -724,9 +727,6 @@
 			<enchant val="0" order="0x0C" stat="pAtk" />
 			<enchant val="0" order="0x0C" stat="mAtk" />
 		</for>
-		<cond msgId="1685">
-			<player pkCount="0" />
-		</cond>
 	</item>
 	<item id="7831" type="Weapon" name="Traveler's Pike">
 		<set name="icon" val="icon.weapon_pike_i00" />
@@ -746,6 +746,9 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="item_skill" val="3599-1" />
+		<cond msgId="1685">
+			<player pkCount="0" />
+		</cond>
 		<for>
 			<set order="0x08" stat="pAtk" val="51" />
 			<set order="0x08" stat="mAtk" val="32" />
@@ -755,9 +758,6 @@
 			<enchant val="0" order="0x0C" stat="pAtk" />
 			<enchant val="0" order="0x0C" stat="mAtk" />
 		</for>
-		<cond msgId="1685">
-			<player pkCount="0" />
-		</cond>
 	</item>
 	<item id="7832" type="EtcItem" name="Apprentice Adventurer's Weapon Exchange Coupon">
 		<set name="icon" val="icon.etc_lottery_card_i00" />
@@ -981,14 +981,13 @@
 		<set name="price" val="58600" />
 		<set name="enchant_enabled" val="1" />
 		<set name="equip_condition" val="{{ec_academy;1}}" />
+		<cond msgId="1518">
+			<player pledgeClass="1" /> <!-- Vassal (Academy) -->
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="37" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player pledgeClass="1" />
-			<!-- Vassal (Academy) -->
-		</cond>
 	</item>
 	<item id="7851" type="Armor" name="Clan Oath Armor">
 		<set name="icon" val="icon.armor_t1001_ul_i00" />
@@ -1073,14 +1072,13 @@
 		<set name="price" val="190400" />
 		<set name="enchant_enabled" val="1" />
 		<set name="equip_condition" val="{{ec_academy;1}}" />
+		<cond msgId="1518">
+			<player pledgeClass="1" /> <!-- Vassal (Academy) -->
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="119" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player pledgeClass="1" />
-			<!-- Vassal (Academy) -->
-		</cond>
 	</item>
 	<item id="7855" type="Armor" name="Clan Oath Leather Gloves - Light Armor">
 		<set name="icon" val="icon.armor_t1002_g_i00" />
@@ -1094,14 +1092,13 @@
 		<set name="price" val="39100" />
 		<set name="enchant_enabled" val="1" />
 		<set name="equip_condition" val="{{ec_academy;1}}" />
+		<cond msgId="1518">
+			<player pledgeClass="1" /> <!-- Vassal (Academy) -->
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="24" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player pledgeClass="1" />
-			<!-- Vassal (Academy) -->
-		</cond>
 	</item>
 	<item id="7856" type="Armor" name="Clan Oath Boots - Light Armor">
 		<set name="icon" val="icon.armor_t1002_b_i00" />
@@ -1115,14 +1112,13 @@
 		<set name="price" val="39100" />
 		<set name="enchant_enabled" val="1" />
 		<set name="equip_condition" val="{{ec_academy;1}}" />
+		<cond msgId="1518">
+			<player pledgeClass="1" /> <!-- Vassal (Academy) -->
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="24" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player pledgeClass="1" />
-			<!-- Vassal (Academy) -->
-		</cond>
 	</item>
 	<item id="7857" type="Armor" name="Clan Oath Aketon">
 		<set name="icon" val="icon.armor_t1003_ul_i00" />

+ 3 - 3
L2J_DataPack_BETA/data/stats/items/09400-09499.xml

@@ -467,13 +467,13 @@
 		<set name="element_enabled" val="1" />
 		<set name="enchant_enabled" val="1" />
 		<set name="equip_condition" val="{{ec_category;{@bow_master}}}" />
+		<cond msgId="1518">
+			<player class_id_restriction="92, 102, 109, 134" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player class_id_restriction="92, 102, 109, 134" />
-		</cond>
 	</item>
 	<item id="9428" type="Armor" name="Dynasty Leather Leggings">
 		<set name="icon" val="icon.armor_t92_l_i00" />

+ 6 - 6
L2J_DataPack_BETA/data/stats/items/10100-10199.xml

@@ -362,13 +362,13 @@
 		<set name="element_enabled" val="1" />
 		<set name="enchant_enabled" val="1" />
 		<set name="equip_condition" val="{{ec_category;{@weapon_master}}}" />
+		<cond msgId="1518">
+			<player class_id_restriction="89, 113, 117, 118, 131, 132, 133" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player class_id_restriction="89, 113, 117, 118, 131, 132, 133" />
-		</cond>
 	</item>
 	<item id="10128" type="Weapon" name="For Monster only (Crossbow)">
 		<set name="icon" val="icon.weapon_monster_i00" />
@@ -916,13 +916,13 @@
 		<set name="element_enabled" val="1" />
 		<set name="enchant_enabled" val="1" />
 		<set name="equip_condition" val="{{ec_category;{@buff_master}}}" />
+		<cond msgId="1518">
+			<player class_id_restriction="98, 115, 116, 136" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player class_id_restriction="98, 115, 116, 136" />
-		</cond>
 	</item>
 	<item id="10169" type="Armor" name="Enchanter Circlet (Kamael only)">
 		<set name="icon" val="icon.accessary_weapon_master_circlet_i00" />

+ 6 - 6
L2J_DataPack_BETA/data/stats/items/10200-10299.xml

@@ -196,13 +196,13 @@
 		<set name="element_enabled" val="1" />
 		<set name="enchant_enabled" val="1" />
 		<set name="equip_condition" val="{{ec_category;{@summon_master}}}" />
+		<cond msgId="1518">
+			<player class_id_restriction="96, 104, 111" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player class_id_restriction="96, 104, 111" />
-		</cond>
 	</item>
 	<item id="10215" type="Weapon" name="Icarus Sawsword">
 		<set name="icon" val="icon.weapon_icarus_sowsword_i00" />
@@ -733,13 +733,13 @@
 		<set name="element_enabled" val="1" />
 		<set name="enchant_enabled" val="1" />
 		<set name="equip_condition" val="{{ec_category;{@bow_master}}}" />
+		<cond msgId="1518">
+			<player class_id_restriction="92, 102, 109, 134" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player class_id_restriction="92, 102, 109, 134" />
-		</cond>
 	</item>
 	<item id="10235" type="Armor" name="Dynasty Silver Satin Tunic">
 		<set name="icon" val="icon.armor_t93_u_i00" />

+ 12 - 12
L2J_DataPack_BETA/data/stats/items/10400-10499.xml

@@ -1826,13 +1826,13 @@
 		<set name="element_enabled" val="1" />
 		<set name="enchant_enabled" val="1" />
 		<set name="equip_condition" val="{{ec_category;{@force_master}}}" />
+		<cond msgId="1518">
+			<player class_id_restriction="88, 114" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player class_id_restriction="88, 114" />
-		</cond>
 	</item>
 	<item id="10488" type="Armor" name="Dynasty Jeweled Leather Armor - Weapon Master">
 		<set name="icon" val="icon.armor_t92_u_i00" />
@@ -1848,13 +1848,13 @@
 		<set name="element_enabled" val="1" />
 		<set name="enchant_enabled" val="1" />
 		<set name="equip_condition" val="{{ec_category;{@weapon_master}}}" />
+		<cond msgId="1518">
+			<player class_id_restriction="89, 113, 117, 118, 131, 132, 133" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player class_id_restriction="89, 113, 117, 118, 131, 132, 133" />
-		</cond>
 	</item>
 	<item id="10489" type="Armor" name="Dynasty Jeweled Leather Armor - Enchanter">
 		<set name="icon" val="icon.armor_t92_u_i00" />
@@ -1870,13 +1870,13 @@
 		<set name="element_enabled" val="1" />
 		<set name="enchant_enabled" val="1" />
 		<set name="equip_condition" val="{{ec_category;{@buff_master}}}" />
+		<cond msgId="1518">
+			<player class_id_restriction="98, 115, 116, 136" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player class_id_restriction="98, 115, 116, 136" />
-		</cond>
 	</item>
 	<item id="10490" type="Armor" name="Dynasty Jeweled Leather Armor - Summoner">
 		<set name="icon" val="icon.armor_t92_u_i00" />
@@ -1892,13 +1892,13 @@
 		<set name="element_enabled" val="1" />
 		<set name="enchant_enabled" val="1" />
 		<set name="equip_condition" val="{{ec_category;{@summon_master}}}" />
+		<cond msgId="1518">
+			<player class_id_restriction="96, 104, 111" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player class_id_restriction="96, 104, 111" />
-		</cond>
 	</item>
 	<item id="10491" type="Armor" name="Silk Shirt - HP">
 		<set name="icon" val="icon.etc_shirts_c_i02" />

+ 31 - 31
L2J_DataPack_BETA/data/stats/items/10800-10899.xml

@@ -164,16 +164,16 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="equip_condition" val="{{ec_category;{@bard}}}" />
-		<for>
-			<add order="0x10" stat="pDef" val="226" />
-			<enchant order="0x0C" stat="pDef" val="0" />
-		</for>
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
 				<player class_id_restriction="100, 107" />
 			</and>
 		</cond>
+		<for>
+			<add order="0x10" stat="pDef" val="226" />
+			<enchant order="0x0C" stat="pDef" val="0" />
+		</for>
 	</item>
 	<item id="10807" type="Armor" name="Dynasty Leather Armor {PvP}">
 		<set name="icon" val="icon.armor_t92_u_i00" />
@@ -234,13 +234,13 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="equip_condition" val="{{ec_category;{@bow_master}}}" />
+		<cond msgId="1518">
+			<player class_id_restriction="92, 102, 109, 134" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player class_id_restriction="92, 102, 109, 134" />
-		</cond>
 	</item>
 	<item id="10810" type="Armor" name="Dynasty Tunic {PvP}">
 		<set name="icon" val="icon.armor_t93_u_i00" />
@@ -421,13 +421,13 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="equip_condition" val="{{ec_category;{@weapon_master}}}" />
+		<cond msgId="1518">
+			<player class_id_restriction="89, 113, 117, 118, 131, 132, 133" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player class_id_restriction="89, 113, 117, 118, 131, 132, 133" />
-		</cond>
 	</item>
 	<item id="10817" type="Armor" name="Dynasty Leather Armor {PvP} - Enchanter">
 		<set name="icon" val="icon.armor_t92_ud_i00" />
@@ -445,13 +445,13 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="equip_condition" val="{{ec_category;{@buff_master}}}" />
+		<cond msgId="1518">
+			<player class_id_restriction="98, 115, 116, 136" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player class_id_restriction="98, 115, 116, 136" />
-		</cond>
 	</item>
 	<item id="10818" type="Armor" name="Dynasty Leather Armor {PvP} - Summoner">
 		<set name="icon" val="icon.armor_t92_u_i00" />
@@ -469,13 +469,13 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="equip_condition" val="{{ec_category;{@summon_master}}}" />
+		<cond msgId="1518">
+			<player class_id_restriction="96, 104, 111" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player class_id_restriction="96, 104, 111" />
-		</cond>
 	</item>
 	<item id="10819" type="Armor" name="Dynasty Platinum Breastplate {PvP}">
 		<set name="icon" val="icon.armor_t91_u_i00" />
@@ -667,13 +667,13 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="equip_condition" val="{{ec_category;{@bow_master}}}" />
+		<cond msgId="1518">
+			<player class_id_restriction="92, 102, 109, 134" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player class_id_restriction="92, 102, 109, 134" />
-		</cond>
 	</item>
 	<item id="10827" type="Armor" name="Dynasty Silver Satin Tunic {PvP}">
 		<set name="icon" val="icon.armor_t93_u_i00" />
@@ -827,13 +827,13 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="equip_condition" val="{{ec_category;{@force_master}}}" />
+		<cond msgId="1518">
+			<player class_id_restriction="88, 114" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player class_id_restriction="88, 114" />
-		</cond>
 	</item>
 	<item id="10833" type="Armor" name="Dynasty Jewel Leather Armor {PvP} - Weapon Master">
 		<set name="icon" val="icon.armor_t92_u_i00" />
@@ -851,13 +851,13 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="equip_condition" val="{{ec_category;{@weapon_master}}}" />
+		<cond msgId="1518">
+			<player class_id_restriction="89, 113, 117, 118, 131, 132, 133" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player class_id_restriction="89, 113, 117, 118, 131, 132, 133" />
-		</cond>
 	</item>
 	<item id="10834" type="Armor" name="Dynasty Jewel Leather Armor {PvP} - Enchanter">
 		<set name="icon" val="icon.armor_t92_u_i00" />
@@ -875,13 +875,13 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="equip_condition" val="{{ec_category;{@buff_master}}}" />
+		<cond msgId="1518">
+			<player class_id_restriction="98, 115, 116, 136" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player class_id_restriction="98, 115, 116, 136" />
-		</cond>
 	</item>
 	<item id="10835" type="Armor" name="Dynasty Jewel Leather Armor {PvP} - Summoner">
 		<set name="icon" val="icon.armor_t92_u_i00" />
@@ -899,13 +899,13 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="equip_condition" val="{{ec_category;{@summon_master}}}" />
+		<cond msgId="1518">
+			<player class_id_restriction="96, 104, 111" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player class_id_restriction="96, 104, 111" />
-		</cond>
 	</item>
 	<item id="10836" type="EtcItem" name="Pathfinder Supplies (Level 2)">
 		<set name="icon" val="icon.etc_treasure_box_i02" />

+ 0 - 9
L2J_DataPack_BETA/data/stats/items/12800-12899.xml

@@ -284,9 +284,6 @@
 			<add order="0x10" stat="pDef" val="13" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-		</cond>
 	</item>
 	<item id="12812" type="Armor" name="Dynasty Sigil">
 		<set name="icon" val="icon.dynasty_sigil_i00" />
@@ -308,9 +305,6 @@
 			<add order="0x10" stat="pDef" val="15" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-		</cond>
 	</item>
 	<item id="12813" type="Armor" name="Vesper Sigil">
 		<set name="icon" val="icon.verper_sigil_i00" />
@@ -333,9 +327,6 @@
 			<add order="0x10" stat="pDef" val="17" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-		</cond>
 	</item>
 	<item id="12814" type="Weapon" name="Shadow Item - Gatekeeper Transformation Stick">
 		<set name="icon" val="icon.etc_gateleeper_stick_i00" />

+ 0 - 3
L2J_DataPack_BETA/data/stats/items/13000-13099.xml

@@ -1183,9 +1183,6 @@
 			<add order="0x10" stat="pDef" val="13" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-		</cond>
 	</item>
 	<item id="13079" type="EtcItem" name="My Teleport Spellbook 1-Sheet Pack">
 		<set name="icon" val="icon.etc_pi_gift_box_i01" />

+ 6 - 9
L2J_DataPack_BETA/data/stats/items/13500-13599.xml

@@ -323,18 +323,18 @@
 		<set name="spiritshots" val="3" />
 		<set name="is_tradable" val="false" />
 		<set name="is_sellable" val="false" />
-		<for>
-			<set order="0x08" stat="pAtk" val="200" />
-			<set order="0x08" stat="mAtk" val="6" />
-			<set order="0x08" stat="rCrit" val="8" />
-			<set order="0x08" stat="pAtkSpd" val="325" />
-		</for>
 		<cond msgId="1518">
 			<and>
 				<player class_id_restriction="93, 101, 108" />
 				<player subclass="false" />
 			</and>
 		</cond>
+		<for>
+			<set order="0x08" stat="pAtk" val="200" />
+			<set order="0x08" stat="mAtk" val="6" />
+			<set order="0x08" stat="rCrit" val="8" />
+			<set order="0x08" stat="pAtkSpd" val="325" />
+		</for>
 	</item>
 	<item id="13529" type="Armor" name="Test Sigil">
 		<set name="icon" val="icon.shield_arcana_sigil_i00" />
@@ -353,9 +353,6 @@
 			<set order="0x08" stat="sDef" val="47" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-		</cond>
 	</item>
 	<item id="13530" type="Weapon" name="Flag of Gludio">
 		<set name="icon" val="icon.weapon_fort_flag_i00" />

+ 7 - 17
L2J_DataPack_BETA/data/stats/items/13800-13899.xml

@@ -1068,9 +1068,6 @@
 			<add order="0x10" stat="pDef" val="13" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-		</cond>
 	</item>
 	<item id="13886" type="Armor" name="Sealed Dynasty Sigil">
 		<set name="icon" val="icon.armor_dynasty_sigil_i01" />
@@ -1092,9 +1089,6 @@
 			<add order="0x10" stat="pDef" val="15" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-		</cond>
 	</item>
 	<item id="13887" type="Armor" name="Sealed Vesper Sigil">
 		<set name="icon" val="icon.armor_verper_sigil_i01" />
@@ -1117,9 +1111,6 @@
 			<add order="0x10" stat="pDef" val="17" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-		</cond>
 	</item>
 	<item id="13888" type="Armor" name="Sealed Lord's Cloak">
 		<set name="icon" val="icon.feud_load_cloak_i01" />
@@ -1147,17 +1138,16 @@
 		<set name="material" val="cloth" />
 		<set name="weight" val="220" />
 		<set name="price" val="28671000" />
-		<for>
-			<add order="0x10" stat="pDef" val="20" />
-			<add order="0x40" stat="darkRes" val="30" />
-		</for>
 		<cond msgId="2453">
 			<and>
 				<player races="Kamael" />
-				<!-- Kamael exclusive cloak -->
 				<player cloakStatus="1" />
 			</and>
 		</cond>
+		<for>
+			<add order="0x10" stat="pDef" val="20" />
+			<add order="0x40" stat="darkRes" val="30" />
+		</for>
 	</item>
 	<item id="13890" type="Armor" name="Holy Spirit's Cloak">
 		<set name="icon" val="icon.vesper_cloack_i00" />
@@ -1168,13 +1158,13 @@
 		<set name="material" val="cloth" />
 		<set name="weight" val="220" />
 		<set name="price" val="28671000" />
+		<cond msgId="2453">
+			<player cloakStatus="1" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="20" />
 			<add order="0x40" stat="darkRes" val="30" />
 		</for>
-		<cond msgId="2453">
-			<player cloakStatus="1" />
-		</cond>
 	</item>
 	<item id="13891" type="Armor" name="Holy Spirit's Cloak - Light Armor exclusive">
 		<set name="icon" val="icon.vesper_cloack_i00" />

+ 36 - 46
L2J_DataPack_BETA/data/stats/items/14500-14599.xml

@@ -2049,14 +2049,13 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<cond msgId="1518">
+			<player pledgeClass="4" /> <!-- Elder -->
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="73" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player pledgeClass="4" />
-			<!-- Elder -->
-		</cond>
 	</item>
 	<item id="14583" type="Armor" name="Apella Combat Armor">
 		<set name="icon" val="icon.armor_t1004_ul_i00" />
@@ -2072,16 +2071,15 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player pledgeClass="4" /> <!-- Elder -->
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="293" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player pledgeClass="4" />
-			<!-- Elder -->
-		</cond>
 	</item>
 	<item id="14584" type="Armor" name="Apella Combat Gauntlet - Heavy Armor">
 		<set name="icon" val="icon.armor_t1004_g_i00" />
@@ -2096,16 +2094,15 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player pledgeClass="4" /> <!-- Elder -->
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="49" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player pledgeClass="4" />
-			<!-- Elder -->
-		</cond>
 	</item>
 	<item id="14585" type="Armor" name="Apella Combat Boots - Heavy Armor">
 		<set name="icon" val="icon.armor_t1004_b_i00" />
@@ -2120,16 +2117,15 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player pledgeClass="4" /> <!-- Elder -->
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="49" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player pledgeClass="4" />
-			<!-- Elder -->
-		</cond>
 	</item>
 	<item id="14586" type="Armor" name="Apella Combat Clothes">
 		<set name="icon" val="icon.armor_t1005_ul_i00" />
@@ -2144,14 +2140,13 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<cond msgId="1518">
+			<player pledgeClass="4" /> <!-- Elder -->
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="220" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player pledgeClass="4" />
-			<!-- Elder -->
-		</cond>
 	</item>
 	<item id="14587" type="Armor" name="Apella Combat Leather Gloves - Tans Armor Use">
 		<set name="icon" val="icon.armor_t1005_g_i00" />
@@ -2165,14 +2160,13 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<cond msgId="1518">
+			<player pledgeClass="4" /> <!-- Elder -->
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="49" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player pledgeClass="4" />
-			<!-- Elder -->
-		</cond>
 	</item>
 	<item id="14588" type="Armor" name="Apella Combat Shoes - Tans Armor Use">
 		<set name="icon" val="icon.armor_t1005_b_i00" />
@@ -2186,14 +2180,13 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<cond msgId="1518">
+			<player pledgeClass="4" /> <!-- Elder -->
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="49" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player pledgeClass="4" />
-			<!-- Elder -->
-		</cond>
 	</item>
 	<item id="14589" type="Armor" name="Apella Combat Overcoat">
 		<set name="icon" val="icon.armor_t1006_ul_i00" />
@@ -2209,17 +2202,16 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player pledgeClass="4" /> <!-- Elder -->
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="147" />
 			<add order="0x40" stat="maxMp" val="718" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player pledgeClass="4" />
-			<!-- Elder -->
-		</cond>
 	</item>
 	<item id="14590" type="Armor" name="Apella Combat Silk Gloves - Robe">
 		<set name="icon" val="icon.armor_t1006_g_i00" />
@@ -2234,16 +2226,15 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player pledgeClass="4" /> <!-- Elder -->
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="49" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player pledgeClass="4" />
-			<!-- Elder -->
-		</cond>
 	</item>
 	<item id="14591" type="Armor" name="Apella Combat Sandals - Robe">
 		<set name="icon" val="icon.armor_t1006_b_i00" />
@@ -2258,16 +2249,15 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player pledgeClass="4" /> <!-- Elder -->
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="49" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player pledgeClass="4" />
-			<!-- Elder -->
-		</cond>
 	</item>
 	<item id="14592" type="Armor" name="Gludio Earth Resistance Ring">
 		<set name="icon" val="icon.accessary_inferno_ring_i00" />

+ 13 - 18
L2J_DataPack_BETA/data/stats/items/14600-14699.xml

@@ -31,16 +31,15 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<for>
-			<add order="0x10" stat="pDef" val="20" />
-		</for>
 		<cond msgId="2453">
 			<and>
 				<player races="Kamael" />
-				<!-- Kamael exclusive cloak -->
 				<player cloakStatus="1" />
 			</and>
 		</cond>
+		<for>
+			<add order="0x10" stat="pDef" val="20" />
+		</for>
 	</item>
 	<item id="14602" type="Armor" name="Ancient Cloak">
 		<set name="icon" val="icon.vesper_cloack_i00" />
@@ -53,19 +52,15 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-		</cond>
-		<for>
-			<add order="0x10" stat="pDef" val="20" />
-		</for>
 		<cond msgId="2453">
 			<and>
-				<player races="Kamael" />
-				<!-- Kamael exclusive cloak -->
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
 				<player cloakStatus="1" />
 			</and>
 		</cond>
+		<for>
+			<add order="0x10" stat="pDef" val="20" />
+		</for>
 	</item>
 	<item id="14603" type="EtcItem" name="Sealed Ancient Cloak">
 		<set name="icon" val="icon.sealed_vesper_cloack_i01" />
@@ -181,12 +176,12 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<for>
-			<add order="0x10" stat="pDef" val="20" />
-		</for>
 		<cond msgId="2453">
 			<player cloakStatus="1" />
 		</cond>
+		<for>
+			<add order="0x10" stat="pDef" val="20" />
+		</for>
 	</item>
 	<item id="14610" type="Armor" name="Ancient Cloak: Robe exclusive">
 		<set name="icon" val="icon.vesper_cloack_i00" />
@@ -200,9 +195,6 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="equip_condition" val="{{ec_category;{@mage_cloack}}}" />
-		<for>
-			<add order="0x10" stat="pDef" val="20" />
-		</for>
 		<cond msgId="2453">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
@@ -210,6 +202,9 @@
 				<player cloakStatus="1" />
 			</and>
 		</cond>
+		<for>
+			<add order="0x10" stat="pDef" val="20" />
+		</for>
 	</item>
 	<item id="14611" type="Armor" name="Rudolph's Nose">
 		<set name="icon" val="icon.Accessory_nose_of_rudolph_mask_i00" />

+ 0 - 3
L2J_DataPack_BETA/data/stats/items/15500-15599.xml

@@ -1677,9 +1677,6 @@
 			<add order="0x10" stat="pDef" val="21" />
 			<enchant order="0x0C" stat="pDef" val="0" />
 		</for>
-		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-		</cond>
 	</item>
 	<item id="15589" type="Armor" name="Vorpal Helmet">
 		<set name="icon" val="icon.armor_helmet_i00" />