lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added enchantmentLevel for multisell enchanted item and ingredients.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-11-07 11:37:12 +00:00
parent c0b6d218f0
commit b19fd303fd
30 changed files with 382 additions and 376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/multisell/31255.xml vendored
View File

@ -3,7 +3,7 @@
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!-- Squash Seed -->
<item id="1">
<ingredient id="6391" count="1" enchant="0" />
<production id="6389" count="1" enchant="0" />
<ingredient id="6391" count="1" />
<production id="6389" count="1" />
</item>
</list>

4
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/multisell/312551.xml vendored
View File

@ -3,7 +3,7 @@
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!--Large Squash Seed -->
<item id="1">
<ingredient id="6391" count="50" enchant="0" />
<production id="6390" count="1" enchant="0" />
<ingredient id="6391" count="50" />
<production id="6390" count="1" />
</item>
</list>

16
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/multisell/312552.xml vendored
View File

@ -2,22 +2,22 @@
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!-- Chrono Cithara -->
<item id="1">
<ingredient id="6391" count="10" enchant="0" />
<production id="4202" count="1" enchant="0" />
<ingredient id="6391" count="10" />
<production id="4202" count="1" />
</item>
<!-- Chrono Unitus-->
<item id="2">
<ingredient id="6391" count="10" enchant="0" />
<production id="5133" count="1" enchant="0" />
<ingredient id="6391" count="10" />
<production id="5133" count="1" />
</item>
<!-- Chrono Campana -->
<item id="3">
<ingredient id="6391" count="10" enchant="0" />
<production id="5817" count="1" enchant="0" />
<ingredient id="6391" count="10" />
<production id="5817" count="1" />
</item>
<!-- Chrono Darubka -->
<item id="4">
<ingredient id="6391" count="10" enchant="0" />
<production id="7058" count="1" enchant="0" />
<ingredient id="6391" count="10" />
<production id="7058" count="1" />
</item>
</list>

8
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/multisell/313750001.xml vendored
View File

@ -3,12 +3,12 @@
<list maintainEnchantment="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!-- Brown Pouch -->
<item id="1">
<ingredient id="7186" count="55" enchant="0" />
<production id="7634" count="1" enchant="0" />
<ingredient id="7186" count="55" />
<production id="7634" count="1" />
</item>
<!-- Scroll of Escape - Ketra -->
<item id="2">
<ingredient id="7186" count="80" enchant="0" />
<production id="7618" count="1" enchant="0" />
<ingredient id="7186" count="80" />
<production id="7618" count="1" />
</item>
</list>

12
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/multisell/313750002.xml vendored
View File

@ -3,17 +3,17 @@
<list maintainEnchantment="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!-- Brown Pouch -->
<item id="1">
<ingredient id="7186" count="55" enchant="0" />
<production id="7634" count="1" enchant="0" />
<ingredient id="7186" count="55" />
<production id="7634" count="1" />
</item>
<!-- Scroll of Escape - Ketra -->
<item id="2">
<ingredient id="7186" count="80" enchant="0" />
<production id="7618" count="1" enchant="0" />
<ingredient id="7186" count="80" />
<production id="7618" count="1" />
</item>
<!-- Gray Pouch -->
<item id="3">
<ingredient id="7186" count="55" enchant="0" />
<production id="7635" count="1" enchant="0" />
<ingredient id="7186" count="55" />
<production id="7635" count="1" />
</item>
</list>

32
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/multisell/313750003.xml vendored
View File

@ -3,42 +3,42 @@
<list maintainEnchantment="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!-- Brown Pouch -->
<item id="1">
<ingredient id="7186" count="55" enchant="0" />
<production id="7634" count="1" enchant="0" />
<ingredient id="7186" count="55" />
<production id="7634" count="1" />
</item>
<!-- Scroll of Escape - Ketra -->
<item id="2">
<ingredient id="7186" count="80" enchant="0" />
<production id="7618" count="1" enchant="0" />
<ingredient id="7186" count="80" />
<production id="7618" count="1" />
</item>
<!-- Gray Pouch -->
<item id="3">
<ingredient id="7186" count="55" enchant="0" />
<production id="7635" count="1" enchant="0" />
<ingredient id="7186" count="55" />
<production id="7635" count="1" />
</item>
<!-- White Cargo Box -->
<item id="4">
<ingredient id="7186" count="150" enchant="0" />
<production id="7629" count="1" enchant="0" />
<ingredient id="7186" count="150" />
<production id="7629" count="1" />
</item>
<!-- Blue Cargo Box -->
<item id="5">
<ingredient id="7186" count="60" enchant="0" />
<production id="7630" count="1" enchant="0" />
<ingredient id="7186" count="60" />
<production id="7630" count="1" />
</item>
<!-- Yellow Cargo Box -->
<item id="6">
<ingredient id="7186" count="60" enchant="0" />
<production id="7631" count="1" enchant="0" />
<ingredient id="7186" count="60" />
<production id="7631" count="1" />
</item>
<!-- Red Cargo Box -->
<item id="7">
<ingredient id="7186" count="150" enchant="0" />
<production id="7632" count="1" enchant="0" />
<ingredient id="7186" count="150" />
<production id="7632" count="1" />
</item>
<!-- Purple Cargo Box -->
<item id="8">
<ingredient id="7186" count="500" enchant="0" />
<production id="7633" count="1" enchant="0" />
<ingredient id="7186" count="500" />
<production id="7633" count="1" />
</item>
</list>

