fixed the text on several threaten effects

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

@@ -55,11 +55,10 @@ public class ActOfAggression extends CardImpl {
 
     public ActOfAggression(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{R/P}{R/P}");
-
         this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
         this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
-        this.getSpellAbility().addEffect(new UntapTargetEffect());
+        this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap that creature"));
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn."));
     }
 
     public ActOfAggression(final ActOfAggression card) {

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

@@ -25,7 +25,6 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.cards.a;
 
 import java.util.UUID;
@@ -48,14 +47,12 @@ public class ActOfTreason extends CardImpl {
     public ActOfTreason(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}");
 
-
         // Gain control of target creature until end of turn. Untap that creature.
         // It gains haste until end of turn. (It can attack and {T} this turn.)
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
-        this.getSpellAbility().addEffect(new UntapTargetEffect());
+        this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap that creature"));
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn."));
-
     }
 
     public ActOfTreason(final ActOfTreason card) {

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

@@ -25,7 +25,6 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.cards.b;
 
 import java.util.UUID;
@@ -42,7 +41,6 @@ import mage.constants.SuperType;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.SupertypePredicate;
-import mage.target.Target;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
@@ -60,11 +58,10 @@ public class BlindWithAnger extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{R}");
         this.subtype.add(SubType.ARCANE);
 
-        this.getSpellAbility().addEffect(new UntapTargetEffect());
+        this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap target nonlegendary creature"));
-        this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn).setText("and gain control of it until end of turn"));
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn."));
-        Target target = new TargetCreaturePermanent(filter);
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
-        this.getSpellAbility().addTarget(target);
     }
 
     public BlindWithAnger(final BlindWithAnger card) {

Mage.Sets/src/mage/cards/c/CloakAndDagger.java

@@ -51,6 +51,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
 public class CloakAndDagger extends CardImpl {
 
     private static final FilterPermanent filter = new FilterCreaturePermanent("a Rogue creature");
+
     static {
         filter.add(new SubtypePredicate(SubType.ROGUE));
     }
@@ -62,7 +63,7 @@ public class CloakAndDagger extends CardImpl {
 
         // Equipped creature gets +2/+0 and has shroud.
         Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0));
-        ability.addEffect(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT));
+        ability.addEffect(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT).setText("and has shroud"));
         this.addAbility(ability);
         // Whenever a Rogue creature enters the battlefield, you may attach Cloak and Dagger to it.
         this.addAbility(new EntersBattlefieldAllTriggeredAbility(

Mage.Sets/src/mage/cards/c/ConqueringManticore.java

@@ -41,6 +41,9 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Duration;
+import mage.constants.TargetController;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
@@ -49,6 +52,12 @@ import mage.target.common.TargetCreaturePermanent;
  */
 public class ConqueringManticore extends CardImpl {
 
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
+
+    static {
+        filter.add(new ControllerPredicate(TargetController.OPPONENT));
+    }
+
     public ConqueringManticore(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}{R}");
         this.subtype.add(SubType.MANTICORE);
@@ -59,9 +68,9 @@ public class ConqueringManticore extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         Ability ability = new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn), false);
-        ability.addEffect(new UntapTargetEffect());
+        ability.addEffect(new UntapTargetEffect().setText("Untap that creature"));
-        ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn."));
-        ability.addTarget(new TargetCreaturePermanent());
+        ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
     }
 

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

@@ -55,13 +55,12 @@ public class DominusOfFealty extends CardImpl {
         this.subtype.add(SubType.SPIRIT);
         this.subtype.add(SubType.AVATAR);
 
-
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
         this.addAbility(FlyingAbility.getInstance());
         Ability ability = new BeginningOfUpkeepTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn), TargetController.YOU, true);
-        ability.addEffect(new UntapTargetEffect());
+        ability.addEffect(new UntapTargetEffect().setText("If you do, untap it"));
-        ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("and it gains haste until end of turn"));
         ability.addTarget(new TargetPermanent());
         this.addAbility(ability);
     }

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

@@ -68,9 +68,9 @@ public class EldraziObligator extends CardImpl {
 
         DoIfCostPaid costPaidEffect = new DoIfCostPaid(new GainControlTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}{C}"));
         Effect untapEffect = new UntapTargetEffect();
-        untapEffect.setText("Untap that creature");        
+        untapEffect.setText("untap that creature,");
         Effect hasteEffect = new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn);
-        hasteEffect.setText("It gains haste until end of turn");
+        hasteEffect.setText("and it gains haste until end of turn");
         costPaidEffect.addEffect(untapEffect);
         costPaidEffect.addEffect(hasteEffect);
 

Mage.Sets/src/mage/cards/f/FlashConscription.java

@@ -59,11 +59,14 @@ public class FlashConscription extends CardImpl {
 
         // Untap target creature and gain control of it until end of turn. That creature gains haste until end of turn. If {W} was spent to cast Flash Conscription, the creature gains "Whenever this creature deals combat damage, you gain that much life" until end of turn.
         this.getSpellAbility().addEffect(new UntapTargetEffect());
-        this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn).setText("and gain control of it until end of turn"));
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("That creature gains haste until end of turn"));
         this.getSpellAbility().addEffect(new ConditionalContinuousEffect(
                 new GainAbilityTargetEffect(new FlashConscriptionTriggeredAbility(), Duration.EndOfTurn),
-                new ManaWasSpentCondition(ColoredManaSymbol.W), "If {W} was spent to cast {this}, the creature gains \"Whenever this creature deals combat damage, you gain that much life\" until end of turn"));
+                new ManaWasSpentCondition(ColoredManaSymbol.W),
+                "If {W} was spent to cast {this}, the creature gains "
+                + "\"Whenever this creature deals combat damage, you gain that much life\" until end of turn"
+        ));
 
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
     }

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

