BETA: Continuing with [10259].

L2J_DataPack_BETA/dist/game/data/categoryData.xml

@@ -1881,6 +1881,7 @@
 		<id>93</id> <!-- Adventurer -->
 		<id>101</id> <!-- Wind Rider -->
 		<id>108</id> <!-- Ghost Hunter -->
+		<id>117</id> <!-- Fortune Seeker -->
 	</category>
 	<category name="HEAL_MASTER">
 		<id>97</id> <!-- Cardinal -->

L2J_DataPack_BETA/dist/game/data/stats/items/09300-09399.xml

@@ -3080,7 +3080,7 @@
 		<set name="weight" val="10" />
 		<cond msgId="1518">
 			<and>
-				<player class_id_restriction="90, 91, 99, 106" /> <!-- Shield Master -->
+				<player categoryType="SHIELD_MASTER2_3" />
 				<player subclass="false" />
 				<player level="40" />
 			</and>
@@ -3095,7 +3095,7 @@
 		<set name="weight" val="10" />
 		<cond msgId="1518">
 			<and>
-				<player class_id_restriction="100, 107" /> <!-- Bard -->
+				<player categoryType="BARD2_3" />
 				<player subclass="false" />
 				<player level="40" />
 			</and>
@@ -3110,7 +3110,7 @@
 		<set name="weight" val="10" />
 		<cond msgId="1518">
 			<and>
-				<player class_id_restriction="88, 114" /> <!-- Force Master -->
+				<player categoryType="FORCE_MASTER2_3" />
 				<player subclass="false" />
 				<player level="40" />
 			</and>

L2J_DataPack_BETA/dist/game/data/stats/items/09400-09499.xml

@@ -9,7 +9,7 @@
 		<set name="weight" val="10" />
 		<cond msgId="1518">
 			<and>
-				<player class_id_restriction="46, 113, 55, 117, 57, 118" /> <!-- Weapon Master -->
+				<player categoryType="WEAPON_MASTER2_3" />
 				<player subclass="false" />
 				<player level="40" />
 			</and>
@@ -24,7 +24,7 @@
 		<set name="weight" val="10" />
 		<cond msgId="1518">
 			<and>
-				<player class_id_restriction="8, 93, 23, 101, 36, 108" /> <!-- Dagger Master -->
+				<player categoryType="DAGGER_MASTER2_3" />
 				<player subclass="false" />
 				<player level="40" />
 			</and>
@@ -39,7 +39,7 @@
 		<set name="weight" val="10" />
 		<cond msgId="1518">
 			<and>
-				<player class_id_restriction="9, 92, 24, 102, 37, 109" /> <!-- Bow Master -->
+				<player categoryType="BOW_MASTER2_3" />
 				<player subclass="false" />
 				<player level="40" />
 			</and>
@@ -54,7 +54,7 @@
 		<set name="weight" val="10" />
 		<cond msgId="1518">
 			<and>
-				<player class_id_restriction="12, 94, 13, 95, 27, 103, 40, 110" /> <!-- Wizard -->
+				<player categoryType="WIZARD_MASTER2_3" />
 				<player subclass="false" />
 				<player level="40" />
 			</and>
@@ -69,7 +69,7 @@
 		<set name="weight" val="10" />
 		<cond msgId="1518">
 			<and>
-				<player class_id_restriction="14, 96, 28, 104, 41, 111" /> <!-- Summoner -->
+				<player categoryType="SUMMON_MASTER2_3" />
 				<player subclass="false" />
 				<player level="40" />
 			</and>
@@ -84,7 +84,7 @@
 		<set name="weight" val="10" />
 		<cond msgId="1518">
 			<and>
-				<player class_id_restriction="16, 97, 30, 105, 43, 112" /> <!-- Healer -->
+				<player categoryType="HEAL_MASTER2_3" />
 				<player subclass="false" />
 				<player level="40" />
 			</and>
@@ -99,7 +99,7 @@
 		<set name="weight" val="10" />
 		<cond msgId="1518">
 			<and>
