diff --git a/Server/data/configs/npc_spawns.json b/Server/data/configs/npc_spawns.json index f40e0c9bb..6e30e2cbf 100644 --- a/Server/data/configs/npc_spawns.json +++ b/Server/data/configs/npc_spawns.json @@ -10718,5 +10718,17 @@ { "npc_id": "5517", "loc_data": "{2403,3853,0,1,0}-{2328,3830,0,1,0}-{2405,3860,0,1,0}-{2335,3894,0,1,0}" + }, + { + "npc_id": "3848", + "loc_data": "{2410,3780,0,1,0}-{2414,3780,0,1,0}" + }, + { + "npc_id": "313", + "loc_data":"{2401,3781,0,1,0}" + }, + { + "npc_id": "312", + "loc_data": "{2421,3789,0,1,0}" } ] \ No newline at end of file diff --git a/Server/src/main/java/core/game/node/entity/skill/fishing/FishingOption.java b/Server/src/main/java/core/game/node/entity/skill/fishing/FishingOption.java index 9ba15f22f..40fab98d2 100644 --- a/Server/src/main/java/core/game/node/entity/skill/fishing/FishingOption.java +++ b/Server/src/main/java/core/game/node/entity/skill/fishing/FishingOption.java @@ -5,6 +5,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.world.update.flag.context.Animation; import core.tools.RandomFunction; +import org.rs09.consts.Items; import java.util.HashMap; @@ -25,7 +26,9 @@ public enum FishingOption { BIG_NET(new Item(305), 16, Animation.create(620), null, "net", Fish.MACKEREL, Fish.COD, Fish.BASS, Fish.SEAWEED), N_HARPOON(new Item(311), 76, Animation.create(618), null, "harpoon", Fish.SHARK), H_NET(new Item(303), 1, Animation.create(621), null, "net", Fish.MONKFISH), - C_CAGE(new Item(301), 85, Animation.create(619), new Item(14943), "cage", Fish.DARK_CRAB); + C_CAGE(new Item(301), 85, Animation.create(619), new Item(14943), "cage", Fish.DARK_CRAB), + KBWANJI_NET(new Item(Items.SMALL_FISHING_NET_303), 5, Animation.create(621), null, "net", Fish.KARAMBWANJI), + KARAMBWAN_VES(new Item(Items.KARAMBWAN_VESSEL_3157), 65, Animation.create(1193), new Item(Items.RAW_KARAMBWANJI_3150), "fish", Fish.KARAMBWAN); public static HashMap nameMap = new HashMap<>(); static{ diff --git a/Server/src/main/java/core/game/node/entity/skill/fishing/FishingSpot.java b/Server/src/main/java/core/game/node/entity/skill/fishing/FishingSpot.java index 045fa780e..57d115c0c 100644 --- a/Server/src/main/java/core/game/node/entity/skill/fishing/FishingSpot.java +++ b/Server/src/main/java/core/game/node/entity/skill/fishing/FishingSpot.java @@ -13,7 +13,9 @@ public enum FishingSpot { CAGE_HARPOON(new int[] { 312, 321, 324, 333, 405, 1332, 1399, 3804, 5470, 7046}, FishingOption.CAGE, FishingOption.HARPOON), NET_HARPOON(new int[] { 313, 322, 334, 406, 1191, 1333, 1405, 1406, 3574, 3575, 5471, 7044 }, FishingOption.BIG_NET, FishingOption.N_HARPOON), HARPOON_NET(new int[] { 3848, 3849 }, FishingOption.HARPOON, FishingOption.H_NET, FishingOption.BARB_HARPOON), - CRAB_CAGE(new int[] {8665}, FishingOption.C_CAGE); + CRAB_CAGE(new int[] {8665}, FishingOption.C_CAGE), + SPOT_KBWANJI(new int[] {1174}, FishingOption.KBWANJI_NET), + SPOT_KARAMBWAN(new int[] {1177}, FishingOption.KARAMBWAN_VES); public static HashMap spotMap = new HashMap<>(); diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/GatheringSkillOptionListeners.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/GatheringSkillOptionListeners.kt index 706cad747..efc3903cb 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/GatheringSkillOptionListeners.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/GatheringSkillOptionListeners.kt @@ -35,6 +35,7 @@ class GatheringSkillOptionListeners : InteractionListener() { on(NPC,"bait"){player,node -> return@on fish(player,node,"bait")} on(NPC,"harpoon"){player,node -> return@on fish(player,node,"harpoon")} on(NPC,"cage"){player,node -> return@on fish(player,node,"cage")} + on(NPC,"fish"){player, node -> return@on fish(player,node,"fish") } } fun fish(player: Player, node: Node, opt: String): Boolean{