From 8dcc0050b77f20e8e0fb06b2d9bd47156539391a Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 8 Apr 2014 00:01:36 +0200 Subject: [PATCH] Added Mystical Teaching --- .../avacynrestored/HomicidalSeclusion.java | 20 +++-- .../sets/timespiral/MysticalTeachings.java | 80 +++++++++++++++++++ .../OneControlledCreatureCondition.java | 8 +- .../SacrificeSourceUnlessPaysEffect.java | 9 ++- 4 files changed, 106 insertions(+), 11 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/timespiral/MysticalTeachings.java diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HomicidalSeclusion.java b/Mage.Sets/src/mage/sets/avacynrestored/HomicidalSeclusion.java index ab14e9df81..c401615569 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/HomicidalSeclusion.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/HomicidalSeclusion.java @@ -27,8 +27,8 @@ */ package mage.sets.avacynrestored; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; +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 { - 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 { // 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)); } diff --git a/Mage.Sets/src/mage/sets/timespiral/MysticalTeachings.java b/Mage.Sets/src/mage/sets/timespiral/MysticalTeachings.java new file mode 100644 index 0000000000..ef25aeb589 --- /dev/null +++ b/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 { + + + 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); + } +} diff --git a/Mage/src/mage/abilities/condition/common/OneControlledCreatureCondition.java b/Mage/src/mage/abilities/condition/common/OneControlledCreatureCondition.java index 3e609c634d..26978da8ed 100644 --- a/Mage/src/mage/abilities/condition/common/OneControlledCreatureCondition.java +++ b/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"; + } + } diff --git a/Mage/src/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java b/Mage/src/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java index 57b90b343c..e4b6147fef 100644 --- a/Mage/src/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java +++ b/Mage/src/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java @@ -39,8 +39,9 @@ public class SacrificeSourceUnlessPaysEffect extends OneShotEffect