From f64f2f104a3eb154a1aeff2a100e0b25376ff693 Mon Sep 17 00:00:00 2001 From: ocekyled <19616058+ocekyled@users.noreply.github.com> Date: Thu, 13 Jun 2019 13:33:31 +0930 Subject: [PATCH] Updated wintertodt aoe warning to use game objects instead of projectiles --- .../aoewarnings/AoeWarningOverlay.java | 5 ++++ .../plugins/aoewarnings/AoeWarningPlugin.java | 24 +++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java index f5de01dcf5..c6799ac343 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java @@ -85,6 +85,11 @@ public class AoeWarningOverlay extends Overlay drawTile(graphics, point, new Color(255, 0, 84), 2, 150, 50); } + for (WorldPoint point : plugin.getWintertodtSnowFall()) + { + drawTile(graphics, point, new Color(255, 0, 84), 2, 150, 50); + } + Instant now = Instant.now(); Map projectiles = plugin.getProjectiles(); for (Iterator it = projectiles.values().iterator(); it.hasNext(); ) 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 059336dc72..c3067095ee 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 @@ -103,6 +103,9 @@ public class AoeWarningPlugin extends Plugin @Getter(AccessLevel.PACKAGE) private List CrystalSpike = new ArrayList<>(); + @Getter(AccessLevel.PACKAGE) + private List WintertodtSnowFall = new ArrayList<>(); + @Provides AoeWarningConfig getConfig(ConfigManager configManager) { @@ -122,6 +125,7 @@ public class AoeWarningPlugin extends Plugin LightningTrail.clear(); AcidTrail.clear(); CrystalSpike.clear(); + WintertodtSnowFall.clear(); } @Override @@ -132,6 +136,7 @@ public class AoeWarningPlugin extends Plugin LightningTrail.clear(); AcidTrail.clear(); CrystalSpike.clear(); + WintertodtSnowFall.clear(); } @Subscribe @@ -178,6 +183,17 @@ public class AoeWarningPlugin extends Plugin //todo CrystalSpike.add(bombLocation); break; + case 26690: //Wintertodt SnowFall + if (config.isWintertodtEnabled()) + { + WintertodtSnowFall.add(bombLocation); + + if (config.aoeNotifyAll() || config.isWintertodtNotifyEnabled()) + { + notifier.notify("Snow Fall!"); + } + } + break; } } @@ -199,6 +215,12 @@ public class AoeWarningPlugin extends Plugin //todo CrystalSpike.remove(bombLocation); break; + case 26690: //Wintertodt SnowFall + if (config.isWintertodtEnabled()) + { + WintertodtSnowFall.remove(bombLocation); + } + break; } } @@ -320,8 +342,6 @@ public class AoeWarningPlugin extends Plugin case CORPOREAL_BEAST: case CORPOREAL_BEAST_DARK_CORE: return notify ? config.isCorpNotifyEnabled() : config.isCorpEnabled(); - case WINTERTODT_SNOW_FALL: - return notify ? config.isWintertodtNotifyEnabled() : config.isWintertodtEnabled(); case XARPUS_POISON_AOE: return notify ? config.isXarpusNotifyEnabled() : config.isXarpusEnabled(); case ADDY_DRAG_POISON: