From f3f2c7825c1f90e51941f7e927355036af4fb191 Mon Sep 17 00:00:00 2001
From: Alex Kolpa <akolpa1990@gmail.com>
Date: Mon, 21 May 2018 16:42:04 +0200
Subject: [PATCH] Add agility arena notifier

Notifies player when the active ticket dispenser has changed locations.
---
 .../client/plugins/agility/AgilityConfig.java | 11 +++++
 .../client/plugins/agility/AgilityPlugin.java | 41 +++++++++++++++++++
 2 files changed, 52 insertions(+)

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 5ce0d3ed1e..20e0a0c0af 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
@@ -123,4 +123,15 @@ public interface AgilityConfig extends Config
 	{
 		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;
+	}
 }
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 5726ce12dd..9f4de5a058 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
@@ -30,6 +30,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import javax.inject.Inject;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -41,6 +42,7 @@ import net.runelite.api.Node;
 import static net.runelite.api.Skill.AGILITY;
 import net.runelite.api.Tile;
 import net.runelite.api.TileObject;
+import net.runelite.api.coords.WorldPoint;
 import net.runelite.api.events.DecorativeObjectChanged;
 import net.runelite.api.events.DecorativeObjectDespawned;
 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.GameObjectSpawned;
 import net.runelite.api.events.GameStateChanged;
+import net.runelite.api.events.GameTick;
 import net.runelite.api.events.GroundObjectChanged;
 import net.runelite.api.events.GroundObjectDespawned;
 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.WallObjectDespawned;
 import net.runelite.api.events.WallObjectSpawned;
+import net.runelite.client.Notifier;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
@@ -67,6 +71,8 @@ import net.runelite.client.ui.overlay.Overlay;
 @Slf4j
 public class AgilityPlugin extends Plugin
 {
+	private static final int AGILITY_ARENA_REGION_ID = 11157;
+
 	@Getter
 	private final Map<TileObject, Tile> obstacles = new HashMap<>();
 
@@ -80,6 +86,9 @@ public class AgilityPlugin extends Plugin
 	@Inject
 	private LapCounterOverlay lapOverlay;
 
+	@Inject
+	private Notifier notifier;
+
 	@Inject
 	private Client client;
 
@@ -90,6 +99,7 @@ public class AgilityPlugin extends Plugin
 	private AgilitySession session;
 
 	private int lastAgilityXp;
+	private WorldPoint lastArenaTicketPosition;
 
 	@Provides
 	AgilityConfig getConfig(ConfigManager configManager)
@@ -119,11 +129,18 @@ public class AgilityPlugin extends Plugin
 			case HOPPING:
 			case LOGIN_SCREEN:
 				session = null;
+				lastArenaTicketPosition = null;
 				break;
 			case LOADING:
 				markOfGrace = null;
 				obstacles.clear();
 				break;
+			case LOGGED_IN:
+				if (!isInAgilityArena())
+				{
+					lastArenaTicketPosition = null;
+				}
+				break;
 		}
 	}
 
@@ -204,6 +221,30 @@ public class AgilityPlugin extends Plugin
 		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
 	public void onGameObjectSpawned(GameObjectSpawned event)
 	{