diff --git a/Mage.Sets/src/mage/cards/m/MoxAmber.java b/Mage.Sets/src/mage/cards/m/MoxAmber.java index ae6d86bd9dc..83093f734de 100644 --- a/Mage.Sets/src/mage/cards/m/MoxAmber.java +++ b/Mage.Sets/src/mage/cards/m/MoxAmber.java @@ -1,7 +1,5 @@ - package mage.cards.m; -import java.util.UUID; import mage.abilities.mana.AnyColorPermanentTypesManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -11,24 +9,25 @@ import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; +import java.util.UUID; + /** - * * @author CountAndromalius */ public final class MoxAmber extends CardImpl { public MoxAmber(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{0}"); addSuperType(SuperType.LEGENDARY); - // {tap}: Add one mana pool of any color among legendary creatures and planeswalkers you control. + // {T}: Add one mana pool of any color among legendary creatures and planeswalkers you control. FilterPermanent filter = new FilterPermanent("legendary creatures and planeswalkers"); filter.add(Predicates.or( Predicates.and( - CardType.CREATURE.getPredicate(), - SuperType.LEGENDARY.getPredicate() + CardType.CREATURE.getPredicate(), + SuperType.LEGENDARY.getPredicate() ), - CardType.PLANESWALKER.getPredicate()) + CardType.PLANESWALKER.getPredicate()) ); this.addAbility(new AnyColorPermanentTypesManaAbility(TargetController.YOU, filter)); } diff --git a/Mage.Sets/src/mage/cards/o/OfOneMind.java b/Mage.Sets/src/mage/cards/o/OfOneMind.java index f81bb902775..a38184af0dd 100644 --- a/Mage.Sets/src/mage/cards/o/OfOneMind.java +++ b/Mage.Sets/src/mage/cards/o/OfOneMind.java @@ -1,12 +1,12 @@ package mage.cards.o; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.CompoundCondition; import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.cost.SpellCostReductionSourceEffect; +import mage.abilities.hint.ConditionHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -16,6 +16,8 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; +import java.util.UUID; + /** * @author TheElk801 */ @@ -38,9 +40,10 @@ public final class OfOneMind extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{U}"); // This spell costs {2} less to cast if you control a Human creature and a non-Human creature. - this.addAbility(new SimpleStaticAbility( - Zone.ALL, new SpellCostReductionSourceEffect(2, condition) - ).setRuleAtTheTop(true)); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SpellCostReductionSourceEffect(2, condition)) + .setRuleAtTheTop(true) + .addHint(new ConditionHint(condition, "You control a Human creature and a non-Human creature")) + ); // Draw two cards. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2)); diff --git a/Mage.Sets/src/mage/cards/t/TitanicBrawl.java b/Mage.Sets/src/mage/cards/t/TitanicBrawl.java index 54f079db20c..c23972f76e6 100644 --- a/Mage.Sets/src/mage/cards/t/TitanicBrawl.java +++ b/Mage.Sets/src/mage/cards/t/TitanicBrawl.java @@ -1,6 +1,5 @@ package mage.cards.t; -import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.SourceTargetsPermanentCondition; @@ -18,6 +17,8 @@ import mage.filter.predicate.permanent.CounterPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author TheElk801 */ @@ -37,7 +38,7 @@ public final class TitanicBrawl extends CardImpl { // This spell costs {1} less to cast if it targets a creature you control with a +1/+1 counter on it. this.addAbility(new SimpleStaticAbility( - Zone.ALL, new SpellCostReductionSourceEffect(1, condition) + Zone.ALL, new SpellCostReductionSourceEffect(1, condition).setCanWorksOnStackOnly(true) ).setRuleAtTheTop(true)); // Target creature you control fights target creature you don't control.