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

Add Skull Timer (#32)

Browse Source
This commit is contained in:
James
2019-04-21 11:35:17 -07:00
committed by Kyleeld
parent 710745a56f
commit f6873a3bdf
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java
View File

@@ -78,7 +78,8 @@ enum GameTimer
STAFF_OF_THE_DEAD(ItemID.STAFF_OF_THE_DEAD, GameTimerImageType.ITEM, "Staff of the Dead", 1, ChronoUnit.MINUTES), STAFF_OF_THE_DEAD(ItemID.STAFF_OF_THE_DEAD, GameTimerImageType.ITEM, "Staff of the Dead", 1, ChronoUnit.MINUTES),
ABYSSAL_SIRE_STUN(ItemID.ABYSSAL_ORPHAN, GameTimerImageType.ITEM, "Abyssal Sire Stun", 30, ChronoUnit.SECONDS, true), ABYSSAL_SIRE_STUN(ItemID.ABYSSAL_ORPHAN, GameTimerImageType.ITEM, "Abyssal Sire Stun", 30, ChronoUnit.SECONDS, true),
HOME_TELEPORT(SpriteID.SPELL_LUMBRIDGE_HOME_TELEPORT, GameTimerImageType.SPRITE, "Home Teleport", 30, ChronoUnit.MINUTES), HOME_TELEPORT(SpriteID.SPELL_LUMBRIDGE_HOME_TELEPORT, GameTimerImageType.SPRITE, "Home Teleport", 30, ChronoUnit.MINUTES),
MINIGAME_TELEPORT(SpriteID.TAB_QUESTS_RED_MINIGAMES, GameTimerImageType.SPRITE, "Minigame Teleport", 20, ChronoUnit.MINUTES); MINIGAME_TELEPORT(SpriteID.TAB_QUESTS_RED_MINIGAMES, GameTimerImageType.SPRITE, "Minigame Teleport", 20, ChronoUnit.MINUTES),
SKULL(SpriteID.PLAYER_KILLER_SKULL_523, GameTimerImageType.SPRITE, "Skull", 20, ChronoUnit.MINUTES);
@Getter @Getter
private final Duration duration; private final Duration duration;

17
runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
View File

@@ -43,6 +43,7 @@ import net.runelite.api.NPC;
import net.runelite.api.NpcID; import net.runelite.api.NpcID;
import net.runelite.api.Player; import net.runelite.api.Player;
import net.runelite.api.Prayer; import net.runelite.api.Prayer;
import net.runelite.api.SkullIcon;
import net.runelite.api.Varbits; import net.runelite.api.Varbits;
import net.runelite.api.WorldType; import net.runelite.api.WorldType;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
@@ -120,6 +121,7 @@ public class TimersPlugin extends Plugin
private int lastAnimation; private int lastAnimation;
private boolean loggedInRace; private boolean loggedInRace;
private boolean widgetHiddenChangedOnPvpWorld; private boolean widgetHiddenChangedOnPvpWorld;
private boolean skulledLastTick = false;
@Inject @Inject
private ItemManager itemManager; private ItemManager itemManager;
@@ -608,6 +610,21 @@ public class TimersPlugin extends Plugin
Player player = client.getLocalPlayer(); Player player = client.getLocalPlayer();
WorldPoint currentWorldPoint = player.getWorldLocation(); WorldPoint currentWorldPoint = player.getWorldLocation();
final boolean isSkulled = player.getSkullIcon() != null && player.getSkullIcon() != SkullIcon.SKULL_FIGHT_PIT;
if (isSkulled != skulledLastTick)
{
skulledLastTick = isSkulled;
if (isSkulled)
{
createGameTimer(SKULL);
}
else
{
removeGameTimer(SKULL);
}
}
if (freezeTimer != null) if (freezeTimer != null)
{ {
// assume movement means unfrozen // assume movement means unfrozen