ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #580 from ocekyled/wintertodt-adjustment

Browse Source 
Updated wintertodt aoe warning to use game objects…
This commit is contained in:
Tyler Bochard
2019-06-13 02:24:57 -04:00
committed by GitHub
parent e56840e65e 32fd54534f
commit 7ac482b248
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java
View File

@@ -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<Projectile, AoeProjectile> projectiles = plugin.getProjectiles();
for (Iterator<AoeProjectile> it = projectiles.values().iterator(); it.hasNext(); )

27
runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java
View File

@@ -42,6 +42,7 @@ import net.runelite.api.Client;
import net.runelite.api.GameObject;
import net.runelite.api.GameState;
import net.runelite.api.GraphicsObject;
import net.runelite.api.NullObjectID;
import net.runelite.api.ObjectID;
import net.runelite.api.Projectile;
import net.runelite.api.Tile;
@@ -103,6 +104,9 @@ public class AoeWarningPlugin extends Plugin
@Getter(AccessLevel.PACKAGE)
private List<WorldPoint> CrystalSpike = new ArrayList<>();
@Getter(AccessLevel.PACKAGE)
private List<WorldPoint> WintertodtSnowFall = new ArrayList<>();
@Provides
AoeWarningConfig getConfig(ConfigManager configManager)
{
@@ -122,6 +126,7 @@ public class AoeWarningPlugin extends Plugin
LightningTrail.clear();
AcidTrail.clear();
CrystalSpike.clear();
WintertodtSnowFall.clear();
}
@Override
@@ -132,6 +137,7 @@ public class AoeWarningPlugin extends Plugin
LightningTrail.clear();
AcidTrail.clear();
CrystalSpike.clear();
WintertodtSnowFall.clear();
}
@Subscribe
@@ -178,6 +184,18 @@ public class AoeWarningPlugin extends Plugin
//todo
CrystalSpike.add(bombLocation);
break;
case NullObjectID.NULL_26690:
//Wintertodt Snowfall
if (config.isWintertodtEnabled())
{
WintertodtSnowFall.add(bombLocation);
if (config.aoeNotifyAll() || config.isWintertodtNotifyEnabled())
{
notifier.notify("Snow Fall!");
}
}
break;
}
}
@@ -199,6 +217,13 @@ public class AoeWarningPlugin extends Plugin
//todo
CrystalSpike.remove(bombLocation);
break;
case NullObjectID.NULL_26690:
//Wintertodt Snowfall
if (config.isWintertodtEnabled())
{
WintertodtSnowFall.remove(bombLocation);
}
break;
}
}
@@ -320,8 +345,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: