github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

update cardtextpredicate

Browse source
This commit is contained in:
igoudt 2017-09-30 00:07:25 +02:00
parent 61f14ea97a
commit 7c34dad8cb
1 changed files with 12 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
Mage/src/main/java/mage/filter/predicate/other/CardTextPredicate.java
View file

@ -29,13 +29,10 @@ package mage.filter.predicate.other;
import mage.cards.Card;
import mage.cards.SplitCard;
import mage.constants.SubType;
import mage.constants.SuperType;
import mage.filter.predicate.Predicate;
import mage.game.Game;
/**
*
* @author North
*/
public class CardTextPredicate implements Predicate<Card> {
@ -64,53 +61,31 @@ public class CardTextPredicate implements Predicate<Card> {
//separate by spaces
String[] tokens = text.toLowerCase().split(" ");
boolean found = false;
for (String token : tokens) {
boolean found = false;
if (!token.isEmpty()) {
// then try to find in rules
if (inRules) {
if (input.isSplitCard()) {
for (String rule : ((SplitCard) input).getLeftHalfCard().getRules(game)) {
if (rule.toLowerCase().contains(token)) {
found = true;
break;
}
}
for (String rule : ((SplitCard) input).getRightHalfCard().getRules(game)) {
if (rule.toLowerCase().contains(token)) {
found = true;
break;
}
}
}
for (String rule : input.getRules(game)) {
if (rule.toLowerCase().contains(token)) {
found = true;
break;
}
found = ((SplitCard) input).getLeftHalfCard().getRules(game).stream().anyMatch(rule -> rule.toLowerCase().contains(token.toLowerCase()));
found |= ((SplitCard) input).getRightHalfCard().getRules(game).stream().anyMatch(rule -> rule.toLowerCase().contains(token.toLowerCase()));
} else {
found = input.getRules(game).stream().anyMatch(rule -> rule.toLowerCase().contains(token.toLowerCase()));
}
}
if (inTypes) {
for (SubType subType : input.getSubtype(game)) {
if (subType.toString().equalsIgnoreCase(token)) {
found = true;
break;
}
}
for (SuperType superType : input.getSuperType()) {
if (superType.toString().equalsIgnoreCase(token)) {
found = true;
break;
}
}
found |= input.getSubtype(game).stream().anyMatch(s -> s.toString().equalsIgnoreCase(token));
found |= input.getSuperType().stream().anyMatch(s -> s.toString().equalsIgnoreCase(token));
}
}
if (!found) {
return false;
if (found) {
break;
}
}
return true;
return found;
}
@Override