Text fixes (cantrips with line break) (#10284)

* Fix text: Teleportal, Weapon Surge, Mizzium Skin

* Fix text: Cantrips with line break (early sets)

* Fix text: Cantrips with line break (later sets)

* Fix text: {tap} in strings, capitalization of gained abilities, misc

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("<br>"));
     }
 
     private Abeyance(final Abeyance card) {

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("<br>"));
     }
 
     private Accelerate(final Accelerate card) {

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("<br>"));
     }
 
     private Afflict(final Afflict card) {

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("<br>"));
     }
 
     private AggressiveUrge(final AggressiveUrge card) {

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("<br>"));
     }
 
     private Annihilate(final Annihilate card) {

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);
+        this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("<br>"));
-        effect.setText("<br>Draw a card");
-        this.getSpellAbility().addEffect(effect);
     }
 
     private AphoticWisps(final AphoticWisps card) {

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("<br>"));
     }
 
     private ArgentMutation(final ArgentMutation card) {

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.";
     }
 }

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("<br>"));
     }
 
     private AuraBlast(final AuraBlast card) {

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("<br>"));
     }
 
     private Bandage(final Bandage card) {

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("<br>"));
     }
 
     private Befuddle(final Befuddle card) {

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("<br>"));
     }
 
     private BenefactorsDraught(final BenefactorsDraught card) {

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("<br>"));
     }
 
     private Bind(final Bind card) {

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("<br>"));
     }
 
     private Blindblast(final Blindblast card) {

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("<br>"));
     }
 
     private BlindingSpray(final BlindingSpray card) {

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("<br>"));
     }
 
     private BoilingBlood(final BoilingBlood card) {

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("<br>"));
     }
 
     private BoneToAsh(final BoneToAsh card) {

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("<br>"));
 
     }
 

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("<br>"));
     }
 
     private BrightReprisal(final BrightReprisal card) {

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("<br>"));
     }
 
     private Carom(final Carom card) {

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("<br>"));
     }
 
     private CeaseFire(final CeaseFire card) {

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.";
     }
 
 }

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("<br>"));
     }
 
     private ChaoticStrike(final ChaoticStrike card) {

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("<br>"));
     }
 
     private ClearTheMind(final ClearTheMind card) {

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("<br>"));
     }
 
     private Confound(final Confound card) {

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("<br>"));
     }
 
     private ConjurersBan(final ConjurersBan card) {

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("<br>"));
 
         // Consume
         // Target player sacrifices a creature with the greatest power among creatures they control. You gain life equal to its power.

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("<br>"));
     }
 
     private ContentiousPlan(final ContentiousPlan card) {

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("<br>"));
     }
 
     private Contradict(final Contradict card) {

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("<BR>Draw a card"));
+        this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("<br>"));
     }
 
     private CrashingTide(final CrashingTide card) {

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("<br>"));
     }
 
     private Cremate(final Cremate card) {

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("<br>"));
     }
 
     private CripplingChill(final CripplingChill card) {

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("<br>"));
     }
 
     private CunningStrike(final CunningStrike card) {

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("<br>"));
     }
 
     private CurtainOfLight(final CurtainOfLight card) {

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);
+        this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("<br>"));
-        effect.setText("<br><br>Draw a card");
-        this.getSpellAbility().addEffect(effect);
     }
 
     private DefiantStrike(final DefiantStrike card) {

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("<br>"));
 
         // Deploy
         // Creature two 1/1 colorless Thopter artifact creature tokens with flying, then you gain 1 life for each creature you control.

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("<br>"));
     }
 
     private Disrupt(final Disrupt card) {

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("<br>"));
     }
 
     private DosansOldestChant(final DosansOldestChant card) {

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("<br>"));
     }
 
     private DragUnder(final DragUnder card) {

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("<br>"));
     }
 
     private Dredge(final Dredge card) {

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("<br>"));
     }
 
     private EmberShot(final EmberShot card) {

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("<br>"));
     }
 
     private EqualTreatment(final EqualTreatment card) {

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("<br>"));
     }
 
     private Execute(final Execute card) {

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("<br>"));
     }
 
     private Expedite(final Expedite card) {

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("<br>"));
     }
 
     private FestivalOfTheGuildpact(final FestivalOfTheGuildpact card) {

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("<br>"));
 
     }
 

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("<br>"));
     }
 
     private FlashFoliage(final FlashFoliage card) {

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("<br>"));
     }
 
     private Flux(final Flux card) {

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("<br>"));
         this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(0, Integer.MAX_VALUE, new FilterArtifactCard("artifact cards from your graveyard")));
     }
 

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("<br>"));
 
         // When Gaea's Blessing is put into your graveyard from your library, shuffle your graveyard into your library.
         this.addAbility(new GaeasBlessingTriggeredAbility());

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("<br>"));
 
     }
 

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("<br>"));
     }
 
     private Gallantry(final Gallantry card) {

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("<br>"));
 
     }
 

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}.\"<br>");
         this.getSpellAbility().addEffect(effect);        // Draw a card.
