fixed some instances of ability words being doubled

Mage.Sets/src/mage/cards/a/AuriokEdgewright.java

@@ -19,7 +19,7 @@ import java.util.UUID;
  */
 public final class AuriokEdgewright extends CardImpl {
 
-    private static final String effectText = "<i>Metalcraft</i> &mdash; Auriok Edgewright has double strike as long as you control three or more artifacts.";
+    private static final String effectText = "{this} has double strike as long as you control three or more artifacts.";
 
     public AuriokEdgewright(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}{W}");

Mage.Sets/src/mage/cards/b/BellowingSaddlebrute.java

@@ -32,7 +32,7 @@ public final class BellowingSaddlebrute extends CardImpl {
         this.addAbility(new ConditionalInterveningIfTriggeredAbility(
                         new EntersBattlefieldTriggeredAbility(new LoseLifeSourceControllerEffect(4)),
                         new InvertCondition(RaidCondition.instance),
-                        "<i>Raid</i> &mdash; When {this} enters the battlefield, you lose 4 life unless you attacked this turn.")
+                        "When {this} enters the battlefield, you lose 4 life unless you attacked this turn.")
                         .setAbilityWord(AbilityWord.RAID)
                         .addHint(RaidHint.instance),
                 new PlayerAttackedWatcher());

Mage.Sets/src/mage/cards/b/BladeTribeBerserkers.java

@@ -23,7 +23,7 @@ import java.util.UUID;
  */
 public final class BladeTribeBerserkers extends CardImpl {
 
-    private static final String effectText = "<i>Metalcraft</i> &mdash; When Blade-Tribe Berserkers enters the battlefield, if you control three or more artifacts, Blade-Tribe Berserkers gets +3/+3 and gains haste until end of turn.";
+    private static final String effectText = "When {this} enters the battlefield, if you control three or more artifacts, {this} gets +3/+3 and gains haste until end of turn.";
 
     public BladeTribeBerserkers(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}");

Mage.Sets/src/mage/cards/b/BleakCovenVampires.java

@@ -23,7 +23,7 @@ import java.util.UUID;
  */
 public final class BleakCovenVampires extends CardImpl {
 
-    private static final String effectText = "<i>Metalcraft</i> &mdash; When Bleak Coven Vampires enters the battlefield, if you control three or more artifacts, target player loses 4 life and you gain 4 life.";
+    private static final String effectText = "When {this} enters the battlefield, if you control three or more artifacts, target player loses 4 life and you gain 4 life.";
 
     public BleakCovenVampires(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{B}");

Mage.Sets/src/mage/cards/d/DeadeyeRigHauler.java

@@ -32,7 +32,7 @@ public final class DeadeyeRigHauler extends CardImpl {
 
         // <i>Raid</i>— When Deadeye Rig-Hauler enters the battlefield, if you attacked this turn, you may return target creature to its owner's hand.
         Ability ability = new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), true), RaidCondition.instance,
-                "<i>Raid</i> &mdash; When {this} enters the battlefield, if you attacked this turn, you may return target creature to its owner's hand.");
+                "When {this} enters the battlefield, if you attacked this turn, you may return target creature to its owner's hand.");
         ability.addTarget(new TargetCreaturePermanent());
         ability.setAbilityWord(AbilityWord.RAID);
         ability.addHint(RaidHint.instance);

Mage.Sets/src/mage/cards/d/DeadeyeTormentor.java

@@ -32,7 +32,7 @@ public final class DeadeyeTormentor extends CardImpl {
 
         // <i>Raid</i> &mdash; When Deadeye Tormentor enters the battlefield, if you attacked this turn, target opponent discards a card.
         Ability ability = new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(1)), RaidCondition.instance,
-                "<i>Raid</i> &mdash; When {this} enters the battlefield, if you attacked this turn, target opponent discards a card.");
+                "When {this} enters the battlefield, if you attacked this turn, target opponent discards a card.");
         ability.addTarget(new TargetOpponent());
         ability.setAbilityWord(AbilityWord.RAID);
         ability.addHint(RaidHint.instance);