-				<player class_id_restriction="17, 98, 51, 115, 52, 116" /> <!-- Enchanter -->
+				<player categoryType="BUFF_MASTER2_3" />
 				<player subclass="false" />
 				<player level="40" />
 			</and>
@@ -114,7 +114,7 @@
 		<set name="weight" val="10" />
 		<cond msgId="1518">
 			<and>
-				<player class_id_restriction="127, 131, 128, 132, 129, 133" /> <!-- Kamael Weapon Master -->
+				<player categoryType="WEAPON_MASTER2_3" />
 				<player subclass="false" />
 				<player level="40" />
 			</and>
@@ -129,7 +129,7 @@
 		<set name="weight" val="10" />
 		<cond msgId="1518">
 			<and>
-				<player class_id_restriction="130, 134" /> <!-- Kamael Bow Master -->
+				<player categoryType="BOW_MASTER2_3" />
 				<player subclass="false" />
 				<player level="40" />
 			</and>
@@ -246,11 +246,10 @@
 		<set name="price" val="24398000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@shield_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="90, 91, 99, 106" />
+				<player categoryType="SHIELD_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -271,11 +270,10 @@
 		<set name="price" val="24398000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@weapon_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="89, 113, 117, 118" />
+				<player categoryType="WEAPON_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -296,11 +294,10 @@
 		<set name="price" val="24398000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@force_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="88, 114" />
+				<player categoryType="FORCE_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -321,11 +318,10 @@
 		<set name="price" val="24398000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@bard}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="100, 107" />
+				<player categoryType="BARD" />
 			</and>
 		</cond>
 		<for>
@@ -446,7 +442,7 @@
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
 		<cond msgId="1518">
-			<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+			<player categoryType="DAGGER_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -466,9 +462,8 @@
 		<set name="price" val="18298000" />
 		<set name="element_enabled" val="true" />
 		<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" />
+			<player categoryType="BOW_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -579,11 +574,10 @@
 		<set name="price" val="18298000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@heal_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="97, 105, 112" />
+				<player categoryType="HEAL_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -605,11 +599,10 @@
 		<set name="price" val="18298000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@buff_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="98, 115, 116" />
+				<player categoryType="BUFF_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -631,11 +624,10 @@
 		<set name="price" val="18298000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@summon_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="96, 104, 111" />
+				<player categoryType="SUMMON_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -657,11 +649,10 @@
 		<set name="price" val="18298000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@wizard_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="94, 95, 103, 110" />
+				<player categoryType="WIZARD_MASTER" />
 			</and>
 		</cond>
 		<for>

L2J_DataPack_BETA/dist/game/data/stats/items/10100-10199.xml

@@ -336,11 +336,10 @@
 		<set name="price" val="18298000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@force_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="88, 114" />
+				<player categoryType="FORCE_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -361,9 +360,8 @@
 		<set name="price" val="18298000" />
 		<set name="element_enabled" val="true" />
 		<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" />
+			<player categoryType="WEAPON_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -961,9 +959,8 @@
 		<set name="price" val="18298000" />
 		<set name="element_enabled" val="true" />
 		<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" />
+			<player categoryType="BUFF_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -977,10 +974,9 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="wood" />
 		<set name="weight" val="10" />
-		<set name="equip_condition" val="{ec_category;{@buff_master2_3}}" />
 		<cond msgId="1518">
 			<and>
-				<player class_id_restriction="135, 136" /> <!-- Kamael Enchanter 2nd or 3rd Class -->
+				<player categoryType="BUFF_MASTER2_3" />
 				<player level="40" />
 			</and>
 		</cond>

L2J_DataPack_BETA/dist/game/data/stats/items/10200-10299.xml

@@ -199,9 +199,8 @@
 		<set name="price" val="18298000" />
 		<set name="element_enabled" val="true" />
 		<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" />
+			<player categoryType="SUMMON_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -597,11 +596,10 @@
 		<set name="price" val="33673000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@shield_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="90, 91, 99, 106" />
+				<player categoryType="SHIELD_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -622,11 +620,10 @@
 		<set name="price" val="33673000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@weapon_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="89, 113, 117, 118" />
