Procházet zdrojové kódy

BETA: Enchant Level for ItemAuctions is now taken directly from Item files, also added missing attributes in XSD file. '''NOTE: Require CORE [L5594]'''.

MELERIX před 12 roky
rodič
revize
f1f171c1f1

+ 34 - 100
L2J_DataPack_BETA/dist/game/data/ItemAuctions.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ItemAuctions.xsd">
-	<!-- Samples -->
+	<!-- Documentation: -->
 	<!-- <instance id="NPC ID of the auctioneer" day_of_week="1 - Monday, 7 - Sunday" hour_of_day="0-23" minute_of_hour="0-59"> -->
 	<!-- <item auctionItemId="1" itemId="9901" itemCount="1" auctionInitBid="100000" auctionLenght="300 (in minutes)"> -->
 	<!-- <extra enchant_level="15" augmentation_id="you can take it from item_attributes table" augmentation_skill_id="3241" augmentation_skill_lvl="10" /> -->
@@ -13,37 +13,21 @@
 	<instance id="32320" day_of_week="5" hour_of_day="17">
 		<!-- Improved Weapons (No-Grade) +15 -->
 		<!-- Improved Falchion -->
-		<item auctionItemId="1" itemId="9901" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="1" itemId="9901" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Great Spear -->
-		<item auctionItemId="2" itemId="9902" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="2" itemId="9902" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Iron Hammer -->
-		<item auctionItemId="3" itemId="9903" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="3" itemId="9903" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Sword Breaker -->
-		<item auctionItemId="4" itemId="9904" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="4" itemId="9904" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Viper Fang -->
-		<item auctionItemId="5" itemId="9905" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="5" itemId="9905" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Composite Bow -->
-		<item auctionItemId="6" itemId="9906" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="6" itemId="9906" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Flanged Mace -->
-		<item auctionItemId="7" itemId="9907" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="7" itemId="9907" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Mage Staff -->
-		<item auctionItemId="8" itemId="9908" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="8" itemId="9908" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Life Stones -->
 		<!-- Top-Grade Life Stone - Level 80 -->
 		<item auctionItemId="9" itemId="9576" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
@@ -194,52 +178,30 @@
 		<item auctionItemId="79" itemId="15588" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Enchaced Epic Jewelery -->
 		<!-- Greater Queen Ant's Ring -->
-		<item auctionItemId="80" itemId="22174" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="5" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="80" itemId="22174" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Greater Zaken's Earring of Immortality -->
-		<item auctionItemId="81" itemId="22175" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="5" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="81" itemId="22175" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Greater Baium's Ring -->
-		<item auctionItemId="82" itemId="22173" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="5" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="82" itemId="22173" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 	</instance>
 	<instance id="32321" day_of_week="1" hour_of_day="17">
 		<!-- Improved Weapons (No-Grade) +15 -->
 		<!-- Improved Falchion -->
-		<item auctionItemId="1" itemId="9901" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="1" itemId="9901" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Great Spear -->
-		<item auctionItemId="2" itemId="9902" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="2" itemId="9902" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Iron Hammer -->
-		<item auctionItemId="3" itemId="9903" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="3" itemId="9903" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Sword Breaker -->
-		<item auctionItemId="4" itemId="9904" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="4" itemId="9904" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Viper Fang -->
-		<item auctionItemId="5" itemId="9905" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="5" itemId="9905" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Composite Bow -->
-		<item auctionItemId="6" itemId="9906" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="6" itemId="9906" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Flanged Mace -->
-		<item auctionItemId="7" itemId="9907" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="7" itemId="9907" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Mage Staff -->
-		<item auctionItemId="8" itemId="9908" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="8" itemId="9908" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Life Stones -->
 		<!-- Top-Grade Life Stone - Level 80 -->
 		<item auctionItemId="9" itemId="9576" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
@@ -390,52 +352,30 @@
 		<item auctionItemId="79" itemId="15588" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Enchaced Epic Jewelery -->
 		<!-- Greater Queen Ant's Ring -->
-		<item auctionItemId="80" itemId="22174" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="5" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="80" itemId="22174" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Greater Zaken's Earring of Immortality -->
-		<item auctionItemId="81" itemId="22175" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="5" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="81" itemId="22175" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Greater Baium's Ring -->
-		<item auctionItemId="82" itemId="22173" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="5" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="82" itemId="22173" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 	</instance>
 	<instance id="32322" day_of_week="3" hour_of_day="17">
 		<!-- Improved Weapons (No-Grade) +15 -->
 		<!-- Improved Falchion -->
-		<item auctionItemId="1" itemId="9901" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="1" itemId="9901" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Great Spear -->
-		<item auctionItemId="2" itemId="9902" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="2" itemId="9902" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Iron Hammer -->
-		<item auctionItemId="3" itemId="9903" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="3" itemId="9903" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Sword Breaker -->
-		<item auctionItemId="4" itemId="9904" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="4" itemId="9904" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Viper Fang -->
-		<item auctionItemId="5" itemId="9905" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="5" itemId="9905" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Composite Bow -->
-		<item auctionItemId="6" itemId="9906" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="6" itemId="9906" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Flanged Mace -->
-		<item auctionItemId="7" itemId="9907" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="7" itemId="9907" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Improved Mage Staff -->
-		<item auctionItemId="8" itemId="9908" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="15" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="8" itemId="9908" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Life Stones -->
 		<!-- Top-Grade Life Stone - Level 80 -->
 		<item auctionItemId="9" itemId="9576" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
@@ -586,16 +526,10 @@
 		<item auctionItemId="79" itemId="15588" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Enchaced Epic Jewelery -->
 		<!-- Greater Queen Ant's Ring -->
-		<item auctionItemId="80" itemId="22174" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="5" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="80" itemId="22174" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Greater Zaken's Earring of Immortality -->
-		<item auctionItemId="81" itemId="22175" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="5" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="81" itemId="22175" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 		<!-- Greater Baium's Ring -->
-		<item auctionItemId="82" itemId="22173" itemCount="1" auctionInitBid="100000" auctionLenght="300">
-			<extra enchant_level="5" /> <!-- FIXME: This should be inside items not here -->
-		</item>
+		<item auctionItemId="82" itemId="22173" itemCount="1" auctionInitBid="100000" auctionLenght="300" />
 	</instance>
 </list>

+ 3 - 1
L2J_DataPack_BETA/dist/game/data/xsd/ItemAuctions.xsd

@@ -11,7 +11,9 @@
 									<xs:sequence minOccurs="1" maxOccurs="1">
 										<xs:element name="extra" minOccurs="0" maxOccurs="1">
 											<xs:complexType>
-												<xs:attribute name="enchant_level" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="augmentation_id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="augmentation_skill_id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="augmentation_skill_lvl" type="xs:positiveInteger" use="required" />
 											</xs:complexType>
 										</xs:element>
 									</xs:sequence>