* Eye of the Stomr - some rework.
@@ -37,10 +37,7 @@ import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.filter.FilterCard;
-import mage.filter.FilterSpell;
-import mage.filter.common.FilterInstantOrSorceryCard;
-import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
+import mage.filter.StaticFilters;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
@@ -114,16 +111,6 @@ class EyeOfTheStormAbility extends TriggeredAbilityImpl {
class EyeOfTheStormEffect1 extends OneShotEffect {
- private static final FilterInstantOrSorceryCard instantOrSorceryfilter = new FilterInstantOrSorceryCard();
-
- private static final FilterSpell filter = new FilterSpell("instant or sorcery card");
-
- static {
- filter.add(Predicates.or(
- new CardTypePredicate(CardType.INSTANT),
- new CardTypePredicate(CardType.SORCERY)));
- }
-
public EyeOfTheStormEffect1() {
super(Outcome.Neutral);
staticText = "Whenever a player casts an instant or sorcery card, exile it. "
@@ -149,7 +136,7 @@ class EyeOfTheStormEffect1 extends OneShotEffect {
Card card = spell.getCard();
if (spellController == null
|| card == null
- || !instantOrSorceryfilter.match(card, game)) {
+ || !StaticFilters.FILTER_INSTANT_OR_SORCERY_SPELL.match(spell, game)) {
return false;
}
if (!noLongerOnStack) {// the spell is still on the stack, so exile it
@@ -192,7 +179,7 @@ class EyeOfTheStormEffect1 extends OneShotEffect {
}
if (cardToCopy != null) {
Card copy = game.copyCard(cardToCopy, source, source.getControllerId());
- if (spellController.chooseUse(outcome, "Cast the copied card without paying mana cost?", source, game)) {
+ if (spellController.chooseUse(outcome, "Cast " + copy.getIdName() + " without paying mana cost?", source, game)) {
spellController.cast(copy.getSpellAbility(), game, true);
}
}
