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

[refactoring] Fixed issues caused by notCardType.

Browse source 
Removed notCardType - it was a relic from previous implementation.
Renamed notScopeCardType to scopeNotCardType.
Renamed notCardTypeList to notCardType for consistency with cardType.
This commit is contained in:
North 2012-07-03 08:57:14 +03:00
parent ed877f772b
commit 4639abd279
13 changed files with 23 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/avacynrestored/DualCasting.java
View file

@ -58,7 +58,7 @@ public class DualCasting extends CardImpl<DualCasting> {
static {
filter.getCardType().add(CardType.INSTANT);
filter.getCardType().add(CardType.SORCERY);
filter.setNotScopeCardType(Filter.ComparisonScope.Any);
filter.setScopeCardType(Filter.ComparisonScope.Any);
}
public DualCasting(UUID ownerId) {

2
Mage.Sets/src/mage/sets/championsofkamigawa/PeerThroughDepths.java
View file

@ -47,7 +47,7 @@ public class PeerThroughDepths extends CardImpl<PeerThroughDepths> {
static {
filter.getCardType().add(CardType.SORCERY);
filter.getCardType().add(CardType.INSTANT);
filter.setNotScopeCardType(ComparisonScope.Any);
filter.setScopeCardType(ComparisonScope.Any);
}

1
Mage.Sets/src/mage/sets/conflux/Countersquall.java
View file

@ -46,7 +46,6 @@ public class Countersquall extends CardImpl<Countersquall> {
static {
filter.getNotCardType().add(CardType.CREATURE);
filter.setNotCardType(true);
}
public Countersquall(UUID ownerId) {

1
Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java
View file

@ -56,7 +56,6 @@ public class NicolBolasPlaneswalker extends CardImpl<NicolBolasPlaneswalker> {
static {
filter.getNotCardType().add(CardType.CREATURE);
filter.setNotCardType(true);
}
public NicolBolasPlaneswalker(UUID ownerId) {

10
Mage.Sets/src/mage/sets/eventide/BanishingKnack.java
View file

@ -38,8 +38,8 @@ import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.common.ReturnToHandTargetEffect;
import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
import mage.cards.CardImpl;
import mage.filter.Filter;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterNonlandPermanent;
import mage.target.TargetPermanent;
import mage.target.common.TargetCreaturePermanent;
@ -49,13 +49,7 @@ import mage.target.common.TargetCreaturePermanent;
*/
public class BanishingKnack extends CardImpl<BanishingKnack> {
private final static FilterPermanent filter = new FilterPermanent("nonland permanent");
static {
filter.getCardType().add(CardType.LAND);
filter.setNotCardType(true);
filter.setScopeCardType(Filter.ComparisonScope.Any);
}
private final static FilterPermanent filter = new FilterNonlandPermanent();
public BanishingKnack(UUID ownerId) {
super(ownerId, 17, "Banishing Knack", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}");

1
Mage.Sets/src/mage/sets/innistrad/Bramblecrush.java
View file

@ -45,7 +45,6 @@ public class Bramblecrush extends CardImpl<Bramblecrush> {
static {
filter.getNotCardType().add(CardType.CREATURE);
filter.setNotCardType(true);
}
public Bramblecrush(UUID ownerId) {

13
Mage.Sets/src/mage/sets/magic2010/PlanarCleansing.java
View file

@ -35,8 +35,8 @@ import mage.Constants.Rarity;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.cards.CardImpl;
import mage.filter.Filter;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterNonlandPermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -50,8 +50,9 @@ public class PlanarCleansing extends CardImpl<PlanarCleansing> {
super(ownerId, 24, "Planar Cleansing", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{W}{W}{W}");
this.expansionSetCode = "M10";
this.color.setWhite(true);
this.getSpellAbility().addEffect(new PlanarCleansingEffect());
// Destroy all nonland permanents.
this.getSpellAbility().addEffect(new PlanarCleansingEffect());
}
public PlanarCleansing(final PlanarCleansing card) {
@ -66,13 +67,7 @@ public class PlanarCleansing extends CardImpl<PlanarCleansing> {
class PlanarCleansingEffect extends OneShotEffect<PlanarCleansingEffect> {
private final static FilterPermanent filter = new FilterPermanent("");
static {
filter.getCardType().add(CardType.LAND);
filter.setNotCardType(true);
filter.setScopeCardType(Filter.ComparisonScope.Any);
}
private final static FilterPermanent filter = new FilterNonlandPermanent();
public PlanarCleansingEffect() {
super(Constants.Outcome.DestroyPermanent);

2
Mage.Sets/src/mage/sets/ravnika/MuddleTheMixture.java
View file

@ -47,7 +47,7 @@ public class MuddleTheMixture extends CardImpl<MuddleTheMixture> {
static {
filter.getCardType().add(CardType.INSTANT);
filter.getCardType().add(CardType.SORCERY);
filter.setNotScopeCardType(Filter.ComparisonScope.Any);
filter.setScopeCardType(Filter.ComparisonScope.Any);
}
public MuddleTheMixture(UUID ownerId) {

3
Mage.Sets/src/mage/sets/riseoftheeldrazi/Magmaw.java
View file

@ -51,8 +51,7 @@ public class Magmaw extends CardImpl<Magmaw> {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("nonland permanent");
static {
filter.getCardType().add(CardType.LAND);
filter.setNotCardType(true);
filter.getNotCardType().add(CardType.LAND);
}
public Magmaw(UUID ownerId) {

2
Mage.Sets/src/mage/sets/shadowmoor/Cursecatcher.java
View file

@ -52,7 +52,7 @@ public class Cursecatcher extends CardImpl<Cursecatcher> {
static {
filter.getCardType().add(CardType.INSTANT);
filter.getCardType().add(CardType.SORCERY);
filter.setNotScopeCardType(ComparisonScope.Any);
filter.setScopeCardType(ComparisonScope.Any);
}
public Cursecatcher(UUID ownerId) {