From 85181298d0e5c7f9ad8b8f4dfed8336c84a3fcad Mon Sep 17 00:00:00 2001 From: Jeff Date: Mon, 15 Jul 2013 15:06:07 -0500 Subject: [PATCH 1/3] - Added Skyshroud Ranger and Doubling Cube. --- .../src/mage/sets/fifthdawn/DoublingCube.java | 52 ++++++++ .../mage/sets/tempest/SkyshroudRanger.java | 103 +++++++++++++++ .../src/mage/sets/tenth/DoublingCube.java | 122 ++++++++++++++++++ .../src/mage/sets/tenth/SkyshroudRanger.java | 52 ++++++++ 4 files changed, 329 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/fifthdawn/DoublingCube.java create mode 100644 Mage.Sets/src/mage/sets/tempest/SkyshroudRanger.java create mode 100644 Mage.Sets/src/mage/sets/tenth/DoublingCube.java create mode 100644 Mage.Sets/src/mage/sets/tenth/SkyshroudRanger.java diff --git a/Mage.Sets/src/mage/sets/fifthdawn/DoublingCube.java b/Mage.Sets/src/mage/sets/fifthdawn/DoublingCube.java new file mode 100644 index 0000000000..0948bf9cea --- /dev/null +++ b/Mage.Sets/src/mage/sets/fifthdawn/DoublingCube.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.fifthdawn; + +import java.util.UUID; + +/** + * + * @author jeffwadsworth + */ +public class DoublingCube extends mage.sets.tenth.DoublingCube { + + public DoublingCube(UUID ownerId) { + super(ownerId); + this.cardNumber = 116; + this.expansionSetCode = "5DN"; + } + + public DoublingCube(final DoublingCube card) { + super(card); + } + + @Override + public DoublingCube copy() { + return new DoublingCube(this); + } +} diff --git a/Mage.Sets/src/mage/sets/tempest/SkyshroudRanger.java b/Mage.Sets/src/mage/sets/tempest/SkyshroudRanger.java new file mode 100644 index 0000000000..8b7ab5fbc8 --- /dev/null +++ b/Mage.Sets/src/mage/sets/tempest/SkyshroudRanger.java @@ -0,0 +1,103 @@ +/* + * 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.tempest; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.ActivateAsSorceryActivatedAbility; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.OneShotEffect; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.common.FilterLandCard; +import mage.game.Game; +import mage.target.common.TargetCardInHand; + +/** + * + * @author jeffwadsworth + */ +public class SkyshroudRanger extends CardImpl { + + public SkyshroudRanger(UUID ownerId) { + super(ownerId, 150, "Skyshroud Ranger", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}"); + this.expansionSetCode = "TMP"; + this.subtype.add("Elf"); + + this.color.setGreen(true); + this.power = new MageInt(1); + this.toughness = new MageInt(1); + + // {tap}: You may put a land card from your hand onto the battlefield. Activate this ability only any time you could cast a sorcery. + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new SkyshroudRangerEffect(), new TapSourceCost()); + ability.addTarget(new TargetCardInHand(0, 1, new FilterLandCard())); + this.addAbility(ability); + + } + + public SkyshroudRanger(final SkyshroudRanger card) { + super(card); + } + + @Override + public SkyshroudRanger copy() { + return new SkyshroudRanger(this); + } +} + +class SkyshroudRangerEffect extends OneShotEffect { + + SkyshroudRangerEffect() { + super(Outcome.PutLandInPlay); + staticText = "You may put a land card from your hand onto the battlefield. Activate this ability only any time you could cast a sorcery"; + } + + SkyshroudRangerEffect(final SkyshroudRangerEffect effect) { + super(effect); + } + + @Override + public boolean apply(Game game, Ability source) { + Card card = game.getCard(targetPointer.getFirst(game, source)); + if (card != null) { + card.moveToZone(Zone.BATTLEFIELD, source.getSourceId(), game, false); + } + return true; + } + + @Override + public SkyshroudRangerEffect copy() { + return new SkyshroudRangerEffect(this); + } + + } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/tenth/DoublingCube.java b/Mage.Sets/src/mage/sets/tenth/DoublingCube.java new file mode 100644 index 0000000000..6d4fd91ca8 --- /dev/null +++ b/Mage.Sets/src/mage/sets/tenth/DoublingCube.java @@ -0,0 +1,122 @@ +/* + * 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.Mana; +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.OneShotEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.game.Game; +import mage.players.Player; + +/** + * + * @author jeffwadsworth + */ +public class DoublingCube extends CardImpl { + + public DoublingCube(UUID ownerId) { + super(ownerId, 321, "Doubling Cube", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{2}"); + this.expansionSetCode = "10E"; + + // {3}, {tap}: Double the amount of each type of mana in your mana pool. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DoublingCubeEffect(), new ManaCostsImpl("{3}")); + ability.addCost(new TapSourceCost()); + this.addAbility(ability); + + } + + public DoublingCube(final DoublingCube card) { + super(card); + } + + @Override + public DoublingCube copy() { + return new DoublingCube(this); + } +} + +class DoublingCubeEffect extends OneShotEffect { + + DoublingCubeEffect() { + super(Outcome.Benefit); + staticText = "Double the amount of each type of mana in your mana pool"; + } + + DoublingCubeEffect(final DoublingCubeEffect effect) { + super(effect); + } + + @Override + public boolean apply(Game game, Ability source) { + Player you = game.getPlayer(source.getControllerId()); + if (you == null) { + return false; + } + int blackMana = you.getManaPool().getBlack() * 2; + int whiteMana = you.getManaPool().getWhite() * 2; + int blueMana = you.getManaPool().getBlue() * 2; + int greenMana = you.getManaPool().getGreen() * 2; + int redMana = you.getManaPool().getRed() * 2; + int colorlessMana = you.getManaPool().getColorless() * 2; + + for (int i=0; i Date: Mon, 15 Jul 2013 16:58:22 -0500 Subject: [PATCH 2/3] - Added Dimir Doppelganger. Fixed text Skyshroud Ranger. --- .../mage/sets/ravnika/DimirDoppelganger.java | 145 ++++++++++++++++++ .../mage/sets/tempest/SkyshroudRanger.java | 2 +- 2 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 Mage.Sets/src/mage/sets/ravnika/DimirDoppelganger.java diff --git a/Mage.Sets/src/mage/sets/ravnika/DimirDoppelganger.java b/Mage.Sets/src/mage/sets/ravnika/DimirDoppelganger.java new file mode 100644 index 0000000000..c932ebdbe8 --- /dev/null +++ b/Mage.Sets/src/mage/sets/ravnika/DimirDoppelganger.java @@ -0,0 +1,145 @@ +/* + * 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.ravnika; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.ContinuousEffectImpl; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.constants.Zone; +import mage.filter.common.FilterCreatureCard; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.target.common.TargetCardInGraveyard; + +/** + * + * @author jeffwadsworth + */ +public class DimirDoppelganger extends CardImpl { + + public DimirDoppelganger(UUID ownerId) { + super(ownerId, 202, "Dimir Doppelganger", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{U}{B}"); + this.expansionSetCode = "RAV"; + this.subtype.add("Shapeshifter"); + + this.color.setBlue(true); + this.color.setBlack(true); + this.power = new MageInt(0); + this.toughness = new MageInt(2); + + // {1}{U}{B}: Exile target creature card from a graveyard. Dimir Doppelganger becomes a copy of that card and gains this ability. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DimirDoppelgangerEffect(), new ManaCostsImpl("{1}{U}{B}")); + ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card in a graveyard"))); + this.addAbility(ability); + + } + + public DimirDoppelganger(final DimirDoppelganger card) { + super(card); + } + + @Override + public DimirDoppelganger copy() { + return new DimirDoppelganger(this); + } +} + +class DimirDoppelgangerEffect extends ContinuousEffectImpl { + + public DimirDoppelgangerEffect() { + super(Duration.WhileOnBattlefield, Layer.CopyEffects_1, SubLayer.NA, Outcome.BecomeCreature); + staticText = "Exile target creature card from a graveyard. {this} becomes a copy of that card and gains this ability"; + } + + public DimirDoppelgangerEffect(final DimirDoppelgangerEffect effect) { + super(effect); + } + + @Override + public DimirDoppelgangerEffect copy() { + return new DimirDoppelgangerEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Card card = game.getCard(source.getFirstTarget()); + Permanent permanent = game.getPermanent(source.getSourceId()); + if (card == null || permanent == null) { + return false; + } + Card cardToCopy = card.copy(); + cardToCopy.assignNewId(); + permanent.setName(cardToCopy.getName()); + permanent.getPower().setValue(cardToCopy.getPower().getValue()); + permanent.getToughness().setValue(cardToCopy.getToughness().getValue()); + permanent.getColor().setColor(cardToCopy.getColor()); + permanent.getManaCost().clear(); + permanent.getManaCost().add(cardToCopy.getManaCost()); + permanent.getCardType().clear(); + for (CardType type : cardToCopy.getCardType()) { + if (!permanent.getCardType().contains(type)) { + permanent.getCardType().add(type); + } + } + permanent.getSubtype().clear(); + for (String type : cardToCopy.getSubtype()) { + if (!permanent.getSubtype().contains(type)) { + permanent.getSubtype().add(type); + } + } + permanent.getSupertype().clear(); + for (String type : cardToCopy.getSupertype()) { + if (!permanent.getSupertype().contains(type)) { + permanent.getSupertype().add(type); + } + } + permanent.removeAllAbilities(source.getSourceId(), game); + // gains ability of Dimir Doppelganger + Ability dimirDoppelgangerAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DimirDoppelgangerEffect(), new ManaCostsImpl("{1}{U}{B}")); + dimirDoppelgangerAbility.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card in a graveyard"))); + permanent.addAbility(dimirDoppelgangerAbility, source.getSourceId(), game); + + for (Ability ability : cardToCopy.getAbilities()) { + if (!permanent.getAbilities().contains(ability)) { + permanent.addAbility(ability, source.getSourceId(), game); + } + } + return true; + } +} diff --git a/Mage.Sets/src/mage/sets/tempest/SkyshroudRanger.java b/Mage.Sets/src/mage/sets/tempest/SkyshroudRanger.java index 8b7ab5fbc8..40887a587f 100644 --- a/Mage.Sets/src/mage/sets/tempest/SkyshroudRanger.java +++ b/Mage.Sets/src/mage/sets/tempest/SkyshroudRanger.java @@ -79,7 +79,7 @@ class SkyshroudRangerEffect extends OneShotEffect { SkyshroudRangerEffect() { super(Outcome.PutLandInPlay); - staticText = "You may put a land card from your hand onto the battlefield. Activate this ability only any time you could cast a sorcery"; + staticText = "You may put a land card from your hand onto the battlefield"; } SkyshroudRangerEffect(final SkyshroudRangerEffect effect) { From d3f7d3d688177f5a87824329cd1587d2e6265063 Mon Sep 17 00:00:00 2001 From: Jeff Date: Mon, 15 Jul 2013 17:02:36 -0500 Subject: [PATCH 3/3] - Added the exile target card to Dimir Doppelganger. --- Mage.Sets/src/mage/sets/ravnika/DimirDoppelganger.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Mage.Sets/src/mage/sets/ravnika/DimirDoppelganger.java b/Mage.Sets/src/mage/sets/ravnika/DimirDoppelganger.java index c932ebdbe8..1b1783badd 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DimirDoppelganger.java +++ b/Mage.Sets/src/mage/sets/ravnika/DimirDoppelganger.java @@ -103,6 +103,7 @@ class DimirDoppelgangerEffect extends ContinuousEffectImpl