Merge remote-tracking branch 'upstream/master'

This commit is contained in:
drmDev 2016-07-17 14:32:42 -04:00
commit 5c5d729447
2 changed files with 1 additions and 2 deletions

View file

@ -69,7 +69,7 @@ public class CrosissCharm extends CardImpl {
this.getSpellAbility().addMode(mode);
// or destroy target artifact.
mode = new Mode();
mode.getEffects().add(new DestroyTargetEffect(true));
mode.getEffects().add(new DestroyTargetEffect());
Target target = new TargetArtifactPermanent();
mode.getTargets().add(target);
this.getSpellAbility().addMode(mode);

View file

@ -45,7 +45,6 @@ public class ContingencyPlan extends CardImpl {
public ContingencyPlan(UUID ownerId) {
super(ownerId, 52, "Contingency Plan", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{U}");
this.expansionSetCode = "EMN";
this.supertype.add("Sorcery");
// Look at the top five cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order.
this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect(new StaticValue(5), false, new StaticValue(5),