Merge pull request #461 from Sethtroll/addraidstimers

Add Raid potions to timer plugin

runelite-api/src/main/java/net/runelite/api/Varbits.java

@@ -187,7 +187,12 @@ public enum Varbits
 	/**
 	 * Experience drop color
 	 */
-	EXPERIENCE_DROP_COLOR(4695, 1227, 6, 8);
+	EXPERIENCE_DROP_COLOR(4695, 1227, 6, 8),
+
+	/**
+	 * Raids
+	 */
+	IN_RAID(5432, 1431, 31, 31);
 
 	/**
 	 * varbit id

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

@@ -64,7 +64,9 @@ public enum GameTimer
 	ANTIDOTEPLUS("antidoteplus", "Antidote+", 518, ChronoUnit.SECONDS),
 	ANTIVENOM("antivenom", "Anto-venom", 12, ChronoUnit.MINUTES),
 	EXSUPERANTIFIRE("exsuperantifire", "Extended Super AntiFire", 6, ChronoUnit.MINUTES),
-	SANFEW("sanfew", "Sanfew serum", 6, ChronoUnit.MINUTES);
+	SANFEW("sanfew", "Sanfew serum", 6, ChronoUnit.MINUTES),
+	OVERLOAD_RAID("overloadraid", "Overload", 5, ChronoUnit.MINUTES),
+	PRAYER_ENHANCE("prayerenhance", "Prayer enhance", 5, ChronoUnit.MINUTES);
 
 	@Getter
 	private final String imageResource;

runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersConfig.java

@@ -214,4 +214,14 @@ public interface TimersConfig extends Config
 	{
 		return true;
 	}
+
+	@ConfigItem(
+		keyName = "showPrayerEnhance",
+		name = "Prayer enhance timer",
+		description = "Configures whether prayer enhance timer is displayed"
+	)
+	default boolean showPrayerEnhance()
+	{
+		return true;
+	}
 }

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

@@ -36,6 +36,8 @@ import static net.runelite.client.plugins.timers.GameTimer.FULLTB;
 import static net.runelite.client.plugins.timers.GameTimer.HALFTB;
 import static net.runelite.client.plugins.timers.GameTimer.MAGICIMBUE;
 import static net.runelite.client.plugins.timers.GameTimer.OVERLOAD;
+import static net.runelite.client.plugins.timers.GameTimer.OVERLOAD_RAID;
+import static net.runelite.client.plugins.timers.GameTimer.PRAYER_ENHANCE;
 import static net.runelite.client.plugins.timers.GameTimer.SANFEW;
 import static net.runelite.client.plugins.timers.GameTimer.STAMINA;
 import static net.runelite.client.plugins.timers.GameTimer.SUPERANTIFIRE;
@@ -59,6 +61,7 @@ import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
 import net.runelite.api.ItemID;
 import net.runelite.api.Prayer;
+import net.runelite.api.Varbits;
 import net.runelite.api.events.GraphicChanged;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.api.events.ChatMessage;
@@ -115,6 +118,7 @@ public class TimersPlugin extends Plugin
 		if (!config.showOverload())
 		{
 			removeGameTimer(OVERLOAD);
+			removeGameTimer(OVERLOAD_RAID);
 		}
 
 		if (!config.showCannon())
@@ -191,6 +195,11 @@ public class TimersPlugin extends Plugin
 			removeGameTimer(ICEBLITZ);
 			removeGameTimer(ICEBARRAGE);
 		}
+
+		if (!config.showPrayerEnhance())
+		{
+			removeGameTimer(PRAYER_ENHANCE);
+		}
 	}
 
 	@Subscribe
@@ -229,7 +238,7 @@ public class TimersPlugin extends Plugin
 			return;
 		}
 
-		if (event.getMessage().equals("You drink some of your stamina potion.") && config.showStamina())
+		if (config.showStamina() && event.getMessage().equals("You drink some of your stamina potion."))
 		{
 			createGameTimer(STAMINA);
 		}
@@ -239,17 +248,17 @@ public class TimersPlugin extends Plugin
 			removeGameTimer(STAMINA);
 		}
 
-		if (event.getMessage().equals("You drink some of your antifire potion.") && config.showAntiFire())
+		if (config.showAntiFire() && event.getMessage().equals("You drink some of your antifire potion."))
 		{
 			createGameTimer(ANTIFIRE);
 		}
 
-		if (event.getMessage().equals("You drink some of your extended antifire potion.") && config.showExAntiFire())
+		if (config.showExAntiFire() && event.getMessage().equals("You drink some of your extended antifire potion."))
 		{
 			createGameTimer(EXANTIFIRE);
 		}
 
-		if (event.getMessage().equals("You drink some of your extended super antifire potion.") && config.showExSuperAntifire())
+		if (config.showExSuperAntifire() && event.getMessage().equals("You drink some of your extended super antifire potion."))
 		{
 			createGameTimer(EXSUPERANTIFIRE);
 		}
@@ -261,12 +270,20 @@ public class TimersPlugin extends Plugin
 			removeGameTimer(EXANTIFIRE);
 		}
 
-		if (event.getMessage().contains("You drink some of your overload potion") && config.showOverload())
+		if (config.showOverload() && event.getMessage().startsWith("You drink some of your") && event.getMessage().contains("overload"))
 		{
-			createGameTimer(OVERLOAD);
+			if (client.getSetting(Varbits.IN_RAID) == 1)
+			{
+				createGameTimer(OVERLOAD_RAID);
+			}
+			else
+			{
+				createGameTimer(OVERLOAD);
+			}
+
 		}
 
-		if ((event.getMessage().equals("You add the furnace.") || event.getMessage().contains("You repair your cannon, restoring it to working order.")) && config.showCannon())
+		if (config.showCannon() && (event.getMessage().equals("You add the furnace.") || event.getMessage().contains("You repair your cannon, restoring it to working order.")))
 		{
 			createGameTimer(CANNON);
 		}
@@ -276,12 +293,12 @@ public class TimersPlugin extends Plugin
 			removeGameTimer(CANNON);
 		}
 
-		if (event.getMessage().contains("You drink some of your super antivenom potion") && config.showAntiVenomPlus())
+		if (config.showAntiVenomPlus() && event.getMessage().contains("You drink some of your super antivenom potion"))
 		{
 			createGameTimer(ANTIVENOMPLUS);
 		}
 
-		if (event.getMessage().equals("You are charged to combine runes!") && config.showMagicImbue())
+		if (config.showMagicImbue() && event.getMessage().equals("You are charged to combine runes!"))
 		{
 			createGameTimer(MAGICIMBUE);
 		}
@@ -291,22 +308,22 @@ public class TimersPlugin extends Plugin
 			removeGameTimer(MAGICIMBUE);
 		}
 
-		if (event.getMessage().equals("<col=4f006f>A teleblock spell has been cast on you. It will expire in 5 minutes, 0 seconds.</col>") && config.showTeleblock())
+		if (config.showTeleblock() && event.getMessage().equals("<col=4f006f>A teleblock spell has been cast on you. It will expire in 5 minutes, 0 seconds.</col>"))
 		{
 			createGameTimer(FULLTB);
 		}
 
-		if (event.getMessage().equals("<col=4f006f>A teleblock spell has been cast on you. It will expire in 2 minutes, 30 seconds.</col>") && config.showTeleblock())
+		if (config.showTeleblock() && event.getMessage().equals("<col=4f006f>A teleblock spell has been cast on you. It will expire in 2 minutes, 30 seconds.</col>"))
 		{
 			createGameTimer(HALFTB);
 		}
 
-		if (event.getMessage().contains("You drink some of your super antifire potion") && config.showSuperAntiFire())
+		if (config.showSuperAntiFire() && event.getMessage().contains("You drink some of your super antifire potion"))
 		{
 			createGameTimer(SUPERANTIFIRE);
 		}
 
-		if (event.getMessage().equals("<col=7f007f>Your super antifire potion has expired.</col>") && config.showSuperAntiFire())
+		if (event.getMessage().equals("<col=7f007f>Your super antifire potion has expired.</col>"))
 		{
 			removeGameTimer(SUPERANTIFIRE);
 		}
@@ -316,15 +333,20 @@ public class TimersPlugin extends Plugin
 			removeGameTimer(IMBUEDHEART);
 		}
 
-		if (event.getMessage().contains("You drink some of your antivenom potion") && config.showAntiVenom())
+		if (config.showAntiVenom() && event.getMessage().contains("You drink some of your antivenom potion"))
 		{
 			createGameTimer(ANTIVENOM);
 		}
 
-		if (event.getMessage().contains("You drink some of your Sanfew Serum.") && config.showSanfew())
+		if (config.showSanfew() && event.getMessage().contains("You drink some of your Sanfew Serum."))
 		{
 			createGameTimer(SANFEW);
 		}
+
+		if (config.showPrayerEnhance() && event.getMessage().startsWith("You drink some of your") && event.getMessage().contains("prayer enhance"))
+		{
+			createGameTimer(PRAYER_ENHANCE);
+		}
 	}
 
 	@Subscribe
@@ -337,12 +359,12 @@ public class TimersPlugin extends Plugin
 			return;
 		}
 
-		if (actor.getGraphic() == IMBUEDHEART.getGraphicId() && config.showImbuedHeart())
+		if (config.showImbuedHeart() && actor.getGraphic() == IMBUEDHEART.getGraphicId())
 		{
 			createGameTimer(IMBUEDHEART);
 		}
 
-		if (actor.getGraphic() == VENGEANCE.getGraphicId() && config.showVengeance())
+		if (config.showVengeance() && actor.getGraphic() == VENGEANCE.getGraphicId())
 		{
 			createGameTimer(VENGEANCE);
 		}