+				<player categoryType="WEAPON_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -647,11 +644,10 @@
 		<set name="price" val="33673000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@force_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="88, 114" />
+				<player categoryType="FORCE_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -672,11 +668,10 @@
 		<set name="price" val="33673000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@bard}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="100, 107" />
+				<player categoryType="BARD" />
 			</and>
 		</cond>
 		<for>
@@ -716,7 +711,7 @@
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
 		<cond msgId="1518">
-			<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+			<player categoryType="DAGGER_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -736,9 +731,8 @@
 		<set name="price" val="25255000" />
 		<set name="element_enabled" val="true" />
 		<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" />
+			<player categoryType="BOW_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -780,11 +774,10 @@
 		<set name="price" val="25255000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@heal_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="97, 105, 112" />
+				<player categoryType="HEAL_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -806,11 +799,10 @@
 		<set name="price" val="25255000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@buff_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="98, 115, 116" />
+				<player categoryType="BUFF_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -832,11 +824,10 @@
 		<set name="price" val="25255000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@summon_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="96, 104, 111" />
+				<player categoryType="SUMMON_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -858,11 +849,10 @@
 		<set name="price" val="25255000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@wizard_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="94, 95, 103, 110" />
+				<player categoryType="WIZARD_MASTER" />
 			</and>
 		</cond>
 		<for>

L2J_DataPack_BETA/dist/game/data/stats/items/10400-10499.xml

@@ -1837,9 +1837,8 @@
 		<set name="price" val="25255000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@force_master}}}" />
 		<cond msgId="1518">
-			<player class_id_restriction="88, 114" />
+			<player categoryType="FORCE_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -1859,9 +1858,8 @@
 		<set name="price" val="25255000" />
 		<set name="element_enabled" val="true" />
 		<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" />
+			<player categoryType="WEAPON_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -1881,9 +1879,8 @@
 		<set name="price" val="25255000" />
 		<set name="element_enabled" val="true" />
 		<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" />
+			<player categoryType="BUFF_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -1903,9 +1900,8 @@
 		<set name="price" val="25255000" />
 		<set name="element_enabled" val="true" />
 		<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" />
+			<player categoryType="SUMMON_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />

L2J_DataPack_BETA/dist/game/data/stats/items/10800-10899.xml

@@ -82,11 +82,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@shield_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="90, 91, 99, 106" />
+				<player categoryType="SHIELD_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -109,11 +108,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@weapon_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="89, 113, 117, 118" />
+				<player categoryType="WEAPON_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -136,11 +134,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@force_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="88, 114" />
+				<player categoryType="FORCE_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -163,11 +160,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@bard}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="100, 107" />
+				<player categoryType="BARD" />
 			</and>
 		</cond>
 		<for>
@@ -211,7 +207,7 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<cond msgId="1518">
-			<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+			<player categoryType="DAGGER_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -233,9 +229,8 @@
 		<set name="is_tradable" val="false" />
 		<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" />
+			<player categoryType="BOW_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -281,11 +276,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@heal_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="97, 105, 112" />
+				<player categoryType="HEAL_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -309,11 +303,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@buff_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="98, 115, 116" />
+				<player categoryType="BUFF_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -337,11 +330,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@summon_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="96, 104, 111" />
+				<player categoryType="SUMMON_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -365,11 +357,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@wizard_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="94, 95, 103, 110" />
+				<player categoryType="WIZARD_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -393,11 +384,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@force_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="88, 114" />
+				<player categoryType="FORCE_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -420,9 +410,8 @@
 		<set name="is_tradable" val="false" />
 		<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" />
+			<player categoryType="WEAPON_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -444,9 +433,8 @@
 		<set name="is_tradable" val="false" />
 		<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" />
+			<player categoryType="BUFF_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -468,9 +456,8 @@
 		<set name="is_tradable" val="false" />
 		<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" />
