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

Add barbarian mix timers to Timers plugin (#7088)

Browse Source 
Closes #7079
This commit is contained in:
tanlines
2018-12-30 05:39:45 +11:00
committed by Tomas Slusny
parent a86bbde9da
commit 392cdfd4f7
1 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -306,7 +306,9 @@ public class TimersPlugin extends Plugin
&& (event.getId() == ItemID.ANTIDOTE1 && (event.getId() == ItemID.ANTIDOTE1
|| event.getId() == ItemID.ANTIDOTE2 || event.getId() == ItemID.ANTIDOTE2
|| event.getId() == ItemID.ANTIDOTE3 || event.getId() == ItemID.ANTIDOTE3
|| event.getId() == ItemID.ANTIDOTE4)) || event.getId() == ItemID.ANTIDOTE4
|| event.getId() == ItemID.ANTIDOTE_MIX1
|| event.getId() == ItemID.ANTIDOTE_MIX2))
{ {
// Needs menu option hook because drink message is intercepting with antipoison message // Needs menu option hook because drink message is intercepting with antipoison message
createGameTimer(ANTIDOTEPLUS); createGameTimer(ANTIDOTEPLUS);
@@ -318,7 +320,9 @@ public class TimersPlugin extends Plugin
&& (event.getId() == ItemID.ANTIPOISON1 && (event.getId() == ItemID.ANTIPOISON1
|| event.getId() == ItemID.ANTIPOISON2 || event.getId() == ItemID.ANTIPOISON2
|| event.getId() == ItemID.ANTIPOISON3 || event.getId() == ItemID.ANTIPOISON3
|| event.getId() == ItemID.ANTIPOISON4)) || event.getId() == ItemID.ANTIPOISON4
|| event.getId() == ItemID.ANTIPOISON_MIX1
|| event.getId() == ItemID.ANTIPOISON_MIX2))
{ {
createGameTimer(ANTIPOISON); createGameTimer(ANTIPOISON);
return; return;
@@ -329,7 +333,9 @@ public class TimersPlugin extends Plugin
&& (event.getId() == ItemID.SUPERANTIPOISON1 && (event.getId() == ItemID.SUPERANTIPOISON1
|| event.getId() == ItemID.SUPERANTIPOISON2 || event.getId() == ItemID.SUPERANTIPOISON2
|| event.getId() == ItemID.SUPERANTIPOISON3 || event.getId() == ItemID.SUPERANTIPOISON3
|| event.getId() == ItemID.SUPERANTIPOISON4)) || event.getId() == ItemID.SUPERANTIPOISON4
|| event.getId() == ItemID.ANTIPOISON_SUPERMIX1
|| event.getId() == ItemID.ANTIPOISON_SUPERMIX2))
{ {
createGameTimer(SUPERANTIPOISON); createGameTimer(SUPERANTIPOISON);
return; return;
@@ -345,6 +351,46 @@ public class TimersPlugin extends Plugin
return; return;
} }
if (config.showAntiFire()
&& event.getMenuOption().contains("Drink")
&& (event.getId() == ItemID.ANTIFIRE_MIX1
|| event.getId() == ItemID.ANTIFIRE_MIX2))
{
// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
createGameTimer(ANTIFIRE);
return;
}
if (config.showAntiFire()
&& event.getMenuOption().contains("Drink")
&& (event.getId() == ItemID.EXTENDED_ANTIFIRE_MIX1
|| event.getId() == ItemID.EXTENDED_ANTIFIRE_MIX2))
{
// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
createGameTimer(EXANTIFIRE);
return;
}
if (config.showAntiFire()
&& event.getMenuOption().contains("Drink")
&& (event.getId() == ItemID.SUPER_ANTIFIRE_MIX1
|| event.getId() == ItemID.SUPER_ANTIFIRE_MIX2))
{
// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
createGameTimer(SUPERANTIFIRE);
return;
}
if (config.showAntiFire()
&& event.getMenuOption().contains("Drink")
&& (event.getId() == ItemID.EXTENDED_SUPER_ANTIFIRE_MIX1
|| event.getId() == ItemID.EXTENDED_SUPER_ANTIFIRE_MIX2))
{
// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
createGameTimer(EXSUPERANTIFIRE);
return;
}
TeleportWidget teleportWidget = TeleportWidget.of(event.getWidgetId()); TeleportWidget teleportWidget = TeleportWidget.of(event.getWidgetId());
if (teleportWidget != null) if (teleportWidget != null)
{ {