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

Add missing sanfew serums to the prayer dose indicator. (#7131)

Browse Source
This commit is contained in:
William
2019-01-03 00:37:36 +10:30
committed by Tomas Slusny
parent 46af56d465
commit 5352827aa8
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerDoseOverlay.java
View File

@@ -64,9 +64,7 @@ class PrayerDoseOverlay extends Overlay
@Setter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE)
private int prayerBonus; private int prayerBonus;
@Setter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE)
private boolean hasPrayerPotion; private boolean hasPrayerRestore;
@Setter(AccessLevel.PACKAGE)
private boolean hasRestorePotion;
@Setter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE)
private boolean hasHolyWrench; private boolean hasHolyWrench;
@@ -120,7 +118,7 @@ class PrayerDoseOverlay extends Overlay
tooltipManager.add(new Tooltip(tooltip)); tooltipManager.add(new Tooltip(tooltip));
} }
if (!config.showPrayerDoseIndicator() || (!hasPrayerPotion && !hasRestorePotion)) if (!config.showPrayerDoseIndicator() || !hasPrayerRestore)
{ {
return null; return null;
} }

10
runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java
View File

@@ -134,8 +134,7 @@ public class PrayerPlugin extends Plugin
if (container == inventory || container == equipment) if (container == inventory || container == equipment)
{ {
doseOverlay.setHasHolyWrench(false); doseOverlay.setHasHolyWrench(false);
doseOverlay.setHasPrayerPotion(false); doseOverlay.setHasPrayerRestore(false);
doseOverlay.setHasRestorePotion(false);
if (inventory != null) if (inventory != null)
{ {
@@ -226,14 +225,13 @@ public class PrayerPlugin extends Plugin
switch (type) switch (type)
{ {
case PRAYERPOT: case PRAYERPOT:
doseOverlay.setHasPrayerPotion(true); case RESTOREPOT:
case SANFEWPOT:
doseOverlay.setHasPrayerRestore(true);
break; break;
case HOLYWRENCH: case HOLYWRENCH:
doseOverlay.setHasHolyWrench(true); doseOverlay.setHasHolyWrench(true);
break; break;
case RESTOREPOT:
doseOverlay.setHasRestorePotion(true);
break;
} }
} }

1
runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerRestoreType.java
View File

@@ -32,6 +32,7 @@ enum PrayerRestoreType
{ {
RESTOREPOT(ItemID.SUPER_RESTORE4, ItemID.SUPER_RESTORE3, ItemID.SUPER_RESTORE2, ItemID.SUPER_RESTORE1), 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), 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, 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); ItemID.MAX_CAPE_13342, ItemID.HOLY_WRENCH, ItemID.RING_OF_THE_GODS_I);