From fa0bf2b0d2bb3c420f66bc7ce8ee663385b1d9e4 Mon Sep 17 00:00:00 2001 From: OnlyHereToPlayOsrs <37775694+xperiaclash@users.noreply.github.com> Date: Fri, 26 Jul 2019 20:59:53 +0200 Subject: [PATCH] gauntlet boss helper : add corrupted projectiles (#1143) --- .../main/java/net/runelite/api/ProjectileID.java | 5 ++++- .../client/plugins/gauntlet/GauntletPlugin.java | 13 +++++++------ 2 files changed, 11 insertions(+), 7 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 5380223df2..706151e1c8 100644 --- a/runelite-api/src/main/java/net/runelite/api/ProjectileID.java +++ b/runelite-api/src/main/java/net/runelite/api/ProjectileID.java @@ -51,7 +51,7 @@ public class ProjectileID 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; @@ -103,5 +103,8 @@ public class ProjectileID public static final int DRAKE_BREATH = 1637; public static final int HUNLEFF_MAGE_ATTACK = 1707; + public static final int HUNLEFF_CORRUPTED_MAGE_ATTACK = 1708; public static final int HUNLEFF_RANGE_ATTACK = 1711; + public static final int HUNLEFF_CORRUPTED_RANGE_ATTACK = 1712; + } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java index 8a7003b174..102e85423d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java @@ -37,7 +37,6 @@ import net.runelite.api.HeadIcon; import net.runelite.api.NPC; import net.runelite.api.NPCDefinition; import net.runelite.api.Prayer; -import net.runelite.api.Projectile; import net.runelite.api.ProjectileID; import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.NpcDespawned; @@ -62,7 +61,9 @@ import net.runelite.client.ui.overlay.OverlayManager; public class GauntletPlugin extends Plugin { - private static final Set HUNLEFF_ATTACKS = ImmutableSet.of(AnimationID.HUNLEFF_ATTACK, AnimationID.HUNLEFF_TORNADO); + private static final Set HUNLEFF_ANIMATIONS = ImmutableSet.of(AnimationID.HUNLEFF_ATTACK, AnimationID.HUNLEFF_TORNADO); + private static final Set HUNLEFF_MAGE_PROJECTILES = ImmutableSet.of(ProjectileID.HUNLEFF_MAGE_ATTACK, ProjectileID.HUNLEFF_CORRUPTED_MAGE_ATTACK); + private static final Set HUNLEFF_RANGE_PROJECTILES = ImmutableSet.of(ProjectileID.HUNLEFF_RANGE_ATTACK, ProjectileID.HUNLEFF_CORRUPTED_RANGE_ATTACK); @Inject private EventBus eventBus; @Inject @@ -140,14 +141,14 @@ public class GauntletPlugin extends Plugin return; } - final Projectile projectile = event.getProjectile(); + final int projectileID = event.getProjectile().getId(); - if (projectile.getId() == ProjectileID.HUNLEFF_MAGE_ATTACK) + if (HUNLEFF_MAGE_PROJECTILES.contains(projectileID)) { setNextPrayer(Prayer.PROTECT_FROM_MAGIC); setFirstHitDetected(true); } - else if (projectile.getId() == ProjectileID.HUNLEFF_RANGE_ATTACK) + else if (HUNLEFF_RANGE_PROJECTILES.contains(projectileID)) { setNextPrayer(Prayer.PROTECT_FROM_MISSILES); setFirstHitDetected(true); @@ -163,7 +164,7 @@ public class GauntletPlugin extends Plugin final int anim = event.getActor().getAnimation(); - if (!HUNLEFF_ATTACKS.contains(anim)) + if (!HUNLEFF_ANIMATIONS.contains(anim)) { return; }