mirror of
https://github.com/correl/mage.git
synced 2024-12-25 11:11:16 +00:00
- Fixed #5393
This commit is contained in:
parent
d1c1abb967
commit
0eedca5283
3 changed files with 19 additions and 16 deletions
|
@ -56,7 +56,7 @@ public class AminatouTheFateShifter extends CardImpl {
|
|||
|
||||
// -1: Exile another target permanent you own, then return it to the battlefield under your control.
|
||||
ability = new LoyaltyAbility(new ExileTargetForSourceEffect(), -1);
|
||||
ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect());
|
||||
ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect(true));
|
||||
ability.addTarget(new TargetPermanent(filter));
|
||||
this.addAbility(ability);
|
||||
|
||||
|
@ -68,6 +68,7 @@ public class AminatouTheFateShifter extends CardImpl {
|
|||
// Aminatou, the Fateshifter can be your commander.
|
||||
this.addAbility(CanBeYourCommanderAbility.getInstance());
|
||||
}
|
||||
|
||||
public AminatouTheFateShifter(final AminatouTheFateShifter card) {
|
||||
super(card);
|
||||
}
|
||||
|
@ -79,6 +80,7 @@ public class AminatouTheFateShifter extends CardImpl {
|
|||
}
|
||||
|
||||
class AminatouPlusEffect extends OneShotEffect {
|
||||
|
||||
public AminatouPlusEffect() {
|
||||
super(Outcome.DrawCard);
|
||||
staticText = "draw a card, then put a card from your hand on top of your library";
|
||||
|
@ -118,10 +120,11 @@ class AminatouPlusEffect extends OneShotEffect {
|
|||
}
|
||||
|
||||
class AminatouUltimateEffect extends OneShotEffect {
|
||||
|
||||
public AminatouUltimateEffect() {
|
||||
super(Outcome.Benefit);
|
||||
staticText = "Choose left or right. Each player gains control of all nonland permanents other than Aminatou," +
|
||||
" the Fateshifter controlled by the next player in the chosen direction.";
|
||||
staticText = "Choose left or right. Each player gains control of all nonland permanents other than Aminatou,"
|
||||
+ " the Fateshifter controlled by the next player in the chosen direction.";
|
||||
}
|
||||
|
||||
public AminatouUltimateEffect(final AminatouUltimateEffect effect) {
|
||||
|
@ -129,7 +132,9 @@ class AminatouUltimateEffect extends OneShotEffect {
|
|||
}
|
||||
|
||||
@Override
|
||||
public AminatouUltimateEffect copy(){return new AminatouUltimateEffect(this);}
|
||||
public AminatouUltimateEffect copy() {
|
||||
return new AminatouUltimateEffect(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean apply(Game game, Ability source) {
|
||||
|
@ -188,4 +193,3 @@ class AminatouUltimateEffect extends OneShotEffect {
|
|||
return nextPlayerId;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
package mage.cards.t;
|
||||
|
||||
import java.util.UUID;
|
||||
|
@ -13,7 +12,6 @@ import mage.constants.SagaChapter;
|
|||
import mage.constants.SubType;
|
||||
import mage.constants.TargetController;
|
||||
import mage.filter.FilterCard;
|
||||
import mage.filter.StaticFilters;
|
||||
import mage.filter.common.FilterControlledPermanent;
|
||||
import mage.filter.predicate.Predicates;
|
||||
import mage.filter.predicate.mageobject.CardTypePredicate;
|
||||
|
@ -35,6 +33,7 @@ public final class TheEldestReborn extends CardImpl {
|
|||
}
|
||||
|
||||
private static final FilterControlledPermanent filterSacrifice = new FilterControlledPermanent("creature or planeswalker");
|
||||
|
||||
static {
|
||||
filterSacrifice.add(Predicates.or(
|
||||
new CardTypePredicate(CardType.CREATURE),
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
package mage.abilities.common;
|
||||
|
||||
import mage.abilities.Ability;
|
||||
|
@ -138,7 +137,8 @@ class ChapterTriggeredAbility extends TriggeredAbilityImpl {
|
|||
if (event.getTargetId().equals(getSourceId()) && event.getData().equals(CounterType.LORE.getName())) {
|
||||
int amountAdded = event.getAmount();
|
||||
int loreCounters = amountAdded;
|
||||
Permanent sourceSaga = game.getPermanentOrLKIBattlefield(getSourceId());
|
||||
//Permanent sourceSaga = game.getPermanentOrLKIBattlefield(getSourceId()); BUG #5393
|
||||
Permanent sourceSaga = game.getPermanent(getSourceId());
|
||||
if (sourceSaga == null) {
|
||||
sourceSaga = game.getPermanentEntering(getSourceId());
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue