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

kourendlibrary: hide Varlamore Envoy outside of the Depths of Despair

Browse Source
This commit is contained in:
Trey
2020-10-06 07:00:53 +02:00
committed by Max Weber
parent cfa6942678
commit 204b79ae17
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryConfig.java
View File

@@ -54,11 +54,11 @@ public interface KourendLibraryConfig extends Config
} }
@ConfigItem( @ConfigItem(
keyName = "hideVarlamoreEnvoy", keyName = "alwaysShowVarlamoreEnvoy",
name = "Hide Varlamore Envoy", name = "Show Varlamore Envoy",
description = "Whether to hide Varlamore Envoy, as it is only required in the Depths of Despair quest, and is never asked for." description = "Varlamore Envoy is only needed during the Depths of Despair, and is never asked for"
) )
default boolean hideVarlamoreEnvoy() default boolean alwaysShowVarlamoreEnvoy()
{ {
return false; return false;
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java
View File

@@ -127,7 +127,7 @@ class KourendLibraryOverlay extends Overlay
bookIsKnown = true; bookIsKnown = true;
} }
if ((book == Book.VARLAMORE_ENVOY && config.hideVarlamoreEnvoy()) if ((book == Book.VARLAMORE_ENVOY && !plugin.showVarlamoreEnvoy())
|| (book != null && book.isDarkManuscript() && config.hideDarkManuscript())) || (book != null && book.isDarkManuscript() && config.hideDarkManuscript()))
{ {
continue; continue;

6
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java
View File

@@ -53,7 +53,6 @@ class KourendLibraryPanel extends PluginPanel
private static final ImageIcon RESET_HOVER_ICON; private static final ImageIcon RESET_HOVER_ICON;
private final KourendLibraryPlugin plugin; private final KourendLibraryPlugin plugin;
private final KourendLibraryConfig config;
private final Library library; private final Library library;
private final HashMap<Book, BookPanel> bookPanels = new HashMap<>(); private final HashMap<Book, BookPanel> bookPanels = new HashMap<>();
@@ -66,12 +65,11 @@ class KourendLibraryPanel extends PluginPanel
} }
@Inject @Inject
KourendLibraryPanel(KourendLibraryPlugin plugin, KourendLibraryConfig config, Library library) KourendLibraryPanel(KourendLibraryPlugin plugin, Library library)
{ {
super(); super();
this.plugin = plugin; this.plugin = plugin;
this.config = config;
this.library = library; this.library = library;
} }
@@ -89,7 +87,7 @@ class KourendLibraryPanel extends PluginPanel
c.gridy = 0; c.gridy = 0;
Stream.of(Book.values()) Stream.of(Book.values())
.filter(b -> !b.isDarkManuscript()) .filter(b -> !b.isDarkManuscript())
.filter(b -> !config.hideVarlamoreEnvoy() || b != Book.VARLAMORE_ENVOY) .filter(b -> b != Book.VARLAMORE_ENVOY || plugin.showVarlamoreEnvoy())
.sorted(Comparator.comparing(Book::getShortName)) .sorted(Comparator.comparing(Book::getShortName))
.forEach(b -> .forEach(b ->
{ {

11
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
View File

@@ -59,6 +59,8 @@ import net.runelite.api.events.ItemContainerChanged;
import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.MenuOptionClicked;
import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetInfo;
import net.runelite.api.Quest;
import net.runelite.api.QuestState;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe; import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.game.ItemManager; import net.runelite.client.game.ItemManager;
@@ -113,6 +115,7 @@ public class KourendLibraryPlugin extends Plugin
private WorldPoint lastBookcaseClick = null; private WorldPoint lastBookcaseClick = null;
private WorldPoint lastBookcaseAnimatedOn = null; private WorldPoint lastBookcaseAnimatedOn = null;
private EnumSet<Book> playerBooks = null; private EnumSet<Book> playerBooks = null;
private QuestState depthsOfDespairState = QuestState.FINISHED;
@Getter(AccessLevel.PACKAGE) @Getter(AccessLevel.PACKAGE)
private final Set<NPC> npcsToMark = new HashSet<>(); private final Set<NPC> npcsToMark = new HashSet<>();
@@ -262,6 +265,7 @@ public class KourendLibraryPlugin extends Plugin
{ {
if (inRegion) if (inRegion)
{ {
panel.reload();
clientToolbar.addNavigation(navButton); clientToolbar.addNavigation(navButton);
} }
else else
@@ -277,6 +281,8 @@ public class KourendLibraryPlugin extends Plugin
return; return;
} }
depthsOfDespairState = Quest.THE_DEPTHS_OF_DESPAIR.getState(client);
if (lastBookcaseAnimatedOn != null) if (lastBookcaseAnimatedOn != null)
{ {
Widget find = client.getWidget(WidgetInfo.DIALOG_SPRITE_SPRITE); Widget find = client.getWidget(WidgetInfo.DIALOG_SPRITE_SPRITE);
@@ -412,6 +418,11 @@ public class KourendLibraryPlugin extends Plugin
} }
} }
boolean showVarlamoreEnvoy()
{
return config.alwaysShowVarlamoreEnvoy() || depthsOfDespairState == QuestState.IN_PROGRESS;
}
static boolean isLibraryCustomer(int npcId) static boolean isLibraryCustomer(int npcId)
{ {
return npcId == NpcID.VILLIA || npcId == NpcID.PROFESSOR_GRACKLEBONE || npcId == NpcID.SAM_7049; return npcId == NpcID.VILLIA || npcId == NpcID.PROFESSOR_GRACKLEBONE || npcId == NpcID.SAM_7049;