From 657bb52b1a00624adeada02003d5e4b0d3534ad2 Mon Sep 17 00:00:00 2001 From: Ashy Date: Sun, 5 May 2019 02:55:07 +0100 Subject: [PATCH] Add Drakes Breath to Aoe/Projectile Warnings --- .../java/net/runelite/api/ProjectileID.java | 1 + .../aoewarnings/AoeProjectileInfo.java | 11 ++++++-- .../plugins/aoewarnings/AoeWarningConfig.java | 9 +++++++ .../plugins/aoewarnings/AoeWarningPlugin.java | 27 ++++++------------- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/ProjectileID.java b/runelite-api/src/main/java/net/runelite/api/ProjectileID.java index 0d2c9296c5..d99a7b2aaa 100644 --- a/runelite-api/src/main/java/net/runelite/api/ProjectileID.java +++ b/runelite-api/src/main/java/net/runelite/api/ProjectileID.java @@ -97,4 +97,5 @@ public class ProjectileID public static final int HYDRA_POISON = 1644; public static final int HYDRA_LIGHTNING = 1664; public static final int HYDRA_LIGHTNING_2 = 1665; + public static final int DRAKE_BREATH = 1637; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectileInfo.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectileInfo.java index a799af24a1..d862863c04 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectileInfo.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectileInfo.java @@ -24,10 +24,11 @@ */ package net.runelite.client.plugins.aoewarnings; +import net.runelite.api.ProjectileID; + import java.time.Duration; import java.util.HashMap; import java.util.Map; -import net.runelite.api.ProjectileID; public enum AoeProjectileInfo { @@ -101,7 +102,13 @@ public enum AoeProjectileInfo /** * Aoe of Addy Drags */ - ADDY_DRAG_POISON(ProjectileID.ADDY_DRAG_POISON, 2400, 1); + ADDY_DRAG_POISON(ProjectileID.ADDY_DRAG_POISON, 2400, 1), + + /** + * the Breath of the Drake + */ + + DRAKE_BREATH(ProjectileID.DRAKE_BREATH, 2800, 1); private static final Map map = new HashMap<>(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningConfig.java index 22cbee9331..27d0acb31b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningConfig.java @@ -250,4 +250,13 @@ public interface AoeWarningConfig extends Config { return true; } + + @ConfigItem( + keyName = "drake", + name = "Drakes Breath", + description = "Configures if Drakes Breath tile markers are displayed" + ) + default boolean isDrakeEnabled() { + return true; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java index e68b5a1ff1..0c92df5750 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java @@ -26,30 +26,13 @@ package net.runelite.client.plugins.aoewarnings; import com.google.inject.Provides; -import java.time.Instant; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import javax.inject.Inject; import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import net.runelite.api.Client; -import net.runelite.api.GameObject; -import net.runelite.api.GameState; -import net.runelite.api.GraphicsObject; -import net.runelite.api.ObjectID; -import net.runelite.api.Projectile; -import net.runelite.api.Tile; +import net.runelite.api.*; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; -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.ProjectileMoved; +import net.runelite.api.events.*; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -58,6 +41,10 @@ import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; +import javax.inject.Inject; +import java.time.Instant; +import java.util.*; + @PluginDescriptor( name = "AoE Warnings", description = "Shows the final destination for AoE Attack projectiles", @@ -297,6 +284,8 @@ public class AoeWarningPlugin extends Plugin return config.isXarpusEnabled(); case ADDY_DRAG_POISON: return config.addyDrags(); + case DRAKE_BREATH: + return config.isDrakeEnabled(); } return false;