Merge pull request #9472 from Alexsuperfly/sote-world-map-updates

Prifddinas world map icon updates

runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java

@@ -143,6 +143,7 @@ public enum AgilityShortcut
 	YANILLE_DUNGEON_MONKEY_BARS(57, "Monkey Bars", null, MONKEYBARS_23567),
 	PHASMATYS_ECTOPOOL_SHORTCUT(58, "Weathered Wall", null , WEATHERED_WALL, WEATHERED_WALL_16526),
 	ELVEN_OVERPASS_CLIFF_SCRAMBLE(59, "Rocks", new WorldPoint(2345, 3300, 0), ROCKS_16514, ROCKS_16515),
+	ELVEN_OVERPASS_CLIFF_SCRAMBLE_PRIFDDINAS(59, "Rocks", new WorldPoint(3369, 6052, 0), ROCKS_16514, ROCKS_16515),
 	WILDERNESS_GWD_CLIMB_EAST(60, "Rocks", new WorldPoint(2943, 3770, 0), ROCKY_HANDHOLDS_26400, ROCKY_HANDHOLDS_26401, ROCKY_HANDHOLDS_26402, ROCKY_HANDHOLDS_26404, ROCKY_HANDHOLDS_26405, ROCKY_HANDHOLDS_26406),
 	WILDERNESS_GWD_CLIMB_WEST(60, "Rocks", new WorldPoint(2928, 3760, 0), ROCKY_HANDHOLDS_26400, ROCKY_HANDHOLDS_26401, ROCKY_HANDHOLDS_26402, ROCKY_HANDHOLDS_26404, ROCKY_HANDHOLDS_26405, ROCKY_HANDHOLDS_26406),
 	MOS_LEHARMLESS_STEPPING_STONE(60, "Stepping Stone", new WorldPoint(3710, 2970, 0), STEPPING_STONE_19042),
@@ -164,6 +165,7 @@ public enum AgilityShortcut
 	HEROES_GUILD_TUNNEL_WEST(67, "Crevice", new WorldPoint(2913, 9895, 0), CREVICE_9739, CREVICE_9740),
 	YANILLE_DUNGEON_RUBBLE_CLIMB(67, "Pile of Rubble", null, PILE_OF_RUBBLE_23563, PILE_OF_RUBBLE_23564),
 	ELVEN_OVERPASS_MEDIUM_CLIFF(68, "Rocks", new WorldPoint(2337, 3288, 0), ROCKS_16514, ROCKS_16515),
+	ELVEN_OVERPASS_MEDIUM_CLIFF_PRIFDDINAS(68, "Rocks", new WorldPoint(3361, 6040, 0), ROCKS_16514, ROCKS_16515),
 	WEISS_OBSTACLES(68, "Shortcut", null, LITTLE_BOULDER, ROCKSLIDE_33184, ROCKSLIDE_33185, NULL_33327, NULL_33328, LEDGE_33190, ROCKSLIDE_33191, FALLEN_TREE_33192),
 	ARCEUUS_ESSENSE_NORTH(69, "Rock Climb", new WorldPoint(1761, 3873, 0), ROCKS_34741),
 	TAVERLEY_DUNGEON_PIPE_BLUE_DRAGON(70, "Pipe Squeeze", new WorldPoint(2886, 9798, 0), OBSTACLE_PIPE_16509),
@@ -185,13 +187,18 @@ public enum AgilityShortcut
 	REVENANT_CAVES_ANKOU_NORTH(75, "Jump", new WorldPoint(3180, 10209, 0), PILLAR_31561),
 	ZUL_ANDRA_ISLAND_CROSSING(76, "Stepping Stone", new WorldPoint(2156, 3073, 0), STEPPING_STONE_10663),
 	SHILO_VILLAGE_STEPPING_STONES( 77, "Stepping Stones", new WorldPoint(2863, 2974, 0), STEPPING_STONE_16466),
