Extractable item handler rework.

trunk/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java

@@ -174,7 +174,9 @@ public final class DocumentItem extends DocumentBase implements IGameXmlReader
 						final int min = parseInteger(b.getAttributes(), "min");
 						final int max = parseInteger(b.getAttributes(), "max");
 						final double chance = parseDouble(b.getAttributes(), "chance");
-						_currentItem.item.addCapsuledItem(new L2ExtractableProduct(id, min, max, chance));
+						final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
+						final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);
+						_currentItem.item.addCapsuledItem(new L2ExtractableProduct(id, min, max, chance, minEnchant, maxEnchant));
 					}
 				}
 			}

trunk/java/com/l2jmobius/gameserver/model/L2ExtractableProduct.java

@@ -25,20 +25,26 @@ public class L2ExtractableProduct
 	private final int _min;
 	private final int _max;
 	private final int _chance;
+	private final int _minEnchant;
+	private final int _maxEnchant;
 	
 	/**
 	 * Create Extractable product
-	 * @param id crete item id
+	 * @param id create item id
 	 * @param min item count max
 	 * @param max item count min
 	 * @param chance chance for creating
+	 * @param minEnchant item min enchant
+	 * @param maxEnchant item max enchant
 	 */
-	public L2ExtractableProduct(int id, int min, int max, double chance)
+	public L2ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant)
 	{
 		_id = id;
 		_min = min;
 		_max = max;
 		_chance = (int) (chance * 1000);
+		_minEnchant = minEnchant;
+		_maxEnchant = maxEnchant;
 	}
 	
 	public int getId()
@@ -60,4 +66,14 @@ public class L2ExtractableProduct
 	{
 		return _chance;
 	}
+	
+	public int getMinEnchant()
+	{
+		return _minEnchant;
+	}
+	
+	public int getMaxEnchant()
+	{
+		return _maxEnchant;
+	}
 }

trunk/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java

@@ -32,6 +32,8 @@ public final class L2EtcItem extends L2Item
 	private String _handler;
 	private EtcItemType _type;
 	private List<L2ExtractableProduct> _extractableItems;
+	private int _extractableCountMin;
+	private int _extractableCountMax;
 	private boolean _isInfinite;
 	
 	/**
@@ -61,6 +63,14 @@ public final class L2EtcItem extends L2Item
 		}
 		
 		_handler = set.getString("handler", null); // ! null !
+		
+		_extractableCountMin = set.getInt("extractableCountMin", 0);
+		_extractableCountMax = set.getInt("extractableCountMax", 0);
+		if (_extractableCountMin > _extractableCountMax)
+		{
+			LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!");
+		}
+		
 		_isInfinite = set.getBoolean("is_infinite", false);
 	}
 	
@@ -98,6 +108,22 @@ public final class L2EtcItem extends L2Item
 		return _extractableItems;
 	}
 	
+	/**
+	 * @return the minimum count of extractable items
+	 */
+	public int getExtractableCountMin()
+	{
+		return _extractableCountMin;
+	}
+	
+	/**
+	 * @return the maximum count of extractable items
+	 */
+	public int getExtractableCountMax()
+	{
+		return _extractableCountMax;
+	}
+	
 	/**
 	 * @return true if item is infinite
 	 */