From d4fa72c6521a69839b68ae862396eb548bc8b732 Mon Sep 17 00:00:00 2001 From: Loki Date: Tue, 20 Dec 2011 02:34:11 +0400 Subject: [PATCH] fix Diabolic Tutor type, 3 TSP --- .../src/mage/sets/tenth/DiabolicTutor.java | 2 +- .../src/mage/sets/timespiral/Bewilder.java | 67 ++++++++++++++++++ .../src/mage/sets/timespiral/Fortify.java | 66 ++++++++++++++++++ .../mage/sets/timespiral/JeditsDragoons.java | 68 +++++++++++++++++++ 4 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 Mage.Sets/src/mage/sets/timespiral/Bewilder.java create mode 100644 Mage.Sets/src/mage/sets/timespiral/Fortify.java create mode 100644 Mage.Sets/src/mage/sets/timespiral/JeditsDragoons.java diff --git a/Mage.Sets/src/mage/sets/tenth/DiabolicTutor.java b/Mage.Sets/src/mage/sets/tenth/DiabolicTutor.java index cf0db58c0f9..3d73258f1be 100644 --- a/Mage.Sets/src/mage/sets/tenth/DiabolicTutor.java +++ b/Mage.Sets/src/mage/sets/tenth/DiabolicTutor.java @@ -42,7 +42,7 @@ import mage.target.common.TargetCardInLibrary; public class DiabolicTutor extends CardImpl { public DiabolicTutor(UUID ownerId){ - super(ownerId, 135, "Diabolic Tutor", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT},"{2}{B}{B}"); + super(ownerId, 135, "Diabolic Tutor", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY},"{2}{B}{B}"); this.expansionSetCode = "10E"; this.color.setBlack(true); TargetCardInLibrary target = new TargetCardInLibrary(); diff --git a/Mage.Sets/src/mage/sets/timespiral/Bewilder.java b/Mage.Sets/src/mage/sets/timespiral/Bewilder.java new file mode 100644 index 00000000000..0900d33384b --- /dev/null +++ b/Mage.Sets/src/mage/sets/timespiral/Bewilder.java @@ -0,0 +1,67 @@ +/* + * 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.Constants; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.abilities.effects.common.DrawCardEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; +import mage.cards.CardImpl; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author Loki + */ +public class Bewilder extends CardImpl { + + public Bewilder(UUID ownerId) { + super(ownerId, 49, "Bewilder", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}"); + this.expansionSetCode = "TSP"; + + this.color.setBlue(true); + + // Target creature gets -3/-0 until end of turn. + this.getSpellAbility().addEffect(new BoostTargetEffect(-3, 0, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); + // Draw a card. + this.getSpellAbility().addEffect(new DrawCardEffect(1)); + } + + public Bewilder(final Bewilder card) { + super(card); + } + + @Override + public Bewilder copy() { + return new Bewilder(this); + } +} diff --git a/Mage.Sets/src/mage/sets/timespiral/Fortify.java b/Mage.Sets/src/mage/sets/timespiral/Fortify.java new file mode 100644 index 00000000000..d16990341f5 --- /dev/null +++ b/Mage.Sets/src/mage/sets/timespiral/Fortify.java @@ -0,0 +1,66 @@ +/* + * 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.Constants; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.abilities.Mode; +import mage.abilities.effects.common.continious.BoostControlledEffect; +import mage.cards.CardImpl; + +/** + * + * @author Loki + */ +public class Fortify extends CardImpl { + + public Fortify(UUID ownerId) { + super(ownerId, 19, "Fortify", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); + this.expansionSetCode = "TSP"; + + this.color.setWhite(true); + + // Choose one - Creatures you control get +2/+0 until end of turn; or creatures you control get +0/+2 until end of turn. + this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Constants.Duration.EndOfTurn)); + Mode mode = new Mode(); + mode.getEffects().add(new BoostControlledEffect(0, 2, Constants.Duration.EndOfTurn)); + this.getSpellAbility().addMode(mode); + } + + public Fortify(final Fortify card) { + super(card); + } + + @Override + public Fortify copy() { + return new Fortify(this); + } +} diff --git a/Mage.Sets/src/mage/sets/timespiral/JeditsDragoons.java b/Mage.Sets/src/mage/sets/timespiral/JeditsDragoons.java new file mode 100644 index 00000000000..4c2d6f1c0a0 --- /dev/null +++ b/Mage.Sets/src/mage/sets/timespiral/JeditsDragoons.java @@ -0,0 +1,68 @@ +/* + * 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.Constants.CardType; +import mage.Constants.Rarity; +import mage.MageInt; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.effects.common.GainLifeEffect; +import mage.abilities.keyword.VigilanceAbility; +import mage.cards.CardImpl; + +/** + * + * @author Loki + */ +public class JeditsDragoons extends CardImpl { + + public JeditsDragoons(UUID ownerId) { + super(ownerId, 25, "Jedit's Dragoons", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{W}"); + this.expansionSetCode = "TSP"; + this.subtype.add("Cat"); + this.subtype.add("Soldier"); + + this.color.setWhite(true); + this.power = new MageInt(2); + this.toughness = new MageInt(5); + + this.addAbility(VigilanceAbility.getInstance()); + // When Jedit's Dragoons enters the battlefield, you gain 4 life. + this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(4), false)); + } + + public JeditsDragoons(final JeditsDragoons card) { + super(card); + } + + @Override + public JeditsDragoons copy() { + return new JeditsDragoons(this); + } +}