Mage.Sets/src/mage/cards/e/EdgarMarkov.java

@@ -51,7 +51,7 @@ public final class EdgarMarkov extends CardImpl {
         Ability ability = new ConditionalInterveningIfTriggeredAbility(
                 new SpellCastControllerTriggeredAbility(Zone.ALL, new CreateTokenEffect(new EdgarMarkovToken()), filter2, false, false),
                 SourceOnBattlefieldOrCommandZoneCondition.instance,
-                "<i>Eminence</i> &mdash; Whenever you cast another Vampire spell, if {this} is in the command zone or on the battlefield, create a 1/1 black Vampire creature token.");
+                "<Whenever you cast another Vampire spell, if {this} is in the command zone or on the battlefield, create a 1/1 black Vampire creature token.");
         ability.setAbilityWord(AbilityWord.EMINENCE);
         this.addAbility(ability);
 

Mage.Sets/src/mage/cards/g/GoblinTutor.java

@@ -50,7 +50,12 @@ class GoblinTutorEffect extends OneShotEffect {
 
     public GoblinTutorEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "Roll a six-sided die. If you roll a 1, {this} has no effect. Otherwise, search your library for the indicated card, reveal it, put it into your hand, then shuffle. 2 - A card named Goblin Tutor 3 - An enchantment card 4 - An artifact card 5 - A creature card 6 - An instant or sorcery card";
+        this.staticText = "Roll a six-sided die. If you roll a 1, {this} has no effect. Otherwise, search your library for the indicated card, reveal it, put it into your hand, then shuffle." +
+                "<br>2 - A card named Goblin Tutor" +
+                "<br>3 - An enchantment" +
+                "<br>4 - An artifact" +
+                "<br>5 - A creature" +
+                "<br>6 - An instant or sorcery";
     }
 
     public GoblinTutorEffect(final GoblinTutorEffect effect) {

Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java

@@ -68,7 +68,7 @@ public final class InallaArchmageRitualist extends CardImpl {
                         new InallaArchmageRitualistEffect(), new ManaCostsImpl("{1}"), "Pay {1} to create a token copy?"),
                         filter, false, SetTargetPointer.PERMANENT, ""),
                 SourceOnBattlefieldOrCommandZoneCondition.instance,
-                "<i>Eminence</i> &mdash; Whenever another nontoken Wizard enters the battlefield under your control, "
+                "Whenever another nontoken Wizard enters the battlefield under your control, "
                 + "{this} is in the command zone or on the battlefield, "
                 + "you may pay {1}. If you do, create a token that's a copy of that Wizard. "
                 + "That token gains haste. Exile it at the beginning of the next end step");

Mage.Sets/src/mage/cards/j/JackInTheMox.java

