From 91bac5821a1adb172157bd45e2f0d6eae7185b04 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 4 May 2021 10:29:51 -0400 Subject: [PATCH] agility plugin: add rellekka lighthouse obstacles --- .../net/runelite/client/plugins/agility/AgilityConfig.java | 2 +- .../runelite/client/plugins/agility/AgilityOverlay.java | 2 +- .../net/runelite/client/plugins/agility/AgilityPlugin.java | 2 +- .../net/runelite/client/plugins/agility/Obstacles.java | 7 +++++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityConfig.java index c68530ec95..0e2af795d1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityConfig.java @@ -45,7 +45,7 @@ public interface AgilityConfig extends Config @ConfigItem( keyName = "showClickboxes", name = "Show Clickboxes", - description = "Show agility course obstacle clickboxes", + description = "Show agility course and other obstacle clickboxes", position = 0 ) default boolean showClickboxes() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java index 6a45b399d4..7612c5b662 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java @@ -79,7 +79,7 @@ class AgilityOverlay extends Overlay { if (Obstacles.SHORTCUT_OBSTACLE_IDS.containsKey(object.getId()) && !config.highlightShortcuts() || Obstacles.TRAP_OBSTACLE_IDS.contains(object.getId()) && !config.showTrapOverlay() || - Obstacles.COURSE_OBSTACLE_IDS.contains(object.getId()) && !config.showClickboxes() || + Obstacles.OBSTACLE_IDS.contains(object.getId()) && !config.showClickboxes() || Obstacles.SEPULCHRE_OBSTACLE_IDS.contains(object.getId()) && !config.highlightSepulchreObstacles() || Obstacles.SEPULCHRE_SKILL_OBSTACLE_IDS.contains(object.getId()) && !config.highlightSepulchreSkilling()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java index b79de676b2..ae6494f867 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java @@ -434,7 +434,7 @@ public class AgilityPlugin extends Plugin return; } - if (Obstacles.COURSE_OBSTACLE_IDS.contains(newObject.getId()) || + if (Obstacles.OBSTACLE_IDS.contains(newObject.getId()) || Obstacles.PORTAL_OBSTACLE_IDS.contains(newObject.getId()) || (Obstacles.TRAP_OBSTACLE_IDS.contains(newObject.getId()) && Obstacles.TRAP_OBSTACLE_REGIONS.contains(newObject.getWorldLocation().getRegionID())) || diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java index dd8809820b..98115f316f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java @@ -36,7 +36,7 @@ import net.runelite.client.game.AgilityShortcut; class Obstacles { - static final Set COURSE_OBSTACLE_IDS = ImmutableSet.of( + static final Set OBSTACLE_IDS = ImmutableSet.of( // Gnome OBSTACLE_NET_23134, TREE_BRANCH_23559, TREE_BRANCH_23560, OBSTACLE_NET_23135, OBSTACLE_PIPE_23138, OBSTACLE_PIPE_23139, LOG_BALANCE_23145, BALANCING_ROPE_23557, @@ -95,7 +95,10 @@ class Obstacles ZIP_LINE_11645, ZIP_LINE_11646, // Prifddinas LADDER_36221, TIGHTROPE_36225, CHIMNEY_36227, ROOF_EDGE, DARK_HOLE_36229, LADDER_36231, LADDER_36232, - ROPE_BRIDGE_36233, TIGHTROPE_36234, ROPE_BRIDGE_36235, TIGHTROPE_36236, TIGHTROPE_36237, DARK_HOLE_36238 + ROPE_BRIDGE_36233, TIGHTROPE_36234, ROPE_BRIDGE_36235, TIGHTROPE_36236, TIGHTROPE_36237, DARK_HOLE_36238, + // Rellekka Lighthouse + BASALT_ROCK, BASALT_ROCK_4553, BASALT_ROCK_4554, BASALT_ROCK_4556, BASALT_ROCK_4558, ROCKY_SHORE, + BASALT_ROCK_4557, BASALT_ROCK_4555, BASALT_ROCK_4552, BEACH ); static final Set PORTAL_OBSTACLE_IDS = ImmutableSet.of(