External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-09 20:32:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

New StaticFilters.FILTER_ANOTHER_CREATURE_YOU_CONTROL (#10577)

Browse source
This commit is contained in:
xenohedron 2023-07-07 01:26:11 -04:00 • committed by GitHub
parent e50f8b05c1
commit 063429b70a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 89 additions and 397 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureEffect.java
View file

@ -5,8 +5,7 @@ import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.mageobject.AnotherPredicate;
import mage.filter.StaticFilters;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -20,17 +19,10 @@ import mage.util.CardUtil;
*/
public class ChooseCreatureEffect extends OneShotEffect {
private static final FilterPermanent defaultFilter
= new FilterControlledCreaturePermanent("another creature you control");
static {
defaultFilter.add(AnotherPredicate.instance);
}
private final FilterPermanent filter;
public ChooseCreatureEffect() {
this(defaultFilter);
this(StaticFilters.FILTER_ANOTHER_CREATURE_YOU_CONTROL);
}
public ChooseCreatureEffect(FilterPermanent filter) {

11
Mage/src/main/java/mage/filter/StaticFilters.java
View file

@ -50,10 +50,10 @@ public final class StaticFilters {
FILTER_CARD_CARDS.setLockedFilter(true);
}
public static final FilterCard FILTER_CARD_ENTCHANTMENT = new FilterEnchantmentCard();
public static final FilterCard FILTER_CARD_ENCHANTMENT = new FilterEnchantmentCard();
static {
FILTER_CARD_ENTCHANTMENT.setLockedFilter(true);
FILTER_CARD_ENCHANTMENT.setLockedFilter(true);
}
public static final FilterArtifactCard FILTER_CARD_ARTIFACT = new FilterArtifactCard();
@ -634,6 +634,13 @@ public final class StaticFilters {
FILTER_CONTROLLED_ANOTHER_CREATURE.setLockedFilter(true);
}
public static final FilterControlledCreaturePermanent FILTER_ANOTHER_CREATURE_YOU_CONTROL = new FilterControlledCreaturePermanent("another creature you control");
static {
FILTER_ANOTHER_CREATURE_YOU_CONTROL.add(AnotherPredicate.instance);
FILTER_ANOTHER_CREATURE_YOU_CONTROL.setLockedFilter(true);
}
public static final FilterControlledCreaturePermanent FILTER_CONTROLLED_UNTAPPED_CREATURE = new FilterControlledCreaturePermanent("untapped creature you control");
static {