From 9cada659b44acf878f2fdc199bfb319e873ee13e Mon Sep 17 00:00:00 2001 From: BetaSteward Date: Thu, 6 May 2010 03:44:47 +0000 Subject: [PATCH] ... --- Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java | 51 +++++++++++++ Mage.Sets/src/mage/sets/Sets.java | 1 + .../riseoftheeldrazi/KarganDragonlord.java | 76 +++++++++++++++++++ .../src/mage/sets/zendikar/AridMesa.java | 28 +------ .../src/mage/sets/zendikar/MarshFlats.java | 28 +------ .../mage/sets/zendikar/MistyRainforest.java | 27 +------ .../src/mage/sets/zendikar/ScaldingTarn.java | 27 +------ .../mage/sets/zendikar/VerdantCatacombs.java | 27 +------ 8 files changed, 138 insertions(+), 127 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java create mode 100644 Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java diff --git a/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java b/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java new file mode 100644 index 00000000000..4351f35aaf0 --- /dev/null +++ b/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java @@ -0,0 +1,51 @@ +/* + * 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; + +import mage.cards.ExpansionSet; +import mage.sets.riseoftheeldrazi.*; + +/** + * + * @author BetaSteward_at_googlemail.com + */ +public class RiseOfTheEldrazi extends ExpansionSet { + + private static final RiseOfTheEldrazi fINSTANCE = new RiseOfTheEldrazi(); + + public static RiseOfTheEldrazi getInstance() { + return fINSTANCE; + } + + private RiseOfTheEldrazi() { + this.name = "Rise Of The Eldrazi"; + this.cards.add(KarganDragonlord.class); + } + +} diff --git a/Mage.Sets/src/mage/sets/Sets.java b/Mage.Sets/src/mage/sets/Sets.java index 029589ebeb1..724eda10377 100644 --- a/Mage.Sets/src/mage/sets/Sets.java +++ b/Mage.Sets/src/mage/sets/Sets.java @@ -48,6 +48,7 @@ public class Sets extends ArrayList { this.add(Conflux.getInstance()); this.add(Magic2010.getInstance()); this.add(Planechase.getInstance()); + this.add(RiseOfTheEldrazi.getInstance()); this.add(ShardsOfAlara.getInstance()); this.add(Tenth.getInstance()); this.add(Worldwake.getInstance()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java new file mode 100644 index 00000000000..4118870f92c --- /dev/null +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.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.riseoftheeldrazi; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Duration; +import mage.Constants.Zone; +import mage.MageInt; +import mage.abilities.Abilities; +import mage.abilities.AbilitiesImpl; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.mana.ManaCosts; +import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.keyword.FlyingAbility; +import mage.abilities.keyword.LevelAbility; +import mage.abilities.keyword.LevelUpAbility; +import mage.abilities.keyword.TrampleAbility; +import mage.cards.LevelerCard; +import mage.sets.RiseOfTheEldrazi; + +/** + * + * @author BetaSteward_at_googlemail.com + */ +public class KarganDragonlord extends LevelerCard { + + public KarganDragonlord(UUID ownerId) { + super(ownerId, "Kargan Dragonlord", new CardType[]{CardType.CREATURE}, "{R}{R}"); + this.expansionSetId = RiseOfTheEldrazi.getInstance().getId(); + this.subtype.add("Human"); + this.subtype.add("Warrior"); + this.color.setRed(true); + this.art = ""; + this.power = new MageInt(2); + this.toughness = new MageInt(2); + + this.addAbility(new LevelUpAbility(new ManaCosts("{R}"))); + Abilities abilities1 = new AbilitiesImpl(); + abilities1.add(FlyingAbility.getInstance()); + this.getLevels().add(new LevelAbility(4, 7, abilities1, 4, 4)); + Abilities abilities2 = new AbilitiesImpl(); + abilities2.add(FlyingAbility.getInstance()); + abilities2.add(TrampleAbility.getInstance()); + abilities2.add(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCosts("{R}"))); + this.getLevels().add(new LevelAbility(8, -1, abilities2, 8, 8)); + } + + +} diff --git a/Mage.Sets/src/mage/sets/zendikar/AridMesa.java b/Mage.Sets/src/mage/sets/zendikar/AridMesa.java index 8add05c590f..c3dfa2e08ea 100644 --- a/Mage.Sets/src/mage/sets/zendikar/AridMesa.java +++ b/Mage.Sets/src/mage/sets/zendikar/AridMesa.java @@ -30,17 +30,9 @@ package mage.sets.zendikar; import java.util.UUID; import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Zone; -import mage.abilities.ActivatedAbilityImpl; -import mage.abilities.costs.common.PayLifeCost; -import mage.abilities.costs.common.SacrificeSourceCost; -import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.SearchLibraryPutInPlayEffect; +import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; -import mage.filter.FilterCard; import mage.sets.Zendikar; -import mage.target.common.TargetCardInLibrary; /** * @@ -52,23 +44,7 @@ public class AridMesa extends CardImpl { super(ownerId, "Arid Mesa", new CardType[]{CardType.LAND}, null); this.expansionSetId = Zendikar.getInstance().getId(); this.art = "123565_typ_reg_sty_010.jpg"; - this.addAbility(new AridMesaAbility()); - } - -} - -class AridMesaAbility extends ActivatedAbilityImpl { - - public AridMesaAbility() { - super(Zone.BATTLEFIELD, null); - addCost(new TapSourceCost()); - addCost(new PayLifeCost(1)); - addCost(new SacrificeSourceCost()); - FilterCard filter = new FilterCard("Mountain or Plains"); - filter.getName().add("Mountain"); - filter.getName().add("Plains"); - TargetCardInLibrary target = new TargetCardInLibrary(filter); - addEffect(new SearchLibraryPutInPlayEffect(target, false, Outcome.PutLandInPlay)); + this.addAbility(new FetchLandActivatedAbility(new String[] {"Mountain", "Plains"})); } } diff --git a/Mage.Sets/src/mage/sets/zendikar/MarshFlats.java b/Mage.Sets/src/mage/sets/zendikar/MarshFlats.java index 33be2d1bd08..4334931e45b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MarshFlats.java +++ b/Mage.Sets/src/mage/sets/zendikar/MarshFlats.java @@ -30,17 +30,9 @@ package mage.sets.zendikar; import java.util.UUID; import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Zone; -import mage.abilities.ActivatedAbilityImpl; -import mage.abilities.costs.common.PayLifeCost; -import mage.abilities.costs.common.SacrificeSourceCost; -import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.SearchLibraryPutInPlayEffect; +import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; -import mage.filter.FilterCard; import mage.sets.Zendikar; -import mage.target.common.TargetCardInLibrary; /** * @@ -52,23 +44,7 @@ public class MarshFlats extends CardImpl { super(ownerId, "Marsh Flats", new CardType[]{CardType.LAND}, null); this.expansionSetId = Zendikar.getInstance().getId(); this.art = "123707_typ_reg_sty_010.jpg"; - this.addAbility(new MarshFlatsAbility()); - } - -} - -class MarshFlatsAbility extends ActivatedAbilityImpl { - - public MarshFlatsAbility() { - super(Zone.BATTLEFIELD, null); - addCost(new TapSourceCost()); - addCost(new PayLifeCost(1)); - addCost(new SacrificeSourceCost()); - FilterCard filter = new FilterCard("Plains or Swamp"); - filter.getName().add("Swamp"); - filter.getName().add("Plains"); - TargetCardInLibrary target = new TargetCardInLibrary(filter); - addEffect(new SearchLibraryPutInPlayEffect(target, false, Outcome.PutLandInPlay)); + this.addAbility(new FetchLandActivatedAbility(new String[] {"Swamp", "Plains"})); } } diff --git a/Mage.Sets/src/mage/sets/zendikar/MistyRainforest.java b/Mage.Sets/src/mage/sets/zendikar/MistyRainforest.java index 0d0a0e06360..b4d4574384d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MistyRainforest.java +++ b/Mage.Sets/src/mage/sets/zendikar/MistyRainforest.java @@ -30,17 +30,9 @@ package mage.sets.zendikar; import java.util.UUID; import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Zone; -import mage.abilities.ActivatedAbilityImpl; -import mage.abilities.costs.common.PayLifeCost; -import mage.abilities.costs.common.SacrificeSourceCost; -import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.SearchLibraryPutInPlayEffect; +import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; -import mage.filter.FilterCard; import mage.sets.Zendikar; -import mage.target.common.TargetCardInLibrary; /** * @@ -52,23 +44,8 @@ public class MistyRainforest extends CardImpl { super(ownerId, "Misty Rainforest", new CardType[]{CardType.LAND}, null); this.expansionSetId = Zendikar.getInstance().getId(); this.art = "123689_typ_reg_sty_010.jpg"; - this.addAbility(new MistyRainforestAbility()); + this.addAbility(new FetchLandActivatedAbility(new String[] {"Forest", "Island"})); } } -class MistyRainforestAbility extends ActivatedAbilityImpl { - - public MistyRainforestAbility() { - super(Zone.BATTLEFIELD, null); - addCost(new TapSourceCost()); - addCost(new PayLifeCost(1)); - addCost(new SacrificeSourceCost()); - FilterCard filter = new FilterCard("Forest or Island"); - filter.getName().add("Island"); - filter.getName().add("Forest"); - TargetCardInLibrary target = new TargetCardInLibrary(filter); - addEffect(new SearchLibraryPutInPlayEffect(target, false, Outcome.PutLandInPlay)); - } - -} diff --git a/Mage.Sets/src/mage/sets/zendikar/ScaldingTarn.java b/Mage.Sets/src/mage/sets/zendikar/ScaldingTarn.java index 77032452428..868d2b0acd9 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ScaldingTarn.java +++ b/Mage.Sets/src/mage/sets/zendikar/ScaldingTarn.java @@ -30,17 +30,9 @@ package mage.sets.zendikar; import java.util.UUID; import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Zone; -import mage.abilities.ActivatedAbilityImpl; -import mage.abilities.costs.common.PayLifeCost; -import mage.abilities.costs.common.SacrificeSourceCost; -import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.SearchLibraryPutInPlayEffect; +import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; -import mage.filter.FilterCard; import mage.sets.Zendikar; -import mage.target.common.TargetCardInLibrary; /** * @@ -52,23 +44,8 @@ public class ScaldingTarn extends CardImpl { super(ownerId, "Scalding Tarn", new CardType[]{CardType.LAND}, null); this.expansionSetId = Zendikar.getInstance().getId(); this.art = "123672_typ_reg_sty_010.jpg"; - this.addAbility(new ScaldingTarnAbility()); + this.addAbility(new FetchLandActivatedAbility(new String[] {"Island", "Mountain"})); } } -class ScaldingTarnAbility extends ActivatedAbilityImpl { - - public ScaldingTarnAbility() { - super(Zone.BATTLEFIELD, null); - addCost(new TapSourceCost()); - addCost(new PayLifeCost(1)); - addCost(new SacrificeSourceCost()); - FilterCard filter = new FilterCard("Island or Mountain"); - filter.getName().add("Island"); - filter.getName().add("Mountain"); - TargetCardInLibrary target = new TargetCardInLibrary(filter); - addEffect(new SearchLibraryPutInPlayEffect(target, false, Outcome.PutLandInPlay)); - } - -} diff --git a/Mage.Sets/src/mage/sets/zendikar/VerdantCatacombs.java b/Mage.Sets/src/mage/sets/zendikar/VerdantCatacombs.java index f796d10ec7f..0ae746f935d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VerdantCatacombs.java +++ b/Mage.Sets/src/mage/sets/zendikar/VerdantCatacombs.java @@ -30,17 +30,9 @@ package mage.sets.zendikar; import java.util.UUID; import mage.Constants.CardType; -import mage.Constants.Outcome; -import mage.Constants.Zone; -import mage.abilities.ActivatedAbilityImpl; -import mage.abilities.costs.common.PayLifeCost; -import mage.abilities.costs.common.SacrificeSourceCost; -import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.SearchLibraryPutInPlayEffect; +import mage.abilities.common.FetchLandActivatedAbility; import mage.cards.CardImpl; -import mage.filter.FilterCard; import mage.sets.Zendikar; -import mage.target.common.TargetCardInLibrary; /** * @@ -52,23 +44,8 @@ public class VerdantCatacombs extends CardImpl { super(ownerId, "Verdant Catacombs", new CardType[]{CardType.LAND}, null); this.expansionSetId = Zendikar.getInstance().getId(); this.art = "123743_typ_reg_sty_010.jpg"; - this.addAbility(new VerdantCatacombsAbility()); + this.addAbility(new FetchLandActivatedAbility(new String[] {"Forest", "Swamp"})); } } -class VerdantCatacombsAbility extends ActivatedAbilityImpl { - - public VerdantCatacombsAbility() { - super(Zone.BATTLEFIELD, null); - addCost(new TapSourceCost()); - addCost(new PayLifeCost(1)); - addCost(new SacrificeSourceCost()); - FilterCard filter = new FilterCard("Swamp or Forest"); - filter.getName().add("Swamp"); - filter.getName().add("Forest"); - TargetCardInLibrary target = new TargetCardInLibrary(filter); - addEffect(new SearchLibraryPutInPlayEffect(target, false, Outcome.PutLandInPlay)); - } - -} \ No newline at end of file