From 16187ad211405b514277dbd7c9e800739c308f40 Mon Sep 17 00:00:00 2001 From: oftheshire Date: Sun, 21 Jun 2026 12:52:46 +0000 Subject: [PATCH] Hunter audit and implementation for geckos, raccoons, monkeys, and squirrels --- Server/data/configs/item_configs.json | 134 ++++++++++++----- Server/data/configs/npc_configs.json | 141 +++++++++++++----- .../global/skill/hunter/NetTrapNode.kt | 25 ++++ .../content/global/skill/hunter/Traps.java | 51 +++++-- 4 files changed, 261 insertions(+), 90 deletions(-) create mode 100644 Server/src/main/content/global/skill/hunter/NetTrapNode.kt diff --git a/Server/data/configs/item_configs.json b/Server/data/configs/item_configs.json index 8a7014647..a51c6805d 100644 --- a/Server/data/configs/item_configs.json +++ b/Server/data/configs/item_configs.json @@ -77818,6 +77818,16 @@ "durability": null, "weight": "1" }, + { + "id": "9721", + "name": "Scroll", + "examine": "A scroll with some writing on it." + }, + { + "id": "9722", + "name": "Key", + "examine": "Quite a small key." + }, { "id": "9723", "name": "Pipe", @@ -99252,7 +99262,7 @@ { "id": "12184", "name": "Gecko", - "examine": "(Baby) It's so adorably tiny! (Adult) How cute!", + "examine": "How cute!", "archery_ticket_price": "0", "durability": null }, @@ -100617,42 +100627,42 @@ { "id": "12486", "name": "Baby raccoon", - "examine": "(Baby) A stripy little baby raccoon.(Adult) He can run with us.", + "examine": "A stripy little baby raccoon.", "archery_ticket_price": "0", "durability": null }, { "id": "12487", "name": "Raccoon", - "examine": "(Baby) A stripy little baby raccoon.(Adult) He can run with us.", + "examine": "He can run with us.", "archery_ticket_price": "0", "durability": null }, { "id": "12488", "name": "Baby gecko", - "examine": "(Baby) It's so adorably tiny! (Adult) How cute!", + "examine": "It's so adorably tiny!", "archery_ticket_price": "0", "durability": null }, { "id": "12489", "name": "Gecko", - "examine": "(Baby) It's so adorably tiny! (Adult) How cute!", + "examine": "How cute!", "archery_ticket_price": "0", "durability": null }, { "id": "12490", "name": "Baby squirrel", - "examine": "Adult: An experienced nut-thief.Baby: A tiny nut-thief.", + "examine": "A tiny nut-thief.", "archery_ticket_price": "0", "durability": null }, { "id": "12491", "name": "Squirrel", - "examine": "Adult: An experienced nut-thief.Baby: A tiny nut-thief.", + "examine": "An experienced nut-thief.", "archery_ticket_price": "0", "durability": null }, @@ -100689,10 +100699,15 @@ { "id": "12496", "name": "Baby monkey", - "examine": "(Baby) It's a tiny, cheeky monkey. (Adult) Hide the bananas!", + "examine": "It's a tiny, cheeky monkey.", "archery_ticket_price": "0", "durability": null }, + { + "id": "12497", + "name": "Monkey", + "examine": "Hide the bananas!" + }, { "id": "12498", "name": "Vulture chick", @@ -102382,66 +102397,111 @@ { "id": "12682", "name": "Baby monkey", - "examine": "(Baby) It's a tiny, cheeky monkey. (Adult) Hide the bananas!", + "examine": "It's a tiny, cheeky monkey.", "archery_ticket_price": "0", "durability": null }, + { + "id": "12683", + "name": "Monkey", + "examine": "Hide the bananas!" + }, { "id": "12684", "name": "Baby monkey", - "examine": "(Baby) It's a tiny, cheeky monkey. (Adult) Hide the bananas!", + "examine": "It's a tiny, cheeky monkey.", "archery_ticket_price": "0", "durability": null }, + { + "id": "12685", + "name": "Monkey", + "examine": "Hide the bananas!" + }, { "id": "12686", "name": "Baby monkey", - "examine": "(Baby) It's a tiny, cheeky monkey. (Adult) Hide the bananas!", + "examine": "It's a tiny, cheeky monkey.", "archery_ticket_price": "0", "durability": null }, + { + "id": "12687", + "name": "Monkey", + "examine": "Hide the bananas!" + }, { "id": "12688", "name": "Baby monkey", - "examine": "(Baby) It's a tiny, cheeky monkey. (Adult) Hide the bananas!", + "examine": "It's a tiny, cheeky monkey.", "archery_ticket_price": "0", "durability": null }, + { + "id": "12689", + "name": "Monkey", + "examine": "Hide the bananas!" + }, { "id": "12690", "name": "Baby monkey", - "examine": "(Baby) It's a tiny, cheeky monkey. (Adult) Hide the bananas!", + "examine": "It's a tiny, cheeky monkey.", "archery_ticket_price": "0", "durability": null }, + { + "id": "12691", + "name": "Monkey", + "examine": "Hide the bananas!" + }, { "id": "12692", "name": "Baby monkey", - "examine": "(Baby) It's a tiny, cheeky monkey. (Adult) Hide the bananas!", + "examine": "It's a tiny, cheeky monkey.", "archery_ticket_price": "0", "durability": null }, + { + "id": "12693", + "name": "Monkey", + "examine": "Hide the bananas!" + }, { "id": "12694", "name": "Baby monkey", - "examine": "(Baby) It's a tiny, cheeky monkey. (Adult) Hide the bananas!", + "examine": "It's a tiny, cheeky monkey.", "archery_ticket_price": "0", "durability": null }, + { + "id": "12695", + "name": "Monkey", + "examine": "Hide the bananas!" + }, { "id": "12696", "name": "Baby monkey", - "examine": "(Baby) It's a tiny, cheeky monkey. (Adult) Hide the bananas!", + "examine": "It's a tiny, cheeky monkey.", "archery_ticket_price": "0", "durability": null }, + { + "id": "12697", + "name": "Monkey", + "examine": "Hide the bananas!" + }, { "id": "12698", "name": "Baby monkey", - "examine": "(Baby) It's a tiny, cheeky monkey. (Adult) Hide the bananas!", + "examine": "It's a tiny, cheeky monkey.", "archery_ticket_price": "0", "durability": null }, + { + "id": "12699", + "name": "Monkey", + "examine": "Hide the bananas!" + }, { "id": "12700", "name": "Terrier puppy", @@ -102707,84 +102767,84 @@ { "id": "12734", "name": "Baby raccoon", - "examine": "(Baby) A stripy little baby raccoon.(Adult) He can run with us.", + "examine": "A stripy little baby raccoon.", "archery_ticket_price": "0", "durability": null }, { "id": "12735", "name": "Raccoon", - "examine": "(Baby) A stripy little baby raccoon.(Adult) He can run with us.", + "examine": "He can run with us.", "archery_ticket_price": "0", "durability": null }, { "id": "12736", "name": "Baby raccoon", - "examine": "(Baby) A stripy little baby raccoon.(Adult) He can run with us.", + "examine": "A stripy little baby raccoon.", "archery_ticket_price": "0", "durability": null }, { "id": "12737", "name": "Raccoon", - "examine": "(Baby) A stripy little baby raccoon.(Adult) He can run with us.", + "examine": "He can run with us.", "archery_ticket_price": "0", "durability": null }, { "id": "12738", "name": "Baby gecko", - "examine": "(Baby) It's so adorably tiny! (Adult) How cute!", + "examine": "It's so adorably tiny!", "archery_ticket_price": "0", "durability": null }, { "id": "12739", "name": "Baby gecko", - "examine": "(Baby) It's so adorably tiny! (Adult) How cute!", + "examine": "It's so adorably tiny!", "archery_ticket_price": "0", "durability": null }, { "id": "12740", "name": "Baby gecko", - "examine": "(Baby) It's so adorably tiny! (Adult) How cute!", + "examine": "It's so adorably tiny!", "archery_ticket_price": "0", "durability": null }, { "id": "12741", "name": "Baby gecko", - "examine": "(Baby) It's so adorably tiny! (Adult) How cute!", + "examine": "It's so adorably tiny!", "archery_ticket_price": "0", "durability": null }, { "id": "12742", "name": "Gecko", - "examine": "(Baby) It's so adorably tiny! (Adult) How cute!", + "examine": "How cute!", "archery_ticket_price": "0", "durability": null }, { "id": "12743", "name": "Gecko", - "examine": "(Baby) It's so adorably tiny! (Adult) How cute!", + "examine": "How cute!", "archery_ticket_price": "0", "durability": null }, { "id": "12744", "name": "Gecko", - "examine": "(Baby) It's so adorably tiny! (Adult) How cute!", + "examine": "How cute!", "archery_ticket_price": "0", "durability": null }, { "id": "12745", "name": "Gecko", - "examine": "(Baby) It's so adorably tiny! (Adult) How cute!", + "examine": "How cute!", "archery_ticket_price": "0", "durability": null }, @@ -102855,56 +102915,56 @@ { "id": "12754", "name": "Baby squirrel", - "examine": "Adult: An experienced nut-thief.Baby: A tiny nut-thief.", + "examine": "A tiny nut-thief.", "archery_ticket_price": "0", "durability": null }, { "id": "12755", "name": "Squirrel", - "examine": "Adult: An experienced nut-thief.Baby: A tiny nut-thief.", + "examine": "An experienced nut-thief.", "archery_ticket_price": "0", "durability": null }, { "id": "12756", "name": "Baby squirrel", - "examine": "Adult: An experienced nut-thief.Baby: A tiny nut-thief.", + "examine": "A tiny nut-thief.", "archery_ticket_price": "0", "durability": null }, { "id": "12757", "name": "Squirrel", - "examine": "Adult: An experienced nut-thief.Baby: A tiny nut-thief.", + "examine": "An experienced nut-thief.", "archery_ticket_price": "0", "durability": null }, { "id": "12758", "name": "Baby squirrel", - "examine": "Adult: An experienced nut-thief.Baby: A tiny nut-thief.", + "examine": "A tiny nut-thief.", "archery_ticket_price": "0", "durability": null }, { "id": "12759", "name": "Squirrel", - "examine": "Adult: An experienced nut-thief.Baby: A tiny nut-thief.", + "examine": "An experienced nut-thief.", "archery_ticket_price": "0", "durability": null }, { "id": "12760", "name": "Baby squirrel", - "examine": "Adult: An experienced nut-thief.Baby: A tiny nut-thief.", + "examine": "A tiny nut-thief.", "archery_ticket_price": "0", "durability": null }, { "id": "12761", "name": "Squirrel", - "examine": "Adult: An experienced nut-thief.Baby: A tiny nut-thief.", + "examine": "An experienced nut-thief.", "archery_ticket_price": "0", "durability": null }, diff --git a/Server/data/configs/npc_configs.json b/Server/data/configs/npc_configs.json index 106281883..2f3dd9984 100644 --- a/Server/data/configs/npc_configs.json +++ b/Server/data/configs/npc_configs.json @@ -38057,11 +38057,13 @@ }, { "id": "3284", - "name": "Squirrel" + "name": "Squirrel", + "examine": "Bushy tail!" }, { "id": "3285", - "name": "Squirrel" + "name": "Squirrel", + "examine": "Bushy tail!" }, { "id": "3286", @@ -38081,7 +38083,8 @@ }, { "id": "3287", - "name": "Raccoon" + "name": "Raccoon", + "examine": "A raccoon." }, { "id": "3288", @@ -77156,20 +77159,23 @@ }, { "id": "6913", - "name": "Baby raccoon" + "name": "Baby raccoon", + "examine": "A stripy little baby raccoon." }, { "id": "6914", - "name": "Raccoon" + "name": "Raccoon", + "examine": "He can run with us." }, { "id": "6915", - "name": "Baby gecko" + "name": "Baby gecko", + "examine": "It's so adorably tiny!" }, { "id": "6916", "name": "Gecko", - "examine": "" + "examine": "How cute!" }, { "id": "6917", @@ -77194,11 +77200,13 @@ }, { "id": "6919", - "name": "Baby squirrel" + "name": "Baby squirrel", + "examine": "A tiny nut-thief." }, { "id": "6920", - "name": "Squirrel" + "name": "Squirrel", + "examine": "An experienced nut-thief." }, { "id": "6921", @@ -77299,6 +77307,7 @@ { "id": "6942", "name": "Baby monkey", + "examine": "It's a tiny, cheeky monkey.", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -77310,6 +77319,7 @@ { "id": "6943", "name": "Monkey", + "examine": "Hide the bananas!", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -77461,7 +77471,8 @@ }, { "id": "6970", - "name": "Pikkupstix" + "name": "Pikkupstix", + "examine": "He's a very important druid." }, { "id": "6971", @@ -77805,6 +77816,16 @@ }, { "id": "6988", + "name": "Pikkupstix", + "examine": "He's a very important druid." + }, + { + "id": "6989", + "name": "Pikkupstix", + "examine": "He's a very important druid." + }, + { + "id": "6990", "name": "Giant wolpertinger" }, { @@ -79666,6 +79687,7 @@ { "id": "7210", "name": "Baby monkey", + "examine": "It's a tiny, cheeky monkey.", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -79677,6 +79699,7 @@ { "id": "7211", "name": "Monkey", + "examine": "Hide the bananas!", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -79688,6 +79711,7 @@ { "id": "7212", "name": "Baby monkey", + "examine": "It's a tiny, cheeky monkey.", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -79699,6 +79723,7 @@ { "id": "7213", "name": "Monkey", + "examine": "Hide the bananas!", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -79710,6 +79735,7 @@ { "id": "7214", "name": "Baby monkey", + "examine": "It's a tiny, cheeky monkey.", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -79721,6 +79747,7 @@ { "id": "7215", "name": "Monkey", + "examine": "Hide the bananas!", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -79732,6 +79759,7 @@ { "id": "7216", "name": "Baby monkey", + "examine": "It's a tiny, cheeky monkey.", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -79743,6 +79771,7 @@ { "id": "7217", "name": "Monkey", + "examine": "Hide the bananas!", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -79754,6 +79783,7 @@ { "id": "7218", "name": "Baby monkey", + "examine": "It's a tiny, cheeky monkey.", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -79765,6 +79795,7 @@ { "id": "7219", "name": "Monkey", + "examine": "Hide the bananas!", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -79776,6 +79807,7 @@ { "id": "7220", "name": "Baby monkey", + "examine": "It's a tiny, cheeky monkey.", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -79787,6 +79819,7 @@ { "id": "7221", "name": "Monkey", + "examine": "Hide the bananas!", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -79798,6 +79831,7 @@ { "id": "7222", "name": "Baby monkey", + "examine": "It's a tiny, cheeky monkey.", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -79809,6 +79843,7 @@ { "id": "7223", "name": "Monkey", + "examine": "Hide the bananas!", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -79820,6 +79855,7 @@ { "id": "7224", "name": "Baby monkey", + "examine": "It's a tiny, cheeky monkey.", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -79831,6 +79867,7 @@ { "id": "7225", "name": "Monkey", + "examine": "Hide the bananas!", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -79842,6 +79879,7 @@ { "id": "7226", "name": "Baby monkey", + "examine": "It's a tiny, cheeky monkey.", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -79853,6 +79891,7 @@ { "id": "7227", "name": "Monkey", + "examine": "Hide the bananas!", "attack_level": "1", "combat_audio": "629,631,630", "defence_level": "1", @@ -80161,19 +80200,23 @@ }, { "id": "7271", - "name": "Baby raccoon" + "name": "Baby raccoon", + "examine": "A stripy little baby raccoon." }, { "id": "7272", - "name": "Raccoon" + "name": "Raccoon", + "examine": "He can run with us." }, { "id": "7273", - "name": "Baby raccoon" + "name": "Baby raccoon", + "examine": "A stripy little baby raccoon." }, { "id": "7274", - "name": "Raccoon" + "name": "Raccoon", + "examine": "He can run with us." }, { "id": "7275", @@ -80193,40 +80236,48 @@ }, { "id": "7276", - "name": "Baby raccoon" + "name": "Baby raccoon", + "examine": "A stripy little baby raccoon." }, { "id": "7277", - "name": "Baby gecko" + "name": "Baby gecko", + "examine": "It's so adorably tiny!" }, { "id": "7278", - "name": "Baby gecko" + "name": "Baby gecko", + "examine": "It's so adorably tiny!" }, { "id": "7279", - "name": "Baby gecko" + "name": "Baby gecko", + "examine": "It's so adorably tiny!" }, { "id": "7280", - "name": "Baby gecko" + "name": "Baby gecko", + "examine": "It's so adorably tiny!" }, { "id": "7281", "name": "Gecko", - "examine": "" + "examine": "How cute!" }, { "id": "7282", - "name": "Gecko" + "name": "Gecko", + "examine": "How cute!" }, { "id": "7283", - "name": "Gecko" + "name": "Gecko", + "examine": "How cute!" }, { "id": "7284", - "name": "Gecko" + "name": "Gecko", + "examine": "How cute!" }, { "id": "7285", @@ -80252,7 +80303,7 @@ { "id": "7287", "name": "Baby gecko", - "examine": "" + "examine": "It's so adorably tiny!" }, { "id": "7288", @@ -80261,7 +80312,8 @@ }, { "id": "7289", - "name": "Gecko" + "name": "Gecko", + "examine": "How cute!" }, { "id": "7290", @@ -80270,7 +80322,8 @@ }, { "id": "7291", - "name": "Gecko" + "name": "Gecko", + "examine": "How cute!" }, { "id": "7292", @@ -80311,51 +80364,63 @@ }, { "id": "7301", - "name": "Baby squirrel" + "name": "Baby squirrel", + "examine": "A tiny nut-thief." }, { "id": "7302", - "name": "Squirrel" + "name": "Squirrel", + "examine": "An experienced nut-thief." }, { "id": "7303", - "name": "Baby squirrel" + "name": "Baby squirrel", + "examine": "A tiny nut-thief." }, { "id": "7304", - "name": "Squirrel" + "name": "Squirrel", + "examine": "An experienced nut-thief." }, { "id": "7305", - "name": "Baby squirrel" + "name": "Baby squirrel", + "examine": "A tiny nut-thief." }, { "id": "7306", - "name": "Squirrel" + "name": "Squirrel", + "examine": "An experienced nut-thief." }, { "id": "7307", - "name": "Baby squirrel" + "name": "Baby squirrel", + "examine": "A tiny nut-thief." }, { "id": "7308", - "name": "Squirrel" + "name": "Squirrel", + "examine": "An experienced nut-thief." }, { "id": "7309", - "name": "Baby squirrel" + "name": "Baby squirrel", + "examine": "A tiny nut-thief." }, { "id": "7310", - "name": "Baby squirrel" + "name": "Baby squirrel", + "examine": "A tiny nut-thief." }, { "id": "7311", - "name": "Baby squirrel" + "name": "Baby squirrel", + "examine": "A tiny nut-thief." }, { "id": "7312", - "name": "Baby squirrel" + "name": "Baby squirrel", + "examine": "A tiny nut-thief." }, { "id": "7313", diff --git a/Server/src/main/content/global/skill/hunter/NetTrapNode.kt b/Server/src/main/content/global/skill/hunter/NetTrapNode.kt new file mode 100644 index 000000000..43b9fdad5 --- /dev/null +++ b/Server/src/main/content/global/skill/hunter/NetTrapNode.kt @@ -0,0 +1,25 @@ +package content.global.skill.hunter + +import core.api.getStatLevel +import core.game.node.entity.npc.NPC +import core.game.node.entity.skill.Skills +import core.game.node.item.Item + +/** + * Handles the net trap node. + */ +class NetTrapNode( + npcIds: IntArray, + level: Int, + experience: Double, + rewards: Array, + private val summoningLevel: Int +) : TrapNode(npcIds, level, experience, intArrayOf(), rewards) { + + override fun canCatch(wrapper: TrapWrapper, npc: NPC): Boolean { + if (getStatLevel(wrapper.player, Skills.SUMMONING) < summoningLevel) { + return false + } + return super.canCatch(wrapper, npc) + } +} \ No newline at end of file diff --git a/Server/src/main/content/global/skill/hunter/Traps.java b/Server/src/main/content/global/skill/hunter/Traps.java index f2151d660..f0cec6d54 100644 --- a/Server/src/main/content/global/skill/hunter/Traps.java +++ b/Server/src/main/content/global/skill/hunter/Traps.java @@ -9,6 +9,8 @@ import core.tools.Log; import core.tools.SystemLogger; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; +import org.rs09.consts.Items; +import org.rs09.consts.NPCs; import java.util.ArrayList; import java.util.List; @@ -33,16 +35,30 @@ public enum Traps { } }), BOX_TRAP(new TrapSetting(10008, new int[] { 19187 }, new int[] { 1963, 12579, 1869, 9996, 5972, 12535 }, "lay", 19192, Animation.create(5208), new Animation(9726), 27), - new BoxTrapNode(new int[] { 5081 }, 27, 100, new Item[] { new Item(10092) }, 1), - new BoxTrapNode(new int[] { 6918, 7289, 7290, 7291, 7292 }, 27, 100, new Item[] { new Item(12184) }, 10), - new BoxTrapNode(new int[] { 1487 }, 27, 100, new Item[] { new Item(4033, 1) }, 95), - new BoxTrapNode(new int[] { 7021, 7022, 7023 }, 48, 150, new Item[] { new Item(12551, 1) }, 1), - new BoxTrapNode(new int[] { 5079 }, 53, 198, new Item[] { new Item(10033, 1) }, 1), - new BoxTrapNode(new int[] { 5428, 5430, 5449, 5450, 5451 }, 56, 150, new Item[] { new Item(12188) }, 1), - 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, 0, new Item[] { new Item(12539, 1) }, 1) { + new BoxTrapNode(new int[] { 5081 }, 27, 100, new Item[] { new Item(10092) }, 1), // Ferret + new BoxTrapNode(new int[] {NPCs.BABY_GECKO_6917 }, 27, 100, new Item[] { new Item(Items.BABY_GECKO_12488) }, 10), // Gecko Orange + new BoxTrapNode(new int[] {NPCs.BABY_GECKO_7285 }, 27, 100, new Item[] { new Item(Items.BABY_GECKO_12738) }, 10), // Gecko Speckled + new BoxTrapNode(new int[] {NPCs.BABY_GECKO_7286 }, 27, 100, new Item[] { new Item(Items.BABY_GECKO_12739) }, 10), // Gecko Green + new BoxTrapNode(new int[] {NPCs.BABY_GECKO_7287 }, 27, 100, new Item[] { new Item(Items.BABY_GECKO_12740) }, 10), // Gecko Blue + new BoxTrapNode(new int[] {NPCs.BABY_GECKO_7288 }, 27, 100, new Item[] { new Item(Items.BABY_GECKO_12741) }, 10), // Gecko Red + new BoxTrapNode(new int[] {NPCs.BABY_RACCOON_6997 }, 27, 100, new Item[] { new Item(Items.BABY_RACCOON_12486) }, 80), // Raccoon Gray + new BoxTrapNode(new int[] {NPCs.BABY_RACCOON_7275 }, 27, 100, new Item[] { new Item(Items.BABY_RACCOON_12734) }, 80), // Raccoon Tan + new BoxTrapNode(new int[] {NPCs.BABY_RACCOON_7276 }, 27, 100, new Item[] { new Item(Items.BABY_RACCOON_12736) }, 80), // Raccoon Red + new BoxTrapNode(new int[] { NPCs.BABY_MONKEY_6944 }, 27, 100, new Item[] { new Item(Items.BABY_MONKEY_12496) }, 95), // Monkey + new BoxTrapNode(new int[] { NPCs.BABY_MONKEY_7228 }, 27, 100, new Item[] { new Item(Items.BABY_MONKEY_12682) }, 95), // Monkey + new BoxTrapNode(new int[] { NPCs.BABY_MONKEY_7229 }, 27, 100, new Item[] { new Item(Items.BABY_MONKEY_12684) }, 95), // Monkey + new BoxTrapNode(new int[] { NPCs.BABY_MONKEY_7230 }, 27, 100, new Item[] { new Item(Items.BABY_MONKEY_12686) }, 95), // Monkey + new BoxTrapNode(new int[] { NPCs.BABY_MONKEY_7231 }, 27, 100, new Item[] { new Item(Items.BABY_MONKEY_12688) }, 95), // Monkey + new BoxTrapNode(new int[] { NPCs.BABY_MONKEY_7232 }, 27, 100, new Item[] { new Item(Items.BABY_MONKEY_12690) }, 95), // Monkey + new BoxTrapNode(new int[] { NPCs.BABY_MONKEY_7233 }, 27, 100, new Item[] { new Item(Items.BABY_MONKEY_12692) }, 95), // Monkey + new BoxTrapNode(new int[] { NPCs.BABY_MONKEY_7234 }, 27, 100, new Item[] { new Item(Items.BABY_MONKEY_12694) }, 95), // Monkey + new BoxTrapNode(new int[] { NPCs.BABY_MONKEY_7235 }, 27, 100, new Item[] { new Item(Items.BABY_MONKEY_12696) }, 95), // Monkey + new BoxTrapNode(new int[] { NPCs.BABY_MONKEY_7236 }, 27, 100, new Item[] { new Item(Items.BABY_MONKEY_12698) }, 95), // Monkey + new BoxTrapNode(new int[] { 7021, 7022, 7023 }, 48, 150, new Item[] { new Item(12551, 1) }, 1), // Platypus + new BoxTrapNode(new int[] { 5079 }, 53, 198, new Item[] { new Item(10033, 1) }, 1), // Chinchompa + new BoxTrapNode(new int[] { 5080 }, 63, 265, new Item[] { new Item(10034, 1) }, 1), // Red Chinchompa + new BoxTrapNode(new int[] { 7012, 7014 }, 66, 400, new Item[] { new Item(12535) }, 1), // Pawya + new BoxTrapNode(new int[] { 7010, 7011 }, 77, 0, new Item[] { new Item(12539, 1) }, 1) { // Grenwall @Override public boolean canCatch(TrapWrapper wrapper, final NPC npc) { //old xp: 726 @@ -59,11 +75,16 @@ public enum Traps { new TrapNode(new int[] { 5086 }, 37, 204, new int[] { 19208, 19208, 19217 }, new Item[] { new Item(10105), new Item(526) }), new TrapNode(new int[] { 7039 }, 44, 200, new int[] { 28939, 28940, 28941 }, new Item[] { new Item(12567), new Item(526) }), new TrapNode(new int[] { 5087 }, 51, 200, new int[] { 19209, 19210, 19216 }, new Item[] { new Item(10109), new Item(526) })), - NET_TRAP(new NetTrapSetting(), new TrapNode(new int[] { 5117 }, 29, 152, new int[] {}, new Item[] { new Item(10149) }), - new TrapNode(new int[] { 5114 }, 47, 224, new int[] {}, new Item[] { new Item(10146) }), - new TrapNode(new int[] { 6921 }, 29, 152, new int[] {}, new Item[] { new Item(12130) }), - new TrapNode(new int[] { 5115 }, 59, 272, new int[] {}, new Item[] { new Item(10147) }), - new TrapNode(new int[] { 5116 }, 67, 304, new int[] {}, new Item[] { new Item(10148) })); + NET_TRAP(new NetTrapSetting(), + new NetTrapNode(new int[] { 5117 }, 29, 152, new Item[] { new Item(10149) }, 1), // Swamp Lizard + new NetTrapNode(new int[] { 5114 }, 47, 224, new Item[] { new Item(10146) }, 1), // Orange Salamander + new NetTrapNode(new int[] { NPCs.BABY_SQUIRREL_6921 }, 29, 152, new Item[] { new Item(Items.BABY_SQUIRREL_12490) }, 60), // Squirrel Gray + new NetTrapNode(new int[] { NPCs.BABY_SQUIRREL_7309 }, 29, 152, new Item[] { new Item(Items.BABY_SQUIRREL_12754) }, 60), // Squirrel Tan + new NetTrapNode(new int[] { NPCs.BABY_SQUIRREL_7310 }, 29, 152, new Item[] { new Item(Items.BABY_SQUIRREL_12756) }, 60), // Squirrel White + new NetTrapNode(new int[] { NPCs.BABY_SQUIRREL_7311 }, 29, 152, new Item[] { new Item(Items.BABY_SQUIRREL_12758) }, 60), // Squirrel Grayish/Brown w/e + new NetTrapNode(new int[] { NPCs.BABY_SQUIRREL_7312 }, 29, 152, new Item[] { new Item(Items.BABY_SQUIRREL_12760) }, 60), // Squirrel Brown + new NetTrapNode(new int[] { 5115 }, 59, 272, new Item[] { new Item(10147) }, 1), // Red Salamander + new NetTrapNode(new int[] { 5116 }, 67, 304, new Item[] { new Item(10148) }, 1)); // Black Salamander /** * The location hooks for this node.