Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge multiple rules into one rule that uses a MagicCard filter

master
melvinzhang 2017-07-18 13:08:54 +08:00
parent a4d91fb20c
commit 8f5e3b419d
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/magic/model/condition/MagicConditionParser.java
View File

@ -136,28 +136,11 @@ public enum MagicConditionParser {
return MagicConditionFactory.GraveyardAtLeast(filter, amount);
}
},
WarriorCardInGraveyard("a Warrior card is in your graveyard") {
CardInGraveyard("(you have |there is )?(a |an )?" + ARG.WORDRUN + " (is )?in your graveyard") {
@Override
public MagicCondition toCondition(final Matcher arg) {
return MagicCondition.HAS_WARRIOR_IN_GRAVEYARD;
}
},
ArtifactCardInGraveyard("an artifact card is in your graveyard") {
@Override
public MagicCondition toCondition(final Matcher arg) {
return MagicCondition.HAS_ARTIFACT_IN_GRAVEYARD;
}
},
CreatureInYourGraveyard("you have a creature card in your graveyard") {
@Override
public MagicCondition toCondition(final Matcher arg) {
return MagicCondition.HAS_CREATURE_IN_GRAVEYARD;
}
},
ArtifactInYourGraveyard("you have an artifact card in your graveyard") {
@Override
public MagicCondition toCondition(final Matcher arg) {
return MagicCondition.HAS_ARTIFACT_IN_GRAVEYARD;
final MagicTargetFilter<MagicCard> filter = MagicTargetFilterFactory.Card(ARG.wordrun(arg) + " from your graveyard");
return MagicConditionFactory.GraveyardAtLeast(filter, 1);
}
},
YourDevotionAtLeast("you have at least " + ARG.NUMBER + " devotion to "+ ARG.COLOR) {