diff --git a/2006Redone Server/src/redone/game/content/minigames/TreasureTrails.java b/2006Redone Server/src/redone/game/content/minigames/TreasureTrails.java index 66759160..466afc47 100644 --- a/2006Redone Server/src/redone/game/content/minigames/TreasureTrails.java +++ b/2006Redone Server/src/redone/game/content/minigames/TreasureTrails.java @@ -5,82 +5,392 @@ import redone.util.Misc; public class TreasureTrails { - public static int lowLevelReward[] = { 1077, 1125, 1165, 1195, 1297, 1367, - 853, 7390, 7392, 7394, 7396, 7386, 7388, 1099, 1135, 1065, 851 }; - public static int mediemLevelReward[] = { 1073, 1123, 1161, 1199, 1301, - 1371, 857, 2577, 2579, 2487, 2493, 2499, 2631, 855 }; - public static int highLevelReward[] = { 1079, 1093, 1113, 1127, 1147, 1163, - 1185, 1201, 1275, 1303, 1319, 1333, 1359, 1373, 2491, 2497, 2503, - 861, 859, 2581, 2651, 1079, 1093, 1113, 1127, 1147, 1163, 1185, - 1201, 1275, 1303, 1319, 1333, 1359, 1373, 2491, 2497, 2503, 861, - 859, 2581, 2651, }; + public static int lowLevelReward[] = { + // Weapons + 853, // Maple shortbow + 851, // Maple longbow + 1327, // Black scimitar + 1233, // Black Dagger (p) + 5682, // Black Dagger (p+) + 5700, // Black Dagger (p++) + 6611, // White scimitar + 6591, // White dagger + 6593, // White dagger(p) + 6595, // White dagger(p+) + 6597, // White dagger(p++) + 6599, // White halberd + 6603, // White magic staff + // Armor + 6619, // White boots + 6615, // White chainbody + 6623, // White full helm + 6629, // White gloves + 6633, // White kiteshield + 6617, // White platebody + 6625, // White platelegs + 6627, // White plateskirt + 6631, // White sq shield + 2587, // Black full helm (t) + 2589, // Black kiteshield (t) + 2583, // Black platebody (t) + 2585, // Black platelegs (t) + 3472, // Black plateskirt (t) + 2595, // Black full helm (g) + 2597, // Black kiteshield (g) + 2591, // Black platebody (g) + 2593, // Black platelegs (g) + 3473, // Black plateskirt (g) + 7388, // Blue skirt (t) + 7396, // Blue wizard hat (t) + 7392, // Blue wizard robe (t) + 7386, // Blue skirt (g) + 7394, // Blue wizard hat (g) + 7390, // Blue wizard robe (g) + 7364, // Studded body (t) + 7368, // Studded chaps (t) + 7362, // Studded body (g) + 7366, // Studded chaps (g) + // Jewelery + 1639, // Emerald ring + 1641, // Ruby ring + 1637, // Sapphire ring + // Misc + 2524, // Black toy horsey + 2520, // Brown toy horsey + 2526, // Grey toy horsey + 2522, // White toy horsey + 6541, // Mouse toy + 7771, // Toy cat + 7767, // Toy mouse + 7763, // Toy doll + 3721, // Toy ship + 7759, // Toy soldier + 6856, // Bobble hat + 2978, // Chompy bird hat + 2979, // Chompy bird hat + 2980, // Chompy bird hat + 2981, // Chompy bird hat + 2982, // Chompy bird hat + 2983, // Chompy bird hat + 2984, // Chompy bird hat + 2985, // Chompy bird hat + 2986, // Chompy bird hat + 2987, // Chompy bird hat + 2988, // Chompy bird hat + 2989, // Chompy bird hat + 2990, // Chompy bird hat + 2991, // Chompy bird hat + 2992, // Chompy bird hat + 2993, // Chompy bird hat + 2994, // Chompy bird hat + 2995, // Chompy bird hat + 6345, // Villager hat + 6355, // Villager hat + 6365, // Villager hat + 6375, // Villager hat + 6862, // Woolly hat + 6860, // Tri-jester hat + 6858, // Jester hat + 6182, // Lederhosen hat + 6547, // Doctors hat + 6548, // Nurse hat + 6665, // Mudskipper hat + }; + public static int mediumLevelReward[] = { + // Weapons + 1329, // Mithril scimitar + 1331, // Adamant scimitar + 1397, // Air battlestaff + 1399, // Earth battlestaff + 1393, // Fire battlestaff + 3053, // Lava battlestaff + 6562, // Mud battlestaff + 1395, // Water battlestaff + 857, // Yew shortbow + 855, // Yew longbow + // Armor + 2605, // Adamant full helm (t) + 2603, // Adamant kiteshield (t) + 2599, // Adamant platebody (t) + 2601, // Adamant platelegs (t) + 3474, // Adamant plateskirt (t) + 2613, // Adamant full helm (g) + 2611, // Adamant kiteshield (g) + 2607, // Adamant platebody (g) + 2609, // Adamant platelegs (g) + 3475, // Adamant plateskirt (g) + 7372, // Green d'hide body (t) + 7380, // Green d'hide chaps (t) + 7370, // Green d'hide body (g) + 7378, // Green d'hide chaps (g) + // Jewelery + 2568, // Ring of forging + 2570, // Ring of life + 2550, // Ring of recoil + 1727, // Amulet of magic + 1725, // Amulet of strength + // Misc + 2581, // Robin hood hat + 2577, // Ranger boots + 2651, // Pirate's hat + 2631, //Highwayman mask + }; + public static int highLevelReward[] = { + // Weapons + 1333, // Rune scimitar + 1229, // Rune dagger(p) + 5678, // Rune dagger(p+) + 5696, // Rune dagger(p++) + 1215, // Dragon dagger + 1231, // Dragon dagger(p) + 5680, // Dragon dagger(p+) + 5698, // Dragon dagger(p++) + 1249, // Dragon spear + 3176, // Dragon spear(kp) + 1263, // Dragon spear(p) + 5716, // Dragon spear(p+) + 5730, // Dragon spear(p++) + 1359, // Rune axe + 6739, // Dragon axe + 3054, // Mystic lava staff + 6563, // Mystic mud staff + 1403, // Mystic water staff + 1405, // Mystic air staff + 1407, // Mystic earth staff + 1401, // Mystic fire staff + 861, // Magic shortbow + 859, // Magic longbow + // Armor + 3486, // Gilded full helm + 3488, // Gilded kiteshield + 3481, // Gilded platebody + 3483, // Gilded platelegs + 3485, // Gilded plateskirt + 2627, // Rune full helm (t) + 2629, // Rune kiteshield (t) + 2623, // Rune platebody (t) + 2625, // Rune platelegs (t) + 3477, // Rune plateskirt (t) + 2619, // Rune full helm (g) + 2621, // Rune kiteshield (g) + 2615, // Rune platebody (g) + 2617, // Rune platelegs (g) + 3476, // Rune plateskirt (g) + 7400, // Enchanted hat + 7398, // Enchanted robe + 7399, // Enchanted top + 6920, // Infinity boots + 6924, // Infinity bottoms + 6922, // Infinity gloves + 6918, // Infinity hat + 6916, // Infinity top + 4097, // Mystic boots + 4107, // Mystic boots (dark) + 4117, // Mystic boots (light) + 4095, // Mystic gloves + 4105, // Mystic gloves (dark) + 4115, // Mystic gloves (light) + 4089, // Mystic hat + 4099, // Mystic hat (dark) + 4109, // Mystic hat (light) + 4093, // Mystic robe bottom + 4103, // Mystic robe bottom (dark) + 4113, // Mystic robe bottom (light) + 4091, // Mystic robe top + 4101, // Mystic robe top (dark) + 4111, // Mystic robe top (light) + 7376, // Blue d'hide body (t) + 7384, // Blue d'hide chaps (t) + 7374, // Blue d'hide body (g) + 7382, // Blue d'hide chaps (g) + 2491, // Black d'hide vamb + 2497, // Black d'hide chaps + 2503, // Black d'hide body + 2513, // Dragon chainbody + 1149, // Dragon med helm + 4087, // Dragon platelegs + 4585, // Dragon plateskirt + 1187, // Dragon sq shield + 2414, // Zamorak cape + 2657, // Zamorak full helm + 2659, // Zamorak kiteshield + 2653, // Zamorak platebody + 2655, // Zamorak platelegs + 3478, // Zamorak plateskirt + 2413, // Guthix cape + 2673, // Guthix full helm + 2675, // Guthix kiteshield + 2669, // Guthix platebody + 2671, // Guthix platelegs + 3480, // Guthix plateskirt + 2412, // Saradomin cape + 2665, // Saradomin full helm + 2667, // Saradomin kiteshield + 2661, // Saradomin platebody + 2663, // Saradomin platelegs + 3479, // Saradomin plateskirt + // Jewelery + 1631, // Uncut dragonstone + 1615, // Dragonstone + 1702, // Dragonstone amulet + 1645, // Dragonstone ring + 2572, // Ring of wealth + 2552, // Ring of dueling(8) + 6733, // Archers ring + 6737, // Berserker ring + 6040, // Amulet of nature + 1497, // Amulet of othanian + 1731, // Amulet of power + 6585, // Amulet of fury + // Misc + 7927, // Easter ring + 1050, // Santa hat + 1042, // Blue partyhat + 1044, // Green partyhat + 1046, // Purple partyhat + 1038, // Red partyhat + 1048, // White partyhat + 1040, // Yellow partyhat + }; + + public static int lowLevelStacks[] = { + 995, // Coins + 380, // Lobster + 555, // Water rune + 558, // Mind rune + 556, // Air rune + 559, // Body rune + 557, // Earth rune + 554, // Fire rune + 884, // Iron arrow + 885, // Iron arrow(p) + 5617, // Iron arrow(p+) + 5623, // Iron arrow(p++) + }; + public static int mediumLevelStacks[] = { + 995, // Coins + 374, // Swordfish + 890, // Adamant arrow + 891, // Adamant arrow(p) + 5620, // Adamant arrow(p+) + 5626, // Adamant arrow(p++) + 563, // Law rune + 561, // Nature rune + 562, // Chaos rune + 564, // Cosmic rune + }; + public static int highLevelStacks[] = { + 995, // Coins + 386, // Shark + 892, // Rune arrow + 893, // Rune arrow(p) + 5621, // Rune arrow(p+) + 5627, // Rune arrow(p++) + 4697, // Smoke rune + 566, // Soul rune + 4694, // Steam rune + 4699, // Lava rune + 4695, // Mist rune + 4698, // Mud rune + 565, // Blood rune + 560, // Death rune + 4696, // Dust rune + 535, // Babydragon bones + 537, // Dragon bones + }; - public static int lowLevelStacks[] = { 995, 380, 561, 886, }; - public static int mediumLevelStacks[] = { 995, 374, 561, 563, 890, }; - public static int highLevelStacks[] = { 995, 386, 561, 563, 560, 892 }; - public static int allStacks[] = { 995, 380, 561, 886, 374, 561, 563, 890, - 386, 561, 563, 560, 892 }; public static void addClueReward(Client c, int clueLevel) { int chanceReward = Misc.random(2); if (clueLevel == 0) { switch (chanceReward) { case 0: - displayReward(c, lowLevelReward[Misc.random(16)], 1, - lowLevelReward[Misc.random(16)], 1, - lowLevelStacks[Misc.random(3)], 1 + Misc.random(150)); + displayReward(c, + Misc.randomArrayItem(lowLevelReward), 1, + Misc.randomArrayItem(lowLevelReward), 1, + Misc.randomArrayItem(lowLevelReward), 1, + Misc.randomArrayItem(lowLevelStacks), Misc.random(50, 150) + ); break; case 1: - displayReward(c, lowLevelReward[Misc.random(16)], 1, - lowLevelStacks[Misc.random(3)], 1 + Misc.random(150), - -1, 1); + displayReward(c, + Misc.randomArrayItem(lowLevelReward), 1, + Misc.randomArrayItem(lowLevelReward), 1, + Misc.randomArrayItem(lowLevelStacks), Misc.random(50, 150) + ); break; case 2: - displayReward(c, lowLevelReward[Misc.random(16)], 1, -1, 1, -1, - 1); + displayReward(c, + Misc.randomArrayItem(lowLevelReward), 1, + Misc.randomArrayItem(lowLevelStacks), Misc.random(50, 150) + ); break; } } else if (clueLevel == 1) { switch (chanceReward) { case 0: - displayReward(c, mediemLevelReward[Misc.random(13)], 1, - mediemLevelReward[Misc.random(13)], 1, - mediumLevelStacks[Misc.random(4)], 1 + Misc.random(200)); + displayReward(c, + Misc.randomArrayItem(mediumLevelReward), 1, + Misc.randomArrayItem(mediumLevelReward), 1, + Misc.randomArrayItem(mediumLevelReward), 1, + Misc.randomArrayItem(mediumLevelStacks), Misc.random(50, 150) + ); break; case 1: - displayReward(c, mediemLevelReward[Misc.random(13)], 1, - mediumLevelStacks[Misc.random(4)], - 1 + Misc.random(200), -1, 1); + displayReward(c, + Misc.randomArrayItem(mediumLevelReward), 1, + Misc.randomArrayItem(mediumLevelReward), 1, + Misc.randomArrayItem(mediumLevelStacks), Misc.random(50, 150) + ); break; case 2: - displayReward(c, mediemLevelReward[Misc.random(13)], 1, -1, 1, - -1, 1); + displayReward(c, + Misc.randomArrayItem(mediumLevelReward), 1, + Misc.randomArrayItem(mediumLevelStacks), Misc.random(50, 150) + ); break; } } else if (clueLevel == 2) { switch (chanceReward) { case 0: - displayReward(c, highLevelReward[Misc.random(52)], 1, - highLevelReward[Misc.random(52)], 1, - highLevelStacks[Misc.random(5)], 1 + Misc.random(350)); + displayReward(c, + Misc.randomArrayItem(highLevelReward), 1, + Misc.randomArrayItem(highLevelReward), 1, + Misc.randomArrayItem(highLevelReward), 1, + Misc.randomArrayItem(highLevelStacks), Misc.random(50, 150) + ); break; case 1: - displayReward(c, highLevelReward[Misc.random(52)], 1, - highLevelStacks[Misc.random(5)], 1 + Misc.random(350), - -1, 1); + displayReward(c, + Misc.randomArrayItem(highLevelReward), 1, + Misc.randomArrayItem(highLevelReward), 1, + Misc.randomArrayItem(highLevelStacks), Misc.random(50, 150) + ); break; case 2: - displayReward(c, highLevelReward[Misc.random(52)], 1, -1, 1, - -1, 1); + displayReward(c, + Misc.randomArrayItem(highLevelReward), 1, + Misc.randomArrayItem(highLevelStacks), Misc.random(50, 150) + ); break; } } } + public static void displayReward(Client c, int item, int amount) { + displayReward(c, item, amount, -1, 1); + } - public static void displayReward(Client c, int item, int amount, int item2, - int amount2, int item3, int amount3) { - int[] items = { item, item2, item3 }; - int[] amounts = { amount, amount2, amount3 }; + public static void displayReward(Client c, int item, int amount, int item2, int amount2) { + displayReward(c, item, amount, item2, amount2, -1, 1); + } + + public static void displayReward(Client c, int item, int amount, int item2, int amount2, int item3, int amount3) { + displayReward(c, item, amount, item2, amount2, item3, amount3, -1, 1); + } + + public static void displayReward(Client c, int item, int amount, int item2, int amount2, int item3, int amount3, int item4, int amount4) { + int[] items = { item, item2, item3, item4 }; + int[] amounts = { amount, amount2, amount3, amount4 }; c.outStream.createFrameVarSizeWord(53); c.outStream.writeWord(6963); c.outStream.writeWord(items.length); @@ -99,9 +409,9 @@ public class TreasureTrails { } c.outStream.endFrameVarSizeWord(); c.flushOutStream(); - c.getItemAssistant().addItem(item, amount); - c.getItemAssistant().addItem(item2, amount2); - c.getItemAssistant().addItem(item3, amount3); + for (int i = 0; i < items.length; i++) { + if (items[i] > 0) c.getItemAssistant().addOrDropItem(items[i], amounts[i]); + } c.getPlayerAssistant().showInterface(6960); } diff --git a/2006Redone Server/src/redone/game/npcs/NpcHandler.java b/2006Redone Server/src/redone/game/npcs/NpcHandler.java index fa6bfb7f..f772435e 100644 --- a/2006Redone Server/src/redone/game/npcs/NpcHandler.java +++ b/2006Redone Server/src/redone/game/npcs/NpcHandler.java @@ -889,7 +889,8 @@ public class NpcHandler { // [j][1] = amount // [j][0] = drop - public void dropItems(int i) {// ring of wealth to add + public void dropItems(int i) { + // TODO: add ring of wealth int npc = 0; Client c = (Client) PlayerHandler.players[npcs[i].killedBy]; if (c != null) { @@ -900,38 +901,51 @@ public class NpcHandler { } } switch (npcs[i].npcType) { - case 2459: - FreakyForester.killedPheasant(c, 0); - Server.itemHandler.createGroundItem(c, 6178, npcs[i].absX, npcs[i].absY, 1, c.playerId); - break; - case 2460: - FreakyForester.killedPheasant(c, 1); - Server.itemHandler.createGroundItem(c, 6178, npcs[i].absX, npcs[i].absY, 1, c.playerId); - break; - case 2461: - FreakyForester.killedPheasant(c, 2); - Server.itemHandler.createGroundItem(c, 6178, npcs[i].absX, npcs[i].absY, 1, c.playerId); - break; - case 2462: - FreakyForester.killedPheasant(c, 3); - Server.itemHandler.createGroundItem(c, 6178, npcs[i].absX, npcs[i].absY, 1, c.playerId); - break; - case 92: - if (c.restGhost == 3) { - Server.itemHandler.createGroundItem(c, 553, npcs[i].absX, npcs[i].absY, 1, c.playerId); - c.restGhost = 4; - } - break; - case 47: - if (c.witchspot == 1 || c.romeojuliet > 0 && c.romeojuliet < 9) { - Server.itemHandler.createGroundItem(c, 300, npcs[i].absX, npcs[i].absY, 1, c.playerId); - } - break; - case 645: - if (c.shieldArrav == 5) { - Server.itemHandler.createGroundItem(c, 761, npcs[i].absX, npcs[i].absY, 1, c.playerId); - } - break; + case 2459: + FreakyForester.killedPheasant(c, 0); + Server.itemHandler.createGroundItem(c, 6178, npcs[i].absX, npcs[i].absY, 1, c.playerId); + break; + case 2460: + FreakyForester.killedPheasant(c, 1); + Server.itemHandler.createGroundItem(c, 6178, npcs[i].absX, npcs[i].absY, 1, c.playerId); + break; + case 2461: + FreakyForester.killedPheasant(c, 2); + Server.itemHandler.createGroundItem(c, 6178, npcs[i].absX, npcs[i].absY, 1, c.playerId); + break; + case 2462: + FreakyForester.killedPheasant(c, 3); + Server.itemHandler.createGroundItem(c, 6178, npcs[i].absX, npcs[i].absY, 1, c.playerId); + break; + case 92: + if (c.restGhost == 3) { + Server.itemHandler.createGroundItem(c, 553, npcs[i].absX, npcs[i].absY, 1, c.playerId); + c.restGhost = 4; + } + break; + case 47: + if (c.witchspot == 1 || c.romeojuliet > 0 && c.romeojuliet < 9) { + Server.itemHandler.createGroundItem(c, 300, npcs[i].absX, npcs[i].absY, 1, c.playerId); + } + break; + case 645: + if (c.shieldArrav == 5) { + Server.itemHandler.createGroundItem(c, 761, npcs[i].absX, npcs[i].absY, 1, c.playerId); + } + break; + } + if (Misc.random(1, 256) == 1) { + int level = npcs[i].combatLevel; + if (level >= 2 && level <= 24) // easy + Server.itemHandler.createGroundItem(c, 2677, npcs[i].absX, npcs[i].absY, 1, c.playerId); + else if (level <= 40) // easy → medium + Server.itemHandler.createGroundItem(c, 2677 + Misc.random(0, 1), npcs[i].absX, npcs[i].absY, 1, c.playerId); + else if (level <= 80) // medium + Server.itemHandler.createGroundItem(c, 2678, npcs[i].absX, npcs[i].absY, 1, c.playerId); + else if (level <= 150) // medium → hard + Server.itemHandler.createGroundItem(c, 2678 + Misc.random(0, 1), npcs[i].absX, npcs[i].absY, 1, c.playerId); + else // hard + Server.itemHandler.createGroundItem(c, 2678 + Misc.random(0, 1), npcs[i].absX, npcs[i].absY, 1, c.playerId); } } } diff --git a/2006Redone Server/src/redone/game/npcs/drops/NPCDrops.java b/2006Redone Server/src/redone/game/npcs/drops/NPCDrops.java index 4bf1c37d..4c8623e5 100644 --- a/2006Redone Server/src/redone/game/npcs/drops/NPCDrops.java +++ b/2006Redone Server/src/redone/game/npcs/drops/NPCDrops.java @@ -7,48 +7,72 @@ package redone.game.npcs.drops; public class NPCDrops extends NPCDropsHandler { - public static final int[][] DEFAULT = { { i("bones"), 1, ALWAYS }, - { 995, r(10), COINSRATE } }; - - public static final int[][] rivertroll = { {i("bones"), 1, ALWAYS}, - {405, 1, COMMON}, {i("spinach roll"), 1, COMMON}, - {i("fishing bait"), 1+r(49), UNCOMMON}, - {985, 1, RARE}, {987, 1, RARE}, - {i("feather"), 2+r(3), COMMON}, {151, 1, UNCOMMON}, - {i("raw tuna"), 1, UNCOMMON}, {i("raw salmon"), 1, UNCOMMON}, - {i("raw trout"), 1, UNCOMMON}, {i("raw herring"), 1, UNCOMMON}, - {i("raw pike"), 1, UNCOMMON}, {i("raw sardine"), 1, UNCOMMON}, - {i("raw shrimps"), 1, UNCOMMON}, {i("raw anchovies"), 1, UNCOMMON}, - {i("raw swordfish"), 1, UNCOMMON}, {i("raw shark"), 1, UNCOMMON}}; - - public static final int[][] darkbeast = { - {i("rune 2h sword"), 1, UNCOMMON}, {i("black 2h sword"), 1, COMMON}, - {i("black battleaxe"), 1, COMMON}, {i("black axe"), 1, UNCOMMON}, - {i("rune battleaxe"), 1, RARE}, {i("adamant sq shield"), 1, COMMON}, - {i("rune chainbody"), 1, UNCOMMON}, {i("rune full helm"), 1, RARE}, - {i("rune sq shield"), 1, RARE}, {i("chaos rune"), 10, COMMON}, - {i("blood rune"), 7, COMMON}, {i("air rune"), 47, UNCOMMON}, - {i("death rune"), 3+r(2), UNCOMMON}, {i("law rune"), 3, UNCOMMON}, - {995, 64+r(2936), COMMON}, {121, 1, UNCOMMON}, - {385, 1+r(1), UNCOMMON}, {i("death talisman"), 1, UNCOMMON}, - {i("adamant bar"), 1, UNCOMMON}, - {199, 1+r(1), COMMON}, - {201, 1+r(1), COMMON}, - {203, 1+r(1), COMMON}, - {205, 1+r(1), UNCOMMON}, - {207, 1+r(1), UNCOMMON}, - {209, 1+r(1), UNCOMMON}, - {211, 1+r(1), UNCOMMON}, - {215, 1+r(1), UNCOMMON}, - {2485, 1+r(1), UNCOMMON}, - {213, 1+r(1), UNCOMMON}, - {217, 1+r(1), UNCOMMON}, + public static final int[][] DEFAULT = { + { i("bones"), 1, ALWAYS }, + { 995, r(10), COINSRATE }, + { 2677, 1, VERY_RARE }, }; - public static final int[][] ogre = { { i("big bones"), 1, ALWAYS }, + public static final int[][] rivertroll = { + { i("bones"), 1, ALWAYS }, + { 405, 1, COMMON }, + { i("spinach roll"), 1, COMMON }, + { i("fishing bait"), 1+r(49), UNCOMMON }, + { 985, 1, RARE }, + { 987, 1, RARE }, + { i("feather"), 2+r(3), COMMON }, + { 151, 1, UNCOMMON }, + { i("raw tuna"), 1, UNCOMMON }, + { i("raw salmon"), 1, UNCOMMON }, + { i("raw trout"), 1, UNCOMMON }, + { i("raw herring"), 1, UNCOMMON }, + { i("raw pike"), 1, UNCOMMON }, + { i("raw sardine"), 1, UNCOMMON }, + { i("raw shrimps"), 1, UNCOMMON }, + { i("raw anchovies"), 1, UNCOMMON }, + { i("raw swordfish"), 1, UNCOMMON }, + { i("raw shark"), 1, UNCOMMON }, + }; + + public static final int[][] darkbeast = { + { i("rune 2h sword"), 1, UNCOMMON }, + { i("black 2h sword"), 1, COMMON }, + { i("black battleaxe"), 1, COMMON }, + { i("black axe"), 1, UNCOMMON }, + { i("rune battleaxe"), 1, RARE }, + { i("adamant sq shield"), 1, COMMON }, + { i("rune chainbody"), 1, UNCOMMON }, + { i("rune full helm"), 1, RARE }, + { i("rune sq shield"), 1, RARE }, + { i("chaos rune"), 10, COMMON }, + { i("blood rune"), 7, COMMON }, + { i("air rune"), 47, UNCOMMON }, + { i("death rune"), 3+r(2), UNCOMMON }, + { i("law rune"), 3, UNCOMMON }, + { 995, 64+r(2936), COMMON }, + { 121, 1, UNCOMMON }, + { 385, 1+r(1), UNCOMMON }, + { i("death talisman"), 1, UNCOMMON }, + { i("adamant bar"), 1, UNCOMMON }, + { 199, 1+r(1), COMMON }, + { 201, 1+r(1), COMMON }, + { 203, 1+r(1), COMMON }, + { 205, 1+r(1), UNCOMMON }, + { 207, 1+r(1), UNCOMMON }, + { 209, 1+r(1), UNCOMMON }, + { 211, 1+r(1), UNCOMMON }, + { 215, 1+r(1), UNCOMMON }, + { 2485, 1+r(1), UNCOMMON }, + { 213, 1+r(1), UNCOMMON }, + { 217, 1+r(1), UNCOMMON }, + }; + + public static final int[][] ogre = { + { i("big bones"), 1, ALWAYS }, { i("strawberry seed"), 1, UNCOMMON }, { i("avantoe seed"), 1, UNCOMMON }, - { i("belladonna seed"), 1, UNCOMMON }, { 5282, 1, UNCOMMON }, + { i("belladonna seed"), 1, UNCOMMON }, + { 5282, 1, UNCOMMON }, { i("cadantine seed"), 1, UNCOMMON }, { i("cactus seed"), 1, UNCOMMON }, { i("harralander seed"), 1, UNCOMMON }, @@ -62,51 +86,90 @@ public class NPCDrops extends NPCDropsHandler { { i("wildblood seed"), 1, UNCOMMON }, { i("whiteberry seed"), 1, UNCOMMON }, { i("marentill seed"), 1, UNCOMMON }, - { i("ranarr seed"), 1, RARE }, { i("dwarf weed seed"), 1, RARE }, + { i("ranarr seed"), 1, RARE }, + { i("dwarf weed seed"), 1, RARE }, { i("lantadyme seed"), 1, RARE }, - { i("watermelon seed"), 1, RARE }, { i("kwuarm seed"), 1, RARE } }; + { i("watermelon seed"), 1, RARE }, + { i("kwuarm seed"), 1, RARE }, + }; - public static final int[][] shade = { { 546, 1, COMMON }, - { 548, 1, COMMON } }; + public static final int[][] shade = { + { 546, 1, COMMON }, + { 548, 1, COMMON }, + }; - public static final int[][] babybluedragon = { { i("babydragon bones"), 1, - ALWAYS } }; + public static final int[][] babybluedragon = { + { i("babydragon bones"), 1, ALWAYS }, + }; - public static final int[][] bear = { { 526, 1, ALWAYS }, - { i("bear fur"), 1, ALWAYS }, { i("raw bear meat"), 1, ALWAYS } }; + public static final int[][] bear = { + { 526, 1, ALWAYS }, + { i("bear fur"), 1, ALWAYS }, + { i("raw bear meat"), 1, ALWAYS }, + }; - public static final int[][] monk = { { 526, 1, ALWAYS }, { 542, 1, RARE }, - { 544, 1, RARE } }; + public static final int[][] monk = { + { 526, 1, ALWAYS }, + { 542, 1, RARE }, + { 544, 1, RARE }, + }; - public static final int[][] tzhaarxil = { { 6522, 9 + r(11), RARE }, - { 6523, 1, RARE }, { 6525, 1, RARE }, { 6524, 1, RARE }, - { 6568, 1, RARE }, { 161, 1, UNCOMMON }, { 149, 1, UNCOMMON }, - { 167, 1, UNCOMMON }, { i("tokkul"), 100 + r(1400), COMMON }, - { i("lobster"), 1, UNCOMMON } }; + public static final int[][] tzhaarxil = { + { 6522, 9 + r(11), RARE }, + { 6523, 1, RARE }, + { 6525, 1, RARE }, + { 6524, 1, RARE }, + { 6568, 1, RARE }, + { 161, 1, UNCOMMON }, + { 149, 1, UNCOMMON }, + { 167, 1, UNCOMMON }, + { i("tokkul"), 100 + r(1400), COMMON }, + { i("lobster"), 1, UNCOMMON }, + }; - public static final int[][] tzhaarket = { { 6527, 1, RARE }, - { i("fire battlestaff"), 1, RARE }, { 6524, 1, RARE }, - { 6568, 1, RARE }, { 167, 1, UNCOMMON }, { 161, 1, UNCOMMON }, + public static final int[][] tzhaarket = { + { 6527, 1, RARE }, + { i("fire battlestaff"), 1, RARE }, + { 6524, 1, RARE }, + { 6568, 1, RARE }, + { 167, 1, UNCOMMON }, + { 161, 1, UNCOMMON }, { i("tokkul"), 100 + r(1800), COMMON }, { i("lobster"), 1, UNCOMMON }, { i("chilli potato"), 1 + r(1), UNCOMMON }, - { i("pure essence"), 5, VERY_RARE } }; + { i("pure essence"), 5, VERY_RARE }, + }; - public static final int[][] tzhaarhur = { { i("gold ore"), 1, COMMON }, - { 443, 1 + r(1), COMMON }, { 1762, 3, UNCOMMON }, + public static final int[][] tzhaarhur = { + { i("gold ore"), 1, COMMON }, + { 443, 1 + r(1), COMMON }, + { 1762, 3, UNCOMMON }, { i("steel bar"), 1, UNCOMMON }, { i("tokkul"), 150 + r(650), COMMON }, - { i("molten glass"), 2, UNCOMMON }, { 149, 1, UNCOMMON }, - { 161, 1, UNCOMMON }, { 1780, 4 + r(8), UNCOMMON }, - { i("battlestaff"), 1, RARE }, { 1744, 3, RARE }, - { i("leather"), 3, RARE }, { 1738, 2 + r(6), RARE }, - { 7937, 2 + r(4), RARE }, { i("lobster"), 1, RARE } }; + { i("molten glass"), 2, UNCOMMON }, + { 149, 1, UNCOMMON }, + { 161, 1, UNCOMMON }, + { 1780, 4 + r(8), UNCOMMON }, + { i("battlestaff"), 1, RARE }, + { 1744, 3, RARE }, + { i("leather"), 3, RARE }, + { 1738, 2 + r(6), RARE }, + { 7937, 2 + r(4), RARE }, + { i("lobster"), 1, RARE }, + }; - public static final int[][] thief = { { 526, 1, ALWAYS }, - { 199, 1, COMMON }, { 201, 1, COMMON }, { 203, 1, COMMON }, - { 205, 1, COMMON }, { 207, 1, UNCOMMON }, { 209, 1, VERY_RARE }, - { 211, 1, VERY_RARE }, { 213, 1, VERY_RARE }, - { 217, 1, VERY_RARE }, { 2485, 1, VERY_RARE }, + public static final int[][] thief = { + { 526, 1, ALWAYS }, + { 199, 1, COMMON }, + { 201, 1, COMMON }, + { 203, 1, COMMON }, + { 205, 1, COMMON }, + { 207, 1, UNCOMMON }, + { 209, 1, VERY_RARE }, + { 211, 1, VERY_RARE }, + { 213, 1, VERY_RARE }, + { 217, 1, VERY_RARE }, + { 2485, 1, VERY_RARE }, { i("bronze arrow"), 3 + r(5), UNCOMMON }, { i("staff of air"), 1, UNCOMMON }, { i("iron knife"), 3 + r(7), UNCOMMON }, @@ -114,13 +177,16 @@ public class NPCDrops extends NPCDropsHandler { { i("mind rune"), 5 + r(5), VERY_RARE }, { i("earth rune"), 5 + r(5), VERY_RARE }, { i("fire rune"), 5 + r(5), VERY_RARE }, - { 995, 3 + r(22), COMMON }, { i("earth talisman"), 1, RARE }, - { i("copper ore"), 1, RARE } }; + { 995, 3 + r(22), COMMON }, + { i("earth talisman"), 1, RARE }, + { i("copper ore"), 1, RARE }, + }; public static final int[][] tzhaarmej = { { i("fire battlestaff"), 1, UNCOMMON }, { i("staff of fire"), 1, UNCOMMON }, - { 6568, 1, RARE }, { 6526, 1, VERY_RARE }, + { 6568, 1, RARE }, + { 6526, 1, VERY_RARE }, { i("earth rune"), 10 + r(70), COMMON }, { i("fire rune"), 10 + r(70), COMMON }, { i("air rune"), 10 + r(70), UNCOMMON }, @@ -134,72 +200,113 @@ public class NPCDrops extends NPCDropsHandler { { i("lava rune"), 1 + r(39), RARE }, { i("fire talisman"), 1, VERY_RARE }, { i("tokkul"), 1 + r(699), COMMON }, - { i("pure essence"), 4 + r(6), COMMON } }; + { i("pure essence"), 4 + r(6), COMMON }, + }; - public static final int[][] watchman = { { i("bones"), 1, ALWAYS }, - { i("bread"), 1, COMMON }, }; + public static final int[][] watchman = { + { i("bones"), 1, ALWAYS }, + { i("bread"), 1, COMMON }, + }; - public static final int[][] treespirit = { { i("knife"), 1, ALWAYS }, - { i("bronze axe"), 1, COMMON }, { i("iron axe"), 1, COMMON }, - { i("steel axe"), 1, COMMON }, { i("black axe"), 1, UNCOMMON }, + public static final int[][] treespirit = { + { i("knife"), 1, ALWAYS }, + { i("bronze axe"), 1, COMMON }, + { i("iron axe"), 1, COMMON }, + { i("steel axe"), 1, COMMON }, + { i("black axe"), 1, UNCOMMON }, { i("mithril axe"), 1, UNCOMMON }, { i("adamant axe"), 1, UNCOMMON + r(50) }, { i("rune axe"), 1, RARE }, { i("nature rune"), 5 + r(23), COMMON }, - { i("banana"), 1, COMMON }, { i("uncut ruby"), 1, UNCOMMON }, + { i("banana"), 1, COMMON }, + { i("uncut ruby"), 1, UNCOMMON }, { i("uncut emerald"), 1, UNCOMMON }, { i("uncut diamond"), 1, RARE }, { i("uncut sapphire"), 1, UNCOMMON }, - { i("rune javelin"), 5, UNCOMMON }, { i("rune spear"), 1, RARE }, + { i("rune javelin"), 5, UNCOMMON }, + { i("rune spear"), 1, RARE }, { i("dragon spear"), 1, VERY_RARE }, { i("cactus seed"), 1, COMMON }, { i("poison ivy seed"), 1, COMMON }, { i("belladonna seed"), 1, COMMON }, - { i("kwuarm seed"), 1, COMMON }, { i("half of a key"), 1, RARE }, + { i("kwuarm seed"), 1, COMMON }, + { i("half of a key"), 1, RARE }, { i("nature talisman"), 1, UNCOMMON }, - { i("shield left half"), 1, VERY_RARE }, { 199, 1, COMMON }, - { 3049, 1, UNCOMMON }, { 3051, 1, RARE }, { 211, 1, UNCOMMON } }; + { i("shield left half"), 1, VERY_RARE }, + { 199, 1, COMMON }, + { 3049, 1, UNCOMMON }, + { 3051, 1, RARE }, + { 211, 1, UNCOMMON }, + }; - public static final int[][] cockatrice = { { 526, 1, ALWAYS }, - { i("iron sword"), 1, COMMON }, { i("steel dagger"), 1, COMMON }, + public static final int[][] cockatrice = { + { 526, 1, ALWAYS }, + { i("iron sword"), 1, COMMON }, + { i("steel dagger"), 1, COMMON }, { i("steel longsword"), 1, COMMON }, { i("iron javelin"), 5, UNCOMMON }, - { i("steel platelegs"), 1, UNCOMMON }, { 4097, 1, RARE }, - { i("iron boots"), 1, RARE }, { i("rune med helm"), 1, VERY_RARE }, + { i("steel platelegs"), 1, UNCOMMON }, + { 4097, 1, RARE }, + { i("iron boots"), 1, RARE }, + { i("rune med helm"), 1, VERY_RARE }, { i("rune chainbody"), 1, VERY_RARE }, { i("water rune"), 1 + r(1), COMMON }, { i("fire rune"), 7, COMMON }, { i("nature rune"), 2 + r(4), COMMON }, { i("law rune"), 2 + r(1), COMMON }, - { i("death rune"), 50, UNCOMMON }, { 199, 1, COMMON }, - { 201, 1, COMMON }, { 203, 1, COMMON }, { 205, 1, COMMON }, - { 209, 1, COMMON }, { 211, 1, COMMON }, { 207, 1, RARE }, - { 213, 1, RARE }, { 215, 1, RARE }, { 2485, 1, RARE }, - { 217, 1, VERY_RARE }, { i("potato seed"), 4, COMMON }, - { i("onion seed"), 4, COMMON }, { i("cabbage seed"), 4, COMMON }, + { i("death rune"), 50, UNCOMMON }, + { 199, 1, COMMON }, + { 201, 1, COMMON }, + { 203, 1, COMMON }, + { 205, 1, COMMON }, + { 209, 1, COMMON }, + { 211, 1, COMMON }, + { 207, 1, RARE }, + { 213, 1, RARE }, + { 215, 1, RARE }, + { 2485, 1, RARE }, + { 217, 1, VERY_RARE }, + { i("potato seed"), 4, COMMON }, + { i("onion seed"), 4, COMMON }, + { i("cabbage seed"), 4, COMMON }, { i("tomato seed"), 3, COMMON }, { i("asgarnian seed"), 2, COMMON }, { i("yanillian seed"), 2, COMMON }, { i("sweetcorn seed"), 3, COMMON }, { i("strawberry seed"), 2, COMMON }, - { i("watermelon seed"), 2, RARE }, { i("ranarr seed"), 1, RARE }, - { i("marigold seed"), 1, RARE }, { 995, 1 + r(308), COMMON }, - { i("limpwurt root"), 1, COMMON }, { i("mithril ore"), 1, RARE } }; + { i("watermelon seed"), 2, RARE }, + { i("ranarr seed"), 1, RARE }, + { i("marigold seed"), 1, RARE }, + { 995, 1 + r(308), COMMON }, + { i("limpwurt root"), 1, COMMON }, + { i("mithril ore"), 1, RARE }, + }; - public static final int[][] unicorn = { { i("bones"), 1, ALWAYS }, - { i("unicorn horn"), 1, ALWAYS } }; + public static final int[][] unicorn = { + { i("bones"), 1, ALWAYS }, + { i("unicorn horn"), 1, ALWAYS }, + }; - public static final int[][] giantrat = { { i("bones"), 1, ALWAYS }, - {2134, 1, ALWAYS } }; + public static final int[][] giantrat = { + { i("bones"), 1, ALWAYS }, + { 2134, 1, ALWAYS }, + }; - public static final int[][] jogre = { { i("jogre bones"), 1, ALWAYS }, - { i("bronze spear"), 1, COMMON }, { i("iron spear"), 1, COMMON }, + public static final int[][] jogre = { + { i("jogre bones"), 1, ALWAYS }, + { i("bronze spear"), 1, COMMON }, + { i("iron spear"), 1, COMMON }, { i("steel javelin"), 3 + r(2), UNCOMMON }, - { i("nature rune"), 2 + r(8), COMMON }, { i("knife"), 1, COMMON }, - { i("pineapple"), 2, COMMON }, { 6306, 22, COMMON }, - { 995, 22, COMMON }, { 3125, 1, COMMON }, - { i("big bones"), 1 + r(5), COMMON }, { 526, 1 + r(1), COMMON }, - { i("banana"), 1, UNCOMMON }, { i("limpwurt seed"), 1, COMMON }, + { i("nature rune"), 2 + r(8), COMMON }, + { i("knife"), 1, COMMON }, + { i("pineapple"), 2, COMMON }, + { 6306, 22, COMMON }, + { 995, 22, COMMON }, + { 3125, 1, COMMON }, + { i("big bones"), 1 + r(5), COMMON }, + { 526, 1 + r(1), COMMON }, + { i("banana"), 1, UNCOMMON }, + { i("limpwurt seed"), 1, COMMON }, { i("marentill seed"), 1, COMMON }, { i("tarromin seed"), 1, COMMON }, { i("harralander seed"), 1, UNCOMMON }, @@ -216,70 +323,111 @@ public class NPCDrops extends NPCDropsHandler { { i("poison ivy seed"), 1, UNCOMMON }, { i("kwuarm seed"), 1, UNCOMMON }, { i("cadantine seed"), 1, UNCOMMON }, - { i("ranarr seed"), 1, RARE }, { i("lantadyme seed"), 1, RARE }, - { i("dwarf weed seed"), 1, RARE }, { 1533, 1, COMMON }, - { 1525, 1, COMMON }, { 203, 1, COMMON }, { 201, 1, COMMON }, - { 205, 1, UNCOMMON }, { 207, 1, UNCOMMON }, { 209, 1, UNCOMMON }, - { 217, 1, RARE }, { 2485, 1, RARE } }; + { i("ranarr seed"), 1, RARE }, + { i("lantadyme seed"), 1, RARE }, + { i("dwarf weed seed"), 1, RARE }, + { 1533, 1, COMMON }, + { 1525, 1, COMMON }, + { 203, 1, COMMON }, + { 201, 1, COMMON }, + { 205, 1, UNCOMMON }, + { 207, 1, UNCOMMON }, + { 209, 1, UNCOMMON }, + { 217, 1, RARE }, + { 2485, 1, RARE }, + }; public static final int[][] blackdemon = { - { i("steel battleaxe"), 1, COMMON }, { i("black axe"), 1, COMMON }, + { i("steel battleaxe"), 1, COMMON }, + { i("black axe"), 1, COMMON }, { i("black sword"), 1, COMMON }, { i("black 2h sword"), 1, COMMON }, { i("rune battleaxe"), 1, RARE }, { i("rune 2h sword"), 1, VERY_RARE }, { i("black full helm"), 1, COMMON }, { i("mithril kiteshield"), 1, COMMON }, - { i("rune med helm"), 1, RARE }, { i("rune full helm"), 1, RARE }, - { i("rune chainbody"), 1, RARE }, { i("rune sq shield"), 1, RARE }, + { i("rune med helm"), 1, RARE }, + { i("rune full helm"), 1, RARE }, + { i("rune chainbody"), 1, RARE }, + { i("rune sq shield"), 1, RARE }, { i("air rune"), 50 + r(25), COMMON }, { i("blood rune"), 7, UNCOMMON }, { i("fire rune"), 37 + r(3), COMMON }, { i("chaos rune"), 10, COMMON }, { i("law rune"), 3 + r(42), COMMON }, - { i("adamant bar"), 1, COMMON }, { 454, 20, RARE }, - { 995, 132 + r(968), COMMON }, { i("lobster"), 1, UNCOMMON }, - { 133, 1, UNCOMMON }, { 199, 1, COMMON }, { 201, 1, COMMON }, - { 203, 1, COMMON }, { 205, 1, COMMON }, { 207, 1, UNCOMMON }, - { 209, 1, UNCOMMON }, { 211, 1, UNCOMMON }, { 213, 1, UNCOMMON }, - { 215, 1, UNCOMMON }, { 2485, 1, RARE }, { 217, 1, RARE }, - { i("ashes"), 1, ALWAYS }}; + { i("adamant bar"), 1, COMMON }, + { 454, 20, RARE }, + { 995, 132 + r(968), COMMON }, + { i("lobster"), 1, UNCOMMON }, + { 133, 1, UNCOMMON }, + { 199, 1, COMMON }, + { 201, 1, COMMON }, + { 203, 1, COMMON }, + { 205, 1, COMMON }, + { 207, 1, UNCOMMON }, + { 209, 1, UNCOMMON }, + { 211, 1, UNCOMMON }, + { 213, 1, UNCOMMON }, + { 215, 1, UNCOMMON }, + { 2485, 1, RARE }, + { 217, 1, RARE }, + { i("ashes"), 1, ALWAYS } }; - public static final int[][] firegiant = { { i("big bones"), 1, ALWAYS }, + public static final int[][] firegiant = { + { i("big bones"), 1, ALWAYS }, { i("steel axe"), 1, COMMON }, { i("fire battlestaff"), 1, UNCOMMON }, { i("rune scimitar"), 1, RARE }, { i("mithril sq shield"), 1, COMMON }, { i("rune arrow"), 12, UNCOMMON }, { i("fire rune"), 37 + r(167), COMMON }, - { i("chaos rune"), 5, UNCOMMON }, { i("blood rune"), 5, UNCOMMON }, - { i("law rune"), 2 + r(2), UNCOMMON }, { 199, 1, COMMON }, - { 201, 1, COMMON }, { 203, 1, COMMON }, { 211, 1, COMMON }, - { 205, 1, UNCOMMON }, { 207, 1, UNCOMMON }, { 209, 1, UNCOMMON }, - { 215, 1, UNCOMMON }, { 217, 1, UNCOMMON }, - { 995, 15 + r(345), COMMON }, { i("lobster"), 1, UNCOMMON }, - { i("steel bar"), 1, UNCOMMON }, { 117, 1, UNCOMMON } }; + { i("chaos rune"), 5, UNCOMMON }, + { i("blood rune"), 5, UNCOMMON }, + { i("law rune"), 2 + r(2), UNCOMMON }, + { 199, 1, COMMON }, + { 201, 1, COMMON }, + { 203, 1, COMMON }, + { 211, 1, COMMON }, + { 205, 1, UNCOMMON }, + { 207, 1, UNCOMMON }, + { 209, 1, UNCOMMON }, + { 215, 1, UNCOMMON }, + { 217, 1, UNCOMMON }, + { 995, 15 + r(345), COMMON }, + { i("lobster"), 1, UNCOMMON }, + { i("steel bar"), 1, UNCOMMON }, + { 117, 1, UNCOMMON }, + }; public static final int[][] evilchicken = { - { i("raw chicken"), 1, ALWAYS }, { 526, 1, ALWAYS }, - { i("feather"), 32 + r(718), ALWAYS } }; + { i("raw chicken"), 1, ALWAYS }, + { 526, 1, ALWAYS }, + { i("feather"), 32 + r(718), ALWAYS }, + }; public static final int[][] pyrefiend = { { i("fire rune"), 30 + r(60), COMMON }, - { i("chaos rune"), 12, COMMON }, { i("law rune"), 1, UNCOMMON }, + { i("chaos rune"), 12, COMMON }, + { i("law rune"), 1, UNCOMMON }, { i("death rune"), 3, UNCOMMON }, { i("steel full helm"), 1, COMMON }, - { i("staff of fire"), 1, COMMON }, { i("steel axe"), 1, COMMON }, + { i("staff of fire"), 1, COMMON }, + { i("steel axe"), 1, COMMON }, { i("steel battleaxe"), 1, UNCOMMON }, { i("steel arrow"), 1, UNCOMMON }, { i("mithril chainbody"), 1, UNCOMMON }, - { i("steel boots"), 1, RARE }, { i("adamant med helm"), 1, RARE }, - { 995, 10 + r(464), COMMON }, { i("gold ore"), 1, COMMON }, - { i("jug of wine"), 1, UNCOMMON } }; + { i("steel boots"), 1, RARE }, + { i("adamant med helm"), 1, RARE }, + { 995, 10 + r(464), COMMON }, + { i("gold ore"), 1, COMMON }, + { i("jug of wine"), 1, UNCOMMON }, + }; - public static final int[][] jelly = { { i("choas rune"), 15, UNCOMMON }, + public static final int[][] jelly = { + { i("choas rune"), 15, UNCOMMON }, { i("death rune"), 5, UNCOMMON }, - { i("water rune"), 5 + r(16), RARE }, { i("blood rune"), 7, RARE }, + { i("water rune"), 5 + r(16), RARE }, + { i("blood rune"), 7, RARE }, { i("steel battleaxe"), 1, COMMON }, { i("steel 2h sword"), 1, COMMON }, { i("mithril kiteshield"), 1, UNCOMMON }, @@ -287,26 +435,38 @@ public class NPCDrops extends NPCDropsHandler { { i("rune full helm"), 1, RARE }, { i("steel platebody"), 1, RARE }, { i("rune battleaxe"), 1, VERY_RARE }, - { 995, 11 + r(486), COMMON }, { i("gold bar"), 1, UNCOMMON }, - { i("thread"), 10, RARE } }; + { 995, 11 + r(486), COMMON }, + { i("gold bar"), 1, UNCOMMON }, + { i("thread"), 10, RARE }, + }; public static final int[][] rockslug = { { i("earth rune"), 5 + r(37), COMMON }, { i("pure essence"), 1, COMMON }, { i("chaos rune"), 2 + r(3), UNCOMMON }, - { i("tin ore"), 1, COMMON }, { i("copper ore"), 1, COMMON }, - { i("bronze bar"), 1, COMMON }, { i("iron ore"), 1, COMMON }, - { i("iron bar"), 1, COMMON }, { i("coal"), 1, COMMON }, - { i("mithril ore"), 1, UNCOMMON }, { i("potato seed"), 4, COMMON }, - { i("onion seed"), 4, COMMON }, { i("cabbage seed"), 4, COMMON }, + { i("tin ore"), 1, COMMON }, + { i("copper ore"), 1, COMMON }, + { i("bronze bar"), 1, COMMON }, + { i("iron ore"), 1, COMMON }, + { i("iron bar"), 1, COMMON }, + { i("coal"), 1, COMMON }, + { i("mithril ore"), 1, UNCOMMON }, + { i("potato seed"), 4, COMMON }, + { i("onion seed"), 4, COMMON }, + { i("cabbage seed"), 4, COMMON }, { i("tomato seed"), 3, UNCOMMON }, - { i("sweetcorn seed"), 3, UNCOMMON }, { 5308, 3, UNCOMMON }, + { i("sweetcorn seed"), 3, UNCOMMON }, + { 5308, 3, UNCOMMON }, { i("strawberry seed"), 2, RARE }, - { i("watermelon seed"), 2, RARE }, { i("hammer"), 1, COMMON }, - { i("dwarven stout"), 1, COMMON }, { 995, 23, UNCOMMON }, - { 4115, 1, RARE } }; + { i("watermelon seed"), 2, RARE }, + { i("hammer"), 1, COMMON }, + { i("dwarven stout"), 1, COMMON }, + { 995, 23, UNCOMMON }, + { 4115, 1, RARE }, + }; - public static final int[][] kurask = { { i("bones"), 1, ALWAYS }, + public static final int[][] kurask = { + { i("bones"), 1, ALWAYS }, { i("nature rune"), 5 + r(25), UNCOMMON }, { i("death rune"), 1 + r(5), UNCOMMON }, { i("mind rune"), 4 + r(12), UNCOMMON }, @@ -314,13 +474,22 @@ public class NPCDrops extends NPCDropsHandler { { i("broad arrow"), 1 + r(9), UNCOMMON }, { i("rune longsword"), 1, RARE }, { i("adamant platebody"), 1, UNCOMMON }, - { i("mithril kiteshield"), 1, UNCOMMON }, { 4111, 1, VERY_RARE }, + { i("mithril kiteshield"), 1, UNCOMMON }, + { 4111, 1, VERY_RARE }, { i("white berries"), 1, COMMON }, - { i("limpwurt root"), 2, COMMON }, { 199, 1, COMMON }, - { 201, 1, COMMON }, { 203, 1, COMMON }, { 205, 1, COMMON }, - { 209, 1, UNCOMMON }, { 211, 1, UNCOMMON }, { 213, 1, UNCOMMON }, - { 215, 1, UNCOMMON }, { 217, 1, UNCOMMON }, { 207, 1, RARE }, - { 2485, 1, RARE }, { i("irit seed"), 1, UNCOMMON }, + { i("limpwurt root"), 2, COMMON }, + { 199, 1, COMMON }, + { 201, 1, COMMON }, + { 203, 1, COMMON }, + { 205, 1, COMMON }, + { 209, 1, UNCOMMON }, + { 211, 1, UNCOMMON }, + { 213, 1, UNCOMMON }, + { 215, 1, UNCOMMON }, + { 217, 1, UNCOMMON }, + { 207, 1, RARE }, + { 2485, 1, RARE }, + { i("irit seed"), 1, UNCOMMON }, { i("cactus seed"), 1, UNCOMMON }, { i("toadflax seed"), 1, UNCOMMON }, { i("poison ivy seed"), 1, UNCOMMON }, @@ -333,21 +502,35 @@ public class NPCDrops extends NPCDropsHandler { { i("dwarf weed seed"), 1, RARE }, { i("torstol seed"), 1, VERY_RARE }, { i("plain pizza"), 1, UNCOMMON }, - { i("banana"), 1 + r(1), COMMON }, { 2115, 2 + r(6), COMMON }, - { 995, 22 + r(726), COMMON }, { 1780, 20 + r(10), COMMON }, - { 161, 1, COMMON }, { 173, 1, UNCOMMON }, + { i("banana"), 1 + r(1), COMMON }, + { 2115, 2 + r(6), COMMON }, + { 995, 22 + r(726), COMMON }, + { 1780, 20 + r(10), COMMON }, + { 161, 1, COMMON }, + { 173, 1, UNCOMMON }, { i("bones"), 1 + r(1), UNCOMMON }, - { i("big bones"), 1 + r(1), UNCOMMON } }; + { i("big bones"), 1 + r(1), UNCOMMON }, + }; - public static final int[][] earthwarrior = { { 199, 1, COMMON }, - { 201, 1, COMMON }, { 203, 1, COMMON }, { 205, 1, COMMON }, - { 207, 1, UNCOMMON }, { 209, 1, UNCOMMON }, { 211, 1, UNCOMMON }, - { 213, 1, UNCOMMON }, { 215, 1, RARE }, { 2485, 1, RARE }, - { 217, 1, RARE }, { i("earth rune"), 12 + r(48), COMMON }, + public static final int[][] earthwarrior = { + { 199, 1, COMMON }, + { 201, 1, COMMON }, + { 203, 1, COMMON }, + { 205, 1, COMMON }, + { 207, 1, UNCOMMON }, + { 209, 1, UNCOMMON }, + { 211, 1, UNCOMMON }, + { 213, 1, UNCOMMON }, + { 215, 1, RARE }, + { 2485, 1, RARE }, + { 217, 1, RARE }, + { i("earth rune"), 12 + r(48), COMMON }, { i("law rune"), 2, COMMON }, { i("nature rune"), 3 + r(3), COMMON }, - { i("chaos rune"), 3, UNCOMMON }, { i("death rune"), 2, UNCOMMON }, - { i("blood rune"), 2, RARE }, { i("air rune"), 45, VERY_RARE }, + { i("chaos rune"), 3, UNCOMMON }, + { i("death rune"), 2, UNCOMMON }, + { i("blood rune"), 2, RARE }, + { i("air rune"), 45, VERY_RARE }, { i("fire rune"), 6, VERY_RARE }, { i("limpwurt seed"), 1, COMMON }, { i("jangerberry seed"), 1, COMMON }, @@ -359,33 +542,52 @@ public class NPCDrops extends NPCDropsHandler { { i("wildblood seed"), 1, COMMON }, { i("belladonna seed"), 1, UNCOMMON }, { i("harralander seed"), 1, UNCOMMON }, - { i("irit seed"), 1, UNCOMMON }, { i("avantoe seed"), 1, RARE }, - { i("cactus seed"), 1, RARE }, { i("dwarf weed seed"), 1, RARE }, - { i("kwuarm seed"), 1, RARE }, { i("lantadyme seed"), 1, RARE }, - { i("poison ivy seed"), 1, RARE }, { i("ranarr seed"), 1, RARE }, + { i("irit seed"), 1, UNCOMMON }, + { i("avantoe seed"), 1, RARE }, + { i("cactus seed"), 1, RARE }, + { i("dwarf weed seed"), 1, RARE }, + { i("kwuarm seed"), 1, RARE }, + { i("lantadyme seed"), 1, RARE }, + { i("poison ivy seed"), 1, RARE }, + { i("ranarr seed"), 1, RARE }, { i("cadantine seed"), 1, VERY_RARE }, { i("snapdragon seed"), 1, VERY_RARE }, - { 995, 1 + r(478), COMMON }, { i("steel spear"), 1, COMMON }, - { i("staff of earth"), 1, UNCOMMON } }; + { 995, 1 + r(478), COMMON }, + { i("steel spear"), 1, COMMON }, + { i("staff of earth"), 1, UNCOMMON }, + }; - public static final int[][] basilisk = { { i("bones"), 1, ALWAYS }, + public static final int[][] basilisk = { + { i("bones"), 1, ALWAYS }, { i("water rune"), 75 + r(100), COMMON }, { i("nature rune"), 15 + r(30), UNCOMMON }, - { i("chaos rune"), 12, UNCOMMON }, { i("law rune"), 3, UNCOMMON }, + { i("chaos rune"), 12, UNCOMMON }, + { i("law rune"), 3, UNCOMMON }, { i("steel battleaxe"), 1, COMMON }, { i("mithril spear"), 1, UNCOMMON }, { i("mithril axe"), 1, UNCOMMON }, { i("mithril kiteshield"), 1, UNCOMMON }, { i("rune dagger"), 1, UNCOMMON }, - { i("adamant full helm"), 1, UNCOMMON }, { 4109, 1, RARE }, - { 4117, 1, VERY_RARE }, { 199, 1, COMMON }, { 201, 1, COMMON }, - { 203, 1, COMMON }, { 205, 1, COMMON }, { 207, 1 + r(1), COMMON }, - { 209, 1, RARE }, { 2485, 1, RARE }, { 211, 1, RARE }, - { 215, 1, RARE }, { 213, 1, RARE }, { 217, 1, RARE } }; + { i("adamant full helm"), 1, UNCOMMON }, + { 4109, 1, RARE }, + { 4117, 1, VERY_RARE }, + { 199, 1, COMMON }, + { 201, 1, COMMON }, + { 203, 1, COMMON }, + { 205, 1, COMMON }, + { 207, 1 + r(1), COMMON }, + { 209, 1, RARE }, + { 2485, 1, RARE }, + { 211, 1, RARE }, + { 215, 1, RARE }, + { 213, 1, RARE }, + { 217, 1, RARE }, + }; public static final int[][] abberantspectre = { { i("belladonna seed"), 1, COMMON }, - { i("cactus seed"), 1, COMMON }, { i("irit seed"), 1, COMMON }, + { i("cactus seed"), 1, COMMON }, + { i("irit seed"), 1, COMMON }, { i("toadflax seed"), 1, COMMON }, { i("avantoe seed"), 1, COMMON }, { i("cadantine seed"), 1, UNCOMMON }, @@ -394,58 +596,87 @@ public class NPCDrops extends NPCDropsHandler { { i("lantadyme seed"), 1, UNCOMMON }, { i("dwarf weed seed"), 1, RARE }, { i("snapdragon seed"), 1, RARE }, - { i("torstol seed"), 1, VERY_RARE }, { 199, 1 + r(2), COMMON }, - { 201, 1 + r(2), COMMON }, { 203, 1 + r(2), COMMON }, - { 205, 1 + r(2), COMMON }, { 207, 1 + r(2), COMMON }, - { 209, 1 + r(2), COMMON }, { 211, 1 + r(2), COMMON }, - { 213, 1 + r(2), COMMON }, { 5302, 1 + r(2), UNCOMMON }, - { 215, 1 + r(2), UNCOMMON }, { 217, 1 + r(2), UNCOMMON }, - { 3051, 1 + r(1), VERY_RARE }, { i("steel axe"), 1, UNCOMMON }, + { i("torstol seed"), 1, VERY_RARE }, + { 199, 1 + r(2), COMMON }, + { 201, 1 + r(2), COMMON }, + { 203, 1 + r(2), COMMON }, + { 205, 1 + r(2), COMMON }, + { 207, 1 + r(2), COMMON }, + { 209, 1 + r(2), COMMON }, + { 211, 1 + r(2), COMMON }, + { 213, 1 + r(2), COMMON }, + { 5302, 1 + r(2), UNCOMMON }, + { 215, 1 + r(2), UNCOMMON }, + { 217, 1 + r(2), UNCOMMON }, + { 3051, 1 + r(1), VERY_RARE }, + { i("steel axe"), 1, UNCOMMON }, { i("mithril kiteshield"), 1, UNCOMMON }, { i("lava battlestaff"), 1, UNCOMMON }, { i("adamant platelegs"), 1, UNCOMMON }, - { i("rune full helm"), 1, RARE }, { 4103, 1, RARE }, - { 995, 278 + r(209), UNCOMMON } }; + { i("rune full helm"), 1, RARE }, + { 4103, 1, RARE }, + { 995, 278 + r(209), UNCOMMON }, + }; - public static final int[][] turoth = { { i("bones"), 1, ALWAYS }, + public static final int[][] turoth = { + { i("bones"), 1, ALWAYS }, { i("mithril axe"), 1, COMMON }, { i("steel platelegs"), 1, COMMON }, { i("mithril kiteshield"), 1, COMMON }, { i("adamant full helm"), 1, UNCOMMON }, - { i("rune dagger"), 1, UNCOMMON }, { 4113, 1, RARE }, + { i("rune dagger"), 1, UNCOMMON }, + { 4113, 1, RARE }, { i("law rune"), 3, COMMON }, { i("nature rune"), 15 + r(30), UNCOMMON }, { i("poision ivy seed"), 1, COMMON }, { i("cactus seed"), 1, COMMON }, { i("belladonna seed"), 1, COMMON }, - { i("toadflax seed"), 1, COMMON }, { i("irit seed"), 1, COMMON }, + { i("toadflax seed"), 1, COMMON }, + { i("irit seed"), 1, COMMON }, { i("snapdragon seed"), 1, UNCOMMON }, { i("cadantine seed"), 1, UNCOMMON }, { i("avantoe seed"), 1, UNCOMMON }, { i("kwuarm seed"), 1, UNCOMMON }, { i("lantadyme seed"), 1, RARE }, - { i("dwarf weed seed"), 1, RARE }, { i("ranarr seed"), 1, RARE }, - { i("torstol seed"), 1, VERY_RARE }, { 199, 1 + r(2), COMMON }, - { 201, 1 + r(2), COMMON }, { 203, 1 + r(2), COMMON }, - { 205, 1 + r(2), COMMON }, { 207, 1 + r(2), UNCOMMON }, - { 209, 1 + r(2), UNCOMMON }, { 211, 1 + r(2), UNCOMMON }, - { 213, 1 + r(2), UNCOMMON }, { 5302, 1 + r(2), RARE }, - { 217, 1 + r(2), RARE }, { 215, 1 + r(2), RARE }, - { 995, 44 + r(396), COMMON }, { i("limpwurt root"), 1, COMMON } }; + { i("dwarf weed seed"), 1, RARE }, + { i("ranarr seed"), 1, RARE }, + { i("torstol seed"), 1, VERY_RARE }, + { 199, 1 + r(2), COMMON }, + { 201, 1 + r(2), COMMON }, + { 203, 1 + r(2), COMMON }, + { 205, 1 + r(2), COMMON }, + { 207, 1 + r(2), UNCOMMON }, + { 209, 1 + r(2), UNCOMMON }, + { 211, 1 + r(2), UNCOMMON }, + { 213, 1 + r(2), UNCOMMON }, + { 5302, 1 + r(2), RARE }, + { 217, 1 + r(2), RARE }, + { 215, 1 + r(2), RARE }, + { 995, 44 + r(396), COMMON }, + { i("limpwurt root"), 1, COMMON }, + }; - public static final int[][] elfwarrior = { { i("bones"), 1, ALWAYS }, - { i("water rune"), 70, COMMON }, { i("fire rune"), 37, UNCOMMON }, + public static final int[][] elfwarrior = { + { i("bones"), 1, ALWAYS }, + { i("water rune"), 70, COMMON }, + { i("fire rune"), 37, UNCOMMON }, { i("law rune"), 1 + r(2), UNCOMMON }, { i("nature rune"), 12, UNCOMMON }, { i("mithril spear"), 1, COMMON }, { i("rune dagger"), 1, UNCOMMON }, - { i("mithril kiteshield"), 1, COMMON }, { 1099, 1, COMMON }, - { 1135, 1, COMMON }, { 1065, 1, COMMON }, + { i("mithril kiteshield"), 1, COMMON }, + { 1099, 1, COMMON }, + { 1135, 1, COMMON }, + { 1065, 1, COMMON }, { i("adamant med helm"), 1, UNCOMMON }, - { i("rune med helm"), 1, RARE }, { i("bass"), 1, UNCOMMON }, - { i("shark"), 1, UNCOMMON }, { i("lobster"), 1, UNCOMMON }, - { i("sea turtle"), 1, RARE }, { i("manta ray"), 1, VERY_RARE }, - { i("kwuarm seed"), 1, UNCOMMON }, { i("irit seed"), 1, UNCOMMON }, + { i("rune med helm"), 1, RARE }, + { i("bass"), 1, UNCOMMON }, + { i("shark"), 1, UNCOMMON }, + { i("lobster"), 1, UNCOMMON }, + { i("sea turtle"), 1, RARE }, + { i("manta ray"), 1, VERY_RARE }, + { i("kwuarm seed"), 1, UNCOMMON }, + { i("irit seed"), 1, UNCOMMON }, { i("avantoe seed"), 1, UNCOMMON }, { i("toadflax seed"), 1, UNCOMMON }, { i("poison ivy seed"), 1, UNCOMMON }, @@ -454,16 +685,28 @@ public class NPCDrops extends NPCDropsHandler { { i("dwarf weed seed"), 1, UNCOMMON }, { i("cactus seed"), 1, UNCOMMON }, { i("lantadyme seed"), 1, RARE }, - { i("snapdragon seed"), 1, RARE }, { 199, 1, COMMON }, - { 201, 1, COMMON }, { 203, 1, COMMON }, { 205, 1, COMMON }, - { 209, 1, COMMON }, { 211, 1, COMMON }, { 213, 1, COMMON }, - { 215, 1, RARE }, { 2485, 1, RARE }, { 207, 1, RARE }, - { 217, 1, RARE }, { 995, 20 + r(407), COMMON }, - { i("adamantite ore"), 1, UNCOMMON } }; + { i("snapdragon seed"), 1, RARE }, + { 199, 1, COMMON }, + { 201, 1, COMMON }, + { 203, 1, COMMON }, + { 205, 1, COMMON }, + { 209, 1, COMMON }, + { 211, 1, COMMON }, + { 213, 1, COMMON }, + { 215, 1, RARE }, + { 2485, 1, RARE }, + { 207, 1, RARE }, + { 217, 1, RARE }, + { 995, 20 + r(407), COMMON }, + { i("adamantite ore"), 1, UNCOMMON }, + }; - public static final int[][] man = { { 526, 1, ALWAYS }, - { 995, 1 + r(39), COMMON }, { i("water rune"), 7, UNCOMMON }, - { i("earth rune"), 4, UNCOMMON }, { i("fire rune"), 6, UNCOMMON }, + public static final int[][] man = { + { 526, 1, ALWAYS }, + { 995, 1 + r(39), COMMON }, + { i("water rune"), 7, UNCOMMON }, + { i("earth rune"), 4, UNCOMMON }, + { i("fire rune"), 6, UNCOMMON }, { i("mind rune"), 9, UNCOMMON }, { i("bronze arrow"), 7, UNCOMMON }, { i("iron dagger"), 1, UNCOMMON }, @@ -471,21 +714,34 @@ public class NPCDrops extends NPCDropsHandler { { i("air talisman"), 1, UNCOMMON }, { i("earth talisman"), 1, UNCOMMON }, { i("fishing bait"), 1, UNCOMMON }, - { i("copper ore"), 1, UNCOMMON }, { i("tin ore"), 1, UNCOMMON }, - { i("chaos rune"), 2, RARE }, { i("body rune"), 7, RARE }, - { i("staff of air"), 1, RARE + r(5) }, { 199, 1, COMMON }, - { 201, 1, UNCOMMON }, { 203, 1, UNCOMMON }, { 205, 1, UNCOMMON }, - { 207, 1, UNCOMMON }, { 213, 1, UNCOMMON }, { 209, 1, UNCOMMON }, - { 211, 1, RARE }, { 215, 1, RARE }, { 217, 1, RARE }, - { 2485, 1, RARE } }; + { i("copper ore"), 1, UNCOMMON }, + { i("tin ore"), 1, UNCOMMON }, + { i("chaos rune"), 2, RARE }, + { i("body rune"), 7, RARE }, + { i("staff of air"), 1, RARE + r(5) }, + { 199, 1, COMMON }, + { 201, 1, UNCOMMON }, + { 203, 1, UNCOMMON }, + { 205, 1, UNCOMMON }, + { 207, 1, UNCOMMON }, + { 213, 1, UNCOMMON }, + { 209, 1, UNCOMMON }, + { 211, 1, RARE }, + { 215, 1, RARE }, + { 217, 1, RARE }, + { 2485, 1, RARE }, + }; - public static final int[][] dagannoth = { { 526, 1, ALWAYS }, - { i("bronze spear"), 1, COMMON }, { i("bronze axe"), 1, COMMON }, + public static final int[][] dagannoth = { + { 526, 1, ALWAYS }, + { i("bronze spear"), 1, COMMON }, + { i("bronze axe"), 1, COMMON }, { i("iron spear"), 1, COMMON }, { i("mithril spear"), 1, UNCOMMON }, { i("cactus seed"), 1, COMMON }, { i("poison ivy seed"), 1, COMMON }, - { i("belladonna seed"), 1, COMMON }, { i("irit seed"), 1, COMMON }, + { i("belladonna seed"), 1, COMMON }, + { i("irit seed"), 1, COMMON }, { i("avantoe seed"), 1, COMMON }, { i("toadflax seed"), 1, COMMON }, { i("ranarr seed"), 1, UNCOMMON }, @@ -497,31 +753,49 @@ public class NPCDrops extends NPCDropsHandler { { i("torstol seed"), 1, UNCOMMON }, { i("steel arrow"), 15, COMMON }, { i("mithril javelin"), 2 + r(2), UNCOMMON }, - { i("harpoon"), 1, COMMON }, { i("lobster pot"), 1, COMMON }, - { i("fishing bait"), 50, COMMON }, { i("feather"), 15, COMMON }, - { i("raw sardine"), 5, COMMON }, { i("raw herring"), 4, COMMON }, - { 402, 10, COMMON }, { 411, 1 + r(1), COMMON }, - { i("raw lobster"), 1, COMMON }, { i("raw tuna"), 1, UNCOMMON }, + { i("harpoon"), 1, COMMON }, + { i("lobster pot"), 1, COMMON }, + { i("fishing bait"), 50, COMMON }, + { i("feather"), 15, COMMON }, + { i("raw sardine"), 5, COMMON }, + { i("raw herring"), 4, COMMON }, + { 402, 10, COMMON }, + { 411, 1 + r(1), COMMON }, + { i("raw lobster"), 1, COMMON }, + { i("raw tuna"), 1, UNCOMMON }, { 995, 1 + r(84), COMMON }, { i("water rune"), 15 + r(15), COMMON }, - { 46, 12, COMMON }, {405, 1, UNCOMMON }, - { 45, 12, UNCOMMON } }; + { 46, 12, COMMON }, + { 405, 1, UNCOMMON }, + { 45, 12, UNCOMMON }, + }; public static final int[][] chaoselemental = { { i("rune sword"), 1, UNCOMMON }, { i("dragon 2h sword"), 1, RARE }, { i("iron arrow"), 500 + r(500), COMMON }, { i("mithril dart"), 400, COMMON }, - { i("rune arrow"), 200, COMMON }, { i("air rune"), 500, UNCOMMON }, + { i("rune arrow"), 200, COMMON }, + { i("air rune"), 500, UNCOMMON }, { i("chaos rune"), 250 + r(2250), COMMON }, - { i("death rune"), 500, RARE }, { i("blood rune"), 500, RARE }, - { 119, 1, COMMON }, { 2446, 1, COMMON }, { 125, 1, COMMON }, - { 137, 1, COMMON }, { 2289, 3, COMMON }, { 361, 5, COMMON }, - { 464, 1 + r(5), COMMON }, { i("shark"), 10, COMMON }, - { 187, 1, UNCOMMON }, { 2003, 10, UNCOMMON }, - { 6689, 4 + r(2), UNCOMMON }, { 995, 3000 + r(9000), UNCOMMON }, - { i("bones"), 4, COMMON }, { i("bat bones"), 5, COMMON }, - { i("big bones"), 3, COMMON }, { i("dragon bones"), 1, UNCOMMON }, + { i("death rune"), 500, RARE }, + { i("blood rune"), 500, RARE }, + { 119, 1, COMMON }, + { 2446, 1, COMMON }, + { 125, 1, COMMON }, + { 137, 1, COMMON }, + { 2289, 3, COMMON }, + { 361, 5, COMMON }, + { 464, 1 + r(5), COMMON }, + { i("shark"), 10, COMMON }, + { 187, 1, UNCOMMON }, + { 2003, 10, UNCOMMON }, + { 6689, 4 + r(2), UNCOMMON }, + { 995, 3000 + r(9000), UNCOMMON }, + { i("bones"), 4, COMMON }, + { i("bat bones"), 5, COMMON }, + { i("big bones"), 3, COMMON }, + { i("dragon bones"), 1, UNCOMMON }, { i("babydragon bones"), 1 + r(1), UNCOMMON }, { i("wildblood seed"), 1 + r(2), COMMON }, { i("avantoe seed"), 1 + r(2), UNCOMMON }, @@ -540,7 +814,8 @@ public class NPCDrops extends NPCDropsHandler { { i("belladonna seed"), 1 + r(2), UNCOMMON }, { i("cadantine seed"), 1 + r(2), UNCOMMON }, { i("whiteberry seed"), 1 + r(2), COMMON }, - { i("lantadyme seed"), 1, RARE } }; + { i("lantadyme seed"), 1, RARE }, + }; public static final int[][] dagannothsupereme = { { i("dragon bones"), 1, ALWAYS }, @@ -549,9 +824,9 @@ public class NPCDrops extends NPCDropsHandler { { i("rune longsword"), 1, RARE }, { i("fremennik blade"), 1, RARE }, { i("rune battleaxe"), 1, RARE },// fremennik - // blade - // not - // tradeable + // blade + // not + // tradeable { i("rune 2h sword"), 1, RARE }, { i("seercull"), 1, RARE }, { i("dragon axe"), 1, RARE }, @@ -567,28 +842,44 @@ public class NPCDrops extends NPCDropsHandler { { i("spined chaps"), 1, UNCOMMON }, { i("fremennik shield"), 1, UNCOMMON }, { i("fremennik helm"), 1, UNCOMMON }, // fremennik shield + helm not - // tradeable - { i("archer helm"), 1, RARE }, { i("archers' ring"), 1, RARE }, - { i("shark"), 5, UNCOMMON }, { i("belladonna seed"), 1, UNCOMMON }, + // tradeable + { i("archer helm"), 1, RARE }, + { i("archers' ring"), 1, RARE }, + { i("shark"), 5, UNCOMMON }, + { i("belladonna seed"), 1, UNCOMMON }, { i("cactus seed"), 1, UNCOMMON }, { i("poison ivy seed"), 1, UNCOMMON }, - { i("irit seed"), 1, UNCOMMON }, { i("toadflax seed"), UNCOMMON }, - { i("avantoe seed"), 1, UNCOMMON }, { i("kwuarm seed"), 1, RARE }, - { i("cadantine seed"), 1, RARE }, { i("lantadyme seed"), 1, RARE }, - { i("dwarf weed seed"), 1, RARE }, { i("air talisman"), 1, RARE }, - { i("mind talisman"), 1, RARE }, { i("earth talisman"), 1, RARE }, - { i("fire talisman"), 1, RARE }, { i("body talisman"), 1, RARE }, - { i("cosmic talisman"), 1, RARE }, { 995, 900 + r(2100), COMMON }, - { i("opal bolt tips"), 1 + r(2), COMMON }, { 1516, 94, UNCOMMON }, - { 1518, 91 + r(31), UNCOMMON }, { i("oyster pearls"), 1, COMMON }, - { 207, 1, UNCOMMON }, { i("feather"), 1 + r(199), RARE }, - { i("runite limbs"), 1, RARE } }; + { i("irit seed"), 1, UNCOMMON }, + { i("toadflax seed"), UNCOMMON }, + { i("avantoe seed"), 1, UNCOMMON }, + { i("kwuarm seed"), 1, RARE }, + { i("cadantine seed"), 1, RARE }, + { i("lantadyme seed"), 1, RARE }, + { i("dwarf weed seed"), 1, RARE }, + { i("air talisman"), 1, RARE }, + { i("mind talisman"), 1, RARE }, + { i("earth talisman"), 1, RARE }, + { i("fire talisman"), 1, RARE }, + { i("body talisman"), 1, RARE }, + { i("cosmic talisman"), 1, RARE }, + { 995, 900 + r(2100), COMMON }, + { i("opal bolt tips"), 1 + r(2), COMMON }, + { 1516, 94, UNCOMMON }, + { 1518, 91 + r(31), UNCOMMON }, + { i("oyster pearls"), 1, COMMON }, + { 207, 1, UNCOMMON }, + { i("feather"), 1 + r(199), RARE }, + { i("runite limbs"), 1, RARE }, + }; - public static final int[][] giantmole = { { i("big bones"), 1, ALWAYS }, + public static final int[][] giantmole = { + { i("big bones"), 1, ALWAYS }, { i("mole claw"), 1, ALWAYS }, { i("mole skin"), 1 + r(5), ALWAYS }, - { i("air rune"), 105, COMMON }, { i("fire rune"), 105, COMMON }, - { i("blood rune"), 15, COMMON }, { i("death rune"), 7, COMMON }, + { i("air rune"), 105, COMMON }, + { i("fire rune"), 105, COMMON }, + { i("blood rune"), 15, COMMON }, + { i("death rune"), 7, COMMON }, { i("law rune"), 15, UNCOMMON }, { i("iron arrow"), 690 + r(690), UNCOMMON }, { i("adamant longsword"), 1, COMMON }, @@ -600,10 +891,14 @@ public class NPCDrops extends NPCDropsHandler { { i("mithril platebody"), 1, COMMON }, { i("rune med helm"), 1, COMMON }, { i("amulet of strength"), 1, COMMON }, - { i("rune sq shield"), 1, UNCOMMON }, { 441, 100, UNCOMMON }, - { i("mithril bar"), 1, RARE }, { 995, 360 + r(10640), UNCOMMON }, + { i("rune sq shield"), 1, UNCOMMON }, + { 441, 100, UNCOMMON }, + { i("mithril bar"), 1, RARE }, + { 995, 360 + r(10640), UNCOMMON }, { i("shark"), 1 + r(4), UNCOMMON }, - { i("oyster pearls"), 1, RARE }, { 1516, 50 + r(50), UNCOMMON } }; + { i("oyster pearls"), 1, RARE }, + { 1516, 50 + r(50), UNCOMMON }, + }; public static final int[][] dagannothprime = { { i("dagganoth bones"), 1, ALWAYS }, @@ -622,30 +917,37 @@ public class NPCDrops extends NPCDropsHandler { { i("death rune"), 63, UNCOMMON }, { i("fremennik shield"), 1, UNCOMMON }, { i("fremennik helm"), 1, UNCOMMON }, // shield - // + - // helm - // not - // tradeable - { i("seers' ring"), 1, RARE }, { i("skeletal top"), 1, RARE }, - { i("skeletal bottoms"), 1, RARE }, { i("farseer helm"), 1, RARE }, - { 995, 972 + r(2022), COMMON }, { 7937, 150, UNCOMMON }, - { 207, 1, UNCOMMON }, { i("belladonna seed"), 1, UNCOMMON }, + // + + // helm + // not + // tradeable + { i("seers' ring"), 1, RARE }, + { i("skeletal top"), 1, RARE }, + { i("skeletal bottoms"), 1, RARE }, + { i("farseer helm"), 1, RARE }, + { 995, 972 + r(2022), COMMON }, + { 7937, 150, UNCOMMON }, + { 207, 1, UNCOMMON }, + { i("belladonna seed"), 1, UNCOMMON }, { i("cactus seed"), 1, UNCOMMON }, { i("poison ivy seed"), 1, UNCOMMON }, { i("irit seed"), 1, UNCOMMON }, { i("toadflax seed"), 1, UNCOMMON }, - { i("avantoe seed"), 1, UNCOMMON }, { i("kwuarm seed"), 1, RARE }, - { i("cadantine seed"), 1, RARE }, { i("lantadyme seed"), 1, RARE }, - { i("dwarf weed seed"), 1, RARE } }; + { i("avantoe seed"), 1, UNCOMMON }, + { i("kwuarm seed"), 1, RARE }, + { i("cadantine seed"), 1, RARE }, + { i("lantadyme seed"), 1, RARE }, + { i("dwarf weed seed"), 1, RARE }, + }; public static final int[][] daggannothrex = { { i("dagganoth bones"), 1, ALWAYS }, { i("dagganoth hide"), 1, ALWAYS }, { i("fremennik blade"), 1, COMMON }, { i("mithril warhammer"), 1, COMMON }, // fremy - // blade - // not - // tradeable + // blade + // not + // tradeable { i("adamant axe"), 1, COMMON }, { i("mithril 2h sword"), 1, UNCOMMON }, { i("rune axe"), UNCOMMON }, @@ -654,52 +956,96 @@ public class NPCDrops extends NPCDropsHandler { { i("steel platebody"), 1, COMMON }, { i("adamant platebody"), 1, UNCOMMON }, { i("fremennik shield"), 1, UNCOMMON },// fremmy helm + shield not - // tradeable + // tradeable { i("fremennik helm"), 1, UNCOMMON }, - { i("berserker ring"), 1, RARE }, { i("warrior ring"), 1, RARE }, - { i("ring of life"), 1, RARE }, { i("rock-shell plate"), 1, RARE }, - { i("rock-shell legs"), 1, RARE }, { 147, 1, UNCOMMON }, - { 159, 1, UNCOMMON }, { 165, 1, UNCOMMON }, { 141, 1, UNCOMMON }, - { 2456, 1, UNCOMMON }, { 191, 1, UNCOMMON }, { 129, 1, UNCOMMON }, - { i("adamant bar"), 1, UNCOMMON }, { 4448, 25, UNCOMMON }, - { 454, 100, UNCOMMON }, { 441, 150, UNCOMMON }, - { 2354, 17 + r(21), UNCOMMON }, { 365, 5, UNCOMMON }, - { 373, 5, UNCOMMON }, { 385, 5, UNCOMMON }, { 207, 1, UNCOMMON }, + { i("berserker ring"), 1, RARE }, + { i("warrior ring"), 1, RARE }, + { i("ring of life"), 1, RARE }, + { i("rock-shell plate"), 1, RARE }, + { i("rock-shell legs"), 1, RARE }, + { 147, 1, UNCOMMON }, + { 159, 1, UNCOMMON }, + { 165, 1, UNCOMMON }, + { 141, 1, UNCOMMON }, + { 2456, 1, UNCOMMON }, + { 191, 1, UNCOMMON }, + { 129, 1, UNCOMMON }, + { i("adamant bar"), 1, UNCOMMON }, + { 4448, 25, UNCOMMON }, + { 454, 100, UNCOMMON }, + { 441, 150, UNCOMMON }, + { 2354, 17 + r(21), UNCOMMON }, + { 365, 5, UNCOMMON }, + { 373, 5, UNCOMMON }, + { 385, 5, UNCOMMON }, + { 207, 1, UNCOMMON }, { i("body talisman"), 1, COMMON }, { i("earth talisman"), 1, COMMON }, - { 995, 995 + r(2844), UNCOMMON } }; + { 995, 995 + r(2844), UNCOMMON }, + }; - public static final int[][] monkeyguard = { { 3182, 1, ALWAYS } }; + public static final int[][] monkeyguard = { + { 3182, 1, ALWAYS }, + }; - public static final int[][] bandit = { { 526, 1, ALWAYS }, - { i("chaos rune"), 2, COMMON }, { i("death rune"), 2, UNCOMMON }, - { i("nature rune"), 2, UNCOMMON }, { i("law rune"), 2, UNCOMMON }, - { i("cosmic rune"), 2, UNCOMMON }, { 205, 1, UNCOMMON }, - { 203, 1, UNCOMMON }, { 201, 1, UNCOMMON }, { 199, 1, UNCOMMON }, - { 217, 1, RARE }, { 2485, 1, RARE }, { 215, 1, RARE }, - { 213, 1, RARE }, { 211, 1, RARE }, { 209, 1, RARE }, - { 207, 1, UNCOMMON + r(200) }, { i("steel axe"), 1, COMMON }, + public static final int[][] bandit = { + { 526, 1, ALWAYS }, + { i("chaos rune"), 2, COMMON }, + { i("death rune"), 2, UNCOMMON }, + { i("nature rune"), 2, UNCOMMON }, + { i("law rune"), 2, UNCOMMON }, + { i("cosmic rune"), 2, UNCOMMON }, + { 205, 1, UNCOMMON }, + { 203, 1, UNCOMMON }, + { 201, 1, UNCOMMON }, + { 199, 1, UNCOMMON }, + { 217, 1, RARE }, + { 2485, 1, RARE }, + { 215, 1, RARE }, + { 213, 1, RARE }, + { 211, 1, RARE }, + { 209, 1, RARE }, + { 207, 1, UNCOMMON + r(200) }, + { i("steel axe"), 1, COMMON }, { i("iron battleaxe"), 1, UNCOMMON }, { i("iron scimitar"), 1, UNCOMMON }, - { i("steel sq shield"), 1, UNCOMMON }, { 995, 12 + r(37), COMMON }, - { i("coal"), 1, COMMON }, { i("steel bar"), 1, UNCOMMON } }; + { i("steel sq shield"), 1, UNCOMMON }, + { 995, 12 + r(37), COMMON }, + { i("coal"), 1, COMMON }, + { i("steel bar"), 1, UNCOMMON }, + }; public static final int[][] abyssaldemon = { - { i("black sword"), 1, COMMON }, { i("black axe"), 1, COMMON }, + { i("black sword"), 1, COMMON }, + { i("black axe"), 1, COMMON }, { i("steel battleaxe"), 1, COMMON }, { i("abyssal whip"), 1, VERY_RARE }, { i("mithril kiteshield"), 1, UNCOMMON }, { i("rune chainbody"), 1, UNCOMMON }, - { i("rune med helm"), 1, UNCOMMON }, { 199, 1, COMMON }, - { 201, 1, COMMON }, { 203, 1, COMMON }, { 205, 1, UNCOMMON }, - { 207, 1, UNCOMMON }, { 209, 1, UNCOMMON }, { 211, 1, UNCOMMON }, - { 215, 1, UNCOMMON }, { 2485, 1, UNCOMMON }, { 213, 1, UNCOMMON }, - { 217, 1, UNCOMMON }, { i("air rune"), 50, COMMON }, - { i("blood rune"), 7, COMMON }, { i("chaos rune"), 10, COMMON }, - { i("law rune"), 3, UNCOMMON }, { 995, 9 + r(2991), COMMON }, - { i("lobster"), 1, COMMON }, { i("cosmic talisman"), 1, COMMON }, - { 7937, 60, UNCOMMON }, { i("earth talisman"), 1, UNCOMMON }, - { i("adamant bar"), 1, UNCOMMON }, { 133, 1, UNCOMMON } }; + { i("rune med helm"), 1, UNCOMMON }, + { 199, 1, COMMON }, + { 201, 1, COMMON }, + { 203, 1, COMMON }, + { 205, 1, UNCOMMON }, + { 207, 1, UNCOMMON }, + { 209, 1, UNCOMMON }, + { 211, 1, UNCOMMON }, + { 215, 1, UNCOMMON }, + { 2485, 1, UNCOMMON }, + { 213, 1, UNCOMMON }, + { 217, 1, UNCOMMON }, + { i("air rune"), 50, COMMON }, + { i("blood rune"), 7, COMMON }, + { i("chaos rune"), 10, COMMON }, + { i("law rune"), 3, UNCOMMON }, + { 995, 9 + r(2991), COMMON }, + { i("lobster"), 1, COMMON }, + { i("cosmic talisman"), 1, COMMON }, + { 7937, 60, UNCOMMON }, + { i("earth talisman"), 1, UNCOMMON }, + { i("adamant bar"), 1, UNCOMMON }, + { 133, 1, UNCOMMON }, + }; public static final int[][] nechryael = { { i("rune full helm"), 1, UNCOMMON }, @@ -708,13 +1054,15 @@ public class NPCDrops extends NPCDropsHandler { { i("rune boots"), 1, UNCOMMON }, { i("rune sq shield"), 1, VERY_RARE }, { i("steel 2h sword"), 1, COMMON }, - { i("steel battleaxe"), 1, COMMON }, { i("steel axe"), 1, COMMON }, + { i("steel battleaxe"), 1, COMMON }, + { i("steel axe"), 1, COMMON }, { i("rune longsword"), 1, VERY_RARE }, { i("rune battleaxe"), 1, VERY_RARE }, { i("rune 2h sword"), 1, VERY_RARE }, { i("death rune"), 5 + r(5), COMMON }, { i("chaos rune"), 3 + r(34), UNCOMMON }, - { i("belladonna seed"), 1, COMMON }, { i("irit seed"), 1, COMMON }, + { i("belladonna seed"), 1, COMMON }, + { i("irit seed"), 1, COMMON }, { i("cactus seed"), 1, COMMON }, { i("avantoe seed"), 1, UNCOMMON }, { i("kwuarm seed"), 1, UNCOMMON }, @@ -722,108 +1070,179 @@ public class NPCDrops extends NPCDropsHandler { { i("toadflax seed"), 1, UNCOMMON }, { i("cadantine seed"), 1, UNCOMMON }, { i("dwarf weed seed"), 1, RARE }, - { i("lantadyme seed"), 1, RARE }, { 995, 11 + r(8981), COMMON }, - { i("tuna"), 1, COMMON }, { i("thread"), 10, UNCOMMON }, - { i("gold bar"), 1, UNCOMMON }, { i("rune bar"), 1, RARE } }; + { i("lantadyme seed"), 1, RARE }, + { 995, 11 + r(8981), COMMON }, + { i("tuna"), 1, COMMON }, + { i("thread"), 10, UNCOMMON }, + { i("gold bar"), 1, UNCOMMON }, + { i("rune bar"), 1, RARE }, + }; public static final int[][] gargoyle = { { i("steel 2h sword"), 1, COMMON }, - { i("steel battleaxe"), 1, COMMON }, { i("steel axe"), 1, COMMON }, + { i("steel battleaxe"), 1, COMMON }, + { i("steel axe"), 1, COMMON }, { i("granite maul"), 1, VERY_RARE + r(50) }, { i("rune full helm"), 1, UNCOMMON }, { i("adamant boots"), 1, UNCOMMON }, - { i("steel full helm"), 1, RARE }, { 4101, 1, RARE }, + { i("steel full helm"), 1, RARE }, + { 4101, 1, RARE }, { i("fire rune"), 37 + r(38), COMMON }, - { i("chaos rune"), 15, COMMON }, { i("death rune"), 5, UNCOMMON }, - { 995, 11 + r(487), COMMON }, { 7937, 35, UNCOMMON }, - { i("mithril bar"), 3, UNCOMMON }, { i("steel bar"), 3, UNCOMMON }, - { i("gold bar"), 1, UNCOMMON }, { i("thread"), 10, UNCOMMON } }; + { i("chaos rune"), 15, COMMON }, + { i("death rune"), 5, UNCOMMON }, + { 995, 11 + r(487), COMMON }, + { 7937, 35, UNCOMMON }, + { i("mithril bar"), 3, UNCOMMON }, + { i("steel bar"), 3, UNCOMMON }, + { i("gold bar"), 1, UNCOMMON }, + { i("thread"), 10, UNCOMMON }, + }; - public static final int[][] dustdevil = { { 526, 1, ALWAYS }, - { i("steel axe"), 1, COMMON }, { i("rune arrow"), 12, COMMON }, - { 2489, 1, COMMON }, { i("earth battlestaff"), 1, RARE }, - { i("rune dagger"), 1, RARE }, { i("rune javelin"), 5, RARE }, + public static final int[][] dustdevil = { + { 526, 1, ALWAYS }, + { i("steel axe"), 1, COMMON }, + { i("rune arrow"), 12, COMMON }, + { 2489, 1, COMMON }, + { i("earth battlestaff"), 1, RARE }, + { i("rune dagger"), 1, RARE }, + { i("rune javelin"), 5, RARE }, { i("dragon chainbody"), 1, VERY_RARE + r(30000) }, { i("fire rune"), 3 + r(263), COMMON }, { i("chaos rune"), 5, UNCOMMON }, { i("soul rune"), 1 + r(4), UNCOMMON }, - { i("law rune"), 1, VERY_RARE }, { 995, 15 + r(381), COMMON }, - { i("mithril bar"), 1, COMMON }, { 1883, 1 + r(1), UNCOMMON }, - { 199, 1, COMMON }, { 201, 1, COMMON }, { 203, 1, COMMON }, - { 205, 1, UNCOMMON }, { 207, 1, UNCOMMON }, { 209, 1, UNCOMMON }, - { 211, 1, UNCOMMON }, { 215, 1, UNCOMMON }, { 2485, 1, RARE }, - { 213, 1, RARE }, { 217, 1, RARE }}; + { i("law rune"), 1, VERY_RARE }, + { 995, 15 + r(381), COMMON }, + { i("mithril bar"), 1, COMMON }, + { 1883, 1 + r(1), UNCOMMON }, + { 199, 1, COMMON }, + { 201, 1, COMMON }, + { 203, 1, COMMON }, + { 205, 1, UNCOMMON }, + { 207, 1, UNCOMMON }, + { 209, 1, UNCOMMON }, + { 211, 1, UNCOMMON }, + { 215, 1, UNCOMMON }, + { 2485, 1, RARE }, + { 213, 1, RARE }, + { 217, 1, RARE } }; - public static final int[][] banshee = { { i("iron mace"), 1, UNCOMMON }, - { i("iron dagger"), 1, RARE }, { i("iron kiteshield"), 1, RARE }, - { i("adamant kiteshield"), 1, VERY_RARE }, { 4105, 1, VERY_RARE }, - { 556, 3, COMMON }, { i("chaos rune"), 3 + r(14), COMMON }, + public static final int[][] banshee = { + { i("iron mace"), 1, UNCOMMON }, + { i("iron dagger"), 1, RARE }, + { i("iron kiteshield"), 1, RARE }, + { i("adamant kiteshield"), 1, VERY_RARE }, + { 4105, 1, VERY_RARE }, + { 556, 3, COMMON }, + { i("chaos rune"), 3 + r(14), COMMON }, { i("cosmic rune"), 2, UNCOMMON }, { i("fire rune"), 5 + r(2), UNCOMMON }, - { 995, 13 + r(22), COMMON }, { 7937, 23, COMMON }, - { 313, 7 + r(8), COMMON }, { i("iron ore"), 1, UNCOMMON }, - { i("eye of newt"), 1, UNCOMMON }, { 199, 1, COMMON }, - { 203, 1, COMMON }, { 201, 1, COMMON }, { 205, 1, COMMON }, - { 213, 1, COMMON }, { 207, 1, UNCOMMON }, { 209, 1, UNCOMMON }, - { 211, 1, UNCOMMON }, { 2485, 1, UNCOMMON }, { 217, 1, UNCOMMON }, - { 215, 1, UNCOMMON } }; + { 995, 13 + r(22), COMMON }, + { 7937, 23, COMMON }, + { 313, 7 + r(8), COMMON }, + { i("iron ore"), 1, UNCOMMON }, + { i("eye of newt"), 1, UNCOMMON }, + { 199, 1, COMMON }, + { 203, 1, COMMON }, + { 201, 1, COMMON }, + { 205, 1, COMMON }, + { 213, 1, COMMON }, + { 207, 1, UNCOMMON }, + { 209, 1, UNCOMMON }, + { 211, 1, UNCOMMON }, + { 2485, 1, UNCOMMON }, + { 217, 1, UNCOMMON }, + { 215, 1, UNCOMMON }, + }; - public static final int[][] infernalmage = { { 526, 1, ALWAYS }, - { i("staff"), 1, COMMON }, { i("staff of fire"), 1, UNCOMMON }, + public static final int[][] infernalmage = { + { 526, 1, ALWAYS }, + { i("staff"), 1, COMMON }, + { i("staff of fire"), 1, UNCOMMON }, { i("lava battlestaff"), 1, RARE }, - { i("mystic fire staff"), 1, RARE }, { 4099, 1, RARE }, - { 4107, 1, RARE }, { i("earth rune"), 5 + r(31), COMMON }, + { i("mystic fire staff"), 1, RARE }, + { 4099, 1, RARE }, + { 4107, 1, RARE }, + { i("earth rune"), 5 + r(31), COMMON }, { i("fire rune"), 10 + r(8), COMMON }, { i("death rune"), 7, COMMON }, { i("blood rune"), 4 + r(3), UNCOMMON }, { i("air rune"), 10 + r(8), UNCOMMON }, { i("mind rune"), 18, UNCOMMON }, { i("water rune"), 10 + r(8), UNCOMMON }, - { i("body rune"), 18, UNCOMMON }, { 995, 1 + r(28), COMMON } }; + { i("body rune"), 18, UNCOMMON }, + { 995, 1 + r(28), COMMON }, + }; - public static final int[][] bloodveld = { { 526, 1, ALWAYS }, + public static final int[][] bloodveld = { + { 526, 1, ALWAYS }, { i("steel axe"), 1, COMMON }, { i("steel scimitar"), 1, UNCOMMON }, { i("steel full helm"), 1, COMMON }, { i("mithril sq shield"), 1, UNCOMMON }, { i("mithril chainbody"), 1, UNCOMMON }, - { i("black boots"), 1, RARE }, { i("rune med helm"), 1, RARE }, - { i("rune full helm"), 1, RARE }, { i("fire rune"), 60, COMMON }, + { i("black boots"), 1, RARE }, + { i("rune med helm"), 1, RARE }, + { i("rune full helm"), 1, RARE }, + { i("fire rune"), 60, COMMON }, { i("blood rune"), 3 + r(27), UNCOMMON }, - { 995, 10 + r(450), COMMON }, { i("gold ore"), 1, UNCOMMON }, + { 995, 10 + r(450), COMMON }, + { i("gold ore"), 1, UNCOMMON }, { 526, 1 + r(2), UNCOMMON }, { i("big bones"), 1 + r(4), UNCOMMON }, - { i("meat pizza"), 1, UNCOMMON }, { i("gold ring"), 1, RARE }, - { 199, 1, UNCOMMON }, { 201, 1, UNCOMMON }, { 203, 1, UNCOMMON }, - { 205, 1, UNCOMMON }, { 207, 1, UNCOMMON }, { 209, 1, UNCOMMON }, - { 211, 1, UNCOMMON }, { 213, 1, UNCOMMON }, { 215, 1, UNCOMMON }, - { 2485, 1, UNCOMMON }, { 217, 1, UNCOMMON } }; + { i("meat pizza"), 1, UNCOMMON }, + { i("gold ring"), 1, RARE }, + { 199, 1, UNCOMMON }, + { 201, 1, UNCOMMON }, + { 203, 1, UNCOMMON }, + { 205, 1, UNCOMMON }, + { 207, 1, UNCOMMON }, + { 209, 1, UNCOMMON }, + { 211, 1, UNCOMMON }, + { 213, 1, UNCOMMON }, + { 215, 1, UNCOMMON }, + { 2485, 1, UNCOMMON }, + { 217, 1, UNCOMMON }, + }; - public static final int[][] dwarf = { { 526, 1, ALWAYS }, - { i("bronze pickaxe"), 1, COMMON }, { i("tin ore"), 1, COMMON }, - { i("bronze bar"), 1, COMMON }, { i("copper ore"), 1, COMMON }, - { i("iron ore"), 1, COMMON }, { i("iron pickaxe"), 1, UNCOMMON }, - { i("coal"), 1, UNCOMMON }, { i("iron bar"), 1, UNCOMMON }, - { i("nature rune"), 2, RARE }, { i("chaos rune"), 2, RARE }, + public static final int[][] dwarf = { + { 526, 1, ALWAYS }, + { i("bronze pickaxe"), 1, COMMON }, + { i("tin ore"), 1, COMMON }, + { i("bronze bar"), 1, COMMON }, + { i("copper ore"), 1, COMMON }, + { i("iron ore"), 1, COMMON }, + { i("iron pickaxe"), 1, UNCOMMON }, + { i("coal"), 1, UNCOMMON }, + { i("iron bar"), 1, UNCOMMON }, + { i("nature rune"), 2, RARE }, + { i("chaos rune"), 2, RARE }, { i("bronze med helm"), 1, COMMON }, { i("bronze battleaxe"), 1, UNCOMMON }, { i("iron battleaxe"), 1, UNCOMMON }, - { 995, 3 + r(27), COMMON }, { i("hammer"), 1, UNCOMMON }, - { i("dwarven stout"), 1, UNCOMMON } }; + { 995, 3 + r(27), COMMON }, + { i("hammer"), 1, UNCOMMON }, + { i("dwarven stout"), 1, UNCOMMON }, + }; - public static final int[][] mossgiant = { { i("big bones"), 1, ALWAYS }, - { i("magic staff"), 1, COMMON }, { i("mithril spear"), 1, COMMON }, + public static final int[][] mossgiant = { + { i("big bones"), 1, ALWAYS }, + { i("magic staff"), 1, COMMON }, + { i("mithril spear"), 1, COMMON }, { i("mithril sword"), 1, COMMON }, - { i("steel arrow"), 30, COMMON }, { i("iron arrow"), 15, COMMON }, + { i("steel arrow"), 30, COMMON }, + { i("iron arrow"), 15, COMMON }, { i("adamant sword"), 1, RARE }, { i("black full helm"), 1, COMMON }, { i("black sq shield"), 1, COMMON }, { i("steel med helm"), 1, COMMON }, { i("steel kiteshield"), 1, UNCOMMON }, - { i("air rune"), 18, COMMON }, { i("cosmic rune"), 3, COMMON }, - { i("earth rune"), 27, COMMON }, { i("nature rune"), 6, COMMON }, + { i("air rune"), 18, COMMON }, + { i("cosmic rune"), 3, COMMON }, + { i("earth rune"), 27, COMMON }, + { i("nature rune"), 6, COMMON }, { i("law rune"), 2 + r(4), UNCOMMON }, - { i("blood rune"), 1, UNCOMMON }, { i("chaos rune"), 7, UNCOMMON }, + { i("blood rune"), 1, UNCOMMON }, + { i("chaos rune"), 7, UNCOMMON }, { i("death rune"), 1 + r(2), RARE }, { i("strawberry seed"), 1, COMMON }, { i("wildblood seed"), 1, COMMON }, @@ -836,28 +1255,46 @@ public class NPCDrops extends NPCDropsHandler { { i("toadflax seed"), 1, UNCOMMON }, { i("whiteberry seed"), 1, UNCOMMON }, { 5282, 1, UNCOMMON }, - { i("avantoe seed"), 1, RARE }, { i("cactus seed"), 1, RARE }, - { i("irit seed"), 1, RARE }, { i("kwuarm seed"), 1, RARE }, - { i("poison ivy seed"), 1, RARE }, { i("ranarr seed"), 1, RARE }, - { i("cadantine seed"), 1, RARE }, { i("lantadyme seed"), 1, RARE }, + { i("avantoe seed"), 1, RARE }, + { i("cactus seed"), 1, RARE }, + { i("irit seed"), 1, RARE }, + { i("kwuarm seed"), 1, RARE }, + { i("poison ivy seed"), 1, RARE }, + { i("ranarr seed"), 1, RARE }, + { i("cadantine seed"), 1, RARE }, + { i("lantadyme seed"), 1, RARE }, { i("watermelon seed"), 1, RARE }, - { i("dwarf weed seed"), 1, VERY_RARE }, { 205, 1, COMMON }, - { 201, 1, COMMON }, { 203, 1, COMMON }, { 199, 1, COMMON }, - { 211, 1, RARE }, { 215, 1, RARE }, { 217, 1, RARE }, - { 209, 1, RARE }, { 2485, 1, RARE }, { 207, 1, RARE }, - { 995, 2 + r(498), COMMON }, { i("steel bar"), 1, COMMON }, - { i("coal"), 1, UNCOMMON }, { i("spinach roll"), 1, UNCOMMON }, - { i("fire talisman"), 1, RARE } }; + { i("dwarf weed seed"), 1, VERY_RARE }, + { 205, 1, COMMON }, + { 201, 1, COMMON }, + { 203, 1, COMMON }, + { 199, 1, COMMON }, + { 211, 1, RARE }, + { 215, 1, RARE }, + { 217, 1, RARE }, + { 209, 1, RARE }, + { 2485, 1, RARE }, + { 207, 1, RARE }, + { 995, 2 + r(498), COMMON }, + { i("steel bar"), 1, COMMON }, + { i("coal"), 1, UNCOMMON }, + { i("spinach roll"), 1, UNCOMMON }, + { i("fire talisman"), 1, RARE }, + }; - public static final int[][] goblin = { { 526, 1, ALWAYS }, - { 995, 1 + r(23), COMMON }, { i("iron dagger"), 1, COMMON }, + public static final int[][] goblin = { + { 526, 1, ALWAYS }, + { 995, 1 + r(23), COMMON }, + { i("iron dagger"), 1, COMMON }, { i("bronze arrow"), 4 + r(16), COMMON }, { i("bronze med helm"), 1, COMMON }, { i("bronze sq shield"), 1, COMMON }, { i("air rune"), 2 + r(4), COMMON }, { i("body rune"), 2 + r(7), COMMON }, - { i("earth rune"), 4, COMMON }, { i("water rune"), 6, COMMON }, - { i("air talisman"), 1, COMMON }, { i("chef's hat"), 1, COMMON }, + { i("earth rune"), 4, COMMON }, + { i("water rune"), 6, COMMON }, + { i("air talisman"), 1, COMMON }, + { i("chef's hat"), 1, COMMON }, { i("goblin mail"), 1, COMMON }, { i("bronze full helm"), 1, UNCOMMON }, { i("bronze sword"), 1, UNCOMMON }, @@ -869,15 +1306,23 @@ public class NPCDrops extends NPCDropsHandler { { i("raw chicken"), 1, UNCOMMON }, { i("fire talisman"), 1, UNCOMMON }, { i("mind rune"), 2 + r(17), UNCOMMON }, - { i("earth talisman"), 1, UNCOMMON }, { i("bronze axe"), 1, RARE }, + { i("earth talisman"), 1, UNCOMMON }, + { i("bronze axe"), 1, RARE }, { i("bronze scimitar"), 1, RARE }, - { i("iron full helm"), 1, RARE }, { i("leather body"), 1, RARE }, - { i("cape"), 1, RARE }, { i("chaos rune"), 1, RARE }, - { i("nature rune"), 1, RARE }, { i("mind talisman"), 1, RARE }, - { 946, 1, RARE }, { i("tin ore"), 1, RARE } }; + { i("iron full helm"), 1, RARE }, + { i("leather body"), 1, RARE }, + { i("cape"), 1, RARE }, + { i("chaos rune"), 1, RARE }, + { i("nature rune"), 1, RARE }, + { i("mind talisman"), 1, RARE }, + { 946, 1, RARE }, + { i("tin ore"), 1, RARE }, + }; - public static final int[][] lesserdemon = { { i("ashes"), 1, ALWAYS }, - { 995, 10 + r(640), COMMON }, { i("steel axe"), 1, COMMON }, + public static final int[][] lesserdemon = { + { i("ashes"), 1, ALWAYS }, + { 995, 10 + r(640), COMMON }, + { i("steel axe"), 1, COMMON }, { i("steel scimitar"), 1, COMMON }, { i("steel full helm"), 1, COMMON }, { i("black 2h sword"), 1, COMMON }, @@ -885,12 +1330,15 @@ public class NPCDrops extends NPCDropsHandler { { i("mithril chainbody"), 1, UNCOMMON }, { i("fire rune"), 6 + r(114), UNCOMMON }, { i("chaos rune"), 7 + r(17), UNCOMMON }, - { 445, 2 + r(2), UNCOMMON }, { i("jug of wine"), 1, UNCOMMON }, + { 445, 2 + r(2), UNCOMMON }, + { i("jug of wine"), 1, UNCOMMON }, { i("death rune"), 3 + r(3), RARE }, { i("black kiteshield"), 1, RARE }, - { i("rune med helm"), 1, VERY_RARE } }; + { i("rune med helm"), 1, VERY_RARE }, + }; - public static final int[][] greaterdemon = { { i("steel axe"), 1, COMMON }, + public static final int[][] greaterdemon = { + { i("steel axe"), 1, COMMON }, { i("steel battleaxe"), 1, COMMON }, { i("steel 2h sword"), 1, COMMON }, { i("mithril kitesiheld"), 1, UNCOMMON }, @@ -898,54 +1346,88 @@ public class NPCDrops extends NPCDropsHandler { { i("rune full helm"), 1, RARE }, { i("adamant platelegs"), 1, RARE }, { i("adamant 2h sword"), 1, VERY_RARE }, - { 995, 9 + r(621), COMMON }, { i("fire rune"), 75, COMMON }, - { i("chaos rune"), 15, COMMON }, { i("death rune"), 5, COMMON }, - { i("thread"), 10, UNCOMMON }, { i("tuna"), 1, UNCOMMON }, - { i("gold bar"), 1, UNCOMMON }, { i("ashes"), 1, ALWAYS } }; + { 995, 9 + r(621), COMMON }, + { i("fire rune"), 75, COMMON }, + { i("chaos rune"), 15, COMMON }, + { i("death rune"), 5, COMMON }, + { i("thread"), 10, UNCOMMON }, + { i("tuna"), 1, UNCOMMON }, + { i("gold bar"), 1, UNCOMMON }, + { i("ashes"), 1, ALWAYS }, + }; - public static final int[][] guard = { { i("bones"), 1, ALWAYS }, - { 995, 1 + r(24), COMMON }, { i("grapes"), 1, COMMON }, + public static final int[][] guard = { + { i("bones"), 1, ALWAYS }, + { 995, 1 + r(24), COMMON }, + { i("grapes"), 1, COMMON }, { i("air rune"), 6, COMMON }, { i("earth rune"), 3 + r(3), COMMON }, - { i("fire rune"), 2, COMMON }, { i("body talisman"), 1, COMMON }, - { i("iron dagger"), 1, COMMON }, { i("law talisman"), 1, RARE }, + { i("fire rune"), 2, COMMON }, + { i("body talisman"), 1, COMMON }, + { i("iron dagger"), 1, COMMON }, + { i("law talisman"), 1, RARE }, { i("iron arrow"), 1 + r(2), COMMON }, { i("bronze arrow"), 1 + r(4), UNCOMMON }, { i("steel arrow"), 1 + r(10), UNCOMMON }, - { i("law rune"), 2, RARE }, { i("nature rune"), 1, RARE }, + { i("law rune"), 2, RARE }, + { i("nature rune"), 1, RARE }, { i("chaos rune"), 1 + r(1), RARE }, - { i("steel warhammer"), 1, RARE }, { 1947, 1 + r(3), RARE }, - { i("iron ore"), 1, RARE }, { i("iron platebody"), 1, RARE }, + { i("steel warhammer"), 1, RARE }, + { 1947, 1 + r(3), RARE }, + { i("iron ore"), 1, RARE }, + { i("iron platebody"), 1, RARE }, { i("steel bar"), 1, RARE }, { i("potato seed"), 4 + r(2), COMMON }, - { i("onion seed"), 4, COMMON }, { i("cabbage seed"), 4, UNCOMMON }, + { i("onion seed"), 4, COMMON }, + { i("cabbage seed"), 4, UNCOMMON }, { i("tomato seed"), 3 + r(1), UNCOMMON }, { i("strawberry seed"), 1 + r(3), RARE }, - { i("watermelon seed"), 2 + r(2), RARE }, { 199, 1, RARE } }; + { i("watermelon seed"), 2 + r(2), RARE }, + { 199, 1, RARE }, + }; - public static final int[][] alkharidwarrior = { { i("bones"), 1, ALWAYS }, - { i("air rune"), 5, UNCOMMON }, { i("mind rune"), 9, COMMON }, - { i("fire rune"), 6, COMMON }, { i("earth rune"), 4, COMMON }, - { i("chaos rune"), 2, RARE }, { i("law rune"), 1, VERY_RARE }, + public static final int[][] alkharidwarrior = { + { i("bones"), 1, ALWAYS }, + { i("air rune"), 5, UNCOMMON }, + { i("mind rune"), 9, COMMON }, + { i("fire rune"), 6, COMMON }, + { i("earth rune"), 4, COMMON }, + { i("chaos rune"), 2, RARE }, + { i("law rune"), 1, VERY_RARE }, { i("bronze med helm"), 1, COMMON }, { i("bronze arrow"), 7, COMMON }, { i("iron dagger"), 1, UNCOMMON }, { i("iron med helm"), 1, UNCOMMON }, - { i("staff of air"), 1, UNCOMMON }, { 199, 1, COMMON }, - { 201, 1, COMMON }, { 203, 1, UNCOMMON }, { 205, 1, UNCOMMON }, - { 207, 1, UNCOMMON }, { 209, 1, UNCOMMON }, { 211, 1, UNCOMMON }, - { 213, 1, UNCOMMON }, { 215, 1, UNCOMMON }, { 2485, 1, UNCOMMON }, - { 217, 1, UNCOMMON } }; + { i("staff of air"), 1, UNCOMMON }, + { 199, 1, COMMON }, + { 201, 1, COMMON }, + { 203, 1, UNCOMMON }, + { 205, 1, UNCOMMON }, + { 207, 1, UNCOMMON }, + { 209, 1, UNCOMMON }, + { 211, 1, UNCOMMON }, + { 213, 1, UNCOMMON }, + { 215, 1, UNCOMMON }, + { 2485, 1, UNCOMMON }, + { 217, 1, UNCOMMON }, + }; - public static final int[][] icewarrior = { { i("bones"), 1, ALWAYS }, - { 995, 1 + r(14), COMMON }, { i("iron battleaxe"), 1, COMMON }, - { i("mithril arrow"), 3, COMMON }, { i("cosmic rune"), 2, COMMON }, - { i("chaos rune"), 3, COMMON }, { i("nature rune"), 4, COMMON }, - { i("law rune"), 2, COMMON }, { i("mithril mace"), 1, UNCOMMON }, + public static final int[][] icewarrior = { + { i("bones"), 1, ALWAYS }, + { 995, 1 + r(14), COMMON }, + { i("iron battleaxe"), 1, COMMON }, + { i("mithril arrow"), 3, COMMON }, + { i("cosmic rune"), 2, COMMON }, + { i("chaos rune"), 3, COMMON }, + { i("nature rune"), 4, COMMON }, + { i("law rune"), 2, COMMON }, + { i("mithril mace"), 1, UNCOMMON }, { i("adamant arrow"), 2, UNCOMMON }, { i("tarromin seed"), 1, COMMON }, - { i("death rune"), 2, UNCOMMON }, { i("mind rune"), 24, RARE }, - { i("mithril ore"), 1, RARE }, { i("guam seed"), 1, COMMON }, + { i("death rune"), 2, UNCOMMON }, + { i("mind rune"), 24, RARE }, + { i("mithril ore"), 1, RARE }, + { i("guam seed"), 1, COMMON }, { i("iron 2h sword"), 1, UNCOMMON }, { i("harralander seed"), 1, COMMON }, { i("steel sword"), 1, VERY_RARE }, @@ -961,33 +1443,59 @@ public class NPCDrops extends NPCDropsHandler { { i("bittecape mushroom spore"), 1, UNCOMMON }, { i("irit seed"), 1, UNCOMMON }, { i("avantoe seed"), 1, UNCOMMON }, - { i("dwarf weed seed"), 1, RARE }, { i("toadflax seed"), 1, RARE }, - { i("ranarr seed"), 1, RARE }, { i("whiteberry seed"), 1, RARE }, - { i("poison ivy seed"), 1, RARE }, { i("kwuarm seed"), 1, RARE }, - { i("cactus seed"), 1, RARE }, { i("watermelon seed"), 1, RARE }, + { i("dwarf weed seed"), 1, RARE }, + { i("toadflax seed"), 1, RARE }, + { i("ranarr seed"), 1, RARE }, + { i("whiteberry seed"), 1, RARE }, + { i("poison ivy seed"), 1, RARE }, + { i("kwuarm seed"), 1, RARE }, + { i("cactus seed"), 1, RARE }, + { i("watermelon seed"), 1, RARE }, { i("belladonna seed"), 1, VERY_RARE }, - { i("lantadyme seed"), 1, VERY_RARE }, { 199, 1, COMMON }, - { 201, 1, COMMON }, { 203, 1, COMMON }, { 205, 1, COMMON }, - { 207, 1, UNCOMMON }, { 209, 1, UNCOMMON }, { 211, 1, UNCOMMON }, - { 213, 1, RARE }, { 215, 1, RARE }, { 217, 1, RARE }, - { 2485, 1, RARE } }; + { i("lantadyme seed"), 1, VERY_RARE }, + { 199, 1, COMMON }, + { 201, 1, COMMON }, + { 203, 1, COMMON }, + { 205, 1, COMMON }, + { 207, 1, UNCOMMON }, + { 209, 1, UNCOMMON }, + { 211, 1, UNCOMMON }, + { 213, 1, RARE }, + { 215, 1, RARE }, + { 217, 1, RARE }, + { 2485, 1, RARE }, + }; - public static final int[][] blackknight = { { 526, 1, ALWAYS }, { 291, 1, ALWAYS }, - { i("iron sword"), 1, COMMON }, { i("iron full helm"), 1, COMMON }, - { i("steel mace"), 1, COMMON }, { i("black full helm"), 1, RARE }, + public static final int[][] blackknight = { + { 526, 1, ALWAYS }, + { 291, 1, ALWAYS }, + { i("iron sword"), 1, COMMON }, + { i("iron full helm"), 1, COMMON }, + { i("steel mace"), 1, COMMON }, + { i("black full helm"), 1, RARE }, { i("mithril arrow"), 3, UNCOMMON }, - { i("black 2h sword"), 1, RARE }, { i("black sword"), 1, RARE }, + { i("black 2h sword"), 1, RARE }, + { i("black sword"), 1, RARE }, { i("mind rune"), 2 + r(7), UNCOMMON }, - { i("earth rune"), 10, UNCOMMON }, { i("body rune"), 9, UNCOMMON }, + { i("earth rune"), 10, UNCOMMON }, + { i("body rune"), 9, UNCOMMON }, { i("cosmic rune"), 7, UNCOMMON }, { i("chaos rune"), 4 + r(2), UNCOMMON }, { i("death rune"), 2, UNCOMMON }, { i("law rune"), 2 + r(2), UNCOMMON }, - { i("nature rune"), 6, RARE }, { 199, 1, COMMON }, - { 201, 1, COMMON }, { 203, 1, COMMON }, { 205, 1, COMMON }, - { 207, 1, UNCOMMON }, { 209, 1, UNCOMMON }, { 211, 1, UNCOMMON }, - { 213, 1, UNCOMMON }, { 215, 1, UNCOMMON }, { 2485, 1, UNCOMMON }, - { 217, 1, UNCOMMON } }; + { i("nature rune"), 6, RARE }, + { 199, 1, COMMON }, + { 201, 1, COMMON }, + { 203, 1, COMMON }, + { 205, 1, COMMON }, + { 207, 1, UNCOMMON }, + { 209, 1, UNCOMMON }, + { 211, 1, UNCOMMON }, + { 213, 1, UNCOMMON }, + { 215, 1, UNCOMMON }, + { 2485, 1, UNCOMMON }, + { 217, 1, UNCOMMON }, + }; public static final int[][] whiteknight = { { 526, 1, ALWAYS }, @@ -1003,62 +1511,100 @@ public class NPCDrops extends NPCDropsHandler { { i("mithril arrow"), 5 + r(4), COMMON }, { i("adamant arrow"), 2 + r(5), UNCOMMON }, { i("steel med helm"), 1, COMMON }, - { i("potato seed"), 4, COMMON }, { i("tomato seed"), 3, COMMON }, - { i("cabbage seed"), 4, COMMON }, { i("onion seed"), 4, COMMON }, + { i("potato seed"), 4, COMMON }, + { i("tomato seed"), 3, COMMON }, + { i("cabbage seed"), 4, COMMON }, + { i("onion seed"), 4, COMMON }, { i("sweetcorn seed"), 3, UNCOMMON }, { i("watermelon seed"), 2, UNCOMMON }, - { i("strawberry seed"), 2, RARE }, { 995, 1 + r(199), COMMON }, - { i("pot of flour"), 1, RARE }, { 2335, 1, UNCOMMON }, + { i("strawberry seed"), 2, RARE }, + { 995, 1 + r(199), COMMON }, + { i("pot of flour"), 1, RARE }, + { 2335, 1, UNCOMMON }, { i("iron ore"), 1, UNCOMMON }, - { i("iron bar"), 1 + r(1), COMMON }, { 199, 1, UNCOMMON }, - { 201, 1, UNCOMMON }, { 203, 1, UNCOMMON }, { 205, 1, UNCOMMON }, - { 207, 1, UNCOMMON }, { 209, 1, RARE }, { 211, 1, RARE }, - { 213, 1, RARE }, { 215, 1, RARE }, { 2485, 1, RARE }, - { 217, 1, RARE } }; + { i("iron bar"), 1 + r(1), COMMON }, + { 199, 1, UNCOMMON }, + { 201, 1, UNCOMMON }, + { 203, 1, UNCOMMON }, + { 205, 1, UNCOMMON }, + { 207, 1, UNCOMMON }, + { 209, 1, RARE }, + { 211, 1, RARE }, + { 213, 1, RARE }, + { 215, 1, RARE }, + { 2485, 1, RARE }, + { 217, 1, RARE }, + }; - public static final int[][] icegiant = { { i("big bones"), 1, ALWAYS }, + public static final int[][] icegiant = { + { i("big bones"), 1, ALWAYS }, { i("iron battleaxe"), 1, COMMON }, { i("iron platelegs"), 1, COMMON }, - { i("iron 2h sword"), 1, COMMON }, { i("steel axe"), 1, COMMON }, + { i("iron 2h sword"), 1, COMMON }, + { i("steel axe"), 1, COMMON }, { i("steel sword"), 1, COMMON }, { i("black kiteshield"), 1, COMMON }, - { i("water rune"), 12, COMMON }, { i("mind rune"), 24, COMMON }, + { i("water rune"), 12, COMMON }, + { i("mind rune"), 24, COMMON }, { i("body rune"), 37, COMMON }, { i("cosmic rune"), 2 + r(2), COMMON }, - { 995, 8 + r(446), COMMON }, { i("adamant arrow"), 5, UNCOMMON }, - { i("law rune"), 3, UNCOMMON }, { i("nature rune"), 6, UNCOMMON }, - { i("banana"), 1, UNCOMMON }, { i("jug of wine"), 1, UNCOMMON }, + { 995, 8 + r(446), COMMON }, + { i("adamant arrow"), 5, UNCOMMON }, + { i("law rune"), 3, UNCOMMON }, + { i("nature rune"), 6, UNCOMMON }, + { i("banana"), 1, UNCOMMON }, + { i("jug of wine"), 1, UNCOMMON }, { i("mithril ore"), 1, UNCOMMON }, { i("mithril sq shield"), 1, RARE }, - { i("mithril mace"), 1, RARE }, { i("death rune"), 2 + r(2), RARE } }; + { i("mithril mace"), 1, RARE }, + { i("death rune"), 2 + r(2), RARE }, + }; - public static final int[][] hobgoblin = { { i("bones"), 1, ALWAYS }, - { 995, 1 + r(70), COMMON }, { i("iron sword"), 1, COMMON }, + public static final int[][] hobgoblin = { + { i("bones"), 1, ALWAYS }, + { 995, 1 + r(70), COMMON }, + { i("iron sword"), 1, COMMON }, { i("iron longsword"), 1, UNCOMMON }, { i("steel longsword"), 1, UNCOMMON }, { i("steel dagger"), 1, UNCOMMON }, { i("limpwurt root"), 1, 2 + r(18) }, - { i("water rune"), 2, UNCOMMON }, { i("body rune"), 6, UNCOMMON }, - { i("fire rune"), 7, UNCOMMON }, { i("cosmic rune"), 2, UNCOMMON }, + { i("water rune"), 2, UNCOMMON }, + { i("body rune"), 6, UNCOMMON }, + { i("fire rune"), 7, UNCOMMON }, + { i("cosmic rune"), 2, UNCOMMON }, { i("chaos rune"), 3, UNCOMMON }, - { i("nature rune"), 4, UNCOMMON }, { i("law rune"), 2, UNCOMMON } }; + { i("nature rune"), 4, UNCOMMON }, + { i("law rune"), 2, UNCOMMON }, + }; - public static final int[][] pirate = { { i("bones"), 1, ALWAYS }, - { i("air rune"), 10, COMMON }, { i("earth rune"), 9, COMMON }, - { i("fire rune"), 5, COMMON }, { i("chaos rune"), 2, COMMON }, - { i("nature rune"), 2, COMMON }, { i("law rune"), 2, RARE }, + public static final int[][] pirate = { + { i("bones"), 1, ALWAYS }, + { i("air rune"), 10, COMMON }, + { i("earth rune"), 9, COMMON }, + { i("fire rune"), 5, COMMON }, + { i("chaos rune"), 2, COMMON }, + { i("nature rune"), 2, COMMON }, + { i("law rune"), 2, RARE }, { i("bronze scimitar"), 1, COMMON }, { i("bronze arrow"), 9 + r(3), COMMON }, { i("iron dagger"), 1, COMMON }, - { i("staff of air"), 1, UNCOMMON }, { 995, 4 + r(51), COMMON }, - { i("iron bar"), 1, RARE }, { i("chef's hat"), 1, RARE }, - { i("limpwurt root"), 1, RARE }, { i("tinderbox"), 1, RARE }, + { i("staff of air"), 1, UNCOMMON }, + { 995, 4 + r(51), COMMON }, + { i("iron bar"), 1, RARE }, + { i("chef's hat"), 1, RARE }, + { i("limpwurt root"), 1, RARE }, + { i("tinderbox"), 1, RARE }, { i("iron platebody"), 1, VERY_RARE }, - { i("eye patch"), 1, COMMON }, { i("knife"), 1, RARE } }; + { i("eye patch"), 1, COMMON }, + { i("knife"), 1, RARE }, + }; - public static final int[][] zombie = { { i("bones"), 1, ALWAYS }, - { 995, 1 + r(25), COMMON }, { i("fishing bait"), 7, COMMON }, - { i("bronze axe"), 1, UNCOMMON }, { i("iron axe"), 1, UNCOMMON }, + public static final int[][] zombie = { + { i("bones"), 1, ALWAYS }, + { 995, 1 + r(25), COMMON }, + { i("fishing bait"), 7, COMMON }, + { i("bronze axe"), 1, UNCOMMON }, + { i("iron axe"), 1, UNCOMMON }, { i("bronze med helm"), 1, UNCOMMON }, { i("iron mace"), 1, UNCOMMON }, { i("bronze kiteshield"), 1, UNCOMMON }, @@ -1066,54 +1612,83 @@ public class NPCDrops extends NPCDropsHandler { { i("iron dagger"), 1, UNCOMMON }, { i("steel arrow"), 5 + r(27), UNCOMMON }, { i("mithril arrow"), 2, UNCOMMON }, - { i("chaos rune"), 4, UNCOMMON }, { i("air rune"), 3, UNCOMMON }, - { i("fire rune"), 7, UNCOMMON }, { i("mind rune"), 5, UNCOMMON }, + { i("chaos rune"), 4, UNCOMMON }, + { i("air rune"), 3, UNCOMMON }, + { i("fire rune"), 7, UNCOMMON }, + { i("mind rune"), 5, UNCOMMON }, { i("body rune"), 3 + r(5), UNCOMMON }, - { i("nature rune"), 5, UNCOMMON }, { i("law rune"), 3, UNCOMMON }, - { i("cosmic rune"), 2, UNCOMMON }, { i("tinderbox"), 1, UNCOMMON }, - { i("copper ore"), 1, UNCOMMON }, { i("iron ore"), 1, UNCOMMON }, - { i("tin ore"), 1, UNCOMMON }, { i("eye of newt"), 1, UNCOMMON }, - { i("ashes"), 1, UNCOMMON }, { i("half a meat pie"), 1, VERY_RARE } }; - - public static final int[][] skeleton = { { i("bones"), 1, ALWAYS }, - { i("iron dagger"), 1, COMMON }, { i("iron med helm"), 1, COMMON }, - { i("air rune"), 12, COMMON }, { i("water rune"), 5, COMMON }, - { i("earth rune"), 3, COMMON }, { i("fire rune"), 2, COMMON }, - { i("mind rune"), 1 + r(24), COMMON }, { 995, 10, COMMON }, - { i("bronze arrow"), 1 + r(10), COMMON }, - { i("iron mace"), 1, COMMON }, { i("iron axe"), 1, UNCOMMON }, + { i("nature rune"), 5, UNCOMMON }, + { i("law rune"), 3, UNCOMMON }, { i("cosmic rune"), 2, UNCOMMON }, - { i("iron arrow"), 5, UNCOMMON }, { i("iron sword"), 1, UNCOMMON }, + { i("tinderbox"), 1, UNCOMMON }, + { i("copper ore"), 1, UNCOMMON }, + { i("iron ore"), 1, UNCOMMON }, + { i("tin ore"), 1, UNCOMMON }, + { i("eye of newt"), 1, UNCOMMON }, + { i("ashes"), 1, UNCOMMON }, + { i("half a meat pie"), 1, VERY_RARE }, + }; + + public static final int[][] skeleton = { + { i("bones"), 1, ALWAYS }, + { i("iron dagger"), 1, COMMON }, + { i("iron med helm"), 1, COMMON }, + { i("air rune"), 12, COMMON }, + { i("water rune"), 5, COMMON }, + { i("earth rune"), 3, COMMON }, + { i("fire rune"), 2, COMMON }, + { i("mind rune"), 1 + r(24), COMMON }, + { 995, 10, COMMON }, + { i("bronze arrow"), 1 + r(10), COMMON }, + { i("iron mace"), 1, COMMON }, + { i("iron axe"), 1, UNCOMMON }, + { i("cosmic rune"), 2, UNCOMMON }, + { i("iron arrow"), 5, UNCOMMON }, + { i("iron sword"), 1, UNCOMMON }, { i("chaos rune"), 4, UNCOMMON }, { i("nature rune"), 1 + r(2), UNCOMMON }, - { i("iron sword"), 1, UNCOMMON }, { i("law rune"), 2, UNCOMMON }, - { i("bucket"), 1, UNCOMMON }, { 1947, 1, UNCOMMON }, - { i("iron ore"), 1, UNCOMMON }, { i("bronze bar"), 1, UNCOMMON }, - { i("iron scimitar"), 1, RARE }, { i("steel arrow"), 1, RARE }, + { i("iron sword"), 1, UNCOMMON }, + { i("law rune"), 2, UNCOMMON }, + { i("bucket"), 1, UNCOMMON }, + { 1947, 1, UNCOMMON }, + { i("iron ore"), 1, UNCOMMON }, + { i("bronze bar"), 1, UNCOMMON }, + { i("iron scimitar"), 1, RARE }, + { i("steel arrow"), 1, RARE }, { i("fire talisman"), 1, RARE }, { i("adamant kiteshield"), 1, VERY_RARE }, }; - public static final int[][] hillgiant = { { i("big bones"), 1, ALWAYS }, - { i("limpwurt root"), 1, 2 + r(23) }, { i("beer"), 1, COMMON }, - { i("iron arrow"), 3, COMMON }, { i("iron full helm"), 1, COMMON }, - { i("water rune"), 7, COMMON }, { 995, 8 + r(15), COMMON }, + public static final int[][] hillgiant = { + { i("big bones"), 1, ALWAYS }, + { i("limpwurt root"), 1, 2 + r(23) }, + { i("beer"), 1, COMMON }, + { i("iron arrow"), 3, COMMON }, + { i("iron full helm"), 1, COMMON }, + { i("water rune"), 7, COMMON }, + { 995, 8 + r(15), COMMON }, { i("body talisman"), 1, UNCOMMON }, { i("fire rune"), 15, UNCOMMON }, { i("law rune"), 1 + r(2), UNCOMMON }, - { i("nature rune"), 6, UNCOMMON }, { i("mind rune"), 3, UNCOMMON }, + { i("nature rune"), 6, UNCOMMON }, + { i("mind rune"), 3, UNCOMMON }, { i("steel longsword"), 1, UNCOMMON }, { i("steel arrow"), 10 + r(5), UNCOMMON }, { i("iron kiteshield"), 1, UNCOMMON }, - { i("iron 2h sword"), 1, RARE }, { i("mithril arrow"), 1, RARE }, - { i("steel dagger"), 1, RARE }, { i("death rune"), 2, RARE }, + { i("iron 2h sword"), 1, RARE }, + { i("mithril arrow"), 1, RARE }, + { i("steel dagger"), 1, RARE }, + { i("death rune"), 2, RARE }, { i("chaos rune"), 2, RARE }, { i("steel platebody"), 1, VERY_RARE }, { i("adamant arrow"), 1 + r(4), VERY_RARE }, }; - public static final int[][] deadlyredspider = { { i("red spiders' eggs"), - 1, UNCOMMON } }; + public static final int[][] deadlyredspider = { + { i("red spiders' eggs"), + 1, UNCOMMON }, + }; - public static final int[][] reddragon = { { i("dragon bones"), 1, ALWAYS }, + public static final int[][] reddragon = { + { i("dragon bones"), 1, ALWAYS }, { i("red dragonhide"), 1, ALWAYS }, { i("mithril 2h sword"), 1, COMMON }, { i("mithril javelin"), 1, COMMON }, @@ -1121,58 +1696,94 @@ public class NPCDrops extends NPCDropsHandler { { i("mithril kiteshield"), 1, UNCOMMON }, { i("adamant platebody"), 1, UNCOMMON }, { i("mithril battleaxe"), 1, UNCOMMON }, - { i("rune arrow"), 4, UNCOMMON }, { i("rune dart"), 8, UNCOMMON }, + { i("rune arrow"), 4, UNCOMMON }, + { i("rune dart"), 8, UNCOMMON }, { i("rune longsword"), 1, UNCOMMON }, - { i("law rune"), 4, UNCOMMON }, { i("death rune"), 5, UNCOMMON }, - { i("blood rune"), 2, UNCOMMON }, { 199, 1, COMMON }, - { 201, 1, COMMON }, { 203, 1, COMMON }, { 205, 1, COMMON }, - { 207, 1, UNCOMMON }, { 209, 1, UNCOMMON }, { 211, 1, UNCOMMON }, - { 213, 1, UNCOMMON }, { 215, 1, UNCOMMON }, { 2485, 1, UNCOMMON }, - { 217, 1, UNCOMMON }, { 995, 30 + r(630), COMMON }, + { i("law rune"), 4, UNCOMMON }, + { i("death rune"), 5, UNCOMMON }, + { i("blood rune"), 2, UNCOMMON }, + { 199, 1, COMMON }, + { 201, 1, COMMON }, + { 203, 1, COMMON }, + { 205, 1, COMMON }, + { 207, 1, UNCOMMON }, + { 209, 1, UNCOMMON }, + { 211, 1, UNCOMMON }, + { 213, 1, UNCOMMON }, + { 215, 1, UNCOMMON }, + { 2485, 1, UNCOMMON }, + { 217, 1, UNCOMMON }, + { 995, 30 + r(630), COMMON }, { i("chocolate cake"), 3, UNCOMMON }, - { i("adamant bar"), 1, UNCOMMON } }; + { i("adamant bar"), 1, UNCOMMON }, + }; - public static final int[][] rat = { { i("bones"), 1, ALWAYS }}; + public static final int[][] rat = { + { i("bones"), 1, ALWAYS } }; - public static final int[][] cow = { { i("bones"), 1, ALWAYS }, - { i("cowhide"), 1, ALWAYS }, { i("raw beef"), 1, ALWAYS }, }; + public static final int[][] cow = { + { i("bones"), 1, ALWAYS }, + { i("cowhide"), 1, ALWAYS }, + { i("raw beef"), 1, ALWAYS }, }; - public static final int[][] chicken = { { i("bones"), 1, ALWAYS }, + public static final int[][] chicken = { + { i("bones"), 1, ALWAYS }, { i("feather"), 5 + r(10), ALWAYS }, - { i("raw chicken"), 1, ALWAYS }, { i("egg"), 1, UNCOMMON }, }; + { i("raw chicken"), 1, ALWAYS }, + { i("egg"), 1, UNCOMMON }, }; - public static final int[][] rockcrab = { { 207, 1, RARE }, - { 211, 1, RARE }, { i("tarromin seed"), 1, RARE }, - { i("ranarr seed"), 1, RARE }, { i("irit seed"), 1, VERY_RARE }, + public static final int[][] rockcrab = { + { 207, 1, RARE }, + { 211, 1, RARE }, + { i("tarromin seed"), 1, RARE }, + { i("ranarr seed"), 1, RARE }, + { i("irit seed"), 1, VERY_RARE }, { i("bronze pickaxe"), 1, COMMON }, - { i("iron pickaxe"), 1, COMMON }, { i("bronze axe"), 1, UNCOMMON }, - { i("fire rune"), 7, COMMON }, { i("nature rune"), 4, UNCOMMON }, - { i("chaos rune"), 1, RARE }, { i("cosmic talisman"), 1, RARE }, - { 995, 3 + r(495), COMMON }, { i("oyster"), 1 + r(1), COMMON }, - { 402, 1 + r(4), COMMON }, { i("edible seaweed"), 2, RARE }, - { i("oyster pearl"), 1, COMMON }, { i("empty oyster"), 1, COMMON }, - { i("spinach roll"), 1, UNCOMMON }, { i("knife"), 1, UNCOMMON }, - { i("iron ore"), 1, UNCOMMON }, { i("coal"), 2, UNCOMMON }, - { i("copper ore"), 3, UNCOMMON }, { i("tin ore"), 3, UNCOMMON }, + { i("iron pickaxe"), 1, COMMON }, + { i("bronze axe"), 1, UNCOMMON }, + { i("fire rune"), 7, COMMON }, + { i("nature rune"), 4, UNCOMMON }, + { i("chaos rune"), 1, RARE }, + { i("cosmic talisman"), 1, RARE }, + { 995, 3 + r(495), COMMON }, + { i("oyster"), 1 + r(1), COMMON }, + { 402, 1 + r(4), COMMON }, + { i("edible seaweed"), 2, RARE }, + { i("oyster pearl"), 1, COMMON }, + { i("empty oyster"), 1, COMMON }, + { i("spinach roll"), 1, UNCOMMON }, + { i("knife"), 1, UNCOMMON }, + { i("iron ore"), 1, UNCOMMON }, + { i("coal"), 2, UNCOMMON }, + { i("copper ore"), 3, UNCOMMON }, + { i("tin ore"), 3, UNCOMMON }, { i("fishing bait"), 1 + r(9), UNCOMMON }, - { 45, 5, UNCOMMON }, { i("limpwurt root"), 1, RARE } }; + { 45, 5, UNCOMMON }, + { i("limpwurt root"), 1, RARE }, + }; public static final int[][] kingblackdragon = { { i("dragon bones"), 1, ALWAYS }, { i("black dragonhide"), 1, ALWAYS }, { i("rune longsword"), 1, UNCOMMON }, { i("rune battleaxe"), 1, UNCOMMON }, - { i("blood rune"), 50, COMMON }, { i("death rune"), 50, COMMON }, + { i("blood rune"), 50, COMMON }, + { i("death rune"), 50, COMMON }, { i("law rune"), 50, UNCOMMON }, { i("mithril arrow"), 250, UNCOMMON }, { i("rune arrow"), 50, UNCOMMON }, { i("rune sq shield"), 1, UNCOMMON }, { i("rune platebody"), 1, UNCOMMON }, - { i("dragon med helm"), 1, RARE }, { 2361, 1 + r(4), UNCOMMON }, - { 2363, 1 + r(1), UNCOMMON }, { 443, 100, UNCOMMON }, - { 445, 50, UNCOMMON }, { 453, 3, UNCOMMON }, - { 995, 1000 + r(2000), COMMON }, { 1516, 50, COMMON }, - { 1514, 10, COMMON } }; + { i("dragon med helm"), 1, RARE }, + { 2361, 1 + r(4), UNCOMMON }, + { 2363, 1 + r(1), UNCOMMON }, + { 443, 100, UNCOMMON }, + { 445, 50, UNCOMMON }, + { 453, 3, UNCOMMON }, + { 995, 1000 + r(2000), COMMON }, + { 1516, 50, COMMON }, + { 1514, 10, COMMON }, + }; public static final int[][] greendragon = { { i("dragon bones"), 1, ALWAYS }, @@ -1187,12 +1798,23 @@ public class NPCDrops extends NPCDropsHandler { { i("water rune"), 75 + r(75), COMMON }, { i("fire rune"), 37, COMMON }, { i("nature rune"), 15 + r(60), COMMON }, - { i("law rune"), 3, COMMON }, { 995, 11 + r(429), COMMON }, - { i("bass"), 1, COMMON }, { i("adamantite ore"), 1, UNCOMMON }, - { 209, 1, COMMON }, { 205, 1, COMMON }, { 199, 1, UNCOMMON }, - { 211, 1, UNCOMMON }, { 215, 1, UNCOMMON }, { 201, 1, UNCOMMON }, - { 203, 1, UNCOMMON }, { 207, 1, UNCOMMON }, { 213, 1, UNCOMMON }, - { 2485, 1, UNCOMMON }, { 217, 1, UNCOMMON }, { i("nature talisman"), 1, RARE} }; + { i("law rune"), 3, COMMON }, + { 995, 11 + r(429), COMMON }, + { i("bass"), 1, COMMON }, + { i("adamantite ore"), 1, UNCOMMON }, + { 209, 1, COMMON }, + { 205, 1, COMMON }, + { 199, 1, UNCOMMON }, + { 211, 1, UNCOMMON }, + { 215, 1, UNCOMMON }, + { 201, 1, UNCOMMON }, + { 203, 1, UNCOMMON }, + { 207, 1, UNCOMMON }, + { 213, 1, UNCOMMON }, + { 2485, 1, UNCOMMON }, + { 217, 1, UNCOMMON }, + { i("nature talisman"), 1, RARE }, + }; public static final int[][] bluedragon = { { i("dragon bones"), 1, ALWAYS }, @@ -1204,61 +1826,101 @@ public class NPCDrops extends NPCDropsHandler { { i("mithril axe"), 1, COMMON }, { i("mithril spear"), 1, UNCOMMON }, { i("adamant dagger"), 1, UNCOMMON }, - { i("rune dagger"), 1, RARE }, { i("water rune"), 75, COMMON }, + { i("rune dagger"), 1, RARE }, + { i("water rune"), 75, COMMON }, { i("fire rune"), 37, UNCOMMON }, - { i("nature rune"), 15, UNCOMMON }, { i("law rune"), 3, UNCOMMON }, - { i("death rune"), 5, VERY_RARE }, { 995, 11 + r(443), COMMON }, - { i("bass"), 1, COMMON }, { i("adamantite ore"), 1, UNCOMMON }, - { 199, 1, COMMON }, { 201, 1, COMMON }, { 203, 1, COMMON }, - { 205, 1, COMMON }, { 207, 1, UNCOMMON }, { 211, 1, UNCOMMON }, - { 213, 1, UNCOMMON }, { 215, 1, UNCOMMON }, { 2485, 1, UNCOMMON }, - { 217, 1, RARE } }; + { i("nature rune"), 15, UNCOMMON }, + { i("law rune"), 3, UNCOMMON }, + { i("death rune"), 5, VERY_RARE }, + { 995, 11 + r(443), COMMON }, + { i("bass"), 1, COMMON }, + { i("adamantite ore"), 1, UNCOMMON }, + { 199, 1, COMMON }, + { 201, 1, COMMON }, + { 203, 1, COMMON }, + { 205, 1, COMMON }, + { 207, 1, UNCOMMON }, + { 211, 1, UNCOMMON }, + { 213, 1, UNCOMMON }, + { 215, 1, UNCOMMON }, + { 2485, 1, UNCOMMON }, + { 217, 1, RARE }, + }; public static final int[][] kalphiteworker = { - { i("water rune"), 2, UNCOMMON }, { i("fire rune"), 7, UNCOMMON }, - { i("body rune"), 6, UNCOMMON }, { i("cosmic rune"), 2, UNCOMMON }, + { i("water rune"), 2, UNCOMMON }, + { i("fire rune"), 7, UNCOMMON }, + { i("body rune"), 6, UNCOMMON }, + { i("cosmic rune"), 2, UNCOMMON }, { i("chaos rune"), 3, UNCOMMON }, - { i("nature rune"), 4, UNCOMMON }, { i("law rune"), 2, UNCOMMON }, + { i("nature rune"), 4, UNCOMMON }, + { i("law rune"), 2, UNCOMMON }, { i("blood rune"), 1, VERY_RARE }, { i("hard leather body"), 1, UNCOMMON }, { i("iron sword"), 1, UNCOMMON }, { i("iron dagger"), 1, UNCOMMON }, { i("steel dagger"), 1, UNCOMMON }, { i("mithril sq shield"), 1, UNCOMMON }, - { i("steel sword"), 1, RARE }, { i("steel longsword"), 1, RARE }, - { i("rune dagger"), 1, RARE }, { 995, 1 + r(999), COMMON }, - { 1823, 1, COMMON }, { i("bucket of sand"), 1, UNCOMMON }, - { 199, 1, COMMON }, { 201, 1, COMMON }, { 203, 1, COMMON }, - { 205, 1, UNCOMMON }, { 207, 1, UNCOMMON }, { 209, 1, UNCOMMON }, - { 211, 1, RARE }, { 213, 1, RARE }, { 215, 1, RARE }, - { 2485, 1, RARE }, { 217, 1, RARE } }; + { i("steel sword"), 1, RARE }, + { i("steel longsword"), 1, RARE }, + { i("rune dagger"), 1, RARE }, + { 995, 1 + r(999), COMMON }, + { 1823, 1, COMMON }, + { i("bucket of sand"), 1, UNCOMMON }, + { 199, 1, COMMON }, + { 201, 1, COMMON }, + { 203, 1, COMMON }, + { 205, 1, UNCOMMON }, + { 207, 1, UNCOMMON }, + { 209, 1, UNCOMMON }, + { 211, 1, RARE }, + { 213, 1, RARE }, + { 215, 1, RARE }, + { 2485, 1, RARE }, + { 217, 1, RARE }, + }; public static final int[][] kalphitesolider = { { i("steel full helm"), 1, COMMON }, - { i("steel scimitar"), 1, COMMON }, { i("steel axe"), 1, COMMON }, + { i("steel scimitar"), 1, COMMON }, + { i("steel axe"), 1, COMMON }, { i("steel sword"), 1, UNCOMMON }, { i("steel dagger"), 1, UNCOMMON }, { i("hard leather body"), 1, UNCOMMON }, { i("adamant chain body"), 1, UNCOMMON }, { i("adamant sq shield"), 1, UNCOMMON }, - { i("rune dagger"), 1, RARE }, { i("adamant scimitar"), 1, RARE }, - { i("adamant axe"), 1, RARE }, { i("adamant med helm"), 1, RARE }, + { i("rune dagger"), 1, RARE }, + { i("adamant scimitar"), 1, RARE }, + { i("adamant axe"), 1, RARE }, + { i("adamant med helm"), 1, RARE }, { i("adamant full helm"), 1, RARE }, - { i("adamant dagger"), 1, RARE }, { i("rune chainbody"), 1, RARE }, + { i("adamant dagger"), 1, RARE }, + { i("rune chainbody"), 1, RARE }, { i("air rune"), 15 + r(12), COMMON }, { i("fire rune"), 6 + r(54), COMMON }, - { i("water rune"), 2, UNCOMMON }, { i("body rune"), 2, UNCOMMON }, + { i("water rune"), 2, UNCOMMON }, + { i("body rune"), 2, UNCOMMON }, { i("chaos rune"), 12, UNCOMMON }, { i("cosmic rune"), 2, UNCOMMON }, { i("death rune"), 3 + r(9), UNCOMMON }, { i("law rune"), 1 + r(2), UNCOMMON }, - { i("nature rune"), 1 + r(5), RARE }, { 995, 10 + r(440), COMMON }, - { 3139, 1 + r(1), UNCOMMON }, { i("lobster"), 1, UNCOMMON }, - { 1823, 1, UNCOMMON }, { i("uncut diamond"), 1, RARE }, - { i("uncut dragonstone"), 1, RARE }, { 205, 1, COMMON }, - { 203, 1, RARE }, { 201, 1, RARE }, { 199, 1, RARE }, - { 207, 1, RARE }, { 213, 1, RARE }, { 211, 1, RARE }, - { 2485, 1, RARE }, { 209, 1, RARE } }; + { i("nature rune"), 1 + r(5), RARE }, + { 995, 10 + r(440), COMMON }, + { 3139, 1 + r(1), UNCOMMON }, + { i("lobster"), 1, UNCOMMON }, + { 1823, 1, UNCOMMON }, + { i("uncut diamond"), 1, RARE }, + { i("uncut dragonstone"), 1, RARE }, + { 205, 1, COMMON }, + { 203, 1, RARE }, + { 201, 1, RARE }, + { 199, 1, RARE }, + { 207, 1, RARE }, + { 213, 1, RARE }, + { 211, 1, RARE }, + { 2485, 1, RARE }, + { 209, 1, RARE }, + }; public static final int[][] kalphiteguardian = { { i("mithril kiteshield"), 1, UNCOMMON }, @@ -1267,14 +1929,17 @@ public class NPCDrops extends NPCDropsHandler { { i("rune chainbody"), 1, RARE }, { i("rune platebody"), 1, VERY_RARE }, { i("rune sq shield"), 1, VERY_RARE }, - { i("steel axe"), 1, COMMON }, { i("steel battleaxe"), 1, COMMON }, + { i("steel axe"), 1, COMMON }, + { i("steel battleaxe"), 1, COMMON }, { i("mithril longsword"), 1, COMMON }, { i("mithril sword"), 1, COMMON }, { i("adamant dagger"), 1, UNCOMMON }, { i("rune 2h sword"), 1, UNCOMMON }, { i("rune battleaxe"), 1, UNCOMMON }, - { i("rune dagger"), 1, UNCOMMON }, { i("rune sword"), 1, RARE }, - { i("air rune"), 50, UNCOMMON }, { i("blood rune"), 7, UNCOMMON }, + { i("rune dagger"), 1, UNCOMMON }, + { i("rune sword"), 1, RARE }, + { i("air rune"), 50, UNCOMMON }, + { i("blood rune"), 7, UNCOMMON }, { i("fire rune"), 37, UNCOMMON }, { i("law rune"), 3 + r(43), UNCOMMON }, { i("death rune"), 18 + r(27), UNCOMMON }, @@ -1283,16 +1948,27 @@ public class NPCDrops extends NPCDropsHandler { { i("cosmic rune"), 2, UNCOMMON }, { i("rune arrow"), 42 + r(108), UNCOMMON }, { 995, 28 + r(2972), COMMON }, - { i("lobster"), 1 + r(1), UNCOMMON }, { 163, 1, UNCOMMON }, - { 145, 1, UNCOMMON }, { 157, 1, UNCOMMON }, - { 3138, 2 + r(2), UNCOMMON }, { 199, 1, COMMON }, - { 215, 1, COMMON }, { 203, 1, COMMON }, { 201, 1, COMMON }, - { 205, 1, COMMON }, { 211, 1, UNCOMMON }, { 207, 1, UNCOMMON }, - { 209, 1, UNCOMMON }, { 213, 1, UNCOMMON }, { 2485, 1, RARE }, - { 217, 1, RARE } }; + { i("lobster"), 1 + r(1), UNCOMMON }, + { 163, 1, UNCOMMON }, + { 145, 1, UNCOMMON }, + { 157, 1, UNCOMMON }, + { 3138, 2 + r(2), UNCOMMON }, + { 199, 1, COMMON }, + { 215, 1, COMMON }, + { 203, 1, COMMON }, + { 201, 1, COMMON }, + { 205, 1, COMMON }, + { 211, 1, UNCOMMON }, + { 207, 1, UNCOMMON }, + { 209, 1, UNCOMMON }, + { 213, 1, UNCOMMON }, + { 2485, 1, RARE }, + { 217, 1, RARE }, + }; public static final int[][] kalphitequeen = { - { i("rune spear"), 2, COMMON }, { i("rune axe"), 1, COMMON }, + { i("rune spear"), 2, COMMON }, + { i("rune axe"), 1, COMMON }, { i("rune battleaxe"), 1, UNCOMMON }, { i("rune 2h sword"), 1, UNCOMMON }, { i("rune warhammer"), 1 + r(1), UNCOMMON }, @@ -1311,62 +1987,102 @@ public class NPCDrops extends NPCDropsHandler { { i("law rune"), 20 + r(230), UNCOMMON }, { i("death rune"), 200 + r(100), UNCOMMON }, { i("cosmic rune"), 200 + r(100), UNCOMMON }, - { i("sapphire"), 1, UNCOMMON }, { i("emerald"), 1, UNCOMMON }, - { i("ruby"), 1, UNCOMMON }, { 414, 40, UNCOMMON }, - { 246, 20 + r(20), COMMON }, { i("amulet of power"), 1, COMMON }, - { 995, 3000 + r(72000), UNCOMMON }, { i("lobster"), 7, UNCOMMON }, - { i("shark"), 7, UNCOMMON } }; + { i("sapphire"), 1, UNCOMMON }, + { i("emerald"), 1, UNCOMMON }, + { i("ruby"), 1, UNCOMMON }, + { 414, 40, UNCOMMON }, + { 246, 20 + r(20), COMMON }, + { i("amulet of power"), 1, COMMON }, + { 995, 3000 + r(72000), UNCOMMON }, + { i("lobster"), 7, UNCOMMON }, + { i("shark"), 7, UNCOMMON }, + }; + + public static final int[][] imp = { + { i("ashes"), 1, ALWAYS }, + { i("red bead"), 1, UNCOMMON }, + { i("yellow bead"), 1, UNCOMMON }, + { i("black bead"), 1, UNCOMMON }, + { i("white bead"), 1, UNCOMMON }, + { i("tinderbox"), 1, UNCOMMON }, + { i("ball of wool"), 1, COMMON }, + { i("hammer"), 1, COMMON }, + { i("mind talisman"), 1, UNCOMMON }, + { i("burnt meat"), 1, UNCOMMON }, + { 1947, 1, UNCOMMON }, + { 753, 1, UNCOMMON }, + { i("tinder"), 1, UNCOMMON }, + { i("shears"), 1, UNCOMMON }, + { i("bucket"), 1, UNCOMMON }, + { i("bucket of water"), 1, RARE }, + { i("jug"), 1, RARE }, + { i("jug of water"), 1, RARE }, + { i("jug of wine"), 1, RARE }, + { 1931, 1, RARE }, + { 2311, 1, RARE }, + { i("flier"), 1, RARE }}; - public static final int[][] imp = { { i("ashes"), 1, ALWAYS }, - { i("red bead"), 1, UNCOMMON }, { i("yellow bead"), 1, UNCOMMON }, - { i("black bead"), 1, UNCOMMON }, { i("white bead"), 1, UNCOMMON }, - { i("tinderbox"), 1, UNCOMMON }, {i("ball of wool"), 1, COMMON}, - {i("hammer"), 1, COMMON}, {i("mind talisman"), 1, UNCOMMON}, - {i("burnt meat"), 1, UNCOMMON}, {1947, 1, UNCOMMON}, - {753, 1, UNCOMMON}, {i("tinder"), 1, UNCOMMON}, - {i("shears"), 1, UNCOMMON}, {i("bucket"), 1, UNCOMMON}, - {i("bucket of water"), 1, RARE}, {i("jug"), 1, RARE}, - {i("jug of water"), 1, RARE}, {i("jug of wine"), 1, RARE}, - {1931, 1, RARE}, {2311, 1, RARE}, {i("flier"), 1, RARE}}; - public static final int[][] cavecrawler = { - {i("potato seed"), 1+r(3), COMMON}, {i("watermelon seed"), 1, UNCOMMON}, - {i("tomato seed"), 1+r(1), COMMON}, {i("onion seed"), 1+r(2), COMMON}, - {i("sweetcorn seed"), 1+r(1), COMMON}, {i("cabbage seed"), 1+r(1), COMMON}, - {i("strawberry seed"), 1, COMMON}, {239, 1, COMMON}, - {i("snape grass"), 1, RARE}, {235, 1, UNCOMMON}, - {223, 1, UNCOMMON}, {i("eye of newt"), 1, COMMON}, - {i("limpwurt root"), 1, COMMON}, {i("vial of water"), 1, COMMON}, - {i("earth rune"), 9+r(1), COMMON}, {i("nature rune"), 3, COMMON}, - {i("fire rune"), 12, COMMON}, {995, 3+r(26), COMMON}, - {i("bronze boots"), 1, UNCOMMON}, {187, 1, UNCOMMON}, - {199, 1+r(1), COMMON}, {201, 1+r(1), COMMON}, - {203, 1+r(1), COMMON}, {205, 1+r(1), COMMON}, - {207, 1+r(1), UNCOMMON}, {209, 1+r(1), UNCOMMON}, - {211, 1+r(1), UNCOMMON}, {213, 1+r(1), UNCOMMON}, - {215, 1+r(1), RARE}, {217, 1+r(1), RARE}, - {2485, 1+r(1), RARE}}; + { i("potato seed"), 1+r(3), COMMON }, + { i("watermelon seed"), 1, UNCOMMON }, + { i("tomato seed"), 1+r(1), COMMON }, + { i("onion seed"), 1+r(2), COMMON }, + { i("sweetcorn seed"), 1+r(1), COMMON }, + { i("cabbage seed"), 1+r(1), COMMON }, + { i("strawberry seed"), 1, COMMON }, + { 239, 1, COMMON }, + { i("snape grass"), 1, RARE }, + { 235, 1, UNCOMMON }, + { 223, 1, UNCOMMON }, + { i("eye of newt"), 1, COMMON }, + { i("limpwurt root"), 1, COMMON }, + { i("vial of water"), 1, COMMON }, + { i("earth rune"), 9+r(1), COMMON }, + { i("nature rune"), 3, COMMON }, + { i("fire rune"), 12, COMMON }, + { 995, 3+r(26), COMMON }, + { i("bronze boots"), 1, UNCOMMON }, + { 187, 1, UNCOMMON }, + { 199, 1+r(1), COMMON }, + { 201, 1+r(1), COMMON }, + { 203, 1+r(1), COMMON }, + { 205, 1+r(1), COMMON }, + { 207, 1+r(1), UNCOMMON }, + { 209, 1+r(1), UNCOMMON }, + { 211, 1+r(1), UNCOMMON }, + { 213, 1+r(1), UNCOMMON }, + { 215, 1+r(1), RARE }, + { 217, 1+r(1), RARE }, + { 2485, 1+r(1), RARE }}; - public static final int[][] crawlinghand = { { 526, 1, ALWAYS }, + public static final int[][] crawlinghand = { + { 526, 1, ALWAYS }, { i("leather gloves"), 1, COMMON }, { i("gold ring"), 1, UNCOMMON }, { i("sapphire ring"), 1, UNCOMMON }, { i("emerald ring"), 1, UNCOMMON }, - { i("ruby ring"), 1, UNCOMMON }, { 995, 5 + r(437), COMMON }, - { i("ashes"), 1, UNCOMMON }, { 2902, 1, COMMON }, - { 2912, 1, UNCOMMON }, { 2922, 1, UNCOMMON }, - { 2932, 1, UNCOMMON }, { 2942, 1, UNCOMMON }, - { 4115, 1, VERY_RARE + r(20) } }; + { i("ruby ring"), 1, UNCOMMON }, + { 995, 5 + r(437), COMMON }, + { i("ashes"), 1, UNCOMMON }, + { 2902, 1, COMMON }, + { 2912, 1, UNCOMMON }, + { 2922, 1, UNCOMMON }, + { 2932, 1, UNCOMMON }, + { 2942, 1, UNCOMMON }, + { 4115, 1, VERY_RARE + r(20) }, + }; public static final int[][] bronzedragon = { - { i("dragon bones"), 1, ALWAYS }, { i("bronze bar"), 5, ALWAYS }, + { i("dragon bones"), 1, ALWAYS }, + { i("bronze bar"), 5, ALWAYS }, { i("adamant javelin"), 30 + r(30), COMMON }, { i("adamant dart"), 16, UNCOMMON }, { i("mithril axe"), 1, UNCOMMON }, { i("mithril 2h sword"), 1, UNCOMMON }, { i("mithril battleaxe"), 1, UNCOMMON }, { i("rune knife"), 2 + r(3), UNCOMMON }, - { i("rune javelin"), 1, RARE }, { i("rune longsword"), 1, RARE }, + { i("rune javelin"), 1, RARE }, + { i("rune longsword"), 1, RARE }, { i("rune battleaxe"), 1, RARE }, { i("dragon dagger"), 1, VERY_RARE }, { i("mithril kiteshield"), 1, UNCOMMON }, @@ -1379,40 +2095,52 @@ public class NPCDrops extends NPCDropsHandler { { i("blood rune"), 15 + r(15), UNCOMMON }, { i("nature rune"), 67, UNCOMMON }, { i("death rune"), 25 + r(20), UNCOMMON }, - { i("adamant bar"), 1, RARE }, { i("runite bar"), 1, RARE } }; + { i("adamant bar"), 1, RARE }, + { i("runite bar"), 1, RARE }, + }; public static final int[][] blackdragon = { { i("dragon bones"), 1, ALWAYS }, { i("black dragonhide"), 1, ALWAYS }, - { i("mithril axe"), 1, UNCOMMON }, { i("black axe"), 1, UNCOMMON }, + { i("mithril axe"), 1, UNCOMMON }, + { i("black axe"), 1, UNCOMMON }, { i("mithril battleaxe"), 1, UNCOMMON }, { i("mithril 2h sword"), 1, UNCOMMON }, { i("adamant platebody"), 1, UNCOMMON }, - { i("rune longsword"), 1, RARE }, { i("rune sq shield"), 1, RARE }, + { i("rune longsword"), 1, RARE }, + { i("rune sq shield"), 1, RARE }, { i("rune battleaxe"), 1, VERY_RARE }, { i("rune 2h sword"), 1, VERY_RARE }, { i("adamant dart"), 16, COMMON }, - { i("rune knife"), 2, UNCOMMON }, { i("rune dart"), 10, UNCOMMON }, - { i("air rune"), 75, UNCOMMON }, { i("blood rune"), 15, UNCOMMON }, + { i("rune knife"), 2, UNCOMMON }, + { i("rune dart"), 10, UNCOMMON }, + { i("air rune"), 75, UNCOMMON }, + { i("blood rune"), 15, UNCOMMON }, { i("death rune"), 5 + r(45), UNCOMMON }, { i("fire rune"), 50, UNCOMMON }, { i("law rune"), 10 + r(35), UNCOMMON }, { i("nature rune"), 67 + r(12), UNCOMMON }, { i("chaos rune"), 90, UNCOMMON }, { i("adamant bar"), 1 + r(1), UNCOMMON }, - { i("steel bar"), 1, VERY_RARE }, { 995, 129 + r(2771), COMMON }, - { i("chocolate cake"), 1, UNCOMMON } }; + { i("steel bar"), 1, VERY_RARE }, + { 995, 129 + r(2771), COMMON }, + { i("chocolate cake"), 1, UNCOMMON }, + }; public static final int[][] irondragon = { - { i("dragon bones"), 1, ALWAYS }, { i("iron bar"), 5, ALWAYS }, + { i("dragon bones"), 1, ALWAYS }, + { i("iron bar"), 5, ALWAYS }, { i("adamant 2h sword"), 1, UNCOMMON }, { i("adamant battleaxe"), 1, UNCOMMON }, - { i("adamant axe"), 1, UNCOMMON }, { i("rune axe"), 1, RARE }, - { i("rune mace"), 1, RARE }, { i("rune longsword"), 1, RARE }, + { i("adamant axe"), 1, UNCOMMON }, + { i("rune axe"), 1, RARE }, + { i("rune mace"), 1, RARE }, + { i("rune longsword"), 1, RARE }, { i("rune battleaxe"), 1, UNCOMMON }, { i("rune 2h sword"), 1, VERY_RARE }, { i("adamant sq shield"), 1, UNCOMMON }, - { i("rune med helm"), 1, RARE }, { i("rune full helm"), 1, RARE }, + { i("rune med helm"), 1, RARE }, + { i("rune full helm"), 1, RARE }, { i("rune sq shield"), 1, RARE }, { i("rune kiteshield"), 1, RARE }, { i("dragon plateskirt"), 1, VERY_RARE + 592 }, @@ -1420,33 +2148,49 @@ public class NPCDrops extends NPCDropsHandler { { i("rune javelin"), 4 + r(4), COMMON }, { i("rune dart"), 9, UNCOMMON }, { i("rune knife"), 1 + r(6), UNCOMMON }, - { i("steel arrow"), 150, RARE }, { i("blood rune"), 15, COMMON }, + { i("steel arrow"), 150, RARE }, + { i("blood rune"), 15, COMMON }, { i("soul rune"), 3 + r(2), UNCOMMON }, { i("death rune"), 15 + r(30), RARE }, { i("chaos rune"), 25 + r(25), RARE }, { i("nature rune"), 60 + r(19), RARE }, { i("law rune"), 45 + r(45), RARE }, - { i("adamant bar"), 2, UNCOMMON }, { i("runite bar"), 1, RARE }, - { 161, 1, COMMON }, { 145, 1, RARE }, { 2442, 1, RARE }, - { 995, 270 + r(2730), COMMON }, { i("curry"), 1 + r(1), UNCOMMON } }; + { i("adamant bar"), 2, UNCOMMON }, + { i("runite bar"), 1, RARE }, + { 161, 1, COMMON }, + { 145, 1, RARE }, + { 2442, 1, RARE }, + { 995, 270 + r(2730), COMMON }, + { i("curry"), 1 + r(1), UNCOMMON }, + }; public static final int[][] steeldragon = { - { i("dragon bones"), 1, ALWAYS }, { i("steel bar"), 5, ALWAYS }, - { i("rune axe"), 1, UNCOMMON }, { i("rune mace"), 1, COMMON }, - { i("rune battleaxe"), 1, RARE }, { i("rune 2h sword"), 1, RARE }, + { i("dragon bones"), 1, ALWAYS }, + { i("steel bar"), 5, ALWAYS }, + { i("rune axe"), 1, UNCOMMON }, + { i("rune mace"), 1, COMMON }, + { i("rune battleaxe"), 1, RARE }, + { i("rune 2h sword"), 1, RARE }, { i("adamant kiteshield"), 1, UNCOMMON }, { i("rune full helm"), 1, UNCOMMON }, { i("rune sq shield"), 1, VERY_RARE }, { i("dragon plateskirt"), 1, VERY_RARE + 30 }, { i("dragon platelegs"), 1, VERY_RARE + 18 }, - { i("blood rune"), 20, COMMON }, { i("rune javelin"), 7, COMMON }, + { i("blood rune"), 20, COMMON }, + { i("rune javelin"), 7, COMMON }, { i("soul rune"), 5, UNCOMMON }, { i("rune dart"), 9 + r(3), UNCOMMON }, - { i("rune knife"), 7, UNCOMMON }, { 995, 470 + r(12180), COMMON }, - { 145, 3, COMMON }, { 165, 2, UNCOMMON }, { 161, 1, UNCOMMON }, - { i("runite bar"), 1, UNCOMMON }, { 2011, 1 + r(1), UNCOMMON } }; + { i("rune knife"), 7, UNCOMMON }, + { 995, 470 + r(12180), COMMON }, + { 145, 3, COMMON }, + { 165, 2, UNCOMMON }, + { 161, 1, UNCOMMON }, + { i("runite bar"), 1, UNCOMMON }, + { 2011, 1 + r(1), UNCOMMON }, + }; - public static final int[][] darkwizard = { { i("bones"), 1, ALWAYS }, + public static final int[][] darkwizard = { + { i("bones"), 1, ALWAYS }, { i("earth rune"), 10 + r(26), COMMON }, { i("air rune"), 10 + r(8), COMMON }, { i("water rune"), 10 + r(8), COMMON }, @@ -1457,65 +2201,114 @@ public class NPCDrops extends NPCDropsHandler { { i("nature rune"), 2 + r(3), UNCOMMON }, { i("law rune"), 3, COMMON }, { i("cosmic rune"), 2 + r(2), UNCOMMON }, - { i("blood rune"), 2 + r(2), COMMON }, { 995, 1 + r(29), COMMON }, - { i("staff"), 1, COMMON }, { i("staff of air"), 1, COMMON }, - { 1017, 1, COMMON }, { 581, 1, COMMON }, + { i("blood rune"), 2 + r(2), COMMON }, + { 995, 1 + r(29), COMMON }, + { i("staff"), 1, COMMON }, + { i("staff of air"), 1, COMMON }, + { 1017, 1, COMMON }, + { 581, 1, COMMON }, { i("fire talisman"), 1, COMMON }, { i("earth talisman"), 1, VERY_RARE }, { i("mind talisman"), 1, RARE }, - { i("staff of water"), 1, VERY_RARE } }; - - public static final int[][] highwayman = { { i("bones"), 1, ALWAYS }, - { 1019, 1, ALWAYS } }; - - public static final int[][] chaosdruid = { { 526, 1, ALWAYS }, - { 199, 1 + r(1), COMMON }, { 201, 1 + r(1), COMMON }, - { 203, 1 + r(1), COMMON }, { 205, 1 + r(1), COMMON }, - { 211, 1 + r(1), UNCOMMON }, { 209, 1 + r(1), UNCOMMON }, - { 213, 1 + r(1), UNCOMMON }, { 207, 1 + r(1), UNCOMMON }, - { 2485, 1 + r(1), UNCOMMON }, { 217, 1 + r(1), UNCOMMON }, - { 215, 1 + r(1), UNCOMMON }, { 219, 1 + r(1), VERY_RARE }, - { i("law rune"), 2, COMMON }, { i("body rune"), 9, COMMON }, - { i("air rune"), 9 + r(27), COMMON }, - { i("earth rune"), 9, COMMON }, { i("mind rune"), 12, COMMON }, - { i("nature rune"), 3, UNCOMMON }, { 995, 2 + r(483), COMMON }, - { i("vail of water"), 1, COMMON }, { 540, 1, COMMON }, - { 538, 1, COMMON }, { i("bronze longsword"), 1, UNCOMMON }, - { i("snape grass"), 1, RARE }, { i("unholy mould"), 1, RARE }, - { i("cosmic talisman"), 1, VERY_RARE }, - { i("iron med helm"), 1, VERY_RARE }, - { i("uncut jade"), 1, VERY_RARE } }; - - public static final int[][] jailer = { { 526, 1, ALWAYS }, - { i("jail key"), 1, ALWAYS }}; - - public static final int[][] wyvern = {{ 6812, 1, ALWAYS}, - {i("mithril sword"), 1, COMMON}, {i("black axe"), 1, UNCOMMON}, - {i("adamant axe"), 1, UNCOMMON}, {i("snakeskin chaps"), 1, UNCOMMON}, - {i("earth battlesatff"), 1, RARE}, {i("granite legs"), 1, RARE}, - {7937, 60, RARE}, {i("air rune"), 10+r(54), UNCOMMON}, - {i("water rune"), 11+r(22), UNCOMMON}, {i("chaos rune"), 10, UNCOMMON}, - {i("law rune"), 2+r(3), UNCOMMON}, {i("blood rune"), 2+r(9), UNCOMMON}, - {i("soul rune"), 5+r(9), UNCOMMON}, {i("death rune"), 1+r(4), UNCOMMON}, - {i("belladonna seed"), 1, UNCOMMON}, {i("cadantine seed"), 1, UNCOMMON}, - {i("dwarf weed seed"), 1, UNCOMMON}, {i("snapdragon seed"), 1, UNCOMMON}, - {i("jangerberry seed"), 1, UNCOMMON}, {i("limpwurt seed"), 1, UNCOMMON}, - {i("marentill seed"), 1, UNCOMMON}, {5282, 1, UNCOMMON}, - {i("ranarr seed"), 1, UNCOMMON}, {i("strawberry seed"), 1, UNCOMMON}, - {i("tarromin seed"), 1, UNCOMMON}, {i("watermelon seed"), 1, UNCOMMON}, - {i("whiteberry seed"), 1, UNCOMMON}, {i("wildblood seed"), 1, UNCOMMON}, - {i("toadflax seed"), 1, UNCOMMON}, {i("harralander seed"), 1, UNCOMMON}, - {995, 20+r(400), COMMON}, {i("lobster"), 3, UNCOMMON}, - {i("bass"), 1, UNCOMMON}, {149, 1, UNCOMMON}, - {133, 1, UNCOMMON}, {199, 1, UNCOMMON}, - {201, 1, UNCOMMON}, {203, 1, UNCOMMON}, - {205, 1, UNCOMMON}, {207, 1, UNCOMMON}, - {209, 1, UNCOMMON}, {211, 1, UNCOMMON}, - {213, 1, UNCOMMON}, {215, 1, UNCOMMON}, - {217, 1, UNCOMMON}, {2485, 1, UNCOMMON}, + { i("staff of water"), 1, VERY_RARE }, }; - public static final int[][] alwaysbones = { { 526, 1, ALWAYS } }; + public static final int[][] highwayman = { + { i("bones"), 1, ALWAYS }, + { 1019, 1, ALWAYS }, + }; - public static final int[][] bat = { { i("batbones"), 1, ALWAYS } }; + public static final int[][] chaosdruid = { + { 526, 1, ALWAYS }, + { 199, 1 + r(1), COMMON }, + { 201, 1 + r(1), COMMON }, + { 203, 1 + r(1), COMMON }, + { 205, 1 + r(1), COMMON }, + { 211, 1 + r(1), UNCOMMON }, + { 209, 1 + r(1), UNCOMMON }, + { 213, 1 + r(1), UNCOMMON }, + { 207, 1 + r(1), UNCOMMON }, + { 2485, 1 + r(1), UNCOMMON }, + { 217, 1 + r(1), UNCOMMON }, + { 215, 1 + r(1), UNCOMMON }, + { 219, 1 + r(1), VERY_RARE }, + { i("law rune"), 2, COMMON }, + { i("body rune"), 9, COMMON }, + { i("air rune"), 9 + r(27), COMMON }, + { i("earth rune"), 9, COMMON }, + { i("mind rune"), 12, COMMON }, + { i("nature rune"), 3, UNCOMMON }, + { 995, 2 + r(483), COMMON }, + { i("vail of water"), 1, COMMON }, + { 540, 1, COMMON }, + { 538, 1, COMMON }, + { i("bronze longsword"), 1, UNCOMMON }, + { i("snape grass"), 1, RARE }, + { i("unholy mould"), 1, RARE }, + { i("cosmic talisman"), 1, VERY_RARE }, + { i("iron med helm"), 1, VERY_RARE }, + { i("uncut jade"), 1, VERY_RARE }, + }; + + public static final int[][] jailer = { + { 526, 1, ALWAYS }, + { i("jail key"), 1, ALWAYS }, + }; + + public static final int[][] wyvern = { { 6812, 1, ALWAYS }, + { i("mithril sword"), 1, COMMON }, + { i("black axe"), 1, UNCOMMON }, + { i("adamant axe"), 1, UNCOMMON }, + { i("snakeskin chaps"), 1, UNCOMMON }, + { i("earth battlesatff"), 1, RARE }, + { i("granite legs"), 1, RARE }, + { 7937, 60, RARE }, + { i("air rune"), 10+r(54), UNCOMMON }, + { i("water rune"), 11+r(22), UNCOMMON }, + { i("chaos rune"), 10, UNCOMMON }, + { i("law rune"), 2+r(3), UNCOMMON }, + { i("blood rune"), 2+r(9), UNCOMMON }, + { i("soul rune"), 5+r(9), UNCOMMON }, + { i("death rune"), 1+r(4), UNCOMMON }, + { i("belladonna seed"), 1, UNCOMMON }, + { i("cadantine seed"), 1, UNCOMMON }, + { i("dwarf weed seed"), 1, UNCOMMON }, + { i("snapdragon seed"), 1, UNCOMMON }, + { i("jangerberry seed"), 1, UNCOMMON }, + { i("limpwurt seed"), 1, UNCOMMON }, + { i("marentill seed"), 1, UNCOMMON }, + { 5282, 1, UNCOMMON }, + { i("ranarr seed"), 1, UNCOMMON }, + { i("strawberry seed"), 1, UNCOMMON }, + { i("tarromin seed"), 1, UNCOMMON }, + { i("watermelon seed"), 1, UNCOMMON }, + { i("whiteberry seed"), 1, UNCOMMON }, + { i("wildblood seed"), 1, UNCOMMON }, + { i("toadflax seed"), 1, UNCOMMON }, + { i("harralander seed"), 1, UNCOMMON }, + { 995, 20+r(400), COMMON }, + { i("lobster"), 3, UNCOMMON }, + { i("bass"), 1, UNCOMMON }, + { 149, 1, UNCOMMON }, + { 133, 1, UNCOMMON }, + { 199, 1, UNCOMMON }, + { 201, 1, UNCOMMON }, + { 203, 1, UNCOMMON }, + { 205, 1, UNCOMMON }, + { 207, 1, UNCOMMON }, + { 209, 1, UNCOMMON }, + { 211, 1, UNCOMMON }, + { 213, 1, UNCOMMON }, + { 215, 1, UNCOMMON }, + { 217, 1, UNCOMMON }, + { 2485, 1, UNCOMMON }, + }; + + public static final int[][] alwaysbones = { + { 526, 1, ALWAYS }, + }; + + public static final int[][] bat = { + { i("batbones"), 1, ALWAYS }, + }; } diff --git a/2006Redone Server/src/redone/game/npcs/drops/NPCDropsHandler.java b/2006Redone Server/src/redone/game/npcs/drops/NPCDropsHandler.java index 67913236..c0d6c41b 100644 --- a/2006Redone Server/src/redone/game/npcs/drops/NPCDropsHandler.java +++ b/2006Redone Server/src/redone/game/npcs/drops/NPCDropsHandler.java @@ -15,7 +15,9 @@ public class NPCDropsHandler { ALWAYS = 0, COINSRATE = 3, CHICKEN_RATE = 75 / 100, COMMON = 2 + r(48), - UNCOMMON = 51 + r(49), RARE = 101 + r(411), VERY_RARE = 513; + UNCOMMON = 51 + r(49), + RARE = 101 + r(411), + VERY_RARE = 513; /** * Handles the npc drops for the npc names. diff --git a/2006Redone Server/src/redone/util/Misc.java b/2006Redone Server/src/redone/util/Misc.java index c01897b8..063738a6 100644 --- a/2006Redone Server/src/redone/util/Misc.java +++ b/2006Redone Server/src/redone/util/Misc.java @@ -14,24 +14,9 @@ public class Misc { return (int) (java.lang.Math.random() * (range + 1)); } + // return a random number from 0 → range - 1 public static int randomMinusOne(int range) { - int number = (int) (Math.random() * range); - return number < 0 ? 0 : number; - } - - public static int random(int range1, int range2) { // 0 till range (range - // INCLUDED) - int keepGoing = 1; - int compare1 = 0; - while (keepGoing == 1) { - compare1 = random(range2); - if (compare1 >= range1) { - keepGoing = 0; - } else { - keepGoing = 1; - } - } - return compare1; + return (int) Math.random() * range; } public static boolean goodDistance(int objectX, int objectY, int playerX, int playerY, int distance) { @@ -152,8 +137,19 @@ public class Misc { return (int) (java.lang.Math.random() * range + 1); } + // return a random number from 0 → range (including range) public static int random(int range) { - return (int) (java.lang.Math.random() * (range + 1)); + return (int) (java.lang.Math.random() * (++range)); + } + + // return a random number between & including the min/max values + public static int random(int min, int max) { + ++max; + return (int) Math.floor(Math.random() * (max - min)) + min; + } + + public static int randomArrayItem(int[] arr) { + return arr[(int) Math.floor(Math.random() * arr.length)]; } public static long playerNameToInt64(String s) {