From 5e2a95947cc82683037854f8a69c8d00619f874b Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 13 Dec 2014 01:15:03 +0100 Subject: [PATCH] Some minor changes to submitted cards. --- .../mage/sets/gatecrash/MysticGenesis.java | 30 +++++++------------ .../sets/urzasdestiny/PhyrexianNegator.java | 3 +- .../effects/common/SacrificeEffect.java | 2 +- 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/Mage.Sets/src/mage/sets/gatecrash/MysticGenesis.java b/Mage.Sets/src/mage/sets/gatecrash/MysticGenesis.java index ff0c9b4ba78..06be4732b95 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MysticGenesis.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MysticGenesis.java @@ -34,8 +34,8 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; -import mage.filter.FilterSpell; import mage.game.Game; import mage.game.permanent.token.Token; import mage.game.stack.StackObject; @@ -51,11 +51,8 @@ public class MysticGenesis extends CardImpl { super(ownerId, 180, "Mystic Genesis", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{G}{U}{U}"); this.expansionSetCode = "GTC"; - this.color.setBlue(true); - this.color.setGreen(true); - // Counter target spell. Put an X/X green Ooze creature token onto the battlefield, where X is that spell's converted mana cost. - this.getSpellAbility().addTarget(new TargetSpell(new FilterSpell())); + this.getSpellAbility().addTarget(new TargetSpell()); this.getSpellAbility().addEffect(new MysticGenesisEffect()); } @@ -89,30 +86,23 @@ class MysticGenesisEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { StackObject stackObject = game.getStack().getStackObject(targetPointer.getFirst(game, source)); - if (stackObject != null && game.getStack().counter(source.getFirstTarget(), source.getSourceId(), game)) { - if ( stackObject != null ) { - int cmc = stackObject.getManaCost().convertedManaCost(); - if ( cmc > 0 ) { - MysticGenesisOozeToken oozeToken = new MysticGenesisOozeToken(); - oozeToken.getPower().initValue(cmc); - oozeToken.getToughness().initValue(cmc); - oozeToken.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId()); - } - return true; - - } + if (stackObject != null) { + game.getStack().counter(source.getFirstTarget(), source.getSourceId(), game); + return new CreateTokenEffect(new MysticGenesisOozeToken(stackObject.getConvertedManaCost())).apply(game, source); } return false; } } class MysticGenesisOozeToken extends Token { - public MysticGenesisOozeToken() { + + public MysticGenesisOozeToken(int xValue) { super("Ooze", "X/X green Ooze creature token"); cardType.add(CardType.CREATURE); + color.setGreen(true); subtype.add("Ooze"); - power = new MageInt(0); - toughness = new MageInt(0); + power = new MageInt(xValue); + toughness = new MageInt(xValue); setOriginalExpansionSetCode("RTR"); } } diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/PhyrexianNegator.java b/Mage.Sets/src/mage/sets/urzasdestiny/PhyrexianNegator.java index 3e45455990c..4e1dc26126c 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/PhyrexianNegator.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/PhyrexianNegator.java @@ -53,7 +53,6 @@ public class PhyrexianNegator extends CardImpl { this.expansionSetCode = "UDS"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(5); this.toughness = new MageInt(5); @@ -105,6 +104,6 @@ class PhyrexianNegatorTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever Phyrexian Negator is dealt damage, sacrifice that many permanents"; + return "Whenever {this} is dealt damage, sacrifice that many permanents."; } } \ No newline at end of file diff --git a/Mage/src/mage/abilities/effects/common/SacrificeEffect.java b/Mage/src/mage/abilities/effects/common/SacrificeEffect.java index 3bec07b496d..4e55554f2ea 100644 --- a/Mage/src/mage/abilities/effects/common/SacrificeEffect.java +++ b/Mage/src/mage/abilities/effects/common/SacrificeEffect.java @@ -66,7 +66,7 @@ public class SacrificeEffect extends OneShotEffect{ this(filter, new StaticValue(count), preText); } - public SacrificeEffect ( SacrificeEffect effect ) { + public SacrificeEffect ( final SacrificeEffect effect ) { super(effect); this.filter = effect.filter; this.count = effect.count;