External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 13:19:18 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Canopy Cover - Fixed that it did not work correctly if cast on a creature controlled by an opponent.

Browse source
This commit is contained in:
LevelX2 2014-09-17 14:07:36 +02:00
parent cb0f9c9e14
commit 9b3c59dfaf
6 changed files with 135 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java
View file

@ -34,7 +34,7 @@ import mage.constants.Duration;
import mage.constants.Rarity;
import mage.ObjectColor;
import mage.abilities.effects.common.CantCounterControlledEffect;
import mage.abilities.effects.common.CantTargetEffect;
import mage.abilities.effects.common.CantBeTargetedAllEffect;
import mage.cards.CardImpl;
import mage.filter.FilterSpell;
import mage.filter.common.FilterControlledCreaturePermanent;
@ -64,7 +64,7 @@ public class AutumnsVeil extends CardImpl {
// Spells you control can't be countered by blue or black spells this turn
this.getSpellAbility().addEffect(new CantCounterControlledEffect(filterTarget1, filterSource, Duration.EndOfTurn));
// and creatures you control can't be the targets of blue or black spells this turn.
this.getSpellAbility().addEffect(new CantTargetEffect(filterTarget2, filterSource, Duration.EndOfTurn));
this.getSpellAbility().addEffect(new CantBeTargetedAllEffect(filterTarget2, filterSource, Duration.EndOfTurn));
}
public AutumnsVeil(final AutumnsVeil card) {

4
Mage.Sets/src/mage/sets/weatherlight/DenseFoliage.java
View file

@ -29,7 +29,7 @@ package mage.sets.weatherlight;
import java.util.UUID;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.CantTargetEffect;
import mage.abilities.effects.common.CantBeTargetedAllEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
@ -51,7 +51,7 @@ public class DenseFoliage extends CardImpl {
this.color.setGreen(true);
// Creatures can't be the targets of spells.
CantTargetEffect cantTargetEffect = new CantTargetEffect(new FilterCreaturePermanent("Creatures"), new FilterSpell("spells"), Duration.WhileOnBattlefield);
CantBeTargetedAllEffect cantTargetEffect = new CantBeTargetedAllEffect(new FilterCreaturePermanent("Creatures"), new FilterSpell("spells"), Duration.WhileOnBattlefield);
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, cantTargetEffect));
}

19
Mage.Sets/src/mage/sets/worldwake/CanopyCover.java
View file

@ -38,12 +38,14 @@ import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.RestrictionEffect;
import mage.abilities.effects.common.AttachEffect;
import mage.abilities.effects.common.continious.GainAbilityAttachedEffect;
import mage.abilities.effects.common.CantBeTargetedAttachedEffect;
import mage.abilities.keyword.EnchantAbility;
import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.HexproofAbility;
import mage.abilities.keyword.ReachAbility;
import mage.cards.CardImpl;
import mage.constants.TargetController;
import mage.filter.FilterStackObject;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.TargetPermanent;
@ -56,6 +58,12 @@ import mage.target.common.TargetCreaturePermanent;
*/
public class CanopyCover extends CardImpl {
private static final FilterStackObject filter = new FilterStackObject("spells or abilities your opponents control");
static {
filter.add(new ControllerPredicate(TargetController.OPPONENT));
}
public CanopyCover(UUID ownerId) {
super(ownerId, 98, "Canopy Cover", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}");
this.expansionSetCode = "WWK";
@ -74,7 +82,7 @@ public class CanopyCover extends CardImpl {
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OrchardSpiritEffect()));
// Enchanted creature can't be the target of spells or abilities your opponents control.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.AURA)));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedAttachedEffect(filter, Duration.WhileOnBattlefield, AttachmentType.AURA)));
}
public CanopyCover(final CanopyCover card) {
@ -112,10 +120,7 @@ class OrchardSpiritEffect extends RestrictionEffect {
@Override
public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) {
if (blocker.getAbilities().contains(FlyingAbility.getInstance()) || blocker.getAbilities().contains(ReachAbility.getInstance())) {
return true;
}
return false;
return blocker.getAbilities().contains(FlyingAbility.getInstance()) || blocker.getAbilities().contains(ReachAbility.getInstance());
}
@Override

5
Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java
View file

@ -29,7 +29,6 @@
package mage.sets.zendikar;
import java.util.UUID;
import mage.ObjectColor;
import mage.abilities.condition.LockedInCondition;
import mage.constants.CardType;
import mage.constants.Duration;
@ -38,14 +37,10 @@ import mage.abilities.condition.common.KickedCondition;
import mage.abilities.decorator.ConditionalContinousEffect;
import mage.abilities.effects.common.CantBeTargetedTargetEffect;
import mage.abilities.effects.common.continious.BoostTargetEffect;
import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
import mage.abilities.keyword.HexproofAbility;
import mage.abilities.keyword.KickerAbility;
import mage.cards.CardImpl;
import mage.constants.TargetController;
import mage.filter.FilterStackObject;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetCreaturePermanent;