diff --git a/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 61d084d22f2a63ff4ea1cdf7a5f3b53a98d07b70..9dabbabd0b1e799ac1c65b71036fff884f239d6a 100644 --- a/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -302,7 +302,7 @@ public class NpcViewMod implements IBypassHandler } else { - GroupedGeneralDropItem normalized = generalGroupedDropItem.normalizeMe(npc, activeChar, generalGroupedDropItem.getDeepBlueDropChance(npc, activeChar)); + GroupedGeneralDropItem normalized = generalGroupedDropItem.normalizeMe(npc, activeChar); sb.append("<table width=332 cellpadding=2 cellspacing=0 background=\"L2UI_CT1.Windows.Windows_DF_TooltipBG\">"); sb.append("<tr><td width=32 valign=top><img src=\"L2UI_CT1.ICON_DF_premiumItem\" width=32 height=32></td>"); sb.append("<td fixwidth=300 align=center><font name=\"ScreenMessageSmall\" color=\"CD9000\">One from group</font>"); @@ -322,7 +322,7 @@ public class NpcViewMod implements IBypassHandler sb.append(item.getName()); sb.append("</font></td></tr><tr><td width=32></td><td width=259><table width=253 cellpadding=0 cellspacing=0>"); sb.append("<tr><td width=48 align=right valign=top><font color=\"LEVEL\">Amount:</font></td><td width=205 align=center>"); - MinMax minMax = getPreciseMinMax(normalized.getChance(), generalDropItem.getMin(npc, activeChar), generalDropItem.getMax(npc, activeChar), generalDropItem.isPreciseCalculated()); + MinMax minMax = getPreciseMinMax(normalized.getChance(), generalDropItem.getMin(npc), generalDropItem.getMax(npc), generalDropItem.isPreciseCalculated()); final long min = minMax.min; final long max = minMax.max; if (min == max) @@ -401,7 +401,7 @@ public class NpcViewMod implements IBypassHandler sb.append("</font></td></tr><tr><td width=32></td><td width=300><table width=295 cellpadding=0 cellspacing=0>"); sb.append("<tr><td width=48 align=right valign=top><font color=\"LEVEL\">Amount:</font></td>"); sb.append("<td width=247 align=center>"); - MinMax minMax = getPreciseMinMax(dropItem.getModifiedChance(npc, activeChar), dropItem.getMin(npc, activeChar), dropItem.getMax(npc, activeChar), dropItem.isPreciseCalculated()); + MinMax minMax = getPreciseMinMax(dropItem.getChance(npc, activeChar), dropItem.getMin(npc), dropItem.getMax(npc), dropItem.isPreciseCalculated()); final long min = minMax.min; final long max = minMax.max; @@ -418,7 +418,7 @@ public class NpcViewMod implements IBypassHandler sb.append("</td></tr><tr><td width=48 align=right valign=top><font color=\"LEVEL\">Chance:</font></td>"); sb.append("<td width=247 align=center>"); - sb.append(chanceFormat.format(Math.min(dropItem.getModifiedChance(npc, activeChar), 100))); + sb.append(chanceFormat.format(Math.min(dropItem.getChance(npc, activeChar), 100))); sb.append("%</td></tr></table></td></tr><tr><td width=32></td><td width=300> </td></tr></table>"); }