diff --git a/Mage.Sets/src/mage/cards/i/ImpendingFlux.java b/Mage.Sets/src/mage/cards/i/ImpendingFlux.java index bd606e00915..460914db182 100644 --- a/Mage.Sets/src/mage/cards/i/ImpendingFlux.java +++ b/Mage.Sets/src/mage/cards/i/ImpendingFlux.java @@ -1,9 +1,8 @@ package mage.cards.i; -import mage.abilities.dynamicvalue.AdditiveDynamicValue; import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.dynamicvalue.IntPlusDynamicValue; import mage.abilities.dynamicvalue.common.SpellsCastNotFromHandValue; -import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.DamagePlayersEffect; import mage.abilities.keyword.ForetellAbility; @@ -22,7 +21,7 @@ import java.util.UUID; */ public final class ImpendingFlux extends CardImpl { - private static final DynamicValue xValue = new AdditiveDynamicValue(SpellsCastNotFromHandValue.instance, StaticValue.get(1)); + private static final DynamicValue xValue = new IntPlusDynamicValue(1, SpellsCastNotFromHandValue.instance); public ImpendingFlux(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}"); diff --git a/Mage.Sets/src/mage/cards/t/TwiceUponATime.java b/Mage.Sets/src/mage/cards/t/TwiceUponATime.java index abea5974ec1..9bf61c5f838 100644 --- a/Mage.Sets/src/mage/cards/t/TwiceUponATime.java +++ b/Mage.Sets/src/mage/cards/t/TwiceUponATime.java @@ -11,6 +11,7 @@ import mage.abilities.hint.Hint; import mage.cards.AdventureCard; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.FilterPermanent; @@ -25,12 +26,12 @@ import java.util.UUID; public final class TwiceUponATime extends AdventureCard { private static final FilterPermanent filter = new FilterControlledPermanent(SubType.DOCTOR, "you control two or more Doctors"); - private static final Condition condition = new PermanentsOnTheBattlefieldCondition(filter); + private static final Condition condition = new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 1); private static final Hint hint = new ConditionHint(condition, "You control two or more Doctors"); private static final FilterCard filter2 = new FilterCard("a Doctor card"); static { - filter.add(SubType.DOCTOR.getPredicate()); + filter2.add(SubType.DOCTOR.getPredicate()); } public TwiceUponATime(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage/src/main/java/mage/abilities/condition/common/DescendCondition.java b/Mage/src/main/java/mage/abilities/condition/common/DescendCondition.java index 4e30b0edbfc..4c1c72375dd 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/DescendCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/DescendCondition.java @@ -17,7 +17,7 @@ public enum DescendCondition implements Condition { FOUR(4), EIGHT(8); private static final Hint hint = new ValueHint( - "Permanent cards in you graveyard", + "Permanent cards in your graveyard", new CardsInControllerGraveyardCount(StaticFilters.FILTER_CARD_PERMANENT) );