+			<player categoryType="SUMMON_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -515,11 +502,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@shield_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="90, 91, 99, 106" />
+				<player categoryType="SHIELD_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -542,11 +528,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@weapon_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="89, 113, 117, 118" />
+				<player categoryType="WEAPON_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -569,11 +554,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@force_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="88, 114" />
+				<player categoryType="FORCE_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -596,11 +580,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@bard}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="100, 107" />
+				<player categoryType="BARD" />
 			</and>
 		</cond>
 		<for>
@@ -644,7 +627,7 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<cond msgId="1518">
-			<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+			<player categoryType="DAGGER_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -666,9 +649,8 @@
 		<set name="is_tradable" val="false" />
 		<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" />
+			<player categoryType="BOW_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -714,11 +696,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@heal_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="97, 105, 112" />
+				<player categoryType="HEAL_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -742,11 +723,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@buff_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="98, 115, 116" />
+				<player categoryType="BUFF_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -770,11 +750,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@summon_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="96, 104, 111" />
+				<player categoryType="SUMMON_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -798,11 +777,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@wizard_master}}}" />
 		<cond msgId="1518">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="94, 95, 103, 110" />
+				<player categoryType="WIZARD_MASTER" />
 			</and>
 		</cond>
 		<for>
@@ -826,9 +804,8 @@
 		<set name="is_tradable" val="false" />
 		<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" />
+			<player categoryType="FORCE_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -850,9 +827,8 @@
 		<set name="is_tradable" val="false" />
 		<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" />
+			<player categoryType="WEAPON_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -874,9 +850,8 @@
 		<set name="is_tradable" val="false" />
 		<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" />
+			<player categoryType="BUFF_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -898,9 +873,8 @@
 		<set name="is_tradable" val="false" />
 		<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" />
+			<player categoryType="SUMMON_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />

L2J_DataPack_BETA/dist/game/data/stats/items/11500-11599.xml

@@ -381,7 +381,7 @@
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
 		<cond msgId="1518">
-			<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+			<player categoryType="DAGGER_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -401,7 +401,9 @@
 		<set name="price" val="18298000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@bow_master}}}" />
+		<cond msgId="1518">
+			<player categoryType="BOW_MASTER" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
@@ -420,9 +422,11 @@
 		<set name="price" val="18298000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@force_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="FORCE_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -442,9 +446,11 @@
 		<set name="price" val="18298000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@weapon_master}}}" />
 		<cond msgId="1518">
-			<player races="Kamael" />
+			<and>
+				<player races="Kamael" />
+				<player categoryType="WEAPON_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -464,7 +470,9 @@
 		<set name="price" val="18298000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@buff_master}}}" />
+		<cond msgId="1518">
+			<player categoryType="BUFF_MASTER" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
@@ -483,7 +491,9 @@
 		<set name="price" val="18298000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@summon_master}}}" />
+		<cond msgId="1518">
+			<player categoryType="SUMMON_MASTER" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
@@ -581,9 +591,11 @@
 		<set name="price" val="24398000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@shield_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="SHIELD_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="226" />
@@ -603,9 +615,11 @@
 		<set name="price" val="24398000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@weapon_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="WEAPON_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="226" />
@@ -625,9 +639,11 @@
 		<set name="price" val="24398000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@force_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="FORCE_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="226" />
@@ -647,9 +663,11 @@
 		<set name="price" val="24398000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@bard}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="BARD" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="226" />
@@ -735,9 +753,11 @@
 		<set name="price" val="25255000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@heal_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="HEAL_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="113" />
@@ -758,9 +778,11 @@
 		<set name="price" val="25255000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@buff_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="BUFF_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="113" />
@@ -781,9 +803,11 @@
 		<set name="price" val="25255000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@summon_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="SUMMON_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="113" />
@@ -804,9 +828,11 @@
 		<set name="price" val="25255000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@wizard_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="WIZARD_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="113" />
@@ -868,7 +894,7 @@
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
 		<cond msgId="1518">
-			<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+			<player categoryType="DAGGER_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -888,7 +914,9 @@
 		<set name="price" val="25255000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@bow_master}}}" />
+		<cond msgId="1518">
+			<player categoryType="BOW_MASTER" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
@@ -907,7 +935,9 @@
 		<set name="price" val="25255000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@force_master}}}" />
