trunk/java/com/l2jserver/gameserver/model/drops/CorpseDropItem.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops;
+
+import com.l2jserver.Config;
+
+/**
+ * @author NosBit
+ */
+public class CorpseDropItem extends GeneralDropItem
+{
+	/**
+	 * @param itemId the item id
+	 * @param min the min count
+	 * @param max the max count
+	 * @param chance the chance of this drop item
+	 */
+	public CorpseDropItem(int itemId, long min, long max, double chance)
+	{
+		super(itemId, min, max, chance);
+	}
+	
+	/*
+	 * (non-Javadoc)
+	 * @see com.l2jserver.gameserver.model.drops.GeneralDropItem#getGlobalAmountMultiplier()
+	 */
+	@Override
+	protected double getGlobalAmountMultiplier()
+	{
+		return Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER;
+	}
+	
+	/*
+	 * (non-Javadoc)
+	 * @see com.l2jserver.gameserver.model.drops.GeneralDropItem#getGlobalChanceMultiplier()
+	 */
+	@Override
+	protected double getGlobalChanceMultiplier()
+	{
+		return Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER;
+	}
+}

trunk/java/com/l2jserver/gameserver/model/drops/DeathDropItem.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops;
+
+import com.l2jserver.Config;
+
+/**
+ * @author NosBit
+ */
+public class DeathDropItem extends GeneralDropItem
+{
+	/**
+	 * @param itemId the item id
+	 * @param min the min count
+	 * @param max the max count
+	 * @param chance the chance of this drop item
+	 */
+	public DeathDropItem(int itemId, long min, long max, double chance)
+	{
+		super(itemId, min, max, chance);
+	}
+	
+	/*
+	 * (non-Javadoc)
+	 * @see com.l2jserver.gameserver.model.drops.GeneralDropItem#getGlobalAmountMultiplier()
+	 */
+	@Override
+	protected double getGlobalAmountMultiplier()
+	{
+		return Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER;
+	}
+	
+	/*
+	 * (non-Javadoc)
+	 * @see com.l2jserver.gameserver.model.drops.GeneralDropItem#getGlobalChanceMultiplier()
+	 */
+	@Override
+	protected double getGlobalChanceMultiplier()
+	{
+		return Config.RATE_DEATH_DROP_CHANCE_MULTIPLIER;
+	}
+}

trunk/java/com/l2jserver/gameserver/model/drops/DropListScope.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * @author NosBit
+ */
+public enum DropListScope
+{
+	DEATH(DeathDropItem.class, GroupedDeathDropItem.class),
+	CORPSE(CorpseDropItem.class, GroupedCorpseDropItem.class);
+	
+	private static final Logger _log = Logger.getLogger(DropListScope.class.getName());
+	
+	private final Class<? extends GeneralDropItem> _dropItemClass;
+	private final Class<? extends GroupedGeneralDropItem> _groupedDropItemClass;
+	
+	private DropListScope(Class<? extends GeneralDropItem> dropItemClass, Class<? extends GroupedGeneralDropItem> groupedDropItemClass)
+	{
+		_dropItemClass = dropItemClass;
+		_groupedDropItemClass = groupedDropItemClass;
+	}
+	
+	public IDropItem newDropItem(int itemId, long min, long max, double chance)
+	{
+		final Constructor<? extends GeneralDropItem> constructor;
+		try
+		{
+			constructor = _dropItemClass.getConstructor(int.class, long.class, long.class, double.class);
+		}
+		catch (NoSuchMethodException | SecurityException e)
+		{
+			_log.log(Level.SEVERE, "Constructor(int, long, long, double) not found for " + _dropItemClass.getSimpleName(), e);
+			return null;
+		}
+		
+		try
+		{
+			return constructor.newInstance(itemId, min, max, chance);
+		}
+		catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e)
+		{
+			_log.log(Level.SEVERE, "", e);
+			return null;
+		}
+	}
+	
+	public GroupedGeneralDropItem newGroupedDropItem(double chance)
+	{
+		final Constructor<? extends GroupedGeneralDropItem> constructor;
+		try
+		{
+			constructor = _groupedDropItemClass.getConstructor(double.class);
+		}
+		catch (NoSuchMethodException | SecurityException e)
+		{
+			_log.log(Level.SEVERE, "Constructor(double) not found for " + _groupedDropItemClass.getSimpleName(), e);
+			return null;
+		}
+		
+		try
+		{
+			return constructor.newInstance(chance);
+		}
+		catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e)
+		{
+			_log.log(Level.SEVERE, "", e);
+			return null;
+		}
+	}
+}

trunk/java/com/l2jserver/gameserver/model/drops/GeneralDropItem.java

