ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2465 from jplsek/agility-warnings

Browse Source 
Add trap overlay for agility plugin
This commit is contained in:
Adam
2018-05-10 13:58:30 -04:00
committed by GitHub
parent 55efcb5fde 87ce6cc2fd
commit b5ac166eab
4 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityConfig.java
View File

@@ -82,7 +82,7 @@ public interface AgilityConfig extends Config
@ConfigItem( @ConfigItem(
keyName = "markHighlight", keyName = "markHighlight",
name = "Mark highlight Color", name = "Mark Highlight Color",
description = "Color of highlighted Marks of Grace", description = "Color of highlighted Marks of Grace",
position = 5 position = 5
) )
@@ -101,4 +101,26 @@ public interface AgilityConfig extends Config
{ {
return true; return true;
} }
@ConfigItem(
keyName = "trapOverlay",
name = "Show Trap Overlay",
description = "Enable/disable the highlighting of traps on Agility courses",
position = 7
)
default boolean showTrapOverlay()
{
return true;
}
@ConfigItem(
keyName = "trapHighlight",
name = "Trap Overlay Color",
description = "Color of Agility trap overlay",
position = 8
)
default Color getTrapColor()
{
return Color.RED;
}
} }

10
runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java
View File

@@ -69,7 +69,8 @@ public class AgilityOverlay extends Overlay
final Tile markOfGrace = plugin.getMarkOfGrace(); final Tile markOfGrace = plugin.getMarkOfGrace();
plugin.getObstacles().forEach((object, tile) -> plugin.getObstacles().forEach((object, tile) ->
{ {
if (Obstacles.SHORTCUT_OBSTACLE_IDS.contains(object.getId()) && !config.highlightShortcuts()) if (Obstacles.SHORTCUT_OBSTACLE_IDS.contains(object.getId()) && !config.highlightShortcuts() ||
Obstacles.TRAP_OBSTACLE_IDS.contains(object.getId()) && !config.showTrapOverlay())
{ {
return; return;
} }
@@ -77,6 +78,13 @@ public class AgilityOverlay extends Overlay
if (tile.getPlane() == client.getPlane() if (tile.getPlane() == client.getPlane()
&& object.getLocalLocation().distanceTo(playerLocation) < MAX_DISTANCE) && object.getLocalLocation().distanceTo(playerLocation) < MAX_DISTANCE)
{ {
// This assumes that the obstacle is not clickable.
if (Obstacles.TRAP_OBSTACLE_IDS.contains(object.getId()))
{
OverlayUtil.renderPolygon(graphics, object.getCanvasTilePoly(), config.getTrapColor());
return;
}
Area objectClickbox = object.getClickbox(); Area objectClickbox = object.getClickbox();
if (objectClickbox != null) if (objectClickbox != null)
{ {

3
runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java
View File

@@ -286,7 +286,8 @@ public class AgilityPlugin extends Plugin
} }
if (Obstacles.COURSE_OBSTACLE_IDS.contains(newObject.getId()) || if (Obstacles.COURSE_OBSTACLE_IDS.contains(newObject.getId()) ||
Obstacles.SHORTCUT_OBSTACLE_IDS.contains(newObject.getId())) Obstacles.SHORTCUT_OBSTACLE_IDS.contains(newObject.getId()) ||
Obstacles.TRAP_OBSTACLE_IDS.contains(newObject.getId()))
{ {
obstacles.put(newObject, tile); obstacles.put(newObject, tile);
} }

11
runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java
View File

@@ -24,13 +24,13 @@
*/ */
package net.runelite.client.plugins.agility; package net.runelite.client.plugins.agility;
import com.google.common.collect.Sets; import com.google.common.collect.ImmutableSet;
import java.util.Set; import java.util.Set;
import static net.runelite.api.ObjectID.*; import static net.runelite.api.ObjectID.*;
public class Obstacles public class Obstacles
{ {
public static final Set<Integer> COURSE_OBSTACLE_IDS = Sets.newHashSet( public static final Set<Integer> COURSE_OBSTACLE_IDS = ImmutableSet.of(
// Gnome // Gnome
OBSTACLE_NET_23134, TREE_BRANCH_23559, TREE_BRANCH_23560, OBSTACLE_NET_23135, OBSTACLE_PIPE_23138, OBSTACLE_NET_23134, TREE_BRANCH_23559, TREE_BRANCH_23560, OBSTACLE_NET_23135, OBSTACLE_PIPE_23138,
OBSTACLE_PIPE_23139, LOG_BALANCE_23145, BALANCING_ROPE_23557, OBSTACLE_PIPE_23139, LOG_BALANCE_23145, BALANCING_ROPE_23557,
@@ -76,7 +76,7 @@ public class Obstacles
GAP_11406, GAP_11429, GAP_11430, STEEP_ROOF, GAP_11630, PLANK_11631, WOODEN_BEAMS GAP_11406, GAP_11429, GAP_11430, STEEP_ROOF, GAP_11630, PLANK_11631, WOODEN_BEAMS
); );
public static final Set<Integer> SHORTCUT_OBSTACLE_IDS = Sets.newHashSet( public static final Set<Integer> SHORTCUT_OBSTACLE_IDS = ImmutableSet.of(
// Grand Exchange // Grand Exchange
UNDERWALL_TUNNEL_16529, UNDERWALL_TUNNEL_16530, UNDERWALL_TUNNEL_16529, UNDERWALL_TUNNEL_16530,
// South Varrock // South Varrock
@@ -177,4 +177,9 @@ public class Obstacles
// Revenant Caves // Revenant Caves
PILLAR_31561 PILLAR_31561
); );
public static final Set<Integer> TRAP_OBSTACLE_IDS = ImmutableSet.of(
// Agility pyramid
NULL_3550, NULL_10872, NULL_10873
);
} }