diff --git a/Mage.Sets/src/mage/sets/commander2014/WordOfSeizing.java b/Mage.Sets/src/mage/sets/commander2014/WordOfSeizing.java index 2688c3eb3c0..f503d13fd3d 100644 --- a/Mage.Sets/src/mage/sets/commander2014/WordOfSeizing.java +++ b/Mage.Sets/src/mage/sets/commander2014/WordOfSeizing.java @@ -50,17 +50,16 @@ public class WordOfSeizing extends CardImpl { super(ownerId, 185, "Word of Seizing", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{R}{R}"); this.expansionSetCode = "C14"; - // Split second this.addAbility(new SplitSecondAbility()); // Untap target permanent and gain control of it until end of turn. It gains haste until end of turn. this.getSpellAbility().addEffect(new UntapTargetEffect()); Effect effect = new GainControlTargetEffect(Duration.EndOfTurn); - effect.setText("and gain control of it until end of turn. "); + effect.setText("and gain control of it until end of turn"); this.getSpellAbility().addEffect(effect); effect = new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn); - effect.setText("It gains haste until end of turn. "); + effect.setText("It gains haste until end of turn"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetPermanent()); diff --git a/Mage.Sets/src/mage/sets/commander2015/MizzixOfTheIzmagnus.java b/Mage.Sets/src/mage/sets/commander2015/MizzixOfTheIzmagnus.java index 705872e1648..32b287c0cbf 100644 --- a/Mage.Sets/src/mage/sets/commander2015/MizzixOfTheIzmagnus.java +++ b/Mage.Sets/src/mage/sets/commander2015/MizzixOfTheIzmagnus.java @@ -58,8 +58,9 @@ import mage.util.CardUtil; * @author emerald000 */ public class MizzixOfTheIzmagnus extends CardImpl { - + private static final FilterInstantOrSorcerySpell filter = new FilterInstantOrSorcerySpell("an instant or sorcery spell with converted mana cost greater than the number of experience counters you have"); + static { filter.add(new MizzixOfTheIzmagnusPredicate()); } @@ -76,7 +77,7 @@ public class MizzixOfTheIzmagnus extends CardImpl { // Whenever you cast an instant or sorcery spell with converted mana cost greater than the number of experience counters you have, you get an experience counter. this.addAbility(new SpellCastControllerTriggeredAbility( new AddCountersControllerEffect(CounterType.EXPERIENCE.createInstance(1), false), filter, false)); - + // Instant and sorcery spells you cast cost {1} less to cast for each experience counter you have. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MizzixOfTheIzmagnusCostReductionEffect())); } @@ -128,9 +129,9 @@ class MizzixOfTheIzmagnusCostReductionEffect extends CostModificationEffectImpl public boolean apply(Game game, Ability source, Ability abilityToModify) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - SpellAbility spellAbility = (SpellAbility) abilityToModify; - CardUtil.adjustCost(spellAbility, controller.getCounters().getCount(CounterType.EXPERIENCE)); - return true; + SpellAbility spellAbility = (SpellAbility) abilityToModify; + CardUtil.adjustCost(spellAbility, controller.getCounters().getCount(CounterType.EXPERIENCE)); + return true; } return false; } diff --git a/Mage.Sets/src/mage/sets/commander2015/MizzixsMastery.java b/Mage.Sets/src/mage/sets/commander2015/MizzixsMastery.java index dfaf1c3b7ed..52032c63ce5 100644 --- a/Mage.Sets/src/mage/sets/commander2015/MizzixsMastery.java +++ b/Mage.Sets/src/mage/sets/commander2015/MizzixsMastery.java @@ -85,7 +85,7 @@ class MizzixsMasteryEffect extends OneShotEffect { public MizzixsMasteryEffect() { super(Outcome.PlayForFree); - this.staticText = "Exile target card that's an instant or sorcery from your graveyard. For each card exiled this way, copy it, and you may cast the copy without paying its mana cost. Exile {this}"; + this.staticText = "Exile target card that's an instant or sorcery from your graveyard. For each card exiled this way, copy it, and you may cast the copy without paying its mana cost"; } public MizzixsMasteryEffect(final MizzixsMasteryEffect effect) { diff --git a/Mage.Sets/src/mage/sets/commander2015/RiteOfTheRagingStorm.java b/Mage.Sets/src/mage/sets/commander2015/RiteOfTheRagingStorm.java index bc5f29f0f78..00bba6e1e66 100644 --- a/Mage.Sets/src/mage/sets/commander2015/RiteOfTheRagingStorm.java +++ b/Mage.Sets/src/mage/sets/commander2015/RiteOfTheRagingStorm.java @@ -57,7 +57,7 @@ import mage.players.Player; * @author fireshoes */ public class RiteOfTheRagingStorm extends CardImpl { - + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures named Lightning Rager"); static { @@ -72,7 +72,7 @@ public class RiteOfTheRagingStorm extends CardImpl { Effect effect = new CantAttackYouOrPlaneswalkerAllEffect(Duration.WhileOnBattlefield, filter); effect.setText("Creatures named Lightning Rager can't attack you or planeswalkers you control"); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); - + // At the beginning of each player's upkeep, that player puts a 5/1 red Elemental creature token named Lightning Rager onto the battlefield. // It has trample, haste, and "At the beginning of the end step, sacrifice this creature." this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new RiteOfTheRagingStormEffect(), TargetController.ANY, false)); @@ -90,7 +90,7 @@ public class RiteOfTheRagingStorm extends CardImpl { class RiteOfTheRagingStormEffect extends OneShotEffect { - private static final String effectText = "that player puts a 5/1 red Elemental creature token named Lightning Rager onto the battlefield." + private static final String effectText = "that player puts a 5/1 red Elemental creature token named Lightning Rager onto the battlefield. " + "It has trample, haste, and \"At the beginning of the end step, sacrifice this creature.\""; RiteOfTheRagingStormEffect() { @@ -119,9 +119,10 @@ class RiteOfTheRagingStormEffect extends OneShotEffect { } class LightningRagerToken extends Token { + LightningRagerToken() { super("Lightning Rager", "5/1 red Elemental creature token named Lightning Rager onto the battlefield." - + "It has trample, haste, and \"At the beginning of the end step, sacrifice this creature.\""); + + "It has trample, haste, and \"At the beginning of the end step, sacrifice this creature.\""); this.setOriginalExpansionSetCode("C15"); cardType.add(CardType.CREATURE); color.setRed(true); @@ -130,6 +131,6 @@ class LightningRagerToken extends Token { toughness = new MageInt(1); addAbility(TrampleAbility.getInstance()); addAbility(HasteAbility.getInstance()); - this.addAbility(new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect(), TargetController.ANY, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect(), TargetController.NEXT, false)); } -} \ No newline at end of file +} diff --git a/Mage/src/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java b/Mage/src/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java index 2e87b2b424c..a81f7b7d76d 100644 --- a/Mage/src/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java @@ -25,7 +25,6 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ - package mage.abilities.common; import mage.abilities.TriggeredAbilityImpl; @@ -40,6 +39,7 @@ import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; public class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl { + private TargetController targetController; private Condition interveningIfClauseCondition; @@ -91,8 +91,9 @@ public class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl { } return true; } - break; + break; case ANY: + case NEXT: if (getTargets().size() == 0) { for (Effect effect : this.getEffects()) { effect.setTargetPointer(new FixedTarget(event.getPlayerId())); @@ -128,15 +129,17 @@ public class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl { public String getRule() { StringBuilder sb = new StringBuilder(getEffects().getText(modes.getMode())); if (this.optional) { - if (sb.substring(0, 6).toLowerCase().equals("target")){ + if (sb.substring(0, 6).toLowerCase().equals("target")) { sb.insert(0, "you may have "); - } else if (!sb.substring(0, 4).toLowerCase().equals("you ")){ + } else if (!sb.substring(0, 4).toLowerCase().equals("you ")) { sb.insert(0, "you may "); } } switch (targetController) { case YOU: return sb.insert(0, generateConditionString()).insert(0, "At the beginning of your end step, ").toString(); + case NEXT: + return sb.insert(0, generateConditionString()).insert(0, "At the beginning of the end step, ").toString(); case OPPONENT: return sb.insert(0, generateConditionString()).insert(0, "At the beginning of each opponent's end step, ").toString(); case ANY: diff --git a/Mage/src/mage/abilities/keyword/HideawayAbility.java b/Mage/src/mage/abilities/keyword/HideawayAbility.java index b312fc9f3fb..a3944296a2f 100644 --- a/Mage/src/mage/abilities/keyword/HideawayAbility.java +++ b/Mage/src/mage/abilities/keyword/HideawayAbility.java @@ -96,7 +96,7 @@ class HideawayExileEffect extends OneShotEffect { public HideawayExileEffect() { super(Outcome.Benefit); - this.staticText = "Look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library"; + this.staticText = "look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library"; } public HideawayExileEffect(final HideawayExileEffect effect) { diff --git a/Mage/src/mage/constants/TargetController.java b/Mage/src/mage/constants/TargetController.java index 8c10feb9591..ed2f4f02e20 100644 --- a/Mage/src/mage/constants/TargetController.java +++ b/Mage/src/mage/constants/TargetController.java @@ -5,5 +5,6 @@ package mage.constants; * @author North */ public enum TargetController { - ANY, YOU, NOT_YOU, OPPONENT, CONTROLLER_ATTACHED_TO + + ANY, YOU, NOT_YOU, OPPONENT, CONTROLLER_ATTACHED_TO, NEXT }