8
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/multisell/313820001.xml vendored
View File

@ -3,12 +3,12 @@
<list maintainEnchantment="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!-- Brown Pouch -->
<item id="1">
<ingredient id="7187" count="55" enchant="0" />
<production id="7634" count="1" enchant="0" />
<ingredient id="7187" count="55" />
<production id="7634" count="1" />
</item>
<!-- Scroll of Escape - Varka -->
<item id="2">
<ingredient id="7187" count="80" enchant="0" />
<production id="7619" count="1" enchant="0" />
<ingredient id="7187" count="80" />
<production id="7619" count="1" />
</item>
</list>

12
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/multisell/313820002.xml vendored
View File

@ -3,17 +3,17 @@
<list maintainEnchantment="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!-- Brown Pouch -->
<item id="1">
<ingredient id="7187" count="55" enchant="0" />
<production id="7634" count="1" enchant="0" />
<ingredient id="7187" count="55" />
<production id="7634" count="1" />
</item>
<!-- Scroll of Escape - Varka -->
<item id="2">
<ingredient id="7187" count="80" enchant="0" />
<production id="7619" count="1" enchant="0" />
<ingredient id="7187" count="80" />
<production id="7619" count="1" />
</item>
<!-- Gray Pouch -->
<item id="3">
<ingredient id="7187" count="55" enchant="0" />
<production id="7635" count="1" enchant="0" />
<ingredient id="7187" count="55" />
<production id="7635" count="1" />
</item>
</list>

32
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/multisell/313820003.xml vendored
View File

@ -3,42 +3,42 @@
<list maintainEnchantment="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!-- Brown Pouch -->
<item id="1">
<ingredient id="7187" count="55" enchant="0" />
<production id="7634" count="1" enchant="0" />
<ingredient id="7187" count="55" />
<production id="7634" count="1" />
</item>
<!-- Scroll of Escape - Varka -->
<item id="2">
<ingredient id="7187" count="80" enchant="0" />
<production id="7619" count="1" enchant="0" />
<ingredient id="7187" count="80" />
<production id="7619" count="1" />
</item>
<!-- Gray Pouch -->
<item id="3">
<ingredient id="7187" count="55" enchant="0" />
<production id="7635" count="1" enchant="0" />
<ingredient id="7187" count="55" />
<production id="7635" count="1" />
</item>
<!-- White Cargo Box -->
<item id="4">
<ingredient id="7187" count="150" enchant="0" />
<production id="7629" count="1" enchant="0" />
<ingredient id="7187" count="150" />
<production id="7629" count="1" />
</item>
<!-- Blue Cargo Box -->
<item id="5">
<ingredient id="7187" count="60" enchant="0" />
<production id="7630" count="1" enchant="0" />
<ingredient id="7187" count="60" />
<production id="7630" count="1" />
</item>
<!-- Yellow Cargo Box -->
<item id="6">
<ingredient id="7187" count="60" enchant="0" />
<production id="7631" count="1" enchant="0" />
<ingredient id="7187" count="60" />
<production id="7631" count="1" />
</item>
<!-- Red Cargo Box -->
<item id="7">
<ingredient id="7187" count="150" enchant="0" />
<production id="7632" count="1" enchant="0" />
<ingredient id="7187" count="150" />
<production id="7632" count="1" />
</item>
<!-- Purple Cargo Box -->
<item id="8">
<ingredient id="7187" count="500" enchant="0" />
<production id="7633" count="1" enchant="0" />
<ingredient id="7187" count="500" />
<production id="7633" count="1" />
</item>
</list>

24
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/multisell/90012.xml vendored
View File

@ -3,27 +3,27 @@
<list maintainEnchantment="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!-- SS/Arrows -->
<item id="1">
<ingredient id="4037" count="5" enchant="0" />
<production id="4897" count="1" enchant="0" />
<ingredient id="4037" count="5" />
<production id="4897" count="1" />
</item>
<item id="2">
<ingredient id="4037" count="5" enchant="0" />
<production id="4898" count="1" enchant="0" />
<ingredient id="4037" count="5" />
<production id="4898" count="1" />
</item>
<item id="3">
<ingredient id="4037" count="5" enchant="0" />
<production id="4899" count="1" enchant="0" />
<ingredient id="4037" count="5" />
<production id="4899" count="1" />
</item>
<item id="4">
<ingredient id="4037" count="5" enchant="0" />
<production id="4900" count="1" enchant="0" />
<ingredient id="4037" count="5" />
<production id="4900" count="1" />
</item>
<item id="5">
<ingredient id="4037" count="5" enchant="0" />
<production id="4901" count="1" enchant="0" />
<ingredient id="4037" count="5" />
<production id="4901" count="1" />
</item>
<item id="6">
<ingredient id="4037" count="5" enchant="0" />
<production id="4902" count="1" enchant="0" />
<ingredient id="4037" count="5" />
<production id="4902" count="1" />
</item>
</list>

192
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/multisell/90051.xml vendored
View File

