diff --git a/Mage.Sets/src/mage/cards/a/Abeyance.java b/Mage.Sets/src/mage/cards/a/Abeyance.java index 3f6e49e7cc2..3e35499f1ce 100644 --- a/Mage.Sets/src/mage/cards/a/Abeyance.java +++ b/Mage.Sets/src/mage/cards/a/Abeyance.java @@ -31,7 +31,7 @@ public final class Abeyance extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Abeyance(final Abeyance card) { diff --git a/Mage.Sets/src/mage/cards/a/Accelerate.java b/Mage.Sets/src/mage/cards/a/Accelerate.java index e990a4e640a..6ed0d9ee32b 100644 --- a/Mage.Sets/src/mage/cards/a/Accelerate.java +++ b/Mage.Sets/src/mage/cards/a/Accelerate.java @@ -25,7 +25,7 @@ public final class Accelerate extends CardImpl { this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Accelerate(final Accelerate card) { diff --git a/Mage.Sets/src/mage/cards/a/Afflict.java b/Mage.Sets/src/mage/cards/a/Afflict.java index 1abcb194792..5bd5a33234f 100644 --- a/Mage.Sets/src/mage/cards/a/Afflict.java +++ b/Mage.Sets/src/mage/cards/a/Afflict.java @@ -21,7 +21,7 @@ public final class Afflict extends CardImpl { this.getSpellAbility().addEffect(new BoostTargetEffect(-1, -1, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Afflict(final Afflict card) { diff --git a/Mage.Sets/src/mage/cards/a/AggressiveUrge.java b/Mage.Sets/src/mage/cards/a/AggressiveUrge.java index ea9c5360be2..07b8e608803 100644 --- a/Mage.Sets/src/mage/cards/a/AggressiveUrge.java +++ b/Mage.Sets/src/mage/cards/a/AggressiveUrge.java @@ -21,7 +21,7 @@ public final class AggressiveUrge extends CardImpl { this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private AggressiveUrge(final AggressiveUrge card) { diff --git a/Mage.Sets/src/mage/cards/a/Annihilate.java b/Mage.Sets/src/mage/cards/a/Annihilate.java index 98130153029..20a4d080bb5 100644 --- a/Mage.Sets/src/mage/cards/a/Annihilate.java +++ b/Mage.Sets/src/mage/cards/a/Annihilate.java @@ -22,7 +22,7 @@ public final class Annihilate extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); this.getSpellAbility().addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_CREATURE_NON_BLACK)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Annihilate(final Annihilate card) { diff --git a/Mage.Sets/src/mage/cards/a/AphoticWisps.java b/Mage.Sets/src/mage/cards/a/AphoticWisps.java index c095e5646dc..dec4fd81427 100644 --- a/Mage.Sets/src/mage/cards/a/AphoticWisps.java +++ b/Mage.Sets/src/mage/cards/a/AphoticWisps.java @@ -32,9 +32,7 @@ public final class AphoticWisps extends CardImpl { effect.setText("and gains fear until end of turn"); this.getSpellAbility().addEffect(effect); // Draw a card. - effect = new DrawCardSourceControllerEffect(1); - effect.setText("
Draw a card"); - this.getSpellAbility().addEffect(effect); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private AphoticWisps(final AphoticWisps card) { diff --git a/Mage.Sets/src/mage/cards/a/ArgentMutation.java b/Mage.Sets/src/mage/cards/a/ArgentMutation.java index 58e8c3f04db..ebde74c4ced 100644 --- a/Mage.Sets/src/mage/cards/a/ArgentMutation.java +++ b/Mage.Sets/src/mage/cards/a/ArgentMutation.java @@ -22,7 +22,7 @@ public final class ArgentMutation extends CardImpl { this.getSpellAbility().addEffect(new AddCardTypeTargetEffect(Duration.EndOfTurn, CardType.ARTIFACT)); this.getSpellAbility().addTarget(new TargetPermanent()); - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private ArgentMutation(final ArgentMutation card) { diff --git a/Mage.Sets/src/mage/cards/a/ArtifactPossession.java b/Mage.Sets/src/mage/cards/a/ArtifactPossession.java index cc4ca7ef0d7..09ebe6868dc 100644 --- a/Mage.Sets/src/mage/cards/a/ArtifactPossession.java +++ b/Mage.Sets/src/mage/cards/a/ArtifactPossession.java @@ -87,6 +87,6 @@ class AbilityActivatedTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever enchanted artifact becomes tapped or a player activates an ability of enchanted artifact without {tap} in its activation cost, Artifact Possession deals 2 damage to that artifact's controller."; + return "Whenever enchanted artifact becomes tapped or a player activates an ability of enchanted artifact without {T} in its activation cost, Artifact Possession deals 2 damage to that artifact's controller."; } } diff --git a/Mage.Sets/src/mage/cards/a/AuraBlast.java b/Mage.Sets/src/mage/cards/a/AuraBlast.java index 38561b57bbd..dc781b6c431 100644 --- a/Mage.Sets/src/mage/cards/a/AuraBlast.java +++ b/Mage.Sets/src/mage/cards/a/AuraBlast.java @@ -23,7 +23,7 @@ public final class AuraBlast extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private AuraBlast(final AuraBlast card) { diff --git a/Mage.Sets/src/mage/cards/b/Bandage.java b/Mage.Sets/src/mage/cards/b/Bandage.java index c168639a113..76facc4f779 100644 --- a/Mage.Sets/src/mage/cards/b/Bandage.java +++ b/Mage.Sets/src/mage/cards/b/Bandage.java @@ -21,7 +21,7 @@ public final class Bandage extends CardImpl { this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1)); this.getSpellAbility().addTarget(new TargetAnyTarget()); - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Bandage(final Bandage card) { diff --git a/Mage.Sets/src/mage/cards/b/Befuddle.java b/Mage.Sets/src/mage/cards/b/Befuddle.java index cc846f4e715..5aae1845071 100644 --- a/Mage.Sets/src/mage/cards/b/Befuddle.java +++ b/Mage.Sets/src/mage/cards/b/Befuddle.java @@ -25,7 +25,7 @@ public final class Befuddle extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Befuddle(final Befuddle card) { diff --git a/Mage.Sets/src/mage/cards/b/BenefactorsDraught.java b/Mage.Sets/src/mage/cards/b/BenefactorsDraught.java index efb14667b54..c1ed2491253 100644 --- a/Mage.Sets/src/mage/cards/b/BenefactorsDraught.java +++ b/Mage.Sets/src/mage/cards/b/BenefactorsDraught.java @@ -33,7 +33,7 @@ public final class BenefactorsDraught extends CardImpl { this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new BenefactorsDraughtTriggeredAbility())); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private BenefactorsDraught(final BenefactorsDraught card) { diff --git a/Mage.Sets/src/mage/cards/b/Bind.java b/Mage.Sets/src/mage/cards/b/Bind.java index 6ea77487635..aa0e3a94d34 100644 --- a/Mage.Sets/src/mage/cards/b/Bind.java +++ b/Mage.Sets/src/mage/cards/b/Bind.java @@ -23,7 +23,7 @@ public final class Bind extends CardImpl { this.getSpellAbility().addEffect(new CounterTargetEffect()); this.getSpellAbility().addTarget(new TargetActivatedAbility()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Bind(final Bind card) { diff --git a/Mage.Sets/src/mage/cards/b/Blindblast.java b/Mage.Sets/src/mage/cards/b/Blindblast.java index 4d6abe5a479..a31423478b6 100644 --- a/Mage.Sets/src/mage/cards/b/Blindblast.java +++ b/Mage.Sets/src/mage/cards/b/Blindblast.java @@ -26,7 +26,7 @@ public final class Blindblast extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Blindblast(final Blindblast card) { diff --git a/Mage.Sets/src/mage/cards/b/BlindingSpray.java b/Mage.Sets/src/mage/cards/b/BlindingSpray.java index 29001f55cde..1140e919730 100644 --- a/Mage.Sets/src/mage/cards/b/BlindingSpray.java +++ b/Mage.Sets/src/mage/cards/b/BlindingSpray.java @@ -22,7 +22,7 @@ public final class BlindingSpray extends CardImpl { this.getSpellAbility().addEffect(new BoostAllEffect(-4, 0, Duration.EndOfTurn, StaticFilters.FILTER_OPPONENTS_PERMANENT_CREATURES, false)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private BlindingSpray(final BlindingSpray card) { diff --git a/Mage.Sets/src/mage/cards/b/BoilingBlood.java b/Mage.Sets/src/mage/cards/b/BoilingBlood.java index a01432190a3..eb97dc00b61 100644 --- a/Mage.Sets/src/mage/cards/b/BoilingBlood.java +++ b/Mage.Sets/src/mage/cards/b/BoilingBlood.java @@ -23,7 +23,7 @@ public final class BoilingBlood extends CardImpl { this.getSpellAbility().addEffect(new AttacksIfAbleTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private BoilingBlood(final BoilingBlood card) { diff --git a/Mage.Sets/src/mage/cards/b/BoneToAsh.java b/Mage.Sets/src/mage/cards/b/BoneToAsh.java index 5df621c7ed3..4c59c43b4b9 100644 --- a/Mage.Sets/src/mage/cards/b/BoneToAsh.java +++ b/Mage.Sets/src/mage/cards/b/BoneToAsh.java @@ -23,7 +23,7 @@ public final class BoneToAsh extends CardImpl { this.getSpellAbility().addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_CREATURE)); this.getSpellAbility().addEffect(new CounterTargetEffect()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private BoneToAsh(final BoneToAsh card) { diff --git a/Mage.Sets/src/mage/cards/b/BoundDetermined.java b/Mage.Sets/src/mage/cards/b/BoundDetermined.java index f218090357f..098f7d10e25 100644 --- a/Mage.Sets/src/mage/cards/b/BoundDetermined.java +++ b/Mage.Sets/src/mage/cards/b/BoundDetermined.java @@ -46,7 +46,7 @@ public final class BoundDetermined extends SplitCard { // Other spells you control can't be countered this turn. // Draw a card. getRightHalfCard().getSpellAbility().addEffect(new DeterminedEffect()); - getRightHalfCard().getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + getRightHalfCard().getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } diff --git a/Mage.Sets/src/mage/cards/b/BrightReprisal.java b/Mage.Sets/src/mage/cards/b/BrightReprisal.java index 2df1fba6837..06e5f82318f 100644 --- a/Mage.Sets/src/mage/cards/b/BrightReprisal.java +++ b/Mage.Sets/src/mage/cards/b/BrightReprisal.java @@ -23,7 +23,7 @@ public final class BrightReprisal extends CardImpl { this.getSpellAbility().addTarget(new TargetAttackingCreature()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private BrightReprisal(final BrightReprisal card) { diff --git a/Mage.Sets/src/mage/cards/c/Carom.java b/Mage.Sets/src/mage/cards/c/Carom.java index 71b86294535..bd9d2ed8e63 100644 --- a/Mage.Sets/src/mage/cards/c/Carom.java +++ b/Mage.Sets/src/mage/cards/c/Carom.java @@ -39,7 +39,7 @@ public final class Carom extends CardImpl { target2.setTargetTag(2); this.getSpellAbility().addTarget(target2); - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Carom(final Carom card) { diff --git a/Mage.Sets/src/mage/cards/c/CeaseFire.java b/Mage.Sets/src/mage/cards/c/CeaseFire.java index 3683fe6f949..3dce905a79c 100644 --- a/Mage.Sets/src/mage/cards/c/CeaseFire.java +++ b/Mage.Sets/src/mage/cards/c/CeaseFire.java @@ -31,7 +31,7 @@ public final class CeaseFire extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private CeaseFire(final CeaseFire card) { diff --git a/Mage.Sets/src/mage/cards/c/CephalidConstable.java b/Mage.Sets/src/mage/cards/c/CephalidConstable.java index 605e736f0f9..9e0c0ae3e8b 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidConstable.java +++ b/Mage.Sets/src/mage/cards/c/CephalidConstable.java @@ -83,7 +83,7 @@ class CephalidConstableTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever {this} deals combat damage to a player, return up to that many target permanents that player controls to their owners' hands"; + return "Whenever {this} deals combat damage to a player, return up to that many target permanents that player controls to their owners' hands."; } } diff --git a/Mage.Sets/src/mage/cards/c/ChaoticStrike.java b/Mage.Sets/src/mage/cards/c/ChaoticStrike.java index 96f91cf3942..4459ce33c0c 100644 --- a/Mage.Sets/src/mage/cards/c/ChaoticStrike.java +++ b/Mage.Sets/src/mage/cards/c/ChaoticStrike.java @@ -36,7 +36,7 @@ public final class ChaoticStrike extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private ChaoticStrike(final ChaoticStrike card) { diff --git a/Mage.Sets/src/mage/cards/c/ClearTheMind.java b/Mage.Sets/src/mage/cards/c/ClearTheMind.java index 77f82c9a278..7bd1dd33edf 100644 --- a/Mage.Sets/src/mage/cards/c/ClearTheMind.java +++ b/Mage.Sets/src/mage/cards/c/ClearTheMind.java @@ -27,7 +27,7 @@ public final class ClearTheMind extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private ClearTheMind(final ClearTheMind card) { diff --git a/Mage.Sets/src/mage/cards/c/Confound.java b/Mage.Sets/src/mage/cards/c/Confound.java index c4bba5826d2..5e97b0f71a4 100644 --- a/Mage.Sets/src/mage/cards/c/Confound.java +++ b/Mage.Sets/src/mage/cards/c/Confound.java @@ -31,7 +31,7 @@ public final class Confound extends CardImpl { this.getSpellAbility().addEffect(new CounterTargetEffect()); this.getSpellAbility().addTarget(new TargetSpell(filter)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Confound(final Confound card) { diff --git a/Mage.Sets/src/mage/cards/c/ConjurersBan.java b/Mage.Sets/src/mage/cards/c/ConjurersBan.java index ee03ad72530..4811942a42f 100644 --- a/Mage.Sets/src/mage/cards/c/ConjurersBan.java +++ b/Mage.Sets/src/mage/cards/c/ConjurersBan.java @@ -29,7 +29,7 @@ public final class ConjurersBan extends CardImpl { this.getSpellAbility().addEffect(new ConjurersBanEffect()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private ConjurersBan(final ConjurersBan card) { diff --git a/Mage.Sets/src/mage/cards/c/ConsecrateConsume.java b/Mage.Sets/src/mage/cards/c/ConsecrateConsume.java index 239bacda2c3..2053b9cb372 100644 --- a/Mage.Sets/src/mage/cards/c/ConsecrateConsume.java +++ b/Mage.Sets/src/mage/cards/c/ConsecrateConsume.java @@ -36,7 +36,7 @@ public final class ConsecrateConsume extends SplitCard { this.getLeftHalfCard().getSpellAbility().addTarget(new TargetCardInGraveyard()); // Draw a card. - this.getLeftHalfCard().getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getLeftHalfCard().getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); // Consume // Target player sacrifices a creature with the greatest power among creatures they control. You gain life equal to its power. diff --git a/Mage.Sets/src/mage/cards/c/ContentiousPlan.java b/Mage.Sets/src/mage/cards/c/ContentiousPlan.java index dc9573d5585..c405654c190 100644 --- a/Mage.Sets/src/mage/cards/c/ContentiousPlan.java +++ b/Mage.Sets/src/mage/cards/c/ContentiousPlan.java @@ -19,7 +19,7 @@ public final class ContentiousPlan extends CardImpl { // Proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.) this.getSpellAbility().addEffect(new ProliferateEffect()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private ContentiousPlan(final ContentiousPlan card) { diff --git a/Mage.Sets/src/mage/cards/c/Contradict.java b/Mage.Sets/src/mage/cards/c/Contradict.java index 05c70c7aba6..5be7132fedf 100644 --- a/Mage.Sets/src/mage/cards/c/Contradict.java +++ b/Mage.Sets/src/mage/cards/c/Contradict.java @@ -23,7 +23,7 @@ public final class Contradict extends CardImpl { this.getSpellAbility().addTarget(new TargetSpell()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Contradict(final Contradict card) { diff --git a/Mage.Sets/src/mage/cards/c/CrashingTide.java b/Mage.Sets/src/mage/cards/c/CrashingTide.java index d604b1b447a..eb7466f0940 100644 --- a/Mage.Sets/src/mage/cards/c/CrashingTide.java +++ b/Mage.Sets/src/mage/cards/c/CrashingTide.java @@ -40,7 +40,7 @@ public final class CrashingTide extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).setText("
Draw a card")); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private CrashingTide(final CrashingTide card) { diff --git a/Mage.Sets/src/mage/cards/c/Cremate.java b/Mage.Sets/src/mage/cards/c/Cremate.java index 607230ee849..eddb889545f 100644 --- a/Mage.Sets/src/mage/cards/c/Cremate.java +++ b/Mage.Sets/src/mage/cards/c/Cremate.java @@ -23,7 +23,7 @@ public final class Cremate extends CardImpl { this.getSpellAbility().addTarget(new TargetCardInGraveyard()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Cremate(final Cremate card) { diff --git a/Mage.Sets/src/mage/cards/c/CripplingChill.java b/Mage.Sets/src/mage/cards/c/CripplingChill.java index 2fa2eaf7b14..fdc6634080d 100644 --- a/Mage.Sets/src/mage/cards/c/CripplingChill.java +++ b/Mage.Sets/src/mage/cards/c/CripplingChill.java @@ -24,7 +24,7 @@ public final class CripplingChill extends CardImpl { this.getSpellAbility().addEffect(new TapTargetEffect()); this.getSpellAbility().addEffect(new DontUntapInControllersNextUntapStepTargetEffect("It")); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private CripplingChill(final CripplingChill card) { diff --git a/Mage.Sets/src/mage/cards/c/CunningStrike.java b/Mage.Sets/src/mage/cards/c/CunningStrike.java index d16a865a0eb..b2257032b94 100644 --- a/Mage.Sets/src/mage/cards/c/CunningStrike.java +++ b/Mage.Sets/src/mage/cards/c/CunningStrike.java @@ -31,7 +31,7 @@ public final class CunningStrike extends CardImpl { this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetPlayerOrPlaneswalker()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private CunningStrike(final CunningStrike card) { diff --git a/Mage.Sets/src/mage/cards/c/CurtainOfLight.java b/Mage.Sets/src/mage/cards/c/CurtainOfLight.java index 027eeae339d..16632d142da 100644 --- a/Mage.Sets/src/mage/cards/c/CurtainOfLight.java +++ b/Mage.Sets/src/mage/cards/c/CurtainOfLight.java @@ -42,7 +42,7 @@ public final class CurtainOfLight extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private CurtainOfLight(final CurtainOfLight card) { diff --git a/Mage.Sets/src/mage/cards/d/DefiantStrike.java b/Mage.Sets/src/mage/cards/d/DefiantStrike.java index 0877a6c0c7f..73f16be44d7 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantStrike.java +++ b/Mage.Sets/src/mage/cards/d/DefiantStrike.java @@ -26,9 +26,7 @@ public final class DefiantStrike extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - Effect effect = new DrawCardSourceControllerEffect(1); - effect.setText("

Draw a card"); - this.getSpellAbility().addEffect(effect); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private DefiantStrike(final DefiantStrike card) { diff --git a/Mage.Sets/src/mage/cards/d/DeposeDeploy.java b/Mage.Sets/src/mage/cards/d/DeposeDeploy.java index b7a040e204f..c7744900cd0 100644 --- a/Mage.Sets/src/mage/cards/d/DeposeDeploy.java +++ b/Mage.Sets/src/mage/cards/d/DeposeDeploy.java @@ -28,7 +28,7 @@ public final class DeposeDeploy extends SplitCard { // Draw a card. this.getLeftHalfCard().getSpellAbility().addEffect(new TapTargetEffect()); this.getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getLeftHalfCard().getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getLeftHalfCard().getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); // Deploy // Creature two 1/1 colorless Thopter artifact creature tokens with flying, then you gain 1 life for each creature you control. diff --git a/Mage.Sets/src/mage/cards/d/Disrupt.java b/Mage.Sets/src/mage/cards/d/Disrupt.java index cf3097f9abb..e1db7fe52d6 100644 --- a/Mage.Sets/src/mage/cards/d/Disrupt.java +++ b/Mage.Sets/src/mage/cards/d/Disrupt.java @@ -25,7 +25,7 @@ public final class Disrupt extends CardImpl { this.getSpellAbility().addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(new GenericManaCost(1))); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Disrupt(final Disrupt card) { diff --git a/Mage.Sets/src/mage/cards/d/DosansOldestChant.java b/Mage.Sets/src/mage/cards/d/DosansOldestChant.java index 8943d3ef871..72266bed980 100644 --- a/Mage.Sets/src/mage/cards/d/DosansOldestChant.java +++ b/Mage.Sets/src/mage/cards/d/DosansOldestChant.java @@ -20,7 +20,7 @@ public final class DosansOldestChant extends CardImpl { // You gain 6 life. this.getSpellAbility().addEffect(new GainLifeEffect(6)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private DosansOldestChant(final DosansOldestChant card) { diff --git a/Mage.Sets/src/mage/cards/d/DragUnder.java b/Mage.Sets/src/mage/cards/d/DragUnder.java index d1c924cef9a..5642dc624c1 100644 --- a/Mage.Sets/src/mage/cards/d/DragUnder.java +++ b/Mage.Sets/src/mage/cards/d/DragUnder.java @@ -22,7 +22,7 @@ public final class DragUnder extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private DragUnder(final DragUnder card) { diff --git a/Mage.Sets/src/mage/cards/d/Dredge.java b/Mage.Sets/src/mage/cards/d/Dredge.java index be17bae6489..a5b774bc9df 100644 --- a/Mage.Sets/src/mage/cards/d/Dredge.java +++ b/Mage.Sets/src/mage/cards/d/Dredge.java @@ -29,7 +29,7 @@ public final class Dredge extends CardImpl { this.getSpellAbility().addEffect(new SacrificeControllerEffect(filter, 1, "")); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Dredge(final Dredge card) { diff --git a/Mage.Sets/src/mage/cards/e/EmberShot.java b/Mage.Sets/src/mage/cards/e/EmberShot.java index 1d364180a7e..8692a95197c 100644 --- a/Mage.Sets/src/mage/cards/e/EmberShot.java +++ b/Mage.Sets/src/mage/cards/e/EmberShot.java @@ -22,7 +22,7 @@ public final class EmberShot extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private EmberShot(final EmberShot card) { diff --git a/Mage.Sets/src/mage/cards/e/EqualTreatment.java b/Mage.Sets/src/mage/cards/e/EqualTreatment.java index 9cac57fc954..61e32e1c4b1 100644 --- a/Mage.Sets/src/mage/cards/e/EqualTreatment.java +++ b/Mage.Sets/src/mage/cards/e/EqualTreatment.java @@ -26,7 +26,7 @@ public final class EqualTreatment extends CardImpl { this.getSpellAbility().addEffect(new EqualTreatmentEffect()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private EqualTreatment(final EqualTreatment card) { diff --git a/Mage.Sets/src/mage/cards/e/Execute.java b/Mage.Sets/src/mage/cards/e/Execute.java index 4f6db5eaffe..bf6d2c3b1f0 100644 --- a/Mage.Sets/src/mage/cards/e/Execute.java +++ b/Mage.Sets/src/mage/cards/e/Execute.java @@ -31,7 +31,7 @@ public final class Execute extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Execute(final Execute card) { diff --git a/Mage.Sets/src/mage/cards/e/Expedite.java b/Mage.Sets/src/mage/cards/e/Expedite.java index a62afd0a3e5..c828bd3e1ec 100644 --- a/Mage.Sets/src/mage/cards/e/Expedite.java +++ b/Mage.Sets/src/mage/cards/e/Expedite.java @@ -25,7 +25,7 @@ public final class Expedite extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Expedite(final Expedite card) { diff --git a/Mage.Sets/src/mage/cards/f/FestivalOfTheGuildpact.java b/Mage.Sets/src/mage/cards/f/FestivalOfTheGuildpact.java index 1e2d6674a49..858c5b4a678 100644 --- a/Mage.Sets/src/mage/cards/f/FestivalOfTheGuildpact.java +++ b/Mage.Sets/src/mage/cards/f/FestivalOfTheGuildpact.java @@ -23,7 +23,7 @@ public final class FestivalOfTheGuildpact extends CardImpl { this.getSpellAbility().addEffect(new PreventDamageToControllerEffect(Duration.EndOfTurn, false, true, ManacostVariableValue.REGULAR)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private FestivalOfTheGuildpact(final FestivalOfTheGuildpact card) { diff --git a/Mage.Sets/src/mage/cards/f/FireIce.java b/Mage.Sets/src/mage/cards/f/FireIce.java index fc01b99963d..afe9d77b15f 100644 --- a/Mage.Sets/src/mage/cards/f/FireIce.java +++ b/Mage.Sets/src/mage/cards/f/FireIce.java @@ -26,7 +26,7 @@ public final class FireIce extends SplitCard { // Draw a card. getRightHalfCard().getSpellAbility().addEffect(new TapTargetEffect()); getRightHalfCard().getSpellAbility().addTarget(new TargetPermanent()); - getRightHalfCard().getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + getRightHalfCard().getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } diff --git a/Mage.Sets/src/mage/cards/f/FlashFoliage.java b/Mage.Sets/src/mage/cards/f/FlashFoliage.java index 0d74626bf7e..484b4b45925 100644 --- a/Mage.Sets/src/mage/cards/f/FlashFoliage.java +++ b/Mage.Sets/src/mage/cards/f/FlashFoliage.java @@ -38,7 +38,7 @@ public final class FlashFoliage extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(new FilterCreatureAttackingYou())); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private FlashFoliage(final FlashFoliage card) { diff --git a/Mage.Sets/src/mage/cards/f/Flux.java b/Mage.Sets/src/mage/cards/f/Flux.java index fc8e92c271b..0cde92a8f55 100644 --- a/Mage.Sets/src/mage/cards/f/Flux.java +++ b/Mage.Sets/src/mage/cards/f/Flux.java @@ -25,7 +25,7 @@ public final class Flux extends CardImpl { this.getSpellAbility().addEffect(new FluxEffect()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Flux(final Flux card) { diff --git a/Mage.Sets/src/mage/cards/f/FranticSalvage.java b/Mage.Sets/src/mage/cards/f/FranticSalvage.java index 19a905fc1ce..dafb45c74b8 100644 --- a/Mage.Sets/src/mage/cards/f/FranticSalvage.java +++ b/Mage.Sets/src/mage/cards/f/FranticSalvage.java @@ -21,7 +21,7 @@ public final class FranticSalvage extends CardImpl { this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(0, Integer.MAX_VALUE, new FilterArtifactCard("artifact cards from your graveyard"))); } diff --git a/Mage.Sets/src/mage/cards/g/GaeasBlessing.java b/Mage.Sets/src/mage/cards/g/GaeasBlessing.java index c0037e3f258..ec9d7d9135f 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasBlessing.java +++ b/Mage.Sets/src/mage/cards/g/GaeasBlessing.java @@ -31,7 +31,7 @@ public final class GaeasBlessing extends CardImpl { this.getSpellAbility().addTarget(new TargetCardInTargetPlayersGraveyard(3)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); // When Gaea's Blessing is put into your graveyard from your library, shuffle your graveyard into your library. this.addAbility(new GaeasBlessingTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/g/Galestrike.java b/Mage.Sets/src/mage/cards/g/Galestrike.java index 5f13ac29061..d148c224a39 100644 --- a/Mage.Sets/src/mage/cards/g/Galestrike.java +++ b/Mage.Sets/src/mage/cards/g/Galestrike.java @@ -31,7 +31,7 @@ public final class Galestrike extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } diff --git a/Mage.Sets/src/mage/cards/g/Gallantry.java b/Mage.Sets/src/mage/cards/g/Gallantry.java index 0e539b48682..c70f8ccc2b6 100644 --- a/Mage.Sets/src/mage/cards/g/Gallantry.java +++ b/Mage.Sets/src/mage/cards/g/Gallantry.java @@ -28,7 +28,7 @@ public final class Gallantry extends CardImpl { this.getSpellAbility().addEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Gallantry(final Gallantry card) { diff --git a/Mage.Sets/src/mage/cards/g/GitaxianProbe.java b/Mage.Sets/src/mage/cards/g/GitaxianProbe.java index 77e899f3eda..62e074a1bf2 100644 --- a/Mage.Sets/src/mage/cards/g/GitaxianProbe.java +++ b/Mage.Sets/src/mage/cards/g/GitaxianProbe.java @@ -22,7 +22,7 @@ public final class GitaxianProbe extends CardImpl { this.getSpellAbility().addEffect(new LookAtTargetPlayerHandEffect()); this.getSpellAbility().addTarget(new TargetPlayer()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } diff --git a/Mage.Sets/src/mage/cards/g/GraveBirthing.java b/Mage.Sets/src/mage/cards/g/GraveBirthing.java index 1b0c16dcb33..a1686b8e114 100644 --- a/Mage.Sets/src/mage/cards/g/GraveBirthing.java +++ b/Mage.Sets/src/mage/cards/g/GraveBirthing.java @@ -39,7 +39,7 @@ public final class GraveBirthing extends CardImpl { Effect effect = new CreateTokenEffect(new EldraziScionToken()); effect.setText("You create a 1/1 colorless Eldrazi Scion creature token. It has \"Sacrifice this creature: Add {C}.\"
"); this.getSpellAbility().addEffect(effect); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private GraveBirthing(final GraveBirthing card) { diff --git a/Mage.Sets/src/mage/cards/g/Gravepurge.java b/Mage.Sets/src/mage/cards/g/Gravepurge.java index 78684394a82..6298a3aa28e 100644 --- a/Mage.Sets/src/mage/cards/g/Gravepurge.java +++ b/Mage.Sets/src/mage/cards/g/Gravepurge.java @@ -22,7 +22,7 @@ public final class Gravepurge extends CardImpl { this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(0, Integer.MAX_VALUE, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Gravepurge(final Gravepurge card) { diff --git a/Mage.Sets/src/mage/cards/g/GripOfAmnesia.java b/Mage.Sets/src/mage/cards/g/GripOfAmnesia.java index d89a6ce0f90..17ccfefacb8 100644 --- a/Mage.Sets/src/mage/cards/g/GripOfAmnesia.java +++ b/Mage.Sets/src/mage/cards/g/GripOfAmnesia.java @@ -27,7 +27,7 @@ public final class GripOfAmnesia extends CardImpl { // Counter target spell unless its controller exiles all cards from their graveyard. // Draw a card. this.getSpellAbility().addEffect(new GripOfAmnesiaEffect()); - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); this.getSpellAbility().addTarget(new TargetSpell()); } diff --git a/Mage.Sets/src/mage/cards/g/GripOfTheRoil.java b/Mage.Sets/src/mage/cards/g/GripOfTheRoil.java index af79510bf40..6a66c4e8885 100644 --- a/Mage.Sets/src/mage/cards/g/GripOfTheRoil.java +++ b/Mage.Sets/src/mage/cards/g/GripOfTheRoil.java @@ -26,7 +26,7 @@ public final class GripOfTheRoil extends CardImpl { this.getSpellAbility().addEffect(new DontUntapInControllersNextUntapStepTargetEffect()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); // Surge {1}{U} addAbility(new SurgeAbility(this, "{1}{U}")); diff --git a/Mage.Sets/src/mage/cards/g/GuidedStrike.java b/Mage.Sets/src/mage/cards/g/GuidedStrike.java index 85c0862b45a..db4066eebe7 100644 --- a/Mage.Sets/src/mage/cards/g/GuidedStrike.java +++ b/Mage.Sets/src/mage/cards/g/GuidedStrike.java @@ -32,7 +32,7 @@ public final class GuidedStrike extends CardImpl { this.getSpellAbility().addEffect(effect); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } diff --git a/Mage.Sets/src/mage/cards/h/HallowedMoonlight.java b/Mage.Sets/src/mage/cards/h/HallowedMoonlight.java index ad43eb282ba..0f44ff0d00e 100644 --- a/Mage.Sets/src/mage/cards/h/HallowedMoonlight.java +++ b/Mage.Sets/src/mage/cards/h/HallowedMoonlight.java @@ -31,7 +31,7 @@ public final class HallowedMoonlight extends CardImpl { this.getSpellAbility().addEffect(new HallowedMoonlightEffect()); this.getSpellAbility().addWatcher(new PermanentWasCastWatcher()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private HallowedMoonlight(final HallowedMoonlight card) { diff --git a/Mage.Sets/src/mage/cards/h/HaltOrder.java b/Mage.Sets/src/mage/cards/h/HaltOrder.java index 0dfc5aa8aeb..5e96f53ac2b 100644 --- a/Mage.Sets/src/mage/cards/h/HaltOrder.java +++ b/Mage.Sets/src/mage/cards/h/HaltOrder.java @@ -21,7 +21,7 @@ public final class HaltOrder extends CardImpl { // Counter target artifact spell. Draw a card. this.getSpellAbility().addTarget(new TargetSpell(new FilterArtifactSpell())); this.getSpellAbility().addEffect(new CounterTargetEffect()); - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } public HaltOrder (final HaltOrder card) { diff --git a/Mage.Sets/src/mage/cards/h/HealingHands.java b/Mage.Sets/src/mage/cards/h/HealingHands.java index 5ce7db432d9..86ab6ac2e20 100644 --- a/Mage.Sets/src/mage/cards/h/HealingHands.java +++ b/Mage.Sets/src/mage/cards/h/HealingHands.java @@ -22,7 +22,7 @@ public final class HealingHands extends CardImpl { this.getSpellAbility().addEffect(new GainLifeTargetEffect(4)); this.getSpellAbility().addTarget(new TargetPlayer()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private HealingHands(final HealingHands card) { diff --git a/Mage.Sets/src/mage/cards/i/IllusionOfChoice.java b/Mage.Sets/src/mage/cards/i/IllusionOfChoice.java index 3c382b0bf98..7a819d78a61 100644 --- a/Mage.Sets/src/mage/cards/i/IllusionOfChoice.java +++ b/Mage.Sets/src/mage/cards/i/IllusionOfChoice.java @@ -25,7 +25,7 @@ public final class IllusionOfChoice extends CardImpl { this.getSpellAbility().addEffect(new IllusionOfChoiceReplacementEffect()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private IllusionOfChoice(final IllusionOfChoice card) { diff --git a/Mage.Sets/src/mage/cards/i/Implode.java b/Mage.Sets/src/mage/cards/i/Implode.java index a589950cd41..da702e55cb3 100644 --- a/Mage.Sets/src/mage/cards/i/Implode.java +++ b/Mage.Sets/src/mage/cards/i/Implode.java @@ -23,7 +23,7 @@ public final class Implode extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetLandPermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Implode(final Implode card) { diff --git a/Mage.Sets/src/mage/cards/i/InactionInjunction.java b/Mage.Sets/src/mage/cards/i/InactionInjunction.java index a3cbab7feff..11703b984be 100644 --- a/Mage.Sets/src/mage/cards/i/InactionInjunction.java +++ b/Mage.Sets/src/mage/cards/i/InactionInjunction.java @@ -26,7 +26,7 @@ public final class InactionInjunction extends CardImpl { this.getSpellAbility().addTarget(target); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private InactionInjunction(final InactionInjunction card) { diff --git a/Mage.Sets/src/mage/cards/i/Insist.java b/Mage.Sets/src/mage/cards/i/Insist.java index 4be52a9113d..69b44d42160 100644 --- a/Mage.Sets/src/mage/cards/i/Insist.java +++ b/Mage.Sets/src/mage/cards/i/Insist.java @@ -31,9 +31,7 @@ public final class Insist extends CardImpl { this.getSpellAbility().addWatcher(new InsistWatcher()); // Draw a card. - Effect effect = new DrawCardSourceControllerEffect(1); - effect.setText("

Draw a card"); - this.getSpellAbility().addEffect(effect); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Insist(final Insist card) { diff --git a/Mage.Sets/src/mage/cards/i/InstillInfection.java b/Mage.Sets/src/mage/cards/i/InstillInfection.java index 149acaf34fe..e2b396e83f5 100644 --- a/Mage.Sets/src/mage/cards/i/InstillInfection.java +++ b/Mage.Sets/src/mage/cards/i/InstillInfection.java @@ -21,7 +21,7 @@ public final class InstillInfection extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{B}"); this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.M1M1.createInstance())); - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/cards/i/Interdict.java b/Mage.Sets/src/mage/cards/i/Interdict.java index 1b50fd75953..754a5ead1f6 100644 --- a/Mage.Sets/src/mage/cards/i/Interdict.java +++ b/Mage.Sets/src/mage/cards/i/Interdict.java @@ -41,7 +41,7 @@ public final class Interdict extends CardImpl { this.getSpellAbility().addTarget(new TargetActivatedAbility(filter)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).setText("

Draw a card")); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Interdict(final Interdict card) { diff --git a/Mage.Sets/src/mage/cards/l/LaquatussDisdain.java b/Mage.Sets/src/mage/cards/l/LaquatussDisdain.java index 3bee4d856b8..e59e25ef2fb 100644 --- a/Mage.Sets/src/mage/cards/l/LaquatussDisdain.java +++ b/Mage.Sets/src/mage/cards/l/LaquatussDisdain.java @@ -35,7 +35,7 @@ public final class LaquatussDisdain extends CardImpl { this.getSpellAbility().addTarget(new TargetSpell(filter)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private LaquatussDisdain(final LaquatussDisdain card) { diff --git a/Mage.Sets/src/mage/cards/l/LastCaress.java b/Mage.Sets/src/mage/cards/l/LastCaress.java index b2a881b36c8..dcf27f3e06b 100644 --- a/Mage.Sets/src/mage/cards/l/LastCaress.java +++ b/Mage.Sets/src/mage/cards/l/LastCaress.java @@ -22,7 +22,7 @@ public final class LastCaress extends CardImpl { this.getSpellAbility().addEffect(new LoseLifeTargetEffect(1)); this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new GainLifeEffect(1).setText("and you gain 1 life")); - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).setText("

Draw a card")); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private LastCaress(final LastCaress card) { diff --git a/Mage.Sets/src/mage/cards/l/LeadershipVacuum.java b/Mage.Sets/src/mage/cards/l/LeadershipVacuum.java index 98d1ab4538e..b148180075a 100644 --- a/Mage.Sets/src/mage/cards/l/LeadershipVacuum.java +++ b/Mage.Sets/src/mage/cards/l/LeadershipVacuum.java @@ -29,7 +29,7 @@ public final class LeadershipVacuum extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private LeadershipVacuum(final LeadershipVacuum card) { diff --git a/Mage.Sets/src/mage/cards/l/Leap.java b/Mage.Sets/src/mage/cards/l/Leap.java index fa62c6ec8e3..fb75608e312 100644 --- a/Mage.Sets/src/mage/cards/l/Leap.java +++ b/Mage.Sets/src/mage/cards/l/Leap.java @@ -24,7 +24,7 @@ public final class Leap extends CardImpl { this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Leap(final Leap card) { diff --git a/Mage.Sets/src/mage/cards/l/LearnFromThePast.java b/Mage.Sets/src/mage/cards/l/LearnFromThePast.java index 3ebdd667d4d..3e0b7944713 100644 --- a/Mage.Sets/src/mage/cards/l/LearnFromThePast.java +++ b/Mage.Sets/src/mage/cards/l/LearnFromThePast.java @@ -29,7 +29,7 @@ public final class LearnFromThePast extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); // Draw a card - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private LearnFromThePast(final LearnFromThePast card) { diff --git a/Mage.Sets/src/mage/cards/m/MentalNote.java b/Mage.Sets/src/mage/cards/m/MentalNote.java index 11c009ffdbd..5250eae4578 100644 --- a/Mage.Sets/src/mage/cards/m/MentalNote.java +++ b/Mage.Sets/src/mage/cards/m/MentalNote.java @@ -21,7 +21,7 @@ public final class MentalNote extends CardImpl { // Put the top two cards of your library into your graveyard. this.getSpellAbility().addEffect(new MillCardsControllerEffect(2)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private MentalNote(final MentalNote card) { diff --git a/Mage.Sets/src/mage/cards/m/MizziumSkin.java b/Mage.Sets/src/mage/cards/m/MizziumSkin.java index 0820739d3b1..4e64224f007 100644 --- a/Mage.Sets/src/mage/cards/m/MizziumSkin.java +++ b/Mage.Sets/src/mage/cards/m/MizziumSkin.java @@ -24,15 +24,14 @@ import mage.target.common.TargetCreaturePermanent; public final class MizziumSkin extends CardImpl { - public MizziumSkin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{U}"); // Target creature you control gets +0/+1 and gains hexproof until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED)); - this.getSpellAbility().addEffect(new BoostTargetEffect(0,1, Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HexproofAbility.getInstance(), Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(0,1, Duration.EndOfTurn).setText("target creature you control gets +0/+1")); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HexproofAbility.getInstance(), Duration.EndOfTurn).setText("and gains hexproof until end of turn")); // Overload {1}{U} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.") OverloadAbility ability = new OverloadAbility(this, new BoostAllEffect(0,1, Duration.EndOfTurn,StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED,false), new ManaCostsImpl<>("{1}{U}")); diff --git a/Mage.Sets/src/mage/cards/o/Overmaster.java b/Mage.Sets/src/mage/cards/o/Overmaster.java index e25de75cc66..516e401e4d8 100644 --- a/Mage.Sets/src/mage/cards/o/Overmaster.java +++ b/Mage.Sets/src/mage/cards/o/Overmaster.java @@ -33,9 +33,7 @@ public final class Overmaster extends CardImpl { this.getSpellAbility().addWatcher(new OvermasterWatcher()); // Draw a card. - Effect effect = new DrawCardSourceControllerEffect(1); - effect.setText("

Draw a card"); - this.getSpellAbility().addEffect(effect); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Overmaster(final Overmaster card) { diff --git a/Mage.Sets/src/mage/cards/p/Peek.java b/Mage.Sets/src/mage/cards/p/Peek.java index b89ebf2205d..3f2839f12f9 100644 --- a/Mage.Sets/src/mage/cards/p/Peek.java +++ b/Mage.Sets/src/mage/cards/p/Peek.java @@ -23,7 +23,7 @@ public final class Peek extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Peek(final Peek card) { diff --git a/Mage.Sets/src/mage/cards/p/PhantasmalForm.java b/Mage.Sets/src/mage/cards/p/PhantasmalForm.java index 06af83705d7..bb96d8e1c4b 100644 --- a/Mage.Sets/src/mage/cards/p/PhantasmalForm.java +++ b/Mage.Sets/src/mage/cards/p/PhantasmalForm.java @@ -31,9 +31,7 @@ public final class PhantasmalForm extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2)); // Draw a card. - this.getSpellAbility().addEffect( - new DrawCardSourceControllerEffect(1).setText("
Draw a card.") - ); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private PhantasmalForm(final PhantasmalForm card) { diff --git a/Mage.Sets/src/mage/cards/p/Provoke.java b/Mage.Sets/src/mage/cards/p/Provoke.java index 351d4037b19..324c8b8475e 100644 --- a/Mage.Sets/src/mage/cards/p/Provoke.java +++ b/Mage.Sets/src/mage/cards/p/Provoke.java @@ -29,7 +29,7 @@ public final class Provoke extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_YOU_DONT_CONTROL)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Provoke(final Provoke card) { diff --git a/Mage.Sets/src/mage/cards/p/PsychicTrance.java b/Mage.Sets/src/mage/cards/p/PsychicTrance.java index 0b0aae48ba5..5dc9eb1193b 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicTrance.java +++ b/Mage.Sets/src/mage/cards/p/PsychicTrance.java @@ -36,7 +36,7 @@ public final class PsychicTrance extends CardImpl { Ability abilityToAdd = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new TapSourceCost()); abilityToAdd.addTarget(new TargetSpell()); Effect effect = new GainAbilityControlledEffect(abilityToAdd, Duration.EndOfTurn, filter); - effect.setText("until end of turn, Wizards you control gain \"{tap}: Counter target spell\""); + effect.setText("until end of turn, Wizards you control gain \"{T}: Counter target spell.\""); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/p/PsychoticFury.java b/Mage.Sets/src/mage/cards/p/PsychoticFury.java index 8b7d56c0f10..3e051377a96 100644 --- a/Mage.Sets/src/mage/cards/p/PsychoticFury.java +++ b/Mage.Sets/src/mage/cards/p/PsychoticFury.java @@ -33,7 +33,7 @@ public final class PsychoticFury extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private PsychoticFury(final PsychoticFury card) { diff --git a/Mage.Sets/src/mage/cards/q/Quickchange.java b/Mage.Sets/src/mage/cards/q/Quickchange.java index 29cc741e7ad..1648c4ce6a1 100644 --- a/Mage.Sets/src/mage/cards/q/Quickchange.java +++ b/Mage.Sets/src/mage/cards/q/Quickchange.java @@ -24,7 +24,7 @@ public final class Quickchange extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Quickchange(final Quickchange card) { diff --git a/Mage.Sets/src/mage/cards/q/Quicken.java b/Mage.Sets/src/mage/cards/q/Quicken.java index 030d8113768..1065bc46d4b 100644 --- a/Mage.Sets/src/mage/cards/q/Quicken.java +++ b/Mage.Sets/src/mage/cards/q/Quicken.java @@ -33,7 +33,7 @@ public final class Quicken extends CardImpl { this.getSpellAbility().addWatcher(new QuickenWatcher()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Quicken(final Quicken card) { diff --git a/Mage.Sets/src/mage/cards/r/RealityAnchor.java b/Mage.Sets/src/mage/cards/r/RealityAnchor.java index d26744c4f04..238676d4909 100644 --- a/Mage.Sets/src/mage/cards/r/RealityAnchor.java +++ b/Mage.Sets/src/mage/cards/r/RealityAnchor.java @@ -25,7 +25,7 @@ public final class RealityAnchor extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private RealityAnchor(final RealityAnchor card) { diff --git a/Mage.Sets/src/mage/cards/r/Refocus.java b/Mage.Sets/src/mage/cards/r/Refocus.java index 9d3461fb6b9..b3b57e4b700 100644 --- a/Mage.Sets/src/mage/cards/r/Refocus.java +++ b/Mage.Sets/src/mage/cards/r/Refocus.java @@ -22,7 +22,7 @@ public final class Refocus extends CardImpl { this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Refocus(final Refocus card) { diff --git a/Mage.Sets/src/mage/cards/r/Refresh.java b/Mage.Sets/src/mage/cards/r/Refresh.java index e695b75a4e7..ad1c261ff21 100644 --- a/Mage.Sets/src/mage/cards/r/Refresh.java +++ b/Mage.Sets/src/mage/cards/r/Refresh.java @@ -23,7 +23,7 @@ public final class Refresh extends CardImpl { this.getSpellAbility().addEffect(new RegenerateTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Refresh(final Refresh card) { diff --git a/Mage.Sets/src/mage/cards/r/Reroute.java b/Mage.Sets/src/mage/cards/r/Reroute.java index 64d76719cb9..9bfcefb1f1f 100644 --- a/Mage.Sets/src/mage/cards/r/Reroute.java +++ b/Mage.Sets/src/mage/cards/r/Reroute.java @@ -31,7 +31,7 @@ public final class Reroute extends CardImpl { this.getSpellAbility().addTarget(new TargetActivatedAbility(filter)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Reroute(final Reroute card) { diff --git a/Mage.Sets/src/mage/cards/r/Restrain.java b/Mage.Sets/src/mage/cards/r/Restrain.java index f8997c26073..f2f0bec3862 100644 --- a/Mage.Sets/src/mage/cards/r/Restrain.java +++ b/Mage.Sets/src/mage/cards/r/Restrain.java @@ -26,7 +26,7 @@ public final class Restrain extends CardImpl { this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetAttackingCreature()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Restrain(final Restrain card) { diff --git a/Mage.Sets/src/mage/cards/r/Resupply.java b/Mage.Sets/src/mage/cards/r/Resupply.java index 40d4121fc5b..bb470071e67 100644 --- a/Mage.Sets/src/mage/cards/r/Resupply.java +++ b/Mage.Sets/src/mage/cards/r/Resupply.java @@ -21,7 +21,7 @@ public final class Resupply extends CardImpl { this.getSpellAbility().addEffect(new GainLifeEffect(6)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Resupply(final Resupply card) { diff --git a/Mage.Sets/src/mage/cards/r/RevivingDose.java b/Mage.Sets/src/mage/cards/r/RevivingDose.java index 183945c7576..234007a3802 100644 --- a/Mage.Sets/src/mage/cards/r/RevivingDose.java +++ b/Mage.Sets/src/mage/cards/r/RevivingDose.java @@ -18,7 +18,7 @@ public final class RevivingDose extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{W}"); this.getSpellAbility().addEffect(new GainLifeEffect(3)); - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private RevivingDose(final RevivingDose card) { diff --git a/Mage.Sets/src/mage/cards/r/Rile.java b/Mage.Sets/src/mage/cards/r/Rile.java index 939b37c34b1..4ef84d602ed 100644 --- a/Mage.Sets/src/mage/cards/r/Rile.java +++ b/Mage.Sets/src/mage/cards/r/Rile.java @@ -27,7 +27,7 @@ public final class Rile extends CardImpl { .setText("That creature gains trample until end of turn")); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).setText("

Draw a card")); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Rile(final Rile card) { diff --git a/Mage.Sets/src/mage/cards/r/RitualOfRejuvenation.java b/Mage.Sets/src/mage/cards/r/RitualOfRejuvenation.java index bf41a1c2345..e2925ca3680 100644 --- a/Mage.Sets/src/mage/cards/r/RitualOfRejuvenation.java +++ b/Mage.Sets/src/mage/cards/r/RitualOfRejuvenation.java @@ -20,7 +20,7 @@ public final class RitualOfRejuvenation extends CardImpl { // You gain 4 life. this.getSpellAbility().addEffect(new GainLifeEffect(4)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private RitualOfRejuvenation(final RitualOfRejuvenation card) { diff --git a/Mage.Sets/src/mage/cards/r/Runeboggle.java b/Mage.Sets/src/mage/cards/r/Runeboggle.java index 67721be64ec..d8c20b70c1b 100644 --- a/Mage.Sets/src/mage/cards/r/Runeboggle.java +++ b/Mage.Sets/src/mage/cards/r/Runeboggle.java @@ -21,7 +21,7 @@ public final class Runeboggle extends CardImpl { this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(new GenericManaCost(1))); this.getSpellAbility().addTarget(new TargetSpell()); - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Runeboggle(final Runeboggle card) { diff --git a/Mage.Sets/src/mage/cards/s/ScatterArc.java b/Mage.Sets/src/mage/cards/s/ScatterArc.java index dfe0807614d..8ed3cf4f150 100644 --- a/Mage.Sets/src/mage/cards/s/ScatterArc.java +++ b/Mage.Sets/src/mage/cards/s/ScatterArc.java @@ -24,7 +24,7 @@ public final class ScatterArc extends CardImpl { this.getSpellAbility().addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_NON_CREATURE)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private ScatterArc(final ScatterArc card) { diff --git a/Mage.Sets/src/mage/cards/s/SecondThoughts.java b/Mage.Sets/src/mage/cards/s/SecondThoughts.java index 426082c3aff..5f5675cff7d 100644 --- a/Mage.Sets/src/mage/cards/s/SecondThoughts.java +++ b/Mage.Sets/src/mage/cards/s/SecondThoughts.java @@ -23,7 +23,7 @@ public final class SecondThoughts extends CardImpl { this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new TargetAttackingCreature()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private SecondThoughts(final SecondThoughts card) { diff --git a/Mage.Sets/src/mage/cards/s/ShadowRift.java b/Mage.Sets/src/mage/cards/s/ShadowRift.java index a1ae38a8852..ab7ee7b092e 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowRift.java +++ b/Mage.Sets/src/mage/cards/s/ShadowRift.java @@ -26,7 +26,7 @@ public final class ShadowRift extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private ShadowRift(final ShadowRift card) { diff --git a/Mage.Sets/src/mage/cards/s/ShakeTheFoundations.java b/Mage.Sets/src/mage/cards/s/ShakeTheFoundations.java index ad2c3d046eb..3006d4be21b 100644 --- a/Mage.Sets/src/mage/cards/s/ShakeTheFoundations.java +++ b/Mage.Sets/src/mage/cards/s/ShakeTheFoundations.java @@ -31,7 +31,7 @@ public final class ShakeTheFoundations extends CardImpl { this.getSpellAbility().addEffect(new DamageAllEffect(1, filter)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private ShakeTheFoundations(final ShakeTheFoundations card) { diff --git a/Mage.Sets/src/mage/cards/s/ShimmeringMirage.java b/Mage.Sets/src/mage/cards/s/ShimmeringMirage.java index 1a6ce9e5b41..c45e496793e 100644 --- a/Mage.Sets/src/mage/cards/s/ShimmeringMirage.java +++ b/Mage.Sets/src/mage/cards/s/ShimmeringMirage.java @@ -23,7 +23,7 @@ public final class ShimmeringMirage extends CardImpl { this.getSpellAbility().addEffect(new BecomesBasicLandTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetLandPermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).setText("

Draw a card")); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private ShimmeringMirage(final ShimmeringMirage card) { diff --git a/Mage.Sets/src/mage/cards/s/ShoulderToShoulder.java b/Mage.Sets/src/mage/cards/s/ShoulderToShoulder.java index 4436af67e89..6d073e9225b 100644 --- a/Mage.Sets/src/mage/cards/s/ShoulderToShoulder.java +++ b/Mage.Sets/src/mage/cards/s/ShoulderToShoulder.java @@ -21,7 +21,7 @@ public final class ShoulderToShoulder extends CardImpl { getSpellAbility().addEffect(new SupportEffect(this, 2, false)); // Draw a card. - getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private ShoulderToShoulder(final ShoulderToShoulder card) { diff --git a/Mage.Sets/src/mage/cards/s/Shuriken.java b/Mage.Sets/src/mage/cards/s/Shuriken.java index a0c89be43ff..10d99277dfd 100644 --- a/Mage.Sets/src/mage/cards/s/Shuriken.java +++ b/Mage.Sets/src/mage/cards/s/Shuriken.java @@ -35,7 +35,7 @@ public final class Shuriken extends CardImpl { // Equipped creature has "{tap}, Unattach Shuriken: Shuriken deals 2 damage to target creature. That creature's controller gains control of Shuriken unless it was unattached from a Ninja." this.addAbility(new SimpleStaticAbility(new GainAbilityWithAttachmentEffect( - "equipped creature has \"{tap}, Unattach {this}: {this} deals 2 damage to target creature. " + + "equipped creature has \"{T}, Unattach {this}: {this} deals 2 damage to target creature. " + "That creature's controller gains control of {this} unless it was unattached from a Ninja.\"", new ShurikenEffect(), new TargetCreaturePermanent(), new UnattachCost(), new TapSourceCost() ))); diff --git a/Mage.Sets/src/mage/cards/s/SinstrikersWill.java b/Mage.Sets/src/mage/cards/s/SinstrikersWill.java index 3d017d8d834..d6f4c29d7e4 100644 --- a/Mage.Sets/src/mage/cards/s/SinstrikersWill.java +++ b/Mage.Sets/src/mage/cards/s/SinstrikersWill.java @@ -51,7 +51,7 @@ public final class SinstrikersWill extends CardImpl { AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has " - + "\"{tap}: This creature deals damage " + + "\"{T}: This creature deals damage " + "equal to its power to target " + "attacking or blocking creature.\"" ) diff --git a/Mage.Sets/src/mage/cards/s/SkyshroudBlessing.java b/Mage.Sets/src/mage/cards/s/SkyshroudBlessing.java index 3828cd21c6d..6c40d14c742 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshroudBlessing.java +++ b/Mage.Sets/src/mage/cards/s/SkyshroudBlessing.java @@ -24,7 +24,7 @@ public final class SkyshroudBlessing extends CardImpl { this.getSpellAbility().addEffect(new GainAbilityAllEffect(ShroudAbility.getInstance(), Duration.EndOfTurn, new FilterLandPermanent("all lands"))); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private SkyshroudBlessing(final SkyshroudBlessing card) { diff --git a/Mage.Sets/src/mage/cards/s/Slay.java b/Mage.Sets/src/mage/cards/s/Slay.java index dcb8b57f3a8..f76c49fe73a 100644 --- a/Mage.Sets/src/mage/cards/s/Slay.java +++ b/Mage.Sets/src/mage/cards/s/Slay.java @@ -31,7 +31,7 @@ public final class Slay extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Slay(final Slay card) { diff --git a/Mage.Sets/src/mage/cards/s/SliceInTwain.java b/Mage.Sets/src/mage/cards/s/SliceInTwain.java index c032c7b4a33..b2f10ce435b 100644 --- a/Mage.Sets/src/mage/cards/s/SliceInTwain.java +++ b/Mage.Sets/src/mage/cards/s/SliceInTwain.java @@ -20,7 +20,7 @@ public final class SliceInTwain extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{G}{G}"); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).setText("

Draw a card")); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); this.getSpellAbility().addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); } diff --git a/Mage.Sets/src/mage/cards/s/SlipThroughSpace.java b/Mage.Sets/src/mage/cards/s/SlipThroughSpace.java index 4ced770d638..97667e7f612 100644 --- a/Mage.Sets/src/mage/cards/s/SlipThroughSpace.java +++ b/Mage.Sets/src/mage/cards/s/SlipThroughSpace.java @@ -27,7 +27,7 @@ public final class SlipThroughSpace extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private SlipThroughSpace(final SlipThroughSpace card) { diff --git a/Mage.Sets/src/mage/cards/s/Smash.java b/Mage.Sets/src/mage/cards/s/Smash.java index 5aa598bc3d8..6e5e28ff834 100644 --- a/Mage.Sets/src/mage/cards/s/Smash.java +++ b/Mage.Sets/src/mage/cards/s/Smash.java @@ -21,7 +21,7 @@ public final class Smash extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetArtifactPermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Smash(final Smash card) { diff --git a/Mage.Sets/src/mage/cards/s/Snakeform.java b/Mage.Sets/src/mage/cards/s/Snakeform.java index a703893469b..8fc7b847224 100644 --- a/Mage.Sets/src/mage/cards/s/Snakeform.java +++ b/Mage.Sets/src/mage/cards/s/Snakeform.java @@ -30,9 +30,7 @@ public final class Snakeform extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - effect = new DrawCardSourceControllerEffect(1); - effect.setText("
Draw a card."); - this.getSpellAbility().addEffect(effect); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } diff --git a/Mage.Sets/src/mage/cards/s/Spiritualize.java b/Mage.Sets/src/mage/cards/s/Spiritualize.java index f6872446375..70e38d06c3d 100644 --- a/Mage.Sets/src/mage/cards/s/Spiritualize.java +++ b/Mage.Sets/src/mage/cards/s/Spiritualize.java @@ -32,7 +32,7 @@ public final class Spiritualize extends CardImpl { this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new SpiritualizeTriggeredAbility())); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Spiritualize(final Spiritualize card) { diff --git a/Mage.Sets/src/mage/cards/s/Squelch.java b/Mage.Sets/src/mage/cards/s/Squelch.java index f3ec94c2d77..cbad11ef349 100644 --- a/Mage.Sets/src/mage/cards/s/Squelch.java +++ b/Mage.Sets/src/mage/cards/s/Squelch.java @@ -23,7 +23,7 @@ public final class Squelch extends CardImpl { this.getSpellAbility().addEffect(new CounterTargetEffect()); this.getSpellAbility().addTarget(new TargetActivatedAbility()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Squelch(final Squelch card) { diff --git a/Mage.Sets/src/mage/cards/s/SteadyProgress.java b/Mage.Sets/src/mage/cards/s/SteadyProgress.java index 427d4a17198..6e17b9b26b6 100644 --- a/Mage.Sets/src/mage/cards/s/SteadyProgress.java +++ b/Mage.Sets/src/mage/cards/s/SteadyProgress.java @@ -23,9 +23,7 @@ public final class SteadyProgress extends CardImpl { this.getSpellAbility().addEffect(new ProliferateEffect()); // Draw a card. - Effect effect = new DrawCardSourceControllerEffect(1); - effect.setText("
Draw a card"); - this.getSpellAbility().addEffect(effect); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } public SteadyProgress (final SteadyProgress card) { diff --git a/Mage.Sets/src/mage/cards/s/StensiaBanquet.java b/Mage.Sets/src/mage/cards/s/StensiaBanquet.java index d79c621839b..85de9d43797 100644 --- a/Mage.Sets/src/mage/cards/s/StensiaBanquet.java +++ b/Mage.Sets/src/mage/cards/s/StensiaBanquet.java @@ -35,7 +35,7 @@ public final class StensiaBanquet extends CardImpl { this.getSpellAbility().addTarget(new TargetOpponentOrPlaneswalker()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private StensiaBanquet(final StensiaBanquet card) { diff --git a/Mage.Sets/src/mage/cards/s/Stun.java b/Mage.Sets/src/mage/cards/s/Stun.java index f3ceadb4dde..1501c425643 100644 --- a/Mage.Sets/src/mage/cards/s/Stun.java +++ b/Mage.Sets/src/mage/cards/s/Stun.java @@ -24,7 +24,7 @@ public final class Stun extends CardImpl { this.getSpellAbility().addEffect(new CantBlockTargetEffect(Duration.EndOfTurn)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Stun(final Stun card) { diff --git a/Mage.Sets/src/mage/cards/s/SuddenStrength.java b/Mage.Sets/src/mage/cards/s/SuddenStrength.java index 5df7badf4c7..95868ad7d7f 100644 --- a/Mage.Sets/src/mage/cards/s/SuddenStrength.java +++ b/Mage.Sets/src/mage/cards/s/SuddenStrength.java @@ -24,7 +24,7 @@ public final class SuddenStrength extends CardImpl { this.getSpellAbility().addEffect(new BoostTargetEffect(3,3,Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private SuddenStrength(final SuddenStrength card) { diff --git a/Mage.Sets/src/mage/cards/s/SwayOfIllusion.java b/Mage.Sets/src/mage/cards/s/SwayOfIllusion.java index 394e6681fb5..e312df45a2f 100644 --- a/Mage.Sets/src/mage/cards/s/SwayOfIllusion.java +++ b/Mage.Sets/src/mage/cards/s/SwayOfIllusion.java @@ -28,7 +28,7 @@ public final class SwayOfIllusion extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, Integer.MAX_VALUE, StaticFilters.FILTER_PERMANENT_CREATURE, false)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private SwayOfIllusion(final SwayOfIllusion card) { diff --git a/Mage.Sets/src/mage/cards/t/TelJiladDefiance.java b/Mage.Sets/src/mage/cards/t/TelJiladDefiance.java index 19725c81a96..32ea9637bbc 100644 --- a/Mage.Sets/src/mage/cards/t/TelJiladDefiance.java +++ b/Mage.Sets/src/mage/cards/t/TelJiladDefiance.java @@ -22,7 +22,7 @@ public final class TelJiladDefiance extends CardImpl { this.getSpellAbility().addEffect(new GainProtectionFromTypeTargetEffect(Duration.EndOfTurn, new FilterArtifactCard("artifacts"))); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private TelJiladDefiance(final TelJiladDefiance card) { diff --git a/Mage.Sets/src/mage/cards/t/Teleportal.java b/Mage.Sets/src/mage/cards/t/Teleportal.java index 201f6c010fb..13ea64aef22 100644 --- a/Mage.Sets/src/mage/cards/t/Teleportal.java +++ b/Mage.Sets/src/mage/cards/t/Teleportal.java @@ -38,7 +38,7 @@ public final class Teleportal extends CardImpl { // Target creature you control gets +1/+0 until end of turn and can't be blocked this turn. this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(1, 0, Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new CantBeBlockedTargetEffect()); + this.getSpellAbility().addEffect(new CantBeBlockedTargetEffect().setText("and can't be blocked this turn")); // Overload {3}{U}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.") OverloadAbility ability = new OverloadAbility(this, new BoostAllEffect(1, 0, Duration.EndOfTurn, filter, false), new ManaCostsImpl<>("{3}{U}{R}")); diff --git a/Mage.Sets/src/mage/cards/t/TimelyInterference.java b/Mage.Sets/src/mage/cards/t/TimelyInterference.java index ffa11160c64..32a29d1d277 100644 --- a/Mage.Sets/src/mage/cards/t/TimelyInterference.java +++ b/Mage.Sets/src/mage/cards/t/TimelyInterference.java @@ -36,7 +36,7 @@ public final class TimelyInterference extends CardImpl { new LockedInCondition(KickedCondition.ONCE), "If this spell was kicked, that creature blocks this turn if able.
" )); - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private TimelyInterference(final TimelyInterference card) { diff --git a/Mage.Sets/src/mage/cards/t/ToArms.java b/Mage.Sets/src/mage/cards/t/ToArms.java index b9e8d2c18b4..c7d6ec43556 100644 --- a/Mage.Sets/src/mage/cards/t/ToArms.java +++ b/Mage.Sets/src/mage/cards/t/ToArms.java @@ -26,7 +26,7 @@ public final class ToArms extends CardImpl { Effect effect = new UntapAllControllerEffect(new FilterControlledCreaturePermanent(), rule); this.getSpellAbility().addEffect(effect); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private ToArms(final ToArms card) { diff --git a/Mage.Sets/src/mage/cards/t/TouchOfInvisibility.java b/Mage.Sets/src/mage/cards/t/TouchOfInvisibility.java index 99212c0edc3..ad8a4b229d4 100644 --- a/Mage.Sets/src/mage/cards/t/TouchOfInvisibility.java +++ b/Mage.Sets/src/mage/cards/t/TouchOfInvisibility.java @@ -24,7 +24,7 @@ public final class TouchOfInvisibility extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private TouchOfInvisibility(final TouchOfInvisibility card) { diff --git a/Mage.Sets/src/mage/cards/t/TranquilPath.java b/Mage.Sets/src/mage/cards/t/TranquilPath.java index b33bc743542..5185b0d1cc0 100644 --- a/Mage.Sets/src/mage/cards/t/TranquilPath.java +++ b/Mage.Sets/src/mage/cards/t/TranquilPath.java @@ -21,7 +21,7 @@ public final class TranquilPath extends CardImpl { // Destroy all enchantments. this.getSpellAbility().addEffect(new DestroyAllEffect(new FilterEnchantmentPermanent("enchantments"))); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).setText("

Draw a card")); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private TranquilPath(final TranquilPath card) { diff --git a/Mage.Sets/src/mage/cards/t/TurfWound.java b/Mage.Sets/src/mage/cards/t/TurfWound.java index 7383367f0f4..c4d42f1a3bd 100644 --- a/Mage.Sets/src/mage/cards/t/TurfWound.java +++ b/Mage.Sets/src/mage/cards/t/TurfWound.java @@ -29,7 +29,7 @@ public final class TurfWound extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private TurfWound(final TurfWound card) { diff --git a/Mage.Sets/src/mage/cards/t/TwistedImage.java b/Mage.Sets/src/mage/cards/t/TwistedImage.java index b2c572479e9..77889987f60 100644 --- a/Mage.Sets/src/mage/cards/t/TwistedImage.java +++ b/Mage.Sets/src/mage/cards/t/TwistedImage.java @@ -21,7 +21,7 @@ public final class TwistedImage extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{U}"); this.getSpellAbility().addEffect(new SwitchPowerToughnessTargetEffect(Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/cards/u/UncomfortableChill.java b/Mage.Sets/src/mage/cards/u/UncomfortableChill.java index 4c849d496d9..1b19648c634 100644 --- a/Mage.Sets/src/mage/cards/u/UncomfortableChill.java +++ b/Mage.Sets/src/mage/cards/u/UncomfortableChill.java @@ -22,7 +22,7 @@ public final class UncomfortableChill extends CardImpl { this.getSpellAbility().addEffect(new BoostOpponentsEffect(-2, 0, Duration.EndOfTurn)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private UncomfortableChill(final UncomfortableChill card) { diff --git a/Mage.Sets/src/mage/cards/u/Unhinge.java b/Mage.Sets/src/mage/cards/u/Unhinge.java index 92a7ada00fb..bdf09017e8d 100644 --- a/Mage.Sets/src/mage/cards/u/Unhinge.java +++ b/Mage.Sets/src/mage/cards/u/Unhinge.java @@ -23,7 +23,7 @@ public final class Unhinge extends CardImpl { this.getSpellAbility().addEffect(new DiscardTargetEffect(1)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Unhinge(final Unhinge card) { diff --git a/Mage.Sets/src/mage/cards/u/UrborgUprising.java b/Mage.Sets/src/mage/cards/u/UrborgUprising.java index ba255c80bf2..aae17b9a927 100644 --- a/Mage.Sets/src/mage/cards/u/UrborgUprising.java +++ b/Mage.Sets/src/mage/cards/u/UrborgUprising.java @@ -22,7 +22,7 @@ public final class UrborgUprising extends CardImpl { this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(0, 2, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private UrborgUprising(final UrborgUprising card) { diff --git a/Mage.Sets/src/mage/cards/v/VerdantRebirth.java b/Mage.Sets/src/mage/cards/v/VerdantRebirth.java index 57c1fab02b9..152db274197 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantRebirth.java +++ b/Mage.Sets/src/mage/cards/v/VerdantRebirth.java @@ -30,7 +30,7 @@ public final class VerdantRebirth extends CardImpl { this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).setText("

Draw a card")); + getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private VerdantRebirth(final VerdantRebirth card) { diff --git a/Mage.Sets/src/mage/cards/v/Vivify.java b/Mage.Sets/src/mage/cards/v/Vivify.java index 36cc87bf28a..2d16efc83ad 100644 --- a/Mage.Sets/src/mage/cards/v/Vivify.java +++ b/Mage.Sets/src/mage/cards/v/Vivify.java @@ -24,7 +24,7 @@ public final class Vivify extends CardImpl { this.getSpellAbility().addEffect(new BecomesCreatureTargetEffect(new CreatureToken(3, 3), false, true, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetLandPermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Vivify(final Vivify card) { diff --git a/Mage.Sets/src/mage/cards/w/WarlordsFury.java b/Mage.Sets/src/mage/cards/w/WarlordsFury.java index 2d8114493db..ed230a6206b 100644 --- a/Mage.Sets/src/mage/cards/w/WarlordsFury.java +++ b/Mage.Sets/src/mage/cards/w/WarlordsFury.java @@ -25,7 +25,7 @@ public final class WarlordsFury extends CardImpl { StaticFilters.FILTER_CONTROLLED_CREATURES, "Creatures you control gain first strike until end of turn.
")); // Draw a card. - getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } diff --git a/Mage.Sets/src/mage/cards/w/WeaponSurge.java b/Mage.Sets/src/mage/cards/w/WeaponSurge.java index b3a65ebb82f..e85d435de0f 100644 --- a/Mage.Sets/src/mage/cards/w/WeaponSurge.java +++ b/Mage.Sets/src/mage/cards/w/WeaponSurge.java @@ -1,5 +1,4 @@ - package mage.cards.w; import java.util.UUID; @@ -24,10 +23,9 @@ import mage.target.common.TargetControlledCreaturePermanent; * @author LevelX2 */ - public final class WeaponSurge extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All creature you control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All creatures you control"); static { filter.add(TargetController.YOU.getControllerPredicate()); } @@ -35,10 +33,9 @@ public final class WeaponSurge extends CardImpl { public WeaponSurge(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R}"); - // Target creature you control gets +1/+0 and gains first strike until end of turn. - this.getSpellAbility().addEffect(new BoostTargetEffect(1,0, Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostTargetEffect(1,0, Duration.EndOfTurn).setText("target creature you control gets +1/+0")); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn).setText("and gains first strike until end of turn")); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); // Overload {1}{R} diff --git a/Mage.Sets/src/mage/cards/w/WheelAndDeal.java b/Mage.Sets/src/mage/cards/w/WheelAndDeal.java index 9ac01961867..924101a2048 100644 --- a/Mage.Sets/src/mage/cards/w/WheelAndDeal.java +++ b/Mage.Sets/src/mage/cards/w/WheelAndDeal.java @@ -38,7 +38,7 @@ public final class WheelAndDeal extends CardImpl { this.getSpellAbility().addEffect(effect); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private WheelAndDeal(final WheelAndDeal card) { diff --git a/Mage.Sets/src/mage/cards/w/WhispersOfTheMuse.java b/Mage.Sets/src/mage/cards/w/WhispersOfTheMuse.java index 8969ed8d493..985fc61daab 100644 --- a/Mage.Sets/src/mage/cards/w/WhispersOfTheMuse.java +++ b/Mage.Sets/src/mage/cards/w/WhispersOfTheMuse.java @@ -22,7 +22,7 @@ public final class WhispersOfTheMuse extends CardImpl { this.addAbility(new BuybackAbility("{5}")); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private WhispersOfTheMuse(final WhispersOfTheMuse card) { diff --git a/Mage.Sets/src/mage/cards/w/Wildsize.java b/Mage.Sets/src/mage/cards/w/Wildsize.java index 519de7bc359..9c5c8e718f8 100644 --- a/Mage.Sets/src/mage/cards/w/Wildsize.java +++ b/Mage.Sets/src/mage/cards/w/Wildsize.java @@ -30,7 +30,7 @@ public final class Wildsize extends CardImpl { effect.setText("and gains trample until end of turn"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Wildsize(final Wildsize card) { diff --git a/Mage.Sets/src/mage/cards/w/Winnow.java b/Mage.Sets/src/mage/cards/w/Winnow.java index 2d866eeda74..96fc6ba6507 100644 --- a/Mage.Sets/src/mage/cards/w/Winnow.java +++ b/Mage.Sets/src/mage/cards/w/Winnow.java @@ -28,7 +28,7 @@ public final class Winnow extends CardImpl { this.getSpellAbility().addEffect(new WinnowEffect()); this.getSpellAbility().addTarget(new TargetNonlandPermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Winnow(final Winnow card) { diff --git a/Mage.Sets/src/mage/cards/w/Withstand.java b/Mage.Sets/src/mage/cards/w/Withstand.java index 72870bbdc98..3190818f666 100644 --- a/Mage.Sets/src/mage/cards/w/Withstand.java +++ b/Mage.Sets/src/mage/cards/w/Withstand.java @@ -21,7 +21,7 @@ public final class Withstand extends CardImpl { this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); // Prevent the next 3 damage that would be dealt to any target this turn. // Draw a card. } diff --git a/Mage.Sets/src/mage/cards/z/Zap.java b/Mage.Sets/src/mage/cards/z/Zap.java index 7a01dfee0ab..11512caae01 100644 --- a/Mage.Sets/src/mage/cards/z/Zap.java +++ b/Mage.Sets/src/mage/cards/z/Zap.java @@ -22,7 +22,7 @@ public final class Zap extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Zap(final Zap card) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java index 3d1c3d829a8..3fc0818978c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java @@ -147,7 +147,7 @@ public class GainAbilityAttachedEffect extends ContinuousEffectImpl { if (quotes) { sb.append('"'); } - sb.append(ability.getRule("this " + targetObjectName)); + sb.append(ability.getRule("This " + targetObjectName)); if (quotes) { sb.append('"'); }