@@ -0,0 +1,269 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.Config;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.util.Util;
+import com.l2jserver.util.Rnd;
+
+/**
+ * @author NosBit
+ */
+public class GeneralDropItem implements IDropItem
+{
+	private final int _itemId;
+	private final long _min;
+	private final long _max;
+	private final double _chance;
+	
+	/**
+	 * @param itemId the item id
+	 * @param min the min count
+	 * @param max the max count
+	 * @param chance the chance of this drop item
+	 */
+	public GeneralDropItem(int itemId, long min, long max, double chance)
+	{
+		_itemId = itemId;
+		_min = min;
+		_max = max;
+		_chance = chance;
+	}
+	
+	protected double getGlobalChanceMultiplier()
+	{
+		return 1.;
+	}
+	
+	protected double getGlobalAmountMultiplier()
+	{
+		return 1.;
+	}
+	
+	private final long getMinMax(L2Character victim, L2Character killer, long val)
+	{
+		double multiplier = 1;
+		
+		// individual drop amount
+		Float individualDropAmountMultiplier = Config.RATE_DROP_AMOUNT_MULTIPLIER.get(getItemId());
+		if (individualDropAmountMultiplier != null)
+		{
+			// individual amount list multiplier
+			multiplier *= individualDropAmountMultiplier;
+		}
+		else
+		{
+			final L2Item item = ItemTable.getInstance().getTemplate(getItemId());
+			// global amount multiplier
+			if ((item != null) && item.hasExImmediateEffect())
+			{
+				// global herb amount multiplier
+				multiplier *= Config.RATE_HERB_DROP_AMOUNT_MULTIPLIER;
+			}
+			else
+			{
+				// drop type specific amount multiplier
+				multiplier *= getGlobalAmountMultiplier();
+			}
+		}
+		
+		// global champions amount multiplier
+		if (victim.isChampion())
+		{
+			multiplier *= getItemId() != Inventory.ADENA_ID ? Config.L2JMOD_CHAMPION_REWARDS : Config.L2JMOD_CHAMPION_ADENAS_REWARDS;
+		}
+		
+		return (long) (val * multiplier);
+	}
+	
+	/**
+	 * Gets the item id
+	 * @return the item id
+	 */
+	public int getItemId()
+	{
+		return _itemId;
+	}
+	
+	/**
+	 * Gets the min drop count
+	 * @return the min
+	 */
+	public long getMin()
+	{
+		return _min;
+	}
+	
+	/**
+	 * Gets the min drop count
+	 * @param victim the victim
+	 * @param killer the killer
+	 * @return the min modified by any rates.
+	 */
+	public long getMin(L2Character victim, L2Character killer)
+	{
+		return getMinMax(victim, killer, getMin());
+	}
+	
+	/**
+	 * Gets the max drop count
+	 * @return the max
+	 */
+	public long getMax()
+	{
+		return _max;
+	}
+	
+	/**
+	 * Gets the max drop count
+	 * @param victim the victim
+	 * @param killer the killer
+	 * @return the max modified by any rates.
+	 */
+	public long getMax(L2Character victim, L2Character killer)
+	{
+		return getMinMax(victim, killer, getMax());
+	}
+	
+	/**
+	 * Gets the chance of this drop item.
+	 * @return the chance
+	 */
+	public double getChance()
+	{
+		return _chance;
+	}
+	
+	/**
+	 * Gets the chance of this drop item.
+	 * @param victim the victim
+	 * @param killer the killer
+	 * @return the chance modified by any rates.
+	 */
+	public double getChance(L2Character victim, L2Character killer)
+	{
+		double multiplier = 1;
+		
+		// individual drop chance
+		Float individualDropChanceMultiplier = Config.RATE_DROP_CHANCE_MULTIPLIER.get(getItemId());
+		if (individualDropChanceMultiplier != null)
+		{
+			multiplier *= individualDropChanceMultiplier;
+		}
+		else
+		{
+			final L2Item item = ItemTable.getInstance().getTemplate(getItemId());
+			if ((item != null) && item.hasExImmediateEffect())
+			{
+				multiplier *= Config.RATE_HERB_DROP_CHANCE_MULTIPLIER;
+			}
+			else
+			{
+				multiplier *= getGlobalChanceMultiplier();
+			}
+		}
+		
+		// global champions chance multiplier, there is no such option yet
+		// @formatter:off
+		/*if (victim.isChampion())
+		{
+			multiplier *= getItemId() != Inventory.ADENA_ID ? Config.L2JMOD_CHAMPION_REWARDS_CHANCE : Config.L2JMOD_CHAMPION_ADENAS_REWARDS_CHANCE;
+		}*/
+		// @formatter:on
+		
+		return (getChance() * multiplier);
+	}
+	
+	/*
+	 * (non-Javadoc)
+	 * @see com.l2jserver.gameserver.model.drop.IDropItem#calculateDrops(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.actor.L2Character)
+	 */
+	@Override
+	public List<ItemHolder> calculateDrops(L2Character victim, L2Character killer)
+	{
+		final int levelDifference = victim.getLevel() - killer.getLevel();
+		final double levelGapChanceToDrop;
+		if (getItemId() == Inventory.ADENA_ID)
+		{
+			levelGapChanceToDrop = Util.map(levelDifference, -Config.DROP_ADENA_MAX_LEVEL_DIFFERENCE, -Config.DROP_ADENA_MIN_LEVEL_DIFFERENCE, Config.DROP_ADENA_MIN_LEVEL_GAP_CHANCE, 100.0);
+		}
+		else
+		{
+			levelGapChanceToDrop = Util.map(levelDifference, -Config.DROP_ITEM_MAX_LEVEL_DIFFERENCE, -Config.DROP_ITEM_MIN_LEVEL_DIFFERENCE, Config.DROP_ITEM_MIN_LEVEL_GAP_CHANCE, 100.0);
+		}
+		
+		// There is a chance of level gap that it wont drop this item
+		if (levelGapChanceToDrop < (Rnd.nextDouble() * 100))
+		{
+			return null;
+		}
+		
+		final List<ItemHolder> items = new ArrayList<>(1);
+		
+		if (Config.L2JMOD_OLD_DROP_BEHAVIOR)
+		{
+			double chance = getChance(victim, killer);
+			if (Config.L2JMOD_CHAMPION_ENABLE && victim.isChampion() && (getItemId() != Inventory.ADENA_ID))
+			{
+				chance *= Config.L2JMOD_CHAMPION_REWARDS;
+			}
+			
+			long amount = 0;
+			
+			if (chance > 100)
+			{
+				int chanceOveflow = (int) (chance / 100);
+				chance = chance % 100;
+				while (chanceOveflow > 0)
+				{
+					amount += Rnd.get(getMin(victim, killer), getMax(victim, killer));
+					chanceOveflow--;
+				}
+			}
+			
+			if (chance > (Rnd.nextDouble() * 100))
+			{
+				amount += Rnd.get(getMin(victim, killer), getMax(victim, killer));
+			}
+			
+			if (amount > 0)
+			{
+				items.add(new ItemHolder(getItemId(), amount));
+			}
+		}
+		else
+		{
+			if (getChance(victim, killer) > (Rnd.nextDouble() * 100))
+			{
+				final long amount = Rnd.get(getMin(victim, killer), getMax(victim, killer));
+				items.add(new ItemHolder(getItemId(), amount));
+			}
+		}
+		
+		return items;
+	}
+}

