From 2ad0ea80dcd77f109238667e8d0c50ab8867af0b Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Sun, 21 Jun 2020 15:57:26 -0700 Subject: [PATCH 1/3] worldmap: Add Drakan's medallion teleport locations --- .../plugins/worldmap/TeleportLocationData.java | 2 ++ .../worldmap/drakans_medallion_teleport_icon.png | Bin 0 -> 6890 bytes 2 files changed, 2 insertions(+) create mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/drakans_medallion_teleport_icon.png diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java index 5a28519bc6..87eee1b1bb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java @@ -143,6 +143,8 @@ enum TeleportLocationData 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"), + DRAKANS_MEDALLION_VER_SINHAZA(TeleportType.OTHER, "Drakan's medallion", "Ver Sinhaza", new WorldPoint(3649, 3230, 0), "drakans_medallion_teleport_icon.png"), + DRAKANS_MEDALLION_DARKMEYER(TeleportType.OTHER, "Drakan's medallion", "Darkmeyer", new WorldPoint(3592, 3337, 0), "drakans_medallion_teleport_icon.png"), // Wilderness OBELISK_13(TeleportType.OTHER, "Obelisk", "13", new WorldPoint(3156, 3620, 0), "obelisk_icon.png"), diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/drakans_medallion_teleport_icon.png b/runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/drakans_medallion_teleport_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0f37fb27bf319fbba3bb733643306964318697f2 GIT binary patch literal 6890 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 literal 0 HcmV?d00001 From e4c818d4a5a27bf3ad08cc47bbf749af60be2aad Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Sun, 21 Jun 2020 15:58:01 -0700 Subject: [PATCH 2/3] worldmap: Add Daeyalt essence mine tooltip --- .../runelite/client/plugins/worldmap/MiningSiteLocation.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MiningSiteLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MiningSiteLocation.java index ff777d0f4f..e1d0653209 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MiningSiteLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MiningSiteLocation.java @@ -65,6 +65,7 @@ enum MiningSiteLocation CRANDOR_NORTH_WEST(new WorldPoint(2831, 3296, 0), new Rock(7, Ore.COAL), new Rock(1, Ore.MITHRIL)), CRANDOR_SOUTH_EAST(new WorldPoint(2835, 3245, 0), new Rock(3, Ore.COAL), new Rock(3, Ore.ADAMANTITE)), CRANDOR_SOUTH_WEST(new WorldPoint(2819, 3247, 0), new Rock(7, Ore.MITHRIL)), + DAEYALT_ESSENCE_MINE(new WorldPoint(3631, 3340, 0), new Rock(3, Ore.DAEYALT_ESSENCE)), DESERT_MINING_CAMP_SURFACE(new WorldPoint(3299, 3021, 0), true, new Rock(4, Ore.COPPER), new Rock(4, Ore.TIN), new Rock(3, Ore.IRON), new Rock(4, Ore.COAL)), // DESERT_MINING_CAMP_UNDERGROUND -- NOT AVAILABLE ON WORLDMAP DORGESH_KAAN_NORTH(new WorldPoint(3309, 9645, 0), new Rock(1, Ore.IRON), new Rock(9, Ore.SILVER)), @@ -232,6 +233,7 @@ enum MiningSiteLocation COAL("Coal"), SANDSTONE("Sandstone"), DENSE_ESSENCE("Dense essence"), + DAEYALT_ESSENCE("Daeyalt essence"), GOLD("Gold"), GEM_ROCK("Gem rock"), HARD_ROCK("Hard rock"), From b17ef5615bdb6d7729ae961e4d43caa2f80de8b0 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Sun, 21 Jun 2020 15:58:55 -0700 Subject: [PATCH 3/3] discord: Add Darkmeyer and Hallowed Sepulchre minigame --- .../runelite/client/plugins/discord/DiscordGameEventType.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java index 26401c2bf5..21a474776b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java @@ -104,6 +104,7 @@ enum DiscordGameEventType CITY_CANIFIS("Canifis" , DiscordAreaType.CITIES, 13878), CITY_CATHERBY("Catherby" , DiscordAreaType.CITIES, 11317, 11318, 11061), CITY_CORSAIR_CAVE("Corsair Cove" , DiscordAreaType.CITIES, 10028, 10284), + CITY_DARKMEYER("Darkmeyer", DiscordAreaType.CITIES, 14388), CITY_DORGESH_KAAN("Dorgesh-Kaan" , DiscordAreaType.CITIES, 10835, 10834), CITY_DRAYNOR("Draynor" , DiscordAreaType.CITIES, 12338), CITY_EDGEVILLE("Edgeville" , DiscordAreaType.CITIES, 12342), @@ -121,7 +122,7 @@ enum DiscordGameEventType CITY_LOVAKENGJ_HOUSE("Lovakengj" , DiscordAreaType.CITIES, 5692, 5948, 5691, 5947, 6203, 6202, 5690, 5946), CITY_LUMBRIDGE("Lumbridge" , DiscordAreaType.CITIES, 12850), CITY_LUNAR_ISLE("Lunar Isle" , DiscordAreaType.CITIES, 8253, 8252, 8509, 8508), - CITY_MEIYERDITCH("Meiyerditch" , DiscordAreaType.CITIES, 14132, 14388, 14387, 14386, 14385), + CITY_MEIYERDITCH("Meiyerditch" , DiscordAreaType.CITIES, 14132, 14387, 14386, 14385), CITY_MISCELLANIA("Miscellania" , DiscordAreaType.CITIES, 10044, 10300), CITY_MOS_LE_HARMLESS("Mos Le'Harmless" , DiscordAreaType.CITIES, 14638), CITY_MORTTON("Mort'ton" , DiscordAreaType.CITIES, 13875), @@ -244,6 +245,7 @@ enum DiscordGameEventType MG_GAUNTLET("Gauntlet", DiscordAreaType.MINIGAMES, 12995), MG_INFERNO("The Inferno", DiscordAreaType.MINIGAMES, 9043), MG_LAST_MAN_STANDING("Last Man Standing", DiscordAreaType.MINIGAMES, 13660, 13659, 13658, 13916, 13915, 13914), + MG_HALLOWED_SEPULCHRE("Hallowed Sepulchre", DiscordAreaType.MINIGAMES, 8797, 9051, 9052, 9053, 9054, 9309, 9563, 9565, 9821, 10074, 10075, 10077), MG_MAGE_TRAINING_ARENA("Mage Training Arena", DiscordAreaType.MINIGAMES, 13462, 13463), MG_NIGHTMARE_ZONE("Nightmare Zone", DiscordAreaType.MINIGAMES, 9033), MG_PEST_CONTROL("Pest Control", DiscordAreaType.MINIGAMES, 10536),