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

Improved text generation for TargetCardInASingleGraveyard (additional to #6557)

Browse source
This commit is contained in:
Oleg Agafonov 2020-06-20 02:17:20 +04:00
parent 520937e68a
commit 05950dcc2f
18 changed files with 88 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Mage/src/main/java/mage/abilities/effects/common/ExileTargetEffect.java
View file

@ -1,8 +1,5 @@
package mage.abilities.effects.common;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.UUID;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.Mode;
@ -20,13 +17,16 @@ import mage.target.targetpointer.FirstTargetPointer;
import mage.target.targetpointer.SecondTargetPointer;
import mage.util.CardUtil;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class ExileTargetEffect extends OneShotEffect {
private Zone onlyFromZone;
private final Zone onlyFromZone;
private String exileZone = null;
private UUID exileId = null;
protected boolean multitargetHandling;
@ -42,6 +42,9 @@ public class ExileTargetEffect extends OneShotEffect {
this.multitargetHandling = multitargetHandling;
}
/**
* Exile cards to normal exile window (but it can exile to source's exile window after toSourceExileZone change)
*/
public ExileTargetEffect() {
this(null, "");
}

4
Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java
View file

@ -21,6 +21,10 @@ import java.util.UUID;
*/
public class ExileTargetForSourceEffect extends OneShotEffect {
/**
* Exile cards to source's exile window (e.g. if it have another effect like return from exile later)
* TODO: delete that effect and replace it by ExileTargetEffect (it have special param for same purpose)
*/
public ExileTargetForSourceEffect() {
super(Outcome.Exile);
}

14
Mage/src/main/java/mage/filter/FilterCard.java
View file

@ -1,14 +1,15 @@
package mage.filter;
import mage.cards.Card;
import mage.constants.TargetController;
import mage.filter.predicate.*;
import mage.game.Game;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
import mage.cards.Card;
import mage.constants.TargetController;
import mage.filter.predicate.*;
import mage.game.Game;
/**
* @author BetaSteward_at_googlemail.com
@ -95,4 +96,9 @@ public class FilterCard extends FilterObject<Card> {
throw new IllegalArgumentException("Card filter doesn't support controller predicate");
}
}
public FilterCard withMessage(String message) {
this.setMessage(message);
return this;
}
}

9
Mage/src/main/java/mage/filter/FilterImpl.java
View file

@ -1,16 +1,16 @@
package mage.filter;
import java.util.ArrayList;
import java.util.List;
import mage.filter.predicate.Predicate;
import mage.filter.predicate.Predicates;
import mage.game.Game;
import java.util.ArrayList;
import java.util.List;
/**
*
* @param <E>
* @author BetaSteward_at_googlemail.com
* @author North
* @param <E>
*/
public abstract class FilterImpl<E> implements Filter<E> {
@ -78,5 +78,4 @@ public abstract class FilterImpl<E> implements Filter<E> {
public List<Predicate<? super E>> getPredicates() {
return predicates;
}
}

11
Mage/src/main/java/mage/target/common/TargetCardInASingleGraveyard.java
View file

@ -1,8 +1,5 @@
package mage.target.common;
import java.util.UUID;
import mage.abilities.Ability;
import mage.cards.Card;
import mage.constants.Zone;
@ -10,17 +7,17 @@ import mage.filter.FilterCard;
import mage.game.Game;
import mage.target.TargetCard;
import java.util.UUID;
/**
*
* @author LevelX2
*/
public class TargetCardInASingleGraveyard extends TargetCard {
public TargetCardInASingleGraveyard(int minNumTargets, int maxNumTargets, FilterCard filter) {
super(minNumTargets, maxNumTargets, Zone.GRAVEYARD, filter);
// workaround to add extra message to final ability text
super(minNumTargets, maxNumTargets, Zone.GRAVEYARD, filter.copy().withMessage(filter.getMessage() + " from a single graveyard"));
}
public TargetCardInASingleGraveyard(final TargetCardInASingleGraveyard target) {
@ -41,9 +38,9 @@ public class TargetCardInASingleGraveyard extends TargetCard {
return super.canTarget(id, source, game);
}
@Override
public TargetCardInASingleGraveyard copy() {
return new TargetCardInASingleGraveyard(this);
}
}