[GRN] Some fixes to black cards..

This commit is contained in:
LevelX2 2018-09-22 19:39:20 +02:00
parent f467378968
commit 3e93a71001
5 changed files with 20 additions and 18 deletions

View file

@ -8,11 +8,11 @@ import mage.abilities.costs.common.SacrificeSourceCost;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.discard.DiscardCardYouChooseTargetEffect;
import mage.constants.SubType;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.filter.StaticFilters;
@ -39,7 +39,7 @@ public final class PilferingImp extends CardImpl {
Zone.BATTLEFIELD,
new DiscardCardYouChooseTargetEffect(
StaticFilters.FILTER_CARD_NON_LAND,
TargetController.ANY
TargetController.OPPONENT
), new ManaCostsImpl("{1}{B}")
);
ability.addCost(new TapSourceCost());

View file

@ -5,6 +5,7 @@ import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.Condition;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.abilities.effects.common.cost.SpellCostReductionSourceEffect;
import mage.abilities.effects.keyword.SurveilEffect;
import mage.cards.CardImpl;

View file

@ -1,4 +1,3 @@
package mage.cards.p;
import java.util.UUID;
@ -20,19 +19,18 @@ import mage.target.TargetSpell;
* @author Plopman
*/
public final class Pyroblast extends CardImpl {
public Pyroblast(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R}");
public Pyroblast(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{R}");
// Choose one - Counter target spell if it's blue; or destroy target permanent if it's blue.
this.getSpellAbility().addEffect(new PyroblastCounterTargetEffect());
this.getSpellAbility().addTarget(new TargetSpell());
Mode mode = new Mode();
mode.getEffects().add(new DestroyTargetEffect());
mode.getEffects().add(new PyroblastDestroyTargetEffect());
mode.getTargets().add(new TargetPermanent());
this.getSpellAbility().addMode(mode);
}
@ -64,7 +62,7 @@ class PyroblastCounterTargetEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Spell targetSpell = game.getStack().getSpell(source.getFirstTarget());
if(targetSpell != null && targetSpell.getColor(game).isBlue()){
if (targetSpell != null && targetSpell.getColor(game).isBlue()) {
game.getStack().counter(source.getFirstTarget(), source.getSourceId(), game);
}
return true;
@ -77,21 +75,19 @@ class PyroblastCounterTargetEffect extends OneShotEffect {
}
class PyroblastDestroyTargetEffect extends OneShotEffect {
class DestroyTargetEffect extends OneShotEffect {
public DestroyTargetEffect() {
public PyroblastDestroyTargetEffect() {
super(Outcome.DestroyPermanent);
}
public DestroyTargetEffect(final DestroyTargetEffect effect) {
public PyroblastDestroyTargetEffect(final PyroblastDestroyTargetEffect effect) {
super(effect);
}
@Override
public DestroyTargetEffect copy() {
return new DestroyTargetEffect(this);
public PyroblastDestroyTargetEffect copy() {
return new PyroblastDestroyTargetEffect(this);
}
@Override

View file

@ -1,12 +1,15 @@
package mage.cards.s;
import java.util.UUID;
import mage.abilities.costs.common.SacrificeTargetCost;
import mage.abilities.dynamicvalue.common.SacrificeCostCreaturesToughness;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.abilities.effects.common.GainLifeEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.target.common.TargetControlledCreaturePermanent;
import mage.target.common.TargetOpponentsCreaturePermanent;
/**
@ -19,6 +22,8 @@ public final class SeveredStrands extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{B}");
// As an additional cost to cast this spell, sacrifice a creature.
this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, new FilterControlledCreaturePermanent("a creature"), true)));
// You gain life equal to the sacrificed creature's toughness. Destroy target creature an opponent controls.
this.getSpellAbility().addEffect(new GainLifeEffect(
new SacrificeCostCreaturesToughness(),

View file

@ -32,7 +32,7 @@ public final class ViciousRumors extends CardImpl {
new PutTopCardOfLibraryIntoGraveEachPlayerEffect(
1, TargetController.OPPONENT
).setText(", then puts the top card of their library "
+ "into their graveyard.")
+ "into their graveyard")
);
this.getSpellAbility().addEffect(new GainLifeEffect(1));
}