diff --git a/.gitattributes b/.gitattributes index 4910e7cb45a..b92d0773031 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8973,6 +8973,7 @@ res/cardsfolder/v/vodalian_merchant.txt svneol=native#text/plain res/cardsfolder/v/vodalian_serpent.txt svneol=native#text/plain res/cardsfolder/v/vodalian_soldiers.txt svneol=native#text/plain res/cardsfolder/v/vodalian_zombie.txt svneol=native#text/plain +res/cardsfolder/v/voice_of_all.txt -text res/cardsfolder/v/voice_of_duty.txt svneol=native#text/plain res/cardsfolder/v/voice_of_grace.txt svneol=native#text/plain res/cardsfolder/v/voice_of_law.txt svneol=native#text/plain diff --git a/res/cardsfolder/c/cauldron_dance.txt b/res/cardsfolder/c/cauldron_dance.txt index a6be85de23c..bc5077a6fde 100644 --- a/res/cardsfolder/c/cauldron_dance.txt +++ b/res/cardsfolder/c/cauldron_dance.txt @@ -13,4 +13,6 @@ SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | Defined$ Self | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/caudron_dance.jpg +SetInfo:INV|Uncommon|http://magiccards.info/scans/en/in/238.jpg +Oracle:Cast Cauldron Dance only during combat.\nReturn target creature card from your graveyard to the battlefield. That creature gains haste. Return it to your hand at the beginning of the next end step.\nYou may put a creature card from your hand onto the battlefield. That creature gains haste. Its controller sacrifices it at the beginning of the next end step. End \ No newline at end of file diff --git a/res/cardsfolder/d/distorting_lens.txt b/res/cardsfolder/d/distorting_lens.txt index 5b05a549e54..68a324b64e8 100644 --- a/res/cardsfolder/d/distorting_lens.txt +++ b/res/cardsfolder/d/distorting_lens.txt @@ -8,4 +8,7 @@ SVar:RemRandomDeck:True SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/distorting_lens.jpg +SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/299.jpg +SetInfo:MMQ|Rare|http://magiccards.info/scans/en/mm/293.jpg +Oracle:{T}: Target permanent becomes the color of your choice until end of turn. End \ No newline at end of file diff --git a/res/cardsfolder/e/explorers_scope.txt b/res/cardsfolder/e/explorers_scope.txt index c54f0258ff8..7dd6b69530f 100644 --- a/res/cardsfolder/e/explorers_scope.txt +++ b/res/cardsfolder/e/explorers_scope.txt @@ -6,4 +6,6 @@ T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigDig | TriggerDescrip SVar:TrigDig:AB$Dig | Cost$ 0 | DigNum$ 1 | ChangeNum$ All | Optional$ True | ChangeValid$ Land | DestinationZone$ Battlefield | Tapped$ True | LibraryPosition2$ 0 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/explorers_scope.jpg +SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/202.jpg +Oracle:Whenever equipped creature attacks, look at the top card of your library. If it's a land card, you may put it onto the battlefield tapped.\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.) End \ No newline at end of file diff --git a/res/cardsfolder/v/voice_of_all.txt b/res/cardsfolder/v/voice_of_all.txt new file mode 100644 index 00000000000..ab132144f11 --- /dev/null +++ b/res/cardsfolder/v/voice_of_all.txt @@ -0,0 +1,16 @@ +Name:Voice of All +ManaCost:2 W W +Types:Creature Angel +Text:no text +PT:2/2 +K:Flying +T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ ChooseColor | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, choose a color. +SVar:ChooseColor:DB$ ChooseColor | Defined$ You +K:Protection:Card.ChosenColor:CARDNAME has protection from the chosen color. +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/voice_of_all.jpg +SetInfo:COM|Rare|http://magiccards.info/scans/en/cmd/35.jpg +SetInfo:PLS|Uncommon|http://magiccards.info/scans/en/ps/19.jpg +SetInfo:10E|Rare|http://magiccards.info/scans/en/10e/56.jpg +Oracle:Flying\nAs Voice of All enters the battlefield, choose a color.\nVoice of All has protection from the chosen color. +End \ No newline at end of file diff --git a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java index db8f682e516..97651281de5 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java @@ -2599,7 +2599,7 @@ public class CardFactoryUtil { if (kw.startsWith("Protection:")) { // uses isValid final String characteristic = kw.split(":")[1]; final String[] characteristics = characteristic.split(","); - if (card.isValid(characteristics, card.getController(), card)) { + if (card.isValid(characteristics, target.getController(), target)) { return true; } }