From 5352827aa8e5e544763d581b6b65871486400254 Mon Sep 17 00:00:00 2001 From: William Date: Thu, 3 Jan 2019 00:37:36 +1030 Subject: [PATCH] Add missing sanfew serums to the prayer dose indicator. (#7131) --- .../client/plugins/prayer/PrayerDoseOverlay.java | 6 ++---- .../runelite/client/plugins/prayer/PrayerPlugin.java | 10 ++++------ .../client/plugins/prayer/PrayerRestoreType.java | 1 + 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerDoseOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerDoseOverlay.java index 0a7e00e753..242f221136 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerDoseOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerDoseOverlay.java @@ -64,9 +64,7 @@ class PrayerDoseOverlay extends Overlay @Setter(AccessLevel.PACKAGE) private int prayerBonus; @Setter(AccessLevel.PACKAGE) - private boolean hasPrayerPotion; - @Setter(AccessLevel.PACKAGE) - private boolean hasRestorePotion; + private boolean hasPrayerRestore; @Setter(AccessLevel.PACKAGE) private boolean hasHolyWrench; @@ -120,7 +118,7 @@ class PrayerDoseOverlay extends Overlay tooltipManager.add(new Tooltip(tooltip)); } - if (!config.showPrayerDoseIndicator() || (!hasPrayerPotion && !hasRestorePotion)) + if (!config.showPrayerDoseIndicator() || !hasPrayerRestore) { return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java index 58ad84e6a5..6442b5dfff 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java @@ -134,8 +134,7 @@ public class PrayerPlugin extends Plugin if (container == inventory || container == equipment) { doseOverlay.setHasHolyWrench(false); - doseOverlay.setHasPrayerPotion(false); - doseOverlay.setHasRestorePotion(false); + doseOverlay.setHasPrayerRestore(false); if (inventory != null) { @@ -226,14 +225,13 @@ public class PrayerPlugin extends Plugin switch (type) { case PRAYERPOT: - doseOverlay.setHasPrayerPotion(true); + case RESTOREPOT: + case SANFEWPOT: + doseOverlay.setHasPrayerRestore(true); break; case HOLYWRENCH: doseOverlay.setHasHolyWrench(true); break; - case RESTOREPOT: - doseOverlay.setHasRestorePotion(true); - break; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerRestoreType.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerRestoreType.java index 5d9f4e349a..2ef3c1a46f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerRestoreType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerRestoreType.java @@ -32,6 +32,7 @@ enum PrayerRestoreType { RESTOREPOT(ItemID.SUPER_RESTORE4, ItemID.SUPER_RESTORE3, ItemID.SUPER_RESTORE2, ItemID.SUPER_RESTORE1), PRAYERPOT(ItemID.PRAYER_POTION4, ItemID.PRAYER_POTION3, ItemID.PRAYER_POTION2, ItemID.PRAYER_POTION1), + SANFEWPOT(ItemID.SANFEW_SERUM4, ItemID.SANFEW_SERUM3, ItemID.SANFEW_SERUM2, ItemID.SANFEW_SERUM1), HOLYWRENCH(ItemID.PRAYER_CAPE, ItemID.PRAYER_CAPET, ItemID.PRAYER_CAPE_10643, ItemID.MAX_CAPE, ItemID.MAX_CAPE_13282, ItemID.MAX_CAPE_13342, ItemID.HOLY_WRENCH, ItemID.RING_OF_THE_GODS_I);