@ -2,195 +2,195 @@
<!-- Custom GM-Shop -->
<list maintainEnchantment="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<item id="1">
<ingredient id="57" count="100000" enchant="0" />
<production id="4553" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4553" count="1" />
</item>
<item id="2">
<ingredient id="57" count="100000" enchant="0" />
<production id="4554" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4554" count="1" />
</item>
<item id="3">
<ingredient id="57" count="100000" enchant="0" />
<production id="4555" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4555" count="1" />
</item>
<item id="4">
<ingredient id="57" count="100000" enchant="0" />
<production id="4556" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4556" count="1" />
</item>
<item id="5">
<ingredient id="57" count="100000" enchant="0" />
<production id="4557" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4557" count="1" />
</item>
<item id="6">
<ingredient id="57" count="100000" enchant="0" />
<production id="4558" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4558" count="1" />
</item>
<item id="7">
<ingredient id="57" count="180000" enchant="0" />
<production id="4559" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4559" count="1" />
</item>
<item id="8">
<ingredient id="57" count="100000" enchant="0" />
<production id="4560" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4560" count="1" />
</item>
<item id="9">
<ingredient id="57" count="100000" enchant="0" />
<production id="4561" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4561" count="1" />
</item>
<item id="10">
<ingredient id="57" count="100000" enchant="0" />
<production id="4562" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4562" count="1" />
</item>
<item id="11">
<ingredient id="57" count="100000" enchant="0" />
<production id="4563" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4563" count="1" />
</item>
<item id="12">
<ingredient id="57" count="100000" enchant="0" />
<production id="4564" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4564" count="1" />
</item>
<item id="13">
<ingredient id="57" count="120000" enchant="0" />
<production id="4589" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4589" count="1" />
</item>
<item id="14">
<ingredient id="57" count="120000" enchant="0" />
<production id="4590" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4590" count="1" />
</item>
<item id="15">
<ingredient id="57" count="120000" enchant="0" />
<production id="4591" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4591" count="1" />
</item>
<item id="16">
<ingredient id="57" count="120000" enchant="0" />
<production id="4592" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4592" count="1" />
</item>
<item id="17">
<ingredient id="57" count="120000" enchant="0" />
<production id="4593" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4593" count="1" />
</item>
<item id="18">
<ingredient id="57" count="120000" enchant="0" />
<production id="4594" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4594" count="1" />
</item>
<item id="19">
<ingredient id="57" count="120000" enchant="0" />
<production id="4595" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4595" count="1" />
</item>
<item id="20">
<ingredient id="57" count="180000" enchant="0" />
<production id="4596" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4596" count="1" />
</item>
<item id="21">
<ingredient id="57" count="120000" enchant="0" />
<production id="4597" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4597" count="1" />
</item>
<item id="22">
<ingredient id="57" count="120000" enchant="0" />
<production id="4598" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4598" count="1" />
</item>
<item id="23">
<ingredient id="57" count="120000" enchant="0" />
<production id="4599" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4599" count="1" />
</item>
<item id="24">
<ingredient id="57" count="120000" enchant="0" />
<production id="4600" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4600" count="1" />
</item>
<item id="25">
<ingredient id="57" count="180000" enchant="0" />
<production id="4601" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4601" count="1" />
</item>
<item id="26">
<ingredient id="57" count="180000" enchant="0" />
<production id="4602" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4602" count="1" />
</item>
<item id="27">
<ingredient id="57" count="180000" enchant="0" />
<production id="4603" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4603" count="1" />
</item>
<item id="28">
<ingredient id="57" count="180000" enchant="0" />
<production id="4604" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4604" count="1" />
</item>
<item id="29">
<ingredient id="57" count="180000" enchant="0" />
<production id="4605" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4605" count="1" />
</item>
<item id="30">
<ingredient id="57" count="180000" enchant="0" />
<production id="4606" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4606" count="1" />
</item>
<item id="31">
<ingredient id="57" count="180000" enchant="0" />
<production id="4607" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4607" count="1" />
</item>
<item id="32">
<ingredient id="57" count="180000" enchant="0" />
<production id="4608" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4608" count="1" />
</item>
<item id="33">
<ingredient id="57" count="180000" enchant="0" />
<production id="4609" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4609" count="1" />
</item>
<item id="34">
<ingredient id="57" count="180000" enchant="0" />
<production id="4610" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4610" count="1" />
</item>
<item id="35">
<ingredient id="57" count="180000" enchant="0" />
<production id="4611" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4611" count="1" />
</item>
<item id="36">
<ingredient id="57" count="180000" enchant="0" />
<production id="4612" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4612" count="1" />
</item>
<item id="37">
<ingredient id="57" count="290000" enchant="0" />
<production id="4613" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4613" count="1" />
</item>
<item id="38">
<ingredient id="57" count="290000" enchant="0" />
<production id="4614" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4614" count="1" />
</item>
<item id="39">
<ingredient id="57" count="290000" enchant="0" />
<production id="4615" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4615" count="1" />
</item>
<item id="40">
<ingredient id="57" count="290000" enchant="0" />
<production id="4616" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4616" count="1" />
</item>
<item id="41">
<ingredient id="57" count="290000" enchant="0" />
<production id="4617" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4617" count="1" />
</item>
<item id="42">
<ingredient id="57" count="290000" enchant="0" />
<production id="4618" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4618" count="1" />
</item>
<item id="43">
<ingredient id="57" count="290000" enchant="0" />
<production id="4619" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4619" count="1" />
</item>
<item id="44">
<ingredient id="57" count="290000" enchant="0" />
<production id="4620" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4620" count="1" />
</item>
<item id="45">
<ingredient id="57" count="290000" enchant="0" />
<production id="4621" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4621" count="1" />
</item>
<item id="46">
<ingredient id="57" count="290000" enchant="0" />
<production id="4622" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4622" count="1" />
</item>
<item id="47">
<ingredient id="57" count="290000" enchant="0" />
<production id="4623" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4623" count="1" />
</item>
<item id="48">
<ingredient id="57" count="290000" enchant="0" />
<production id="4624" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4624" count="1" />
</item>
</list>

