BETA: Datapack for [L5183]

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java

@@ -66,7 +66,6 @@ public class RestorationRandom extends L2Effect
 		double chance = 0;
 		double chanceFrom = 0;
 		final List<ItemHolder> creationList = new ArrayList<>();
-		final boolean isFish = getSkill().getName().contains("Fish");
 		
 		// Explanation for future changes:
 		// You get one chance for the current skill, then you can fall into
@@ -95,15 +94,13 @@ public class RestorationRandom extends L2Effect
 			return false;
 		}
 		
-		long count;
 		for (ItemHolder item : creationList)
 		{
 			if ((item.getId() <= 0) || (item.getCount() <= 0))
 			{
 				continue;
 			}
-			count = (long) (isFish ? item.getCount() * Config.RATE_EXTR_FISH : item.getCount());
-			player.addItem("Extract", item.getId(), count, getEffector(), true);
+			player.addItem("Extract", item.getId(), (long) (item.getCount() * Config.RATE_EXTRACTABLE), getEffector(), true);
 		}
 		return true;
 	}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java

@@ -44,8 +44,6 @@ public class ExtractableItems implements IItemHandler
 		}
 		
 		final L2PcInstance activeChar = playable.getActingPlayer();
-		
-		final int itemID = item.getItemId();
 		final L2EtcItem etcitem = (L2EtcItem) item.getItem();
 		final List<L2ExtractableProduct> exitem = etcitem.getExtractableItems();
 		if (exitem == null)
@@ -62,20 +60,17 @@ public class ExtractableItems implements IItemHandler
 		
 		boolean created = false;
 		// calculate extraction
+		int min;
+		int max;
+		int createitemAmount;
 		for (L2ExtractableProduct expi : exitem)
 		{
 			if (Rnd.get(100000) <= expi.getChance())
 			{
-				int min = expi.getMin();
-				int max = expi.getMax();
-				
-				if (((itemID >= 6411) && (itemID <= 6518)) || ((itemID >= 7726) && (itemID <= 7860)) || ((itemID >= 8403) && (itemID <= 8483)))
-				{
-					min *= Config.RATE_EXTR_FISH;
-					max *= Config.RATE_EXTR_FISH;
-				}
+				min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE);
+				max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE);
 				
-				final int createitemAmount = (max == min) ? min : (Rnd.get(max - min + 1) + min);
+				createitemAmount = (max == min) ? min : (Rnd.get(max - min + 1) + min);
 				activeChar.addItem("Extract", expi.getId(), createitemAmount, activeChar, true);
 				created = true;
 			}