-        this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
+        this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("<br>"));
     }
 
     private GraveBirthing(final GraveBirthing card) {

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("<br>"));
     }
 
     private Gravepurge(final Gravepurge card) {

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("<br>"));
         this.getSpellAbility().addTarget(new TargetSpell());
     }
 

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("<br>"));
 
         // Surge {1}{U}
         addAbility(new SurgeAbility(this, "{1}{U}"));

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("<br>"));
 
     }
 

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("<br>"));
     }
 
     private HallowedMoonlight(final HallowedMoonlight card) {

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("<br>"));
     }
 
     public HaltOrder (final HaltOrder card) {

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("<br>"));
     }
 
     private HealingHands(final HealingHands card) {

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("<br>"));
     }
 
     private IllusionOfChoice(final IllusionOfChoice card) {

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("<br>"));
     }
 
     private Implode(final Implode card) {

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("<br>"));
     }
  
     private InactionInjunction(final InactionInjunction card) {

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);
+        this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("<br>"));
-        effect.setText("<br><br>Draw a card");
-        this.getSpellAbility().addEffect(effect);
     }
 
     private Insist(final Insist card) {

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("<br>"));
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
     }
 

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("<br><br>Draw a card"));
+        this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("<br>"));
     }
 
     private Interdict(final Interdict card) {

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("<br>"));
     }
 
     private LaquatussDisdain(final LaquatussDisdain card) {

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("<br><br>Draw a card"));
+        this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("<br>"));
     }
 
     private LastCaress(final LastCaress card) {

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("<br>"));
     }
 
     private LeadershipVacuum(final LeadershipVacuum card) {

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("<br>"));
     }
 
     private Leap(final Leap card) {

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("<br>"));
     }
 
     private LearnFromThePast(final LearnFromThePast card) {

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("<br>"));
     }
 
     private MentalNote(final MentalNote card) {

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 BoostTargetEffect(0,1, Duration.EndOfTurn).setText("target creature you control gets +0/+1"));
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HexproofAbility.getInstance(), Duration.EndOfTurn));
+        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}"));

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);
+        this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("<br>"));
-        effect.setText("<br><br>Draw a card");
-        this.getSpellAbility().addEffect(effect);
     }
 
     private Overmaster(final Overmaster card) {

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("<br>"));
     }
 
     private Peek(final Peek card) {

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(
+        this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("<br>"));
-                new DrawCardSourceControllerEffect(1).setText("<br>Draw a card.")
-        );
     }
 
     private PhantasmalForm(final PhantasmalForm card) {

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("<br>"));
     }
 
     private Provoke(final Provoke card) {

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);
     }
 

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("<br>"));
     }
 
     private PsychoticFury(final PsychoticFury card) {

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("<br>"));
     }
 
     private Quickchange(final Quickchange card) {

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("<br>"));
     }
 
     private Quicken(final Quicken card) {

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("<br>"));
     }
 
     private RealityAnchor(final RealityAnchor card) {

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("<br>"));
     }
 
     private Refocus(final Refocus card) {

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("<br>"));
     }
 
     private Refresh(final Refresh card) {

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("<br>"));
     }
 
     private Reroute(final Reroute card) {

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("<br>"));
     }
 
     private Restrain(final Restrain card) {

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("<br>"));
     }
 
     private Resupply(final Resupply card) {

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("<br>"));
     }
 
     private RevivingDose(final RevivingDose card) {

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("<br><br>Draw a card"));
+        this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("<br>"));
     }
 
     private Rile(final Rile card) {

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("<br>"));
     }
 
     private RitualOfRejuvenation(final RitualOfRejuvenation card) {

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("<br>"));
     }
 
     private Runeboggle(final Runeboggle card) {

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("<br>"));
     }
 
     private ScatterArc(final ScatterArc card) {

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("<br>"));
     }
 
     private SecondThoughts(final SecondThoughts card) {

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("<br>"));
     }
 
     private ShadowRift(final ShadowRift card) {

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("<br>"));
     }
 
     private ShakeTheFoundations(final ShakeTheFoundations card) {

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("<br><br>Draw a card"));
+        this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("<br>"));
     }
 
     private ShimmeringMirage(final ShimmeringMirage card) {

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("<br>"));
     }
 
     private ShoulderToShoulder(final ShoulderToShoulder card) {

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()
         )));

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.\""
                 )