trunk/java/com/l2jserver/gameserver/model/drops/GroupedCorpseDropItem.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops;
+
+import com.l2jserver.Config;
+
+/**
+ * @author NosBit
+ */
+public class GroupedCorpseDropItem extends GroupedGeneralDropItem
+{
+	/**
+	 * @param chance the chance of this drop item.
+	 */
+	public GroupedCorpseDropItem(double chance)
+	{
+		super(chance);
+	}
+	
+	/*
+	 * (non-Javadoc)
+	 * @see com.l2jserver.gameserver.model.drops.GroupedGeneralDropItem#getGlobalChanceMultiplier()
+	 */
+	@Override
+	protected double getGlobalChanceMultiplier()
+	{
+		return Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER;
+	}
+}

trunk/java/com/l2jserver/gameserver/model/drops/GroupedDeathDropItem.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops;
+
+import com.l2jserver.Config;
+
+/**
+ * @author NosBit
+ */
+public class GroupedDeathDropItem extends GroupedGeneralDropItem
+{
+	/**
+	 * @param chance the chance of this drop item.
+	 */
+	public GroupedDeathDropItem(double chance)
+	{
+		super(chance);
+	}
+	
+	/*
+	 * (non-Javadoc)
+	 * @see com.l2jserver.gameserver.model.drops.GroupedGeneralDropItem#getGlobalChanceMultiplier()
+	 */
+	@Override
+	protected double getGlobalChanceMultiplier()
+	{
+		return Config.RATE_DEATH_DROP_CHANCE_MULTIPLIER;
+	}
+}

trunk/java/com/l2jserver/gameserver/model/drops/GroupedGeneralDropItem.java

