diff --git a/.gitattributes b/.gitattributes index a1576a9baa9..937e0fb2c64 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1564,6 +1564,7 @@ res/cardsfolder/elvish_piper.txt -text svneol=native#text/plain res/cardsfolder/elvish_ranger.txt -text svneol=native#text/plain res/cardsfolder/elvish_scrapper.txt -text svneol=native#text/plain res/cardsfolder/elvish_skysweeper.txt -text svneol=native#text/plain +res/cardsfolder/elvish_spirit_guide.txt -text svneol=native#text/plain res/cardsfolder/elvish_vanguard.txt -text svneol=native#text/plain res/cardsfolder/elvish_visionary.txt -text svneol=native#text/plain res/cardsfolder/elvish_warrior.txt -text svneol=native#text/plain @@ -4591,6 +4592,7 @@ res/cardsfolder/silverstorm_samurai.txt -text svneol=native#text/plain res/cardsfolder/silvos_rogue_elemental.txt -text svneol=native#text/plain res/cardsfolder/sima_yi_wei_field_marshal.txt -text svneol=native#text/plain res/cardsfolder/simian_grunts.txt -text svneol=native#text/plain +res/cardsfolder/simian_spirit_guide.txt -text svneol=native#text/plain res/cardsfolder/simic_growth_chamber.txt -text svneol=native#text/plain res/cardsfolder/simic_ragworm.txt -text svneol=native#text/plain res/cardsfolder/simic_signet.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/elvish_spirit_guide.txt b/res/cardsfolder/elvish_spirit_guide.txt new file mode 100644 index 00000000000..4e0569b1593 --- /dev/null +++ b/res/cardsfolder/elvish_spirit_guide.txt @@ -0,0 +1,9 @@ +Name:Elvish Spirit Guide +ManaCost:2 G +Types:Creature Elf Spirit +Text:no text +PT:2/2 +A:AB$Mana | Cost$ExileFromHand<1/CARDNAME> | Produced$G | ActivatingZone$Hand | SpellDescription$Add G to your mana pool. +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/elvish_spirit_guide.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/simian_spirit_guide.txt b/res/cardsfolder/simian_spirit_guide.txt new file mode 100644 index 00000000000..22176c71f7e --- /dev/null +++ b/res/cardsfolder/simian_spirit_guide.txt @@ -0,0 +1,9 @@ +Name:Simian Spirit Guide +ManaCost:2 R +Types:Creature Ape Spirit +Text:no text +PT:2/2 +A:AB$Mana | Cost$ExileFromHand<1/CARDNAME> | Produced$R | ActivatingZone$Hand | SpellDescription$Add R to your mana pool. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/simian_spirit_guide.jpg +End \ No newline at end of file diff --git a/src/forge/Cost_Payment.java b/src/forge/Cost_Payment.java index 126079e1b3a..8570971a09c 100644 --- a/src/forge/Cost_Payment.java +++ b/src/forge/Cost_Payment.java @@ -916,7 +916,7 @@ public class Cost_Payment { JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, null, possibleValues, possibleValues[0]); if(choice.equals(0)) { - payment.setPayExile(true); + payment.setPayExileFromHand(true); AllZone.GameAction.exile(card); stop(); payment.payCost();