Add support for filtering by quest experience rewards (skill filtering) #1283
Conversation
tempest-sol
commented
Sep 21, 2023
•
tempest-sol
commented
| @@ -206,6 +208,78 @@ public static QuestFilter[] displayFilters() | |||
| } | |||
| } | |||
|
|
|||
| enum SkillFilter implements Predicate<QuestHelper> | |||
| { | |||
| ANY(true), | |||
There was a problem hiding this comment.
nit: rename so its display name is "Show All", this way it's consistent with the base quest filter
| enum SkillFilter implements Predicate<QuestHelper> | ||
| { | ||
| ANY(true), | ||
| ATTACK, |
There was a problem hiding this comment.
bit of a random suggestion, but you could use a constructor that takes a RuneLite Skill that you get the display name from, which also means you don't need to call Skill.valueOf since you already have the underlying skill
.
It would mean this line would look something like this (probably doesn't compile:
ATTACK(Skill.ATTACK),and the SkillFilter constructor looking something like this:
// Constructor for meta filters
SkillFilter(String displayName)
{
this.skill = null;
this.displayName = displayName;
this.predicate = q -> true;
}
// Constructor for skills
SkillFilter(Skill skill)
{
this.skill = skill;
this.displayName = skill.getName();
this.predicate = q -> {
List<ExperienceReward> experienceRewards = q.getQuest().getQuestHelper().getExperienceRewards();
if (experienceRewards != null)
{
return experienceRewards.stream().anyMatch(reward -> reward.getSkill() == this.skill);
}
else
{
return false;
}
};
}| return predicate.test(quest); | ||
| } | ||
|
|
||
| public List<QuestHelper> test(Collection<QuestHelper> helpers) |
There was a problem hiding this comment.
nit: this function looks unused
| @Override | ||
| public boolean test(QuestHelper quest) | ||
| { | ||
| return predicate.test(quest); |
There was a problem hiding this comment.
nit: consistent with this. prefix
| return predicate.test(quest); | |
| return this.predicate.test(quest); |
| @@ -616,4 +690,16 @@ default boolean showCompletedQuests() | |||
| { | |||
| return false; | |||
| } | |||
|
|
|||
| @ConfigItem( | |||
There was a problem hiding this comment.
Open question: Should this filter stick around after a restart?
If it does, the name (& key name) should be changed to match its name in the main panel
| @@ -307,7 +312,7 @@ protected void startUp() throws IOException | |||
|
|
|||
| final BufferedImage icon = Icon.QUEST_ICON.getImage(); | |||
|
|
|||
| panel = new QuestHelperPanel(this); | |||
| panel = new QuestHelperPanel(this, skillIconManager); | |||
There was a problem hiding this comment.
nit: Since skillIconManager is unused atm, it might be best to remove this requirement for now
| @@ -78,6 +81,7 @@ public class QuestHelperPanel extends PluginPanel | |||
|
|
|||
| private final JPanel allDropdownSections = new JPanel(); | |||
| private final JComboBox<Enum> filterDropdown, difficultyDropdown, orderDropdown; | |||
| private final JComboBox<Enum> skillSelectionPanel; | |||
There was a problem hiding this comment.
nit: Rename to be consistent with the other dropdowns
| private final JComboBox<Enum> skillSelectionPanel; | |
| private final JComboBox<Enum> skillFilterDropdown; |
| @@ -297,11 +301,16 @@ public void changedUpdate(DocumentEvent e) | |||
| JPanel orderPanel = makeDropdownPanel(orderDropdown, "Ordering"); | |||
| orderPanel.setPreferredSize(new Dimension(PANEL_WIDTH, DROPDOWN_HEIGHT)); | |||
|
|
|||
| skillSelectionPanel = makeNewDropdown(QuestHelperConfig.SkillFilter.values(), "skillReward"); | |||
| JPanel skillSortPanel = makeDropdownPanel(skillSelectionPanel, "Skill Filtering"); | |||
There was a problem hiding this comment.
I'd personally prefer if this was labeled Skill Filters (consistent with main Filters), or Skill Filter
