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

Improved MultisellData maximum enchant check.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-05-12 22:38:57 +00:00
parent 59dd8c41f2
commit 0f05f844a7
12 changed files with 132 additions and 408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
View File

@ -77,6 +77,15 @@ public final class MultisellData implements IXmlReader
@Override @Override
public void parseDocument(Document doc, File f) public void parseDocument(Document doc, File f)
{ {
final EnchantItemGroup magicWeaponGroup = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
final int magicWeaponGroupMax = magicWeaponGroup != null ? magicWeaponGroup.getMaximumEnchant() : 0;
final EnchantItemGroup weapongroup = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
final int weaponGroupMax = weapongroup != null ? weapongroup.getMaximumEnchant() : 0;
final EnchantItemGroup fullArmorGroup = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
final int fullArmorGroupMax = fullArmorGroup != null ? fullArmorGroup.getMaximumEnchant() : 0;
final EnchantItemGroup armorGroup = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
final int armorGroupMax = armorGroup != null ? armorGroup.getMaximumEnchant() : 0;
try try
{ {
forEach(doc, "list", listNode -> forEach(doc, "list", listNode ->
@ -119,7 +128,6 @@ public final class MultisellData implements IXmlReader
final long count = parseLong(d.getAttributes(), "count"); final long count = parseLong(d.getAttributes(), "count");
final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN); final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN);
byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0); byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0);
if (enchantmentLevel > 0) if (enchantmentLevel > 0)
{ {
final Item item = ItemTable.getInstance().getTemplate(id); final Item item = ItemTable.getInstance().getTemplate(id);
@ -127,47 +135,16 @@ public final class MultisellData implements IXmlReader
{ {
if (item.isWeapon()) if (item.isWeapon())
{ {
if (item.isMagicWeapon()) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.isMagicWeapon() ? magicWeaponGroupMax : weaponGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
else if (item.isArmor()) else if (item.isArmor())
{ {
if (item.getBodyPart() == Item.SLOT_FULL_ARMOR) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.getBodyPart() == Item.SLOT_FULL_ARMOR ? fullArmorGroupMax : armorGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
} }
} }
final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel); final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel);
if (itemExists(product)) if (itemExists(product))
{ {
// Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes. // Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes.

45
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
View File

@ -77,6 +77,15 @@ public final class MultisellData implements IXmlReader
@Override @Override
public void parseDocument(Document doc, File f) public void parseDocument(Document doc, File f)
{ {
final EnchantItemGroup magicWeaponGroup = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
final int magicWeaponGroupMax = magicWeaponGroup != null ? magicWeaponGroup.getMaximumEnchant() : 0;
final EnchantItemGroup weapongroup = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
final int weaponGroupMax = weapongroup != null ? weapongroup.getMaximumEnchant() : 0;
final EnchantItemGroup fullArmorGroup = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
final int fullArmorGroupMax = fullArmorGroup != null ? fullArmorGroup.getMaximumEnchant() : 0;
final EnchantItemGroup armorGroup = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
final int armorGroupMax = armorGroup != null ? armorGroup.getMaximumEnchant() : 0;
try try
{ {
forEach(doc, "list", listNode -> forEach(doc, "list", listNode ->
@ -119,7 +128,6 @@ public final class MultisellData implements IXmlReader
final long count = parseLong(d.getAttributes(), "count"); final long count = parseLong(d.getAttributes(), "count");
final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN); final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN);
byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0); byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0);
if (enchantmentLevel > 0) if (enchantmentLevel > 0)
{ {
final Item item = ItemTable.getInstance().getTemplate(id); final Item item = ItemTable.getInstance().getTemplate(id);
@ -127,47 +135,16 @@ public final class MultisellData implements IXmlReader
{ {
if (item.isWeapon()) if (item.isWeapon())
{ {
if (item.isMagicWeapon()) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.isMagicWeapon() ? magicWeaponGroupMax : weaponGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
else if (item.isArmor()) else if (item.isArmor())
{ {
if (item.getBodyPart() == Item.SLOT_FULL_ARMOR) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.getBodyPart() == Item.SLOT_FULL_ARMOR ? fullArmorGroupMax : armorGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
} }
} }
final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel); final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel);
if (itemExists(product)) if (itemExists(product))
{ {
// Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes. // Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes.

45
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
View File

@ -77,6 +77,15 @@ public final class MultisellData implements IXmlReader
@Override @Override
public void parseDocument(Document doc, File f) public void parseDocument(Document doc, File f)
{ {
final EnchantItemGroup magicWeaponGroup = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
final int magicWeaponGroupMax = magicWeaponGroup != null ? magicWeaponGroup.getMaximumEnchant() : 0;
final EnchantItemGroup weapongroup = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
final int weaponGroupMax = weapongroup != null ? weapongroup.getMaximumEnchant() : 0;
final EnchantItemGroup fullArmorGroup = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
final int fullArmorGroupMax = fullArmorGroup != null ? fullArmorGroup.getMaximumEnchant() : 0;
final EnchantItemGroup armorGroup = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
final int armorGroupMax = armorGroup != null ? armorGroup.getMaximumEnchant() : 0;
try try
{ {
forEach(doc, "list", listNode -> forEach(doc, "list", listNode ->
@ -119,7 +128,6 @@ public final class MultisellData implements IXmlReader
final long count = parseLong(d.getAttributes(), "count"); final long count = parseLong(d.getAttributes(), "count");
final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN); final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN);
byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0); byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0);
if (enchantmentLevel > 0) if (enchantmentLevel > 0)
{ {
final Item item = ItemTable.getInstance().getTemplate(id); final Item item = ItemTable.getInstance().getTemplate(id);
@ -127,47 +135,16 @@ public final class MultisellData implements IXmlReader
{ {
if (item.isWeapon()) if (item.isWeapon())
{ {
if (item.isMagicWeapon()) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.isMagicWeapon() ? magicWeaponGroupMax : weaponGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
else if (item.isArmor()) else if (item.isArmor())
{ {
if (item.getBodyPart() == Item.SLOT_FULL_ARMOR) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.getBodyPart() == Item.SLOT_FULL_ARMOR ? fullArmorGroupMax : armorGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
} }
} }
final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel); final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel);
if (itemExists(product)) if (itemExists(product))
{ {
// Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes. // Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes.

45
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
View File

@ -77,6 +77,15 @@ public final class MultisellData implements IXmlReader
@Override @Override
public void parseDocument(Document doc, File f) public void parseDocument(Document doc, File f)
{ {
final EnchantItemGroup magicWeaponGroup = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
final int magicWeaponGroupMax = magicWeaponGroup != null ? magicWeaponGroup.getMaximumEnchant() : 0;
final EnchantItemGroup weapongroup = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
final int weaponGroupMax = weapongroup != null ? weapongroup.getMaximumEnchant() : 0;
final EnchantItemGroup fullArmorGroup = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
final int fullArmorGroupMax = fullArmorGroup != null ? fullArmorGroup.getMaximumEnchant() : 0;
final EnchantItemGroup armorGroup = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
final int armorGroupMax = armorGroup != null ? armorGroup.getMaximumEnchant() : 0;
try try
{ {
forEach(doc, "list", listNode -> forEach(doc, "list", listNode ->
@ -119,7 +128,6 @@ public final class MultisellData implements IXmlReader
final long count = parseLong(d.getAttributes(), "count"); final long count = parseLong(d.getAttributes(), "count");
final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN); final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN);
byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0); byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0);
if (enchantmentLevel > 0) if (enchantmentLevel > 0)
{ {
final Item item = ItemTable.getInstance().getTemplate(id); final Item item = ItemTable.getInstance().getTemplate(id);
@ -127,47 +135,16 @@ public final class MultisellData implements IXmlReader
{ {
if (item.isWeapon()) if (item.isWeapon())
{ {
if (item.isMagicWeapon()) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.isMagicWeapon() ? magicWeaponGroupMax : weaponGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
else if (item.isArmor()) else if (item.isArmor())
{ {
if (item.getBodyPart() == Item.SLOT_FULL_ARMOR) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.getBodyPart() == Item.SLOT_FULL_ARMOR ? fullArmorGroupMax : armorGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
} }
} }
final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel); final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel);
if (itemExists(product)) if (itemExists(product))
{ {
// Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes. // Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes.

45
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
View File

@ -77,6 +77,15 @@ public final class MultisellData implements IXmlReader
@Override @Override
public void parseDocument(Document doc, File f) public void parseDocument(Document doc, File f)
{ {
final EnchantItemGroup magicWeaponGroup = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
final int magicWeaponGroupMax = magicWeaponGroup != null ? magicWeaponGroup.getMaximumEnchant() : 0;
final EnchantItemGroup weapongroup = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
final int weaponGroupMax = weapongroup != null ? weapongroup.getMaximumEnchant() : 0;
final EnchantItemGroup fullArmorGroup = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
final int fullArmorGroupMax = fullArmorGroup != null ? fullArmorGroup.getMaximumEnchant() : 0;
final EnchantItemGroup armorGroup = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
final int armorGroupMax = armorGroup != null ? armorGroup.getMaximumEnchant() : 0;
try try
{ {
forEach(doc, "list", listNode -> forEach(doc, "list", listNode ->
@ -119,7 +128,6 @@ public final class MultisellData implements IXmlReader
final long count = parseLong(d.getAttributes(), "count"); final long count = parseLong(d.getAttributes(), "count");
final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN); final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN);
byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0); byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0);
if (enchantmentLevel > 0) if (enchantmentLevel > 0)
{ {
final Item item = ItemTable.getInstance().getTemplate(id); final Item item = ItemTable.getInstance().getTemplate(id);
@ -127,47 +135,16 @@ public final class MultisellData implements IXmlReader
{ {
if (item.isWeapon()) if (item.isWeapon())
{ {
if (item.isMagicWeapon()) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.isMagicWeapon() ? magicWeaponGroupMax : weaponGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
else if (item.isArmor()) else if (item.isArmor())
{ {
if (item.getBodyPart() == Item.SLOT_FULL_ARMOR) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.getBodyPart() == Item.SLOT_FULL_ARMOR ? fullArmorGroupMax : armorGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
} }
} }
final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel); final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel);
if (itemExists(product)) if (itemExists(product))
{ {
// Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes. // Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes.

45
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
View File

@ -77,6 +77,15 @@ public final class MultisellData implements IXmlReader
@Override @Override
public void parseDocument(Document doc, File f) public void parseDocument(Document doc, File f)
{ {
final EnchantItemGroup magicWeaponGroup = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
final int magicWeaponGroupMax = magicWeaponGroup != null ? magicWeaponGroup.getMaximumEnchant() : 0;
final EnchantItemGroup weapongroup = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
final int weaponGroupMax = weapongroup != null ? weapongroup.getMaximumEnchant() : 0;
final EnchantItemGroup fullArmorGroup = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
final int fullArmorGroupMax = fullArmorGroup != null ? fullArmorGroup.getMaximumEnchant() : 0;
final EnchantItemGroup armorGroup = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
final int armorGroupMax = armorGroup != null ? armorGroup.getMaximumEnchant() : 0;
try try
{ {
forEach(doc, "list", listNode -> forEach(doc, "list", listNode ->
@ -119,7 +128,6 @@ public final class MultisellData implements IXmlReader
final long count = parseLong(d.getAttributes(), "count"); final long count = parseLong(d.getAttributes(), "count");
final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN); final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN);
byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0); byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0);
if (enchantmentLevel > 0) if (enchantmentLevel > 0)
{ {
final Item item = ItemTable.getInstance().getTemplate(id); final Item item = ItemTable.getInstance().getTemplate(id);
@ -127,47 +135,16 @@ public final class MultisellData implements IXmlReader
{ {
if (item.isWeapon()) if (item.isWeapon())
{ {
if (item.isMagicWeapon()) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.isMagicWeapon() ? magicWeaponGroupMax : weaponGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
else if (item.isArmor()) else if (item.isArmor())
{ {
if (item.getBodyPart() == Item.SLOT_FULL_ARMOR) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.getBodyPart() == Item.SLOT_FULL_ARMOR ? fullArmorGroupMax : armorGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
} }
} }
final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel); final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel);
if (itemExists(product)) if (itemExists(product))
{ {
// Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes. // Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes.

45
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
View File

@ -77,6 +77,15 @@ public final class MultisellData implements IXmlReader
@Override @Override
public void parseDocument(Document doc, File f) public void parseDocument(Document doc, File f)
{ {
final EnchantItemGroup magicWeaponGroup = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
final int magicWeaponGroupMax = magicWeaponGroup != null ? magicWeaponGroup.getMaximumEnchant() : 0;
final EnchantItemGroup weapongroup = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
final int weaponGroupMax = weapongroup != null ? weapongroup.getMaximumEnchant() : 0;
final EnchantItemGroup fullArmorGroup = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
final int fullArmorGroupMax = fullArmorGroup != null ? fullArmorGroup.getMaximumEnchant() : 0;
final EnchantItemGroup armorGroup = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
final int armorGroupMax = armorGroup != null ? armorGroup.getMaximumEnchant() : 0;
try try
{ {
forEach(doc, "list", listNode -> forEach(doc, "list", listNode ->
@ -119,7 +128,6 @@ public final class MultisellData implements IXmlReader
final long count = parseLong(d.getAttributes(), "count"); final long count = parseLong(d.getAttributes(), "count");
final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN); final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN);
byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0); byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0);
if (enchantmentLevel > 0) if (enchantmentLevel > 0)
{ {
final Item item = ItemTable.getInstance().getTemplate(id); final Item item = ItemTable.getInstance().getTemplate(id);
@ -127,47 +135,16 @@ public final class MultisellData implements IXmlReader
{ {
if (item.isWeapon()) if (item.isWeapon())
{ {
if (item.isMagicWeapon()) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.isMagicWeapon() ? magicWeaponGroupMax : weaponGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
else if (item.isArmor()) else if (item.isArmor())
{ {
if (item.getBodyPart() == Item.SLOT_FULL_ARMOR) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.getBodyPart() == Item.SLOT_FULL_ARMOR ? fullArmorGroupMax : armorGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
} }
} }
final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel); final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel);
if (itemExists(product)) if (itemExists(product))
{ {
// Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes. // Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes.

45
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
View File

@ -77,6 +77,15 @@ public final class MultisellData implements IXmlReader
@Override @Override
public void parseDocument(Document doc, File f) public void parseDocument(Document doc, File f)
{ {
final EnchantItemGroup magicWeaponGroup = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
final int magicWeaponGroupMax = magicWeaponGroup != null ? magicWeaponGroup.getMaximumEnchant() : 0;
final EnchantItemGroup weapongroup = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
final int weaponGroupMax = weapongroup != null ? weapongroup.getMaximumEnchant() : 0;
final EnchantItemGroup fullArmorGroup = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
final int fullArmorGroupMax = fullArmorGroup != null ? fullArmorGroup.getMaximumEnchant() : 0;
final EnchantItemGroup armorGroup = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
final int armorGroupMax = armorGroup != null ? armorGroup.getMaximumEnchant() : 0;
try try
{ {
forEach(doc, "list", listNode -> forEach(doc, "list", listNode ->
@ -119,7 +128,6 @@ public final class MultisellData implements IXmlReader
final long count = parseLong(d.getAttributes(), "count"); final long count = parseLong(d.getAttributes(), "count");
final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN); final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN);
byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0); byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0);
if (enchantmentLevel > 0) if (enchantmentLevel > 0)
{ {
final Item item = ItemTable.getInstance().getTemplate(id); final Item item = ItemTable.getInstance().getTemplate(id);
@ -127,47 +135,16 @@ public final class MultisellData implements IXmlReader
{ {
if (item.isWeapon()) if (item.isWeapon())
{ {
if (item.isMagicWeapon()) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.isMagicWeapon() ? magicWeaponGroupMax : weaponGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
else if (item.isArmor()) else if (item.isArmor())
{ {
if (item.getBodyPart() == Item.SLOT_FULL_ARMOR) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.getBodyPart() == Item.SLOT_FULL_ARMOR ? fullArmorGroupMax : armorGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
} }
} }
final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel); final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel);
if (itemExists(product)) if (itemExists(product))
{ {
// Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes. // Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes.

45
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
View File

@ -77,6 +77,15 @@ public final class MultisellData implements IXmlReader
@Override @Override
public void parseDocument(Document doc, File f) public void parseDocument(Document doc, File f)
{ {
final EnchantItemGroup magicWeaponGroup = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
final int magicWeaponGroupMax = magicWeaponGroup != null ? magicWeaponGroup.getMaximumEnchant() : 0;
final EnchantItemGroup weapongroup = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
final int weaponGroupMax = weapongroup != null ? weapongroup.getMaximumEnchant() : 0;
final EnchantItemGroup fullArmorGroup = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
final int fullArmorGroupMax = fullArmorGroup != null ? fullArmorGroup.getMaximumEnchant() : 0;
final EnchantItemGroup armorGroup = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
final int armorGroupMax = armorGroup != null ? armorGroup.getMaximumEnchant() : 0;
try try
{ {
forEach(doc, "list", listNode -> forEach(doc, "list", listNode ->
@ -119,7 +128,6 @@ public final class MultisellData implements IXmlReader
final long count = parseLong(d.getAttributes(), "count"); final long count = parseLong(d.getAttributes(), "count");
final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN); final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN);
byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0); byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0);
if (enchantmentLevel > 0) if (enchantmentLevel > 0)
{ {
final Item item = ItemTable.getInstance().getTemplate(id); final Item item = ItemTable.getInstance().getTemplate(id);
@ -127,47 +135,16 @@ public final class MultisellData implements IXmlReader
{ {
if (item.isWeapon()) if (item.isWeapon())
{ {
if (item.isMagicWeapon()) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.isMagicWeapon() ? magicWeaponGroupMax : weaponGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
else if (item.isArmor()) else if (item.isArmor())
{ {
if (item.getBodyPart() == Item.SLOT_FULL_ARMOR) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.getBodyPart() == Item.SLOT_FULL_ARMOR ? fullArmorGroupMax : armorGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
} }
} }
final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel); final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel);
if (itemExists(product)) if (itemExists(product))
{ {
// Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes. // Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes.

45
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
View File

@ -77,6 +77,15 @@ public final class MultisellData implements IXmlReader
@Override @Override
public void parseDocument(Document doc, File f) public void parseDocument(Document doc, File f)
{ {
final EnchantItemGroup magicWeaponGroup = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
final int magicWeaponGroupMax = magicWeaponGroup != null ? magicWeaponGroup.getMaximumEnchant() : 0;
final EnchantItemGroup weapongroup = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
final int weaponGroupMax = weapongroup != null ? weapongroup.getMaximumEnchant() : 0;
final EnchantItemGroup fullArmorGroup = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
final int fullArmorGroupMax = fullArmorGroup != null ? fullArmorGroup.getMaximumEnchant() : 0;
final EnchantItemGroup armorGroup = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
final int armorGroupMax = armorGroup != null ? armorGroup.getMaximumEnchant() : 0;
try try
{ {
forEach(doc, "list", listNode -> forEach(doc, "list", listNode ->
@ -119,7 +128,6 @@ public final class MultisellData implements IXmlReader
final long count = parseLong(d.getAttributes(), "count"); final long count = parseLong(d.getAttributes(), "count");
final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN); final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN);
byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0); byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0);
if (enchantmentLevel > 0) if (enchantmentLevel > 0)
{ {
final Item item = ItemTable.getInstance().getTemplate(id); final Item item = ItemTable.getInstance().getTemplate(id);
@ -127,47 +135,16 @@ public final class MultisellData implements IXmlReader
{ {
if (item.isWeapon()) if (item.isWeapon())
{ {
if (item.isMagicWeapon()) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.isMagicWeapon() ? magicWeaponGroupMax : weaponGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
else if (item.isArmor()) else if (item.isArmor())
{ {
if (item.getBodyPart() == Item.SLOT_FULL_ARMOR) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.getBodyPart() == Item.SLOT_FULL_ARMOR ? fullArmorGroupMax : armorGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
} }
} }
final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel); final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel);
if (itemExists(product)) if (itemExists(product))
{ {
// Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes. // Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes.

45
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
View File

@ -77,6 +77,15 @@ public final class MultisellData implements IXmlReader
@Override @Override
public void parseDocument(Document doc, File f) public void parseDocument(Document doc, File f)
{ {
final EnchantItemGroup magicWeaponGroup = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
final int magicWeaponGroupMax = magicWeaponGroup != null ? magicWeaponGroup.getMaximumEnchant() : 0;
final EnchantItemGroup weapongroup = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
final int weaponGroupMax = weapongroup != null ? weapongroup.getMaximumEnchant() : 0;
final EnchantItemGroup fullArmorGroup = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
final int fullArmorGroupMax = fullArmorGroup != null ? fullArmorGroup.getMaximumEnchant() : 0;
final EnchantItemGroup armorGroup = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
final int armorGroupMax = armorGroup != null ? armorGroup.getMaximumEnchant() : 0;
try try
{ {
forEach(doc, "list", listNode -> forEach(doc, "list", listNode ->
@ -119,7 +128,6 @@ public final class MultisellData implements IXmlReader
final long count = parseLong(d.getAttributes(), "count"); final long count = parseLong(d.getAttributes(), "count");
final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN); final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN);
byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0); byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0);
if (enchantmentLevel > 0) if (enchantmentLevel > 0)
{ {
final Item item = ItemTable.getInstance().getTemplate(id); final Item item = ItemTable.getInstance().getTemplate(id);
@ -127,47 +135,16 @@ public final class MultisellData implements IXmlReader
{ {
if (item.isWeapon()) if (item.isWeapon())
{ {
if (item.isMagicWeapon()) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.isMagicWeapon() ? magicWeaponGroupMax : weaponGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
else if (item.isArmor()) else if (item.isArmor())
{ {
if (item.getBodyPart() == Item.SLOT_FULL_ARMOR) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.getBodyPart() == Item.SLOT_FULL_ARMOR ? fullArmorGroupMax : armorGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
} }
} }
final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel); final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel);
if (itemExists(product)) if (itemExists(product))
{ {
// Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes. // Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes.

45
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
View File

@ -77,6 +77,15 @@ public final class MultisellData implements IXmlReader
@Override @Override
public void parseDocument(Document doc, File f) public void parseDocument(Document doc, File f)
{ {
final EnchantItemGroup magicWeaponGroup = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
final int magicWeaponGroupMax = magicWeaponGroup != null ? magicWeaponGroup.getMaximumEnchant() : 0;
final EnchantItemGroup weapongroup = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
final int weaponGroupMax = weapongroup != null ? weapongroup.getMaximumEnchant() : 0;
final EnchantItemGroup fullArmorGroup = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
final int fullArmorGroupMax = fullArmorGroup != null ? fullArmorGroup.getMaximumEnchant() : 0;
final EnchantItemGroup armorGroup = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
final int armorGroupMax = armorGroup != null ? armorGroup.getMaximumEnchant() : 0;
try try
{ {
forEach(doc, "list", listNode -> forEach(doc, "list", listNode ->
@ -119,7 +128,6 @@ public final class MultisellData implements IXmlReader
final long count = parseLong(d.getAttributes(), "count"); final long count = parseLong(d.getAttributes(), "count");
final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN); final double chance = parseDouble(d.getAttributes(), "chance", Double.NaN);
byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0); byte enchantmentLevel = parseByte(d.getAttributes(), "enchantmentLevel", (byte) 0);
if (enchantmentLevel > 0) if (enchantmentLevel > 0)
{ {
final Item item = ItemTable.getInstance().getTemplate(id); final Item item = ItemTable.getInstance().getTemplate(id);
@ -127,47 +135,16 @@ public final class MultisellData implements IXmlReader
{ {
if (item.isWeapon()) if (item.isWeapon())
{ {
if (item.isMagicWeapon()) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.isMagicWeapon() ? magicWeaponGroupMax : weaponGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("MAGE_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FIGHTER_WEAPON_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
else if (item.isArmor()) else if (item.isArmor())
{ {
if (item.getBodyPart() == Item.SLOT_FULL_ARMOR) enchantmentLevel = (byte) Math.min(enchantmentLevel, item.getBodyPart() == Item.SLOT_FULL_ARMOR ? fullArmorGroupMax : armorGroupMax);
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("FULL_ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
else
{
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup("ARMOR_GROUP");
if (group != null)
{
enchantmentLevel = (byte) Math.min(enchantmentLevel, group.getMaximumEnchant());
}
}
} }
} }
} }
final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel); final ItemChanceHolder product = new ItemChanceHolder(id, chance, count, enchantmentLevel);
if (itemExists(product)) if (itemExists(product))
{ {
// Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes. // Check chance only of items that have set chance. Items without chance (NaN) are used for displaying purposes.