github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source
This commit is contained in:
Styxo 2016-12-15 15:37:49 +01:00
commit 1d989a70db
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/c/ConsulateCrackdown.java
View file

@ -77,7 +77,7 @@ class ConsulateCracksownExileEffect extends OneShotEffect {
private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifacts your opponents control");
static {
filter.add(new ControllerPredicate(TargetController.NOT_YOU));
filter.add(new ControllerPredicate(TargetController.OPPONENT));
}
public ConsulateCracksownExileEffect() {

5
Mage.Sets/src/mage/cards/e/EvolutionaryEscalation.java
View file

@ -39,6 +39,7 @@ import mage.constants.TargetController;
import mage.counters.Counter;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.Target;
@ -51,6 +52,10 @@ import mage.target.common.TargetCreaturePermanent;
*/
public class EvolutionaryEscalation extends CardImpl {
private static final FilterCreaturePermanent filterOpponentCreature = new FilterCreaturePermanent("creature an opponent controls");
static {
filterOpponentCreature.add(new ControllerPredicate(TargetController.OPPONENT));
}
public EvolutionaryEscalation(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}");

4
Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java
View file

@ -63,7 +63,7 @@ import mage.util.CardUtil;
public class EyeOfTheStorm extends CardImpl {
public EyeOfTheStorm(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{5}{U}{U}");
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{5}{U}{U}");
// Whenever a player casts an instant or sorcery card, exile it. Then that player copies each instant or sorcery card exiled with Eye of the Storm. For each copy, the player may cast the copy without paying its mana cost.
this.addAbility(new EyeOfTheStormAbility());
@ -101,7 +101,7 @@ class EyeOfTheStormAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getZone() == Zone.HAND) {
if (event.getZone() != Zone.OUTSIDE) {
Spell spell = game.getStack().getSpell(event.getTargetId());
if (spell != null && !spell.isCopy()
&& (spell.getCardType().contains(CardType.INSTANT) || spell.getCardType().contains(CardType.SORCERY))) {