@@ -51,12 +51,13 @@ class JackInTheMoxManaEffect extends ManaEffect {
 
     JackInTheMoxManaEffect() {
         super();
-        staticText = "Roll a six-sided die for {this}. On a 1, sacrifice {this} and lose 5 life. Otherwise, {this} has one of the following effects. Treat this ability as a mana source."
+        staticText = "roll a six-sided die. This ability has the indicated effect."
-                + "<br/>2 Add {W}.\n"
+                + "<br>1 - Sacrifice {this} and you lose 5 life."
-                + "<br/>3 Add {U}.\n"
+                + "<br>2 - Add {W}."
-                + "<br/>4 Add {B}.\n"
+                + "<br>3 - Add {U}."
-                + "<br/>5 Add {R}.\n"
+                + "<br>4 - Add {B}."
-                + "<br/>6 Add {G}.";
+                + "<br>5 - Add {R}."
+                + "<br>6 - Add {G}.";
     }
 
     JackInTheMoxManaEffect(final JackInTheMoxManaEffect effect) {

Mage.Sets/src/mage/cards/j/JaggedPoppet.java

@@ -39,7 +39,7 @@ public final class JaggedPoppet extends CardImpl {
         Ability hellbentAbility = new ConditionalInterveningIfTriggeredAbility(
                 new DealsCombatDamageToAPlayerTriggeredAbility(new JaggedPoppetDealsDamageEffect(), false, true),
                 HellbentCondition.instance,
-                "<i>Hellbent</i> &mdash; Whenever {this} deals combat damage to a player, if you have no cards in hand, that player discards cards equal to the damage.");
+                "Whenever {this} deals combat damage to a player, if you have no cards in hand, that player discards cards equal to the damage.");
         hellbentAbility.setAbilityWord(AbilityWord.HELLBENT);
         this.addAbility(hellbentAbility);
 

Mage.Sets/src/mage/cards/l/LumengridDrake.java

@@ -22,7 +22,7 @@ import java.util.UUID;
  */
 public final class LumengridDrake extends CardImpl {
 
-    private static final String ruleText = "<i>Metalcraft</i> &mdash; When {this} enters the battlefield, if you control three or more artifacts, return target creature to its owner's hand.";
+    private static final String ruleText = "When {this} enters the battlefield, if you control three or more artifacts, return target creature to its owner's hand.";
 
     public LumengridDrake(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}");

Mage.Sets/src/mage/cards/m/MarduHeartPiercer.java

@@ -32,7 +32,7 @@ public final class MarduHeartPiercer extends CardImpl {
 
         // <em>Raid</em> - When Mardu Heart-Piercer enters the battlefield, if you attacked this turn, Mardu Heart-Piercer deals 2 damage to any target.
         Ability ability = new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2)), RaidCondition.instance,
-                "<i>Raid</i> &mdash; When {this} enters the battlefield, if you attacked this turn, {this} deals 2 damage to any target.");
+                "When {this} enters the battlefield, if you attacked this turn, {this} deals 2 damage to any target.");
         ability.addTarget(new TargetAnyTarget());
         ability.setAbilityWord(AbilityWord.RAID);
         ability.addHint(RaidHint.instance);

Mage.Sets/src/mage/cards/m/MarduHordechief.java

@@ -33,7 +33,7 @@ public final class MarduHordechief extends CardImpl {
         this.addAbility(new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(
                         new CreateTokenEffect(new WarriorToken())),
                         RaidCondition.instance,
-                        "<i>Raid</i> &mdash; When {this} enters the battlefield, if you attacked this turn, create a 1/1 white Warrior creature token.")
+                        "When {this} enters the battlefield, if you attacked this turn, create a 1/1 white Warrior creature token.")
                         .setAbilityWord(AbilityWord.RAID)
                         .addHint(RaidHint.instance),
                 new PlayerAttackedWatcher());

Mage.Sets/src/mage/cards/m/MarduSkullhunter.java

@@ -36,7 +36,7 @@ public final class MarduSkullhunter extends CardImpl {
 
         // <em>Raid</em> - When Mardu Skullhunter enters the battlefield, if you attacked this turn, target opponent discards a card.
         Ability ability = new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(1)), RaidCondition.instance,
-                "<i>Raid</i> &mdash; When {this} enters the battlefield, if you attacked this turn, target opponent discards a card.");
+                "When {this} enters the battlefield, if you attacked this turn, target opponent discards a card.");
         ability.addTarget(new TargetOpponent());
         ability.setAbilityWord(AbilityWord.RAID);
         ability.addHint(RaidHint.instance);

Mage.Sets/src/mage/cards/m/MarduWarshrieker.java

@@ -33,7 +33,7 @@ public final class MarduWarshrieker extends CardImpl {
         this.addAbility(new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(
                         new AddManaToManaPoolSourceControllerEffect(new Mana(1, 0, 1, 1, 0, 0, 0, 0))),
                         RaidCondition.instance,
-                        "<i>Raid</i> &mdash; When {this} enters the battlefield, if you attacked this turn, add {R}{W}{B}.")
+                        "When {this} enters the battlefield, if you attacked this turn, add {R}{W}{B}.")
                         .setAbilityWord(AbilityWord.RAID)
                         .addHint(RaidHint.instance),
                 new PlayerAttackedWatcher());

