diff --git a/.gitattributes b/.gitattributes index ce0d9075bf2..51cbdb2c598 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9641,6 +9641,7 @@ res/cardsfolder/u/urzas_bauble.txt -text res/cardsfolder/u/urzas_blueprints.txt svneol=native#text/plain res/cardsfolder/u/urzas_chalice.txt svneol=native#text/plain res/cardsfolder/u/urzas_factory.txt svneol=native#text/plain +res/cardsfolder/u/urzas_filter.txt -text res/cardsfolder/u/urzas_guilt.txt svneol=native#text/plain res/cardsfolder/u/urzas_incubator.txt -text svneol=unset#text/plain res/cardsfolder/u/urzas_mine.txt svneol=native#text/plain diff --git a/res/cardsfolder/u/urzas_filter.txt b/res/cardsfolder/u/urzas_filter.txt new file mode 100644 index 00000000000..8a83d954f5f --- /dev/null +++ b/res/cardsfolder/u/urzas_filter.txt @@ -0,0 +1,10 @@ +Name:Urza's Filter +ManaCost:4 +Types:Artifact +Text:no text +K:CostChange:All:Less:2:Spell:MultiColored:All:NoSpecial:Multicolored spells cost up to 2 less to cast. +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/urzas_filter.jpg +SetInfo:INV|Rare|http://magiccards.info/scans/en/in/318.jpg +Oracle:Multicolored spells cost up to {2} less to cast. +End \ No newline at end of file diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java index 17616c5686f..524721207f2 100644 --- a/src/main/java/forge/GameAction.java +++ b/src/main/java/forge/GameAction.java @@ -1909,6 +1909,7 @@ public class GameAction { || (k[4].equals("Enchanted") && originalCard.getEnchantedBy().contains(card)) || k[4] .equals("All")) && ((CardUtil.getColors(originalCard).contains(k[5])) || k[5].equals("All")) + || (k[5].equals("Multicolored") && (CardUtil.getColors(originalCard).size() > 1)) && ((originalCard.isType(k[6])) || (!(originalCard.isType(k[6])) && k[7].contains("NonType")) || k[6].equals("All"))) { if (k[7].contains("CardIsTapped")) { @@ -2095,6 +2096,7 @@ public class GameAction { || (k[4].equals("Enchanted") && originalCard.getEnchantedBy().contains(card)) || k[4] .equals("All")) && ((CardUtil.getColors(originalCard).contains(k[5])) || k[5].equals("All")) + || (k[5].equals("MultiColored") && (CardUtil.getColors(originalCard).size() > 1)) && ((originalCard.isType(k[6])) || (!(originalCard.isType(k[6])) && k[7].contains("NonType")) || k[6] .equals("All"))) {