rearrange filters

master
melvin 2013-08-25 10:56:41 +08:00
parent d61df7aa22
commit 2fb40c4281
1 changed files with 9 additions and 9 deletions

View File

@ -1283,30 +1283,30 @@ public interface MagicTargetFilter<T extends MagicTarget> {
MagicCardFilterImpl TARGET_FOREST_OR_PLAINS_CARD_FROM_LIBRARY = MagicCardFilterImpl TARGET_FOREST_OR_PLAINS_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Forest, MagicSubType.Plains); Factory.land(MagicTargetType.Library, MagicSubType.Forest, MagicSubType.Plains);
MagicCardFilterImpl TARGET_PLAINS_OR_SWAMP_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Plains, MagicSubType.Swamp);
MagicCardFilterImpl TARGET_PLAINS_OR_ISLAND_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Plains, MagicSubType.Island);
MagicCardFilterImpl TARGET_ISLAND_OR_MOUNTAIN_CARD_FROM_LIBRARY = MagicCardFilterImpl TARGET_ISLAND_OR_MOUNTAIN_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Island, MagicSubType.Mountain); Factory.land(MagicTargetType.Library, MagicSubType.Island, MagicSubType.Mountain);
MagicCardFilterImpl TARGET_ISLAND_OR_SWAMP_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Island, MagicSubType.Swamp);
MagicCardFilterImpl TARGET_SWAMP_OR_FOREST_CARD_FROM_LIBRARY = MagicCardFilterImpl TARGET_SWAMP_OR_FOREST_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Swamp, MagicSubType.Forest); Factory.land(MagicTargetType.Library, MagicSubType.Swamp, MagicSubType.Forest);
MagicCardFilterImpl TARGET_SWAMP_OR_MOUNTAIN_CARD_FROM_LIBRARY = MagicCardFilterImpl TARGET_SWAMP_OR_MOUNTAIN_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Swamp, MagicSubType.Mountain); Factory.land(MagicTargetType.Library, MagicSubType.Swamp, MagicSubType.Mountain);
MagicCardFilterImpl TARGET_PLAINS_OR_SWAMP_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Plains, MagicSubType.Swamp);
MagicCardFilterImpl TARGET_MOUNTAIN_OR_PLAINS_CARD_FROM_LIBRARY = MagicCardFilterImpl TARGET_MOUNTAIN_OR_PLAINS_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Mountain, MagicSubType.Plains); Factory.land(MagicTargetType.Library, MagicSubType.Mountain, MagicSubType.Plains);
MagicCardFilterImpl TARGET_MOUNTAIN_OR_FOREST_CARD_FROM_LIBRARY = MagicCardFilterImpl TARGET_MOUNTAIN_OR_FOREST_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Mountain, MagicSubType.Forest); Factory.land(MagicTargetType.Library, MagicSubType.Mountain, MagicSubType.Forest);
MagicCardFilterImpl TARGET_ISLAND_OR_SWAMP_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Island, MagicSubType.Swamp);
MagicCardFilterImpl TARGET_PLAINS_OR_ISLAND_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Plains, MagicSubType.Island);
MagicCardFilterImpl TARGET_PLAINS_ISLAND_SWAMP_OR_MOUNTAIN_CARD_FROM_LIBRARY = new MagicCardFilterImpl() { MagicCardFilterImpl TARGET_PLAINS_ISLAND_SWAMP_OR_MOUNTAIN_CARD_FROM_LIBRARY = new MagicCardFilterImpl() {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicCard target) { public boolean accept(final MagicGame game,final MagicPlayer player,final MagicCard target) {
return target.hasSubType(MagicSubType.Plains) || return target.hasSubType(MagicSubType.Plains) ||