diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KondaLordOfEiganjo.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KondaLordOfEiganjo.java index e4d3e86fc1..9898dd090e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KondaLordOfEiganjo.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KondaLordOfEiganjo.java @@ -25,17 +25,16 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ - package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; import mage.abilities.keyword.BushidoAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; /** * @author Loki @@ -51,9 +50,11 @@ public class KondaLordOfEiganjo extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); + this.addAbility(VigilanceAbility.getInstance()); - this.addAbility(new BushidoAbility(5)); this.addAbility(IndestructibleAbility.getInstance()); + + this.addAbility(new BushidoAbility(5)); } public KondaLordOfEiganjo(final KondaLordOfEiganjo card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/HamletCaptain.java b/Mage.Sets/src/mage/sets/innistrad/HamletCaptain.java index 9aa23edb7c..267970091b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HamletCaptain.java +++ b/Mage.Sets/src/mage/sets/innistrad/HamletCaptain.java @@ -28,13 +28,13 @@ package mage.sets.innistrad; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -44,7 +44,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class HamletCaptain extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Human creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Humans"); static { filter.add(new SubtypePredicate("Human")); diff --git a/Mage.Sets/src/mage/sets/mirrodin/SwordOfKaldra.java b/Mage.Sets/src/mage/sets/mirrodin/SwordOfKaldra.java index c6d692fdd6..94632edf8c 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SwordOfKaldra.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SwordOfKaldra.java @@ -60,7 +60,7 @@ public class SwordOfKaldra extends CardImpl { this.subtype.add("Equipment"); // Equipped creature gets +5/+5. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(5,5, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(5, 5, Duration.WhileOnBattlefield))); // Whenever equipped creature deals damage to a creature, exile that creature. this.addAbility(new SwordOfKaldraTriggeredAbility()); // Equip {4} @@ -80,16 +80,16 @@ public class SwordOfKaldra extends CardImpl { class SwordOfKaldraTriggeredAbility extends TriggeredAbilityImpl { public SwordOfKaldraTriggeredAbility() { - super(Zone.BATTLEFIELD, new ExileTargetEffect("exile that creature"), false); + super(Zone.BATTLEFIELD, new ExileTargetEffect("exile that creature. (Exile it only if it's still on the battlefield.)"), false); } public SwordOfKaldraTriggeredAbility(final SwordOfKaldraTriggeredAbility ability) { - super(ability); + super(ability); } @java.lang.Override public SwordOfKaldraTriggeredAbility copy() { - return new SwordOfKaldraTriggeredAbility(this); + return new SwordOfKaldraTriggeredAbility(this); } @java.lang.Override @@ -101,8 +101,8 @@ class SwordOfKaldraTriggeredAbility extends TriggeredAbilityImpl { public boolean checkTrigger(GameEvent event, Game game) { Permanent equipment = game.getPermanent(this.getSourceId()); if (equipment != null - && equipment.getAttachedTo() != null - && event.getSourceId().equals(equipment.getAttachedTo())) { + && equipment.getAttachedTo() != null + && event.getSourceId().equals(equipment.getAttachedTo())) { for (Effect effect : this.getEffects()) { effect.setTargetPointer(new FixedTarget(event.getTargetId())); } @@ -113,7 +113,7 @@ class SwordOfKaldraTriggeredAbility extends TriggeredAbilityImpl { @java.lang.Override public String getRule() { - return "Whenever equipped creature deals damage to a creature, " + super.getRule(); + return "Whenever equipped creature deals damage to a creature, " + super.getRule(); } } diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/IonasBlessing.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/IonasBlessing.java index dcd4428192..29c3068870 100644 --- a/Mage.Sets/src/mage/sets/oathofthegatewatch/IonasBlessing.java +++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/IonasBlessing.java @@ -92,7 +92,7 @@ class IonasBlessingEffect extends ContinuousEffectImpl { public IonasBlessingEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit); - staticText = ", and can block an additional creature"; + staticText = ", and can block an additional creature each combat"; } public IonasBlessingEffect(final IonasBlessingEffect effect) { diff --git a/Mage.Sets/src/mage/sets/planechase2012/SakashimasStudent.java b/Mage.Sets/src/mage/sets/planechase2012/SakashimasStudent.java index 015ae11675..dd198dcdef 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/SakashimasStudent.java +++ b/Mage.Sets/src/mage/sets/planechase2012/SakashimasStudent.java @@ -60,7 +60,7 @@ public class SakashimasStudent extends CardImpl { // You may have Sakashima's Student enter the battlefield as a copy of any creature on the battlefield, except it's still a Ninja in addition to its other creature types. Effect effect = new CopyPermanentEffect(new FilterCreaturePermanent(), new AddSubtypeApplier("Ninja")); - effect.setText("as a copy of any creature on the battlefield, except it's still a Ninja in addition to its other creature types"); + effect.setText("as a copy of any creature on the battlefield, except it's a Ninja in addition to its other creature types"); this.addAbility(new EntersBattlefieldAbility(effect, true)); }