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

Merge pull request #5071 from ShaunDreclin/prayer-flick

Browse Source 
Add option to always show prayer flick helper
This commit is contained in:
Tomas Slusny
2018-09-23 00:55:12 +02:00
committed by GitHub
parent e9221f0c76 2f4aefa6c1
commit 15545fd022
3 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java
View File

@@ -93,7 +93,9 @@ class PrayerBarOverlay extends Overlay
graphics.setColor(BAR_FILL_COLOR);
graphics.fillRect(barX, barY, progressFill, barHeight);
if (plugin.isPrayersActive() && (config.prayerFlickLocation().equals(PrayerFlickLocation.PRAYER_BAR) || config.prayerFlickLocation().equals(PrayerFlickLocation.BOTH)))
if ((plugin.isPrayersActive() || config.prayerFlickAlwaysOn())
&& (config.prayerFlickLocation().equals(PrayerFlickLocation.PRAYER_BAR)
|| config.prayerFlickLocation().equals(PrayerFlickLocation.BOTH)))
{
double t = plugin.getTickProgress();

33
runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerConfig.java
View File

@@ -35,7 +35,7 @@ public interface PrayerConfig extends Config
position = 0,
keyName = "prayerFlickLocation",
name = "Pray flick location",
description = "Choose where to display the prayer flick helper"
description = "Choose where to display the prayer flick helper."
)
default PrayerFlickLocation prayerFlickLocation()
{
@@ -44,9 +44,20 @@ public interface PrayerConfig extends Config
@ConfigItem(
position = 1,
keyName = "prayerFlickAlwaysOn",
name = "Never hide prayer flick helper",
description = "Show prayer flick helper regardless of if you're praying or not."
)
default boolean prayerFlickAlwaysOn()
{
return false;
}
@ConfigItem(
position = 2,
keyName = "prayerIndicator",
name = "Boost indicator",
description = "Enable infoboxes for prayers"
description = "Enable infoboxes for prayers."
)
default boolean prayerIndicator()
{
@@ -54,10 +65,10 @@ public interface PrayerConfig extends Config
}
@ConfigItem(
position = 2,
position = 3,
keyName = "prayerIndicatorOverheads",
name = "Overhead indicator",
description = "Also enable infoboxes for overheads"
description = "Also enable infoboxes for overheads."
)
default boolean prayerIndicatorOverheads()
{
@@ -65,7 +76,7 @@ public interface PrayerConfig extends Config
}
@ConfigItem(
position = 3,
position = 4,
keyName = "showPrayerDoseIndicator",
name = "Show prayer dose indicator",
description = "Enables the prayer dose indicator."
@@ -76,7 +87,7 @@ public interface PrayerConfig extends Config
}
@ConfigItem(
position = 4,
position = 5,
keyName = "showPrayerTooltip",
name = "Show prayer orb tooltip",
description = "Displays time remaining and prayer bonus as a tooltip on the quick-prayer icon."
@@ -87,7 +98,7 @@ public interface PrayerConfig extends Config
}
@ConfigItem(
position = 5,
position = 6,
keyName = "showPrayerBar",
name = "Show prayer bar",
description = "Displays prayer bar under HP bar when praying."
@@ -98,10 +109,10 @@ public interface PrayerConfig extends Config
}
@ConfigItem(
position = 7,
keyName = "prayerBarHideIfNotPraying",
name = "Hide bar while prayer is inactive",
description = "Prayer bar will be hidden while prayers are inactivate.",
position = 6
description = "Prayer bar will be hidden while prayers are inactive."
)
default boolean hideIfNotPraying()
{
@@ -109,10 +120,10 @@ public interface PrayerConfig extends Config
}
@ConfigItem(
position = 8,
keyName = "prayerBarHideIfNonCombat",
name = "Hide bar while out-of-combat",
description = "Prayer bar will be hidden while out-of-combat.",
position = 7
description = "Prayer bar will be hidden while out-of-combat."
)
default boolean hideIfOutOfCombat()
{

2
runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickOverlay.java
View File

@@ -56,7 +56,7 @@ class PrayerFlickOverlay extends Overlay
public Dimension render(Graphics2D graphics)
{
// If there are no prayers active or flick location is set to the prayer bar we don't require the flick helper
if (!plugin.isPrayersActive()
if ((!plugin.isPrayersActive() && !config.prayerFlickAlwaysOn())
|| config.prayerFlickLocation().equals(PrayerFlickLocation.NONE)
|| config.prayerFlickLocation().equals(PrayerFlickLocation.PRAYER_BAR))
{