Merge origin/master

This commit is contained in:
LevelX2 2017-04-17 22:54:27 +02:00
commit d52043e9db
2 changed files with 3 additions and 8 deletions

View file

@ -33,16 +33,13 @@ import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.CardsInControllerHandCount; import mage.abilities.dynamicvalue.common.CardsInControllerHandCount;
import mage.abilities.dynamicvalue.common.SignInversionDynamicValue; import mage.abilities.dynamicvalue.common.SignInversionDynamicValue;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import java.util.UUID; import java.util.UUID;
/** /**
@ -57,8 +54,6 @@ public class GrimStrider extends CardImpl {
this.power = new MageInt(6); this.power = new MageInt(6);
this.toughness = new MageInt(6); this.toughness = new MageInt(6);
this.addAbility(FlyingAbility.getInstance());
// Grim Strider gets -1/-1 for each card in your hand. // Grim Strider gets -1/-1 for each card in your hand.
DynamicValue count = new SignInversionDynamicValue(new CardsInControllerHandCount()); DynamicValue count = new SignInversionDynamicValue(new CardsInControllerHandCount());
Effect effect = new BoostSourceEffect(count, count, Duration.WhileOnBattlefield); Effect effect = new BoostSourceEffect(count, count, Duration.WhileOnBattlefield);
@ -76,4 +71,3 @@ public class GrimStrider extends CardImpl {
return new GrimStrider(this); return new GrimStrider(this);
} }
} }

View file

@ -45,8 +45,9 @@ public class SplendidAgony extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{B}"); super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{B}");
// Distribute two -1/-1 counters among one or two target creatures. // Distribute two -1/-1 counters among one or two target creatures.
getSpellAbility().addEffect(new DistributeCountersEffect(CounterType.M1M1, 2, false, "one or two target creatures you control")); getSpellAbility().addEffect(new DistributeCountersEffect(CounterType.M1M1, 2, false, "one or two target creatures"));
getSpellAbility().addTarget(new TargetCreaturePermanentAmount(2)); getSpellAbility().addTarget(new TargetCreaturePermanentAmount(2));
} }
public SplendidAgony(final SplendidAgony card) { public SplendidAgony(final SplendidAgony card) {