-
Notifications
You must be signed in to change notification settings - Fork 133
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Support for unidentified and corrupted items #1063
Open
nqrcqn
wants to merge
8
commits into
Procurement-PoE:master
Choose a base branch
from
nqrcqn:unidentified-corrupted
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
7667345
Support for unidentified and corrupted items
nqrcqn 922a795
Remove flasks from UncorruptedItemFilter
nqrcqn 4c017d6
Improve filters
nqrcqn b071e49
Improve filters
nqrcqn 88b01c2
Replace fragments with geartype unknown
nqrcqn 96cafdb
Add abyss jewels
nqrcqn 448aa3f
Revert itemhover changes
nqrcqn b4d54a0
Simplify filters
nqrcqn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
Procurement/ViewModel/Filters/ForumExport/CorruptedItemFilter.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
using POEApi.Model; | ||
|
||
namespace Procurement.ViewModel.Filters.ForumExport | ||
{ | ||
public class CorruptedItemFilter : IFilter | ||
{ | ||
public bool CanFormCategory | ||
{ | ||
get | ||
{ | ||
return false; | ||
} | ||
} | ||
|
||
public string Keyword | ||
{ | ||
get | ||
{ | ||
return "Corrupted Items"; | ||
} | ||
} | ||
|
||
public string Help | ||
{ | ||
get | ||
{ | ||
return "Corrupted Items"; | ||
} | ||
} | ||
|
||
public FilterGroup Group | ||
{ | ||
get | ||
{ | ||
return FilterGroup.Default; | ||
} | ||
} | ||
|
||
public bool Applicable(Item item) | ||
{ | ||
return item.Corrupted; | ||
} | ||
} | ||
} |
44 changes: 44 additions & 0 deletions
44
Procurement/ViewModel/Filters/ForumExport/IdentifiedItemFilter.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
using POEApi.Model; | ||
|
||
namespace Procurement.ViewModel.Filters.ForumExport | ||
{ | ||
public class IdentifiedItemFilter : IFilter | ||
{ | ||
public bool CanFormCategory | ||
{ | ||
get | ||
{ | ||
return false; | ||
} | ||
} | ||
|
||
public string Keyword | ||
{ | ||
get | ||
{ | ||
return "Identified Items"; | ||
} | ||
} | ||
|
||
public string Help | ||
{ | ||
get | ||
{ | ||
return "Identified Items"; | ||
} | ||
} | ||
|
||
public FilterGroup Group | ||
{ | ||
get | ||
{ | ||
return FilterGroup.Default; | ||
} | ||
} | ||
|
||
public bool Applicable(Item item) | ||
{ | ||
return item.Identified && item.ItemLevel > 0 && !(item.StackSize > 0) && !(item is Incubator) && !(item is FullBestiaryOrb); | ||
} | ||
} | ||
} |
48 changes: 48 additions & 0 deletions
48
Procurement/ViewModel/Filters/ForumExport/UncorruptedItemFilter.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
using POEApi.Model; | ||
|
||
namespace Procurement.ViewModel.Filters.ForumExport | ||
{ | ||
public class UncorruptedItemFilter : IFilter | ||
{ | ||
public bool CanFormCategory | ||
{ | ||
get | ||
{ | ||
return false; | ||
} | ||
} | ||
|
||
public string Keyword | ||
{ | ||
get | ||
{ | ||
return "Uncorrupted Items"; | ||
} | ||
} | ||
|
||
public string Help | ||
{ | ||
get | ||
{ | ||
return "Uncorrupted Items"; | ||
} | ||
} | ||
|
||
public FilterGroup Group | ||
{ | ||
get | ||
{ | ||
return FilterGroup.Default; | ||
} | ||
} | ||
|
||
public bool Applicable(Item item) | ||
{ | ||
Gear gear = item as Gear; | ||
|
||
return !item.Corrupted | ||
&& (item is Gem || (item.ItemLevel > 0 && !(item.StackSize > 0) && (!gear?.GearType.Equals(GearType.Flask) ?? true))) | ||
&& !(item is Incubator) && !(item is FullBestiaryOrb); | ||
} | ||
} | ||
} |
45 changes: 45 additions & 0 deletions
45
Procurement/ViewModel/Filters/ForumExport/UnidentifiedItemFilter.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
using POEApi.Model; | ||
|
||
namespace Procurement.ViewModel.Filters.ForumExport | ||
{ | ||
public class UnidentifiedItemFilter : IFilter | ||
{ | ||
public bool CanFormCategory | ||
{ | ||
get | ||
{ | ||
return false; | ||
} | ||
} | ||
|
||
public string Keyword | ||
{ | ||
get | ||
{ | ||
return "Unidentified Items"; | ||
} | ||
} | ||
|
||
public string Help | ||
{ | ||
get | ||
{ | ||
return "Unidentified Items"; | ||
} | ||
} | ||
|
||
public FilterGroup Group | ||
{ | ||
get | ||
{ | ||
return FilterGroup.Default; | ||
} | ||
} | ||
|
||
public bool Applicable(Item item) | ||
{ | ||
// Item types that can't be unidentified always have identified value as true so a simple check is sufficient | ||
return !item.Identified; | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For items that can't be unidentified, is
item.Identified
always true? If so, add a comment explaining this, and thus why we don't need a more complicated check (like we do for theIdentifiedItemFilter
).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes that appears to be the case, haven't seen any issues with the way these filters work