diff --git a/Mage.Sets/src/mage/sets/antiquities/GateToPhyrexia.java b/Mage.Sets/src/mage/sets/antiquities/GateToPhyrexia.java index 1d2a88c9ab..4d902ed4b3 100644 --- a/Mage.Sets/src/mage/sets/antiquities/GateToPhyrexia.java +++ b/Mage.Sets/src/mage/sets/antiquities/GateToPhyrexia.java @@ -91,4 +91,9 @@ class GateToPhyrexiaAbility extends LimitedTimesPerTurnActivatedAbility { } return super.canActivate(playerId, game); } + + @Override + public String getRule() { + return "Sacrifice a creature: Destroy target artifact. Activate this ability only during your upkeep and only once each turn."; + } } diff --git a/Mage.Sets/src/mage/sets/fifthedition/Recall.java b/Mage.Sets/src/mage/sets/fifthedition/Recall.java index 605470d167..f1af05b0fa 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Recall.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Recall.java @@ -73,7 +73,7 @@ class RecallEffect extends OneShotEffect { public RecallEffect() { super(Outcome.ReturnToHand); - this.staticText = "Discard X cards, then return a card from your graveyard to your hand for each card discarded this way. "; + this.staticText = "Discard X cards, then return a card from your graveyard to your hand for each card discarded this way"; } public RecallEffect(final RecallEffect effect) { diff --git a/Mage.Sets/src/mage/sets/fifthedition/TheWretched.java b/Mage.Sets/src/mage/sets/fifthedition/TheWretched.java index bfe1f16d8a..3297179000 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/TheWretched.java +++ b/Mage.Sets/src/mage/sets/fifthedition/TheWretched.java @@ -53,10 +53,10 @@ import mage.watchers.common.BlockedAttackerWatcher; /** * * @author jeffwadsworth - * + * 5/1/2009 The ability grants you control of all creatures that are blocking it as the ability resolves. This will include * any creatures that were put onto the battlefield blocking it. -5/1/2009 Any blocking creatures that regenerated during combat will have been removed from combat. Since such creatures +5/1/2009 Any blocking creatures that regenerated during combat will have been removed from combat. Since such creatures * are no longer in combat, they cannot be blocking The Wretched, which means you won't be able to gain control of them. 5/1/2009 If The Wretched itself regenerated during combat, then it will have been removed from combat. Since it is no longer * in combat, there cannot be any creatures blocking it, which means you won't be able to gain control of any creatures. @@ -64,7 +64,7 @@ import mage.watchers.common.BlockedAttackerWatcher; * combat damage step). For example, if it's blocked by a 7/7 creature and is destroyed, its ability won't trigger at all. 10/1/2009 If The Wretched leaves the battlefield, you no longer control it, so the duration of its control-change effect ends. 10/1/2009 If you lose control of The Wretched before its ability resolves, you won't gain control of the creatures blocking it at all. -10/1/2009 Once the ability resolves, it doesn't care whether the permanents you gained control of remain creatures, only that +10/1/2009 Once the ability resolves, it doesn't care whether the permanents you gained control of remain creatures, only that * they remain on the battlefield. */ @@ -96,6 +96,7 @@ class TheWretchedEffect extends OneShotEffect { TheWretchedEffect() { super(Outcome.Benefit); + staticText = "gain control of all creatures blocking {this} for as long as you control {this}"; } TheWretchedEffect(final TheWretchedEffect effect) { @@ -114,7 +115,7 @@ class TheWretchedEffect extends OneShotEffect { if (!new SourceOnBattlefieldControlUnchangedCondition().apply(game, source)) { return false; } - + for (CombatGroup combatGroup :game.getCombat().getGroups()) { if (combatGroup.getAttackers().contains(source.getSourceId())) { for(UUID creatureId: combatGroup.getBlockers()) { @@ -123,7 +124,7 @@ class TheWretchedEffect extends OneShotEffect { ContinuousEffect effect = new ConditionalContinuousEffect(new GainControlTargetEffect(Duration.Custom, source.getControllerId()), new SourceOnBattlefieldControlUnchangedCondition(), ""); effect.setTargetPointer(new FixedTarget(blocker.getId())); game.addEffect(effect, source); - + } } } diff --git a/Mage.Sets/src/mage/sets/legends/IvoryGuardians.java b/Mage.Sets/src/mage/sets/legends/IvoryGuardians.java index 2e3b6a2615..81e37f4aeb 100644 --- a/Mage.Sets/src/mage/sets/legends/IvoryGuardians.java +++ b/Mage.Sets/src/mage/sets/legends/IvoryGuardians.java @@ -54,13 +54,13 @@ import mage.game.Game; * @author jeffwadsworth */ public class IvoryGuardians extends CardImpl { - - private static final FilterCard filter = new FilterCard(); - + + private static final FilterCard filter = new FilterCard("red"); + static { filter.add(new ColorPredicate(ObjectColor.RED)); } - + private static final String rule = "Creatures named {this} get +1/+1 as long as an opponent controls a nontoken red permanent"; public IvoryGuardians(UUID ownerId) { @@ -73,10 +73,10 @@ public class IvoryGuardians extends CardImpl { // Protection from red this.addAbility(new ProtectionAbility(filter)); - + // Creatures named Ivory Guardians get +1/+1 as long as an opponent controls a nontoken red permanent. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield), new IvoryGuardiansCondition(), rule))); - + } public IvoryGuardians(final IvoryGuardians card) { @@ -103,4 +103,4 @@ class IvoryGuardiansCondition implements Condition { } return conditionApplies; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/sets/legends/LadyEvangela.java b/Mage.Sets/src/mage/sets/legends/LadyEvangela.java index c317c54c82..30743d13b5 100644 --- a/Mage.Sets/src/mage/sets/legends/LadyEvangela.java +++ b/Mage.Sets/src/mage/sets/legends/LadyEvangela.java @@ -61,7 +61,6 @@ public class LadyEvangela extends CardImpl { Effect effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt by target creature this turn."); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{W}{B}")); - ability.addEffect(effect); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/KoboldDrillSergeant.java b/Mage.Sets/src/mage/sets/masterseditioniii/KoboldDrillSergeant.java index 225d0176d3..19390b22d4 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniii/KoboldDrillSergeant.java +++ b/Mage.Sets/src/mage/sets/masterseditioniii/KoboldDrillSergeant.java @@ -31,6 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.TrampleAbility; @@ -47,7 +48,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; * @author ilcartographer */ public class KoboldDrillSergeant extends CardImpl { - + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Kobold creatures"); static { @@ -62,9 +63,11 @@ public class KoboldDrillSergeant extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - // Other Kobold creatures you control get +0/+1 and have trample. + // Other Kobold creatures you control get +0/+1 and have trample. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true)); - ability.addEffect(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter, true)); + Effect effect = new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter, true); + effect.setText("and have trample"); + ability.addEffect(effect); this.addAbility(ability); }