diff --git a/Mage.Sets/src/mage/cards/h/HallarTheFirefletcher.java b/Mage.Sets/src/mage/cards/h/HallarTheFirefletcher.java index 8cfbf4cfcc..579dd9700d 100644 --- a/Mage.Sets/src/mage/cards/h/HallarTheFirefletcher.java +++ b/Mage.Sets/src/mage/cards/h/HallarTheFirefletcher.java @@ -119,6 +119,6 @@ class HallarTheFirefletcherTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever you cast a spell, if it was kicked," + super.getRule(); + return "Whenever you cast a spell, if that spell was kicked," + super.getRule(); } } diff --git a/Mage.Sets/src/mage/cards/h/HelmOfTheHost.java b/Mage.Sets/src/mage/cards/h/HelmOfTheHost.java index a5aa48f058..1458aa942d 100644 --- a/Mage.Sets/src/mage/cards/h/HelmOfTheHost.java +++ b/Mage.Sets/src/mage/cards/h/HelmOfTheHost.java @@ -83,7 +83,7 @@ class HelmOfTheHostEffect extends OneShotEffect { public HelmOfTheHostEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "create a token that’s a copy of equipped creature, except the token isn’t legendary if equipped creature is legendary. That token gains haste."; + this.staticText = "create a token that's a copy of equipped creature, except the token isn't legendary if equipped creature is legendary. That token gains haste."; } public HelmOfTheHostEffect(final HelmOfTheHostEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MoxAmber.java b/Mage.Sets/src/mage/cards/m/MoxAmber.java index 935ee00ca4..9da1579a0e 100644 --- a/Mage.Sets/src/mage/cards/m/MoxAmber.java +++ b/Mage.Sets/src/mage/cards/m/MoxAmber.java @@ -49,8 +49,8 @@ public class MoxAmber extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); addSuperType(SuperType.LEGENDARY); - // {tap}: Add one mana pool of any color among legendary creatures or planeswalkers you control. - FilterPermanent filter = new FilterPermanent("legendary creatures or planeswalkers"); + // {tap}: 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( new CardTypePredicate(CardType.CREATURE), diff --git a/Mage.Sets/src/mage/cards/r/RatColony.java b/Mage.Sets/src/mage/cards/r/RatColony.java index dae3e405ae..a538754c76 100644 --- a/Mage.Sets/src/mage/cards/r/RatColony.java +++ b/Mage.Sets/src/mage/cards/r/RatColony.java @@ -50,7 +50,7 @@ import mage.filter.predicate.permanent.AnotherPredicate; */ public class RatColony extends CardImpl { - private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other Rat you control"); static { filter.add(new SubtypePredicate(SubType.RAT)); diff --git a/Mage.Sets/src/mage/cards/t/TerashisCry.java b/Mage.Sets/src/mage/cards/t/TerashisCry.java index e208375043..0977753813 100644 --- a/Mage.Sets/src/mage/cards/t/TerashisCry.java +++ b/Mage.Sets/src/mage/cards/t/TerashisCry.java @@ -36,6 +36,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import static mage.filter.StaticFilters.FILTER_PERMANENT_CREATURES; import java.util.UUID; @@ -51,8 +52,7 @@ public class TerashisCry extends CardImpl { // Tap up to three target creatures. - Target target = new TargetCreaturePermanent(0, 3); - target.setTargetName("up to three"); + Target target = new TargetCreaturePermanent(0, 3, FILTER_PERMANENT_CREATURES, false); this.getSpellAbility().addEffect(new TapTargetEffect()); this.getSpellAbility().addTarget(target); } diff --git a/Mage.Sets/src/mage/cards/z/ZahidDjinnOfTheLamp.java b/Mage.Sets/src/mage/cards/z/ZahidDjinnOfTheLamp.java index d8461ddc06..e9cbaabd81 100644 --- a/Mage.Sets/src/mage/cards/z/ZahidDjinnOfTheLamp.java +++ b/Mage.Sets/src/mage/cards/z/ZahidDjinnOfTheLamp.java @@ -1,81 +1,81 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ -package mage.cards.z; - -import java.util.UUID; -import mage.MageInt; -import mage.abilities.costs.AlternativeCostSourceAbility; -import mage.abilities.costs.common.TapTargetCost; -import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.keyword.FlyingAbility; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.SuperType; -import mage.filter.common.FilterControlledArtifactPermanent; -import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.TappedPredicate; -import mage.target.common.TargetControlledPermanent; - -/** - * - * @author LevelX2 - */ -public class ZahidDjinnOfTheLamp extends CardImpl { - - public ZahidDjinnOfTheLamp(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); - - this.addSuperType(SuperType.LEGENDARY); - this.subtype.add(SubType.DJINN); - this.power = new MageInt(5); - this.toughness = new MageInt(6); - - // You may pay {3}{U} and tap an untapped artifact you control rather than pay this spell's mana cost. - AlternativeCostSourceAbility alternativeCostSourceAbility = new AlternativeCostSourceAbility(new ManaCostsImpl("{3}{U}"), null, - "You may pay {3}{U} and tap an untapped artifact you control rather than pay this spell's mana cost."); - FilterControlledArtifactPermanent filter = new FilterControlledArtifactPermanent("untapped artifact you control"); - filter.add(Predicates.not(new TappedPredicate())); - alternativeCostSourceAbility.addCost(new TapTargetCost(new TargetControlledPermanent(filter))); - this.addAbility(alternativeCostSourceAbility); - - // Flying - this.addAbility(FlyingAbility.getInstance()); - - } - - public ZahidDjinnOfTheLamp(final ZahidDjinnOfTheLamp card) { - super(card); - } - - @Override - public ZahidDjinnOfTheLamp copy() { - return new ZahidDjinnOfTheLamp(this); - } -} +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.cards.z; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.costs.AlternativeCostSourceAbility; +import mage.abilities.costs.common.TapTargetCost; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.keyword.FlyingAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SubType; +import mage.constants.SuperType; +import mage.filter.common.FilterControlledArtifactPermanent; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.permanent.TappedPredicate; +import mage.target.common.TargetControlledPermanent; + +/** + * + * @author LevelX2 + */ +public class ZahidDjinnOfTheLamp extends CardImpl { + + public ZahidDjinnOfTheLamp(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); + + this.addSuperType(SuperType.LEGENDARY); + this.subtype.add(SubType.DJINN); + this.power = new MageInt(5); + this.toughness = new MageInt(6); + + // You may pay {3}{U} and tap an untapped artifact you control rather than pay this spell's mana cost. + AlternativeCostSourceAbility alternativeCostSourceAbility = new AlternativeCostSourceAbility(new ManaCostsImpl("{3}{U}"), null, + "You may pay {3}{U} and tap an untapped artifact you control rather than pay this spell's mana cost."); + FilterControlledArtifactPermanent filter = new FilterControlledArtifactPermanent("untapped artifact you control"); + filter.add(Predicates.not(new TappedPredicate())); + alternativeCostSourceAbility.addCost(new TapTargetCost(new TargetControlledPermanent(filter))); + this.addAbility(alternativeCostSourceAbility); + + // Flying + this.addAbility(FlyingAbility.getInstance()); + + } + + public ZahidDjinnOfTheLamp(final ZahidDjinnOfTheLamp card) { + super(card); + } + + @Override + public ZahidDjinnOfTheLamp copy() { + return new ZahidDjinnOfTheLamp(this); + } +} diff --git a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java index 9ab2ff079a..ef9cb95b64 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java @@ -272,7 +272,7 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff if (anyOrder) { sb.append(" in any order"); } else { - sb.append(" in random order"); + sb.append(" in a random order"); } break; case HAND: @@ -342,7 +342,7 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff if (anyOrder) { sb.append("any"); } else { - sb.append("random"); + sb.append("a random"); } sb.append(" order"); } else if (targetZoneLookedCards == Zone.GRAVEYARD) {