External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 03:51:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[filters] Reimplemented Wicked Akuba and fixed filtered Player Targeting

Browse source
This commit is contained in:
North 2012-07-22 21:59:21 +03:00
parent 93804656ea
commit b230fc883a
4 changed files with 67 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Mage/src/mage/filter/FilterPlayer.java
View file

@ -28,35 +28,49 @@
package mage.filter;
import mage.Constants.TargetController;
import mage.game.Game;
import mage.players.Player;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import mage.Constants.TargetController;
import mage.filter.predicate.ObjectPlayer;
import mage.filter.predicate.ObjectPlayerPredicate;
import mage.filter.predicate.ObjectSourcePlayer;
import mage.filter.predicate.Predicates;
import mage.game.Game;
import mage.players.Player;
/**
*
* @author BetaSteward_at_googlemail.com
* @author North
*/
public class FilterPlayer extends FilterImpl<Player> {
protected List<ObjectPlayerPredicate<ObjectPlayer<Player>>> extraPredicates = new ArrayList<ObjectPlayerPredicate<ObjectPlayer<Player>>>();
protected List<UUID> playerId = new ArrayList<UUID>();
protected boolean notPlayer;
protected TargetController playerTarget = TargetController.ANY;
public FilterPlayer() {
super("player");
this("player");
}
public FilterPlayer(FilterPlayer filter) {
public FilterPlayer(String name) {
super(name);
}
public FilterPlayer(final FilterPlayer filter) {
super(filter);
this.extraPredicates = new ArrayList<ObjectPlayerPredicate<ObjectPlayer<Player>>>(filter.extraPredicates);
this.playerId.addAll(filter.playerId);
this.notPlayer = filter.notPlayer;
this.playerTarget = filter.playerTarget;
}
public void add(ObjectPlayerPredicate predicate) {
extraPredicates.add(predicate);
}
@Override
public boolean match(Player player, Game game) {
@ -66,28 +80,28 @@ public class FilterPlayer extends FilterImpl<Player> {
return !notFilter;
}
public boolean match(Player player, UUID sourceId, UUID playerId, Game game) {
public boolean match(Player player, UUID sourceId, UUID controllerId, Game game) {
if (!this.match(player, game))
return notFilter;
if (playerTarget != TargetController.ANY && playerId != null) {
if (playerTarget != TargetController.ANY && controllerId != null) {
switch(playerTarget) {
case YOU:
if (!player.getId().equals(playerId))
if (!player.getId().equals(controllerId))
return notFilter;
break;
case OPPONENT:
if (!game.getOpponents(playerId).contains(player.getId()))
if (!game.getOpponents(controllerId).contains(player.getId()))
return notFilter;
break;
case NOT_YOU:
if (player.getId().equals(playerId))
if (player.getId().equals(controllerId))
return notFilter;
break;
}
}
return !notFilter;
return Predicates.and(extraPredicates).apply(new ObjectSourcePlayer(player, sourceId, controllerId), game);
}
public List<UUID> getPlayerId() {

6
Mage/src/mage/filter/common/FilterCreatureOrPlayer.java
View file

@ -74,12 +74,12 @@ public class FilterCreatureOrPlayer extends FilterImpl<Object> implements Filter
}
@Override
public boolean match(Object o, UUID sourceId, UUID playerId, Game game) {
public boolean match(Object o, UUID sourceId, UUID controllerId, Game game) {
if (o instanceof Player) {
return playerFilter.match((Player)o, sourceId, playerId, game);
return playerFilter.match((Player)o, sourceId, controllerId, game);
}
else if (o instanceof Permanent) {
return creatureFilter.match((Permanent)o, sourceId, playerId, game);
return creatureFilter.match((Permanent)o, sourceId, controllerId, game);
}
return notFilter;
}

21
Mage/src/mage/target/TargetPlayer.java
View file

@ -44,7 +44,7 @@ import java.util.UUID;
*/
public class TargetPlayer<T extends TargetPlayer<T>> extends TargetImpl<TargetPlayer<T>> {
protected FilterPlayer filter = new FilterPlayer();
protected FilterPlayer filter;
public TargetPlayer(boolean required) {
this();
@ -60,9 +60,14 @@ public class TargetPlayer<T extends TargetPlayer<T>> extends TargetImpl<TargetPl
}
public TargetPlayer(int minNumTargets, int maxNumTargets, boolean notTarget) {
this(minNumTargets, maxNumTargets, notTarget, new FilterPlayer());
}
public TargetPlayer(int minNumTargets, int maxNumTargets, boolean notTarget, FilterPlayer filter) {
this.minNumberOfTargets = minNumTargets;
this.maxNumberOfTargets = maxNumTargets;
this.targetName = "player";
this.filter = filter;
this.targetName = filter.getMessage();
this.notTarget = notTarget;
}
@ -91,7 +96,7 @@ public class TargetPlayer<T extends TargetPlayer<T>> extends TargetImpl<TargetPl
MageObject targetSource = game.getObject(sourceId);
for (UUID playerId: game.getPlayer(sourceControllerId).getInRange()) {
Player player = game.getPlayer(playerId);
if (player != null && !player.hasLeft() && filter.match(player, game)) {
if (player != null && !player.hasLeft() && filter.match(player, sourceId, sourceControllerId, game)) {
if (player.canBeTargetedBy(targetSource, game)) {
count++;
if (count >= this.minNumberOfTargets)
@ -130,7 +135,7 @@ public class TargetPlayer<T extends TargetPlayer<T>> extends TargetImpl<TargetPl
MageObject targetSource = game.getObject(sourceId);
for (UUID playerId: game.getPlayer(sourceControllerId).getInRange()) {
Player player = game.getPlayer(playerId);
if (player != null && !player.hasLeft() && filter.match(player, game)) {
if (player != null && !player.hasLeft() && filter.match(player, sourceId, sourceControllerId, game)) {
if (player.canBeTargetedBy(targetSource, game))
possibleTargets.add(playerId);
}
@ -173,10 +178,12 @@ public class TargetPlayer<T extends TargetPlayer<T>> extends TargetImpl<TargetPl
public boolean canTarget(UUID id, Ability source, Game game) {
Player player = game.getPlayer(id);
if (player != null) {
if (source != null)
return player.canBeTargetedBy(game.getObject(source.getSourceId()), game) && filter.match(player, game);
else
if (source != null) {
return player.canBeTargetedBy(game.getObject(source.getSourceId()), game)
&& filter.match(player, source.getSourceId(), source.getControllerId(), game);
} else {
return filter.match(player, game);
}
}
return false;
}