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

rearrange filter using WUBRG order

master
melvin 2013-08-25 13:12:08 +08:00
parent 2fb40c4281
commit dfa3d38d64
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/magic/model/target/MagicTargetFilter.java
View File

@ -1277,36 +1277,6 @@ public interface MagicTargetFilter<T extends MagicTarget> {
}
};
MagicCardFilterImpl TARGET_FOREST_OR_ISLAND_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Forest, MagicSubType.Island);
MagicCardFilterImpl TARGET_FOREST_OR_PLAINS_CARD_FROM_LIBRARY =
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 =
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 =
Factory.land(MagicTargetType.Library, MagicSubType.Swamp, MagicSubType.Forest);
MagicCardFilterImpl TARGET_SWAMP_OR_MOUNTAIN_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Swamp, MagicSubType.Mountain);
MagicCardFilterImpl TARGET_MOUNTAIN_OR_PLAINS_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Mountain, MagicSubType.Plains);
MagicCardFilterImpl TARGET_MOUNTAIN_OR_FOREST_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Mountain, MagicSubType.Forest);
MagicCardFilterImpl TARGET_PLAINS_ISLAND_SWAMP_OR_MOUNTAIN_CARD_FROM_LIBRARY = new MagicCardFilterImpl() {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicCard target) {
return target.hasSubType(MagicSubType.Plains) ||
@ -1318,6 +1288,36 @@ public interface MagicTargetFilter<T extends MagicTarget> {
return targetType==MagicTargetType.Library;
}
};
MagicCardFilterImpl TARGET_PLAINS_OR_ISLAND_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Plains, MagicSubType.Island);
MagicCardFilterImpl TARGET_PLAINS_OR_SWAMP_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Plains, MagicSubType.Swamp);
MagicCardFilterImpl TARGET_ISLAND_OR_SWAMP_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Island, MagicSubType.Swamp);
MagicCardFilterImpl TARGET_ISLAND_OR_MOUNTAIN_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Island, MagicSubType.Mountain);
MagicCardFilterImpl TARGET_SWAMP_OR_MOUNTAIN_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Swamp, MagicSubType.Mountain);
MagicCardFilterImpl TARGET_SWAMP_OR_FOREST_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Swamp, MagicSubType.Forest);
MagicCardFilterImpl TARGET_MOUNTAIN_OR_FOREST_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Mountain, MagicSubType.Forest);
MagicCardFilterImpl TARGET_MOUNTAIN_OR_PLAINS_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Mountain, MagicSubType.Plains);
MagicCardFilterImpl TARGET_FOREST_OR_PLAINS_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Forest, MagicSubType.Plains);
MagicCardFilterImpl TARGET_FOREST_OR_ISLAND_CARD_FROM_LIBRARY =
Factory.land(MagicTargetType.Library, MagicSubType.Forest, MagicSubType.Island);
MagicCardFilterImpl TARGET_LAND_CARD_FROM_HAND = new MagicCardFilterImpl() {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicCard target) {