From d9cd3dfd45dc21a692ef521aa9abd8571875b760 Mon Sep 17 00:00:00 2001 From: melkypie <5113962+melkypie@users.noreply.github.com> Date: Sun, 3 May 2020 00:55:23 +0300 Subject: [PATCH] fishing: add unmapped fishing spots --- .../net/runelite/client/game/FishingSpot.java | 48 ++++++++++++------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/FishingSpot.java b/runelite-client/src/main/java/net/runelite/client/game/FishingSpot.java index b116d71495..0000624d2d 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/FishingSpot.java +++ b/runelite-client/src/main/java/net/runelite/client/game/FishingSpot.java @@ -30,9 +30,11 @@ import lombok.Getter; import net.runelite.api.ItemID; import static net.runelite.api.NpcID.FISHING_SPOT_1497; import static net.runelite.api.NpcID.FISHING_SPOT_1498; +import static net.runelite.api.NpcID.FISHING_SPOT_1499; import static net.runelite.api.NpcID.FISHING_SPOT_1510; import static net.runelite.api.NpcID.FISHING_SPOT_1511; import static net.runelite.api.NpcID.FISHING_SPOT_1514; +import static net.runelite.api.NpcID.FISHING_SPOT_1517; import static net.runelite.api.NpcID.FISHING_SPOT_1518; import static net.runelite.api.NpcID.FISHING_SPOT_1519; import static net.runelite.api.NpcID.FISHING_SPOT_1520; @@ -43,12 +45,15 @@ import static net.runelite.api.NpcID.FISHING_SPOT_1524; import static net.runelite.api.NpcID.FISHING_SPOT_1525; import static net.runelite.api.NpcID.FISHING_SPOT_1528; import static net.runelite.api.NpcID.FISHING_SPOT_1530; +import static net.runelite.api.NpcID.FISHING_SPOT_1535; import static net.runelite.api.NpcID.FISHING_SPOT_1536; import static net.runelite.api.NpcID.FISHING_SPOT_1542; import static net.runelite.api.NpcID.FISHING_SPOT_1544; import static net.runelite.api.NpcID.FISHING_SPOT_2653; import static net.runelite.api.NpcID.FISHING_SPOT_2654; import static net.runelite.api.NpcID.FISHING_SPOT_2655; +import static net.runelite.api.NpcID.FISHING_SPOT_3317; +import static net.runelite.api.NpcID.FISHING_SPOT_3419; import static net.runelite.api.NpcID.FISHING_SPOT_3913; import static net.runelite.api.NpcID.FISHING_SPOT_3914; import static net.runelite.api.NpcID.FISHING_SPOT_3915; @@ -86,8 +91,13 @@ import static net.runelite.api.NpcID.FISHING_SPOT_8523; import static net.runelite.api.NpcID.FISHING_SPOT_8525; import static net.runelite.api.NpcID.FISHING_SPOT_8526; import static net.runelite.api.NpcID.FISHING_SPOT_8527; +import static net.runelite.api.NpcID.FISHING_SPOT_9171; +import static net.runelite.api.NpcID.FISHING_SPOT_9172; +import static net.runelite.api.NpcID.FISHING_SPOT_9173; +import static net.runelite.api.NpcID.FISHING_SPOT_9174; import static net.runelite.api.NpcID.ROD_FISHING_SPOT; import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1506; +import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1507; import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1508; import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1509; import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1513; @@ -95,6 +105,8 @@ import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1515; import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1516; import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1526; import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1527; +import static net.runelite.api.NpcID.ROD_FISHING_SPOT_3417; +import static net.runelite.api.NpcID.ROD_FISHING_SPOT_3418; import static net.runelite.api.NpcID.ROD_FISHING_SPOT_6825; import static net.runelite.api.NpcID.ROD_FISHING_SPOT_7463; import static net.runelite.api.NpcID.ROD_FISHING_SPOT_7464; @@ -108,33 +120,35 @@ import static net.runelite.api.NpcID.FISHING_SPOT_6784; public enum FishingSpot { SHRIMP("Shrimp, Anchovies", ItemID.RAW_SHRIMPS, - FISHING_SPOT_1514, FISHING_SPOT_1518, FISHING_SPOT_1521, - FISHING_SPOT_1523, FISHING_SPOT_1524, FISHING_SPOT_1525, - FISHING_SPOT_1528, FISHING_SPOT_1530, FISHING_SPOT_1544, - FISHING_SPOT_3913, FISHING_SPOT_7155, FISHING_SPOT_7459, - FISHING_SPOT_7462, FISHING_SPOT_7467, FISHING_SPOT_7469, - FISHING_SPOT_7947 + FISHING_SPOT_1514, FISHING_SPOT_1517, FISHING_SPOT_1518, + FISHING_SPOT_1521, FISHING_SPOT_1523, FISHING_SPOT_1524, + FISHING_SPOT_1525, FISHING_SPOT_1528, FISHING_SPOT_1530, + FISHING_SPOT_1544, FISHING_SPOT_3913, FISHING_SPOT_7155, + FISHING_SPOT_7459, FISHING_SPOT_7462, FISHING_SPOT_7467, + FISHING_SPOT_7469, FISHING_SPOT_7947 ), LOBSTER("Lobster, Swordfish, Tuna", ItemID.RAW_LOBSTER, FISHING_SPOT_1510, FISHING_SPOT_1519, FISHING_SPOT_1522, FISHING_SPOT_3914, FISHING_SPOT_5820, FISHING_SPOT_7199, FISHING_SPOT_7460, FISHING_SPOT_7465, FISHING_SPOT_7470, - FISHING_SPOT_7946 + FISHING_SPOT_7946, FISHING_SPOT_9173, FISHING_SPOT_9174 ), SHARK("Shark, Bass", ItemID.RAW_SHARK, - FISHING_SPOT_1511, FISHING_SPOT_1520, FISHING_SPOT_3915, - FISHING_SPOT_4476, FISHING_SPOT_4477, FISHING_SPOT_5233, - FISHING_SPOT_5234, FISHING_SPOT_5821, FISHING_SPOT_7200, - FISHING_SPOT_7461, FISHING_SPOT_7466, FISHING_SPOT_8525, - FISHING_SPOT_8526, FISHING_SPOT_8527 + FISHING_SPOT_1511, FISHING_SPOT_1520, FISHING_SPOT_3419, + FISHING_SPOT_3915, FISHING_SPOT_4476, FISHING_SPOT_4477, + FISHING_SPOT_5233, FISHING_SPOT_5234, FISHING_SPOT_5821, + FISHING_SPOT_7200, FISHING_SPOT_7461, FISHING_SPOT_7466, + FISHING_SPOT_8525, FISHING_SPOT_8526, FISHING_SPOT_8527, + FISHING_SPOT_9171, FISHING_SPOT_9172 ), MONKFISH("Monkfish", ItemID.RAW_MONKFISH, FISHING_SPOT_4316 ), SALMON("Salmon, Trout", ItemID.RAW_SALMON, - ROD_FISHING_SPOT, ROD_FISHING_SPOT_1506, ROD_FISHING_SPOT_1508, - ROD_FISHING_SPOT_1509, ROD_FISHING_SPOT_1513, ROD_FISHING_SPOT_1515, - ROD_FISHING_SPOT_1516, ROD_FISHING_SPOT_1526, ROD_FISHING_SPOT_1527, + ROD_FISHING_SPOT, ROD_FISHING_SPOT_1506, ROD_FISHING_SPOT_1507, + ROD_FISHING_SPOT_1508, ROD_FISHING_SPOT_1509, ROD_FISHING_SPOT_1513, + ROD_FISHING_SPOT_1515, ROD_FISHING_SPOT_1516, ROD_FISHING_SPOT_1526, + ROD_FISHING_SPOT_1527, ROD_FISHING_SPOT_3417, ROD_FISHING_SPOT_3418, ROD_FISHING_SPOT_7463, ROD_FISHING_SPOT_7464, ROD_FISHING_SPOT_7468, ROD_FISHING_SPOT_8524 ), @@ -163,13 +177,13 @@ public enum FishingSpot FISHING_SPOT_6488 ), CAVE_EEL("Cave eel", ItemID.RAW_CAVE_EEL, - FISHING_SPOT_1497, FISHING_SPOT_1498 + FISHING_SPOT_1497, FISHING_SPOT_1498, FISHING_SPOT_1499 ), SLIMY_EEL("Slimy eel", ItemID.RAW_SLIMY_EEL, FISHING_SPOT_2653, FISHING_SPOT_2654, FISHING_SPOT_2655 ), DARK_CRAB("Dark Crab", ItemID.RAW_DARK_CRAB, - FISHING_SPOT_1536 + FISHING_SPOT_1535, FISHING_SPOT_1536 ), COMMON_TENCH("Common tench, Bluegill, Greater siren, Mottled eel", ItemID.COMMON_TENCH, FISHING_SPOT_8523);