diff --git a/Server/data/configs/drop_tables.json b/Server/data/configs/drop_tables.json index 5bf29bf60..ce2da38e8 100644 --- a/Server/data/configs/drop_tables.json +++ b/Server/data/configs/drop_tables.json @@ -27896,7 +27896,7 @@ "maxAmount": "1" } ], - "ids": "1832,5750", + "ids": "5750", "description": "", "main": [ { @@ -60099,5 +60099,109 @@ "maxAmount": "1" } ] + }, + { + "default": [], + "charm": [], + "ids": "1832", + "description": "Cave Bug (Level 6)", + "main": [ + { + "minAmount": "8", + "weight": "5.0", + "id": "555", + "maxAmount": "8" + }, + { + "minAmount": "1", + "weight": "5.0", + "id": "561", + "maxAmount": "1" + }, + { + "minAmount": "6", + "weight": "2.0", + "id": "557", + "maxAmount": "6" + }, + { + "minAmount": "1", + "weight": "1.0", + "id": "561", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "23.0", + "id": "14424", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "2.0", + "id": "235", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "2.0", + "id": "221", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "2.0", + "id": "223", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "1.0", + "id": "225", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "1.0", + "id": "231", + "maxAmount": "1" + }, + { + "minAmount": "3", + "weight": "8.0", + "id": "995", + "maxAmount": "3" + }, + { + "minAmount": "1", + "weight": "64.0", + "id": "0", + "maxAmount": "1" + }, + { + "minAmount": "8", + "weight": "3.0", + "id": "995", + "maxAmount": "8" + }, + { + "minAmount": "1", + "weight": "5.0", + "id": "36", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "3.0", + "id": "590", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "1.0", + "id": "4527", + "maxAmount": "1" + } + ] } ] \ No newline at end of file diff --git a/Server/src/main/content/global/skill/hunter/BoxTrapNode.java b/Server/src/main/content/global/skill/hunter/BoxTrapNode.java index 6cebfaf6a..129702015 100644 --- a/Server/src/main/content/global/skill/hunter/BoxTrapNode.java +++ b/Server/src/main/content/global/skill/hunter/BoxTrapNode.java @@ -8,7 +8,7 @@ import core.game.node.item.Item; * Handles the box trap node. * @author Vexia */ -public final class BoxTrapNode extends TrapNode { +public class BoxTrapNode extends TrapNode { /** * The summoning level required. diff --git a/Server/src/main/content/global/skill/hunter/Traps.java b/Server/src/main/content/global/skill/hunter/Traps.java index ab3314381..f2151d660 100644 --- a/Server/src/main/content/global/skill/hunter/Traps.java +++ b/Server/src/main/content/global/skill/hunter/Traps.java @@ -42,7 +42,14 @@ public enum Traps { new BoxTrapNode(new int[] { 5080 }, 63, 265, new Item[] { new Item(10034, 1) }, 1), new BoxTrapNode(new int[] { 7012, 7014 }, 66, 400, new Item[] { new Item(12535) }, 1), new BoxTrapNode(new int[] { 8654 }, 73, 315, new Item[] { new Item(14861) }, 1), - new BoxTrapNode(new int[] { 7010, 7011 }, 77, 726, new Item[] { new Item(12539, 1) }, 1)), + new BoxTrapNode(new int[] { 7010, 7011 }, 77, 0, new Item[] { new Item(12539, 1) }, 1) { + @Override + public boolean canCatch(TrapWrapper wrapper, final NPC npc) { + //old xp: 726 + wrapper.getPlayer().sendMessage("Note: Giving 0 xp for grenwalls until this area and its requirements are implemented."); + return super.canCatch(wrapper, npc); + } + }), RABBIT_SNARE(new TrapSetting(10031, new int[] { 19333 }, new int[] {}, "lay", -1, Animation.create(5208), Animation.create(9726), 27)), IMP_BOX(new MagicBoxSetting(), new TrapNode(new int[] { 708, 709, 1531 }, 71, 450, new int[] { -1, 19226 }, new Item[] { new Item(10027) })), diff --git a/Server/src/main/content/global/skill/hunter/bnet/BNetPulse.java b/Server/src/main/content/global/skill/hunter/bnet/BNetPulse.java index 13edf7b3b..f00add82d 100644 --- a/Server/src/main/content/global/skill/hunter/bnet/BNetPulse.java +++ b/Server/src/main/content/global/skill/hunter/bnet/BNetPulse.java @@ -73,18 +73,16 @@ public final class BNetPulse extends SkillPulse { player.sendMessage("You need a Hunter level of at least " + type.getLevel() + " in order to do that."); return false; } - if (!type.isBareHand(player)) { - if (type.hasWeapon(player)) { - player.getPacketDispatch().sendMessage("Your hands need to be free."); - return false; - } else if (!type.hasNet(player)) { - player.sendMessage("You need to be wielding a butterfly net to catch " + (type instanceof ImplingNode ? "implings" : "butterflies") + "."); - return false; - } else if (!type.hasJar(player)) { - player.getPacketDispatch().sendMessage("You need to have a" + (StringUtils.isPlusN(type.getJar().getName()) ? "n" : "") + " " + type.getJar().getName().toLowerCase() + "."); - return false; - } - } + if (type.hasWeapon(player)) { + player.getPacketDispatch().sendMessage("Your hands need to be free."); + return false; + } else if (!type.hasNet(player)) { + player.sendMessage("You need to be wielding a butterfly net to catch " + (type instanceof ImplingNode ? "implings" : "butterflies") + "."); + return false; + } else if (!type.hasJar(player)) { + player.getPacketDispatch().sendMessage("You need to have a" + (StringUtils.isPlusN(type.getJar().getName()) ? "n" : "") + " " + type.getJar().getName().toLowerCase() + "."); + return false; + } if (node.isInvisible() || DeathTask.isDead(node)) { return false; } diff --git a/Server/src/main/content/minigame/puropuro/PuroPuroPlugin.java b/Server/src/main/content/minigame/puropuro/PuroPuroPlugin.java index a0df1d47e..4afa73a7e 100644 --- a/Server/src/main/content/minigame/puropuro/PuroPuroPlugin.java +++ b/Server/src/main/content/minigame/puropuro/PuroPuroPlugin.java @@ -263,7 +263,8 @@ public final class PuroPuroPlugin extends MapZone implements Plugin { player.getDialogueInterpreter().sendDialogue("Something prevents you from entering. You think the portal is offended by", "your imp boxes. They are not popular on imp and impling planes."); break; } - player.getTeleporter().send(Location.create(2591, 4320, 0), TeleportType.PURO_PURO); + player.sendMessage("Puro Puro is disabled until its rewrite/bugfix update is complete."); + //player.getTeleporter().send(Location.create(2591, 4320, 0), TeleportType.PURO_PURO); return true; case 11273: if (!player.getZoneMonitor().isInZone("puro puro")) {