@@ -65,8 +65,8 @@ public class Goatnapper extends CardImpl {
         this.toughness = new MageInt(2);
         Ability ability = new EntersBattlefieldTriggeredAbility(new UntapTargetEffect(), false);
         ability.addTarget(new TargetPermanent(filter));
-        ability.addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
+        ability.addEffect(new GainControlTargetEffect(Duration.EndOfTurn).setText("and gain control of it until end of turn"));
-        ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn"));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/cards/k/KariZevsExpertise.java

@@ -63,8 +63,8 @@ public class KariZevsExpertise extends CardImpl {
         // Gain control of target creature or Vehicle until end of turn. Untap it. It gains haste until end of turn.
         this.getSpellAbility().addTarget(new TargetPermanent(filter));
         this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
-        this.getSpellAbility().addEffect(new UntapTargetEffect());
+        this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap it"));
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gans haste until end of turn."));
 
         // You may cast a card with converted mana cost 2 or less from your hand without paying its mana cost.
         this.getSpellAbility().addEffect(new CastWithoutPayingManaCostEffect(2));

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

@@ -36,9 +36,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
-import mage.filter.FilterPermanent;
+import mage.target.common.TargetArtifactPermanent;
-import mage.filter.predicate.mageobject.CardTypePredicate;
-import mage.target.TargetPermanent;
 
 /**
  *
@@ -46,20 +44,14 @@ import mage.target.TargetPermanent;
  */
 public class MetallicMastery extends CardImpl {
 
-    private static final FilterPermanent filter = new FilterPermanent("artifact");
-
-    static {
-        filter.add(new CardTypePredicate(CardType.ARTIFACT));
-    }
-
     public MetallicMastery(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}");
 
-
+        // Gain control of target artifact until end of turn. Untap that artifact. It gains haste until end of turn.
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetArtifactPermanent());
         this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap that artifact"));
-        this.getSpellAbility().addEffect(new UntapTargetEffect());
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn."));
     }
 
     public MetallicMastery(final MetallicMastery card) {

Mage.Sets/src/mage/cards/o/OgreGeargrabber.java

@@ -68,8 +68,8 @@ public class OgreGeargrabber extends CardImpl {
 
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
-        Ability ability = new AttacksTriggeredAbility(new OgreGeargrabberEffect1(), false);
+        Ability ability = new AttacksTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn), false);
-        ability.addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
+        ability.addEffect(new OgreGeargrabberEffect1());
         ability.addTarget(new TargetPermanent(1, 1, filter, false));
         this.addAbility(ability);
     }

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

@@ -58,8 +58,8 @@ public class SlaveOfBolas extends CardImpl {
 
         // Gain control of target creature. Untap that creature. It gains haste until end of turn. Sacrifice it at the beginning of the next end step.
         this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
-        this.getSpellAbility().addEffect(new UntapTargetEffect());
+        this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap that creature"));
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn"));
         this.getSpellAbility().addEffect(new SlaveOfBolasEffect());
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
     }

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

@@ -77,7 +77,7 @@ public class SpinalEmbrace extends CardImpl {
         Effect effect = new GainControlTargetEffect(Duration.EndOfTurn);
         effect.setText("and gain control of it");
         this.getSpellAbility().addEffect(effect);
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn"));
         this.getSpellAbility().addEffect(new SpinalEmbraceAddDelayedEffect());
     }
 

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

@@ -47,9 +47,9 @@ public class Threaten extends CardImpl {
     public Threaten(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}");
 
-        this.getSpellAbility().addEffect(new UntapTargetEffect());
+        this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap target creature"));
-        this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn).setText("and gain control of it until end of turn"));
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn."));
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
     }
 

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

@@ -48,13 +48,12 @@ public class TraitorousBlood extends CardImpl {
     public TraitorousBlood(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{R}{R}");
 
-
         // Gain control of target creature until end of turn. Untap it. It gains trample and haste until end of turn.
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
-        this.getSpellAbility().addEffect(new UntapTargetEffect());
+        this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap it"));
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn).setText("It gains trample"));
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("and hast until end of turn"));
     }
 
     public TraitorousBlood(final TraitorousBlood card) {

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

@@ -48,12 +48,11 @@ public class TraitorousInstinct extends CardImpl {
     public TraitorousInstinct(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{R}");
 
-
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
-        this.getSpellAbility().addEffect(new UntapTargetEffect());
+        this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap that creature"));
-        this.getSpellAbility().addEffect(new BoostTargetEffect(2, 0, Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new BoostTargetEffect(2, 0, Duration.EndOfTurn).setText("Until end of turn, it gets +2/+0"));
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("and gains haste"));
     }
 
     public TraitorousInstinct(final TraitorousInstinct card) {