diff --git a/Mage.Sets/src/mage/cards/b/Batterskull.java b/Mage.Sets/src/mage/cards/b/Batterskull.java index 1d8049210b4..d165d8044b0 100644 --- a/Mage.Sets/src/mage/cards/b/Batterskull.java +++ b/Mage.Sets/src/mage/cards/b/Batterskull.java @@ -3,6 +3,7 @@ package mage.cards.b; import java.util.UUID; + import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -18,28 +19,30 @@ import mage.cards.CardSetInfo; import mage.constants.*; /** - * * @author Loki */ public final class Batterskull extends CardImpl { - public Batterskull (UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); + public Batterskull(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); this.subtype.add(SubType.EQUIPMENT); // Living weapon (When this Equipment enters the battlefield, create a 0/0 black Germ creature token, then attach this to it.) this.addAbility(new LivingWeaponAbility()); + // Equipped creature gets +4/+4 and has vigilance and lifelink. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, 4))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT))); + // {3}: Return Batterskull to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new GenericManaCost(3))); + // Equip {5} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(5))); } - public Batterskull (final Batterskull card) { + public Batterskull(final Batterskull card) { super(card); } diff --git a/Mage.Sets/src/mage/cards/b/Bonehoard.java b/Mage.Sets/src/mage/cards/b/Bonehoard.java index 7085e45b1dd..5ff585c7e20 100644 --- a/Mage.Sets/src/mage/cards/b/Bonehoard.java +++ b/Mage.Sets/src/mage/cards/b/Bonehoard.java @@ -2,6 +2,7 @@ package mage.cards.b; import java.util.UUID; + import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.common.CardsInAllGraveyardsCount; @@ -17,19 +18,22 @@ import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; /** - * * @author North */ public final class Bonehoard extends CardImpl { public Bonehoard(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); this.subtype.add(SubType.EQUIPMENT); - + // Living weapon (When this Equipment enters the battlefield, create a 0/0 black Germ creature token, then attach this to it.) this.addAbility(new LivingWeaponAbility()); + + // Equipped creature gets +X/+X, where X is the number of creature cards in all graveyards. CardsInAllGraveyardsCount value = new CardsInAllGraveyardsCount(new FilterCreatureCard()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(value, value))); + + // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); }