4
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/xsd/multisell.xsd vendored
View File

@ -13,14 +13,14 @@
<xs:attribute name="count" type="xs:unsignedInt" use="required" />
<xs:attribute name="isTaxIngredient" type="xs:boolean" use="optional" />
<xs:attribute name="mantainIngredient" type="xs:boolean" use="optional" />
<xs:attribute name="enchant" type="xs:unsignedByte" use="optional" />
<xs:attribute name="enchantmentLevel" type="xs:unsignedByte" use="optional" />
</xs:complexType>
</xs:element>
<xs:element name="production">
<xs:complexType>
<xs:attribute name="id" type="xs:unsignedShort" use="required" />
<xs:attribute name="count" type="xs:unsignedInt" use="required" />
<xs:attribute name="enchant" type="xs:unsignedByte" use="optional" />
<xs:attribute name="enchantmentLevel" type="xs:unsignedByte" use="optional" />
</xs:complexType>
</xs:element>
</xs:choice>

24
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
View File

@ -376,6 +376,13 @@ public class MultisellData
{
Node attribute;
// Enable enchant level on multisell ingredient using attribue "enchantmentLevel".
int enchantmentLevel = 0;
if (n.getAttributes().getNamedItem("enchantmentLevel") != null)
{
enchantmentLevel = Integer.parseInt(n.getAttributes().getNamedItem("enchantmentLevel").getNodeValue());
}
final int id = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
final int count = Integer.parseInt(n.getAttributes().getNamedItem("count").getNodeValue());
boolean isTaxIngredient = false;
@ -392,11 +399,18 @@ public class MultisellData
mantainIngredient = Boolean.parseBoolean(attribute.getNodeValue());
}
final MultiSellIngredient e = new MultiSellIngredient(id, count, isTaxIngredient, mantainIngredient);
final MultiSellIngredient e = new MultiSellIngredient(id, count, enchantmentLevel, isTaxIngredient, mantainIngredient);
entry.addIngredient(e);
}
else if ("production".equalsIgnoreCase(n.getNodeName()))
{
// Enable enchant level on multisell production using attribue "enchantmentLevel".
int enchantmentLevel = 0;
if (n.getAttributes().getNamedItem("enchantmentLevel") != null)
{
enchantmentLevel = Integer.parseInt(n.getAttributes().getNamedItem("enchantmentLevel").getNodeValue());
}
final int id = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
final int count = Integer.parseInt(n.getAttributes().getNamedItem("count").getNodeValue());
if (ItemTable.getInstance().getTemplate(id) == null)
@ -404,13 +418,7 @@ public class MultisellData
LOGGER.warning("Multisell: Item " + id + " does not exist.");
}
int enchant = 0;
// By Azagthtot support enchantment in multisell
if (n.getAttributes().getNamedItem("enchant") != null)
{
enchant = Integer.parseInt(n.getAttributes().getNamedItem("enchant").getNodeValue());
}
final MultiSellIngredient e = new MultiSellIngredient(id, count, enchant, false, false);
MultiSellIngredient e = new MultiSellIngredient(id, count, enchantmentLevel, false, false);
entry.addProduct(e);
}
}

5
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/multisell/MultiSellIngredient.java
View File