+		<cond msgId="1518">
+			<player categoryType="FORCE_MASTER" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
@@ -926,7 +956,9 @@
 		<set name="price" val="25255000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@weapon_master}}}" />
+		<cond msgId="1518">
+			<player categoryType="WEAPON_MASTER" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
@@ -945,7 +977,9 @@
 		<set name="price" val="25255000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@buff_master}}}" />
+		<cond msgId="1518">
+			<player categoryType="BUFF_MASTER" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
@@ -964,7 +998,9 @@
 		<set name="price" val="25255000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@summon_master}}}" />
+		<cond msgId="1518">
+			<player categoryType="SUMMON_MASTER" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 			<enchant order="0x0C" stat="pDef" val="0" />
@@ -1006,9 +1042,11 @@
 		<set name="price" val="18298000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@heal_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="HEAL_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="113" />
@@ -1029,9 +1067,11 @@
 		<set name="price" val="18298000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@buff_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="BUFF_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="113" />
@@ -1052,9 +1092,11 @@
 		<set name="price" val="18298000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@summon_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="SUMMON_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="113" />
@@ -1075,9 +1117,11 @@
 		<set name="price" val="18298000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@wizard_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="WIZARD_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="113" />
@@ -1120,9 +1164,11 @@
 		<set name="price" val="33673000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@shield_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="SHIELD_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="226" />
@@ -1142,9 +1188,11 @@
 		<set name="price" val="33673000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@weapon_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="WEAPON_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="226" />
@@ -1164,9 +1212,11 @@
 		<set name="price" val="33673000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@force_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="FORCE_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="226" />
@@ -1186,9 +1236,11 @@
 		<set name="price" val="33673000" />
 		<set name="element_enabled" val="true" />
 		<set name="enchant_enabled" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@bard}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="BARD" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="226" />

L2J_DataPack_BETA/dist/game/data/stats/items/12600-12699.xml

@@ -702,7 +702,7 @@
 		<set name="weight" val="4180" />
 		<set name="price" val="18298000" />
 		<cond msgId="1518">
-			<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+			<player categoryType="DAGGER_MASTER" />
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -716,7 +716,9 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="4180" />
 		<set name="price" val="18298000" />
-		<set name="equip_condition" val="{{ec_category;{@bow_master}}}" />
+		<cond msgId="1518">
+			<player categoryType="BOW_MASTER" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 		</for>
@@ -729,9 +731,11 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="4180" />
 		<set name="price" val="18298000" />
-		<set name="equip_condition" val="{{ec_category;{@force_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="FORCE_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -745,9 +749,11 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="4180" />
 		<set name="price" val="18298000" />
-		<set name="equip_condition" val="{{ec_category;{@weapon_master}}}" />
 		<cond msgId="1518">
-			<player races="Kamael" />
+			<and>
+				<player races="Kamael" />
+				<player categoryType="WEAPON_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
@@ -761,7 +767,9 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="4180" />
 		<set name="price" val="18298000" />
-		<set name="equip_condition" val="{{ec_category;{@buff_master}}}" />
+		<cond msgId="1518">
+			<player categoryType="BUFF_MASTER" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 		</for>
@@ -774,7 +782,9 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="4180" />
 		<set name="price" val="18298000" />
-		<set name="equip_condition" val="{{ec_category;{@summon_master}}}" />
+		<cond msgId="1518">
+			<player categoryType="SUMMON_MASTER" />
+		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="170" />
 		</for>
@@ -838,9 +848,11 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="7570" />
 		<set name="price" val="24398000" />
-		<set name="equip_condition" val="{{ec_category;{@shield_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="SHIELD_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="226" />
@@ -854,9 +866,11 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="7570" />
 		<set name="price" val="24398000" />
-		<set name="equip_condition" val="{{ec_category;{@weapon_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="WEAPON_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="226" />
@@ -870,9 +884,11 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="7570" />
 		<set name="price" val="24398000" />
