External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 13:32:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactored TokenPredicate to contain its own inverse

Browse source
This commit is contained in:
Evan Kranzler 2021-08-20 09:33:38 -04:00
parent cb5d873fea
commit bdeb0dde66
180 changed files with 196 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java
View file

@ -33,7 +33,7 @@ public class PopulateEffect extends OneShotEffect {
private static final FilterPermanent filter = new FilterCreaturePermanent("creature token for populate");
static {
filter.add(TokenPredicate.instance);
filter.add(TokenPredicate.TRUE);
filter.add(TargetController.YOU.getControllerPredicate());
}

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

@ -689,14 +689,14 @@ public final class StaticFilters {
public static final FilterCreaturePermanent FILTER_CREATURE_TOKEN = new FilterCreaturePermanent("creature token");
static {
FILTER_CREATURE_TOKEN.add(TokenPredicate.instance);
FILTER_CREATURE_TOKEN.add(TokenPredicate.TRUE);
FILTER_CREATURE_TOKEN.setLockedFilter(true);
}
public static final FilterCreaturePermanent FILTER_CREATURE_TOKENS = new FilterCreaturePermanent("creature tokens");
static {
FILTER_CREATURE_TOKENS.add(TokenPredicate.instance);
FILTER_CREATURE_TOKENS.add(TokenPredicate.TRUE);
FILTER_CREATURE_TOKENS.setLockedFilter(true);
}

13
Mage/src/main/java/mage/filter/predicate/permanent/TokenPredicate.java
View file

@ -1,4 +1,3 @@
package mage.filter.predicate.permanent;
import mage.filter.predicate.Predicate;
@ -10,15 +9,21 @@ import mage.game.permanent.PermanentToken;
* @author North
*/
public enum TokenPredicate implements Predicate<Permanent> {
instance;
TRUE(true),
FALSE(false);
private final boolean value;
TokenPredicate(boolean value) {
this.value = value;
}
@Override
public boolean apply(Permanent input, Game game) {
return input instanceof PermanentToken;
return value == input instanceof PermanentToken;
}
@Override
public String toString() {
return "Token";
}
}
}

3
Mage/src/main/java/mage/game/command/emblems/AurraSingBaneOfJediEmblem.java
View file

@ -5,7 +5,6 @@ import mage.abilities.common.LeavesBattlefieldAllTriggeredAbility;
import mage.abilities.effects.common.discard.DiscardControllerEffect;
import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.TokenPredicate;
import mage.game.command.Emblem;
@ -18,7 +17,7 @@ public final class AurraSingBaneOfJediEmblem extends Emblem {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a nontoken creature you control");
static {
filter.add(Predicates.not(TokenPredicate.instance));
filter.add(TokenPredicate.FALSE);
}
// Whenever a nontoken creature you control leaves the battlefied, discard a card.