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

Fixed some bugs that prevent to select shroud or hexproof targets by not targeted effects (e.g. Proliferate).

Browse source
This commit is contained in:
LevelX2 2015-04-05 11:13:26 +02:00
parent 5c2189fdd7
commit 66cf690968
8 changed files with 232 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

102
Mage/src/mage/abilities/effects/common/counter/ProliferateEffect.java
View file

@ -53,7 +53,7 @@ public class ProliferateEffect extends OneShotEffect {
public ProliferateEffect() {
super(Outcome.Benefit);
staticText = "Proliferate. (You choose any number of permanents and/or players with counters on them, then give each another counter of a kind already there.)";
staticText = "Proliferate. <i>(You choose any number of permanents and/or players with counters on them, then give each another counter of a kind already there.)</i>";
}
public ProliferateEffect(ProliferateEffect effect) {
@ -63,81 +63,71 @@ public class ProliferateEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
if (controller == null) {
return false;
}
Target target = new TargetPermanentOrPlayerWithCounter(0, Integer.MAX_VALUE, true);
Map<String, Serializable> options = new HashMap<>();
options.put("UI.right.btn.text", "Done");
controller.choose(Outcome.Benefit, target, source.getSourceId(), game, options);
//A spell or ability could have removed the only legal target this player
//had, if thats the case this ability should fizzle.
if (target.canChoose(controller.getId(), game)) {
boolean abilityApplied = false;
Map<String, Serializable> options = new HashMap<>();
options.put("UI.right.btn.text", "Done");
while (target.canChoose(controller.getId(), game)) {
if (controller.choose(Outcome.Benefit, target, source.getSourceId(), game, options)) {
break;
}
}
for (int idx = 0; idx < target.getTargets().size(); idx++) {
UUID chosen = (UUID) target.getTargets().get(idx);
Permanent permanent = game.getPermanent(chosen);
if (permanent != null) {
if (permanent.getCounters().size() > 0) {
if (permanent.getCounters().size() == 1) {
for (Counter counter : permanent.getCounters().values()) {
for (int idx = 0; idx < target.getTargets().size(); idx++) {
UUID chosen = (UUID) target.getTargets().get(idx);
Permanent permanent = game.getPermanent(chosen);
if (permanent != null) {
if (permanent.getCounters().size() > 0) {
if (permanent.getCounters().size() == 1) {
for (Counter counter : permanent.getCounters().values()) {
permanent.addCounters(counter.getName(), 1, game);
}
} else {
Choice choice = new ChoiceImpl(true);
Set<String> choices = new HashSet<>();
for (Counter counter : permanent.getCounters().values()) {
choices.add(counter.getName());
}
choice.setChoices(choices);
choice.setMessage("Choose a counter to proliferate (" + permanent.getName() + ")");
controller.choose(Outcome.Benefit, choice, game);
for (Counter counter : permanent.getCounters().values()) {
if (counter.getName().equals(choice.getChoice())) {
permanent.addCounters(counter.getName(), 1, game);
break;
}
}
}
}
} else {
Player player = game.getPlayer(chosen);
if (player != null) {
if (player.getCounters().size() > 0) {
if (player.getCounters().size() == 1) {
for (Counter counter : player.getCounters().values()) {
Counter newCounter = new Counter(counter.getName());
player.addCounters(newCounter, game);
}
} else {
Choice choice = new ChoiceImpl(true);
Set<String> choices = new HashSet<>();
for (Counter counter : permanent.getCounters().values()) {
for (Counter counter : player.getCounters().values()) {
choices.add(counter.getName());
}
choice.setChoices(choices);
choice.setMessage("Choose a counter to proliferate (" + permanent.getName() + ")");
choice.setMessage("Choose a counter to proliferate (" + player.getName() + ")");
controller.choose(Outcome.Benefit, choice, game);
for (Counter counter : permanent.getCounters().values()) {
for (Counter counter : player.getCounters().values()) {
if (counter.getName().equals(choice.getChoice())) {
permanent.addCounters(counter.getName(), 1, game);
Counter newCounter = new Counter(counter.getName());
player.addCounters(newCounter, game);
break;
}
}
}
}
} else {
Player player = game.getPlayer(chosen);
if (player != null) {
if (player.getCounters().size() > 0) {
if (player.getCounters().size() == 1) {
for (Counter counter : player.getCounters().values()) {
Counter newCounter = new Counter(counter.getName());
player.addCounters(newCounter, game);
}
} else {
Choice choice = new ChoiceImpl(true);
Set<String> choices = new HashSet<>();
for (Counter counter : player.getCounters().values()) {
choices.add(counter.getName());
}
choice.setChoices(choices);
choice.setMessage("Choose a counter to proliferate (" + player.getName() + ")");
controller.choose(Outcome.Benefit, choice, game);
for (Counter counter : player.getCounters().values()) {
if (counter.getName().equals(choice.getChoice())) {
Counter newCounter = new Counter(counter.getName());
player.addCounters(newCounter, game);
break;
}
}
}
}
}
}
}
return abilityApplied;
}
return false;
return true;
}
@Override

10
Mage/src/mage/filter/predicate/permanent/CounterPredicate.java
View file

@ -40,13 +40,21 @@ public class CounterPredicate implements Predicate<Permanent> {
private final CounterType counter;
/**
*
* @param counter if null any counter selects the permanent
*/
public CounterPredicate(CounterType counter) {
this.counter = counter;
}
@Override
public boolean apply(Permanent input, Game game) {
return input.getCounters().containsKey(counter);
if (counter == null) {
return !input.getCounters().keySet().isEmpty();
} else {
return input.getCounters().containsKey(counter);
}
}
@Override

2
Mage/src/mage/target/TargetPermanent.java
View file

@ -89,7 +89,7 @@ public class TargetPermanent extends TargetObject {
// second for protection from sources (e.g. protection from artifacts + equip ability)
if (!isNotTarget()) {
if (!permanent.canBeTargetedBy(game.getObject(source.getId()), controllerId, game) ||
!permanent.canBeTargetedBy(game.getObject(source.getSourceId()), controllerId, game)) {
!permanent.canBeTargetedBy(game.getObject(source.getSourceId()), controllerId, game)) {
return false;
}
}

24
Mage/src/mage/target/common/TargetPermanentOrPlayer.java
View file

@ -71,7 +71,7 @@ public class TargetPermanentOrPlayer extends TargetImpl {
}
public TargetPermanentOrPlayer(int minNumTargets, int maxNumTargets, boolean notTarget) {
this(minNumTargets, maxNumTargets);
this(minNumTargets, maxNumTargets);
this.notTarget = notTarget;
}
@ -116,10 +116,21 @@ public class TargetPermanentOrPlayer extends TargetImpl {
if (source != null) {
MageObject targetSource = game.getObject(source.getSourceId());
if (permanent != null) {
return permanent.canBeTargetedBy(targetSource, source.getControllerId(), game) && filter.match(permanent, source.getSourceId(), source.getControllerId(), game);
if (!isNotTarget()) {
if (!permanent.canBeTargetedBy(game.getObject(source.getId()), source.getControllerId(), game) ||
!permanent.canBeTargetedBy(game.getObject(source.getSourceId()), source.getControllerId(), game)) {
return false;
}
}
return filter.match(permanent, source.getSourceId(), source.getControllerId(), game);
}
if (player != null) {
return player.canBeTargetedBy(targetSource, game) && filter.match(player, game);
if (!isNotTarget()) {
if (!player.canBeTargetedBy(targetSource, game)) {
return false;
}
}
return filter.match(player, game);
}
}
@ -202,12 +213,12 @@ public class TargetPermanentOrPlayer extends TargetImpl {
MageObject targetSource = game.getObject(sourceId);
for (UUID playerId: game.getPlayer(sourceControllerId).getInRange()) {
Player player = game.getPlayer(playerId);
if (player != null && player.canBeTargetedBy(targetSource, game) && filter.match(player, game)) {
if (player != null && (notTarget || player.canBeTargetedBy(targetSource, game)) && filter.match(player, game)) {
possibleTargets.add(playerId);
}
}
for (Permanent permanent: game.getBattlefield().getActivePermanents(new FilterPermanent(), sourceControllerId, game)) {
if (permanent.canBeTargetedBy(targetSource, sourceControllerId, game) && filter.match(permanent, sourceId, sourceControllerId, game)) {
if ((notTarget || permanent.canBeTargetedBy(targetSource, sourceControllerId, game)) && filter.match(permanent, sourceId, sourceControllerId, game)) {
possibleTargets.add(permanent.getId());
}
}
@ -252,4 +263,7 @@ public class TargetPermanentOrPlayer extends TargetImpl {
return new TargetPermanentOrPlayer(this);
}
public FilterPermanent getFilterPermanent() {
return filterPermanent.copy();
}
}

15
Mage/src/mage/target/common/TargetPermanentOrPlayerWithCounter.java
View file

@ -34,6 +34,9 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import java.util.UUID;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.CounterPredicate;
/**
*
@ -52,15 +55,15 @@ public class TargetPermanentOrPlayerWithCounter extends TargetPermanentOrPlayer
}
public TargetPermanentOrPlayerWithCounter(int minNumTargets, int maxNumTargets) {
super(minNumTargets, maxNumTargets);
this.filter = new FilterPermanentOrPlayerWithCounter();
this.targetName = filter.getMessage();
super.setFilter(this.filter);
this(minNumTargets, maxNumTargets, false);
}
public TargetPermanentOrPlayerWithCounter(int minNumTargets, int maxNumTargets, boolean notTarget) {
this(minNumTargets, maxNumTargets);
this.notTarget = notTarget;
super(minNumTargets, maxNumTargets, notTarget);
this.filter = new FilterPermanentOrPlayerWithCounter();
this.filterPermanent = new FilterPermanent();
this.filterPermanent.add(new CounterPredicate(null));
this.targetName = filter.getMessage();
}
public TargetPermanentOrPlayerWithCounter(final TargetPermanentOrPlayerWithCounter target) {