Mage.Sets/src/mage/cards/n/NavigatorsRuin.java

@@ -28,7 +28,7 @@ public final class NavigatorsRuin extends CardImpl {
         Ability ability = new ConditionalInterveningIfTriggeredAbility(new BeginningOfEndStepTriggeredAbility(
                 new PutLibraryIntoGraveTargetEffect(4), TargetController.YOU, false),
                 RaidCondition.instance,
-                "<i>Raid</i> &mdash; At the beginning of your end step, " +
+                "At the beginning of your end step, " +
                         "if you attacked this turn, target opponent mills four cards."
         );
         ability.addTarget(new TargetOpponent());

Mage.Sets/src/mage/cards/r/RaidersWake.java

@@ -33,7 +33,7 @@ public final class RaidersWake extends CardImpl {
         // Raid — At the beginning of your end step, if you attacked this turn, target opponent discards a card.
         Ability ability = new ConditionalInterveningIfTriggeredAbility(
                 new BeginningOfEndStepTriggeredAbility(new DiscardTargetEffect(1), TargetController.YOU, false), RaidCondition.instance,
-                "<i>Raid</i> &mdash; At the beginning of your end step, if you attacked this turn, target opponent discards a card.");
+                "At the beginning of your end step, if you attacked this turn, target opponent discards a card.");
         ability.addTarget(new TargetOpponent());
         ability.setAbilityWord(AbilityWord.RAID);
         ability.addHint(RaidHint.instance);

Mage.Sets/src/mage/cards/r/RuinRaider.java

@@ -32,7 +32,7 @@ public final class RuinRaider extends CardImpl {
         Ability ability = new ConditionalInterveningIfTriggeredAbility(
                 new BeginningOfEndStepTriggeredAbility(new RuinRaiderEffect(), TargetController.YOU, false),
                 RaidCondition.instance,
-                "<i>Raid</i> &mdash; At the beginning of your end step, if you attacked this turn, "
+                "At the beginning of your end step, if you attacked this turn, "
                         + "reveal the top card of your library and put that card into your hand. "
                         + "You lose life equal to the card's mana value.");
         ability.setAbilityWord(AbilityWord.RAID);

Mage.Sets/src/mage/cards/s/ScreechingSilcaw.java

@@ -34,7 +34,7 @@ public final class ScreechingSilcaw extends CardImpl {
         TriggeredAbility conditional = new ConditionalInterveningIfTriggeredAbility(
                 new DealsCombatDamageToAPlayerTriggeredAbility(
                         new PutLibraryIntoGraveTargetEffect(4), false, true
-                ), MetalcraftCondition.instance, "<i>Metalcraft</i> &mdash; Whenever {this} " +
+                ), MetalcraftCondition.instance, "Whenever {this} " +
                 "deals combat damage to a player, if you control three or more artifacts, that player mills four cards."
         );
         conditional.setAbilityWord(AbilityWord.METALCRAFT);

Mage.Sets/src/mage/cards/s/StormFleetArsonist.java

@@ -35,7 +35,7 @@ public final class StormFleetArsonist extends CardImpl {
         Ability ability = new ConditionalInterveningIfTriggeredAbility(
                 new EntersBattlefieldTriggeredAbility(new SacrificeEffect(new FilterPermanent(), 1, "Target opponent")),
                 RaidCondition.instance,
-                "<i>Raid</i> &mdash; When {this} enters the battlefield, if you attacked this turn, target opponent sacrifices a permanent.");
+                "When {this} enters the battlefield, if you attacked this turn, target opponent sacrifices a permanent.");
         ability.addTarget(new TargetOpponent());
         ability.setAbilityWord(AbilityWord.RAID);
         ability.addHint(RaidHint.instance);

Mage.Sets/src/mage/cards/s/StormFleetPyromancer.java

@@ -35,7 +35,7 @@ public final class StormFleetPyromancer extends CardImpl {
         Ability ability = new ConditionalInterveningIfTriggeredAbility(
                 new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2)),
                 RaidCondition.instance,
-                "<i>Raid</i> &mdash; When {this} enters the battlefield, if you attacked this turn, {this} deals 2 damage to any target.");
+                "When {this} enters the battlefield, if you attacked this turn, {this} deals 2 damage to any target.");
         ability.addTarget(new TargetAnyTarget());
         ability.setAbilityWord(AbilityWord.RAID);
         ability.addHint(RaidHint.instance);

