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

gauntlet boss helper : add corrupted projectiles (#1143)

Browse Source
This commit is contained in:
OnlyHereToPlayOsrs
2019-07-26 20:59:53 +02:00
committed by Kyleeld
parent 36f52232c8
commit fa0bf2b0d2
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runelite-api/src/main/java/net/runelite/api/ProjectileID.java
View File

@@ -51,7 +51,7 @@ public class ProjectileID
public static final int OLM_FIRE_LINE = 1347; public static final int OLM_FIRE_LINE = 1347;
public static final int OLM_MAGE_ATTACK = 1339; public static final int OLM_MAGE_ATTACK = 1339;
public static final int OLM_RANGE_ATTACK = 1340; public static final int OLM_RANGE_ATTACK = 1340;
public static final int VORKATH_BOMB_AOE = 1481; public static final int VORKATH_BOMB_AOE = 1481;
public static final int VORKATH_POISON_POOL_AOE = 1483; public static final int VORKATH_POISON_POOL_AOE = 1483;
public static final int VORKATH_TICK_FIRE_AOE = 1482; 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 DRAKE_BREATH = 1637;
public static final int HUNLEFF_MAGE_ATTACK = 1707; 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_RANGE_ATTACK = 1711;
public static final int HUNLEFF_CORRUPTED_RANGE_ATTACK = 1712;
} }

13
runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java
View File

@@ -37,7 +37,6 @@ import net.runelite.api.HeadIcon;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.api.NPCDefinition; import net.runelite.api.NPCDefinition;
import net.runelite.api.Prayer; import net.runelite.api.Prayer;
import net.runelite.api.Projectile;
import net.runelite.api.ProjectileID; import net.runelite.api.ProjectileID;
import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.AnimationChanged;
import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcDespawned;
@@ -62,7 +61,9 @@ import net.runelite.client.ui.overlay.OverlayManager;
public class GauntletPlugin extends Plugin public class GauntletPlugin extends Plugin
{ {
private static final Set<Integer> HUNLEFF_ATTACKS = ImmutableSet.of(AnimationID.HUNLEFF_ATTACK, AnimationID.HUNLEFF_TORNADO); private static final Set<Integer> HUNLEFF_ANIMATIONS = ImmutableSet.of(AnimationID.HUNLEFF_ATTACK, AnimationID.HUNLEFF_TORNADO);
private static final Set<Integer> HUNLEFF_MAGE_PROJECTILES = ImmutableSet.of(ProjectileID.HUNLEFF_MAGE_ATTACK, ProjectileID.HUNLEFF_CORRUPTED_MAGE_ATTACK);
private static final Set<Integer> HUNLEFF_RANGE_PROJECTILES = ImmutableSet.of(ProjectileID.HUNLEFF_RANGE_ATTACK, ProjectileID.HUNLEFF_CORRUPTED_RANGE_ATTACK);
@Inject @Inject
private EventBus eventBus; private EventBus eventBus;
@Inject @Inject
@@ -140,14 +141,14 @@ public class GauntletPlugin extends Plugin
return; 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); setNextPrayer(Prayer.PROTECT_FROM_MAGIC);
setFirstHitDetected(true); setFirstHitDetected(true);
} }
else if (projectile.getId() == ProjectileID.HUNLEFF_RANGE_ATTACK) else if (HUNLEFF_RANGE_PROJECTILES.contains(projectileID))
{ {
setNextPrayer(Prayer.PROTECT_FROM_MISSILES); setNextPrayer(Prayer.PROTECT_FROM_MISSILES);
setFirstHitDetected(true); setFirstHitDetected(true);
@@ -163,7 +164,7 @@ public class GauntletPlugin extends Plugin
final int anim = event.getActor().getAnimation(); final int anim = event.getActor().getAnimation();
if (!HUNLEFF_ATTACKS.contains(anim)) if (!HUNLEFF_ANIMATIONS.contains(anim))
{ {
return; return;
} }