diff --git a/Mage.Sets/src/mage/cards/a/AbueloAncestralEcho.java b/Mage.Sets/src/mage/cards/a/AbueloAncestralEcho.java index 8c4a906d16e..fbc0a292aba 100644 --- a/Mage.Sets/src/mage/cards/a/AbueloAncestralEcho.java +++ b/Mage.Sets/src/mage/cards/a/AbueloAncestralEcho.java @@ -34,7 +34,7 @@ public final class AbueloAncestralEcho extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Ward {2} - this.addAbility(new WardAbility(new ManaCostsImpl<>("{2}"))); + this.addAbility(new WardAbility(new ManaCostsImpl<>("{2}"), false)); // {1}{W}{U}: Exile another target creature or artifact you control. Return it to the battlefield under its owner's control at the beginning of the next end step. Ability ability = new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/a/AlphaDeathclaw.java b/Mage.Sets/src/mage/cards/a/AlphaDeathclaw.java index 0edc6441b3e..45b5cabe6e1 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaDeathclaw.java +++ b/Mage.Sets/src/mage/cards/a/AlphaDeathclaw.java @@ -32,7 +32,7 @@ public final class AlphaDeathclaw extends CardImpl { this.toughness = new MageInt(6); // Menace - this.addAbility(new MenaceAbility()); + this.addAbility(new MenaceAbility(false)); // Trample this.addAbility(TrampleAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/a/AmaliaBenavidesAguirre.java b/Mage.Sets/src/mage/cards/a/AmaliaBenavidesAguirre.java index 453b328913f..615b694504e 100644 --- a/Mage.Sets/src/mage/cards/a/AmaliaBenavidesAguirre.java +++ b/Mage.Sets/src/mage/cards/a/AmaliaBenavidesAguirre.java @@ -43,14 +43,14 @@ public final class AmaliaBenavidesAguirre extends CardImpl { this.toughness = new MageInt(2); // Ward--Pay 3 life. - this.addAbility(new WardAbility(new PayLifeCost(3))); + this.addAbility(new WardAbility(new PayLifeCost(3), false)); // Whenever you gain life, Amalia Benavides Aguirre explores. Then, destroy all other creatures if Amalia's power is exactly 20. Ability ability = new GainLifeControllerTriggeredAbility(new ExploreSourceEffect(false, "{this}")); ability.addEffect(new ConditionalOneShotEffect( new DestroyAllEffect(filter), AmaliaBenavidesAguirreCondition.instance - ).setText("Then, destroy all other creatures if Amalia's power is exactly 20")); + ).setText("Then, destroy all other creatures if its power is exactly 20")); this.addAbility(ability); } @@ -72,4 +72,4 @@ enum AmaliaBenavidesAguirreCondition implements Condition { Permanent amalia = source.getSourcePermanentOrLKI(game); return amalia != null && amalia.getPower().getValue() == 20; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/e/EarthshakerDreadmaw.java b/Mage.Sets/src/mage/cards/e/EarthshakerDreadmaw.java index 1461154c247..73020e4b227 100644 --- a/Mage.Sets/src/mage/cards/e/EarthshakerDreadmaw.java +++ b/Mage.Sets/src/mage/cards/e/EarthshakerDreadmaw.java @@ -23,7 +23,7 @@ import java.util.UUID; */ public final class EarthshakerDreadmaw extends CardImpl { - private static final FilterPermanent filter = new FilterControlledPermanent(SubType.DINOSAUR); + private static final FilterPermanent filter = new FilterControlledPermanent(SubType.DINOSAUR, "other Dinosaur you control"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/j/JadelightSpelunker.java b/Mage.Sets/src/mage/cards/j/JadelightSpelunker.java index a44e7339aae..462769b455e 100644 --- a/Mage.Sets/src/mage/cards/j/JadelightSpelunker.java +++ b/Mage.Sets/src/mage/cards/j/JadelightSpelunker.java @@ -29,7 +29,7 @@ public final class JadelightSpelunker extends CardImpl { new ExploreSourceEffect(ManacostVariableValue.ETB, false, "it") .setText("it explores X times. (To have it explore, reveal the top card of your library. " + "Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on that creature, " - + "then put the card back or put it into your graveyard.)") + + "then put the card back or put it into your graveyard.)") )); } diff --git a/Mage.Sets/src/mage/cards/r/RestlessAnchorage.java b/Mage.Sets/src/mage/cards/r/RestlessAnchorage.java index 4fd5afb4672..8c12403f965 100644 --- a/Mage.Sets/src/mage/cards/r/RestlessAnchorage.java +++ b/Mage.Sets/src/mage/cards/r/RestlessAnchorage.java @@ -41,7 +41,7 @@ public final class RestlessAnchorage extends CardImpl { .withSubType(SubType.BIRD) .withAbility(FlyingAbility.getInstance()), CardType.LAND, Duration.EndOfTurn - ), new ManaCostsImpl<>("{1}{W}{U}"))); + ).withDurationRuleAtStart(true), new ManaCostsImpl<>("{1}{W}{U}"))); // Whenever Restless Anchorage attacks, create a Map token. this.addAbility(new AttacksTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/r/RestlessVents.java b/Mage.Sets/src/mage/cards/r/RestlessVents.java index e4576834391..3d5e80670fb 100644 --- a/Mage.Sets/src/mage/cards/r/RestlessVents.java +++ b/Mage.Sets/src/mage/cards/r/RestlessVents.java @@ -42,7 +42,7 @@ public final class RestlessVents extends CardImpl { .withSubType(SubType.INSECT) .withAbility(new MenaceAbility(false)), CardType.LAND, Duration.EndOfTurn - ), new ManaCostsImpl<>("{1}{B}{R}"))); + ).withDurationRuleAtStart(true), new ManaCostsImpl<>("{1}{B}{R}"))); // Whenever Restless Vents attacks, you may discard a card. If you do, draw a card. this.addAbility(new AttacksTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/s/SaheeliTheSunsBrilliance.java b/Mage.Sets/src/mage/cards/s/SaheeliTheSunsBrilliance.java index b75d551ceac..2e7b92277b5 100644 --- a/Mage.Sets/src/mage/cards/s/SaheeliTheSunsBrilliance.java +++ b/Mage.Sets/src/mage/cards/s/SaheeliTheSunsBrilliance.java @@ -55,7 +55,7 @@ class SaheeliTheSunsBrillianceEffect extends OneShotEffect { SaheeliTheSunsBrillianceEffect() { super(Outcome.Benefit); - staticText = "create a token that' a copy of another target creature or artifact you control, " + + staticText = "create a token that's a copy of another target creature or artifact you control, " + "except it's an artifact in addition to its other types. It gains haste. " + "Sacrifice it at the beginning of the next end step"; } diff --git a/Mage.Sets/src/mage/cards/s/SovereignOkinecAhau.java b/Mage.Sets/src/mage/cards/s/SovereignOkinecAhau.java index 7475382ed48..5ebb83c6611 100644 --- a/Mage.Sets/src/mage/cards/s/SovereignOkinecAhau.java +++ b/Mage.Sets/src/mage/cards/s/SovereignOkinecAhau.java @@ -32,7 +32,7 @@ public final class SovereignOkinecAhau extends CardImpl { this.toughness = new MageInt(4); // Ward {2} - this.addAbility(new WardAbility(new ManaCostsImpl<>("{2}"))); + this.addAbility(new WardAbility(new ManaCostsImpl<>("{2}"), false)); // Whenever Sovereign Okinec Ahau attacks, for each creature you control with power greater than that // creature's base power, put a number of +1/+1 counters on that creature equal to the difference. @@ -54,7 +54,7 @@ class SovereignOkinecAhauEffect extends OneShotEffect { SovereignOkinecAhauEffect() { super(Outcome.Benefit); - staticText = "for each creature you control with power greater than that" + + staticText = "for each creature you control with power greater than that " + "creature's base power, put a number of +1/+1 counters on that creature equal to the difference."; } @@ -77,4 +77,4 @@ class SovereignOkinecAhauEffect extends OneShotEffect { } return true; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TheBelligerent.java b/Mage.Sets/src/mage/cards/t/TheBelligerent.java index cd3d8e614c2..dae76d87340 100644 --- a/Mage.Sets/src/mage/cards/t/TheBelligerent.java +++ b/Mage.Sets/src/mage/cards/t/TheBelligerent.java @@ -35,7 +35,7 @@ public final class TheBelligerent extends CardImpl { ability.addEffect(new LookAtTopCardOfLibraryAnyTimeEffect(TargetController.YOU, Duration.EndOfTurn)); ability.addEffect(new PlayTheTopCardEffect( TargetController.YOU, filter, false - ).concatBy("and")); + ).concatBy(", and")); this.addAbility(ability); // Crew 3 diff --git a/Mage.Sets/src/mage/cards/t/TheGrimCaptain.java b/Mage.Sets/src/mage/cards/t/TheGrimCaptain.java index c03f57f2051..e8ca7add470 100644 --- a/Mage.Sets/src/mage/cards/t/TheGrimCaptain.java +++ b/Mage.Sets/src/mage/cards/t/TheGrimCaptain.java @@ -41,7 +41,7 @@ public final class TheGrimCaptain extends CardImpl { this.color.setBlack(true); // Menace - this.addAbility(new MenaceAbility()); + this.addAbility(new MenaceAbility(false)); // Trample this.addAbility(TrampleAbility.getInstance()); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LookAtTopCardOfLibraryAnyTimeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LookAtTopCardOfLibraryAnyTimeEffect.java index 62d074e21ee..4cb4694c505 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LookAtTopCardOfLibraryAnyTimeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LookAtTopCardOfLibraryAnyTimeEffect.java @@ -47,7 +47,7 @@ public class LookAtTopCardOfLibraryAnyTimeEffect extends ContinuousEffectImpl { String durationString = duration.toString(); if (durationString != null && !durationString.isEmpty()) { sb.append(durationString); - sb.append(' '); + sb.append(", "); } sb.append("you may look at the top card of "); sb.append(libInfo); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayTheTopCardEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayTheTopCardEffect.java index ad03af47f5d..3eb76dd81b7 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayTheTopCardEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayTheTopCardEffect.java @@ -60,7 +60,7 @@ public class PlayTheTopCardEffect extends AsThoughEffectImpl { default: throw new IllegalArgumentException("Unknown target library type: " + targetLibrary); } - this.staticText = "You may " + filter.getMessage() + " from the top of " + libInfo; + this.staticText = "you may " + filter.getMessage() + " from the top of " + libInfo; // verify check: if you see "card" text in the rules then use card mode // (there aren't any real cards after oracle update, but can be added in the future) diff --git a/Mage/src/main/java/mage/constants/AbilityWord.java b/Mage/src/main/java/mage/constants/AbilityWord.java index 8043aaa46d4..3ab034a0ce9 100644 --- a/Mage/src/main/java/mage/constants/AbilityWord.java +++ b/Mage/src/main/java/mage/constants/AbilityWord.java @@ -22,7 +22,7 @@ public enum AbilityWord { COUNCILS_DILEMMA("Council's dilemma"), COVEN("Coven"), DELIRIUM("Delirium"), - DESCEND_4("Descent 4"), + DESCEND_4("Descend 4"), DOMAIN("Domain"), EMINENCE("Eminence"), ENRAGE("Enrage"),