Added Mystical Teaching

Mage.Sets/src/mage/sets/avacynrestored/HomicidalSeclusion.java

@@ -27,8 +27,8 @@
  */
 package mage.sets.avacynrestored;
 
-import mage.constants.CardType;
+import java.util.UUID;
-import mage.constants.Rarity;
+import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.condition.common.OneControlledCreatureCondition;
 import mage.abilities.decorator.ConditionalContinousEffect;
@@ -38,17 +38,17 @@ import mage.abilities.effects.common.continious.BoostControlledEffect;
 import mage.abilities.effects.common.continious.GainAbilityControlledEffect;
 import mage.abilities.keyword.LifelinkAbility;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
 import mage.constants.Duration;
+import mage.constants.Rarity;
 import mage.constants.Zone;
 
-import java.util.UUID;
-
 /**
  * @author noxx
  */
 public class HomicidalSeclusion extends CardImpl<HomicidalSeclusion> {
 
-    private static final String rule = "As long as you control exactly one creature, that creature gets +3/+1 and lifelink";
+    private static final String rule = "As long as you control exactly one creature, that creature gets +3/+1";
 
     public HomicidalSeclusion(UUID ownerId) {
         super(ownerId, 108, "Homicidal Seclusion", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{4}{B}");
@@ -59,10 +59,14 @@ public class HomicidalSeclusion extends CardImpl<HomicidalSeclusion> {
         // As long as you control exactly one creature, that creature gets +3/+1 and has lifelink.
         ContinuousEffect boostEffect = new BoostControlledEffect(3, 1, Duration.WhileOnBattlefield);
         Effect effect = new ConditionalContinousEffect(boostEffect, new OneControlledCreatureCondition(), rule);
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
+        Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect);
-
         ContinuousEffect lifelinkEffect = new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield);
-        effect = new ConditionalContinousEffect(lifelinkEffect, new OneControlledCreatureCondition(), null);
+        effect = new ConditionalContinousEffect(lifelinkEffect, new OneControlledCreatureCondition(), "and has lifelink");
+        ability.addEffect(effect);
+        this.addAbility(ability);
+
+        
+        
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
     }
 

Mage.Sets/src/mage/sets/timespiral/MysticalTeachings.java

@@ -0,0 +1,80 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.timespiral;
+
+import java.util.UUID;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect;
+import mage.abilities.keyword.FlashAbility;
+import mage.abilities.keyword.FlashbackAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.TimingRule;
+import mage.filter.FilterCard;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.AbilityPredicate;
+import mage.filter.predicate.mageobject.CardTypePredicate;
+import mage.target.common.TargetCardInLibrary;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class MysticalTeachings extends CardImpl<MysticalTeachings> {
+
+
+    private static final FilterCard filter = new FilterCard("creature an opponent controls");
+
+    static {
+        filter.add(Predicates.or(
+                new CardTypePredicate(CardType.INSTANT),
+                new AbilityPredicate(FlashAbility.class)));
+    }
+
+    public MysticalTeachings(UUID ownerId) {
+        super(ownerId, 69, "Mystical Teachings", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{U}");
+        this.expansionSetCode = "TSP";
+
+        this.color.setBlue(true);
+
+        // Search your library for an instant card or a card with flash, reveal it, and put it into your hand. Then shuffle your library.
+        this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true));
+        // Flashback {5}{B}
+        this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{B}"), TimingRule.INSTANT));
+    }
+
+    public MysticalTeachings(final MysticalTeachings card) {
+        super(card);
+    }
+
+    @Override
+    public MysticalTeachings copy() {
+        return new MysticalTeachings(this);
+    }
+}

Mage/src/mage/abilities/condition/common/OneControlledCreatureCondition.java

@@ -37,7 +37,7 @@ import mage.game.Game;
  */
 public class OneControlledCreatureCondition implements Condition {
 
-    private static OneControlledCreatureCondition fInstance = new OneControlledCreatureCondition();
+    private static final OneControlledCreatureCondition fInstance = new OneControlledCreatureCondition();
 
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
 
@@ -49,4 +49,10 @@ public class OneControlledCreatureCondition implements Condition {
     public boolean apply(Game game, Ability source) {
         return game.getBattlefield().countAll(filter, source.getControllerId(), game) == 1;
     }
+
+    @Override
+    public String toString() {
+        return "you control exactly one creature";
+    }
+
 }

Mage/src/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java

@@ -39,8 +39,9 @@ public class SacrificeSourceUnlessPaysEffect extends OneShotEffect<SacrificeSour
             }
             if (player.chooseUse(Outcome.Benefit, sb.toString(), game)) {
                 cost.clearPaid();
-                if (cost.pay(source, game, source.getSourceId(), source.getControllerId(), false))
+                if (cost.pay(source, game, source.getSourceId(), source.getControllerId(), false)) {
                     return true;
+                }
             }
             permanent.sacrifice(source.getSourceId(), game);
             return true;
@@ -57,7 +58,11 @@ public class SacrificeSourceUnlessPaysEffect extends OneShotEffect<SacrificeSour
     public String getText(Mode mode) {
             StringBuilder sb = new StringBuilder("sacrifice {this} unless you ");
             String costText = cost.getText();
-            if (costText.toLowerCase().startsWith("discard") || costText.toLowerCase().startsWith("remove") || costText.toLowerCase().startsWith("return") || costText.toLowerCase().startsWith("exile")) {
+            if (costText.toLowerCase().startsWith("discard") 
+                    || costText.toLowerCase().startsWith("remove")
+                    || costText.toLowerCase().startsWith("return")
+                    || costText.toLowerCase().startsWith("exile")
+                    || costText.toLowerCase().startsWith("sacrifice")) {
                 sb.append(costText.substring(0, 1).toLowerCase());
                 sb.append(costText.substring(1));
             }