From c8c6cdaa0ecf0004dba3737bc84abbf92f9419ff Mon Sep 17 00:00:00 2001 From: jeffwadsworth Date: Thu, 5 Jul 2012 16:32:18 -0500 Subject: [PATCH] - Added Time Stop. --- .../sets/championsofkamigawa/TimeStop.java | 52 ++++++++++++++++ .../sets/magic2012/SundialOfTheInfinite.java | 30 +--------- Mage.Sets/src/mage/sets/tenth/TimeStop.java | 60 +++++++++++++++++++ .../effects/common/EndTurnEffect.java | 57 ++++++++++++++++++ 4 files changed, 172 insertions(+), 27 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/championsofkamigawa/TimeStop.java create mode 100644 Mage.Sets/src/mage/sets/tenth/TimeStop.java create mode 100644 Mage/src/mage/abilities/effects/common/EndTurnEffect.java diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TimeStop.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TimeStop.java new file mode 100644 index 0000000000..910f95d6c7 --- /dev/null +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TimeStop.java @@ -0,0 +1,52 @@ +/* + * 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.championsofkamigawa; + +import java.util.UUID; + +/** + * + * @author jeff + */ +public class TimeStop extends mage.sets.tenth.TimeStop { + + public TimeStop(UUID ownerId) { + super(ownerId); + this.cardNumber = 97; + this.expansionSetCode = "CHK"; + } + + public TimeStop(final TimeStop card) { + super(card); + } + + @Override + public TimeStop copy() { + return new TimeStop(this); + } +} diff --git a/Mage.Sets/src/mage/sets/magic2012/SundialOfTheInfinite.java b/Mage.Sets/src/mage/sets/magic2012/SundialOfTheInfinite.java index 18aec8aa30..0f715fa595 100644 --- a/Mage.Sets/src/mage/sets/magic2012/SundialOfTheInfinite.java +++ b/Mage.Sets/src/mage/sets/magic2012/SundialOfTheInfinite.java @@ -29,7 +29,6 @@ package mage.sets.magic2012; import java.util.UUID; -import static mage.Constants.Outcome; import static mage.Constants.Zone; import mage.Constants.CardType; @@ -39,9 +38,8 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.OnlyDuringYourTurnCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; -import mage.game.Game; +import mage.abilities.effects.common.EndTurnEffect; /** * @@ -54,7 +52,7 @@ public class SundialOfTheInfinite extends CardImpl { this.expansionSetCode = "M12"; // {1}, {tap}: End the turn. Activate this ability only during your turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SundialOfTheInfiniteEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new EndTurnEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new OnlyDuringYourTurnCost()); this.addAbility(ability); @@ -68,26 +66,4 @@ public class SundialOfTheInfinite extends CardImpl { public SundialOfTheInfinite copy() { return new SundialOfTheInfinite(this); } -} - -class SundialOfTheInfiniteEffect extends OneShotEffect { - - public SundialOfTheInfiniteEffect() { - super(Outcome.Detriment); - staticText = "End the turn (Exile all spells and abilities on the stack. Discard down to your maximum hand size. Damage wears off, and \"this turn\" and \"until end of turn\" effects end.)"; - } - - public SundialOfTheInfiniteEffect(SundialOfTheInfiniteEffect effect) { - super(effect); - } - - @Override - public boolean apply(Game game, Ability source) { - return game.endTurn(source.getControllerId()); - } - - @Override - public SundialOfTheInfiniteEffect copy() { - return new SundialOfTheInfiniteEffect(this); - } -} +} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/tenth/TimeStop.java b/Mage.Sets/src/mage/sets/tenth/TimeStop.java new file mode 100644 index 0000000000..cc31a5386a --- /dev/null +++ b/Mage.Sets/src/mage/sets/tenth/TimeStop.java @@ -0,0 +1,60 @@ +/* + * 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.tenth; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.abilities.effects.common.EndTurnEffect; +import mage.cards.CardImpl; + +/** + * + * @author jeff + */ +public class TimeStop extends CardImpl { + + public TimeStop(UUID ownerId) { + super(ownerId, 117, "Time Stop", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{4}{U}{U}"); + this.expansionSetCode = "10E"; + + this.color.setBlue(true); + + // End the turn. + this.getSpellAbility().addEffect(new EndTurnEffect()); + } + + public TimeStop(final TimeStop card) { + super(card); + } + + @Override + public TimeStop copy() { + return new TimeStop(this); + } +} diff --git a/Mage/src/mage/abilities/effects/common/EndTurnEffect.java b/Mage/src/mage/abilities/effects/common/EndTurnEffect.java new file mode 100644 index 0000000000..73911aabdb --- /dev/null +++ b/Mage/src/mage/abilities/effects/common/EndTurnEffect.java @@ -0,0 +1,57 @@ +/* + * 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.abilities.effects.common; + +import mage.Constants.Outcome; +import mage.abilities.Ability; +import mage.abilities.effects.OneShotEffect; +import mage.game.Game; + +public class EndTurnEffect extends OneShotEffect { + + public EndTurnEffect() { + super(Outcome.Detriment); + staticText = "End the turn (Exile all spells and abilities on the stack. Discard down to your maximum hand size. Damage wears off, and \"this turn\" and \"until end of turn\" effects end.)"; + } + + public EndTurnEffect(EndTurnEffect effect) { + super(effect); + } + + @Override + public boolean apply(Game game, Ability source) { + return game.endTurn(source.getControllerId()); + } + + @Override + public EndTurnEffect copy() { + return new EndTurnEffect(this); + } +} +