mirror of
https://github.com/correl/mage.git
synced 2025-01-12 19:25:44 +00:00
Fixed Break of day and Knight Exemplar (missed controlled Predicate)
This commit is contained in:
parent
e9b441ed9e
commit
b7f1fd72a1
2 changed files with 6 additions and 3 deletions
|
@ -36,7 +36,7 @@ import mage.abilities.decorator.ConditionalContinousEffect;
|
|||
import mage.abilities.effects.common.IndestructibleAllEffect;
|
||||
import mage.abilities.effects.common.continious.BoostControlledEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.common.FilterControlledCreaturePermanent;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -55,7 +55,7 @@ public class BreakOfDay extends CardImpl<BreakOfDay> {
|
|||
this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Duration.EndOfTurn));
|
||||
// Fateful hour - If you have 5 or less life, those creatures also are indestructible this turn.
|
||||
this.getSpellAbility().addEffect(new ConditionalContinousEffect(
|
||||
new IndestructibleAllEffect(new FilterCreaturePermanent("creatures you control"), Duration.EndOfTurn),
|
||||
new IndestructibleAllEffect(new FilterControlledCreaturePermanent("creatures you control"), Duration.EndOfTurn),
|
||||
FatefulHourCondition.getInstance(),
|
||||
"If you have 5 or less life, those creatures also are indestructible this turn."));
|
||||
}
|
||||
|
|
|
@ -32,6 +32,7 @@ import java.util.UUID;
|
|||
import mage.Constants.CardType;
|
||||
import mage.Constants.Duration;
|
||||
import mage.Constants.Rarity;
|
||||
import mage.Constants.TargetController;
|
||||
import mage.Constants.Zone;
|
||||
import mage.MageInt;
|
||||
import mage.abilities.common.SimpleStaticAbility;
|
||||
|
@ -42,6 +43,7 @@ import mage.cards.CardImpl;
|
|||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.AnotherPredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -53,7 +55,6 @@ public class KnightExemplar extends CardImpl<KnightExemplar> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Knight"));
|
||||
filter.add(new AnotherPredicate());
|
||||
}
|
||||
|
||||
public KnightExemplar(UUID ownerId) {
|
||||
|
@ -70,6 +71,8 @@ public class KnightExemplar extends CardImpl<KnightExemplar> {
|
|||
// Other Knight creatures you control get +1/+1 and are indestructible.
|
||||
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true)));
|
||||
FilterCreaturePermanent indestructibleFilter = filter.copy();
|
||||
indestructibleFilter.add(new AnotherPredicate());
|
||||
indestructibleFilter.add(new ControllerPredicate(TargetController.YOU));
|
||||
indestructibleFilter.setMessage("Other Knight creatures you control");
|
||||
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IndestructibleAllEffect(indestructibleFilter)));
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue