diff --git a/Mage.Sets/src/mage/cards/a/AngelicReward.java b/Mage.Sets/src/mage/cards/a/AngelicReward.java index fa24705bea9..c3f8d47c1fa 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicReward.java +++ b/Mage.Sets/src/mage/cards/a/AngelicReward.java @@ -1,6 +1,5 @@ package mage.cards.a; -import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; @@ -29,12 +28,12 @@ public final class AngelicReward extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget); - this.addAbility(ability); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +3/+3 and has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + SimpleStaticAbility ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, 3)); + ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA).setText("and has flying")); + this.addAbility(ability); } private AngelicReward(final AngelicReward card) { diff --git a/Mage.Sets/src/mage/cards/a/ArmoryPaladin.java b/Mage.Sets/src/mage/cards/a/ArmoryPaladin.java index 76adba74a0e..4eea10a8caa 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoryPaladin.java +++ b/Mage.Sets/src/mage/cards/a/ArmoryPaladin.java @@ -41,7 +41,9 @@ public final class ArmoryPaladin extends CardImpl { // Whenever you cast an Aura or Equipment spell, exile the top card of your library. You may play that card until the end of your next turn. this.addAbility(new SpellCastControllerTriggeredAbility( - new ExileTopXMayPlayUntilEffect(1, Duration.UntilEndOfYourNextTurn), filter, false + new ExileTopXMayPlayUntilEffect(1, Duration.UntilEndOfYourNextTurn) + .withTextOptions("that card", true), + filter, false )); } diff --git a/Mage.Sets/src/mage/cards/b/BriaRiptideRogue.java b/Mage.Sets/src/mage/cards/b/BriaRiptideRogue.java index 52da607a3cb..bb1c85007cf 100644 --- a/Mage.Sets/src/mage/cards/b/BriaRiptideRogue.java +++ b/Mage.Sets/src/mage/cards/b/BriaRiptideRogue.java @@ -43,7 +43,7 @@ public final class BriaRiptideRogue extends CardImpl { // Whenever you cast a noncreature spell, target creature you control can't be blocked this turn. Ability ability = new SpellCastControllerTriggeredAbility( - new CantBeBlockedTargetEffect(), StaticFilters.FILTER_SPELL_A_NON_CREATURE, true + new CantBeBlockedTargetEffect(), StaticFilters.FILTER_SPELL_A_NON_CREATURE, false ); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GuardianProject.java b/Mage.Sets/src/mage/cards/g/GuardianProject.java index a4e002f8188..79d13ad44fa 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianProject.java +++ b/Mage.Sets/src/mage/cards/g/GuardianProject.java @@ -11,14 +11,12 @@ import mage.constants.Outcome; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; -import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; +import mage.filter.predicate.card.OwnerIdPredicate; import mage.filter.predicate.mageobject.CardIdPredicate; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.card.OwnerIdPredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; -import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; @@ -82,7 +80,7 @@ class GuardianProjectTriggeredAbility extends EntersBattlefieldAllTriggeredAbili @Override public String getRule() { return "Whenever a nontoken creature enters the battlefield under your control, " + - "if that creature does not have the same name as another creature you control " + + "if it doesn't have the same name as another creature you control " + "or a creature card in your graveyard, draw a card."; } @@ -104,10 +102,7 @@ class GuardianProjectTriggeredAbility extends EntersBattlefieldAllTriggeredAbili filterPermanent.add(new NamePredicate(permanent.getName())); filterPermanent.add(Predicates.not(new CardIdPredicate(permanent.getId()))); filterPermanent.add(new ControllerIdPredicate(controllerId)); - if (!game.getBattlefield().getActivePermanents(filterPermanent, controllerId, game).isEmpty()) { - return false; - } - return true; + return game.getBattlefield().getActivePermanents(filterPermanent, controllerId, game).isEmpty(); } } diff --git a/Mage.Sets/src/mage/cards/l/LibertyPrimeRecharged.java b/Mage.Sets/src/mage/cards/l/LibertyPrimeRecharged.java index a088f92b59c..5f26494aa17 100644 --- a/Mage.Sets/src/mage/cards/l/LibertyPrimeRecharged.java +++ b/Mage.Sets/src/mage/cards/l/LibertyPrimeRecharged.java @@ -49,7 +49,7 @@ public final class LibertyPrimeRecharged extends CardImpl { this.addAbility(new AttacksOrBlocksTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new PayEnergyCost(2)), false)); // {2}, {T}, Sacrifice an artifact: You get {E}{E} and draw a card. - Ability ability = new SimpleActivatedAbility(new GetEnergyCountersControllerEffect(2), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new GetEnergyCountersControllerEffect(2).setText("you get {E}{E}"), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT_AN)); ability.addEffect(new DrawCardSourceControllerEffect(1).concatBy("and")); diff --git a/Mage.Sets/src/mage/cards/s/ScurryOfGremlins.java b/Mage.Sets/src/mage/cards/s/ScurryOfGremlins.java index fe6304acc37..dc570aeb763 100644 --- a/Mage.Sets/src/mage/cards/s/ScurryOfGremlins.java +++ b/Mage.Sets/src/mage/cards/s/ScurryOfGremlins.java @@ -31,7 +31,7 @@ public final class ScurryOfGremlins extends CardImpl { // When Scurry of Gremlins enters the battlefield, create two 1/1 red Gremlin creature tokens. Then you get an amount of {E} equal to the number of creatures you control. Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GremlinToken(), 2)); ability.addEffect(new GetEnergyCountersControllerEffect(CreaturesYouControlCount.instance) - .setText("then you get an amount of {E} equal to the number of creatures you control")); + .setText("Then you get an amount of {E} equal to the number of creatures you control")); this.addAbility(ability.addHint(CreaturesYouControlHint.instance)); // Pay {E}{E}{E}{E}: Creatures you control get +1/+0 and gain haste until end of turn. diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControlledEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControlledEffect.java index bcc35060f39..3d33102d124 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControlledEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControlledEffect.java @@ -138,6 +138,8 @@ public class GainAbilityControlledEffect extends ContinuousEffectImpl { } if (forceQuotes || gainedAbility.startsWith("When") || gainedAbility.startsWith("{T}")) { gainedAbility = '"' + gainedAbility + '"'; + } else { + gainedAbility = CardUtil.getTextWithFirstCharLowerCase(gainedAbility); } sb.append(gainedAbility); if (!durationRuleAtStart && !duration.toString().isEmpty() && duration != Duration.EndOfGame) {