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

demonic gorilla plugin: use headicon api

Browse Source
This commit is contained in:
Adam
2018-04-29 19:42:54 -04:00
parent 18dc60db60
commit ff89cac97e
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorilla.java
View File

@@ -29,6 +29,7 @@ import java.util.List;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import net.runelite.api.Actor; import net.runelite.api.Actor;
import net.runelite.api.HeadIcon;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.api.NPCComposition; import net.runelite.api.NPCComposition;
import net.runelite.api.coords.WorldArea; import net.runelite.api.coords.WorldArea;
@@ -112,7 +113,7 @@ public class DemonicGorilla
@Getter @Getter
@Setter @Setter
private int lastTickOverheadIcon; private HeadIcon lastTickOverheadIcon;
@Getter @Getter
@Setter @Setter
@@ -125,16 +126,15 @@ public class DemonicGorilla
this.nextAttackTick = -100; this.nextAttackTick = -100;
this.attacksUntilSwitch = ATTACKS_PER_SWITCH; this.attacksUntilSwitch = ATTACKS_PER_SWITCH;
this.recentProjectileId = -1; this.recentProjectileId = -1;
this.lastTickOverheadIcon = -1;
} }
public int getOverheadIcon() public HeadIcon getOverheadIcon()
{ {
NPCComposition composition = this.npc.getComposition(); NPCComposition composition = this.npc.getComposition();
if (composition != null) if (composition != null)
{ {
return composition.getOverheadIcon(); return composition.getOverheadIcon();
} }
return -1; return null;
} }
} }

27
runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java
View File

@@ -25,7 +25,6 @@
package net.runelite.client.plugins.demonicgorilla; package net.runelite.client.plugins.demonicgorilla;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
@@ -39,6 +38,7 @@ import lombok.extern.slf4j.Slf4j;
import net.runelite.api.AnimationID; import net.runelite.api.AnimationID;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; import net.runelite.api.GameState;
import net.runelite.api.HeadIcon;
import net.runelite.api.Hitsplat; import net.runelite.api.Hitsplat;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.api.NpcID; import net.runelite.api.NpcID;
@@ -65,10 +65,6 @@ import net.runelite.client.ui.overlay.Overlay;
@Slf4j @Slf4j
public class DemonicGorillaPlugin extends Plugin public class DemonicGorillaPlugin extends Plugin
{ {
static final int OVERHEAD_ICON_MELEE = 0;
static final int OVERHEAD_ICON_RANGED = 1;
static final int OVERHEAD_ICON_MAGIC = 2;
@Inject @Inject
private Client client; private Client client;
@@ -155,19 +151,22 @@ public class DemonicGorillaPlugin extends Plugin
private DemonicGorilla.AttackStyle getProtectedStyle(Player player) private DemonicGorilla.AttackStyle getProtectedStyle(Player player)
{ {
if (player.getOverheadIcon() == OVERHEAD_ICON_MELEE) HeadIcon headIcon = player.getOverheadIcon();
if (headIcon == null)
{ {
return DemonicGorilla.AttackStyle.MELEE; return null;
} }
else if (player.getOverheadIcon() == OVERHEAD_ICON_RANGED) switch (headIcon)
{ {
return DemonicGorilla.AttackStyle.RANGED; case MELEE:
return DemonicGorilla.AttackStyle.MELEE;
case RANGED:
return DemonicGorilla.AttackStyle.RANGED;
case MAGIC:
return DemonicGorilla.AttackStyle.MAGIC;
default:
return null;
} }
else if (player.getOverheadIcon() == OVERHEAD_ICON_MAGIC)
{
return DemonicGorilla.AttackStyle.MAGIC;
}
return null;
} }
private void onGorillaAttack(DemonicGorilla gorilla, final DemonicGorilla.AttackStyle attackStyle) private void onGorillaAttack(DemonicGorilla gorilla, final DemonicGorilla.AttackStyle attackStyle)