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

Fixed drop chance multiplier by item id.

Browse Source
This commit is contained in:
MobiusDev
2017-10-04 01:09:16 +00:00
parent ed4be650f8
commit 2c61857b12
10 changed files with 176 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/drops/GroupedGeneralDropItem.java
View File

@@ -71,8 +71,40 @@ public class GroupedGeneralDropItem implements IDropItem
for (GeneralDropItem gdi : getItems())
{
final L2Item item = ItemTable.getInstance().getTemplate(gdi.getItemId());
if ((item == null) || !item.hasExImmediateEffect())
if (item == null)
{
return 0;
}
if (!item.hasExImmediateEffect())
{
// individual chance
Float individualDropChanceMultiplier = null;
if (killer.getActingPlayer().hasPremiumStatus())
{
final Float normalMultiplier = Config.RATE_DROP_CHANCE_BY_ID.get(item.getId());
final Float premiumMultiplier = Config.PREMIUM_RATE_DROP_CHANCE_BY_ID.get(item.getId());
if ((normalMultiplier != null) && (premiumMultiplier != null))
{
individualDropChanceMultiplier = normalMultiplier * premiumMultiplier;
}
else if (normalMultiplier != null)
{
individualDropChanceMultiplier = normalMultiplier;
}
else if (premiumMultiplier != null)
{
individualDropChanceMultiplier = premiumMultiplier;
}
}
else
{
individualDropChanceMultiplier = Config.RATE_DROP_CHANCE_BY_ID.get(item.getId());
}
if (individualDropChanceMultiplier != null)
{
return getChance() * individualDropChanceMultiplier;
}
return getChance() * getGlobalChanceMultiplier();
}
}
@@ -130,7 +162,7 @@ public class GroupedGeneralDropItem implements IDropItem
for (GeneralDropItem item : getItems())
{
// Grouped item chance rates should not be modified.
totalChance += item.getChance();
totalChance += item.getChance(victim, killer);
if (totalChance > random)
{
final Collection<ItemHolder> items = new ArrayList<>(1);