rooftopagilityplugin: add seers rooftop

This commit is contained in:
illumineawake 2020-06-12 10:16:29 +10:00
parent 81631721c2
commit 1f0cbce503
2 changed files with 16 additions and 14 deletions

View File

@ -45,7 +45,14 @@ public enum RooftopAgilityObstacles
FAL_ROOFTOP_NINE(new WorldArea(new WorldPoint(3010, 3343, 3), new WorldPoint(3015, 3347, 3)),LEDGE_14921),
FAL_ROOFTOP_TEN(new WorldArea(new WorldPoint(3008, 3335, 3), new WorldPoint(3014, 3343, 3)),LEDGE_14922),
FAL_ROOFTOP_ELEVEN(new WorldArea(new WorldPoint(3013, 3331, 3), new WorldPoint(3018, 3335, 3)),LEDGE_14924),
FAL_ROOFTOP_TWELVE(new WorldArea(new WorldPoint(3019, 3331, 3), new WorldPoint(3027, 3335, 3)),EDGE_14925);
FAL_ROOFTOP_TWELVE(new WorldArea(new WorldPoint(3019, 3331, 3), new WorldPoint(3027, 3335, 3)),EDGE_14925),
//SEERS
SEERS_GROUND(new WorldArea(new WorldPoint(2689, 3457, 0), new WorldPoint(2750, 3517, 0)), WALL_14927), //DECORATION
SEERS_ROOF_ONE(new WorldArea(new WorldPoint(2720, 3489, 3), new WorldPoint(2731, 3498, 3)), GAP_14928),
SEERS_ROOF_TWO(new WorldArea(new WorldPoint(2702, 3486, 2), new WorldPoint(2714, 3499, 2)), TIGHTROPE_14932), //GROUND OBJECT
SEERS_ROOF_THREE(new WorldArea(new WorldPoint(2707, 3475, 2), new WorldPoint(2717, 3483, 2)),GAP_14929),
SEERS_ROOF_FOUR(new WorldArea(new WorldPoint(2697, 3468, 3), new WorldPoint(2718, 3478, 3)), GAP_14930),
SEERS_ROOF_FIVE(new WorldArea(new WorldPoint(2689, 3458, 2), new WorldPoint(2704, 3467, 2)), EDGE_14931);
//@Getter(AccessLevel.PACKAGE)
private final WorldArea location;

View File

@ -29,15 +29,7 @@ import java.awt.image.BufferedImage;
import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.*;
import static net.runelite.api.ObjectID.BALANCING_ROPE_23557;
import static net.runelite.api.ObjectID.LOG_BALANCE_23145;
import static net.runelite.api.ObjectID.ROUGH_WALL;
import static net.runelite.api.ObjectID.ROUGH_WALL_14412;
import static net.runelite.api.ObjectID.ROUGH_WALL_14898;
import static net.runelite.api.ObjectID.TIGHTROPE;
import static net.runelite.api.ObjectID.TIGHTROPE_11406;
import static net.runelite.api.ObjectID.TIGHTROPE_14899;
import static net.runelite.api.ObjectID.TIGHTROPE_14911;
import static net.runelite.api.ObjectID.*;
import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.*;
@ -99,8 +91,7 @@ public class RooftopAgilityPlugin extends Plugin
int timeout = 0;
List<WorldPoint> path = List.of(new WorldPoint(3013, 3436, 0),new WorldPoint(3013, 3436, 0));
private final List<Integer> REGION_IDS = List.of(9781,12853, 12597, 12084, 12339, 12338);
private final List<Integer> REGION_IDS = List.of(9781,12853, 12597, 12084, 12339, 12338, 10806);
@Override
protected void startUp()
@ -148,8 +139,11 @@ public class RooftopAgilityPlugin extends Plugin
RooftopAgilityObstacles obstacle = RooftopAgilityObstacles.getObstacle(client.getLocalPlayer().getWorldLocation());
if (obstacle != null)
{
List<Integer> decObstacles = List.of(ROUGH_WALL_14412, ROUGH_WALL_14898, ROUGH_WALL, WALL_14927);
List<Integer> groundObjObstacles = List.of(TIGHTROPE_14899, TIGHTROPE_14911, LOG_BALANCE_23145, BALANCING_ROPE_23557, TIGHTROPE, TIGHTROPE_11406, TIGHTROPE_14932);
log.info(String.valueOf(obstacle.getObstacleId()));
if (obstacle.getObstacleId() == ROUGH_WALL_14412 || obstacle.getObstacleId()== ROUGH_WALL_14898 || obstacle.getObstacleId() == ROUGH_WALL)
//if (obstacle.getObstacleId() == ROUGH_WALL_14412 || obstacle.getObstacleId()== ROUGH_WALL_14898 || obstacle.getObstacleId() == ROUGH_WALL || obstacle.getObstacleId() == WALL_14927)
if (decObstacles.contains(obstacle.getObstacleId()))
{
DecorativeObject decObstacle = utils.findNearestDecorObject(obstacle.getObstacleId());
if (decObstacle != null)
@ -160,7 +154,8 @@ public class RooftopAgilityPlugin extends Plugin
return;
}
}
if (obstacle.getObstacleId() == TIGHTROPE_14899 || obstacle.getObstacleId() == TIGHTROPE_14911 || obstacle.getObstacleId() == LOG_BALANCE_23145 || obstacle.getObstacleId() == BALANCING_ROPE_23557 || obstacle.getObstacleId() == TIGHTROPE || obstacle.getObstacleId() == TIGHTROPE_11406)
//if (obstacle.getObstacleId() == TIGHTROPE_14899 || obstacle.getObstacleId() == TIGHTROPE_14911 || obstacle.getObstacleId() == LOG_BALANCE_23145 || obstacle.getObstacleId() == BALANCING_ROPE_23557 || obstacle.getObstacleId() == TIGHTROPE || obstacle.getObstacleId() == TIGHTROPE_11406)
if (groundObjObstacles.contains(obstacle.getObstacleId()))
{
GroundObject groundObstacle = utils.findNearestGroundObject(obstacle.getObstacleId());
if (groundObstacle != null)