@@ -0,0 +1,187 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import com.l2jserver.Config;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2RaidBossInstance;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.util.Util;
+import com.l2jserver.util.Rnd;
+
+/**
+ * @author NosBit
+ */
+public class GroupedGeneralDropItem implements IDropItem
+{
+	private final double _chance;
+	private List<GeneralDropItem> _items;
+	
+	/**
+	 * @param chance the chance of this drop item.
+	 */
+	public GroupedGeneralDropItem(double chance)
+	{
+		_chance = chance;
+	}
+	
+	protected double getGlobalChanceMultiplier()
+	{
+		return 1.;
+	}
+	
+	/**
+	 * Gets the chance of this drop item.
+	 * @return the chance
+	 */
+	public double getChance()
+	{
+		return _chance;
+	}
+	
+	/**
+	 * Gets the chance of this drop item.
+	 * @param victim the victim
+	 * @param killer the killer
+	 * @return the chance modified by any rates.
+	 */
+	public double getChance(L2Character victim, L2Character killer)
+	{
+		for (final GeneralDropItem gdi : getItems())
+		{
+			final L2Item item = ItemTable.getInstance().getTemplate(gdi.getItemId());
+			if ((item == null) || !item.hasExImmediateEffect())
+			{
+				return getChance() * getGlobalChanceMultiplier();
+			}
+		}
+		
+		return getChance() * Config.RATE_HERB_DROP_CHANCE_MULTIPLIER;
+	}
+	
+	/**
+	 * Gets the items.
+	 * @return the items
+	 */
+	public List<GeneralDropItem> getItems()
+	{
+		return _items;
+	}
+	
+	/**
+	 * Sets an item list to this drop item.
+	 * @param items the item list
+	 */
+	public void setItems(List<GeneralDropItem> items)
+	{
+		_items = Collections.unmodifiableList(items);
+	}
+	
+	/*
+	 * (non-Javadoc)
+	 * @see com.l2jserver.gameserver.model.drop.IDropItem#calculateDrops(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.actor.L2Character)
+	 */
+	@Override
+	public List<ItemHolder> calculateDrops(L2Character victim, L2Character killer)
+	{
+		int levelDifference = victim.getLevel() - killer.getLevel();
+		double chanceModifier;
+		if (victim instanceof L2RaidBossInstance)
+		{
+			chanceModifier = Math.max(0, Math.min(1, (levelDifference * 0.15) + 1));
+		}
+		else
+		{
+			chanceModifier = 1;
+			
+			double levelGapChanceToDrop = Util.map(levelDifference, -Config.DROP_ITEM_MAX_LEVEL_DIFFERENCE, -Config.DROP_ITEM_MIN_LEVEL_DIFFERENCE, Config.DROP_ITEM_MIN_LEVEL_GAP_CHANCE, 100.0);
+			// There is a chance of level gap that it wont drop this item
+			if (levelGapChanceToDrop < (Rnd.nextDouble() * 100))
+			{
+				return null;
+			}
+		}
+		
+		if ((getChance(victim, killer) * chanceModifier) > (Rnd.nextDouble() * 100))
+		{
+			final List<ItemHolder> items = new ArrayList<>(1);
+			long amount = 0;
+			double totalChance = 0;
+			double random = (Rnd.nextDouble() * 100);
+			double chance = 0;
+			
+			if (Config.L2JMOD_OLD_DROP_BEHAVIOR)
+			{
+				for (GeneralDropItem item : getItems())
+				{
+					// Grouped item chance rates should not be modified.
+					totalChance += item.getChance();
+					
+					if (totalChance > 100)
+					{
+						int chanceOverflow = (int) (totalChance / 100);
+						chance = totalChance % 100;
+						while (chanceOverflow > 0)
+						{
+							amount += Rnd.get(item.getMin(victim, killer), item.getMax(victim, killer));
+							chanceOverflow--;
+						}
+					}
+					else
+					{
+						chance = totalChance;
+					}
+					
+					if (chance > random)
+					{
+						amount += Rnd.get(item.getMin(victim, killer), item.getMax(victim, killer));
+					}
+					
+					if (amount > 0)
+					{
+						items.add(new ItemHolder(item.getItemId(), amount));
+						return items;
+					}
+				}
+			}
+			else
+			{
+				for (GeneralDropItem item : getItems())
+				{
+					// Grouped item chance rates should not be modified.
+					totalChance += item.getChance();
+					if (totalChance > random)
+					{
+						amount = Rnd.get(item.getMin(victim, killer), item.getMax(victim, killer));
+						items.add(new ItemHolder(item.getItemId(), amount));
+						return items;
+					}
+				}
+			}
+		}
+		
+		return null;
+	}
+}

trunk/java/com/l2jserver/gameserver/model/drops/IDropItem.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+
+/**
+ * @author NosBit
+ */
+public interface IDropItem
+{
+	/**
+	 * Calculates drops of this drop item.
+	 * @param victim the victim
+	 * @param killer the killer
+	 * @return {@code null} or empty list if there are no drops, a list containing all items to drop otherwise
+	 */
+	public List<ItemHolder> calculateDrops(L2Character victim, L2Character killer);
+}