From d6813922f1144c26eb3096e4a430548987b5132b Mon Sep 17 00:00:00 2001 From: Ethan Date: Mon, 28 May 2018 20:14:54 -0500 Subject: [PATCH] Add teleport scroll locations to map --- .../worldmap/TeleportLocationData.java | 26 +++++++++++++++++- .../client/plugins/worldmap/TeleportType.java | 1 + .../plugins/worldmap/WorldMapConfig.java | 13 ++++++++- .../plugins/worldmap/WorldMapPlugin.java | 7 ++++- .../plugins/worldmap/scroll_teleport_icon.png | Bin 0 -> 18127 bytes 5 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/scroll_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 76548081bf..b7d6415c85 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 @@ -125,7 +125,23 @@ enum TeleportLocationData RELLEKKKA_LYRE(TeleportType.OTHER, "Enchanted Lyre", "Rellekka", new WorldPoint(2664, 3643, 0), "enchanted_lyre_teleport_icon.png"), WATERBIRTH_ISLAND_LYRE(TeleportType.OTHER, "Enchanted Lyre", "Waterbirth Island", new WorldPoint(2550, 3756, 0), "enchanted_lyre_teleport_icon.png"), NEITIZNOT_LYRE(TeleportType.OTHER, "Enchanted Lyre", "Neitiznot", new WorldPoint(2336, 3801, 0), "enchanted_lyre_teleport_icon.png"), - JATIZSO_LYRE(TeleportType.OTHER, "Enchanted Lyre", "Jatizso", new WorldPoint(2409, 3809, 0), "enchanted_lyre_teleport_icon.png"); + JATIZSO_LYRE(TeleportType.OTHER, "Enchanted Lyre", "Jatizso", new WorldPoint(2409, 3809, 0), "enchanted_lyre_teleport_icon.png"), + + // 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"), + 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 Aisle Teleport", new WorldPoint(2093, 3912, 0), "scroll_teleport_icon.png"), + MORTTON_SCROLL(TeleportType.SCROLL, "Mort'ton", new WorldPoint(3489, 3288, 0), "scroll_teleport_icon.png"), + MOS_LEHARMLESS_SCROLL(TeleportType.SCROLL, "Mos Le'Harmless Teleport", new WorldPoint(3701, 2996, 0), "scroll_teleport_icon.png"), + NARDAH_SCROLL(TeleportType.SCROLL, "Nardah Teleport", new WorldPoint(3421, 2917, 0), "scroll_teleport_icon.png"), + PEST_CONTROL_SCROLL(TeleportType.SCROLL, "Pest Control Teleport", new WorldPoint(2657, 2660, 0), "scroll_teleport_icon.png"), + PISCATORIS_SCROLL(TeleportType.SCROLL, "Piscatoris Teleport", new WorldPoint(2339, 3648, 0), "scroll_teleport_icon.png"), + TAI_BWO_WANNAI_SCROLL(TeleportType.SCROLL, "Tai Bwo Wannai Teleport", new WorldPoint(2788, 3066, 0), "scroll_teleport_icon.png"), + ZULANDRA_SCROLL(TeleportType.SCROLL, "Zul-Andra Teleport", new WorldPoint(2197, 3056, 0), "scroll_teleport_icon.png"), + KEY_MASTER_SCROLL(TeleportType.SCROLL, "Key Master Teleport", new WorldPoint(2686, 9882, 0), "scroll_teleport_icon.png"), + REVENANT_CAVE_SCROLL(TeleportType.SCROLL, "Revenant Cave Teleport", new WorldPoint(3127, 3833, 0), "scroll_teleport_icon.png"); private final TeleportType type; private final String tooltip; @@ -147,4 +163,12 @@ enum TeleportLocationData this.location = location; this.iconPath = iconPath; } + + TeleportLocationData(TeleportType type, String item, WorldPoint location, String iconPath) + { + this.type = type; + this.tooltip = item; + this.location = location; + this.iconPath = iconPath; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportType.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportType.java index fcccbe894c..a51e8f9c6e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportType.java @@ -35,6 +35,7 @@ public enum TeleportType LUNAR_MAGIC("Lunar - "), ARCEUUS_MAGIC("Arceuus - "), JEWELLERY("Jewellery - "), + SCROLL(""), OTHER(""); private String prefix; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapConfig.java index 57ce2a9406..c7d60c6a50 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapConfig.java @@ -135,11 +135,22 @@ public interface WorldMapConfig extends Config return true; } + @ConfigItem( + keyName = WorldMapPlugin.CONFIG_KEY_SCROLL_TELEPORT_ICON, + name = "Show teleport scroll locations", + description = "Show icons at the destinations for teleports from scrolls", + position = 10 + ) + default boolean scrollTeleportIcon() + { + return true; + } + @ConfigItem( keyName = WorldMapPlugin.CONFIG_KEY_MISC_TELEPORT_ICON, name = "Show misc teleport locations", description = "Show icons at the destinations for miscellaneous teleport items", - position = 10 + position = 11 ) default boolean miscellaneousTeleportIcon() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java index c6199c50cd..20a96131fd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java @@ -61,6 +61,7 @@ public class WorldMapPlugin extends Plugin static final String CONFIG_KEY_LUNAR_TELEPORT_ICON = "lunarSpellbookIcon"; static final String CONFIG_KEY_ARCEUUS_TELEPORT_ICON = "arceuusSpellbookIcon"; static final String CONFIG_KEY_JEWELLERY_TELEPORT_ICON = "jewelleryIcon"; + static final String CONFIG_KEY_SCROLL_TELEPORT_ICON = "scrollIcon"; static final String CONFIG_KEY_MISC_TELEPORT_ICON = "miscellaneousTeleportIcon"; static @@ -145,6 +146,7 @@ public class WorldMapPlugin extends Plugin case CONFIG_KEY_ARCEUUS_TELEPORT_ICON: case CONFIG_KEY_JEWELLERY_TELEPORT_ICON: case CONFIG_KEY_MISC_TELEPORT_ICON: + case CONFIG_KEY_SCROLL_TELEPORT_ICON: worldMapPointManager.removeIf(TeleportPoint.class::isInstance); createMagicTeleportPoints(); break; @@ -175,7 +177,8 @@ public class WorldMapPlugin extends Plugin || config.lunarTeleportIcon() || config.arceuusTeleportIcon() || config.jewelleryTeleportIcon() - || config.miscellaneousTeleportIcon()) + || config.miscellaneousTeleportIcon() + || config.scrollTeleportIcon()) { createMagicTeleportPoints(); } @@ -224,6 +227,8 @@ public class WorldMapPlugin extends Plugin return config.arceuusTeleportIcon(); case JEWELLERY: return config.jewelleryTeleportIcon(); + case SCROLL: + return config.scrollTeleportIcon(); case OTHER: return config.miscellaneousTeleportIcon(); default: diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/scroll_teleport_icon.png b/runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/scroll_teleport_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d297f0df8c29946ea281c41ee9e297a3d5c24c89 GIT binary patch literal 18127 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