github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed protection from multicolor sources - fixed issue 57

Browse source
This commit is contained in:
BetaSteward 2011-06-18 16:00:31 -04:00
parent ee613eb042
commit 6de60b926d
16 changed files with 45 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/conflux/GoblinOutlander.java
View file

@ -34,6 +34,7 @@ import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterCard;
/**
@ -46,6 +47,7 @@ public class GoblinOutlander extends CardImpl<GoblinOutlander> {
static {
filter.setUseColor(true);
filter.getColor().setWhite(true);
filter.setScopeColor(ComparisonScope.Any);
}
public GoblinOutlander(UUID ownerId) {

2
Mage.Sets/src/mage/sets/conflux/NacatlOutlander.java
View file

@ -34,6 +34,7 @@ import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterCard;
/**
@ -46,6 +47,7 @@ public class NacatlOutlander extends CardImpl<NacatlOutlander> {
static {
filter.setUseColor(true);
filter.getColor().setBlue(true);
filter.setScopeColor(ComparisonScope.Any);
}
public NacatlOutlander(UUID ownerId) {

2
Mage.Sets/src/mage/sets/conflux/ValeronOutlander.java
View file

@ -34,6 +34,7 @@ import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterCard;
/**
@ -46,6 +47,7 @@ public class ValeronOutlander extends CardImpl<ValeronOutlander> {
static {
filter.setUseColor(true);
filter.getColor().setBlack(true);
filter.setScopeColor(ComparisonScope.Any);
}
public ValeronOutlander(UUID ownerId) {

2
Mage.Sets/src/mage/sets/conflux/VedalkenOutlander.java
View file

@ -34,6 +34,7 @@ import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterCard;
/**
@ -46,6 +47,7 @@ public class VedalkenOutlander extends CardImpl<VedalkenOutlander> {
static {
filter.setUseColor(true);
filter.getColor().setRed(true);
filter.setScopeColor(ComparisonScope.Any);
}
public VedalkenOutlander(UUID ownerId) {

2
Mage.Sets/src/mage/sets/conflux/ZombieOutlander.java
View file

@ -34,6 +34,7 @@ import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterCard;
/**
@ -46,6 +47,7 @@ public class ZombieOutlander extends CardImpl<ZombieOutlander> {
static {
filter.setUseColor(true);
filter.getColor().setGreen(true);
filter.setScopeColor(ComparisonScope.Any);
}
public ZombieOutlander(UUID ownerId) {

3
Mage.Sets/src/mage/sets/magic2010/BaneslayerAngel.java
View file

@ -37,6 +37,7 @@ import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.LifelinkAbility;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreaturePermanent;
@ -51,6 +52,8 @@ public class BaneslayerAngel extends CardImpl<BaneslayerAngel> {
static {
filter1.getSubtype().add("Demon");
filter2.getSubtype().add("Dragon");
filter1.setScopeSubtype(ComparisonScope.Any);
filter2.setScopeSubtype(ComparisonScope.Any);
}
public BaneslayerAngel(UUID ownerId) {

2
Mage.Sets/src/mage/sets/magic2010/BlackKnight.java
View file

@ -35,6 +35,7 @@ import mage.MageInt;
import mage.abilities.keyword.FirstStrikeAbility;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterCard;
/**
@ -48,6 +49,7 @@ public class BlackKnight extends CardImpl<BlackKnight> {
static {
filter.setUseColor(true);
filter.getColor().setWhite(true);
filter.setScopeColor(ComparisonScope.Any);
}
public BlackKnight(UUID ownerId) {

3
Mage.Sets/src/mage/sets/magic2010/GreatSableStag.java
View file

@ -37,6 +37,7 @@ import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.CantCounterSourceEffect;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterCard;
/**
@ -50,8 +51,10 @@ public class GreatSableStag extends CardImpl<GreatSableStag> {
static {
filter1.setUseColor(true);
filter1.getColor().setBlue(true);
filter1.setScopeColor(ComparisonScope.Any);
filter2.setUseColor(true);
filter2.getColor().setBlack(true);
filter2.setScopeColor(ComparisonScope.Any);
}
public GreatSableStag(UUID ownerId) {

12
Mage.Sets/src/mage/sets/magic2010/WhiteKnight.java
View file

@ -35,6 +35,7 @@ import mage.MageInt;
import mage.abilities.keyword.FirstStrikeAbility;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterCard;
/**
@ -43,6 +44,14 @@ import mage.filter.FilterCard;
*/
public class WhiteKnight extends CardImpl<WhiteKnight> {
private static final FilterCard filter = new FilterCard("Black");
static {
filter.setUseColor(true);
filter.getColor().setBlack(true);
filter.setScopeColor(ComparisonScope.Any);
}
public WhiteKnight(UUID ownerId) {
super(ownerId, 41, "White Knight", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{W}{W}");
this.expansionSetCode = "M10";
@ -53,9 +62,6 @@ public class WhiteKnight extends CardImpl<WhiteKnight> {
this.toughness = new MageInt(2);
this.addAbility(FirstStrikeAbility.getInstance());
FilterCard filter = new FilterCard("Black");
filter.setUseColor(true);
filter.getColor().setBlack(true);
this.addAbility(new ProtectionAbility(filter));
}

3
Mage.Sets/src/mage/sets/mirrodinbesieged/MirranCrusader.java
View file

@ -35,6 +35,7 @@ import mage.MageInt;
import mage.abilities.keyword.DoubleStrikeAbility;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterCard;
/**
@ -48,9 +49,11 @@ public class MirranCrusader extends CardImpl<MirranCrusader> {
static {
filter.setUseColor(true);
filter.getColor().setBlack(true);
filter.setScopeColor(ComparisonScope.Any);
filter2.setUseColor(true);
filter2.getColor().setGreen(true);
filter2.setScopeColor(ComparisonScope.Any);
}
public MirranCrusader (UUID ownerId) {

3
Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianCrusader.java
View file

@ -39,6 +39,7 @@ import mage.abilities.keyword.InfectAbility;
import mage.abilities.keyword.ProtectionAbility;
import mage.abilities.mana.ColorlessManaAbility;
import mage.cards.CardImpl;
import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterCard;
/**
@ -53,9 +54,11 @@ public class PhyrexianCrusader extends CardImpl<PhyrexianCrusader> {
static {
filter.setUseColor(true);
filter.getColor().setRed(true);
filter.setScopeColor(ComparisonScope.Any);
filter2.setUseColor(true);
filter2.getColor().setWhite(true);
filter2.setScopeColor(ComparisonScope.Any);
}
public PhyrexianCrusader (UUID ownerId) {

2
Mage.Sets/src/mage/sets/newphyrexia/VulshokRefugee.java
View file

@ -33,6 +33,7 @@ import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterCard;
/**
@ -46,6 +47,7 @@ public class VulshokRefugee extends CardImpl<VulshokRefugee> {
static {
filter.setUseColor(true);
filter.getColor().setRed(true);
filter.setScopeColor(ComparisonScope.Any);
}
public VulshokRefugee(UUID ownerId) {

2
Mage.Sets/src/mage/sets/worldwake/KorFirewalker.java
View file

@ -38,6 +38,7 @@ import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.common.GainLifeEffect;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterCard;
import mage.game.Game;
import mage.game.events.GameEvent;
@ -53,6 +54,7 @@ public class KorFirewalker extends CardImpl<KorFirewalker> {
static {
filter.setUseColor(true);
filter.getColor().setRed(true);
filter.setScopeColor(ComparisonScope.Any);
}
public KorFirewalker (UUID ownerId) {

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

@ -37,6 +37,7 @@ import mage.abilities.effects.common.continious.GainAbilityControlledEffect;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.choices.ChoiceColor;
import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterCard;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
@ -68,11 +69,12 @@ public class BraveTheElements extends CardImpl<BraveTheElements> {
class BraveTheElementsEffect extends GainAbilityControlledEffect {
private static FilterCreaturePermanent filter1 = new FilterCreaturePermanent();
private static final FilterCreaturePermanent filter1 = new FilterCreaturePermanent();
static {
filter1.setUseColor(true);
filter1.getColor().setWhite(true);
filter1.setScopeColor(ComparisonScope.Any);
}
FilterCard filter2;
@ -81,6 +83,7 @@ class BraveTheElementsEffect extends GainAbilityControlledEffect {
super(new ProtectionAbility(new FilterCard()), Duration.EndOfTurn, filter1);
filter2 = (FilterCard)((ProtectionAbility)ability).getFilter();
filter2.setUseColor(true);
filter2.setScopeColor(ComparisonScope.Any);
}
public BraveTheElementsEffect(final BraveTheElementsEffect effect) {

2
Mage.Sets/src/mage/sets/zendikar/DevoutLightcaster.java
View file

@ -35,6 +35,7 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.common.ExileTargetEffect;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterCard;
import mage.filter.FilterPermanent;
import mage.target.TargetPermanent;
@ -51,6 +52,7 @@ public class DevoutLightcaster extends CardImpl<DevoutLightcaster> {
static {
filterProtection.setUseColor(true);
filterProtection.getColor().setBlack(true);
filterProtection.setScopeColor(ComparisonScope.Any);
filterTarget.setUseColor(true);
filterTarget.getColor().setBlack(true);
}

2
Mage/src/mage/abilities/effects/common/continious/GainProtectionFromColorTargetEffect.java
View file

@ -32,6 +32,7 @@ import mage.Constants.Duration;
import mage.abilities.Ability;
import mage.abilities.keyword.ProtectionAbility;
import mage.choices.ChoiceColor;
import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterCard;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -48,6 +49,7 @@ public class GainProtectionFromColorTargetEffect extends GainAbilityTargetEffect
super(new ProtectionAbility(new FilterCard()), duration);
protectionFilter = (FilterCard)((ProtectionAbility)ability).getFilter();
protectionFilter.setUseColor(true);
protectionFilter.setScopeColor(ComparisonScope.Any);
}
public GainProtectionFromColorTargetEffect(final GainProtectionFromColorTargetEffect effect) {