diff --git a/.gitattributes b/.gitattributes index ddeb71f15e5..f641e8ba75e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -930,6 +930,7 @@ res/cardsfolder/crazed_skirge.txt -text svneol=native#text/plain res/cardsfolder/creakwood_liege.txt -text svneol=native#text/plain res/cardsfolder/creeping_mold.txt -text svneol=native#text/plain res/cardsfolder/creeping_tar_pit.txt -text svneol=native#text/plain +res/cardsfolder/cremate.txt -text svneol=native#text/plain res/cardsfolder/crenellated_wall.txt -text svneol=native#text/plain res/cardsfolder/crevasse.txt -text svneol=native#text/plain res/cardsfolder/crib_swap.txt -text svneol=native#text/plain @@ -1487,6 +1488,7 @@ res/cardsfolder/fabricate.txt -text svneol=native#text/plain res/cardsfolder/faceless_butcher.txt -text svneol=native#text/plain res/cardsfolder/facevaulter.txt -text svneol=native#text/plain res/cardsfolder/fact_or_fiction.txt -text svneol=native#text/plain +res/cardsfolder/fade_from_memory.txt -text svneol=native#text/plain res/cardsfolder/faerie_conclave.txt -text svneol=native#text/plain res/cardsfolder/faerie_harbinger.txt -text svneol=native#text/plain res/cardsfolder/faerie_swarm.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/cremate.txt b/res/cardsfolder/cremate.txt new file mode 100644 index 00000000000..ff6c05e20c5 --- /dev/null +++ b/res/cardsfolder/cremate.txt @@ -0,0 +1,9 @@ +Name:Cremate +ManaCost:B +Types:Instant +Text:no text +A:SP$Retrieve | Cost$ B | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard. +K:Draw a card. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/cremate.jpg +End diff --git a/res/cardsfolder/fade_from_memory.txt b/res/cardsfolder/fade_from_memory.txt new file mode 100644 index 00000000000..169d4586284 --- /dev/null +++ b/res/cardsfolder/fade_from_memory.txt @@ -0,0 +1,9 @@ +Name:Fade from Memory +ManaCost:B +Types:Instant +Text:no text +A:SP$Retrieve | Cost$ B | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard. +K:Cycling:B +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/fade_from_memory.jpg +End diff --git a/src/forge/AbilityFactory_Fetch.java b/src/forge/AbilityFactory_Fetch.java index 764f77c8987..b577087a1c6 100644 --- a/src/forge/AbilityFactory_Fetch.java +++ b/src/forge/AbilityFactory_Fetch.java @@ -622,7 +622,7 @@ public class AbilityFactory_Fetch { tgtC.setController(sa.getActivatingPlayer()); } else if (destination.equals("Exile")){ - AllZone.getZone(Constant.Zone.Removed_From_Play, player).add(tgtC); + AllZone.getZone(Constant.Zone.Removed_From_Play, tgtC.getOwner()).add(tgtC); } } String DrawBack = af.getMapParams().get("SubAbility");