+	IORWERTHS_DUNGEON_NORTHERN_SHORTCUT_EAST(78, "Tight Gap", new WorldPoint(3221, 12441, 0), TIGHT_GAP),
+	IORWERTHS_DUNGEON_NORTHERN_SHORTCUT_WEST(78, "Tight Gap", new WorldPoint(3215, 12441, 0), TIGHT_GAP_36693),
 	KHARAZI_JUNGLE_VINE_CLIMB(79, "Vine", new WorldPoint(2897, 2939, 0), NULL_26884, NULL_26886),
 	TAVERLEY_DUNGEON_SPIKED_BLADES(80, "Strange Floor", new WorldPoint(2877, 9813, 0), STRANGE_FLOOR),
 	SLAYER_DUNGEON_CHASM_JUMP(81, "Spiked Blades", new WorldPoint(2770, 10003, 0), STRANGE_FLOOR_16544),
 	LAVA_MAZE_NORTH_JUMP(82, "Stepping Stone", new WorldPoint(3092, 3880, 0), STEPPING_STONE_14917),
 	BRIMHAVEN_DUNGEON_EAST_STEPPING_STONES_NORTH(83, "Stepping Stones", new WorldPoint(2685, 9547, 0), STEPPING_STONE_19040),
 	BRIMHAVEN_DUNGEON_EAST_STEPPING_STONES_SOUTH(83, "Stepping Stones", new WorldPoint(2693, 9529, 0), STEPPING_STONE_19040),
+	IORWERTHS_DUNGEON_SOUTHERN_SHORTCUT_EAST(84, "Tight Gap", new WorldPoint(3241, 12420, 0), TIGHT_GAP_36694),
+	IORWERTHS_DUNGEON_SOUTHERN_SHORTCUT_WEST(84, "Tight Gap", new WorldPoint(3231, 12420, 0), TIGHT_GAP_36695),
 	ELVEN_ADVANCED_CLIFF_SCRAMBLE(85, "Rocks", new WorldPoint(2337, 3253, 0), ROCKS_16514, ROCKS_16514),
+	ELVEN_ADVANCED_CLIFF_SCRAMBLE_PRIFDDINAS(85, "Rocks", new WorldPoint(3361, 6005, 0), ROCKS_16514, ROCKS_16514),
 	KALPHITE_WALL(86, "Crevice", new WorldPoint(3214, 9508, 0), CREVICE_16465),
 	BRIMHAVEN_DUNGEON_VINE_EAST(87, "Vine", new WorldPoint(2672, 9582, 0), VINE_26880, VINE_26882),
 	BRIMHAVEN_DUNGEON_VINE_WEST(87, "Vine", new WorldPoint(2606, 9584, 0), VINE_26880, VINE_26882),

runelite-client/src/main/java/net/runelite/client/plugins/worldmap/FarmingPatchLocation.java

@@ -40,7 +40,8 @@ enum FarmingPatchLocation
 		new WorldPoint(3598, 3524, 0),
 		new WorldPoint(3052, 3309, 0),
 		new WorldPoint(2810, 3462, 0),
-		new WorldPoint(2663, 3375, 0)
+		new WorldPoint(2663, 3375, 0),
+		new WorldPoint(3289, 6100, 0)
 	),
 	ANIMA_HERB("Anima/Herb", new WorldPoint(1235, 3724, 0)),
 	BELLADONNA("Belladonna", new WorldPoint(3084, 3356, 0)),
@@ -59,6 +60,9 @@ enum FarmingPatchLocation
 	CELASTRUS_FRUIT_TREE("Celastrus/Fruit Tree",
 		new WorldPoint(1242, 3755, 0)
 	),
