From 7e2ec0ffa99aec02f57140d07154c605f40395e4 Mon Sep 17 00:00:00 2001 From: hanasu Date: Fri, 18 Sep 2015 09:40:22 -0400 Subject: [PATCH 1/7] [HML] Implemented 3 cards --- .../mage/sets/homelands/ClockworkGnomes.java | 54 +++++++++++++ .../sets/homelands/GrandmotherSengir.java | 52 +++++++++++++ .../sets/homelands/RevekaWizardSavant.java | 54 +++++++++++++ .../masterseditionii/GrandmotherSengir.java | 74 ++++++++++++++++++ .../masterseditioniii/RevekaWizardSavant.java | 74 ++++++++++++++++++ .../masterseditioniv/ClockworkGnomes.java | 78 +++++++++++++++++++ 6 files changed, 386 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/homelands/ClockworkGnomes.java create mode 100644 Mage.Sets/src/mage/sets/homelands/GrandmotherSengir.java create mode 100644 Mage.Sets/src/mage/sets/homelands/RevekaWizardSavant.java create mode 100644 Mage.Sets/src/mage/sets/masterseditionii/GrandmotherSengir.java create mode 100644 Mage.Sets/src/mage/sets/masterseditioniii/RevekaWizardSavant.java create mode 100644 Mage.Sets/src/mage/sets/masterseditioniv/ClockworkGnomes.java diff --git a/Mage.Sets/src/mage/sets/homelands/ClockworkGnomes.java b/Mage.Sets/src/mage/sets/homelands/ClockworkGnomes.java new file mode 100644 index 00000000000..d46a6c006b4 --- /dev/null +++ b/Mage.Sets/src/mage/sets/homelands/ClockworkGnomes.java @@ -0,0 +1,54 @@ +/* + * 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.homelands; + +import java.util.UUID; +import mage.constants.Rarity; + +/** + * + * @author hanasu + */ +public class ClockworkGnomes extends mage.sets.masterseditioniv.ClockworkGnomes { + + public ClockworkGnomes(UUID ownerId) { + super(ownerId); + this.cardNumber = 127; + this.expansionSetCode = "HML"; + this.rarity = Rarity.COMMON; + } + + public ClockworkGnomes(final ClockworkGnomes card) { + super(card); + } + + @Override + public ClockworkGnomes copy() { + return new ClockworkGnomes(this); + } +} diff --git a/Mage.Sets/src/mage/sets/homelands/GrandmotherSengir.java b/Mage.Sets/src/mage/sets/homelands/GrandmotherSengir.java new file mode 100644 index 00000000000..a1b27a00df1 --- /dev/null +++ b/Mage.Sets/src/mage/sets/homelands/GrandmotherSengir.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.homelands; + +import java.util.UUID; + +/** + * + * @author hanasu + */ +public class GrandmotherSengir extends mage.sets.masterseditionii.GrandmotherSengir { + + public GrandmotherSengir(UUID ownerId) { + super(ownerId); + this.cardNumber = 13; + this.expansionSetCode = "HML"; + } + + public GrandmotherSengir(final GrandmotherSengir card) { + super(card); + } + + @Override + public GrandmotherSengir copy() { + return new GrandmotherSengir(this); + } +} diff --git a/Mage.Sets/src/mage/sets/homelands/RevekaWizardSavant.java b/Mage.Sets/src/mage/sets/homelands/RevekaWizardSavant.java new file mode 100644 index 00000000000..8a878245f28 --- /dev/null +++ b/Mage.Sets/src/mage/sets/homelands/RevekaWizardSavant.java @@ -0,0 +1,54 @@ +/* + * 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.homelands; + +import java.util.UUID; +import mage.constants.Rarity; + +/** + * + * @author hanasu + */ +public class RevekaWizardSavant extends mage.sets.masterseditioniii.RevekaWizardSavant { + + public RevekaWizardSavant(UUID ownerId) { + super(ownerId); + this.cardNumber = 47; + this.expansionSetCode = "HML"; + this.rarity = Rarity.RARE; + } + + public RevekaWizardSavant(final RevekaWizardSavant card) { + super(card); + } + + @Override + public RevekaWizardSavant copy() { + return new RevekaWizardSavant(this); + } +} diff --git a/Mage.Sets/src/mage/sets/masterseditionii/GrandmotherSengir.java b/Mage.Sets/src/mage/sets/masterseditionii/GrandmotherSengir.java new file mode 100644 index 00000000000..5a1ea84a567 --- /dev/null +++ b/Mage.Sets/src/mage/sets/masterseditionii/GrandmotherSengir.java @@ -0,0 +1,74 @@ +/* + * 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.masterseditionii; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.common.continuous.BoostTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author hanasu + */ +public class GrandmotherSengir extends CardImpl { + + public GrandmotherSengir(UUID ownerId) { + super(ownerId, 93, "Grandmother Sengir", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{B}"); + this.expansionSetCode = "ME2"; + this.supertype.add("Legendary"); + this.subtype.add("Human"); + this.subtype.add("Wizard"); + this.power = new MageInt(3); + this.toughness = new MageInt(3); + + // {1}{B}, {tap}: Target creature gets -1/-1 until end of turn. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl("{1}{B}")); + ability.addCost(new TapSourceCost()); + ability.addTarget(new TargetCreaturePermanent()); + this.addAbility(ability); + } + + public GrandmotherSengir(final GrandmotherSengir card) { + super(card); + } + + @Override + public GrandmotherSengir copy() { + return new GrandmotherSengir(this); + } +} diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/RevekaWizardSavant.java b/Mage.Sets/src/mage/sets/masterseditioniii/RevekaWizardSavant.java new file mode 100644 index 00000000000..2416727587a --- /dev/null +++ b/Mage.Sets/src/mage/sets/masterseditioniii/RevekaWizardSavant.java @@ -0,0 +1,74 @@ +/* + * 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.masterseditioniii; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.common.DamageControllerEffect; +import mage.abilities.effects.common.DamageTargetEffect; +import mage.abilities.effects.common.DontUntapInControllersNextUntapStepSourceEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.target.common.TargetCreatureOrPlayer; + +/** + * + * @author hanasu + */ +public class RevekaWizardSavant extends CardImpl { + + public RevekaWizardSavant(UUID ownerId) { + super(ownerId, 49, "Reveka, Wizard Savant", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); + this.expansionSetCode = "ME3"; + this.supertype.add("Legendary"); + this.subtype.add("Dwarf"); + this.subtype.add("Wizard"); + this.power = new MageInt(0); + this.toughness = new MageInt(1); + + // {tap}: Reveka, Wizard Savant deals 2 damage to target creature or player and doesn't untap during your next untap step. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + ability.addTarget(new TargetCreatureOrPlayer()); + ability.addEffect(new DontUntapInControllersNextUntapStepSourceEffect()); + this.addAbility(ability); + } + + public RevekaWizardSavant(final RevekaWizardSavant card) { + super(card); + } + + @Override + public RevekaWizardSavant copy() { + return new RevekaWizardSavant(this); + } +} diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/ClockworkGnomes.java b/Mage.Sets/src/mage/sets/masterseditioniv/ClockworkGnomes.java new file mode 100644 index 00000000000..d56765d987f --- /dev/null +++ b/Mage.Sets/src/mage/sets/masterseditioniv/ClockworkGnomes.java @@ -0,0 +1,78 @@ +/* + * 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.masterseditioniv; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.common.RegenerateTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.CardTypePredicate; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author hanasu + */ +public class ClockworkGnomes extends CardImpl { + + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("artifact creature"); + + static { + filter.add(new CardTypePredicate(CardType.ARTIFACT)); + } + + public ClockworkGnomes(UUID ownerId) { + super(ownerId, 191, "Clockwork Gnomes", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}"); + this.expansionSetCode = "ME4"; + this.subtype.add("Gnome"); + this.power = new MageInt(2); + this.toughness = new MageInt(2); + + // {3}, {tap}: Regenerate target artifact creature. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{3}")); + ability.addCost(new TapSourceCost()); + ability.addTarget(new TargetCreaturePermanent(filter)); + } + + public ClockworkGnomes(final ClockworkGnomes card) { + super(card); + } + + @Override + public ClockworkGnomes copy() { + return new ClockworkGnomes(this); + } +} From cf12430787bc857302904b1fe43ccf6cec05276b Mon Sep 17 00:00:00 2001 From: odowdb Date: Fri, 18 Sep 2015 15:17:39 -0400 Subject: [PATCH 2/7] Fix for Dredge tooltip reporting incorrect number of cards --- Mage/src/mage/abilities/keyword/DredgeAbility.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/mage/abilities/keyword/DredgeAbility.java b/Mage/src/mage/abilities/keyword/DredgeAbility.java index afed19ef46b..44ff99b07ff 100644 --- a/Mage/src/mage/abilities/keyword/DredgeAbility.java +++ b/Mage/src/mage/abilities/keyword/DredgeAbility.java @@ -71,7 +71,7 @@ class DredgeEffect extends ReplacementEffectImpl { super(Duration.WhileInGraveyard, Outcome.ReturnToHand); this.amount = value; this.staticText = new StringBuilder("Dredge ").append(Integer.toString(value)) - .append(" (If you would draw a card, instead you may put exactly three cards from the top of your library into your graveyard. If you do, return this card from your graveyard to your hand. Otherwise, draw a card.)").toString(); + .append(" (If you would draw a card, instead you may put exactly " + value + " card(s) from the top of your library into your graveyard. If you do, return this card from your graveyard to your hand. Otherwise, draw a card.)").toString(); } public DredgeEffect(final DredgeEffect effect) { From 3c840db8716309b19bd3d2855e599d8a914dd35b Mon Sep 17 00:00:00 2001 From: hanasu Date: Fri, 18 Sep 2015 15:22:27 -0400 Subject: [PATCH 3/7] [LEG] Implemented 3 cards --- .../mage/sets/legends/GhostsOfTheDamned.java | 52 ++++++++++ .../src/mage/sets/legends/PixieQueen.java | 76 +++++++++++++++ .../src/mage/sets/legends/StormSeeker.java | 52 ++++++++++ .../mage/sets/mastersedition/StormSeeker.java | 95 +++++++++++++++++++ .../masterseditioniii/GhostsOfTheDamned.java | 70 ++++++++++++++ 5 files changed, 345 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/legends/GhostsOfTheDamned.java create mode 100644 Mage.Sets/src/mage/sets/legends/PixieQueen.java create mode 100644 Mage.Sets/src/mage/sets/legends/StormSeeker.java create mode 100644 Mage.Sets/src/mage/sets/mastersedition/StormSeeker.java create mode 100644 Mage.Sets/src/mage/sets/masterseditioniii/GhostsOfTheDamned.java diff --git a/Mage.Sets/src/mage/sets/legends/GhostsOfTheDamned.java b/Mage.Sets/src/mage/sets/legends/GhostsOfTheDamned.java new file mode 100644 index 00000000000..3f713ceaa40 --- /dev/null +++ b/Mage.Sets/src/mage/sets/legends/GhostsOfTheDamned.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.legends; + +import java.util.UUID; + +/** + * + * @author hanasu + */ +public class GhostsOfTheDamned extends mage.sets.masterseditioniii.GhostsOfTheDamned { + + public GhostsOfTheDamned(UUID ownerId) { + super(ownerId); + this.cardNumber = 12; + this.expansionSetCode = "LEG"; + } + + public GhostsOfTheDamned(final GhostsOfTheDamned card) { + super(card); + } + + @Override + public GhostsOfTheDamned copy() { + return new GhostsOfTheDamned(this); + } +} diff --git a/Mage.Sets/src/mage/sets/legends/PixieQueen.java b/Mage.Sets/src/mage/sets/legends/PixieQueen.java new file mode 100644 index 00000000000..1bfe612f28b --- /dev/null +++ b/Mage.Sets/src/mage/sets/legends/PixieQueen.java @@ -0,0 +1,76 @@ +/* + * 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.legends; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; +import mage.abilities.keyword.FlyingAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author hanasu + */ +public class PixieQueen extends CardImpl { + + public PixieQueen(UUID ownerId) { + super(ownerId, 110, "Pixie Queen", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); + this.expansionSetCode = "LEG"; + this.subtype.add("Faerie"); + this.power = new MageInt(1); + this.toughness = new MageInt(1); + + // Flying + this.addAbility(FlyingAbility.getInstance()); + + // {G}{G}{G}, {tap}: Target creature gains flying until end of turn. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{G}{G}{G}")); + ability.addTarget(new TargetCreaturePermanent()); + ability.addCost(new TapSourceCost()); + this.addAbility(ability); + } + + public PixieQueen(final PixieQueen card) { + super(card); + } + + @Override + public PixieQueen copy() { + return new PixieQueen(this); + } +} diff --git a/Mage.Sets/src/mage/sets/legends/StormSeeker.java b/Mage.Sets/src/mage/sets/legends/StormSeeker.java new file mode 100644 index 00000000000..53dd9ddc226 --- /dev/null +++ b/Mage.Sets/src/mage/sets/legends/StormSeeker.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.legends; + +import java.util.UUID; + +/** + * + * @author hanasu + */ +public class StormSeeker extends mage.sets.mastersedition.StormSeeker { + + public StormSeeker(UUID ownerId) { + super(ownerId); + this.cardNumber = 119; + this.expansionSetCode = "LEG"; + } + + public StormSeeker(final StormSeeker card) { + super(card); + } + + @Override + public StormSeeker copy() { + return new StormSeeker(this); + } +} diff --git a/Mage.Sets/src/mage/sets/mastersedition/StormSeeker.java b/Mage.Sets/src/mage/sets/mastersedition/StormSeeker.java new file mode 100644 index 00000000000..d2aca3cc6b1 --- /dev/null +++ b/Mage.Sets/src/mage/sets/mastersedition/StormSeeker.java @@ -0,0 +1,95 @@ +/* + * 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.mastersedition; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.DamageTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.game.Game; +import mage.players.Player; +import mage.target.TargetPlayer; + +/** + * + * @author hanasu + */ +public class StormSeeker extends CardImpl { + + public StormSeeker(UUID ownerId) { + super(ownerId, 132, "Storm Seeker", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{G}"); + this.expansionSetCode = "MED"; + + // Storm Seeker deals damage to target player equal to the number of cards in that player's hand. + Effect effect = new DamageTargetEffect(new TargetPlayerCardsInHandCount()); + effect.setText("{this} deals damage to target player equal to the number of cards in that player's hand."); + this.getSpellAbility().addEffect(effect); + this.getSpellAbility().addTarget(new TargetPlayer()); + } + + public StormSeeker(final StormSeeker card) { + super(card); + } + + @Override + public StormSeeker copy() { + return new StormSeeker(this); + } +} + +class TargetPlayerCardsInHandCount implements DynamicValue { + + @Override + public int calculate(Game game, Ability sourceAbility, Effect effect) { + Player targetPlayer = game.getPlayer(sourceAbility.getFirstTarget()); + if (targetPlayer != null) { + return targetPlayer.getHand().size(); + } + + return 0; + } + + @Override + public DynamicValue copy() { + return new TargetPlayerCardsInHandCount(); + } + + @Override + public String toString() { + return "1"; + } + + @Override + public String getMessage() { + return "target player's cards in hand"; + } +} diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/GhostsOfTheDamned.java b/Mage.Sets/src/mage/sets/masterseditioniii/GhostsOfTheDamned.java new file mode 100644 index 00000000000..e2d6369df47 --- /dev/null +++ b/Mage.Sets/src/mage/sets/masterseditioniii/GhostsOfTheDamned.java @@ -0,0 +1,70 @@ +/* + * 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.masterseditioniii; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.common.continuous.BoostTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author hanasu + */ +public class GhostsOfTheDamned extends CardImpl { + + public GhostsOfTheDamned(UUID ownerId) { + super(ownerId, 68, "Ghosts of the Damned", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}{B}"); + this.expansionSetCode = "ME3"; + this.subtype.add("Spirit"); + this.power = new MageInt(0); + this.toughness = new MageInt(2); + + // {tap}: Target creature gets -1/-0 until end of turn. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, 0, Duration.EndOfTurn), new TapSourceCost()); + ability.addTarget(new TargetCreaturePermanent()); + this.addAbility(ability); + } + + public GhostsOfTheDamned(final GhostsOfTheDamned card) { + super(card); + } + + @Override + public GhostsOfTheDamned copy() { + return new GhostsOfTheDamned(this); + } +} From 37d4acff2e89480b033972822327c7988826fc81 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 18 Sep 2015 15:36:03 -0400 Subject: [PATCH 4/7] Revert "Fix for Dredge tooltip reporting incorrect number of cards" This reverts commit cf12430787bc857302904b1fe43ccf6cec05276b. Incorrect username on commit. --- Mage/src/mage/abilities/keyword/DredgeAbility.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/mage/abilities/keyword/DredgeAbility.java b/Mage/src/mage/abilities/keyword/DredgeAbility.java index 44ff99b07ff..afed19ef46b 100644 --- a/Mage/src/mage/abilities/keyword/DredgeAbility.java +++ b/Mage/src/mage/abilities/keyword/DredgeAbility.java @@ -71,7 +71,7 @@ class DredgeEffect extends ReplacementEffectImpl { super(Duration.WhileInGraveyard, Outcome.ReturnToHand); this.amount = value; this.staticText = new StringBuilder("Dredge ").append(Integer.toString(value)) - .append(" (If you would draw a card, instead you may put exactly " + value + " card(s) from the top of your library into your graveyard. If you do, return this card from your graveyard to your hand. Otherwise, draw a card.)").toString(); + .append(" (If you would draw a card, instead you may put exactly three cards from the top of your library into your graveyard. If you do, return this card from your graveyard to your hand. Otherwise, draw a card.)").toString(); } public DredgeEffect(final DredgeEffect effect) { From 85e71fa162e6248ebd79ec800e9f66d6cd68de70 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 18 Sep 2015 15:38:34 -0400 Subject: [PATCH 5/7] Fixed issue with Dredge reminder text always indicating three cards --- Mage/src/mage/abilities/keyword/DredgeAbility.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/mage/abilities/keyword/DredgeAbility.java b/Mage/src/mage/abilities/keyword/DredgeAbility.java index afed19ef46b..44ff99b07ff 100644 --- a/Mage/src/mage/abilities/keyword/DredgeAbility.java +++ b/Mage/src/mage/abilities/keyword/DredgeAbility.java @@ -71,7 +71,7 @@ class DredgeEffect extends ReplacementEffectImpl { super(Duration.WhileInGraveyard, Outcome.ReturnToHand); this.amount = value; this.staticText = new StringBuilder("Dredge ").append(Integer.toString(value)) - .append(" (If you would draw a card, instead you may put exactly three cards from the top of your library into your graveyard. If you do, return this card from your graveyard to your hand. Otherwise, draw a card.)").toString(); + .append(" (If you would draw a card, instead you may put exactly " + value + " card(s) from the top of your library into your graveyard. If you do, return this card from your graveyard to your hand. Otherwise, draw a card.)").toString(); } public DredgeEffect(final DredgeEffect effect) { From 899e2921f0a0ed8cc0fcff7b5fc0f75413579c28 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 18 Sep 2015 15:39:43 -0400 Subject: [PATCH 6/7] Revert "Fixed issue with Dredge reminder text always indicating three cards" This reverts commit 85e71fa162e6248ebd79ec800e9f66d6cd68de70. Username incorrectly specified. --- Mage/src/mage/abilities/keyword/DredgeAbility.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/mage/abilities/keyword/DredgeAbility.java b/Mage/src/mage/abilities/keyword/DredgeAbility.java index 44ff99b07ff..afed19ef46b 100644 --- a/Mage/src/mage/abilities/keyword/DredgeAbility.java +++ b/Mage/src/mage/abilities/keyword/DredgeAbility.java @@ -71,7 +71,7 @@ class DredgeEffect extends ReplacementEffectImpl { super(Duration.WhileInGraveyard, Outcome.ReturnToHand); this.amount = value; this.staticText = new StringBuilder("Dredge ").append(Integer.toString(value)) - .append(" (If you would draw a card, instead you may put exactly " + value + " card(s) from the top of your library into your graveyard. If you do, return this card from your graveyard to your hand. Otherwise, draw a card.)").toString(); + .append(" (If you would draw a card, instead you may put exactly three cards from the top of your library into your graveyard. If you do, return this card from your graveyard to your hand. Otherwise, draw a card.)").toString(); } public DredgeEffect(final DredgeEffect effect) { From 04f6686ff5e4765bb88525eb86443f65a6536b7b Mon Sep 17 00:00:00 2001 From: hanasu Date: Fri, 18 Sep 2015 15:42:08 -0400 Subject: [PATCH 7/7] Fixed issue with Dredge ability reminder text having wrong number of cards --- Mage/src/mage/abilities/keyword/DredgeAbility.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/mage/abilities/keyword/DredgeAbility.java b/Mage/src/mage/abilities/keyword/DredgeAbility.java index afed19ef46b..44ff99b07ff 100644 --- a/Mage/src/mage/abilities/keyword/DredgeAbility.java +++ b/Mage/src/mage/abilities/keyword/DredgeAbility.java @@ -71,7 +71,7 @@ class DredgeEffect extends ReplacementEffectImpl { super(Duration.WhileInGraveyard, Outcome.ReturnToHand); this.amount = value; this.staticText = new StringBuilder("Dredge ").append(Integer.toString(value)) - .append(" (If you would draw a card, instead you may put exactly three cards from the top of your library into your graveyard. If you do, return this card from your graveyard to your hand. Otherwise, draw a card.)").toString(); + .append(" (If you would draw a card, instead you may put exactly " + value + " card(s) from the top of your library into your graveyard. If you do, return this card from your graveyard to your hand. Otherwise, draw a card.)").toString(); } public DredgeEffect(final DredgeEffect effect) {