From f6d97367fcdaafa2896242d8e6fc89eb5f805c88 Mon Sep 17 00:00:00 2001 From: jeffwadsworth Date: Thu, 2 May 2013 16:37:21 -0500 Subject: [PATCH] - Added some Dragon Maze cards. --- .../src/mage/player/ai/ComputerPlayer6.java | 6 +- .../HeartbeatOfSpring.java | 57 +++--- .../sets/dragonsmaze/VorelOfTheHullClade.java | 127 ++++++++++++ .../sets/dragonsmaze/WarleadersHelix.java | 65 ++++++ .../mage/sets/dragonsmaze/ZhurTaaAncient.java | 191 ++++++++++++++++++ .../effects/common/GainLifeEffect.java | 6 +- 6 files changed, 419 insertions(+), 33 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/dragonsmaze/VorelOfTheHullClade.java create mode 100644 Mage.Sets/src/mage/sets/dragonsmaze/WarleadersHelix.java create mode 100644 Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaAncient.java diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java index c3fba20e5a..14d5902815 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java @@ -1124,9 +1124,9 @@ public class ComputerPlayer6 extends ComputerPlayer implements && !blocker.getAbilities().containsKey(ReachAbility.getInstance().getId())) { safeToAttack = true; } - if (attacker.getPower().getValue() == 0) { - safeToAttack = false; - } + } + if (attacker.getPower().getValue() == 0) { + safeToAttack = false; } if (safeToAttack) { attackingPlayer.declareAttacker(attacker.getId(), defenderId, game); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HeartbeatOfSpring.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HeartbeatOfSpring.java index 2725dbab7d..d457078f60 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HeartbeatOfSpring.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HeartbeatOfSpring.java @@ -25,7 +25,6 @@ * 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; @@ -54,15 +53,15 @@ import mage.target.targetpointer.FixedTarget; */ public class HeartbeatOfSpring extends CardImpl { - public HeartbeatOfSpring (UUID ownerId) { + public HeartbeatOfSpring(UUID ownerId) { super(ownerId, 212, "Heartbeat of Spring", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "CHK"; - this.color.setGreen(true); + this.color.setGreen(true); // Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced. this.addAbility(new HeartbeatOfSpringAbility()); } - public HeartbeatOfSpring (final HeartbeatOfSpring card) { + public HeartbeatOfSpring(final HeartbeatOfSpring card) { super(card); } @@ -70,7 +69,6 @@ public class HeartbeatOfSpring extends CardImpl { public HeartbeatOfSpring copy() { return new HeartbeatOfSpring(this); } - } class HeartbeatOfSpringAbility extends TriggeredManaAbility { @@ -87,14 +85,14 @@ class HeartbeatOfSpringAbility extends TriggeredManaAbility { Permanent land = game.getPermanent(this.targetPointer.getFirst(game, source)); Abilities mana = land.getAbilities().getManaAbilities(Zone.BATTLEFIELD); Mana types = new Mana(); - for (ManaAbility ability: mana) { + for (ManaAbility ability : mana) { types.add(ability.getNetMana(game)); } Choice choice = new ChoiceImpl(true); choice.setMessage("Pick a mana color"); - if (types.getBlack() > 0) + if (types.getBlack() > 0) { choice.getChoices().add("Black"); - if (types.getRed() > 0) + } + if (types.getRed() > 0) { choice.getChoices().add("Red"); - if (types.getBlue() > 0) + } + if (types.getBlue() > 0) { choice.getChoices().add("Blue"); - if (types.getGreen() > 0) + } + if (types.getGreen() > 0) { choice.getChoices().add("Green"); - if (types.getWhite() > 0) + } + if (types.getWhite() > 0) { choice.getChoices().add("White"); - if (types.getColorless() > 0) + } + if (types.getColorless() > 0) { choice.getChoices().add("Colorless"); + } if (choice.getChoices().size() > 0) { - Player player = game.getPlayer(source.getControllerId()); - if (choice.getChoices().size() == 1) + Player player = game.getPlayer(land.getControllerId()); + if (choice.getChoices().size() == 1) { choice.setChoice(choice.getChoices().iterator().next()); - else + } else { player.choose(outcome, choice, game); + } if (choice.getChoice().equals("Black")) { player.getManaPool().addMana(Mana.BlackMana, game, source); return true; - } - else if (choice.getChoice().equals("Blue")) { + } else if (choice.getChoice().equals("Blue")) { player.getManaPool().addMana(Mana.BlueMana, game, source); return true; - } - else if (choice.getChoice().equals("Red")) { + } else if (choice.getChoice().equals("Red")) { player.getManaPool().addMana(Mana.RedMana, game, source); return true; - } - else if (choice.getChoice().equals("Green")) { + } else if (choice.getChoice().equals("Green")) { player.getManaPool().addMana(Mana.GreenMana, game, source); return true; - } - else if (choice.getChoice().equals("White")) { + } else if (choice.getChoice().equals("White")) { player.getManaPool().addMana(Mana.WhiteMana, game, source); return true; - } - else if (choice.getChoice().equals("Colorless")) { + } else if (choice.getChoice().equals("Colorless")) { player.getManaPool().addMana(Mana.ColorlessMana, game, source); return true; } @@ -182,5 +182,4 @@ class HeartbeatOfSpringEffect extends ManaEffect { public HeartbeatOfSpringEffect copy() { return new HeartbeatOfSpringEffect(this); } - } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/VorelOfTheHullClade.java b/Mage.Sets/src/mage/sets/dragonsmaze/VorelOfTheHullClade.java new file mode 100644 index 0000000000..725e031450 --- /dev/null +++ b/Mage.Sets/src/mage/sets/dragonsmaze/VorelOfTheHullClade.java @@ -0,0 +1,127 @@ +/* + * 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.dragonsmaze; + +import java.util.List; +import java.util.UUID; +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.Outcome; +import mage.Constants.Rarity; +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.OneShotEffect; +import mage.cards.CardImpl; +import mage.counters.Counter; +import mage.filter.FilterPermanent; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.CardTypePredicate; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.target.TargetPermanent; + +/** + * + * @author jeffwadsworth + */ +public class VorelOfTheHullClade extends CardImpl { + + final static private FilterPermanent filter = new FilterPermanent("artifact, creature, or land"); + + static { + filter.add(Predicates.or( + new CardTypePredicate(CardType.ARTIFACT), + new CardTypePredicate(CardType.CREATURE), + new CardTypePredicate(CardType.LAND))); + } + + public VorelOfTheHullClade(UUID ownerId) { + super(ownerId, 115, "Vorel of the Hull Clade", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{G}{U}"); + this.expansionSetCode = "DGM"; + this.supertype.add("Legendary"); + this.subtype.add("Human"); + this.subtype.add("Merfolk"); + + this.color.setBlue(true); + this.color.setGreen(true); + this.power = new MageInt(1); + this.toughness = new MageInt(4); + + // {G}{U}, {tap}: For each counter on target artifact, creature, or land, put another of those counters on that permanent. + Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new VorelOfTheHullCladeEffect(), new ManaCostsImpl("{G}{U}")); + ability.addTarget(new TargetPermanent(filter)); + ability.addCost(new TapSourceCost()); + this.addAbility(ability); + + } + + public VorelOfTheHullClade(final VorelOfTheHullClade card) { + super(card); + } + + @Override + public VorelOfTheHullClade copy() { + return new VorelOfTheHullClade(this); + } +} + +class VorelOfTheHullCladeEffect extends OneShotEffect { + + public VorelOfTheHullCladeEffect() { + super(Outcome.Benefit); + staticText = "For each counter on target artifact, creature, or land, put another of those counters on that permanent"; + } + + public VorelOfTheHullCladeEffect(VorelOfTheHullCladeEffect effect) { + super(effect); + } + + @Override + public boolean apply(Game game, Ability source) { + Permanent target = game.getPermanent(source.getFirstTarget()); + if (target == null) { + return false; + } + for (Counter counter : target.getCounters().values()) { + Counter newCounter = new Counter(counter.getName(), 1); + target.addCounters(newCounter, game); + System.out.println("The target and counter type added is " + target.getName() + counter.getName()); + } + return true; + } + + @Override + public VorelOfTheHullCladeEffect copy() { + return new VorelOfTheHullCladeEffect(this); + } + +} + diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/WarleadersHelix.java b/Mage.Sets/src/mage/sets/dragonsmaze/WarleadersHelix.java new file mode 100644 index 0000000000..a0739a92d6 --- /dev/null +++ b/Mage.Sets/src/mage/sets/dragonsmaze/WarleadersHelix.java @@ -0,0 +1,65 @@ +/* + * 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.dragonsmaze; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.abilities.effects.common.DamageTargetEffect; +import mage.abilities.effects.common.GainLifeEffect; +import mage.cards.CardImpl; +import mage.target.common.TargetCreatureOrPlayer; + +/** + * + * @author jeffwadsworth + */ +public class WarleadersHelix extends CardImpl { + + public WarleadersHelix(UUID ownerId) { + super(ownerId, 116, "Warleader's Helix", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{R}{W}"); + this.expansionSetCode = "DGM"; + + this.color.setRed(true); + this.color.setWhite(true); + + // Warleader's Helix deals 4 damage to target creature or player and you gain 4 life. + this.getSpellAbility().addEffect(new DamageTargetEffect(4)); + this.getSpellAbility().addEffect(new GainLifeEffect(4)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + } + + public WarleadersHelix(final WarleadersHelix card) { + super(card); + } + + @Override + public WarleadersHelix copy() { + return new WarleadersHelix(this); + } +} diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaAncient.java b/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaAncient.java new file mode 100644 index 0000000000..d663c00344 --- /dev/null +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaAncient.java @@ -0,0 +1,191 @@ +/* + * 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.dragonsmaze; + +import java.util.UUID; +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.MageInt; +import mage.Mana; +import mage.abilities.Abilities; +import mage.abilities.Ability; +import mage.abilities.effects.common.ManaEffect; +import mage.abilities.mana.ManaAbility; +import mage.abilities.mana.TriggeredManaAbility; +import mage.cards.CardImpl; +import mage.choices.Choice; +import mage.choices.ChoiceImpl; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.permanent.Permanent; +import mage.players.Player; +import mage.target.targetpointer.FixedTarget; + +/** + * + * @author jeffwadsworth + */ +public class ZhurTaaAncient extends CardImpl { + + public ZhurTaaAncient(UUID ownerId) { + super(ownerId, 119, "Zhur-Taa Ancient", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{R}{G}"); + this.expansionSetCode = "DGM"; + this.subtype.add("Beast"); + + this.color.setRed(true); + this.color.setGreen(true); + this.power = new MageInt(7); + this.toughness = new MageInt(5); + + // Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced. + this.addAbility(new ZhurTaaAncientAbility()); + } + + public ZhurTaaAncient(final ZhurTaaAncient card) { + super(card); + } + + @Override + public ZhurTaaAncient copy() { + return new ZhurTaaAncient(this); + } +} + +class ZhurTaaAncientAbility extends TriggeredManaAbility { + + private static final String staticText = "Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced."; + + public ZhurTaaAncientAbility() { + super(Constants.Zone.BATTLEFIELD, new ZhurTaaAncientEffect()); + } + + public ZhurTaaAncientAbility(ZhurTaaAncientAbility ability) { + super(ability); + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + if (event.getType() == GameEvent.EventType.TAPPED_FOR_MANA) { + Permanent permanent = game.getPermanent(event.getSourceId()); + if (permanent == null) { + permanent = (Permanent) game.getLastKnownInformation(event.getSourceId(), Constants.Zone.BATTLEFIELD); + } + if (permanent != null && permanent.getCardType().contains(CardType.LAND)) { + getEffects().get(0).setTargetPointer(new FixedTarget(permanent.getId())); + return true; + } + } + return false; + } + + @Override + public ZhurTaaAncientAbility copy() { + return new ZhurTaaAncientAbility(this); + } + + @Override + public String getRule() { + return staticText; + } +} + +class ZhurTaaAncientEffect extends ManaEffect { + + public ZhurTaaAncientEffect() { + super(); + staticText = "that player adds one mana to his or her mana pool of any type that land produced"; + } + + public ZhurTaaAncientEffect(final ZhurTaaAncientEffect effect) { + super(effect); + } + + @Override + public boolean apply(Game game, Ability source) { + Permanent land = game.getPermanent(this.targetPointer.getFirst(game, source)); + Abilities mana = land.getAbilities().getManaAbilities(Constants.Zone.BATTLEFIELD); + Mana types = new Mana(); + for (ManaAbility ability : mana) { + types.add(ability.getNetMana(game)); + } + Choice choice = new ChoiceImpl(true); + choice.setMessage("Pick a mana color"); + if (types.getBlack() > 0) { + choice.getChoices().add("Black"); + } + if (types.getRed() > 0) { + choice.getChoices().add("Red"); + } + if (types.getBlue() > 0) { + choice.getChoices().add("Blue"); + } + if (types.getGreen() > 0) { + choice.getChoices().add("Green"); + } + if (types.getWhite() > 0) { + choice.getChoices().add("White"); + } + if (types.getColorless() > 0) { + choice.getChoices().add("Colorless"); + } + if (choice.getChoices().size() > 0) { + Player player = game.getPlayer(land.getControllerId()); + if (choice.getChoices().size() == 1) { + choice.setChoice(choice.getChoices().iterator().next()); + } else { + player.choose(outcome, choice, game); + } + if (choice.getChoice().equals("Black")) { + player.getManaPool().addMana(Mana.BlackMana, game, source); + return true; + } else if (choice.getChoice().equals("Blue")) { + player.getManaPool().addMana(Mana.BlueMana, game, source); + return true; + } else if (choice.getChoice().equals("Red")) { + player.getManaPool().addMana(Mana.RedMana, game, source); + return true; + } else if (choice.getChoice().equals("Green")) { + player.getManaPool().addMana(Mana.GreenMana, game, source); + return true; + } else if (choice.getChoice().equals("White")) { + player.getManaPool().addMana(Mana.WhiteMana, game, source); + return true; + } else if (choice.getChoice().equals("Colorless")) { + player.getManaPool().addMana(Mana.ColorlessMana, game, source); + return true; + } + } + return true; + } + + @Override + public ZhurTaaAncientEffect copy() { + return new ZhurTaaAncientEffect(this); + } +} \ No newline at end of file diff --git a/Mage/src/mage/abilities/effects/common/GainLifeEffect.java b/Mage/src/mage/abilities/effects/common/GainLifeEffect.java index f145eadb62..3d06f72a52 100644 --- a/Mage/src/mage/abilities/effects/common/GainLifeEffect.java +++ b/Mage/src/mage/abilities/effects/common/GainLifeEffect.java @@ -80,7 +80,11 @@ public class GainLifeEffect extends OneShotEffect { StringBuilder sb = new StringBuilder(); String message = life.getMessage(); - sb.append("you gain "); + if (sb.length() > 0) { + sb.append("you gain "); + } else { + sb.append("You gain "); + } if (message.isEmpty() || !message.equals("1")) { sb.append(life).append(" "); }