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

infernoplugin: add ticksOnNpcZukShield config option (#2089)

Browse Source 
infernoplugin: add ticksOnNpcZukShield config option
This commit is contained in:
Owain van Brakel
2019-12-06 00:36:51 +01:00
committed by GitHub
parent 4dce917a08 1723286505
commit c51851cc98
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java
View File

@@ -944,6 +944,18 @@ public interface InfernoConfig extends Config
return false; return false;
} }
@ConfigItem(
position = 4,
keyName = "ticksOnNpcZukShield",
name = "Ticks on Zuk Shield",
description = "Draws the amount of ticks before Zuk attacks on the floating shield",
section = "ZukSection"
)
default boolean ticksOnNpcZukShield()
{
return false;
}
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor
enum FontStyle enum FontStyle

12
runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java
View File

@@ -13,6 +13,7 @@ import net.runelite.api.Client;
import net.runelite.api.Perspective; import net.runelite.api.Perspective;
import net.runelite.api.Point; import net.runelite.api.Point;
import net.runelite.api.Prayer; import net.runelite.api.Prayer;
import net.runelite.api.NPC;
import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.Widget;
@@ -113,7 +114,12 @@ public class InfernoOverlay extends Overlay
if (plugin.isTicksOnNpc(infernoNPC) && infernoNPC.getTicksTillNextAttack() > 0) if (plugin.isTicksOnNpc(infernoNPC) && infernoNPC.getTicksTillNextAttack() > 0)
{ {
renderTicksOnNpc(graphics, infernoNPC); renderTicksOnNpc(graphics, infernoNPC, infernoNPC.getNpc());
}
if (plugin.isTicksOnNpcZukShield() && infernoNPC.getType() == InfernoNPC.Type.ZUK && plugin.getZukShield() != null && infernoNPC.getTicksTillNextAttack() > 0)
{
renderTicksOnNpc(graphics, infernoNPC, plugin.getZukShield());
} }
} }
@@ -345,12 +351,12 @@ public class InfernoOverlay extends Overlay
} }
} }
private void renderTicksOnNpc(Graphics2D graphics, InfernoNPC infernoNPC) private void renderTicksOnNpc(Graphics2D graphics, InfernoNPC infernoNPC, NPC renderOnNPC)
{ {
final Color color = (infernoNPC.getTicksTillNextAttack() == 1 final Color color = (infernoNPC.getTicksTillNextAttack() == 1
|| (infernoNPC.getType() == InfernoNPC.Type.BLOB && infernoNPC.getTicksTillNextAttack() == 4)) || (infernoNPC.getType() == InfernoNPC.Type.BLOB && infernoNPC.getTicksTillNextAttack() == 4))
? infernoNPC.getNextAttack().getCriticalColor() : infernoNPC.getNextAttack().getNormalColor(); ? infernoNPC.getNextAttack().getCriticalColor() : infernoNPC.getNextAttack().getNormalColor();
final Point canvasPoint = infernoNPC.getNpc().getCanvasTextLocation( final Point canvasPoint = renderOnNPC.getCanvasTextLocation(
graphics, String.valueOf(infernoNPC.getTicksTillNextAttack()), 0); graphics, String.valueOf(infernoNPC.getTicksTillNextAttack()), 0);
OverlayUtil.renderTextLocation(graphics, String.valueOf(infernoNPC.getTicksTillNextAttack()), OverlayUtil.renderTextLocation(graphics, String.valueOf(infernoNPC.getTicksTillNextAttack()),
plugin.getTextSize(), plugin.getFontStyle().getFont(), color, canvasPoint, false, 0); plugin.getTextSize(), plugin.getFontStyle().getFont(), color, canvasPoint, false, 0);

5
runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java
View File

@@ -117,6 +117,7 @@ public class InfernoPlugin extends Plugin
@Getter(AccessLevel.PACKAGE) @Getter(AccessLevel.PACKAGE)
private boolean finalPhase = false; private boolean finalPhase = false;
@Getter(AccessLevel.PACKAGE)
private NPC zukShield = null; private NPC zukShield = null;
private WorldPoint zukShieldLastPosition = null; private WorldPoint zukShieldLastPosition = null;
private WorldPoint zukShieldBase = null; private WorldPoint zukShieldBase = null;
@@ -198,6 +199,9 @@ public class InfernoPlugin extends Plugin
private boolean ticksOnNpcJad; private boolean ticksOnNpcJad;
private boolean ticksOnNpcZuk; private boolean ticksOnNpcZuk;
@Getter(AccessLevel.PACKAGE)
private boolean ticksOnNpcZukShield;
private boolean safespotsBat; private boolean safespotsBat;
private boolean safespotsBlob; private boolean safespotsBlob;
private boolean safespotsMeleer; private boolean safespotsMeleer;
@@ -1065,6 +1069,7 @@ public class InfernoPlugin extends Plugin
this.ticksOnNpcHealerJad = config.ticksOnNpcHealerJad(); this.ticksOnNpcHealerJad = config.ticksOnNpcHealerJad();
this.ticksOnNpcJad = config.ticksOnNpcJad(); this.ticksOnNpcJad = config.ticksOnNpcJad();
this.ticksOnNpcZuk = config.ticksOnNpcZuk(); this.ticksOnNpcZuk = config.ticksOnNpcZuk();
this.ticksOnNpcZukShield = config.ticksOnNpcZukShield();
this.safespotsBat = config.safespotsBat(); this.safespotsBat = config.safespotsBat();
this.safespotsBlob = config.safespotsBlob(); this.safespotsBlob = config.safespotsBlob();