-		<set name="equip_condition" val="{{ec_category;{@force_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="FORCE_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="226" />
@@ -886,9 +902,11 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="7570" />
 		<set name="price" val="24398000" />
-		<set name="equip_condition" val="{{ec_category;{@bard}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="BARD" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="226" />
@@ -947,9 +965,11 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="1780" />
 		<set name="price" val="25255000" />
-		<set name="equip_condition" val="{{ec_category;{@heal_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="HEAL_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x40" stat="maxMp" val="592" />
@@ -963,9 +983,11 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="1780" />
 		<set name="price" val="25255000" />
-		<set name="equip_condition" val="{{ec_category;{@buff_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="BUFF_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x40" stat="maxMp" val="592" />
@@ -979,9 +1001,11 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="1780" />
 		<set name="price" val="25255000" />
-		<set name="equip_condition" val="{{ec_category;{@summon_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="SUMMON_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x40" stat="maxMp" val="592" />
@@ -995,9 +1019,11 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="1780" />
 		<set name="price" val="25255000" />
-		<set name="equip_condition" val="{{ec_category;{@wizard_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="WIZARD_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x40" stat="maxMp" val="592" />
@@ -1035,7 +1061,7 @@
 		<set name="weight" val="4180" />
 		<set name="price" val="25255000" />
 		<cond msgId="1518">
-			<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+			<player categoryType="DAGGER_MASTER" />
 		</cond>
 	</item>
 	<item id="12677" type="EtcItem" name="Foundation Dynasty Jewel Leather Armor">
@@ -1046,7 +1072,9 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="4180" />
 		<set name="price" val="25255000" />
-		<set name="equip_condition" val="{{ec_category;{@bow_master}}}" />
+		<cond msgId="1518">
+			<player categoryType="BOW_MASTER" />
+		</cond>
 	</item>
 	<item id="12678" type="EtcItem" name="Foundation Dynasty Jewel Leather Armor">
 		<set name="icon" val="icon.armor_t92_u_i00" />
@@ -1056,7 +1084,9 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="4180" />
 		<set name="price" val="25255000" />
-		<set name="equip_condition" val="{{ec_category;{@force_master}}}" />
+		<cond msgId="1518">
+			<player categoryType="FORCE_MASTER" />
+		</cond>
 	</item>
 	<item id="12679" type="EtcItem" name="Foundation Dynasty Jewel Leather Armor">
 		<set name="icon" val="icon.armor_t92_u_i00" />
@@ -1066,7 +1096,9 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="4180" />
 		<set name="price" val="25255000" />
-		<set name="equip_condition" val="{{ec_category;{@weapon_master}}}" />
+		<cond msgId="1518">
+			<player categoryType="WEAPON_MASTER" />
+		</cond>
 	</item>
 	<item id="12680" type="EtcItem" name="Foundation Dynasty Jewel Leather Armor">
 		<set name="icon" val="icon.armor_t92_u_i00" />
@@ -1076,7 +1108,9 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="4180" />
 		<set name="price" val="25255000" />
-		<set name="equip_condition" val="{{ec_category;{@buff_master}}}" />
+		<cond msgId="1518">
+			<player categoryType="BUFF_MASTER" />
+		</cond>
 	</item>
 	<item id="12681" type="EtcItem" name="Foundation Dynasty Jewel Leather Armor">
 		<set name="icon" val="icon.armor_t92_u_i00" />
@@ -1086,7 +1120,9 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="4180" />
 		<set name="price" val="25255000" />
-		<set name="equip_condition" val="{{ec_category;{@summon_master}}}" />
+		<cond msgId="1518">
+			<player categoryType="SUMMON_MASTER" />
+		</cond>
 	</item>
 	<item id="12682" type="EtcItem" name="Foundation Dynasty Tunic">
 		<set name="icon" val="icon.armor_t93_u_i00" />
@@ -1112,9 +1148,11 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="1780" />
 		<set name="price" val="18298000" />
-		<set name="equip_condition" val="{{ec_category;{@heal_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="HEAL_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="113" />
@@ -1129,9 +1167,11 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="1780" />
 		<set name="price" val="18298000" />
