diff --git a/Mage.Sets/src/mage/cards/b/BlackbladeReforged.java b/Mage.Sets/src/mage/cards/b/BlackbladeReforged.java index 35a6cfb703e..06a17e681d7 100644 --- a/Mage.Sets/src/mage/cards/b/BlackbladeReforged.java +++ b/Mage.Sets/src/mage/cards/b/BlackbladeReforged.java @@ -19,6 +19,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; +import mage.constants.SuperType; import mage.constants.Zone; /** @@ -26,20 +27,21 @@ import mage.constants.Zone; * @author Rystan */ public class BlackbladeReforged extends CardImpl { - + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public BlackbladeReforged(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); + addSuperType(SuperType.LEGENDARY); this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1 for each land you control. PermanentsOnBattlefieldCount count = new PermanentsOnBattlefieldCount(filter); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(count, count))); - + // Equip legendary creature (3) this.addAbility(new EquipLegendaryAbility(Outcome.AddAbility, new GenericManaCost(3))); - + // Equip {7} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(7))); } diff --git a/Mage.Sets/src/mage/cards/b/BlessedLight.java b/Mage.Sets/src/mage/cards/b/BlessedLight.java index a45ef260e73..4b9a611199d 100644 --- a/Mage.Sets/src/mage/cards/b/BlessedLight.java +++ b/Mage.Sets/src/mage/cards/b/BlessedLight.java @@ -44,13 +44,13 @@ import mage.target.TargetPermanent; public class BlessedLight extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("creature or enchantment"); + static { filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.ENCHANTMENT))); } public BlessedLight(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{W}"); - + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{4}{W}"); // Exile target creature or enchantment. getSpellAbility().addEffect(new ExileTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/j/JodahArchmageEternal.java b/Mage.Sets/src/mage/cards/j/JodahArchmageEternal.java index ae7d16bf6bc..8bdae7d29ca 100644 --- a/Mage.Sets/src/mage/cards/j/JodahArchmageEternal.java +++ b/Mage.Sets/src/mage/cards/j/JodahArchmageEternal.java @@ -29,19 +29,12 @@ package mage.cards.j; import java.util.UUID; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.SourceIsSpellCondition; -import mage.abilities.costs.AlternativeCostSourceAbility; -import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.continuous.WUBRGInsteadEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; -import mage.game.Game; -import mage.players.Player; /** * @@ -50,8 +43,9 @@ import mage.players.Player; public class JodahArchmageEternal extends CardImpl { public JodahArchmageEternal(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{R}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{R}{W}"); this.addSuperType(SuperType.LEGENDARY); + this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.WIZARD); this.power = new MageInt(4); @@ -59,7 +53,7 @@ public class JodahArchmageEternal extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - + // You may pay WUBRG rather than pay the mana cost for spells that you cast. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WUBRGInsteadEffect())); } diff --git a/Mage.Sets/src/mage/cards/s/SparringConstruct.java b/Mage.Sets/src/mage/cards/s/SparringConstruct.java index ad91e39775a..897965ac3c2 100644 --- a/Mage.Sets/src/mage/cards/s/SparringConstruct.java +++ b/Mage.Sets/src/mage/cards/s/SparringConstruct.java @@ -28,6 +28,7 @@ package mage.cards.s; import java.util.UUID; +import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; @@ -46,9 +47,11 @@ public class SparringConstruct extends CardImpl { public SparringConstruct(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{1}"); - this.subtype.add(SubType.CONSTRUCT); + this.power = new MageInt(1); + this.toughness = new MageInt(1); + // When Sparring Construct dies, put a +1/+1 counter on target creature you control. Ability ability = new DiesTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false); ability.addTarget(new TargetControlledCreaturePermanent());