Add agility arena notifier

Notifies player when the active ticket dispenser has changed locations.
This commit is contained in:
Alex Kolpa
2018-05-21 16:42:04 +02:00
parent 0fe49ec2df
commit f3f2c7825c
2 changed files with 52 additions and 0 deletions

View File

@@ -123,4 +123,15 @@ public interface AgilityConfig extends Config
{ {
return Color.RED; return Color.RED;
} }
@ConfigItem(
keyName = "agilityArenaNotifier",
name = "Agility Arena notifier",
description = "Notify on ticket location change in Agility Arena",
position = 9
)
default boolean notifyAgilityArena()
{
return true;
}
} }

View File

@@ -30,6 +30,7 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -41,6 +42,7 @@ import net.runelite.api.Node;
import static net.runelite.api.Skill.AGILITY; import static net.runelite.api.Skill.AGILITY;
import net.runelite.api.Tile; import net.runelite.api.Tile;
import net.runelite.api.TileObject; import net.runelite.api.TileObject;
import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.DecorativeObjectChanged; import net.runelite.api.events.DecorativeObjectChanged;
import net.runelite.api.events.DecorativeObjectDespawned; import net.runelite.api.events.DecorativeObjectDespawned;
import net.runelite.api.events.DecorativeObjectSpawned; import net.runelite.api.events.DecorativeObjectSpawned;
@@ -49,6 +51,7 @@ import net.runelite.api.events.GameObjectChanged;
import net.runelite.api.events.GameObjectDespawned; import net.runelite.api.events.GameObjectDespawned;
import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GameObjectSpawned;
import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.GroundObjectChanged; import net.runelite.api.events.GroundObjectChanged;
import net.runelite.api.events.GroundObjectDespawned; import net.runelite.api.events.GroundObjectDespawned;
import net.runelite.api.events.GroundObjectSpawned; import net.runelite.api.events.GroundObjectSpawned;
@@ -56,6 +59,7 @@ import net.runelite.api.events.ItemLayerChanged;
import net.runelite.api.events.WallObjectChanged; import net.runelite.api.events.WallObjectChanged;
import net.runelite.api.events.WallObjectDespawned; import net.runelite.api.events.WallObjectDespawned;
import net.runelite.api.events.WallObjectSpawned; import net.runelite.api.events.WallObjectSpawned;
import net.runelite.client.Notifier;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
@@ -67,6 +71,8 @@ import net.runelite.client.ui.overlay.Overlay;
@Slf4j @Slf4j
public class AgilityPlugin extends Plugin public class AgilityPlugin extends Plugin
{ {
private static final int AGILITY_ARENA_REGION_ID = 11157;
@Getter @Getter
private final Map<TileObject, Tile> obstacles = new HashMap<>(); private final Map<TileObject, Tile> obstacles = new HashMap<>();
@@ -80,6 +86,9 @@ public class AgilityPlugin extends Plugin
@Inject @Inject
private LapCounterOverlay lapOverlay; private LapCounterOverlay lapOverlay;
@Inject
private Notifier notifier;
@Inject @Inject
private Client client; private Client client;
@@ -90,6 +99,7 @@ public class AgilityPlugin extends Plugin
private AgilitySession session; private AgilitySession session;
private int lastAgilityXp; private int lastAgilityXp;
private WorldPoint lastArenaTicketPosition;
@Provides @Provides
AgilityConfig getConfig(ConfigManager configManager) AgilityConfig getConfig(ConfigManager configManager)
@@ -119,11 +129,18 @@ public class AgilityPlugin extends Plugin
case HOPPING: case HOPPING:
case LOGIN_SCREEN: case LOGIN_SCREEN:
session = null; session = null;
lastArenaTicketPosition = null;
break; break;
case LOADING: case LOADING:
markOfGrace = null; markOfGrace = null;
obstacles.clear(); obstacles.clear();
break; break;
case LOGGED_IN:
if (!isInAgilityArena())
{
lastArenaTicketPosition = null;
}
break;
} }
} }
@@ -204,6 +221,30 @@ public class AgilityPlugin extends Plugin
return false; return false;
} }
@Subscribe
public void onGameTick(GameTick tick)
{
if (isInAgilityArena())
{
WorldPoint newTicketPosition = client.getHintArrowPoint();
if (!Objects.equals(lastArenaTicketPosition, newTicketPosition))
{
// We don't want to notify when players first enter the course
if (lastArenaTicketPosition != null && config.notifyAgilityArena())
{
notifier.notify("Ticket location changed");
}
lastArenaTicketPosition = newTicketPosition;
}
}
}
private boolean isInAgilityArena()
{
return AGILITY_ARENA_REGION_ID == client.getLocalPlayer().getWorldLocation().getRegionID();
}
@Subscribe @Subscribe
public void onGameObjectSpawned(GameObjectSpawned event) public void onGameObjectSpawned(GameObjectSpawned event)
{ {