-		<set name="equip_condition" val="{{ec_category;{@buff_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="BUFF_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="113" />
@@ -1146,9 +1186,11 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="1780" />
 		<set name="price" val="18298000" />
-		<set name="equip_condition" val="{{ec_category;{@summon_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="SUMMON_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="113" />
@@ -1163,9 +1205,11 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="1780" />
 		<set name="price" val="18298000" />
-		<set name="equip_condition" val="{{ec_category;{@wizard_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="WIZARD_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<add order="0x10" stat="pDef" val="113" />
@@ -1192,9 +1236,11 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="7570" />
 		<set name="price" val="33673000" />
-		<set name="equip_condition" val="{{ec_category;{@shield_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="SHIELD_MASTER" />
+			</and>
 		</cond>
 	</item>
 	<item id="12689" type="EtcItem" name="Foundation Dynasty Platinum Plate">
@@ -1205,9 +1251,11 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="7570" />
 		<set name="price" val="33673000" />
-		<set name="equip_condition" val="{{ec_category;{@weapon_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="WEAPON_MASTER" />
+			</and>
 		</cond>
 	</item>
 	<item id="12690" type="EtcItem" name="Foundation Dynasty Platinum Plate">
@@ -1218,9 +1266,11 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="7570" />
 		<set name="price" val="33673000" />
-		<set name="equip_condition" val="{{ec_category;{@force_master}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="FORCE_MASTER" />
+			</and>
 		</cond>
 	</item>
 	<item id="12691" type="EtcItem" name="Foundation Dynasty Platinum Plate">
@@ -1231,9 +1281,11 @@
 		<set name="material" val="scale_of_dragon" />
 		<set name="weight" val="7570" />
 		<set name="price" val="33673000" />
-		<set name="equip_condition" val="{{ec_category;{@bard}}}" />
 		<cond msgId="1518">
-			<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+			<and>
+				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
+				<player categoryType="BARD" />
+			</and>
 		</cond>
 	</item>
 	<item id="12692" type="EtcItem" name="Foundation Dynasty Helmet">

L2J_DataPack_BETA/dist/game/data/stats/items/13500-13599.xml

@@ -323,12 +323,6 @@
 		<set name="spiritshots" val="3" />
 		<set name="is_tradable" val="false" />
 		<set name="is_sellable" val="false" />
-		<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" />

L2J_DataPack_BETA/dist/game/data/stats/items/13600-13699.xml

@@ -1484,11 +1484,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@rogue_cloack}}}" />
 		<cond msgId="2453">
 			<and>
 				<player castle="-1" /> <!-- owns a castle -->
-				<player class_id_restriction="92, 102, 109, 93, 101, 108" /> <!-- Bow Masters and Dagger Masters -->
+				<player categoryType="ROGUE_CLOACK" />
 				<player pledgeClass="5" /> <!-- Baron -->
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
 				<player cloakStatus="1" />
@@ -1511,11 +1510,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@mage_cloack}}}" />
 		<cond msgId="2453">
 			<and>
 				<player castle="-1" /> <!-- owns a castle -->
-				<player class_id_restriction="97, 105, 112, 98, 115, 116, 96, 104, 111, 94, 95, 103, 110" /> <!-- Healer, Enchanter, Summoner and Wizard -->
+				<player categoryType="MAGE_CLOACK" />
 				<player pledgeClass="5" /> <!-- Baron -->
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
 				<player cloakStatus="1" />

L2J_DataPack_BETA/dist/game/data/stats/items/13700-13799.xml

@@ -970,9 +970,11 @@
 		<set name="item_skill" val="8276-1" />
 		<set name="duration" val="60" />
 		<set name="useSkillDisTime" val="1" />
-		<set name="equip_condition" val="{{ec_category;{@shield_master]}" />
 		<cond msgId="1518">
-			<player instanceId="115,116,119,120,121,122" />
+			<and>
+				<player instanceId="115,116,119,120,121,122" />
+				<player categoryType="SHIELD_MASTER" />
+			</and>
 		</cond>
 		<for>
 			<sub order="0x10" stat="rEvas" val="8" />