Mage.Sets/src/mage/cards/s/StormFleetSpy.java

@@ -33,7 +33,7 @@ public final class StormFleetSpy extends CardImpl {
         Ability ability = new ConditionalInterveningIfTriggeredAbility(
                 new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1)),
                 RaidCondition.instance,
-                "<i>Raid</i> &mdash; When {this} enters the battlefield, if you attacked this turn, draw a card.");
+                "When {this} enters the battlefield, if you attacked this turn, draw a card.");
         ability.setAbilityWord(AbilityWord.RAID);
         ability.addHint(RaidHint.instance);
         this.addAbility(ability, new PlayerAttackedWatcher());

Mage.Sets/src/mage/cards/s/StrategySchmategy.java

@@ -46,7 +46,13 @@ class StrategySchmategyffect extends OneShotEffect {
 
     public StrategySchmategyffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "Roll a six-sided die. {this} has the indicated effect. 1 - Do nothing. 2 - Destroy all artifacts. 3 - Destroy all lands. 4 - {this} deals 3 damage to each creature and each player. 5 - Each player discards their hand and draws seven cards. 6 - Repeat this process two more times";
+        this.staticText = "Roll a six-sided die. {this} has the indicated effect." +
+                "<br>1 - Do nothing." +
+                "<br>2 - Destroy all artifacts." +
+                "<br>3 - Destroy all lands." +
+                "<br>4 - {this} deals 3 damage to each creature and each player." +
+                "<br>5 - Each player discards their hand and draws seven cards." +
+                "<br>6 - Repeat this process two more times";
     }
 
     public StrategySchmategyffect(final StrategySchmategyffect effect) {

Mage.Sets/src/mage/cards/t/TimelyHordemate.java

@@ -41,7 +41,7 @@ public final class TimelyHordemate extends CardImpl {
 
         // <i>Raid</i> &mdash; When Timely Hordemate enters the battlefield, if you attacked this turn, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield.
         Ability ability = new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect()), RaidCondition.instance,
-                "<i>Raid</i> &mdash; When {this} enters the battlefield, if you attacked this turn, return target creature card with mana value 2 or less from your graveyard to the battlefield.");
+                "When {this} enters the battlefield, if you attacked this turn, return target creature card with mana value 2 or less from your graveyard to the battlefield.");
         ability.addTarget(new TargetCardInYourGraveyard(filter));
         ability.setAbilityWord(AbilityWord.RAID);
         ability.addHint(RaidHint.instance);

Mage.Sets/src/mage/cards/u/UrzasScienceFairProject.java

@@ -1,12 +1,11 @@
 
 package mage.cards.u;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.mana.GenericManaCost;
-import mage.abilities.effects.Effect;
+import mage.abilities.effects.ContinuousEffect;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.PreventCombatDamageBySourceEffect;
 import mage.abilities.effects.common.continuous.BoostSourceEffect;
@@ -16,16 +15,13 @@ import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.VigilanceAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.CardType;
+import mage.constants.*;
-import mage.constants.Duration;
-import mage.constants.Outcome;
-import mage.constants.SubType;
-import mage.constants.Zone;
 import mage.game.Game;
 import mage.players.Player;
 