@ -27,11 +27,6 @@ public class MultiSellIngredient
private boolean _isTaxIngredient;
private boolean _mantainIngredient;
public MultiSellIngredient(int itemId, int itemCount, boolean isTaxIngredient, boolean mantainIngredient)
{
this(itemId, itemCount, 0, isTaxIngredient, mantainIngredient);
}
public MultiSellIngredient(int itemId, int itemCount, int enchantmentLevel, boolean isTaxIngredient, boolean mantainIngredient)
{
setItemId(itemId);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -481,7 +481,7 @@ public class MultiSellChoose implements IClientIncomingPacket
// Next add the adena amount, if any
if (totalAdenaCount > 0)
{
newEntry.addIngredient(new MultiSellIngredient(57, totalAdenaCount, false, false));
newEntry.addIngredient(new MultiSellIngredient(57, totalAdenaCount, 0, false, false));
}
// Now modify the enchantment level of products, if necessary

4
L2J_Mobius_C6_Interlude/dist/game/data/multisell/31255.xml vendored
View File

@ -3,7 +3,7 @@
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!-- Squash Seed -->
<item id="1">
<ingredient id="6391" count="1" enchant="0" />
<production id="6389" count="1" enchant="0" />
<ingredient id="6391" count="1" />
<production id="6389" count="1" />
</item>
</list>

4
L2J_Mobius_C6_Interlude/dist/game/data/multisell/312551.xml vendored
View File

@ -3,7 +3,7 @@
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!--Large Squash Seed -->
<item id="1">
<ingredient id="6391" count="50" enchant="0" />
<production id="6390" count="1" enchant="0" />
<ingredient id="6391" count="50" />
<production id="6390" count="1" />
</item>
</list>

16
L2J_Mobius_C6_Interlude/dist/game/data/multisell/312552.xml vendored
View File

@ -2,22 +2,22 @@
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!-- Chrono Cithara -->
<item id="1">
<ingredient id="6391" count="10" enchant="0" />
<production id="4202" count="1" enchant="0" />
<ingredient id="6391" count="10" />
<production id="4202" count="1" />
</item>
<!-- Chrono Unitus-->
<item id="2">
<ingredient id="6391" count="10" enchant="0" />
<production id="5133" count="1" enchant="0" />
<ingredient id="6391" count="10" />
<production id="5133" count="1" />
</item>
<!-- Chrono Campana -->
<item id="3">
<ingredient id="6391" count="10" enchant="0" />
<production id="5817" count="1" enchant="0" />
<ingredient id="6391" count="10" />
<production id="5817" count="1" />
</item>
<!-- Chrono Darubka -->
<item id="4">
<ingredient id="6391" count="10" enchant="0" />
<production id="7058" count="1" enchant="0" />
<ingredient id="6391" count="10" />
<production id="7058" count="1" />
</item>
</list>

8
L2J_Mobius_C6_Interlude/dist/game/data/multisell/313750001.xml vendored
View File

@ -3,12 +3,12 @@
<list maintainEnchantment="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!-- Brown Pouch -->
<item id="1">
<ingredient id="7186" count="55" enchant="0" />
<production id="7634" count="1" enchant="0" />
<ingredient id="7186" count="55" />
<production id="7634" count="1" />
</item>
<!-- Scroll of Escape - Ketra -->
<item id="2">
<ingredient id="7186" count="80" enchant="0" />
<production id="7618" count="1" enchant="0" />
<ingredient id="7186" count="80" />
<production id="7618" count="1" />
</item>
</list>

12
L2J_Mobius_C6_Interlude/dist/game/data/multisell/313750002.xml vendored
View File

@ -3,17 +3,17 @@
<list maintainEnchantment="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!-- Brown Pouch -->
<item id="1">
<ingredient id="7186" count="55" enchant="0" />
<production id="7634" count="1" enchant="0" />
<ingredient id="7186" count="55" />
<production id="7634" count="1" />
</item>
<!-- Scroll of Escape - Ketra -->
<item id="2">
<ingredient id="7186" count="80" enchant="0" />
<production id="7618" count="1" enchant="0" />
<ingredient id="7186" count="80" />
<production id="7618" count="1" />
</item>
<!-- Gray Pouch -->
<item id="3">
<ingredient id="7186" count="55" enchant="0" />
<production id="7635" count="1" enchant="0" />
<ingredient id="7186" count="55" />
<production id="7635" count="1" />
</item>
</list>

32
L2J_Mobius_C6_Interlude/dist/game/data/multisell/313750003.xml vendored
View File

@ -3,42 +3,42 @@
<list maintainEnchantment="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!-- Brown Pouch -->
<item id="1">
<ingredient id="7186" count="55" enchant="0" />
<production id="7634" count="1" enchant="0" />
<ingredient id="7186" count="55" />
<production id="7634" count="1" />
</item>
<!-- Scroll of Escape - Ketra -->
<item id="2">
<ingredient id="7186" count="80" enchant="0" />
<production id="7618" count="1" enchant="0" />
<ingredient id="7186" count="80" />
<production id="7618" count="1" />
</item>
<!-- Gray Pouch -->
<item id="3">
<ingredient id="7186" count="55" enchant="0" />
<production id="7635" count="1" enchant="0" />
<ingredient id="7186" count="55" />
<production id="7635" count="1" />
</item>
<!-- White Cargo Box -->
<item id="4">
<ingredient id="7186" count="150" enchant="0" />
<production id="7629" count="1" enchant="0" />
<ingredient id="7186" count="150" />
<production id="7629" count="1" />
</item>
<!-- Blue Cargo Box -->
<item id="5">
<ingredient id="7186" count="60" enchant="0" />
<production id="7630" count="1" enchant="0" />
<ingredient id="7186" count="60" />
<production id="7630" count="1" />
</item>
<!-- Yellow Cargo Box -->
<item id="6">
<ingredient id="7186" count="60" enchant="0" />
<production id="7631" count="1" enchant="0" />
<ingredient id="7186" count="60" />
<production id="7631" count="1" />
</item>
<!-- Red Cargo Box -->
<item id="7">
<ingredient id="7186" count="150" enchant="0" />
<production id="7632" count="1" enchant="0" />
<ingredient id="7186" count="150" />
<production id="7632" count="1" />
</item>
<!-- Purple Cargo Box -->
<item id="8">
<ingredient id="7186" count="500" enchant="0" />
<production id="7633" count="1" enchant="0" />
<ingredient id="7186" count="500" />
<production id="7633" count="1" />
</item>
</list>

8
L2J_Mobius_C6_Interlude/dist/game/data/multisell/313820001.xml vendored
View File

@ -3,12 +3,12 @@
<list maintainEnchantment="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!-- Brown Pouch -->
<item id="1">
<ingredient id="7187" count="55" enchant="0" />
<production id="7634" count="1" enchant="0" />
<ingredient id="7187" count="55" />
<production id="7634" count="1" />
</item>
<!-- Scroll of Escape - Varka -->
<item id="2">
<ingredient id="7187" count="80" enchant="0" />
<production id="7619" count="1" enchant="0" />
<ingredient id="7187" count="80" />
<production id="7619" count="1" />
</item>
</list>

12
L2J_Mobius_C6_Interlude/dist/game/data/multisell/313820002.xml vendored
View File

@ -3,17 +3,17 @@
<list maintainEnchantment="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!-- Brown Pouch -->
<item id="1">
<ingredient id="7187" count="55" enchant="0" />
<production id="7634" count="1" enchant="0" />
<ingredient id="7187" count="55" />
<production id="7634" count="1" />
</item>
<!-- Scroll of Escape - Varka -->
<item id="2">
<ingredient id="7187" count="80" enchant="0" />
<production id="7619" count="1" enchant="0" />
<ingredient id="7187" count="80" />
<production id="7619" count="1" />
</item>
<!-- Gray Pouch -->
<item id="3">
<ingredient id="7187" count="55" enchant="0" />
<production id="7635" count="1" enchant="0" />
<ingredient id="7187" count="55" />
<production id="7635" count="1" />
</item>
</list>

32
L2J_Mobius_C6_Interlude/dist/game/data/multisell/313820003.xml vendored
View File

@ -3,42 +3,42 @@
<list maintainEnchantment="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!-- Brown Pouch -->
<item id="1">
<ingredient id="7187" count="55" enchant="0" />
<production id="7634" count="1" enchant="0" />
<ingredient id="7187" count="55" />
<production id="7634" count="1" />
</item>
<!-- Scroll of Escape - Varka -->
<item id="2">
<ingredient id="7187" count="80" enchant="0" />
<production id="7619" count="1" enchant="0" />
<ingredient id="7187" count="80" />
<production id="7619" count="1" />
</item>
<!-- Gray Pouch -->
<item id="3">
<ingredient id="7187" count="55" enchant="0" />
<production id="7635" count="1" enchant="0" />
<ingredient id="7187" count="55" />
<production id="7635" count="1" />
</item>
<!-- White Cargo Box -->
<item id="4">
<ingredient id="7187" count="150" enchant="0" />
<production id="7629" count="1" enchant="0" />
<ingredient id="7187" count="150" />
<production id="7629" count="1" />
</item>
<!-- Blue Cargo Box -->
<item id="5">
<ingredient id="7187" count="60" enchant="0" />
<production id="7630" count="1" enchant="0" />
<ingredient id="7187" count="60" />
<production id="7630" count="1" />
</item>
<!-- Yellow Cargo Box -->
<item id="6">
<ingredient id="7187" count="60" enchant="0" />
<production id="7631" count="1" enchant="0" />
<ingredient id="7187" count="60" />
<production id="7631" count="1" />
</item>
<!-- Red Cargo Box -->
<item id="7">
<ingredient id="7187" count="150" enchant="0" />
<production id="7632" count="1" enchant="0" />
<ingredient id="7187" count="150" />
<production id="7632" count="1" />
</item>
<!-- Purple Cargo Box -->
<item id="8">
<ingredient id="7187" count="500" enchant="0" />
<production id="7633" count="1" enchant="0" />
<ingredient id="7187" count="500" />
<production id="7633" count="1" />
</item>
</list>

24
L2J_Mobius_C6_Interlude/dist/game/data/multisell/90012.xml vendored
View File

@ -3,27 +3,27 @@
<list maintainEnchantment="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<!-- SS/Arrows -->
<item id="1">
<ingredient id="4037" count="5" enchant="0" />
<production id="4897" count="1" enchant="0" />
<ingredient id="4037" count="5" />
<production id="4897" count="1" />
</item>
<item id="2">
<ingredient id="4037" count="5" enchant="0" />
<production id="4898" count="1" enchant="0" />
<ingredient id="4037" count="5" />
<production id="4898" count="1" />
</item>
<item id="3">
<ingredient id="4037" count="5" enchant="0" />
<production id="4899" count="1" enchant="0" />
<ingredient id="4037" count="5" />
<production id="4899" count="1" />
</item>
<item id="4">
<ingredient id="4037" count="5" enchant="0" />
<production id="4900" count="1" enchant="0" />
<ingredient id="4037" count="5" />
<production id="4900" count="1" />
</item>
<item id="5">
<ingredient id="4037" count="5" enchant="0" />
<production id="4901" count="1" enchant="0" />
<ingredient id="4037" count="5" />
<production id="4901" count="1" />
</item>
<item id="6">
<ingredient id="4037" count="5" enchant="0" />
<production id="4902" count="1" enchant="0" />
<ingredient id="4037" count="5" />
<production id="4902" count="1" />
</item>
</list>

192
L2J_Mobius_C6_Interlude/dist/game/data/multisell/90051.xml vendored
View File

@ -2,195 +2,195 @@
<!-- Custom GM-Shop -->
<list maintainEnchantment="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
<item id="1">
<ingredient id="57" count="100000" enchant="0" />
<production id="4553" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4553" count="1" />
</item>
<item id="2">
<ingredient id="57" count="100000" enchant="0" />
<production id="4554" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4554" count="1" />
</item>
<item id="3">
<ingredient id="57" count="100000" enchant="0" />
<production id="4555" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4555" count="1" />
</item>
<item id="4">
<ingredient id="57" count="100000" enchant="0" />
<production id="4556" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4556" count="1" />
</item>
<item id="5">
<ingredient id="57" count="100000" enchant="0" />
<production id="4557" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4557" count="1" />
</item>
<item id="6">
<ingredient id="57" count="100000" enchant="0" />
<production id="4558" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4558" count="1" />
</item>
<item id="7">
<ingredient id="57" count="180000" enchant="0" />
<production id="4559" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4559" count="1" />
</item>
<item id="8">
<ingredient id="57" count="100000" enchant="0" />
<production id="4560" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4560" count="1" />
</item>
<item id="9">
<ingredient id="57" count="100000" enchant="0" />
<production id="4561" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4561" count="1" />
</item>
<item id="10">
<ingredient id="57" count="100000" enchant="0" />
<production id="4562" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4562" count="1" />
</item>
<item id="11">
<ingredient id="57" count="100000" enchant="0" />
<production id="4563" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4563" count="1" />
</item>
<item id="12">
<ingredient id="57" count="100000" enchant="0" />
<production id="4564" count="1" enchant="0" />
<ingredient id="57" count="100000" />
<production id="4564" count="1" />
</item>
<item id="13">
<ingredient id="57" count="120000" enchant="0" />
<production id="4589" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4589" count="1" />
</item>
<item id="14">
<ingredient id="57" count="120000" enchant="0" />
<production id="4590" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4590" count="1" />
</item>
<item id="15">
<ingredient id="57" count="120000" enchant="0" />
<production id="4591" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4591" count="1" />
</item>
<item id="16">
<ingredient id="57" count="120000" enchant="0" />
<production id="4592" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4592" count="1" />
</item>
<item id="17">
<ingredient id="57" count="120000" enchant="0" />
<production id="4593" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4593" count="1" />
</item>
<item id="18">
<ingredient id="57" count="120000" enchant="0" />
<production id="4594" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4594" count="1" />
</item>
<item id="19">
<ingredient id="57" count="120000" enchant="0" />
<production id="4595" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4595" count="1" />
</item>
<item id="20">
<ingredient id="57" count="180000" enchant="0" />
<production id="4596" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4596" count="1" />
</item>
<item id="21">
<ingredient id="57" count="120000" enchant="0" />
<production id="4597" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4597" count="1" />
</item>
<item id="22">
<ingredient id="57" count="120000" enchant="0" />
<production id="4598" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4598" count="1" />
</item>
<item id="23">
<ingredient id="57" count="120000" enchant="0" />
<production id="4599" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4599" count="1" />
</item>
<item id="24">
<ingredient id="57" count="120000" enchant="0" />
<production id="4600" count="1" enchant="0" />
<ingredient id="57" count="120000" />
<production id="4600" count="1" />
</item>
<item id="25">
<ingredient id="57" count="180000" enchant="0" />
<production id="4601" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4601" count="1" />
</item>
<item id="26">
<ingredient id="57" count="180000" enchant="0" />
<production id="4602" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4602" count="1" />
</item>
<item id="27">
<ingredient id="57" count="180000" enchant="0" />
<production id="4603" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4603" count="1" />
</item>
<item id="28">
<ingredient id="57" count="180000" enchant="0" />
<production id="4604" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4604" count="1" />
</item>
<item id="29">
<ingredient id="57" count="180000" enchant="0" />
<production id="4605" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4605" count="1" />
</item>
<item id="30">
<ingredient id="57" count="180000" enchant="0" />
<production id="4606" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4606" count="1" />
</item>
<item id="31">
<ingredient id="57" count="180000" enchant="0" />
<production id="4607" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4607" count="1" />
</item>
<item id="32">
<ingredient id="57" count="180000" enchant="0" />
<production id="4608" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4608" count="1" />
</item>
<item id="33">
<ingredient id="57" count="180000" enchant="0" />
<production id="4609" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4609" count="1" />
</item>
<item id="34">
<ingredient id="57" count="180000" enchant="0" />
<production id="4610" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4610" count="1" />
</item>
<item id="35">
<ingredient id="57" count="180000" enchant="0" />
<production id="4611" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4611" count="1" />
</item>
<item id="36">
<ingredient id="57" count="180000" enchant="0" />
<production id="4612" count="1" enchant="0" />
<ingredient id="57" count="180000" />
<production id="4612" count="1" />
</item>
<item id="37">
<ingredient id="57" count="290000" enchant="0" />
<production id="4613" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4613" count="1" />
</item>
<item id="38">
<ingredient id="57" count="290000" enchant="0" />
<production id="4614" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4614" count="1" />
</item>
<item id="39">
<ingredient id="57" count="290000" enchant="0" />
<production id="4615" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4615" count="1" />
</item>
<item id="40">
<ingredient id="57" count="290000" enchant="0" />
<production id="4616" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4616" count="1" />
</item>
<item id="41">
<ingredient id="57" count="290000" enchant="0" />
<production id="4617" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4617" count="1" />
</item>
<item id="42">
<ingredient id="57" count="290000" enchant="0" />
<production id="4618" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4618" count="1" />
</item>
<item id="43">
<ingredient id="57" count="290000" enchant="0" />
<production id="4619" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4619" count="1" />
</item>
<item id="44">
<ingredient id="57" count="290000" enchant="0" />
<production id="4620" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4620" count="1" />
</item>
<item id="45">
<ingredient id="57" count="290000" enchant="0" />
<production id="4621" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4621" count="1" />
</item>
<item id="46">
<ingredient id="57" count="290000" enchant="0" />
<production id="4622" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4622" count="1" />
</item>
<item id="47">
<ingredient id="57" count="290000" enchant="0" />
<production id="4623" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4623" count="1" />
</item>
<item id="48">
<ingredient id="57" count="290000" enchant="0" />
<production id="4624" count="1" enchant="0" />
<ingredient id="57" count="290000" />
<production id="4624" count="1" />
</item>
</list>

4
L2J_Mobius_C6_Interlude/dist/game/data/xsd/multisell.xsd vendored
View File

@ -13,14 +13,14 @@
<xs:attribute name="count" type="xs:unsignedInt" use="required" />
<xs:attribute name="isTaxIngredient" type="xs:boolean" use="optional" />
<xs:attribute name="mantainIngredient" type="xs:boolean" use="optional" />
<xs:attribute name="enchant" type="xs:unsignedByte" use="optional" />
<xs:attribute name="enchantmentLevel" type="xs:unsignedByte" use="optional" />
</xs:complexType>
</xs:element>
<xs:element name="production">
<xs:complexType>
<xs:attribute name="id" type="xs:unsignedShort" use="required" />
<xs:attribute name="count" type="xs:unsignedInt" use="required" />
<xs:attribute name="enchant" type="xs:unsignedByte" use="optional" />
<xs:attribute name="enchantmentLevel" type="xs:unsignedByte" use="optional" />
</xs:complexType>
</xs:element>
</xs:choice>

24
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
View File

@ -376,6 +376,13 @@ public class MultisellData
{
Node attribute;
// Enable enchant level on multisell ingredient using attribue "enchantmentLevel".
int enchantmentLevel = 0;
if (n.getAttributes().getNamedItem("enchantmentLevel") != null)
{
enchantmentLevel = Integer.parseInt(n.getAttributes().getNamedItem("enchantmentLevel").getNodeValue());
}
final int id = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
final int count = Integer.parseInt(n.getAttributes().getNamedItem("count").getNodeValue());
boolean isTaxIngredient = false;
@ -392,11 +399,18 @@ public class MultisellData
mantainIngredient = Boolean.parseBoolean(attribute.getNodeValue());
}
final MultiSellIngredient e = new MultiSellIngredient(id, count, isTaxIngredient, mantainIngredient);
final MultiSellIngredient e = new MultiSellIngredient(id, count, enchantmentLevel, isTaxIngredient, mantainIngredient);
entry.addIngredient(e);
}
else if ("production".equalsIgnoreCase(n.getNodeName()))
{
// Enable enchant level on multisell production using attribue "enchantmentLevel".
int enchantmentLevel = 0;
if (n.getAttributes().getNamedItem("enchantmentLevel") != null)
{
enchantmentLevel = Integer.parseInt(n.getAttributes().getNamedItem("enchantmentLevel").getNodeValue());
}
final int id = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
final int count = Integer.parseInt(n.getAttributes().getNamedItem("count").getNodeValue());
if (ItemTable.getInstance().getTemplate(id) == null)
@ -404,13 +418,7 @@ public class MultisellData
LOGGER.warning("Multisell: Item " + id + " does not exist.");
}
int enchant = 0;
// By Azagthtot support enchantment in multisell
if (n.getAttributes().getNamedItem("enchant") != null)
{
enchant = Integer.parseInt(n.getAttributes().getNamedItem("enchant").getNodeValue());
}
final MultiSellIngredient e = new MultiSellIngredient(id, count, enchant, false, false);
MultiSellIngredient e = new MultiSellIngredient(id, count, enchantmentLevel, false, false);
entry.addProduct(e);
}
}

5
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/multisell/MultiSellIngredient.java
View File

@ -27,11 +27,6 @@ public class MultiSellIngredient
private boolean _isTaxIngredient;
private boolean _mantainIngredient;
public MultiSellIngredient(int itemId, int itemCount, boolean isTaxIngredient, boolean mantainIngredient)
{
this(itemId, itemCount, 0, isTaxIngredient, mantainIngredient);
}
public MultiSellIngredient(int itemId, int itemCount, int enchantmentLevel, boolean isTaxIngredient, boolean mantainIngredient)
{
setItemId(itemId);

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -501,7 +501,7 @@ public class MultiSellChoose implements IClientIncomingPacket
// Next add the adena amount, if any
if (totalAdenaCount > 0)
{
newEntry.addIngredient(new MultiSellIngredient(57, totalAdenaCount, false, false));
newEntry.addIngredient(new MultiSellIngredient(57, totalAdenaCount, 0, false, false));
}
// Now modify the enchantment level of products, if necessary