external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

update advance filter

Browse Source 
support alternate parts limited to card names, keywords, rules text, types and subtypes
This commit is contained in:
Anthony Calosa
2021-03-29 21:26:14 +08:00
parent 28d1cc2055
commit fc6237cd29
1 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java
View File

@@ -81,6 +81,13 @@ public class AdvancedSearch {
Set<String> names = new HashSet<>();
names.add(input.getRules().getOracleText());
names.add(CardTranslation.getTranslatedOracle(input.getName()));
CardSplitType cardSplitType = input.getRules().getSplitType();
if (cardSplitType != CardSplitType.None && cardSplitType != CardSplitType.Split) {
if (input.getRules().getOtherPart() != null) {
names.add(input.getRules().getOtherPart().getOracleText());
names.add(CardTranslation.getTranslatedOracle(input.getRules().getOtherPart().getName()));
}
}
return names;
}
}),
@@ -91,6 +98,18 @@ public class AdvancedSearch {
}
@Override
protected Set<Keyword> getItemValues(PaperCard input) {
CardSplitType cardSplitType = input.getRules().getSplitType();
if (cardSplitType != CardSplitType.None && cardSplitType != CardSplitType.Split) {
Set<Keyword> keywords = new HashSet<>();
if (input.getRules().getOtherPart() != null) {
PaperCard otherPart = FModel.getMagicDb().getCommonCards().getCard(input.getRules().getOtherPart().getName());
if (otherPart != null) {
keywords.addAll(Keyword.getKeywordSet(otherPart));
keywords.addAll(Keyword.getKeywordSet(input));
}
}
return keywords;
}
return Keyword.getKeywordSet(input);
}
}),
@@ -175,6 +194,24 @@ public class AdvancedSearch {
protected Set<String> getItemValues(PaperCard input) {
final CardType type = input.getRules().getType();
final Set<String> types = new HashSet<>();
CardSplitType cardSplitType = input.getRules().getSplitType();
if (cardSplitType != CardSplitType.None && cardSplitType != CardSplitType.Split) {
if (input.getRules().getOtherPart() != null) {
for (Supertype supertype : input.getRules().getOtherPart().getType().getSupertypes()) {
types.add(supertype.name());
}
for (CoreType coreType : input.getRules().getOtherPart().getType().getCoreTypes()) {
types.add(coreType.name());
}
for (Supertype supertype : input.getRules().getMainPart().getType().getSupertypes()) {
types.add(supertype.name());
}
for (CoreType coreType : input.getRules().getMainPart().getType().getCoreTypes()) {
types.add(coreType.name());
}
return types;
}
}
for (Supertype t : type.getSupertypes()) {
types.add(t.name());
}
@@ -196,11 +233,10 @@ public class AdvancedSearch {
if (input.getRules().getOtherPart() != null) {
Set<String> subtypes = new HashSet<>();
for (String subs : input.getRules().getOtherPart().getType().getSubtypes()) {
if (!subtypes.contains(subs))
subtypes.add(subs);
}for (String subs : input.getRules().getMainPart().getType().getSubtypes()) {
if (!subtypes.contains(subs))
subtypes.add(subs);
subtypes.add(subs);
}
for (String subs : input.getRules().getMainPart().getType().getSubtypes()) {
subtypes.add(subs);
}
return subtypes;
}