+	CRYSTAL_TREE("Crystal Tree",
+		new WorldPoint(3292, 6120, 0)
+	),
 	FRUIT_TREE("Fruit Tree",
 		new WorldPoint(2487, 3181, 0),
 		new WorldPoint(2343, 3160, 0),

runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MinigameLocation.java

@@ -70,7 +70,8 @@ enum MinigameLocation
 	ANIMATION_ROOM("Animation Room", new WorldPoint(2853, 3537, 0)),
 	DUMMY_ROOM("Dummy Room", new WorldPoint(2857, 3551, 0)),
 	CATAPULT_ROOM("Catapult Room", new WorldPoint(2842, 3545, 0)),
-	SHOT_PUT_ROOM("Shot Put Room", new WorldPoint(2863, 3550, 0));
+	SHOT_PUT_ROOM("Shot Put Room", new WorldPoint(2863, 3550, 0)),
+	THE_GAUNTLET("The Gauntlet", new WorldPoint(3223, 12505, 1));
 
 	private final String tooltip;
 	private final WorldPoint location;

runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java

@@ -130,7 +130,7 @@ enum QuestStartLocation
 	OBSERVATORY_QUEST(Quest.OBSERVATORY_QUEST, new WorldPoint(2438, 3185, 0)),
 	OLAFS_QUEST(Quest.OLAFS_QUEST, new WorldPoint(2723, 3729, 0)),
 	ONE_SMALL_FAVOUR(Quest.ONE_SMALL_FAVOUR, new WorldPoint(2834, 2985, 0)),
-	PLAGUE_CITY(Quest.PLAGUE_CITY, new WorldPoint(2567, 3334, 0)),
+	PLAGUE_CITY_SONG_OF_THE_ELVES(new Quest[]{Quest.PLAGUE_CITY, Quest.SONG_OF_THE_ELVES}, new WorldPoint(2567, 3334, 0)),
 	PRIEST_IN_PERIL(Quest.PRIEST_IN_PERIL, new WorldPoint(3219, 3473, 0)),
 	THE_QUEEN_OF_THIEVES(Quest.THE_QUEEN_OF_THIEVES, new WorldPoint(1795, 3782, 0)),
 	RAG_AND_BONE_MAN(new Quest[]{Quest.RAG_AND_BONE_MAN, Quest.RAG_AND_BONE_MAN_II}, new WorldPoint(3359, 3504, 0)),

runelite-client/src/main/java/net/runelite/client/plugins/worldmap/RareTreeLocation.java

@@ -50,7 +50,10 @@ enum RareTreeLocation
 		new WorldPoint(2899, 2897, 0),
 
 		// Feldip Hills
-		new WorldPoint(2333, 3049, 0)),
+		new WorldPoint(2333, 3049, 0),
+
+		// Prifddinas
+		new WorldPoint(3309, 6123, 0)),
 
 	SWAYING("Swaying tree", 40,
 		// The Fremennik Trials
@@ -78,7 +81,11 @@ enum RareTreeLocation
 		new WorldPoint(2726, 3501, 0),
 		new WorldPoint(2728, 3481, 0),
 		new WorldPoint(2748, 3466, 0),
-		new WorldPoint(2710, 3570, 0)),
+		new WorldPoint(2710, 3570, 0),
+
+		// Prifddinas
+		new WorldPoint(2209, 3427, 0),
+		new WorldPoint(3233, 6179, 0)),
 
 	MAHOGANY("Mahogany tree", 50,
 		// Zeah
@@ -92,7 +99,10 @@ enum RareTreeLocation
 		new WorldPoint(3824, 3053, 0),
 
 		// Karamja
-		new WorldPoint(2946, 2908, 0)),
+		new WorldPoint(2946, 2908, 0),
+
+		// Prifddinas
+		new WorldPoint(3301, 6129, 0)),
 
 	TEAK_MAHOGANY("Teak/Mahogany trees", 50,
 		// Miscellania
@@ -126,6 +136,10 @@ enum RareTreeLocation
 		// Tirannwn
 		new WorldPoint(2217, 3141, 0),
 
+		// Prifddinas
+		new WorldPoint(3288, 6066, 0),
+		new WorldPoint(3305, 6032, 0),
+
 		// Kandarin
 		new WorldPoint(2315, 3610, 0),
 		new WorldPoint(2331, 3514, 0),
@@ -202,6 +216,9 @@ enum RareTreeLocation
 		// Tirannwn
 		new WorldPoint(2284, 3141, 0),
 
+		// Prifddinas
+		new WorldPoint(3229, 6101, 0),
+
 		// Kandarin
 		new WorldPoint(2371, 3427, 0),
 		new WorldPoint(2432, 3411, 0),

runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java

@@ -139,6 +139,8 @@ enum TeleportLocationData
 	PHARAOHS_SCEPTRE_JALEUSTROPHOS(TeleportType.OTHER, "Pharaoh's Sceptre", "Jaleustrophos (Agility Pyramid)", new WorldPoint(3341, 2827, 0), "pharaohs_sceptre_teleport_icon.png"),
 	PHARAOHS_SCEPTRE_JALDRAOCHT(TeleportType.OTHER, "Pharaoh's Sceptre", "Jaldraocht (Desert Treasure Pyramid)", new WorldPoint(3232, 2897, 0), "pharaohs_sceptre_teleport_icon.png"),
 	CAMULET_TEMPLE(TeleportType.OTHER, "Camulet", "Enakhra's Temple", new WorldPoint(3190, 2923, 0), "camulet_teleport_icon.png"),
+	TELEPORT_CRYSTAL_LLETYA(TeleportType.OTHER, "Teleport crystal", "Lletya", new WorldPoint(2330, 3172, 0), "teleport_crystal_icon.png"),
+	TELEPORT_CRYSTAL_PRIFDDINAS(TeleportType.OTHER, "Teleport crystal", "Prifddinas", new WorldPoint(3264, 6065, 0), "teleport_crystal_icon.png"),
 
 	// Wilderness
 	OBELISK_13(TeleportType.OTHER, "Obelisk", "13", new WorldPoint(3156, 3620, 0), "obelisk_icon.png"),
@@ -167,7 +169,7 @@ enum TeleportLocationData
 
 	// Scrolls
 	DIGSITE_SCROLL(TeleportType.SCROLL, "Digsite Teleport", new WorldPoint(3324, 3412, 0), "scroll_teleport_icon.png"),
-	ELF_CAMP_SCROLL(TeleportType.SCROLL, "Elf Camp Teleport", new WorldPoint(2193, 3257, 0), "scroll_teleport_icon.png"),
+	IORWERTH_CAMP_SCROLL(TeleportType.SCROLL, "Iorwerth Camp Teleport", new WorldPoint(2193, 3257, 0), "scroll_teleport_icon.png"),
 	FELDIP_HILLS_SCROLL(TeleportType.SCROLL, "Feldip Hills Teleport", new WorldPoint(2542, 2925, 0), "scroll_teleport_icon.png"),
 	LUMBERYARD_SCROLL(TeleportType.SCROLL, "Lumberyard Teleport", new WorldPoint(3303, 3487, 0), "scroll_teleport_icon.png"),
 	LUNAR_ISLE_SCROLL(TeleportType.SCROLL, "Lunar Isle Teleport", new WorldPoint(2093, 3912, 0), "scroll_teleport_icon.png"),

runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TransportationPointLocation.java

@@ -114,6 +114,8 @@ enum TransportationPointLocation
 	CHARTER_PORT_PHASMATYS("Charter Ship", new WorldPoint(3702, 3503, 0)),
 	CHARTER_PORTSARIM("Charter Ship", new WorldPoint(3037, 3191, 0)),
 	CHARTER_TYRAS("Charter Ship", new WorldPoint(2141, 3123, 0)),
+	CHARTER_PRIFDDINAS("Charter Ship", new WorldPoint(2156, 3331, 0)),
+	CHARTER_PRIFDDINAS_INSTANCE("Charter Ship", new WorldPoint(3180, 6083, 0)),
 
 	//Minecarts/Carts
 	MINE_CART_ARCEUUS("Minecart", new WorldPoint(1673, 3832, 0)),
@@ -155,6 +157,7 @@ enum TransportationPointLocation
 	SPIRITTREE_GNOMESTRONGHOLD("Spirit Tree", new WorldPoint(2459, 3446, 0)),
 	SPIRITTREE_GNOMEVILLAGE("Spirit Tree", new WorldPoint(2538, 3166, 0)),
 	SPIRITTREE_GRANDEXCHANGE("Spirit Tree", new WorldPoint(3184, 3510, 0)),
+	SPIRITTREE_PRIFDDINAS("Spirit Tree", new WorldPoint(3274, 6124, 0)),
 
 	//Carpets
 	CARPET_KHARID("Carpet to Bedabin/Pollnivneach/Uzer", new WorldPoint(3311, 3107, 0)),
@@ -172,6 +175,7 @@ enum TransportationPointLocation
 	TELEPORT_RUNE_ARDOUGNE("Teleport to Rune Essence", new WorldPoint(2681, 3325, 0)),
 	TELEPORT_RUNE_YANILLE("Teleport to Rune Essence", new WorldPoint(2592, 3089, 0)),
 	TELEPORT_SORCERESS_GARDEN("Teleport to Sorceress's Garden", new WorldPoint(3320, 3141, 0)),
+	TELEPORT_PRIFDDINAS_LIBRARY("Teleport to Priffdinas Library", new WorldPoint(3254, 6082, 2)),
 
 	//Other
 	ALTER_KOUREND_UNDERGROUND("Altar to Skotizo", new WorldPoint(1662, 10047, 0)),