L2J_DataPack_BETA/dist/game/data/stats/items/13800-13899.xml

@@ -968,7 +968,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="81" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>
@@ -1005,7 +1005,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="81" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>
@@ -1042,7 +1042,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="81" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>
@@ -1182,11 +1182,10 @@
 		<set name="material" val="cloth" />
 		<set name="weight" val="220" />
 		<set name="price" val="28671000" />
-		<set name="equip_condition" val="{{ec_category;{@rogue_cloack}}}" />
 		<cond msgId="2453">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="93, 101, 108, 92, 102, 109" /> <!-- Dagger Master and Bow Master -->
+				<player categoryType="ROGUE_CLOACK" />
 				<player cloakStatus="1" />
 			</and>
 		</cond>
@@ -1204,11 +1203,10 @@
 		<set name="material" val="cloth" />
 		<set name="weight" val="220" />
 		<set name="price" val="28671000" />
-		<set name="equip_condition" val="{{ec_category;{@mage_cloack}}}" />
 		<cond msgId="2453">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="97, 105, 112, 98, 115, 116, 96, 104, 111, 94, 95, 103, 110" /> <!-- Healer, Enchanter, Summoner and Wizard -->
+				<player categoryType="MAGE_CLOACK" />
 				<player cloakStatus="1" />
 			</and>
 		</cond>

L2J_DataPack_BETA/dist/game/data/stats/items/14400-14499.xml

@@ -1998,7 +1998,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="81" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>
@@ -2515,7 +2515,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="81" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>

L2J_DataPack_BETA/dist/game/data/stats/items/14500-14599.xml

@@ -826,7 +826,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="81" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>
@@ -863,7 +863,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="81" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>
@@ -902,7 +902,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="81" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>
@@ -941,7 +941,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="81" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>
@@ -1345,7 +1345,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="81" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>

L2J_DataPack_BETA/dist/game/data/stats/items/14600-14699.xml

@@ -151,11 +151,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@rogue_cloack}}}" />
 		<cond msgId="2453">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="93, 101, 108, 92, 102, 109" /> <!-- Dagger Master and Bow Master -->
+				<player categoryType="ROGUE_CLOACK" />
 				<player cloakStatus="1" />
 			</and>
 		</cond>
@@ -192,11 +191,10 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="equip_condition" val="{{ec_category;{@mage_cloack}}}" />
 		<cond msgId="2453">
 			<and>
 				<player races="Human,Elf,DarkElf,Orc,Dwarf" />
-				<player class_id_restriction="97, 105, 112, 98, 115, 116, 96, 104, 111, 94, 95, 103, 110" /> <!-- Healer, Enchanter, Summoner and Wizard -->
+				<player categoryType="MAGE_CLOACK" />
 				<player cloakStatus="1" />
 			</and>
 		</cond>

L2J_DataPack_BETA/dist/game/data/stats/items/14700-14799.xml

@@ -1308,7 +1308,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="81" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>

L2J_DataPack_BETA/dist/game/data/stats/items/15300-15399.xml

@@ -201,7 +201,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="81" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>

L2J_DataPack_BETA/dist/game/data/stats/items/16100-16199.xml

@@ -812,7 +812,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="81" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>
@@ -851,7 +851,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="81" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>
@@ -948,7 +948,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="84" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>
@@ -987,7 +987,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="84" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>
@@ -1084,7 +1084,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="85" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>
@@ -1123,7 +1123,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="85" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>

L2J_DataPack_BETA/dist/game/data/stats/items/21900-21999.xml

@@ -749,7 +749,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="81" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>
@@ -790,7 +790,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="81" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>
@@ -828,7 +828,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="81" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>
@@ -869,7 +869,7 @@
 		<cond msgId="1518">
 			<and>
 				<player level="81" />
-				<player class_id_restriction="93, 101, 108, 117" /> <!-- Dagger Masters -->
+				<player categoryType="DAGGER_MASTER" />
 				<player subclass="false" /> <!-- TEMP FIX only for customs subclass 80+ -->
 			</and>
 		</cond>