github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-12 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

refactored PlayerPredicate

Browse source
This commit is contained in:
Evan Kranzler 2020-01-06 19:53:29 -05:00
parent 8e29454916
commit 13d76bfc06
11 changed files with 23 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Mage.Sets/src/mage/cards/b/BlessedAlliance.java
View file

@ -14,7 +14,6 @@ import mage.constants.TargetController;
import mage.filter.FilterPlayer;
import mage.filter.common.FilterAttackingCreature;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.other.PlayerPredicate;
import mage.target.TargetPlayer;
import mage.target.common.TargetCreaturePermanent;
@ -30,7 +29,7 @@ public final class BlessedAlliance extends CardImpl {
private static final FilterPlayer filterGainLife = new FilterPlayer("player to gain life");
static {
filterSacrifice.add(new PlayerPredicate(TargetController.OPPONENT));
filterSacrifice.add(TargetController.OPPONENT.getPlayerPredicate());
}
public BlessedAlliance(UUID ownerId, CardSetInfo setInfo) {

5
Mage.Sets/src/mage/cards/c/CollectiveBrutality.java
View file

@ -18,7 +18,6 @@ import mage.filter.FilterCard;
import mage.filter.FilterPlayer;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.other.PlayerPredicate;
import mage.target.TargetPlayer;
import mage.target.common.TargetCreaturePermanent;
@ -37,8 +36,8 @@ public final class CollectiveBrutality extends CardImpl {
static {
filter.add(Predicates.or(CardType.INSTANT.getPredicate(),
CardType.SORCERY.getPredicate()));
filterDiscard.add(new PlayerPredicate(TargetController.OPPONENT));
filterLoseLife.add(new PlayerPredicate(TargetController.OPPONENT));
filterDiscard.add(TargetController.OPPONENT.getPlayerPredicate());
filterLoseLife.add(TargetController.OPPONENT.getPlayerPredicate());
}
public CollectiveBrutality(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/e/Endure.java
View file

@ -9,7 +9,6 @@ import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePlayerOrPlaneswalker;
import mage.filter.predicate.other.PlayerPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
/**
@ -22,7 +21,7 @@ public final class Endure extends CardImpl {
static {
filter.getCreatureFilter().add(new ControllerPredicate(TargetController.YOU));
filter.getPlayerFilter().add(new PlayerPredicate(TargetController.YOU));
filter.getPlayerFilter().add(TargetController.YOU.getPlayerPredicate());
}
public Endure(UUID ownerId, CardSetInfo setInfo) {

33
Mage.Sets/src/mage/cards/f/FireAndBrimstone.java
View file

@ -1,7 +1,5 @@
package mage.cards.f;
import java.util.UUID;
import mage.abilities.effects.common.DamageControllerEffect;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.cards.CardImpl;
@ -9,26 +7,27 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.filter.FilterPlayer;
import mage.filter.predicate.ObjectSourcePlayer;
import mage.filter.predicate.other.PlayerPredicate;
import mage.filter.predicate.ObjectSourcePlayerPredicate;
import mage.game.Game;
import mage.players.Player;
import mage.target.TargetPlayer;
import mage.watchers.common.AttackedThisTurnWatcher;
import java.util.UUID;
/**
*
* @author L_J
*/
public final class FireAndBrimstone extends CardImpl {
private static final FilterPlayer filter = new FilterPlayer("player who attacked this turn");
private static final FilterPlayer filter = new FilterPlayer("player who attacked this turn");
static {
filter.add(new FireAndBrimstonePredicate());
static {
filter.add(FireAndBrimstonePredicate.instance);
}
public FireAndBrimstone(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{W}{W}");
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{W}{W}");
// Fire and Brimstone deals 4 damage to target player who attacked this turn and 4 damage to you.
this.getSpellAbility().addEffect(new DamageTargetEffect(4));
@ -36,7 +35,7 @@ public final class FireAndBrimstone extends CardImpl {
this.getSpellAbility().addTarget(new TargetPlayer(1, 1, false, filter));
}
public FireAndBrimstone(final FireAndBrimstone card) {
private FireAndBrimstone(final FireAndBrimstone card) {
super(card);
}
@ -46,11 +45,8 @@ public final class FireAndBrimstone extends CardImpl {
}
}
class FireAndBrimstonePredicate extends PlayerPredicate {
public FireAndBrimstonePredicate() {
super(null);
}
enum FireAndBrimstonePredicate implements ObjectSourcePlayerPredicate<ObjectSourcePlayer<Player>> {
instance;
@Override
public boolean apply(ObjectSourcePlayer<Player> input, Game game) {
@ -60,11 +56,8 @@ class FireAndBrimstonePredicate extends PlayerPredicate {
return false;
}
AttackedThisTurnWatcher watcher = game.getState().getWatcher(AttackedThisTurnWatcher.class);
if (watcher != null) {
if (!watcher.getAttackedThisTurnCreatures().isEmpty()) {
return player.getId().equals(game.getActivePlayerId());
}
}
return false;
return watcher != null
&& !watcher.getAttackedThisTurnCreatures().isEmpty()
&& player.getId().equals(game.getActivePlayerId());
}
}

3
Mage.Sets/src/mage/cards/s/SavageAlliance.java
View file

@ -18,7 +18,6 @@ import mage.constants.Outcome;
import mage.constants.TargetController;
import mage.filter.FilterPlayer;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.other.PlayerPredicate;
import mage.filter.predicate.permanent.ControllerIdPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -39,7 +38,7 @@ public final class SavageAlliance extends CardImpl {
private static final FilterPlayer filterOpponent = new FilterPlayer();
static {
filterOpponent.add(new PlayerPredicate(TargetController.OPPONENT));
filterOpponent.add(TargetController.OPPONENT.getPlayerPredicate());
}
public SavageAlliance(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/w/WheelAndDeal.java
View file

@ -11,7 +11,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.TargetController;
import mage.filter.FilterPlayer;
import mage.filter.predicate.other.PlayerPredicate;
import mage.target.TargetPlayer;
/**
@ -23,7 +22,7 @@ public final class WheelAndDeal extends CardImpl {
private static final FilterPlayer filter = new FilterPlayer("opponent");
static {
filter.add(new PlayerPredicate(TargetController.OPPONENT));
filter.add(TargetController.OPPONENT.getPlayerPredicate());
}
public WheelAndDeal(UUID ownerId, CardSetInfo setInfo) {

3
Mage/src/main/java/mage/abilities/costs/common/GainLifeOpponentCost.java
View file

@ -14,7 +14,6 @@ import mage.constants.Outcome;
import mage.constants.TargetController;
import mage.filter.FilterPlayer;
import mage.filter.predicate.other.PlayerCanGainLifePredicate;
import mage.filter.predicate.other.PlayerPredicate;
import mage.game.Game;
import mage.players.Player;
import mage.target.TargetPlayer;
@ -28,7 +27,7 @@ public class GainLifeOpponentCost extends CostImpl {
private static final FilterPlayer filter = new FilterPlayer("opponent that can gain life");
static {
filter.add(new PlayerPredicate(TargetController.OPPONENT));
filter.add(TargetController.OPPONENT.getPlayerPredicate());
filter.add(new PlayerCanGainLifePredicate()); // you can't pay the costs by letting a player gain life that can't get life by rule changing effect
}

3
Mage/src/main/java/mage/abilities/keyword/AssistAbility.java
View file

@ -10,7 +10,6 @@ import mage.abilities.costs.mana.ManaCost;
import mage.abilities.effects.OneShotEffect;
import mage.constants.*;
import mage.filter.FilterPlayer;
import mage.filter.predicate.other.PlayerPredicate;
import mage.game.Game;
import mage.players.ManaPool;
import mage.players.Player;
@ -26,7 +25,7 @@ public class AssistAbility extends SimpleStaticAbility implements AlternateManaP
private static final FilterPlayer filter = new FilterPlayer("another player");
static {
filter.add(new PlayerPredicate(TargetController.NOT_YOU));
filter.add(TargetController.NOT_YOU.getPlayerPredicate());
}
public AssistAbility() {

3
Mage/src/main/java/mage/filter/FilterOpponent.java
View file

@ -2,7 +2,6 @@
package mage.filter;
import mage.constants.TargetController;
import mage.filter.predicate.other.PlayerPredicate;
/**
*
@ -16,7 +15,7 @@ public class FilterOpponent extends FilterPlayer {
public FilterOpponent(String text) {
super(text);
add(new PlayerPredicate(TargetController.OPPONENT));
add(TargetController.OPPONENT.getPlayerPredicate());
}
public FilterOpponent(final FilterOpponent filter) {

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

@ -12,7 +12,6 @@ import mage.constants.TargetController;
import mage.filter.common.*;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.MulticoloredPredicate;
import mage.filter.predicate.other.PlayerPredicate;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.AttackingPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
@ -633,7 +632,7 @@ public final class StaticFilters {
public static final FilterPlayer FILTER_PLAYER_CONTROLLER = new FilterPlayer("you");
static {
FILTER_PLAYER_CONTROLLER.add(new PlayerPredicate(TargetController.YOU));
FILTER_PLAYER_CONTROLLER.add(TargetController.YOU.getPlayerPredicate());
FILTER_PLAYER_CONTROLLER.setLockedFilter(true);
}
}

57
Mage/src/main/java/mage/filter/predicate/other/PlayerPredicate.java
View file

@ -1,57 +0,0 @@
package mage.filter.predicate.other;
import java.util.UUID;
import mage.constants.TargetController;
import mage.filter.predicate.ObjectSourcePlayer;
import mage.filter.predicate.ObjectSourcePlayerPredicate;
import mage.game.Game;
import mage.players.Player;
/**
*
* @author North
*/
public class PlayerPredicate implements ObjectSourcePlayerPredicate<ObjectSourcePlayer<Player>> {
private final TargetController targetPlayer;
public PlayerPredicate(TargetController player) {
this.targetPlayer = player;
}
@Override
public boolean apply(ObjectSourcePlayer<Player> input, Game game) {
Player player = input.getObject();
UUID playerId = input.getPlayerId();
if (player == null || playerId == null) {
return false;
}
switch (targetPlayer) {
case YOU:
if (player.getId().equals(playerId)) {
return true;
}
break;
case OPPONENT:
if (!player.getId().equals(playerId) &&
game.getPlayer(playerId).hasOpponent(player.getId(), game)) {
return true;
}
break;
case NOT_YOU:
if (!player.getId().equals(playerId)) {
return true;
}
break;
}
return false;
}
@Override
public String toString() {
return "Player(" + targetPlayer + ')';
}
}