From 92a4d718af7867360c72f14c636db4df5f508da5 Mon Sep 17 00:00:00 2001 From: Justin Date: Sun, 19 May 2019 01:43:09 +1000 Subject: [PATCH] Added COX Olm attacking projectile IDs (#293) * Added COX Olm attacking projectile IDs added OLM_MAGE_ATTACK and OLM_RANGE_ATTACK ids * no hardcoded projectiles removed two hardcoded projectiles for olm attacks --- .../src/main/java/net/runelite/api/ProjectileID.java | 4 +++- .../java/net/runelite/client/plugins/zcox/CoxPlugin.java | 5 +++-- 2 files changed, 6 insertions(+), 3 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 c7d9c836cc..5dff0bc450 100644 --- a/runelite-api/src/main/java/net/runelite/api/ProjectileID.java +++ b/runelite-api/src/main/java/net/runelite/api/ProjectileID.java @@ -49,7 +49,9 @@ public class ProjectileID public static final int OLM_FALLING_CRYSTAL_TRAIL = 1352; public static final int OLM_ACID_TRAIL = 1354; public static final int OLM_FIRE_LINE = 1347; - + public static final int OLM_MAGE_ATTACK = 1339; + public static final int OLM_RANGE_ATTACK = 1340; + public static final int VORKATH_BOMB_AOE = 1481; public static final int VORKATH_POISON_POOL_AOE = 1483; public static final int VORKATH_TICK_FIRE_AOE = 1482; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zcox/CoxPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/zcox/CoxPlugin.java index 477acadb43..d1450ad838 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zcox/CoxPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zcox/CoxPlugin.java @@ -41,6 +41,7 @@ import net.runelite.api.MessageNode; import net.runelite.api.NPC; import net.runelite.api.NpcID; import net.runelite.api.Projectile; +import net.runelite.api.ProjectileID; import net.runelite.api.Varbits; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ChatMessage; @@ -269,13 +270,13 @@ public class CoxPlugin extends Plugin public void onProjectileMoved(ProjectileMoved event) { Projectile projectile = event.getProjectile(); - if (projectile.getId() == 1339) + if (projectile.getId() == ProjectileID.OLM_MAGE_ATTACK) { log.debug("Mage Detected"); prayAgainstOlm = PrayAgainst.MAGIC; lastPrayTime = System.currentTimeMillis(); } - if (projectile.getId() == 1340) + if (projectile.getId() == ProjectileID.OLM_RANGE_ATTACK) { log.debug("Range Detected"); prayAgainstOlm = PrayAgainst.RANGED;