diff --git a/.gitattributes b/.gitattributes index 58312e4c504..e9a10135391 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4864,6 +4864,7 @@ res/cardsfolder/shield_sphere.txt -text svneol=native#text/plain res/cardsfolder/shield_wall.txt -text svneol=native#text/plain res/cardsfolder/shielding_plax.txt -text svneol=native#text/plain res/cardsfolder/shifting_wall.txt -text svneol=native#text/plain +res/cardsfolder/shimmer_myr.txt -text svneol=native#text/plain res/cardsfolder/shimmering_barrier.txt -text svneol=native#text/plain res/cardsfolder/shimmering_grotto.txt -text svneol=native#text/plain res/cardsfolder/shimmering_wings.txt svneol=native#text/plain diff --git a/res/cardsfolder/shimmer_myr.txt b/res/cardsfolder/shimmer_myr.txt new file mode 100644 index 00000000000..3b13ef25557 --- /dev/null +++ b/res/cardsfolder/shimmer_myr.txt @@ -0,0 +1,10 @@ +Name:Shimmer Myr +ManaCost:3 +Types:Artifact Creature Myr +Text:You may cast artifact cards as though they had flash. +PT:2/2 +K:Flash +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/shimmer_myr.jpg +End +#Uses card-specific code. \ No newline at end of file diff --git a/src/forge/Spell_Permanent.java b/src/forge/Spell_Permanent.java index 5aa3b0e258d..5d42094a7ac 100644 --- a/src/forge/Spell_Permanent.java +++ b/src/forge/Spell_Permanent.java @@ -153,9 +153,20 @@ public class Spell_Permanent extends Spell { return false; } + CardList listShimmerMyr = new CardList(AllZone.getZone(Constant.Zone.Battlefield, perm.getController()).getCards()); + listShimmerMyr = listShimmerMyr.filter(new CardListFilter() { + + public boolean addCard(Card c) { + return c.getName().equals("Shimmer Myr"); + } + + }); + return super.canPlay() || (getSourceCard().getKeyword().contains("Flash") && !AllZone.GameAction.isCardInPlay(getSourceCard()) - && !getSourceCard().isUnCastable()); + && !getSourceCard().isUnCastable()) + || ((perm.getType().contains("Artifact") && listShimmerMyr.size() != 0) && !AllZone.GameAction.isCardInPlay(getSourceCard()) + && !getSourceCard().isUnCastable()); } @Override