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

Reverting Premium System drop calculations.

Browse Source
This commit is contained in:
MobiusDev
2015-04-25 00:50:27 +00:00
parent 66f1e4c9f9
commit 2543c68c09
8 changed files with 39 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
trunk/java/com/l2jserver/gameserver/model/drops/GeneralDropItem.java
View File

@@ -146,12 +146,11 @@ public final class GeneralDropItem implements IDropItem
/**
* Gets the min drop count modified by server rates
* @param victim the victim who drops the item
* @param killer
* @return the min modified by any rates.
*/
public final long getMin(L2Character victim, L2Character killer)
public final long getMin(L2Character victim)
{
return (long) (getMin() * getAmountMultiplier(victim, killer));
return (long) (getMin() * getAmountMultiplier(victim));
}
/**
@@ -166,12 +165,11 @@ public final class GeneralDropItem implements IDropItem
/**
* Gets the max drop count modified by server rates
* @param victim the victim who drops the item
* @param killer
* @return the max modified by any rates.
*/
public final long getMax(L2Character victim, L2Character killer)
public final long getMax(L2Character victim)
{
return (long) (getMax() * getAmountMultiplier(victim, killer));
return (long) (getMax() * getAmountMultiplier(victim));
}
/**
@@ -183,6 +181,17 @@ public final class GeneralDropItem implements IDropItem
return _chance;
}
/**
* Gets the general chance to drop this item modified by rates. <br>
* This shall be used in calculating chance within drop groups.
* @param victim the victim who drops the item
* @return the chance modified by any rates.
*/
public final double getChance(L2Character victim)
{
return getChance() * getChanceMultiplier(victim);
}
/**
* Gets the chance of dropping this item for current killer and victim (modified by server rates and another rules based on killer) <br>
* This shall be used to calculate chance outside of drop groups.
@@ -192,7 +201,7 @@ public final class GeneralDropItem implements IDropItem
*/
public final double getChance(L2Character victim, L2Character killer)
{
return (getKillerChanceModifier(victim, killer) * getChance());
return (getKillerChanceModifier(victim, killer) * getChance(victim));
}
@Override
@@ -223,22 +232,20 @@ public final class GeneralDropItem implements IDropItem
/**
* This gets standard server rates for this item
* @param victim who drops the item
* @param killer
* @return
*/
protected final double getAmountMultiplier(L2Character victim, L2Character killer)
protected final double getAmountMultiplier(L2Character victim)
{
return _amountStrategy.getAmountMultiplier(this, victim, killer);
return _amountStrategy.getAmountMultiplier(this, victim);
}
/**
* This gets standard server rates for this item
* @param victim who drops the item
* @param killer
* @return
*/
protected final double getChanceMultiplier(L2Character victim, L2Character killer)
protected final double getChanceMultiplier(L2Character victim)
{
return _chanceStrategy.getChanceMultiplier(this, victim, killer);
return _chanceStrategy.getChanceMultiplier(this, victim);
}
}