+import java.util.UUID;
+
 /**
- *
  * @author spjspj
  */
 public final class UrzasScienceFairProject extends CardImpl {
@@ -56,7 +52,13 @@ class UrzasScienceFairProjectEffect extends OneShotEffect {
 
     public UrzasScienceFairProjectEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Roll a six-sided die. {this} gets the indicated result. 1 - -2/-2 until end of turn. 2 - Prevent all combat damage it would deal this turn. 3 - gains vigilance until end of turn. 4 - gains first strike until end of turn. 5 - gains flying until end of turn. 6 - gets +2/+2 until end of turn";
+        this.staticText = "Roll a six-sided die. {this} gets the indicated result." +
+                "<br>1 - It gets -2/-2 until end of turn." +
+                "<br>2 - Prevent all combat damage it would deal this turn." +
+                "<br>3 - It gains vigilance until end of turn." +
+                "<br>4 - It gains first strike until end of turn." +
+                "<br>5 - It gains flying until end of turn." +
+                "<br>6 - It gets +2/+2 until end of turn";
     }
 
     public UrzasScienceFairProjectEffect(final UrzasScienceFairProjectEffect effect) {
@@ -71,31 +73,41 @@ class UrzasScienceFairProjectEffect extends OneShotEffect {
     @Override
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
-        if (controller != null) {
+        if (controller == null) {
-            int amount = controller.rollDice(outcome, source, game, 6);
+            return false;
-
-            Effect effect = null;
-            // 1 - -2/-2 until end of turn.
-            // 2 - Prevent all combat damage it would deal this turn.
-            // 3 - gains vigilance until end of turn.
-            // 4 - gains first strike until end of turn.
-            // 5 - gains flying until end of turn.
-            // 6 - gets +2/+2 until end of turn";
-            if (amount == 1) {
-                game.addEffect(new BoostSourceEffect(-2, -2, Duration.EndOfTurn), source);
-            } else if (amount == 2) {
-                game.addEffect(new PreventCombatDamageBySourceEffect(Duration.EndOfTurn), source);
-            } else if (amount == 3) {
-                game.addEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), source);
-            } else if (amount == 4) {
-                game.addEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), source);
-            } else if (amount == 5) {
-                game.addEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), source);
-            } else if (amount == 6) {
-                game.addEffect(new BoostSourceEffect(+2, +2, Duration.EndOfTurn), source);
-            }
-            return true;
         }
-        return false;
+        int amount = controller.rollDice(outcome, source, game, 6);
+
+        ContinuousEffect effect;
+        // 1 - -2/-2 until end of turn.
+        // 2 - Prevent all combat damage it would deal this turn.
+        // 3 - gains vigilance until end of turn.
+        // 4 - gains first strike until end of turn.
+        // 5 - gains flying until end of turn.
+        // 6 - gets +2/+2 until end of turn";
+        switch (amount) {
+            case 1:
+                effect = new BoostSourceEffect(-2, -2, Duration.EndOfTurn);
+                break;
+            case 2:
+                effect = new PreventCombatDamageBySourceEffect(Duration.EndOfTurn);
+                break;
+            case 3:
+                effect = new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn);
+                break;
+            case 4:
+                effect = new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn);
+                break;
+            case 5:
+                effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn);
+                break;
+            case 6:
+                effect = new BoostSourceEffect(+2, +2, Duration.EndOfTurn);
+                break;
+            default:
+                return true;
+        }
+        game.addEffect(effect, source);
+        return true;
     }
 }

Mage.Sets/src/mage/cards/w/WingmateRoc.java

@@ -38,7 +38,7 @@ public final class WingmateRoc extends CardImpl {
 
         // <i>Raid</i> &mdash; When Wingmate Roc enters the battlefield, if you attacked this turn, create a 3/4 white Bird creature token with flying.
         this.addAbility(new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WingmateRocToken())), RaidCondition.instance,
-                        "<i>Raid</i> &mdash; When {this} enters the battlefield, if you attacked this turn, create a 3/4 white Bird creature token with flying.")
+                        "When {this} enters the battlefield, if you attacked this turn, create a 3/4 white Bird creature token with flying.")
                         .setAbilityWord(AbilityWord.RAID)
                         .addHint(RaidHint.instance),
                 new PlayerAttackedWatcher());