diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/31126001.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/31126001.xml index 68b2b9c2c3..3ce461f94d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/31126001.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/31126001.xml @@ -1,5 +1,5 @@ - + 31126 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/719.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/719.xml index 6ae043f0f9..2e80baacdf 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/719.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/719.xml @@ -1,5 +1,5 @@ - + 33493 33494 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/776.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/776.xml index 39562c4b23..3a506ed84c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/776.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/776.xml @@ -1,5 +1,5 @@ - + 31126 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/863.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/863.xml index 38d3e688bb..70e0af8bab 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/863.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/863.xml @@ -1,5 +1,5 @@ - + 33715 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/864.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/864.xml index d31ab7a8b1..75355c43a0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/864.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/864.xml @@ -1,5 +1,5 @@ - + 31126 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/914.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/914.xml index 381ed95d85..b776554c7b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/914.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/multisell/914.xml @@ -1,5 +1,5 @@ - + 33936 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/multisell.xsd b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/multisell.xsd index 089fd5b89c..196695f377 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/multisell.xsd +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/multisell.xsd @@ -30,14 +30,14 @@ - + - + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/zones/custom_script.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/zones/custom_script.xml index 091f7dc86b..fc65caccb5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/zones/custom_script.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/zones/custom_script.xml @@ -291,14 +291,14 @@ - - - - - - - - + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java index b60305699c..01bd5c5942 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -96,7 +96,7 @@ public final class MultisellData implements IGameXmlReader if ("list".equalsIgnoreCase(n.getNodeName())) { list.setApplyTaxes(parseBoolean(n.getAttributes(), "applyTaxes", false)); - list.setNewMultisell(parseBoolean(n.getAttributes(), "isNewMultisell", false)); + list.setIsChanceMultisell(parseBoolean(n.getAttributes(), "isChanceMultisell", false)); list.setMaintainEnchantment(parseBoolean(n.getAttributes(), "maintainEnchantment", false)); att = n.getAttributes().getNamedItem("useRate"); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java index dcb12ddab5..b0dd180176 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java @@ -35,14 +35,14 @@ public class Ingredient private boolean _maintainIngredient; private L2Item _template = null; private ItemInfo _itemInfo = null; - private final int _chance; + private final double _chance; public Ingredient(StatsSet set) { - this(set.getInt("id"), set.getLong("count"), set.getInt("enchantmentLevel", 0), set.getInt("chance", 0), set.getBoolean("isTaxIngredient", false), set.getBoolean("maintainIngredient", false)); + this(set.getInt("id"), set.getLong("count"), set.getInt("enchantmentLevel", 0), set.getDouble("chance", 0), set.getBoolean("isTaxIngredient", false), set.getBoolean("maintainIngredient", false)); } - public Ingredient(int itemId, long itemCount, int enchantmentLevel, int chance, boolean isTaxIngredient, boolean maintainIngredient) + public Ingredient(int itemId, long itemCount, int enchantmentLevel, double chance, boolean isTaxIngredient, boolean maintainIngredient) { _itemId = itemId; _itemCount = itemCount; @@ -109,7 +109,7 @@ public class Ingredient return _itemCount; } - public int getChance() + public double getChance() { return _chance; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java index e5c4ac10ee..ce1783c276 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java @@ -27,7 +27,7 @@ import java.util.Set; public class ListContainer { private final int _listId; - private boolean _isNewMultisell; + private boolean _isChanceMultisell; private boolean _applyTaxes = false; private boolean _maintainEnchantment = false; private double _useRate = 1.0; @@ -43,7 +43,7 @@ public class ListContainer public ListContainer(ListContainer container) { _listId = container.getListId(); - _isNewMultisell = container.isNewMultisell(); + _isChanceMultisell = container.isChanceMultisell(); _maintainEnchantment = container.getMaintainEnchantment(); } @@ -57,14 +57,14 @@ public class ListContainer return _listId; } - public boolean isNewMultisell() + public boolean isChanceMultisell() { - return _isNewMultisell; + return _isChanceMultisell; } - public void setNewMultisell(boolean val) + public void setIsChanceMultisell(boolean val) { - _isNewMultisell = val; + _isChanceMultisell = val; } public final void setApplyTaxes(boolean applyTaxes) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 831875c2a8..a2c109efcf 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -368,7 +368,7 @@ public class MultiSellChoose implements IClientIncomingPacket // Generate the appropriate items for (Ingredient e : entry.getProducts()) { - if (list.isNewMultisell()) + if (list.isChanceMultisell()) { // Skip first entry. if (e.getChance() < 1) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index fdbbd42f2a..86804e4c01 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -59,7 +59,7 @@ public final class MultiSellList implements IClientOutgoingPacket packet.writeD(_finished ? 0x01 : 0x00); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(_list.isNewMultisell() ? 0x01 : 0x00); // new multisell window + packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window Entry ent; while (_size-- > 0) @@ -100,7 +100,7 @@ public final class MultiSellList implements IClientOutgoingPacket { final ItemInfo item = ing.getItemInfo(); packet.writeH(item.getEnchantLevel()); // enchant level - packet.writeD(_list.isNewMultisell() ? ing.getChance() : item.getAugmentId()); // augment id + packet.writeD((int) (_list.isChanceMultisell() ? ing.getChance() : item.getAugmentId())); // augment id packet.writeD(0x00); // mana packet.writeD(0x00); // time ? packet.writeH(item.getElementId()); // attack element @@ -115,7 +115,7 @@ public final class MultiSellList implements IClientOutgoingPacket else { packet.writeH(ing.getEnchantLevel()); // enchant level - packet.writeD(ing.getChance()); // augment id + packet.writeD((int) ing.getChance()); // augment id packet.writeD(0x00); // mana packet.writeD(0x00); // time ? packet.writeH(0x00); // attack element @@ -138,7 +138,7 @@ public final class MultiSellList implements IClientOutgoingPacket { final ItemInfo item = ing.getItemInfo(); packet.writeH(item.getEnchantLevel()); // enchant level - packet.writeD(_list.isNewMultisell() ? ing.getChance() : item.getAugmentId()); // augment id + packet.writeD((int) (_list.isChanceMultisell() ? ing.getChance() : item.getAugmentId())); // augment id packet.writeD(0x00); // mana packet.writeH(item.getElementId()); // attack element packet.writeH(item.getElementPower()); // element power @@ -151,7 +151,7 @@ public final class MultiSellList implements IClientOutgoingPacket else { packet.writeH(ing.getEnchantLevel()); // enchant level - packet.writeD(ing.getChance()); // augment id + packet.writeD((int) ing.getChance()); // augment id packet.writeD(0x00); // mana packet.writeH(0x00); // attack element packet.writeH(0x00); // element power diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/multisell/31126001.xml b/L2J_Mobius_2.5_Underground/dist/game/data/multisell/31126001.xml index 68b2b9c2c3..3ce461f94d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/multisell/31126001.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/multisell/31126001.xml @@ -1,5 +1,5 @@ - + 31126 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/multisell/719.xml b/L2J_Mobius_2.5_Underground/dist/game/data/multisell/719.xml index 6ae043f0f9..2e80baacdf 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/multisell/719.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/multisell/719.xml @@ -1,5 +1,5 @@ - + 33493 33494 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/multisell/776.xml b/L2J_Mobius_2.5_Underground/dist/game/data/multisell/776.xml index 39562c4b23..3a506ed84c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/multisell/776.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/multisell/776.xml @@ -1,5 +1,5 @@ - + 31126 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/multisell/863.xml b/L2J_Mobius_2.5_Underground/dist/game/data/multisell/863.xml index 38d3e688bb..70e0af8bab 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/multisell/863.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/multisell/863.xml @@ -1,5 +1,5 @@ - + 33715 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/multisell/864.xml b/L2J_Mobius_2.5_Underground/dist/game/data/multisell/864.xml index d31ab7a8b1..75355c43a0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/multisell/864.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/multisell/864.xml @@ -1,5 +1,5 @@ - + 31126 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/multisell/914.xml b/L2J_Mobius_2.5_Underground/dist/game/data/multisell/914.xml index 381ed95d85..b776554c7b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/multisell/914.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/multisell/914.xml @@ -1,5 +1,5 @@ - + 33936 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/xsd/multisell.xsd b/L2J_Mobius_2.5_Underground/dist/game/data/xsd/multisell.xsd index 089fd5b89c..196695f377 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/xsd/multisell.xsd +++ b/L2J_Mobius_2.5_Underground/dist/game/data/xsd/multisell.xsd @@ -30,14 +30,14 @@ - + - + diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/zones/custom_script.xml b/L2J_Mobius_2.5_Underground/dist/game/data/zones/custom_script.xml index ba5c38f78d..033ac69700 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/zones/custom_script.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/zones/custom_script.xml @@ -291,14 +291,14 @@ - - - - - - - - + + + + + + + + diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java index b60305699c..01bd5c5942 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -96,7 +96,7 @@ public final class MultisellData implements IGameXmlReader if ("list".equalsIgnoreCase(n.getNodeName())) { list.setApplyTaxes(parseBoolean(n.getAttributes(), "applyTaxes", false)); - list.setNewMultisell(parseBoolean(n.getAttributes(), "isNewMultisell", false)); + list.setIsChanceMultisell(parseBoolean(n.getAttributes(), "isChanceMultisell", false)); list.setMaintainEnchantment(parseBoolean(n.getAttributes(), "maintainEnchantment", false)); att = n.getAttributes().getNamedItem("useRate"); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java index dcb12ddab5..b0dd180176 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java @@ -35,14 +35,14 @@ public class Ingredient private boolean _maintainIngredient; private L2Item _template = null; private ItemInfo _itemInfo = null; - private final int _chance; + private final double _chance; public Ingredient(StatsSet set) { - this(set.getInt("id"), set.getLong("count"), set.getInt("enchantmentLevel", 0), set.getInt("chance", 0), set.getBoolean("isTaxIngredient", false), set.getBoolean("maintainIngredient", false)); + this(set.getInt("id"), set.getLong("count"), set.getInt("enchantmentLevel", 0), set.getDouble("chance", 0), set.getBoolean("isTaxIngredient", false), set.getBoolean("maintainIngredient", false)); } - public Ingredient(int itemId, long itemCount, int enchantmentLevel, int chance, boolean isTaxIngredient, boolean maintainIngredient) + public Ingredient(int itemId, long itemCount, int enchantmentLevel, double chance, boolean isTaxIngredient, boolean maintainIngredient) { _itemId = itemId; _itemCount = itemCount; @@ -109,7 +109,7 @@ public class Ingredient return _itemCount; } - public int getChance() + public double getChance() { return _chance; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java index e5c4ac10ee..ce1783c276 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java @@ -27,7 +27,7 @@ import java.util.Set; public class ListContainer { private final int _listId; - private boolean _isNewMultisell; + private boolean _isChanceMultisell; private boolean _applyTaxes = false; private boolean _maintainEnchantment = false; private double _useRate = 1.0; @@ -43,7 +43,7 @@ public class ListContainer public ListContainer(ListContainer container) { _listId = container.getListId(); - _isNewMultisell = container.isNewMultisell(); + _isChanceMultisell = container.isChanceMultisell(); _maintainEnchantment = container.getMaintainEnchantment(); } @@ -57,14 +57,14 @@ public class ListContainer return _listId; } - public boolean isNewMultisell() + public boolean isChanceMultisell() { - return _isNewMultisell; + return _isChanceMultisell; } - public void setNewMultisell(boolean val) + public void setIsChanceMultisell(boolean val) { - _isNewMultisell = val; + _isChanceMultisell = val; } public final void setApplyTaxes(boolean applyTaxes) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index d4d88cd715..05d5921904 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -369,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket // Generate the appropriate items for (Ingredient e : entry.getProducts()) { - if (list.isNewMultisell()) + if (list.isChanceMultisell()) { // Skip first entry. if (e.getChance() < 1) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 680635eab4..3a17aa00b1 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -60,7 +60,7 @@ public final class MultiSellList implements IClientOutgoingPacket packet.writeD(_finished ? 0x01 : 0x00); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(_list.isNewMultisell() ? 0x01 : 0x00); // new multisell window + packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window Entry ent; while (_size-- > 0) @@ -112,7 +112,7 @@ public final class MultiSellList implements IClientOutgoingPacket { final ItemInfo item = ing.getItemInfo(); packet.writeH(item.getEnchantLevel()); // enchant level - packet.writeD(_list.isNewMultisell() ? ing.getChance() : item.getAugmentId()); // augment id + packet.writeD((int) (_list.isChanceMultisell() ? ing.getChance() : item.getAugmentId())); // augment id packet.writeD(0x00); // mana packet.writeD(0x00); // time ? packet.writeH(item.getElementId()); // attack element @@ -139,7 +139,7 @@ public final class MultiSellList implements IClientOutgoingPacket else { packet.writeH(ing.getEnchantLevel()); // enchant level - packet.writeD(ing.getChance()); // augment id + packet.writeD((int) ing.getChance()); // augment id packet.writeD(0x00); // mana packet.writeD(0x00); // time ? packet.writeH(0x00); // attack element @@ -173,7 +173,7 @@ public final class MultiSellList implements IClientOutgoingPacket { final ItemInfo item = ing.getItemInfo(); packet.writeH(item.getEnchantLevel()); // enchant level - packet.writeD(_list.isNewMultisell() ? ing.getChance() : item.getAugmentId()); // augment id + packet.writeD((int) (_list.isChanceMultisell() ? ing.getChance() : item.getAugmentId())); // augment id packet.writeD(0x00); // mana packet.writeH(item.getElementId()); // attack element packet.writeH(item.getElementPower()); // element power @@ -197,7 +197,7 @@ public final class MultiSellList implements IClientOutgoingPacket else { packet.writeH(ing.getEnchantLevel()); // enchant level - packet.writeD(ing.getChance()); // augment id + packet.writeD((int) ing.getChance()); // augment id packet.writeD(0x00); // mana packet.writeH(0x00); // attack element packet.writeH(0x00); // element power diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/2017.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/2017.xml new file mode 100644 index 0000000000..b22a78658e --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/2017.xml @@ -0,0 +1,82 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/2124.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/2124.xml new file mode 100644 index 0000000000..02c15f6ab4 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/2124.xml @@ -0,0 +1,102 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/2167.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/2167.xml new file mode 100644 index 0000000000..d084bda031 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/2167.xml @@ -0,0 +1,66 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/2175.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/2175.xml index c4b5eb0eae..c156015466 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/2175.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/2175.xml @@ -1,5 +1,5 @@ - + 34230 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/31126001.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/31126001.xml index 68b2b9c2c3..3ce461f94d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/31126001.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/31126001.xml @@ -1,5 +1,5 @@ - + 31126 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/533.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/533.xml index 5f1cc5fda2..8d5cc11fc0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/533.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/533.xml @@ -5,86 +5,92 @@ 31820 31821 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/534.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/534.xml index 5a4b71393a..5814e2b3f9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/534.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/534.xml @@ -1,92 +1,97 @@ - 31792 - 31793 - 31794 - 31795 - 31796 + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/535.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/535.xml index bd88d31ec2..03b21a7b05 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/535.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/535.xml @@ -1,114 +1,119 @@ - 31837 - 31838 - 31839 - 31840 - 31841 + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/536.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/536.xml index f60a0d75be..965802889d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/536.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/536.xml @@ -1,59 +1,68 @@ - 34187 + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/537.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/537.xml index c55546bbc8..fba5cd92d3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/537.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/537.xml @@ -1,90 +1,95 @@ - 31804 - 31805 - 31806 - 31807 - 31808 + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/538.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/538.xml index c1d827751e..771dc61bc3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/538.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/538.xml @@ -1,53 +1,59 @@ - 31823 - 31824 - 31825 - 31826 + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/539.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/539.xml index b268aff9c4..34afb536b9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/539.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/539.xml @@ -1,146 +1,151 @@ - 31827 - 31828 - 31829 - 31830 - 31831 + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/540.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/540.xml index a9fa78e07e..75eb47dfee 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/540.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/540.xml @@ -1,112 +1,118 @@ - 31991 - 31992 - 31993 - 31995 + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/541.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/541.xml index 12cd16a3d1..8764c9fa63 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/541.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/541.xml @@ -1,87 +1,92 @@ + 31819 + 31820 + 31821 + 31822 31832 31833 31834 31835 31836 + 33946 - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/542.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/542.xml index 8e231b39d8..552f077ed6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/542.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/542.xml @@ -1,107 +1,112 @@ - 31814 - 31815 - 31816 - 31817 - 31818 + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/543.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/543.xml index 0ea45083d4..e320ea318b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/543.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/543.xml @@ -1,39 +1,45 @@ - 31797 - 31798 - 31799 - 31800 + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/544.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/544.xml new file mode 100644 index 0000000000..ef91d33fdc --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/544.xml @@ -0,0 +1,105 @@ + + + + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/545.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/545.xml new file mode 100644 index 0000000000..0037d95c18 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/545.xml @@ -0,0 +1,96 @@ + + + + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/548.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/548.xml index 13d0a1dafc..7b9bc60a97 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/548.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/548.xml @@ -5,34 +5,86 @@ 31733 31734 31738 + 31787 + 31788 + 31789 + 31790 + 31791 + 31792 + 31793 + 31794 + 31795 + 31796 + 31797 + 31798 + 31799 + 31800 + 31805 + 31806 + 31807 + 31808 + 31814 + 31815 + 31816 + 31817 + 31819 + 31820 + 31821 + 31822 + 31823 + 31824 + 31825 + 31826 + 31827 + 31828 + 31829 + 31830 + 31831 + 31832 + 31833 + 31834 + 31835 + 31836 + 31837 + 31838 + 31839 + 31840 + 31841 + 31804 + 31818 + 31991 + 31992 + 31993 + 31995 + 33946 34187 - - + + - - + + - - + + - - + + - - + + - - + + - - + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/719.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/719.xml index 6ae043f0f9..2e80baacdf 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/719.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/719.xml @@ -1,5 +1,5 @@ - + 33493 33494 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/720.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/720.xml new file mode 100644 index 0000000000..9df03bde82 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/720.xml @@ -0,0 +1,58 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/721.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/721.xml new file mode 100644 index 0000000000..ee10e04341 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/721.xml @@ -0,0 +1,64 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/722.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/722.xml new file mode 100644 index 0000000000..e001911946 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/722.xml @@ -0,0 +1,64 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/723.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/723.xml new file mode 100644 index 0000000000..4830354e4b --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/723.xml @@ -0,0 +1,79 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/727.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/727.xml new file mode 100644 index 0000000000..c5bc8b9b94 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/727.xml @@ -0,0 +1,98 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/728.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/728.xml new file mode 100644 index 0000000000..2b079675fa --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/728.xml @@ -0,0 +1,98 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/729.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/729.xml new file mode 100644 index 0000000000..d48e69afb6 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/729.xml @@ -0,0 +1,98 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/730.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/730.xml new file mode 100644 index 0000000000..c09173b0f0 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/730.xml @@ -0,0 +1,98 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/731.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/731.xml new file mode 100644 index 0000000000..6120883cde --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/731.xml @@ -0,0 +1,90 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/732.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/732.xml new file mode 100644 index 0000000000..c4da1d7020 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/732.xml @@ -0,0 +1,90 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/733.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/733.xml new file mode 100644 index 0000000000..668295c6a8 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/733.xml @@ -0,0 +1,90 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/734.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/734.xml new file mode 100644 index 0000000000..d950b9590f --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/734.xml @@ -0,0 +1,90 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/735.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/735.xml new file mode 100644 index 0000000000..dccdf1da5a --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/735.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/736.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/736.xml new file mode 100644 index 0000000000..fef2484fec --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/736.xml @@ -0,0 +1,10 @@ + + + + 33946 + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/737.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/737.xml new file mode 100644 index 0000000000..1463a37e76 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/737.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/738.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/738.xml new file mode 100644 index 0000000000..d28a9cb183 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/738.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/739.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/739.xml new file mode 100644 index 0000000000..49b309f1ab --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/739.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/740.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/740.xml new file mode 100644 index 0000000000..fd47e04af4 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/740.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/741.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/741.xml new file mode 100644 index 0000000000..fd47e04af4 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/741.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/742.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/742.xml new file mode 100644 index 0000000000..d4487843dc --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/742.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/743.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/743.xml new file mode 100644 index 0000000000..9655bb0f92 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/743.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/744.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/744.xml new file mode 100644 index 0000000000..483d84f149 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/744.xml @@ -0,0 +1,10 @@ + + + + 33946 + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/745.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/745.xml new file mode 100644 index 0000000000..6122b0ee21 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/745.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/746.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/746.xml new file mode 100644 index 0000000000..37741aa547 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/746.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/747.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/747.xml new file mode 100644 index 0000000000..fa087fb245 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/747.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/748.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/748.xml new file mode 100644 index 0000000000..f6bd54ee78 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/748.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/749.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/749.xml new file mode 100644 index 0000000000..f6bd54ee78 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/749.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/750.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/750.xml new file mode 100644 index 0000000000..78cac6d85a --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/750.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/751.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/751.xml new file mode 100644 index 0000000000..ca1dd92117 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/751.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/752.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/752.xml new file mode 100644 index 0000000000..d26ecbc242 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/752.xml @@ -0,0 +1,10 @@ + + + + 33946 + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/753.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/753.xml new file mode 100644 index 0000000000..82811ce948 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/753.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/754.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/754.xml new file mode 100644 index 0000000000..1e05893f40 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/754.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/755.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/755.xml new file mode 100644 index 0000000000..05b704699f --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/755.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/756.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/756.xml new file mode 100644 index 0000000000..ba56fb6320 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/756.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/757.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/757.xml new file mode 100644 index 0000000000..ba56fb6320 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/757.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/758.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/758.xml new file mode 100644 index 0000000000..b23fa5c5c3 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/758.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/759.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/759.xml new file mode 100644 index 0000000000..1c200d89a5 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/759.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/760.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/760.xml new file mode 100644 index 0000000000..341d2101cb --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/760.xml @@ -0,0 +1,10 @@ + + + + 33946 + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/761.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/761.xml new file mode 100644 index 0000000000..7b9a7a0c30 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/761.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/762.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/762.xml new file mode 100644 index 0000000000..488824d98b --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/762.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/763.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/763.xml new file mode 100644 index 0000000000..d7d7632c49 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/763.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/764.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/764.xml new file mode 100644 index 0000000000..9c002732e6 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/764.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/765.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/765.xml new file mode 100644 index 0000000000..9c002732e6 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/765.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/766.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/766.xml new file mode 100644 index 0000000000..3ccc229200 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/766.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/776.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/776.xml index 39562c4b23..3a506ed84c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/776.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/776.xml @@ -1,5 +1,5 @@ - + 31126 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/863.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/863.xml index 38d3e688bb..70e0af8bab 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/863.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/863.xml @@ -1,5 +1,5 @@ - + 33715 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/864.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/864.xml index d31ab7a8b1..75355c43a0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/864.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/864.xml @@ -1,5 +1,5 @@ - + 31126 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/914.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/914.xml index 381ed95d85..b776554c7b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/914.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/914.xml @@ -1,5 +1,5 @@ - + 33936 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/xsd/multisell.xsd b/L2J_Mobius_3.0_Helios/dist/game/data/xsd/multisell.xsd index 089fd5b89c..196695f377 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/xsd/multisell.xsd +++ b/L2J_Mobius_3.0_Helios/dist/game/data/xsd/multisell.xsd @@ -30,14 +30,14 @@ - + - + diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/zones/custom_script.xml b/L2J_Mobius_3.0_Helios/dist/game/data/zones/custom_script.xml index ba5c38f78d..033ac69700 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/zones/custom_script.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/zones/custom_script.xml @@ -291,14 +291,14 @@ - - - - - - - - + + + + + + + + diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java index b60305699c..01bd5c5942 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -96,7 +96,7 @@ public final class MultisellData implements IGameXmlReader if ("list".equalsIgnoreCase(n.getNodeName())) { list.setApplyTaxes(parseBoolean(n.getAttributes(), "applyTaxes", false)); - list.setNewMultisell(parseBoolean(n.getAttributes(), "isNewMultisell", false)); + list.setIsChanceMultisell(parseBoolean(n.getAttributes(), "isChanceMultisell", false)); list.setMaintainEnchantment(parseBoolean(n.getAttributes(), "maintainEnchantment", false)); att = n.getAttributes().getNamedItem("useRate"); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java index dcb12ddab5..b0dd180176 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java @@ -35,14 +35,14 @@ public class Ingredient private boolean _maintainIngredient; private L2Item _template = null; private ItemInfo _itemInfo = null; - private final int _chance; + private final double _chance; public Ingredient(StatsSet set) { - this(set.getInt("id"), set.getLong("count"), set.getInt("enchantmentLevel", 0), set.getInt("chance", 0), set.getBoolean("isTaxIngredient", false), set.getBoolean("maintainIngredient", false)); + this(set.getInt("id"), set.getLong("count"), set.getInt("enchantmentLevel", 0), set.getDouble("chance", 0), set.getBoolean("isTaxIngredient", false), set.getBoolean("maintainIngredient", false)); } - public Ingredient(int itemId, long itemCount, int enchantmentLevel, int chance, boolean isTaxIngredient, boolean maintainIngredient) + public Ingredient(int itemId, long itemCount, int enchantmentLevel, double chance, boolean isTaxIngredient, boolean maintainIngredient) { _itemId = itemId; _itemCount = itemCount; @@ -109,7 +109,7 @@ public class Ingredient return _itemCount; } - public int getChance() + public double getChance() { return _chance; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java index e5c4ac10ee..ce1783c276 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java @@ -27,7 +27,7 @@ import java.util.Set; public class ListContainer { private final int _listId; - private boolean _isNewMultisell; + private boolean _isChanceMultisell; private boolean _applyTaxes = false; private boolean _maintainEnchantment = false; private double _useRate = 1.0; @@ -43,7 +43,7 @@ public class ListContainer public ListContainer(ListContainer container) { _listId = container.getListId(); - _isNewMultisell = container.isNewMultisell(); + _isChanceMultisell = container.isChanceMultisell(); _maintainEnchantment = container.getMaintainEnchantment(); } @@ -57,14 +57,14 @@ public class ListContainer return _listId; } - public boolean isNewMultisell() + public boolean isChanceMultisell() { - return _isNewMultisell; + return _isChanceMultisell; } - public void setNewMultisell(boolean val) + public void setIsChanceMultisell(boolean val) { - _isNewMultisell = val; + _isChanceMultisell = val; } public final void setApplyTaxes(boolean applyTaxes) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index d4d88cd715..05d5921904 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -369,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket // Generate the appropriate items for (Ingredient e : entry.getProducts()) { - if (list.isNewMultisell()) + if (list.isChanceMultisell()) { // Skip first entry. if (e.getChance() < 1) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 6d5ead2f06..be6ce0114b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -61,7 +61,7 @@ public final class MultiSellList implements IClientOutgoingPacket packet.writeD(_finished ? 0x01 : 0x00); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(_list.isNewMultisell() ? 0x01 : 0x00); // new multisell window + packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window packet.writeD(0x20); // Always 32 oO Entry ent; @@ -114,7 +114,7 @@ public final class MultiSellList implements IClientOutgoingPacket { final ItemInfo item = ing.getItemInfo(); packet.writeH(item.getEnchantLevel()); // enchant level - packet.writeD(_list.isNewMultisell() ? ing.getChance() : item.getAugmentId()); // augment id + packet.writeD((int) (_list.isChanceMultisell() ? ing.getChance() : item.getAugmentId())); // augment id packet.writeD(0x00); // mana packet.writeD(0x00); // time ? packet.writeH(item.getElementId()); // attack element @@ -141,7 +141,7 @@ public final class MultiSellList implements IClientOutgoingPacket else { packet.writeH(ing.getEnchantLevel()); // enchant level - packet.writeD(ing.getChance()); // augment id + packet.writeD((int) ing.getChance()); // augment id packet.writeD(0x00); // mana packet.writeD(0x00); // time ? packet.writeH(0x00); // attack element @@ -175,7 +175,7 @@ public final class MultiSellList implements IClientOutgoingPacket { final ItemInfo item = ing.getItemInfo(); packet.writeH(item.getEnchantLevel()); // enchant level - packet.writeD(_list.isNewMultisell() ? ing.getChance() : item.getAugmentId()); // augment id + packet.writeD((int) (_list.isChanceMultisell() ? ing.getChance() : item.getAugmentId())); // augment id packet.writeD(0x00); // mana packet.writeH(item.getElementId()); // attack element packet.writeH(item.getElementPower()); // element power @@ -199,7 +199,7 @@ public final class MultiSellList implements IClientOutgoingPacket else { packet.writeH(ing.getEnchantLevel()); // enchant level - packet.writeD(ing.getChance()); // augment id + packet.writeD((int) ing.getChance()); // augment id packet.writeD(0x00); // mana packet.writeH(0x00); // attack element packet.writeH(0x00); // element power diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/2017.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/2017.xml new file mode 100644 index 0000000000..4012338563 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/2017.xml @@ -0,0 +1,82 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/2124.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/2124.xml new file mode 100644 index 0000000000..aa4239a116 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/2124.xml @@ -0,0 +1,102 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/2167.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/2167.xml new file mode 100644 index 0000000000..2f16ad374a --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/2167.xml @@ -0,0 +1,66 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/2175.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/2175.xml index c4b5eb0eae..c156015466 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/2175.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/2175.xml @@ -1,5 +1,5 @@ - + 34230 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/31126001.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/31126001.xml index 68b2b9c2c3..3ce461f94d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/31126001.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/31126001.xml @@ -1,5 +1,5 @@ - + 31126 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/533.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/533.xml index 5f1cc5fda2..8d5cc11fc0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/533.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/533.xml @@ -5,86 +5,92 @@ 31820 31821 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/534.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/534.xml index 5a4b71393a..5814e2b3f9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/534.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/534.xml @@ -1,92 +1,97 @@ - 31792 - 31793 - 31794 - 31795 - 31796 + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/535.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/535.xml index bd88d31ec2..03b21a7b05 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/535.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/535.xml @@ -1,114 +1,119 @@ - 31837 - 31838 - 31839 - 31840 - 31841 + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/536.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/536.xml index f60a0d75be..965802889d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/536.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/536.xml @@ -1,59 +1,68 @@ - 34187 + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/537.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/537.xml index c55546bbc8..fba5cd92d3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/537.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/537.xml @@ -1,90 +1,95 @@ - 31804 - 31805 - 31806 - 31807 - 31808 + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/538.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/538.xml index c1d827751e..771dc61bc3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/538.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/538.xml @@ -1,53 +1,59 @@ - 31823 - 31824 - 31825 - 31826 + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/539.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/539.xml index b268aff9c4..34afb536b9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/539.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/539.xml @@ -1,146 +1,151 @@ - 31827 - 31828 - 31829 - 31830 - 31831 + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/540.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/540.xml index a9fa78e07e..75eb47dfee 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/540.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/540.xml @@ -1,112 +1,118 @@ - 31991 - 31992 - 31993 - 31995 + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/541.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/541.xml index 12cd16a3d1..8764c9fa63 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/541.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/541.xml @@ -1,87 +1,92 @@ + 31819 + 31820 + 31821 + 31822 31832 31833 31834 31835 31836 + 33946 - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/542.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/542.xml index 8e231b39d8..552f077ed6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/542.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/542.xml @@ -1,107 +1,112 @@ - 31814 - 31815 - 31816 - 31817 - 31818 + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/543.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/543.xml index 0ea45083d4..e320ea318b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/543.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/543.xml @@ -1,39 +1,45 @@ - 31797 - 31798 - 31799 - 31800 + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/544.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/544.xml new file mode 100644 index 0000000000..79220bf464 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/544.xml @@ -0,0 +1,105 @@ + + + + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/545.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/545.xml new file mode 100644 index 0000000000..2dad93ad21 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/545.xml @@ -0,0 +1,96 @@ + + + + 31819 + 31820 + 31821 + 31822 + 31832 + 31833 + 31834 + 31835 + 31836 + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/548.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/548.xml index 13d0a1dafc..7b9bc60a97 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/548.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/548.xml @@ -5,34 +5,86 @@ 31733 31734 31738 + 31787 + 31788 + 31789 + 31790 + 31791 + 31792 + 31793 + 31794 + 31795 + 31796 + 31797 + 31798 + 31799 + 31800 + 31805 + 31806 + 31807 + 31808 + 31814 + 31815 + 31816 + 31817 + 31819 + 31820 + 31821 + 31822 + 31823 + 31824 + 31825 + 31826 + 31827 + 31828 + 31829 + 31830 + 31831 + 31832 + 31833 + 31834 + 31835 + 31836 + 31837 + 31838 + 31839 + 31840 + 31841 + 31804 + 31818 + 31991 + 31992 + 31993 + 31995 + 33946 34187 - - + + - - + + - - + + - - + + - - + + - - + + - - + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/719.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/719.xml index 6ae043f0f9..2e80baacdf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/719.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/719.xml @@ -1,5 +1,5 @@ - + 33493 33494 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/720.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/720.xml new file mode 100644 index 0000000000..5becae99e0 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/720.xml @@ -0,0 +1,58 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/721.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/721.xml new file mode 100644 index 0000000000..da087a26f9 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/721.xml @@ -0,0 +1,64 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/722.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/722.xml new file mode 100644 index 0000000000..38b6267e44 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/722.xml @@ -0,0 +1,64 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/723.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/723.xml new file mode 100644 index 0000000000..ab495cc922 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/723.xml @@ -0,0 +1,79 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/727.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/727.xml new file mode 100644 index 0000000000..88f63c66f3 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/727.xml @@ -0,0 +1,98 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/728.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/728.xml new file mode 100644 index 0000000000..af99f63d9b --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/728.xml @@ -0,0 +1,98 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/729.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/729.xml new file mode 100644 index 0000000000..e1b3a6fe52 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/729.xml @@ -0,0 +1,98 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/730.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/730.xml new file mode 100644 index 0000000000..3d8def7f9e --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/730.xml @@ -0,0 +1,98 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/731.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/731.xml new file mode 100644 index 0000000000..7dd0cb8ec4 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/731.xml @@ -0,0 +1,90 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/732.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/732.xml new file mode 100644 index 0000000000..5e28f3192d --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/732.xml @@ -0,0 +1,90 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/733.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/733.xml new file mode 100644 index 0000000000..9d9e3719a4 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/733.xml @@ -0,0 +1,90 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/734.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/734.xml new file mode 100644 index 0000000000..2052246d4d --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/734.xml @@ -0,0 +1,90 @@ + + + + 33946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/735.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/735.xml new file mode 100644 index 0000000000..c6fc651766 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/735.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/736.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/736.xml new file mode 100644 index 0000000000..91d4a946f6 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/736.xml @@ -0,0 +1,10 @@ + + + + 33946 + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/737.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/737.xml new file mode 100644 index 0000000000..18d5a506e3 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/737.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/738.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/738.xml new file mode 100644 index 0000000000..87a014ca28 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/738.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/739.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/739.xml new file mode 100644 index 0000000000..b69ab1d48b --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/739.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/740.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/740.xml new file mode 100644 index 0000000000..192b7c2a35 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/740.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/741.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/741.xml new file mode 100644 index 0000000000..192b7c2a35 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/741.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/742.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/742.xml new file mode 100644 index 0000000000..71ca8b6062 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/742.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/743.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/743.xml new file mode 100644 index 0000000000..8ad5230b54 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/743.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/744.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/744.xml new file mode 100644 index 0000000000..5aea5864fd --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/744.xml @@ -0,0 +1,10 @@ + + + + 33946 + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/745.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/745.xml new file mode 100644 index 0000000000..5d503c44eb --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/745.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/746.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/746.xml new file mode 100644 index 0000000000..b594b36820 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/746.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/747.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/747.xml new file mode 100644 index 0000000000..affa7ad2c0 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/747.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/748.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/748.xml new file mode 100644 index 0000000000..53be8bd64c --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/748.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/749.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/749.xml new file mode 100644 index 0000000000..53be8bd64c --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/749.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/750.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/750.xml new file mode 100644 index 0000000000..a1651da6a9 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/750.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/751.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/751.xml new file mode 100644 index 0000000000..4f217dcb66 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/751.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/752.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/752.xml new file mode 100644 index 0000000000..28b93b9920 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/752.xml @@ -0,0 +1,10 @@ + + + + 33946 + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/753.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/753.xml new file mode 100644 index 0000000000..1f5999b0ed --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/753.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/754.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/754.xml new file mode 100644 index 0000000000..0f60d279e7 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/754.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/755.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/755.xml new file mode 100644 index 0000000000..4e71278238 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/755.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/756.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/756.xml new file mode 100644 index 0000000000..0e15f77d73 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/756.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/757.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/757.xml new file mode 100644 index 0000000000..0e15f77d73 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/757.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/758.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/758.xml new file mode 100644 index 0000000000..af08f550c8 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/758.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/759.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/759.xml new file mode 100644 index 0000000000..1fe7166cf7 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/759.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/760.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/760.xml new file mode 100644 index 0000000000..b183a39d6d --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/760.xml @@ -0,0 +1,10 @@ + + + + 33946 + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/761.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/761.xml new file mode 100644 index 0000000000..e65344fd11 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/761.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/762.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/762.xml new file mode 100644 index 0000000000..f7f423fa40 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/762.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/763.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/763.xml new file mode 100644 index 0000000000..1d835ef8e7 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/763.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/764.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/764.xml new file mode 100644 index 0000000000..f681c1354f --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/764.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/765.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/765.xml new file mode 100644 index 0000000000..f681c1354f --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/765.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/766.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/766.xml new file mode 100644 index 0000000000..72491cb485 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/766.xml @@ -0,0 +1,14 @@ + + + + 33946 + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/776.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/776.xml index 39562c4b23..3a506ed84c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/776.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/776.xml @@ -1,5 +1,5 @@ - + 31126 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/863.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/863.xml index 38d3e688bb..70e0af8bab 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/863.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/863.xml @@ -1,5 +1,5 @@ - + 33715 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/864.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/864.xml index d31ab7a8b1..75355c43a0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/864.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/864.xml @@ -1,5 +1,5 @@ - + 31126 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/914.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/914.xml index 381ed95d85..b776554c7b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/914.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/multisell/914.xml @@ -1,5 +1,5 @@ - + 33936 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/multisell.xsd b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/multisell.xsd index 089fd5b89c..196695f377 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/multisell.xsd +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/multisell.xsd @@ -30,14 +30,14 @@ - + - + diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/zones/custom_script.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/zones/custom_script.xml index ba5c38f78d..033ac69700 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/zones/custom_script.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/zones/custom_script.xml @@ -291,14 +291,14 @@ - - - - - - - - + + + + + + + + diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java index b60305699c..01bd5c5942 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -96,7 +96,7 @@ public final class MultisellData implements IGameXmlReader if ("list".equalsIgnoreCase(n.getNodeName())) { list.setApplyTaxes(parseBoolean(n.getAttributes(), "applyTaxes", false)); - list.setNewMultisell(parseBoolean(n.getAttributes(), "isNewMultisell", false)); + list.setIsChanceMultisell(parseBoolean(n.getAttributes(), "isChanceMultisell", false)); list.setMaintainEnchantment(parseBoolean(n.getAttributes(), "maintainEnchantment", false)); att = n.getAttributes().getNamedItem("useRate"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java index dcb12ddab5..b0dd180176 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java @@ -35,14 +35,14 @@ public class Ingredient private boolean _maintainIngredient; private L2Item _template = null; private ItemInfo _itemInfo = null; - private final int _chance; + private final double _chance; public Ingredient(StatsSet set) { - this(set.getInt("id"), set.getLong("count"), set.getInt("enchantmentLevel", 0), set.getInt("chance", 0), set.getBoolean("isTaxIngredient", false), set.getBoolean("maintainIngredient", false)); + this(set.getInt("id"), set.getLong("count"), set.getInt("enchantmentLevel", 0), set.getDouble("chance", 0), set.getBoolean("isTaxIngredient", false), set.getBoolean("maintainIngredient", false)); } - public Ingredient(int itemId, long itemCount, int enchantmentLevel, int chance, boolean isTaxIngredient, boolean maintainIngredient) + public Ingredient(int itemId, long itemCount, int enchantmentLevel, double chance, boolean isTaxIngredient, boolean maintainIngredient) { _itemId = itemId; _itemCount = itemCount; @@ -109,7 +109,7 @@ public class Ingredient return _itemCount; } - public int getChance() + public double getChance() { return _chance; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java index e5c4ac10ee..ce1783c276 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java @@ -27,7 +27,7 @@ import java.util.Set; public class ListContainer { private final int _listId; - private boolean _isNewMultisell; + private boolean _isChanceMultisell; private boolean _applyTaxes = false; private boolean _maintainEnchantment = false; private double _useRate = 1.0; @@ -43,7 +43,7 @@ public class ListContainer public ListContainer(ListContainer container) { _listId = container.getListId(); - _isNewMultisell = container.isNewMultisell(); + _isChanceMultisell = container.isChanceMultisell(); _maintainEnchantment = container.getMaintainEnchantment(); } @@ -57,14 +57,14 @@ public class ListContainer return _listId; } - public boolean isNewMultisell() + public boolean isChanceMultisell() { - return _isNewMultisell; + return _isChanceMultisell; } - public void setNewMultisell(boolean val) + public void setIsChanceMultisell(boolean val) { - _isNewMultisell = val; + _isChanceMultisell = val; } public final void setApplyTaxes(boolean applyTaxes) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index d4d88cd715..05d5921904 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -369,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket // Generate the appropriate items for (Ingredient e : entry.getProducts()) { - if (list.isNewMultisell()) + if (list.isChanceMultisell()) { // Skip first entry. if (e.getChance() < 1) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 4ba99c85bd..3c4792a3da 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -62,7 +62,7 @@ public final class MultiSellList implements IClientOutgoingPacket packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length packet.writeC(0x00); // Grand Crusade - packet.writeC(_list.isNewMultisell() ? 0x01 : 0x00); // new multisell window + packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window packet.writeD(0x20); // Always 32 oO Entry ent; @@ -115,7 +115,7 @@ public final class MultiSellList implements IClientOutgoingPacket { final ItemInfo item = ing.getItemInfo(); packet.writeH(item.getEnchantLevel()); // enchant level - packet.writeD(_list.isNewMultisell() ? ing.getChance() : item.getAugmentId()); // augment id + packet.writeD((int) (_list.isChanceMultisell() ? ing.getChance() : item.getAugmentId())); // augment id packet.writeD(0x00); // mana packet.writeD(0x00); // time ? packet.writeH(item.getElementId()); // attack element @@ -142,7 +142,7 @@ public final class MultiSellList implements IClientOutgoingPacket else { packet.writeH(ing.getEnchantLevel()); // enchant level - packet.writeD(ing.getChance()); // augment id + packet.writeD((int) ing.getChance()); // augment id packet.writeD(0x00); // mana packet.writeD(0x00); // time ? packet.writeH(0x00); // attack element @@ -176,7 +176,7 @@ public final class MultiSellList implements IClientOutgoingPacket { final ItemInfo item = ing.getItemInfo(); packet.writeH(item.getEnchantLevel()); // enchant level - packet.writeD(_list.isNewMultisell() ? ing.getChance() : item.getAugmentId()); // augment id + packet.writeD((int) (_list.isChanceMultisell() ? ing.getChance() : item.getAugmentId())); // augment id packet.writeD(0x00); // mana packet.writeH(item.getElementId()); // attack element packet.writeH(item.getElementPower()); // element power @@ -200,7 +200,7 @@ public final class MultiSellList implements IClientOutgoingPacket else { packet.writeH(ing.getEnchantLevel()); // enchant level - packet.writeD(ing.getChance()); // augment id + packet.writeD((int) ing.getChance()); // augment id packet.writeD(0x00); // mana packet.writeH(0x00); // attack element packet.writeH(0x00); // element power diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3002003.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3002003.xml index 79be104cde..d299dbf989 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3002003.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3002003.xml @@ -1,5 +1,5 @@ - + 30020 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3009703.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3009703.xml index d04f09474f..6d15f6f8df 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3009703.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3009703.xml @@ -1,5 +1,5 @@ - + 30097 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3025404.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3025404.xml index ad066e81c6..ddab0e6dd1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3025404.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3025404.xml @@ -1,5 +1,5 @@ - + 30254 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3083902.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3083902.xml index fb834246a3..6ed56fbe15 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3083902.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3083902.xml @@ -1,5 +1,5 @@ - + 30839 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3084002.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3084002.xml index 7bf09df44f..9e8abe1486 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3084002.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3084002.xml @@ -1,5 +1,5 @@ - + 30840 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3084103.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3084103.xml index af2522fb3f..0f6212597d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3084103.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3084103.xml @@ -1,5 +1,5 @@ - + 30841 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3104301.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3104301.xml index 63269e5454..d23c757f1e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3104301.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3104301.xml @@ -1,5 +1,5 @@ - + 31043 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/multisell.xsd b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/multisell.xsd index 089fd5b89c..196695f377 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/multisell.xsd +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/multisell.xsd @@ -30,14 +30,14 @@ - + - + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/zones/custom_script.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/zones/custom_script.xml index 10025fa8e4..7840f8cdf2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/zones/custom_script.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/zones/custom_script.xml @@ -291,14 +291,14 @@ - - - - - - - - + + + + + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java index b60305699c..01bd5c5942 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -96,7 +96,7 @@ public final class MultisellData implements IGameXmlReader if ("list".equalsIgnoreCase(n.getNodeName())) { list.setApplyTaxes(parseBoolean(n.getAttributes(), "applyTaxes", false)); - list.setNewMultisell(parseBoolean(n.getAttributes(), "isNewMultisell", false)); + list.setIsChanceMultisell(parseBoolean(n.getAttributes(), "isChanceMultisell", false)); list.setMaintainEnchantment(parseBoolean(n.getAttributes(), "maintainEnchantment", false)); att = n.getAttributes().getNamedItem("useRate"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java index dcb12ddab5..b0dd180176 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java @@ -35,14 +35,14 @@ public class Ingredient private boolean _maintainIngredient; private L2Item _template = null; private ItemInfo _itemInfo = null; - private final int _chance; + private final double _chance; public Ingredient(StatsSet set) { - this(set.getInt("id"), set.getLong("count"), set.getInt("enchantmentLevel", 0), set.getInt("chance", 0), set.getBoolean("isTaxIngredient", false), set.getBoolean("maintainIngredient", false)); + this(set.getInt("id"), set.getLong("count"), set.getInt("enchantmentLevel", 0), set.getDouble("chance", 0), set.getBoolean("isTaxIngredient", false), set.getBoolean("maintainIngredient", false)); } - public Ingredient(int itemId, long itemCount, int enchantmentLevel, int chance, boolean isTaxIngredient, boolean maintainIngredient) + public Ingredient(int itemId, long itemCount, int enchantmentLevel, double chance, boolean isTaxIngredient, boolean maintainIngredient) { _itemId = itemId; _itemCount = itemCount; @@ -109,7 +109,7 @@ public class Ingredient return _itemCount; } - public int getChance() + public double getChance() { return _chance; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java index e5c4ac10ee..ce1783c276 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/multisell/ListContainer.java @@ -27,7 +27,7 @@ import java.util.Set; public class ListContainer { private final int _listId; - private boolean _isNewMultisell; + private boolean _isChanceMultisell; private boolean _applyTaxes = false; private boolean _maintainEnchantment = false; private double _useRate = 1.0; @@ -43,7 +43,7 @@ public class ListContainer public ListContainer(ListContainer container) { _listId = container.getListId(); - _isNewMultisell = container.isNewMultisell(); + _isChanceMultisell = container.isChanceMultisell(); _maintainEnchantment = container.getMaintainEnchantment(); } @@ -57,14 +57,14 @@ public class ListContainer return _listId; } - public boolean isNewMultisell() + public boolean isChanceMultisell() { - return _isNewMultisell; + return _isChanceMultisell; } - public void setNewMultisell(boolean val) + public void setIsChanceMultisell(boolean val) { - _isNewMultisell = val; + _isChanceMultisell = val; } public final void setApplyTaxes(boolean applyTaxes) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index d4d88cd715..05d5921904 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -369,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket // Generate the appropriate items for (Ingredient e : entry.getProducts()) { - if (list.isNewMultisell()) + if (list.isChanceMultisell()) { // Skip first entry. if (e.getChance() < 1) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 6d5ead2f06..be6ce0114b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -61,7 +61,7 @@ public final class MultiSellList implements IClientOutgoingPacket packet.writeD(_finished ? 0x01 : 0x00); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(_list.isNewMultisell() ? 0x01 : 0x00); // new multisell window + packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window packet.writeD(0x20); // Always 32 oO Entry ent; @@ -114,7 +114,7 @@ public final class MultiSellList implements IClientOutgoingPacket { final ItemInfo item = ing.getItemInfo(); packet.writeH(item.getEnchantLevel()); // enchant level - packet.writeD(_list.isNewMultisell() ? ing.getChance() : item.getAugmentId()); // augment id + packet.writeD((int) (_list.isChanceMultisell() ? ing.getChance() : item.getAugmentId())); // augment id packet.writeD(0x00); // mana packet.writeD(0x00); // time ? packet.writeH(item.getElementId()); // attack element @@ -141,7 +141,7 @@ public final class MultiSellList implements IClientOutgoingPacket else { packet.writeH(ing.getEnchantLevel()); // enchant level - packet.writeD(ing.getChance()); // augment id + packet.writeD((int) ing.getChance()); // augment id packet.writeD(0x00); // mana packet.writeD(0x00); // time ? packet.writeH(0x00); // attack element @@ -175,7 +175,7 @@ public final class MultiSellList implements IClientOutgoingPacket { final ItemInfo item = ing.getItemInfo(); packet.writeH(item.getEnchantLevel()); // enchant level - packet.writeD(_list.isNewMultisell() ? ing.getChance() : item.getAugmentId()); // augment id + packet.writeD((int) (_list.isChanceMultisell() ? ing.getChance() : item.getAugmentId())); // augment id packet.writeD(0x00); // mana packet.writeH(item.getElementId()); // attack element packet.writeH(item.getElementPower()); // element power @@ -199,7 +199,7 @@ public final class MultiSellList implements IClientOutgoingPacket else { packet.writeH(ing.getEnchantLevel()); // enchant level - packet.writeD(ing.getChance()); // augment id + packet.writeD((int) ing.getChance()); // augment id packet.writeD(0x00); // mana packet.writeH(0x00); // attack element packet.writeH(0x00); // element power